feat(launcher): append capability tag for all output

Author: hankduan

lib/launcher.js

@@ -226,6 +226,7 @@ var TaskReporter_ = function(task, pid) {
   this.pid = pid;
   this.failedCount = 0;
   this.buffer = '';
+  this.insertTag = true;
 };
 
 /**
@@ -235,18 +236,9 @@ var TaskReporter_ = function(task, pid) {
 TaskReporter_.prototype.reportHeader_ = function() {
   var capability = this.task.capability;
   var eol = require('os').EOL;
-  var output = eol + '------------------------------------' + eol;
-  output += 'PID: ' + this.pid + ' (capability: ';
-  output += (capability.browserName) ?
-    capability.browserName : '';
-  output += (capability.version) ?
-    capability.version : '';
-  output += (capability.platform) ?
-    capability.platform : '';
-  output += (' #' + this.task.taskId);
-  output += ')' + eol;
+  var output = 'PID: ' + this.pid + eol;
   if (this.task.specs.length === 1) {
-    output += 'Specs: '+ this.task.specs.toString() + eol;
+    output += 'Specs: '+ this.task.specs.toString() + eol + eol;
   }
   this.log_(output);
 };
@@ -287,7 +279,10 @@ TaskReporter_.prototype.testsDone = function(failedCount) {
 TaskReporter_.prototype.flush = function() {
   if (this.buffer) {
     // Flush buffer if nonempty
+    var eol = require('os').EOL;
+    process.stdout.write(eol + '------------------------------------' + eol);
     process.stdout.write(this.buffer);
+    process.stdout.write(eol);
     this.buffer = '';
   }
 };
@@ -300,7 +295,30 @@ TaskReporter_.prototype.flush = function() {
  * @param {string} data 
  */
 TaskReporter_.prototype.log_ = function(data) {
-  this.buffer += data;
+  var tag = '[';
+  var capability = this.task.capability;
+  tag += (capability.browserName) ?
+    capability.browserName : '';
+  tag += (capability.version) ?
+    (' ' +  capability.version) : '';
+  tag += (capability.platform) ?
+    (' ' + capability.platform) : '';
+  tag += (' #' + this.task.taskId);
+  tag += '] ';
+
+
+  data = data.toString();
+  for ( var i = 0; i < data.length; i++ ) {
+    if (this.insertTag) {
+      this.insertTag = false;
+      this.buffer += tag;
+    }
+    if (data[i] === '\n') {
+      this.insertTag = true;
+      this.buffer += '\x1B[0m'; // Prevent color from leaking into next line
+    }
+    this.buffer += data[i];
+  }
 };
 
 exports.init = init;