add support for settling functions - ref gulpjs/gulp#871

gulpjs · Mar 14, 2015 · 84dd7aa · 84dd7aa
1 parent 44d8afe
commit 84dd7aa
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 3 deletions.
diff --git a/index.js b/index.js
@@ -24,6 +24,8 @@ function Undertaker(Registry){
 
   this._registry = new Registry();
 
+  this._settle = (process.argv.indexOf('--undertaker-settle') !== -1);
+
   validateRegistry(this._registry);
 
   this._lastRuns = {};

diff --git a/lib/parallel.js b/lib/parallel.js
@@ -9,9 +9,12 @@ var createExtensions = require('./helpers/createExtensions');
 
 function parallel(){
   /* jshint validthis: true */
+
+  var create = this._settle ? bach.settleParallel : bach.parallel;
+
   var args = normalizeArgs(this._registry, arguments);
   var extensions = createExtensions(this);
-  var fn = bach.parallel(args, extensions);
+  var fn = create(args, extensions);
   metadata.set(fn, {
     name: 'parallel',
     tree: {

diff --git a/lib/series.js b/lib/series.js
@@ -9,9 +9,12 @@ var createExtensions = require('./helpers/createExtensions');
 
 function series(){
   /* jshint validthis: true */
+
+  var create = this._settle ? bach.settleSeries : bach.series;
+
   var args = normalizeArgs(this._registry, arguments);
   var extensions = createExtensions(this);
-  var fn = bach.series(args, extensions);
+  var fn = create(args, extensions);
   metadata.set(fn, {
     name: 'series',
     tree: {

diff --git a/test/integration.js b/test/integration.js
@@ -90,7 +90,7 @@ describe('integrations', function() {
     var count = 0;
 
     taker.task('clean', aOnce(function(cb) {
-      console.log(cb());
+      cb();
       count++;
       del(['./fixtures/some-build.txt'], {cwd: __dirname}, cb);
     }));

diff --git a/test/parallel.js b/test/parallel.js
@@ -88,4 +88,13 @@ describe('parallel', function(){
     expect(unregistered).to.throw('Task never defined: unregistered');
     done();
   });
+
+  it('should process all functions if settle flag is true', function(done){
+    taker._settle = true;
+    taker.parallel('test1', 'error', 'test3')(function(err, results){
+      expect(err[0]).to.be.an.instanceof(Error);
+      expect(results).to.deep.equal([1, 3]);
+      done();
+    });
+  });
 });
diff --git a/test/series.js b/test/series.js
@@ -88,4 +88,13 @@ describe('series', function(){
     expect(unregistered).to.throw('Task never defined: unregistered');
     done();
   });
+
+  it('should process all functions if settle flag is true', function(done){
+    taker._settle = true;
+    taker.series('test1', 'error', 'test3')(function(err, results){
+      expect(err[0]).to.be.an.instanceof(Error);
+      expect(results).to.deep.equal([1, 3]);
+      done();
+    });
+  });
 });