Merge pull request #126 from bem/use-chalk

Use chalk

Author: eGavr

lib/cli.js

@@ -1,7 +1,9 @@
 var path = require('path'),
     vow = require('vow'),
     vfs = require('vow-fs'),
-    colors = require('colors'),
+    chalk = require('chalk'),
+    boldGreen = chalk.green.bold,
+    boldRed = chalk.red.bold,
     HtmlDiffer = require('./index').HtmlDiffer,
     diffLogger = require('./logger'),
     defaults = require('./utils/defaults');
@@ -33,8 +35,8 @@ module.exports = require('coa').Cmd()
         .long('bem')
         .flag()
         .act(function (opts) {
-            console.error('Option ' +  '--bem'.bold.red + ' is deprecated, use ' +
-                '--preset=bem'.bold.green + ' option instead.');
+            console.error('Option ' +  boldRed('--bem') + ' is deprecated, use ' +
+                boldGreen('--preset=bem') + ' option instead.');
             // support legacy
             opts.preset = 'bem';
             delete opts.bem;
@@ -46,8 +48,10 @@ module.exports = require('coa').Cmd()
         .short('p').long('preset')
         .val(function (val) {
             if (!defaults.presets.hasOwnProperty(val)) {
-                console.log(val.bold.red + ' is an invalid preset name. Available presets are: ' +
-                    Object.keys(defaults.presets).map(colors.green).map(colors.bold).join(', ') + '.');
+                console.log(boldRed(val) + ' is an invalid preset name. Available presets are: ' +
+                    Object.keys(defaults.presets).map(function (preset) {
+                        return boldGreen(preset);
+                    }).join(', ') + '.');
                 process.exit(1);
             }
             return val;

lib/logger.js

@@ -1,4 +1,7 @@
-require('colors');
+var chalk = require('chalk'),
+    inverseGreen = chalk.green.inverse,
+    inverseRed = chalk.red.inverse,
+    grey = chalk.grey;
 
 /**
  * @typedef {Object} Diff
@@ -31,24 +34,24 @@ function getDiffText(diff, options) {
     diff.forEach(function (part) {
         var index = diff.indexOf(part),
             partValue = part.value,
-            color = 'grey';
+            diffColor;
 
-        if (part.added) color = 'green';
-        if (part.removed) color = 'red';
+        if (part.added) diffColor = inverseGreen;
+        if (part.removed) diffColor = inverseRed;
 
-        if (color !== 'grey') {
-            output += (!index ? '\n' : '') + partValue.inverse[color];
+        if (diffColor) {
+            output += (index === 0 ? '\n' : '') + diffColor(partValue);
 
             return;
         }
 
         if (partValue.length < charsAroundDiff * 2) {
-            output += (index ? '' : '\n') + partValue.grey;
+            output += (index !== 0 ? '' : '\n') + grey(partValue);
         } else {
-            index && (output += partValue.substr(0, charsAroundDiff).grey);
+            index !== 0 && (output += grey(partValue.substr(0, charsAroundDiff)));
 
             if (index < diff.length - 1) {
-                output += '\n...\n' + partValue.substr(partValue.length - charsAroundDiff, charsAroundDiff).grey;
+                output += '\n...\n' + grey(partValue.substr(partValue.length - charsAroundDiff));
             }
         }
     });
@@ -57,7 +60,7 @@ function getDiffText(diff, options) {
 }
 
 /**
- * Logs diff of the given HTML docs to the console
+ * Logs the diff of the given HTML docs to the console
  * @param {Object[]} diff
  * @param {Object} [options]
  * @param {Number} [options.charsAroundDiff=40]
@@ -66,7 +69,7 @@ function logDiffText(diff, options) {
     var diffText = getDiffText(diff, options);
 
     if (diffText) {
-        console.log('+ expected'.inverse.green, '- actual'.inverse.red, '\n',  diffText);
+        console.log(inverseGreen('+ expected'), inverseRed('- actual'), '\n',  diffText);
     }
 }
 

lib/utils/utils.js

@@ -1,7 +1,5 @@
 var _ = require('lodash');
 
-require('colors');
-
 /**
  * Gets the attribute's indexes in the array of the attributes
  * @param {Array} attrs

package.json

@@ -27,13 +27,13 @@
     "url": "git://github.com/bem/html-differ.git"
   },
   "dependencies": {
-    "vow": "0.4.3",
-    "vow-fs": "0.3.1",
+    "chalk": "1.0.0",
     "coa": "0.4.0",
-    "parse5": "1.1.3",
     "diff": "1.0.8",
-    "colors": "0.6.2",
-    "lodash": "2.4.1"
+    "lodash": "2.4.1",
+    "parse5": "1.1.3",
+    "vow": "0.4.3",
+    "vow-fs": "0.3.1"
   },
   "devDependencies": {
     "mocha": "1.18.2",
@@ -43,11 +43,12 @@
     "jscs": "1.11.3"
   },
   "scripts": {
-    "test": "npm run lint && npm run unit-test && npm run func-test && npm run cover",
+    "test": "npm run lint && npm run unit-test && npm run func-test && npm run logger-test && npm run cover",
     "lint": "jshint . && jscs -c .jscs.js .",
-    "func-test": "mocha test/diff",
     "unit-test": "mocha test/unit",
-    "cover": "istanbul cover _mocha -- test/unit test/diff"
+    "func-test": "mocha test/differ",
+    "logger-test": "mocha test/logger",
+    "cover": "istanbul cover _mocha -- test/unit test/differ test/logger"
   },
   "engines": {
     "node": ">=0.8.0",