Reverted to the latest tag

MIT-LICENSE.txt

@@ -0,0 +1,23 @@
+Original Library
+  - Copyright (c) Marak Squires
+
+Additional Functionality
+ - Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

ReadMe.md

@@ -1,8 +1,8 @@
-# colors.js [![Build Status](https://travis-ci.org/Marak/colors.js.svg?branch=master)](https://travis-ci.org/Marak/colors.js)
+# colors.js
 
 ## get color and style in your node.js console
 
-![Demo](https://raw.githubusercontent.com/Marak/colors.js/master/screenshots/colors.png)
+<img src="https://github.com/Marak/colors.js/raw/master/screenshots/colors.png"/>
 
 ## Installation
 
@@ -162,18 +162,6 @@ 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
-colors.setTheme({
-  link: ['underline', 'blue']
-});
-
-// outputs underlined blue text
-console.log(colors.info('Listening on ') + colors.link('http://0.0.0.0:' + port)  );
 ```
 
 *Protip: There is a secret undocumented style in `colors`. If you find the style you can summon him.*

lib/colors.js

@@ -48,10 +48,6 @@ colors.stripColors = colors.strip = function(str){
 
 
 var stylize = colors.stylize = function stylize (str, style) {
-  if (!colors.enabled) {
-    return str+'';
-  }
-
   return ansiStyles[style].open + str + ansiStyles[style].close;
 }
 
@@ -119,13 +115,6 @@ 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)

lib/extendStringPrototype.js

@@ -1,4 +1,5 @@
-var colors = require('./colors');
+var colors = require('./colors'),
+    styles = require('./styles');
 
 module['exports'] = function () {
 
@@ -17,6 +18,10 @@ module['exports'] = function () {
       }
   };
 
+  var stylize = function stylize (str, style) {
+    return styles[style].open + str + styles[style].close;
+  }
+
   addProperty('strip', function () {
     return colors.strip(this);
   });
@@ -55,7 +60,7 @@ module['exports'] = function () {
   var x = Object.keys(colors.styles);
   x.forEach(function (style) {
     addProperty(style, function () {
-      return colors.stylize(this, style);
+      return stylize(this, style);
     });
   });
 

lib/index.js

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

package.json

@@ -17,12 +17,5 @@
     "engines": {
         "node": ">=0.1.90"
     },
-    "main": "lib",
+    "main": "./lib/index"
-    "files": [
-        "examples",
-        "lib",
-        "LICENSE",
-        "safe.js",
-        "themes"
-    ]
 }