(api) watch mode can take arguments, fixed a couple edge cases

Author: cloudhead

bin/vows

@@ -119,7 +119,7 @@ if (options.watch) {
 msg('bin', 'argv', args);
 msg('bin', 'options', { reporter: options.reporter.name, matcher: options.matcher });
 
-if (args.length === 0) {
+if (args.length === 0 || options.watch) {
     msg('bin', 'discovering', 'folder structure');
     root = fs.readdirSync('.');
 
@@ -132,7 +132,14 @@ if (args.length === 0) {
     }
     msg('bin', 'discovered', "./" + testFolder);
 
-    args = paths(testFolder);
+    if (args.length === 0) {
+        args = paths(testFolder);
+
+        if (options.watch) {
+            args = args.concat(paths('lib'),
+                               paths('src'));
+        }
+    }
 }
 
 if (! options.watch) {
@@ -171,7 +178,6 @@ if (! options.watch) {
         });
     });
 } else {
-    msg('watcher', 'watching files in', process.cwd() + '/');
     //
     // Watch mode
     //
@@ -229,7 +235,7 @@ if (! options.watch) {
         function cursorRestore() { esc("0G") }
         function cursorHide()    { esc("?25l") }
         function cursorShow()    { esc("?25h") }
-        function cleanup()       { eraseLine(), cursorShow(), print('\n') }
+        function cleanup()       { eraseLine(), cursorShow(), clearInterval(timer), print('\n') }
 
         //
         // Called when a file has been modified.
@@ -238,10 +244,10 @@ if (! options.watch) {
         function changed(file) {
             status = { honored: 0, broken: 0, errored: 0, pending: 0 };
 
-            msg('watcher', 'detected change in', file + '.js');
+            msg('watcher', 'detected change in', file);
 
-            file = (/-(test|spec)$/.test(file) ? path.join(testFolder, file)
-                                               : path.join(testFolder, file + '-' + testFolder)) + '.js';
+            file = (/-(test|spec)\.js$/.test(file) ? path.join(testFolder, file)
+                                                   : path.join(testFolder, file + '-' + testFolder));
 
             try {
                 fs.statSync(file);
@@ -268,16 +274,18 @@ if (! options.watch) {
             });
         }
 
+        msg('watcher', 'watching', args);
+
         //
-        // Watch all relevant files in lib/ and src/,
+        // Watch all relevant files,
         // and call `changed()` on change.
         //
-        [].concat(paths('lib'), paths('src'), paths(testFolder)).forEach(function (p) {
+        args.forEach(function (p) {
             fs.watchFile(p, function (current, previous) {
                 if (new(Date)(current.mtime).valueOf() ===
                     new(Date)(previous.mtime).valueOf()) { return }
                 else {
-                    changed(path.basename(p, '.js'));
+                    changed(p);
                 }
             });
         });
@@ -298,7 +306,7 @@ function runSuites(suites, callback) {
     (function run(suites, callback) {
         var suite = suites.shift();
         if (suite) {
-            msg('runner', "running", suite.subject + ' ', true);
+            msg('runner', "running", suite.subject + ' ', options.watch ? false : true);
             suite.run(options, function (result) {
                 Object.keys(result).forEach(function (k) {
                     results[k] += result[k];