Merge pull request #1 from sgarza/master

string.color was returning undefined

diff --git a/CHANGELOG b/CHANGELOG
index 0a2c8a5428f5c4f03983ca7e20e5ec1324a94635..ff007d7d3d65c1e8f34d969e6647f6cb5e40b0bc 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+2015-01-09 Sergio de la Garza <sergio@delagarza.io>
+
+       Version 1.1.1
+
+       * lib/cobalt.js (dependencies): require colors fix the log output when
+       using the tocken formatter.
+
+       
 2014-03-20 Ben Beltran <ben@nsovocal.com>
 
        Version 1.0.0

diff --git a/lib/cobalt.js b/lib/cobalt.js
index 4c6944d2617a64b9a009cf8748f19325f73c0cf7..b5dd94cb7be3dfe5e59c96eb553b28df4cb78099 100644 (file)
--- a/lib/cobalt.js
+++ b/lib/cobalt.js
@@ -1,6 +1,7 @@
 // Load up dependencies
 if (typeof require === 'function') {
   require('neon');
+  var colors = require('colors');
   var Microtime = require('microtime');
 }
 

diff --git a/package.json b/package.json
index 74a68c3e362e8f0d19acb5f281c1edb8c5534fe6..b7d17d8cb24dffa5c7094d6c5641b136518dcb56 100644 (file)
--- a/package.json
+++ b/package.json
@@ -1,33 +1,35 @@
 {
-  "name" : "cobalt-log",
-  "description" : "Logger + multiplexer for JSON based logs, based on Cobalt ruby gem by ktlacaelel (http://rubygems.org/gems/cobalt)",
-  "author" : {
-    "name"  : "Ben Beltran",
-    "email" : "ben@nsovocal.com",
-    "url" : "http://nsovocal.com"
+  "name": "cobalt-log",
+  "description": "Logger + multiplexer for JSON based logs, based on Cobalt ruby gem by ktlacaelel (http://rubygems.org/gems/cobalt)",
+  "author": {
+    "name": "Ben Beltran",
+    "email": "ben@nsovocal.com",
+    "url": "http://nsovocal.com"
   },
-  "repository" : {
-    "type" : "git",
-    "url" : "https://github.com/benbeltran/cobalt.git"
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/benbeltran/cobalt.git"
   },
-  "contributors" : [
+  "contributors": [
     {
-      "name" : "Kazuyoshi Tlacaelel",
-      "email" : "kazu.dev@gmail.com",
-      "url" : "http://github.com/ktlacaelel"
+      "name": "Kazuyoshi Tlacaelel",
+      "email": "kazu.dev@gmail.com",
+      "url": "http://github.com/ktlacaelel"
     }
   ],
-  "version" : "1.1.0",
-  "dependencies" : {
-    "neon" : "2.0.x",
-    "socket.io-client" : "0.9.x",
-    "colors" : "0.x.x",
-    "emailjs" : "0.3.x",
-    "microtime" : "0.3.x"
+  "version": "1.1.2",
+  "dependencies": {
+    "colors": "^1.0.3",
+    "emailjs": "^0.3.12",
+    "microtime": "^1.2.0",
+    "neon": "^2.0.0",
+    "socket.io-client": "^1.2.1"
   },
-  "devDependencies" : {
-    "tellurium" : "2.0.x"
+  "devDependencies": {
+    "tellurium": "2.0.x"
   },
-  "engines" : { "node" : ">= 0.8.0" },
-  "main" : "./lib/cobalt.js"
+  "engines": {
+    "node": ">= 0.8.0"
+  },
+  "main": "./lib/cobalt.js"
 }