pass the test-suite promises to tryFinish()

lib/vows.js

@@ -127,7 +127,7 @@ function addVow(/* description & callback */) {
             puts(title);
             if (exception) puts(exception);
         }
-        tryFinish(vows.remaining);
+        tryFinish(vows.remaining, vow.promise);
     }
 };
 
@@ -226,7 +226,8 @@ function addVows(tests) {
                         callback: ctx.tests[item],
                         context: ctx.name,
                         description: item,
-                        binding: ctx.env
+                        binding: ctx.env,
+                        promise: promise
                     });
                     env = Object.create(ctx.env);
 
@@ -253,7 +254,7 @@ function addVows(tests) {
                     }
                 });
                 // Check if we're done running the tests
-                tryFinish(--vows.remaining);
+                tryFinish(--vows.remaining, promise);
             // This is our initial, empty context
             })(new(Context)({ callback: tests, context: null, description: null }, {}));
         }
@@ -263,35 +264,51 @@ function addVows(tests) {
 
 function puts() {
     var args = Array.prototype.slice.call(arguments);
-    if (vows.promises[vows.promises.length - 1].listeners('end').length > 0) {
+    if (vows.promises[suites - 1].listeners('finish').length > 0) {
         buffer.push(args.join('\n'));
     } else {
-        sys.puts.apply(null, args);
+      sys.puts.apply(null, args);
     }
 }
 
-function tryFinish(remaining) {
+//
+// Checks if all the required tests have been run,
+// and either triggers the next test suite, if any,
+// or exits the process.
+//
+function tryFinish(remaining, promise) {
+    var result, style;
+
     // Output results once all the vows have been checked
     if (honored + broken + errored === total && remaining === 0) {
-        var result = honored + " honored, " +
-                     broken  + " broken, "  +
-                     errored + " errored",
-
-        style = honored === total ?
-            ('green') : (errored === 0 ? 'yellow' : 'red');
+        result = honored + " honored, " +
+                 broken  + " broken, "  +
+                 errored + " errored",
+        style  = honored === total ? ('green')
+                                   : (errored === 0 ? 'yellow' : 'red');
+
+        // If this isn't the last test suite in the chain,
+        // emit 'end', to trigger the next test suite.
+        if (promise.listeners('end').length > 0) {
+            promise.emit('end', honored, broken, errored);
+        } else {
+            if (!vows.options.brief) {
+                puts("\nVerified " + total + " vows in " +
+                     (((new(Date)) - start) / 1000) + " seconds.");
+                puts("\n" + stylize(result, style));
+            }
 
-        if (!vows.options.brief) {
-            puts("\nVerified " + total + " vows in " +
-                 (((new(Date)) - start) / 1000) + " seconds.");
-            puts("\n" + stylize(result, style));
-        }
+            // The 'finish' event is triggered once all the tests have been run.
+            // It's used by bin/vows
+            vows.promises[suites - 1].emit("finish", honored, broken, errored);
 
-        vows.promises[vows.promises.length - 1].emit("end", honored, broken, errored);
-        if (broken || errored) { sys.puts(buffer.join('\n') + '\n') }
+            if ((broken || errored) && buffer.length) { sys.puts(buffer.join('\n') + '\n') }
 
-        process.stdout.addListener('drain', function () {
-            process.exit(broken || errored ? 1 : 0);
-        });
+            // Don't exit until stdout is empty
+            process.stdout.addListener('drain', function () {
+                process.exit(broken || errored ? 1 : 0);
+            });
+        }
     }
 }