colors 1.0.2 → 1.1.2

package/ReadMe.md

@@ -1,8 +1,8 @@
-# colors.js
+# colors.js [![Build Status](https://travis-ci.org/Marak/colors.js.svg?branch=master)](https://travis-ci.org/Marak/colors.js)
 
 ## get color and style in your node.js console
 
-<img src="https://github.com/Marak/colors.js/raw/master/screenshots/colors.png"/>
+![Demo](https://raw.githubusercontent.com/Marak/colors.js/master/screenshots/colors.png)
 
 ## Installation
 
@@ -25,8 +25,6 @@
 
 ### background colors
 
-
-
   - bgBlack
   - bgRed
   - bgGreen
@@ -162,6 +160,19 @@ console.log(colors.error("this is an error"));
 
 // outputs yellow text
 console.log(colors.warn("this is a warning"));
+
+```
+
+You can also combine them:
+
+```javascript
+var colors = require('colors');
+
+colors.setTheme({
+  custom: ['red', 'underline']
+});
+
+console.log('test'.custom);
 ```
 
-*Protip: There is a secret undocumented style in `colors`. If you find the style you can summon him.*
+*Protip: There is a secret undocumented style in `colors`. If you find the style you can summon him.*

package/lib/colors.js

@@ -42,11 +42,16 @@ if (typeof colors.enabled === "undefined") {
   colors.enabled = colors.supportsColor;
 }
 
-colors.strip = function(str){
+colors.stripColors = colors.strip = function(str){
   return ("" + str).replace(/\x1B\[\d+m/g, '');
 };
 
+
 var stylize = colors.stylize = function stylize (str, style) {
+  if (!colors.enabled) {
+    return str+'';
+  }
+
   return ansiStyles[style].open + str + ansiStyles[style].close;
 }
 
@@ -114,6 +119,13 @@ function applyTheme (theme) {
   for (var style in theme) {
     (function(style){
       colors[style] = function(str){
+        if (typeof theme[style] === 'object'){
+          var out = str;
+          for (var i in theme[style]){
+            out = colors[theme[style][i]](out);
+          }
+          return out;
+        }
         return colors[theme[style]](str);
       };
     })(style)

package/lib/custom/zalgo.js

@@ -58,10 +58,10 @@ module['exports'] = function zalgo(text, options) {
   function heComes(text, options) {
     var result = '', counts, l;
     options = options || {};
-    options["up"] = options["up"] || true;
-    options["mid"] = options["mid"] || true;
-    options["down"] = options["down"] || true;
-    options["size"] = options["size"] || "maxi";
+    options["up"] =   typeof options["up"]   !== 'undefined' ? options["up"]   : true;
+    options["mid"] =  typeof options["mid"]  !== 'undefined' ? options["mid"]  : true;
+    options["down"] = typeof options["down"] !== 'undefined' ? options["down"] : true;
+    options["size"] = typeof options["size"] !== 'undefined' ? options["size"] : "maxi";
     text = text.split('');
     for (l in text) {
       if (is_char(l)) {
@@ -72,12 +72,12 @@ module['exports'] = function zalgo(text, options) {
       switch (options.size) {
       case 'mini':
         counts.up = randomNumber(8);
-        counts.min = randomNumber(2);
+        counts.mid = randomNumber(2);
         counts.down = randomNumber(8);
         break;
       case 'maxi':
         counts.up = randomNumber(16) + 3;
-        counts.min = randomNumber(4) + 1;
+        counts.mid = randomNumber(4) + 1;
         counts.down = randomNumber(64) + 3;
         break;
       default:
@@ -100,5 +100,5 @@ module['exports'] = function zalgo(text, options) {
     return result;
   }
   // don't summon him
-  return heComes(text);
+  return heComes(text, options);
 }

package/lib/extendStringPrototype.js

@@ -1,5 +1,4 @@
-var colors = require('./colors'),
-    styles = require('./styles');
+var colors = require('./colors');
 
 module['exports'] = function () {
 
@@ -18,14 +17,14 @@ module['exports'] = function () {
       }
   };
 
-  var stylize = function stylize (str, style) {
-    return styles[style].open + str + styles[style].close;
-  }
-
   addProperty('strip', function () {
     return colors.strip(this);
   });
 
+  addProperty('stripColors', function () {
+    return colors.strip(this);
+  });
+
   addProperty("trap", function(){
     return colors.trap(this);
   });
@@ -56,7 +55,7 @@ module['exports'] = function () {
   var x = Object.keys(colors.styles);
   x.forEach(function (style) {
     addProperty(style, function () {
-      return stylize(this, style);
+      return colors.stylize(this, style);
     });
   });
 
@@ -87,7 +86,7 @@ module['exports'] = function () {
           addProperty(prop, function () {
             var ret = this;
             for (var t = 0; t < theme[prop].length; t++) {
-              ret = exports[theme[prop][t]](ret);
+              ret = colors[theme[prop][t]](ret);
             }
             return ret;
           });

package/lib/index.js

@@ -9,4 +9,4 @@ module['exports'] = colors;
 //   colors.red("foo")
 //
 //
-var extendStringPrototype = require('./extendStringPrototype')();
+require('./extendStringPrototype')();

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "colors",
     "description": "get colors in your node.js console",
-    "version": "1.0.2",
+    "version": "1.1.2",
     "author": "Marak Squires",
     "homepage": "https://github.com/Marak/colors.js",
     "bugs": "https://github.com/Marak/colors.js/issues",
@@ -17,5 +17,12 @@
     "engines": {
         "node": ">=0.1.90"
     },
-    "main": "./lib/index"
+    "main": "lib",
+    "files": [
+        "examples",
+        "lib",
+        "LICENSE",
+        "safe.js",
+        "themes"
+    ]
 }

package/.travis.yml

@@ -1,6 +0,0 @@
-language: node_js
-node_js:
-  - "0.11"
-  - "0.10"
-  - "0.8"
-  - "0.6"

package/tests/basic-test.js

@@ -1,50 +0,0 @@
-var assert = require('assert'),
-    colors = require('../lib/index');
-
-var s = 'string';
-
-function a(s, code) {
-  return '\x1B[' + code.toString() + 'm' + s + '\x1B[39m';
-}
-
-function aE(s, color, code) {
-  assert.equal(s[color], a(s, code));
-  assert.equal(colors[color](s), a(s, code));
-  assert.equal(s[color], colors[color](s));
-  assert.equal(s[color].strip, s);
-  assert.equal(s[color].strip, colors.strip(s));
-}
-
-function h(s, color) {
-  return '<span style="color:' + color + ';">' + s + '</span>';
-}
-
-var stylesColors = ['white', 'black', 'blue', 'cyan', 'green', 'magenta', 'red', 'yellow'];
-var stylesAll = stylesColors.concat(['bold', 'italic', 'underline', 'inverse', 'rainbow']);
-
-colors.mode = 'console';
-assert.equal(s.bold, '\x1B[1m' + s + '\x1B[22m');
-assert.equal(s.italic, '\x1B[3m' + s + '\x1B[23m');
-assert.equal(s.underline, '\x1B[4m' + s + '\x1B[24m');
-assert.equal(s.strikethrough, '\x1B[9m' + s + '\x1B[29m');
-assert.equal(s.inverse, '\x1B[7m' + s + '\x1B[27m');
-
-assert.ok(s.rainbow);
-
-aE(s, 'white', 37);
-aE(s, 'grey', 90);
-aE(s, 'black', 30);
-aE(s, 'blue', 34);
-aE(s, 'cyan', 36);
-aE(s, 'green', 32);
-aE(s, 'magenta', 35);
-aE(s, 'red', 31);
-aE(s, 'yellow', 33);
-
-assert.equal(s, 'string');
-
-colors.setTheme({error:'red'});
-
-assert.equal(typeof("astring".red),'string');
-assert.equal(typeof("astring".error),'string');
-

package/tests/safe-test.js

@@ -1,45 +0,0 @@
-var assert = require('assert'),
-    colors = require('../safe');
-
-var s = 'string';
-
-function a(s, code) {
-  return '\x1B[' + code.toString() + 'm' + s + '\x1B[39m';
-}
-
-function aE(s, color, code) {
-  assert.equal(colors[color](s), a(s, code));
-  assert.equal(colors.strip(s), s);
-}
-
-function h(s, color) {
-  return '<span style="color:' + color + ';">' + s + '</span>';
-}
-
-var stylesColors = ['white', 'black', 'blue', 'cyan', 'green', 'magenta', 'red', 'yellow'];
-var stylesAll = stylesColors.concat(['bold', 'italic', 'underline', 'inverse', 'rainbow']);
-
-colors.mode = 'console';
-assert.equal(colors.bold(s), '\x1B[1m' + s + '\x1B[22m');
-assert.equal(colors.italic(s), '\x1B[3m' + s + '\x1B[23m');
-assert.equal(colors.underline(s), '\x1B[4m' + s + '\x1B[24m');
-assert.equal(colors.strikethrough(s), '\x1B[9m' + s + '\x1B[29m');
-assert.equal(colors.inverse(s), '\x1B[7m' + s + '\x1B[27m');
-
-assert.ok(colors.rainbow);
-
-aE(s, 'white', 37);
-aE(s, 'grey', 90);
-aE(s, 'black', 30);
-aE(s, 'blue', 34);
-aE(s, 'cyan', 36);
-aE(s, 'green', 32);
-aE(s, 'magenta', 35);
-aE(s, 'red', 31);
-aE(s, 'yellow', 33);
-
-assert.equal(s, 'string');
-colors.setTheme({error:'red'});
-
-assert.equal(typeof(colors.red("astring")), 'string');
-assert.equal(typeof(colors.error("astring")), 'string');