Merge pull request #92 from stringparser/fix-log-formatting

contra · contra · commit 81a61ce1f509 · 2015-04-12T20:02:13.000-03:00
Fixes log formatting and tests logging
diff --git a/lib/log.js b/lib/log.js
@@ -3,8 +3,7 @@ var dateformat = require('dateformat');
 
 module.exports = function(){
   var time = '['+chalk.grey(dateformat(new Date(), 'HH:MM:ss'))+']';
-  var args = Array.prototype.slice.call(arguments);
-  args.unshift(time);
-  console.log.apply(console, args);
+  process.stdout.write(time + ' ');
+  console.log.apply(console, arguments);
   return this;
 };
diff --git a/test/log.js b/test/log.js
@@ -4,20 +4,47 @@ require('mocha');
 
 describe('log()', function(){
   it('should work i guess', function(done){
-    var writtenValue;
+    var count = 0;
+    var writtenValue = '';
 
     // Stub process.stdout.write
     var stdout_write = process.stdout.write;
     process.stdout.write = function(value) {
-      writtenValue = value;
+      writtenValue += value;
+      if(++count > 2){
+        // Restore process.stdout.write after test
+        process.stdout.write = stdout_write;
+      }
     };
 
     util.log(1, 2, 3, 4, 'five');
     var time = util.date(new Date(), 'HH:MM:ss');
-    writtenValue.should.eql('[' + util.colors.grey(time) + '] 1 2 3 4 five\n');
+    writtenValue.should.eql('[' + util.colors.grey(time) + '] 1 2 3 4 \'five\'\n');
+
+    done();
+  });
+
+  it('should accept formatting', function(done){
+    var count = 0;
+    var writtenValue = '';
+
+    // Stub process.stdout.write
+    var stdout_write = process.stdout.write;
+    process.stdout.write = function(value) {
+      writtenValue += value;
+      if(++count > 2){
+        // Restore process.stdout.write after test
+        process.stdout.write = stdout_write;
+      }
+    };
+
+    util.log('%s %d %j', 'something', 0.1, {key: 'value'});
+    var time = util.date(new Date(), 'HH:MM:ss');
+    writtenValue.should.eql(
+      '[' + util.colors.grey(time) + '] '+
+      'something 0.1 {\"key\":\"value\"}\n'
+    );
 
-    // Restore process.stdout.write
-    process.stdout.write = stdout_write;
     done();
   });
 });
