Changeset 516 for Dev/trunk/node_modules/grunt/lib/util/task.js

Timestamp:

03/14/14 12:36:58 (11 years ago)

Author:

hendrikvanantwerpen

Message:

Enable deployment with Grunt.

Location:

Dev/trunk

Files:

• . (modified) (1 prop)
• node_modules/grunt/lib/util/task.js (modified) (6 diffs)

Dev/trunk

@@ -1 +1 @@
 build
-quod-erat.git

@@ -1 +1 @@
 build
-quod-erat.git

Dev/trunk/node_modules/grunt/lib/util/task.js

@@ -3 +3 @@
  * http://gruntjs.com/
  *
- * Copyright (c) 2013 "Cowboy" Ben Alman
+ * Copyright (c) 2014 "Cowboy" Ben Alman
  * Licensed under the MIT license.
  * https://github.com/gruntjs/grunt/blob/master/LICENSE-MIT
@@ -90 +90 @@
   // easier to implement than some kind of in-task "super" functionality.
   Task.prototype.renameTask = function(oldname, newname) {
+    if (!this._tasks[oldname]) {
+      throw new Error('Cannot rename missing "' + oldname + '" task.');
+    }
     // Rename task.
     this._tasks[newname] = this._tasks[oldname];
@@ -186 +189 @@
 
   // Run a task function, handling this.async / return value.
-  Task.prototype.runTaskFn = function(context, fn, done) {
+  Task.prototype.runTaskFn = function(context, fn, done, asyncDone) {
     // Async flag.
     var async = false;
@@ -213 +216 @@
         this._options.error.call({name: context.name, nameArgs: context.nameArgs}, err);
       }
-      done(err, success);
+      // only call done async if explicitly requested to
+      // see: https://github.com/gruntjs/grunt/pull/1026
+      if (asyncDone) {
+        process.nextTick(function () {
+          done(err, success);
+        });
+      } else {
+        done(err, success);
+      }
     }.bind(this);
 
@@ -244 +255 @@
 
   // Begin task queue processing. Ie. run all tasks.
-  Task.prototype.start = function() {
+  Task.prototype.start = function(opts) {
+    if (!opts) {
+      opts = {};
+    }
     // Abort if already running.
     if (this._running) { return false; }
@@ -281 +295 @@
       this.runTaskFn(context, function() {
         return thing.task.fn.apply(this, this.args);
-      }, nextTask);
+      }, nextTask, !!opts.asyncDone);
 
     }.bind(this);

@@ -1 +1 @@
 build
-quod-erat.git