Skip to content

Commit

Permalink
code refactoring and karma config
Browse files Browse the repository at this point in the history
  • Loading branch information
pranaydutta89 committed Jul 28, 2014
1 parent 88da2bc commit 7b83ec0
Show file tree
Hide file tree
Showing 12 changed files with 153 additions and 90 deletions.
1 change: 1 addition & 0 deletions .idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/console-logger.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/jsLibraryMappings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions .idea/libraries/console_logger_node_modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions dependencies/jquery.min.js

Large diffs are not rendered by default.

64 changes: 25 additions & 39 deletions dist/logger.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/logger.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/logger.min/logger.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

60 changes: 60 additions & 0 deletions karma.conf.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
// Karma configuration
// Generated on Sun Jun 22 2014 20:52:26 GMT+0200 (W. Europe Daylight Time)

module.exports = function(config) {
config.set({

// base path that will be used to resolve all patterns (eg. files, exclude)
basePath: '',

plugins:[
'karma-jasmine',
'karma-chrome-launcher'
],

// frameworks to use
// available frameworks: https://npmjs.org/browse/keyword/karma-adapter
frameworks: ['jasmine'],


// list of files / patterns to load in the browser
files: [
"dependencies/jquery.min.js",
"dist/logger.min/logger.js",
"src/*.spec.js"
],


// list of files to exclude
exclude: [

],

// test results reporter to use
// possible values: 'dots', 'progress'
// available reporters: https://npmjs.org/browse/keyword/karma-reporter
reporters: ['progress'],


// web server port
port: 9876,

// enable / disable colors in the output (reporters and logs)
colors: true,

// level of logging
// possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
logLevel: config.LOG_INFO,

// enable / disable watching file and executing tests whenever any file changes
autoWatch: false,

// start these browsers
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
browsers: ['PhantomJS'],

// Continuous Integration mode
// if true, Karma captures browsers, runs the tests and exits
singleRun: false
});
};
7 changes: 6 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
"gulp-tsc": "^0.9.1",
"gulp-uglify": "^0.3.1",
"gulp-usemin": "^0.3.5",
"gulp-util": "^2.2.17"
"gulp-util": "^2.2.17",
"karma": "^0.12.16",
"karma-chrome-launcher": "^0.1.4",
"karma-cli": "0.0.4",
"karma-coverage": "^0.2.4",
"karma-jasmine": "^0.1.5"
}
}
5 changes: 5 additions & 0 deletions src/logger.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/**
* Created by prandutt on 7/28/2014.
*/
/// <reference path="../dist/logger.js"/>
//TODO:create test cases
75 changes: 27 additions & 48 deletions src/logger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,95 +17,74 @@ module consoleLogger{
public logging:boolean =false;
private logHistory:Array<logWrapper> =[];
setAndShowLog(mes){
var temp = new logWrapper();
if(typeof(mes) === 'object' )
{

if(mes.message)
temp.message = $ ? $.trim(mes.message) :mes.message;


var logWarpperObj = new logWrapper();
logWarpperObj.eventDT =new Date();
if(typeof(mes) === 'object' ) {
if(mes.message)
logWarpperObj.message = $ ? $.trim(mes.message) :mes.message;
else
logWarpperObj.message='NA';

if(mes.stack)
temp.stack = $ ? $.trim(mes.stack): mes.stack;

temp.eventDT =new Date();
this.logHistory.push(temp);
this.showLog(temp)

logWarpperObj.stack = $ ? $.trim(mes.stack): mes.stack;
else
logWarpperObj.stack='NA';
}
else if(typeof(mes) ==='string'){

logWarpperObj.message = $ ?$.trim(mes) :mes;
logWarpperObj.stack ='NA';


temp.message = $ ?$.trim(mes) :mes;

temp.stack ='';

temp.eventDT =new Date();
this.logHistory.push(temp);
this.showLog(temp);
}
else{
//no supported format
temp.message ='UnSupported format:'+ mes;
logWarpperObj.message ='UnSupported format, logging actual data:'+ mes;
logWarpperObj.stack ='NA';

temp.stack ='';

temp.eventDT =new Date();
this.logHistory.push(temp);
this.showLog(temp);
}


this.logHistory.push(logWarpperObj);
this.showLog(logWarpperObj);

}

showHistory(){

if(this.logHistory.length ==0) {
this.showLog('No recent activity yet !!');
this.showLog('No recent activity yet!!');
}
else
{
for(var x in this.logHistory){
this.showLog('Sr No:' + (parseInt(x,10)+1).toString());
this.showLog(this.logHistory[x]);
for(var idx in this.logHistory){
this.showLog('Sr No:' + (parseInt(idx,10)+1).toString());
this.showLog(this.logHistory[idx]);
}
}
}
private showLog(mes){
if(console && this.logging && mes)
{
//console is present show them the logs
var strData='';
if(typeof(mes) === 'object')
{


var message =$ ? $.trim(mes.message) :mes.message;

var stack;
if(mes.stack)
stack = $? $.trim(mes.stack): mes.stack;
else
stack ='';


console.log('Message:' + message +'\n' +'Stack:' + stack + '\n\n'+ 'Event Time:' + mes.eventDT);
strData ='Message:' + mes.message +'\n' +'Stack:' + mes.stack + '\n\n'+ 'Event Time:' + mes.eventDT;

}
else if(typeof(mes) ==='string'){

var message = $ ?$.trim(mes) :mes;
console.log('Message:'+ message);

strData='Message:'+ mes.message;

}
else{
//no supported format pass directly
console.log('Unsupported format:'+ mes);
strData='Unsupported format:'+ mes;
}
}else{
//console not supported

console.log(strData);
}

}
Expand Down

0 comments on commit 7b83ec0

Please sign in to comment.