Changeset 516 for Dev/trunk/node_modules/grunt-exec/tasks/exec.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-exec/tasks/exec.js (modified) (4 diffs)

Dev/trunk

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

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

Dev/trunk/node_modules/grunt-exec/tasks/exec.js

@@ -18 +18 @@
       , stderr = data.stderr !== undefined ? data.stderr : true
       , callback = _.isFunction(data.callback) ? data.callback : function() {}
-      , exitCode = data.exitCode || 0
+      , exitCodes = data.exitCode || data.exitCodes || 0
       , command
       , childProcess
@@ -24 +24 @@
       , done = this.async();
 
+    // https://github.com/jharding/grunt-exec/pull/30
+    exitCodes = _.isArray(exitCodes) ? exitCodes : [exitCodes];
+
     // allow for command to be specified in either
-    // 'command' or 'cmd' property
-    command = data.command || data.cmd;
+    // 'command' or 'cmd' property, or as a string.
+    command = data.command || data.cmd || (_.isString(data) && data);
 
     data.cwd && (execOptions.cwd = data.cwd);
@@ -46 +49 @@
 
     verbose.subhead(command);
-    verbose.writeln(f('Expecting exit code %d', exitCode));
+    verbose.writeln(f('Expecting exit code %s', exitCodes.join(' or ')));
 
     childProcess = cp.exec(command, execOptions, callback);
@@ -54 +57 @@
 
     childProcess.on('exit', function(code) {
-      if (code !== exitCode) {
+      if (exitCodes.indexOf(code) < 0) {
         log.error(f('Exited with code: %d.', code));
         return done(false);

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