Fix: Reintroduce color-support & --no-color flag

Author: phated

index.js

@@ -4,9 +4,30 @@
  */
 var gray = require('ansi-gray');
 var timestamp = require('time-stamp');
+var supportsColor = require('color-support');
+
+function hasFlag(flag) {
+  return (process.argv.indexOf('--' + flag) !== -1);
+}
+
+function addColor(str) {
+  if (hasFlag('no-color')) {
+    return str;
+  }
+
+  if (hasFlag('color')) {
+    return gray(str);
+  }
+
+  if (supportsColor()) {
+    return gray(str);
+  }
+
+  return str;
+}
 
 function getTimestamp(){
-  return '['+gray(timestamp('HH:mm:ss'))+']';
+  return '['+addColor(timestamp('HH:mm:ss'))+']';
 }
 
 function log(){

package.json

@@ -21,6 +21,7 @@
   },
   "dependencies": {
     "ansi-gray": "^0.1.1",
+    "color-support": "^1.1.3",
     "time-stamp": "^1.0.0"
   },
   "devDependencies": {

test.js

@@ -13,6 +13,8 @@ var log = require('./');
 
 lab.describe('log()', function(){
 
+  var term = process.env.TERM;
+  var colorterm = process.env.COLORTERM;
   var stdout_write = process.stdout.write;
   var writtenValue = '';
 
@@ -55,6 +57,62 @@ lab.describe('log()', function(){
 
     done();
   });
+
+  lab.it('does not add color if argv contains --no-color', function(done) {
+    // Stub process.stdout.write
+    process.stdout.write = writeSpy;
+
+    process.argv.push('--no-color');
+
+    log(1, 2, 3, 4, 'five');
+    var time = timestamp('HH:mm:ss');
+    code.expect(writtenValue).equals('[' + time + '] 1 2 3 4 \'five\'\n');
+
+    // Restore process.stdout.write after test
+    process.stdout.write = stdout_write;
+
+    process.argv.pop();
+
+    done();
+  });
+
+  lab.it('adds color if argv contains --color', function(done) {
+    // Stub process.stdout.write
+    process.stdout.write = writeSpy;
+
+    process.argv.push('--color');
+
+    log(1, 2, 3, 4, 'five');
+    var time = timestamp('HH:mm:ss');
+    code.expect(writtenValue).equals('[' + gray(time) + '] 1 2 3 4 \'five\'\n');
+
+    // Restore process.stdout.write after test
+    process.stdout.write = stdout_write;
+
+    process.argv.pop();
+
+    done();
+  });
+
+  lab.it('does not add color if no support', function(done) {
+    // Stub process.stdout.write
+    process.stdout.write = writeSpy;
+
+    process.env.TERM = 'dumb';
+    delete process.env.COLORTERM;
+
+    log(1, 2, 3, 4, 'five');
+    var time = timestamp('HH:mm:ss');
+    code.expect(writtenValue).equals('[' + time + '] 1 2 3 4 \'five\'\n');
+
+    // Restore process.stdout.write after test
+    process.stdout.write = stdout_write;
+
+    process.env.TERM = term;
+    process.env.COLORTERM = colorterm;
+
+    done();
+  });
 });
 
 lab.describe('log.info()', function(){