nicer output for browser & launch commands

lib/browser.js

@@ -30,6 +30,8 @@ var errorTemplate = nodeTemplate('browser-error');
 var errorNoStackTemplate = nodeTemplate('browser-error-no-stack');
 var consoleTemplate = nodeTemplate('browser-console');
 var testTemplate = nodeTemplate('browser-test');
+var instructionsTemplate = nodeTemplate('browser-instructions');
+
 var onSourceCodeChange = require("pubsub")();
 var customFrameURL, matchURL, read;
 
@@ -108,7 +110,9 @@ function start (files, command) {
 
   });
 
-  debug('Visit %s%s:%s with a browser to start running the tests.', 'http://', command.host, command.port);
+  //var grep = command.grep ? '/#grep:' + command.grep : '';
+  //debug('Visit %s%s:%s%s with a browser to start running the tests.', 'http://', command.host, command.port, grep);
+  outputInstructions(command);
 
   function onMessage (msg) {
     msg = JSON.parse(msg.data);
@@ -293,6 +297,20 @@ function outputResult (msg) {
   console.log(formatText(template, msg.result) + '  ' + formatUserAgent(msg.userAgent));
 }
 
+function outputInstructions (command) {
+  var params = '';
+
+  if (command.grep) {
+    params = '/#grep:' + command.grep;
+  }
+
+  console.log(formatText(instructionsTemplate, {
+    host: command.host,
+    port: command.port,
+    params: params
+  }));
+}
+
 function formatUserAgent (rawUserAgent) {
   var userAgent = parseUserAgent(rawUserAgent);
 

lib/launch.js

@@ -1,15 +1,17 @@
 var debug = require("local-debug")('launch');
 var launcher = require("browser-launcher");
 var style = require("style-format");
+var template = require("./node-template")('browser-launch');
+var format = require("format-text");
 
 module.exports = launch;
 module.exports.list = list;
 
 function list () {
   launcher.detect(function (avail) {
-    console.log(style('\n  {bold}Available Browsers:{reset} %s\n'), avail.map(function (b) {
-      return b.name + ' v' + b.version;
-    }).join(', '));
+    console.log(style('\n  {cyan}Available Browsers:\n{reset} ' + avail.map(function (b) {
+      return '\n  ' + b.name + ' {grey}v' + b.version + '{reset}';
+    }).join('')) + '\n');
   });
 }
 
@@ -28,7 +30,11 @@ function launch (url, options) {
       if (options.headless) extras += ' headlessly';
       if (options.proxy) extras += ' through ' + options.proxy;
 
-      debug('Launched %s to visit %s%s.', options.browser, url, extras);
+      console.log(format(template, {
+        app: options.browser,
+        url: url,
+        extras: extras
+      }));
     });
   });
 }

templates/layout.html

@@ -12,7 +12,7 @@
 
 <div class="navigation">
   <div class="buttons">
-    <a class="run-again pointer">Run Again</a>
+    <a class="run-again pointer">Repeat</a>
     <a class="conn" class="pointer">{conn}</a>
     <a class="maximize pointer">Maximize Frame</a>
     <a class="minimize pointer">Minimize Frame</a>

templates/node-browser-instructions.txt

@@ -0,0 +1,2 @@
+{reset}
+  {cyan}Visit {reset}{bold}http://{host}:{port}{params}{grey} to run the tests

templates/node-browser-launch.txt

@@ -0,0 +1 @@
+{reset}  {grey}Launching {reset}{bold}{app} {grey}to run the tests{extras}