don't include ansi color codes when outputting to a file or pipe

dylang · Aug 16, 2011 · cc71f62 · cc71f62
1 parent 08e9657
commit cc71f62
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/lib/cli.js b/lib/cli.js
@@ -5,10 +5,11 @@ var Github  = require('./github');
 var Npm     = require('./npm');
 var log     = require('./log');
 var FS      = require('fs');
+var Util    = require('./util');
 
 CLI.setUsage('changelog <npm module name or github repo url> [OPTIONS]').parse({
-    color:      ['c', 'Output as Color (default)'],
-    markdown:   ['m', 'Output as Github-flavored Markdown'],
+    color:      ['c', 'Output as Color (terminal default)'],
+    markdown:   ['m', 'Output as Github-flavored Markdown (file default)'],
     json:       ['j', 'Output as JSON'],
     debug:      ['d', 'Enable debugging']
 });
@@ -27,7 +28,7 @@ CLI.main(function (args, options) {
         }
     }
 
-    var output = options.json ? Output.json : options.markdown ? Output.markdown : Output.color;
+    var output = options.json ? Output.json : options.markdown ? Output.markdown : Util.enableColor() ? Output.color : Output.markdown;
 
 
     Step(

diff --git a/lib/util.js b/lib/util.js
@@ -1,5 +1,6 @@
-var log = require('logging').from(__filename);
-var WordWrap = require('wordwrap');
+var log         = require('logging').from(__filename);
+var WordWrap    = require('wordwrap');
+var TTY         = require('tty');
 
 var wordwrap;
 
@@ -9,7 +10,7 @@ function padZero(n) {
 
 function initWordWrap(width){
     if (!width) {
-        width = require('tty').getWindowSize()[1];
+        width = TTY.getWindowSize()[1];
     }
 
     wordwrap = WordWrap(4, width);
@@ -23,7 +24,12 @@ function bullet(string, bulletCharacter) {
     return '  ' + (bulletCharacter || '*') + ' ' + wordwrap(string).trim();
 }
 
+function enableColor() {
+    return TTY.isatty(1);
+}
+
 module.exports = {
     padZero:    padZero,
-    bullet:     bullet
+    bullet:     bullet,
+    enableColor: enableColor
 };