fixes #56 Remove loglevel.

skygragon · skygragon · commit 1065652df9ff · 2017-07-15T22:44:18.000+08:00
Signed-off-by: Eric Wang &lt;skygragon@gmail.com&gt;
diff --git a/lib/cli.js b/lib/cli.js
@@ -1,13 +1,13 @@
 var fs = require('fs');
 
-var log = require('loglevel');
 var sprintf = require('sprintf-js').sprintf;
 var _ = require('underscore');
 
+var h = require('./helper');
 var chalk = require('./chalk');
-var config = require('./config');
 var icon = require('./icon');
-var h = require('./helper');
+var log = require('./log');
+var config = require('./config');
 
 // We are expecting a tier configuration like:
 // global config < local config < cli params
@@ -27,41 +27,34 @@ function setIcon() {
 }
 
 function setLogLevel() {
-  var level = log.levels.INFO;
-  if (process.argv.indexOf('-v') >= 0) level = log.levels.DEBUG;
-  if (process.argv.indexOf('-vv') >= 0) level = log.levels.TRACE;
-
-  log.setLevel(level);
-
-  log.fail = function(e) {
-    log.error(chalk.red(sprintf('[ERROR] %s [%d]', (e.msg || e), (e.statusCode || 0))));
-  };
+  log.init();
 
-  _.each(['debug', 'trace'], function(level) {
-    log[level] = _.wrap(log[level], function(func) {
-      var args = Array.prototype.slice.call(arguments);
-      args[0] = '[' + level.toUpperCase() + ']';
-      func.apply(null, _.map(args, function(arg) {
-        return chalk.gray(arg);
-      }));
-    });
-  });
+  var level = 'INFO';
+  if (process.argv.indexOf('-v') >= 0) level = 'DEBUG';
+  if (process.argv.indexOf('-vv') >= 0) level = 'TRACE';
 
-  if (level === log.levels.TRACE) {
+  // print HTTP details in TRACE
+  if (level === 'TRACE') {
     var request = require('request');
     request.debug = true;
-    // FIXME: hack request log, hope no one else use it...
+
     console.error = _.wrap(console.error, function(func) {
       var args = Array.prototype.slice.call(arguments);
       args.shift();
+
+      // FIXME: hack HTTP request log, hope no one else use it...
       if (args.length > 0 && args[0].indexOf('REQUEST ') === 0) {
-        args.unshift('[TRACE]');
+        args = args.map(function(arg) {
+          return h.printSafeHTTP(arg);
+        });
+        log.trace.apply(log, args);
+      } else {
+        log.info.apply(log, args);
       }
-      console.log.apply(null, _.map(args, function(arg) {
-        return chalk.gray(h.printSafeHTTP(arg));
-      }));
     });
   }
+
+  log.setLevel(level);
 }
 
 function checkCache() {
diff --git a/lib/commands/cache.js b/lib/commands/cache.js
@@ -1,9 +1,9 @@
-var log = require('loglevel');
 var sprintf = require('sprintf-js').sprintf;
 var _ = require('underscore');
 
-var cache = require('../cache');
 var h = require('../helper');
+var log = require('../log');
+var cache = require('../cache');
 
 var cmd = {
   command: 'cache',
diff --git a/lib/commands/list.js b/lib/commands/list.js
@@ -1,11 +1,11 @@
 var _ = require('underscore');
 var sprintf = require('sprintf-js').sprintf;
-var log = require('loglevel');
 
-var chalk = require('../chalk');
-var core = require('../core');
 var h = require('../helper');
+var chalk = require('../chalk');
 var icon = require('../icon');
+var log = require('../log');
+var core = require('../core');
 
 var cmd = {
   command: 'list [keyword]',
diff --git a/lib/commands/show.js b/lib/commands/show.js
@@ -2,14 +2,14 @@ var fs = require('fs');
 var util = require('util');
 
 var _ = require('underscore');
-var log = require('loglevel');
 var sprintf = require('sprintf-js').sprintf;
 
+var h = require('../helper');
 var chalk = require('../chalk');
+var icon = require('../icon');
+var log = require('../log');
 var config = require('../config');
 var core = require('../core');
-var h = require('../helper');
-var icon = require('../icon');
 
 var cmd = {
   command: 'show <keyword>',
diff --git a/lib/commands/star.js b/lib/commands/star.js
@@ -1,9 +1,9 @@
-var log = require('loglevel');
 var sprintf = require('sprintf-js').sprintf;
 
 var chalk = require('../chalk');
-var core = require('../core');
 var icon = require('../icon');
+var log = require('../log');
+var core = require('../core');
 
 var cmd = {
   command: 'star <keyword>',
diff --git a/lib/commands/stat.js b/lib/commands/stat.js
@@ -1,8 +1,8 @@
-var log = require('loglevel');
 var sprintf = require('sprintf-js').sprintf;
 var _ = require('underscore');
 
 var chalk = require('../chalk');
+var log = require('../log');
 var core = require('../core');
 
 var cmd = {
diff --git a/lib/commands/submission.js b/lib/commands/submission.js
@@ -1,13 +1,13 @@
 var fs = require('fs');
 
 var _ = require('underscore');
-var log = require('loglevel');
 var sprintf = require('sprintf-js').sprintf;
 
-var chalk = require('../chalk');
-var core = require('../core');
 var h = require('../helper');
+var chalk = require('../chalk');
+var log = require('../log');
 var queue = require('../queue');
+var core = require('../core');
 
 var cmd = {
   command: 'submission [keyword]',
diff --git a/lib/commands/submit.js b/lib/commands/submit.js
@@ -1,10 +1,10 @@
 var util = require('util');
 
 var _ = require('underscore');
-var log = require('loglevel');
 
-var core = require('../core');
 var h = require('../helper');
+var log = require('../log');
+var core = require('../core');
 
 var cmd = {
   command: 'submit <filename>',
diff --git a/lib/commands/test.js b/lib/commands/test.js
@@ -1,11 +1,11 @@
 var util = require('util');
 
 var _ = require('underscore');
-var log = require('loglevel');
 
+var h = require('../helper');
 var chalk = require('../chalk');
+var log = require('../log');
 var core = require('../core');
-var h = require('../helper');
 
 var cmd = {
   command: 'test <filename>',
diff --git a/lib/commands/user.js b/lib/commands/user.js
@@ -1,7 +1,7 @@
-var log = require('loglevel');
 var prompt = require('prompt');
 
 var chalk = require('../chalk');
+var log = require('../log');
 var core = require('../core');
 
 var cmd = {
diff --git a/lib/commands/version.js b/lib/commands/version.js
@@ -1,6 +1,7 @@
-var log = require('loglevel');
 var sprintf = require('sprintf-js').sprintf;
 
+var log = require('../log');
+
 var cmd = {
   command: 'version',
   desc:    'show version info',
@@ -26,7 +27,7 @@ function getVersion() {
 cmd.handler = function(argv) {
   var version = getVersion();
 
-  if (log.getLevel() >= log.levels.INFO)
+  if (!log.isEnabled('DEBUG'))
     return log.info(version);
 
   var logo = [
diff --git a/lib/core.js b/lib/core.js
@@ -3,8 +3,8 @@ var path = require('path');
 var util = require('util');
 
 var _ = require('underscore');
-var log = require('loglevel');
 
+var log = require('./log');
 var cache = require('./cache');
 var config = require('./config');
 var client = require('./leetcode_client');
diff --git a/lib/leetcode_client.js b/lib/leetcode_client.js
@@ -1,9 +1,9 @@
 var _ = require('underscore');
 var cheerio = require('cheerio');
 var he = require('he');
-var log = require('loglevel');
 var request = require('request');
 
+var log = require('./log');
 var config = require('./config');
 var h = require('./helper');
 
diff --git a/lib/log.js b/lib/log.js
@@ -0,0 +1,51 @@
+var _ = require('underscore');
+var sprintf = require('sprintf-js').sprintf;
+
+var chalk = require('./chalk');
+
+var log = {
+  level: null,
+
+  levels: {
+    TRACE: {value: 0, color: 'gray'},
+    DEBUG: {value: 1, color: 'gray'},
+    INFO:  {value: 2, color: ''},
+    WARN:  {value: 3, color: 'yellow'},
+    ERROR: {value: 4, color: 'red'}
+  }
+};
+
+log.setLevel = function(name) {
+  this.level = this.levels[name] || this.levels.INFO;
+};
+
+log.isEnabled = function(name) {
+  return this.level.value <= this.levels[name].value;
+};
+
+log.fail = function(e) {
+  log.error(sprintf('%s [%d]', (e.msg || e), (e.statusCode || 0)));
+};
+
+log.init = function() {
+  this.setLevel('INFO');
+
+  _.keys(this.levels).forEach(function(name) {
+    log[name.toLowerCase()] = function() {
+      var level = log.levels[name];
+      if (log.level.value > level.value) return;
+
+      var args = Array.prototype.slice.call(arguments);
+      if (name !== 'INFO') args.unshift('[' + name + ']');
+
+      var s = args.map(function(arg) {
+        return arg.toString();
+      }).join(' ');
+      if (level.color) s = chalk[level.color](s);
+
+      console.log(s);
+    };
+  });
+};
+
+module.exports = log;
diff --git a/package.json b/package.json
@@ -33,7 +33,6 @@
     "ansi-styles": "^3.0.0",
     "cheerio": "^0.20.0",
     "he": "^1.1.1",
-    "loglevel": "^1.4.1",
     "prompt": "^1.0.0",
     "request": "^2.74.0",
     "sprintf-js": "^1.0.3",
diff --git a/test/test_core.js b/test/test_core.js
@@ -5,6 +5,8 @@ var _ = require('underscore');
 var assert = require('chai').assert;
 var rewire = require('rewire');
 
+var log = require('../lib/log');
+
 // mock depedencies
 var cache = rewire('../lib/cache');
 var client = rewire('../lib/leetcode_client');
@@ -14,6 +16,8 @@ var h = rewire('../lib/helper');
 
 describe('core', function() {
   before(function() {
+    log.init();
+
     var home = './tmp';
     execSync('rm -rf ' + home);
     fs.mkdirSync(home);
diff --git a/test/test_leetcode_client.js b/test/test_leetcode_client.js
@@ -2,6 +2,7 @@ var _ = require('underscore');
 var assert = require('chai').assert;
 var nock = require('nock');
 
+var log = require('../lib/log');
 var client = require('../lib/leetcode_client');
 var config = require('../lib/config');
 var core = require('../lib/core');
@@ -23,6 +24,7 @@ describe('leetcode_client', function() {
   var URL_ALGORITHMS = 'https://leetcode.com/api/problems/algorithms/';
 
   before(function() {
+    log.init();
     config.init();
   });
 
