ability to reset batch/suite

lib/vows/suite.js

@@ -1,27 +1,40 @@
 var events = require('events'),
     path = require('path');
 
-var vows = require(path.join(__dirname, '..', 'vows'));
+require.paths.unshift(path.join(__dirname, '..'));
+
+var vows = require('vows');
 var Context = require('vows/context').Context;
 var tryEnd = vows.tryEnd;
 
-this.Suite = function () {
-    this.results = {
-        honored: 0,
-        broken:  0,
-        errored: 0,
-        total:   0,
-        time:  null
-    };
+this.Suite = function (subject) {
+    this.subject = subject;
     this.batches = [];
+    this.reset();
 };
 
 this.Suite.prototype = new(function () {
+    this.reset = function () {
+        this.results = {
+            honored: 0,
+            broken:  0,
+            errored: 0,
+            total:   0,
+            time:  null
+        };
+        this.batches.forEach(function (b) {
+            b.lastContext = null;
+            b.remaining = b._remaining;
+            b.honored = b.broken = b.errored = b.total = 0;
+        });
+    };
+
     this.addVows = function (tests) {
         var batch = {
             tests: tests,
             suite:  this,
             remaining: 0,
+           _remaining: 0,
             honored:   0,
             broken:    0,
             errored:   0,
@@ -55,6 +68,7 @@ this.Suite.prototype = new(function () {
                 return match;
             })(tests);
         }
+        batch._remaining = batch.remaining;
 
         return this;
     };
@@ -189,6 +203,7 @@ this.Suite.prototype = new(function () {
                 process.stdout.addListener('drain', function () {
                     process.exit(that.results.broken || that.results.errored ? 1 : 0);
                 });
+                that.reset();
             }
         })(this.batches.slice(0));
     };