Changing the fallback Drush path to use the system path to avoid a compatibility break. Ensuring the example and test Gruntconfig.json use the local installed copy of Drush.

Author: Joe Turgeon

CONFIG.md

@@ -231,7 +231,8 @@ This is an example of the settings for Drush tasks:
 ```
 
 **drush.cmd**: The path to the Drush executable that should be used for all
-Drush operations.
+Drush operations. If none is specified, the Drush executable found in the
+default PATH will be used.
 
 **drush.make.args**: An array of arguments to pass to Drush for the make
 operation.

tasks/drush.js

@@ -9,8 +9,10 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-drush');
   grunt.loadNpmTasks('grunt-newer');
 
-  // Provide a default path for drush.
-  var cmd = grunt.config('config.drush.cmd') || process.cwd() + '/bin/drush';
+  var _ = require('lodash');
+
+  // If no path is configured for Drush, fallback to the system path.
+  var cmd = grunt.config('config.drush.cmd') !== undefined ? {cmd: grunt.config('config.drush.cmd')} : {};
 
   // Allow extra arguments for drush to be supplied.
   var args = ['make', '<%= config.srcPaths.make %>', '<%= config.buildPaths.temp %>'],
@@ -25,23 +27,19 @@ module.exports = function(grunt) {
   grunt.config('drush', {
     make: {
       args: args,
-      options: {
-        cmd: cmd
-      }
+      options: _.extend({}, cmd)
     },
     liteinstall: {
       args: ['site-install', '-y', 'standard', '--db-url=sqlite://drupal:[email protected]'],
-      options: {
-        cmd: cmd,
+      options: _.extend({
         cwd: '<%= config.buildPaths.html %>'
-      }
+      }, cmd)
     },
     runserver: {
       args: ['runserver', '8080'],
-      options: {
-        cmd: cmd,
+      options: _.extend({
         cwd: '<%= config.buildPaths.html %>'
-      }
+      }, cmd)
     }
   });
 

test/test_assets/Gruntconfig.json

@@ -24,6 +24,7 @@
     "path": "bin/phpmd"
   },
   "drush": {
+    "cmd": "bin/drush",
     "make": {
       "args": ["--concurrency=16"]
     }