Fixes #1328: Spaces in project paths break BLT. (#1426)

* Fixes #1328: Spaces in project paths break BLT.

* A few more fixes.

Author: grasmash

phing/tasks/properties.xml

@@ -39,7 +39,7 @@
       <exec dir="${repo.root}" command="echo '0' >> ${blt.config-files.schema-version}" checkreturn="true" logoutput="true" passthru="false" level="${blt.exec_level}"/>
     </then>
   </if>
-  <exec dir="${repo.root}" command="cat ${blt.config-files.schema-version}" outputProperty="blt.schema-version" checkreturn="true" logoutput="false" level="${blt.exec_level}"/>
+  <exec dir="${repo.root}" command="cat '${blt.config-files.schema-version}'" outputProperty="blt.schema-version" checkreturn="true" logoutput="false" level="${blt.exec_level}"/>
   <!-- Send errors to /dev/null, for environments like ACE without composer. -->
   <exec dir="${repo.root}" command="composer info acquia/blt --no-ansi 2> /dev/null | grep versions | awk '{print $4}'" outputProperty="blt.version" logoutput="false" checkreturn="true" level="${blt.exec_level}" />
 

src/Robo/Commands/Blt/DoctorCommand.php

@@ -68,12 +68,11 @@ protected function executeDoctorInsideVm() {
    *   The command result.
    */
   protected function executeDoctorOnHost($alias) {
-    $include_dir = $this->getConfigValue('blt.root') . '/drush';
     $result = $this->taskDrush()
       ->drush("blt-doctor")
       ->alias($alias)
       ->uri("")
-      ->includePath($include_dir)
+      ->includePath($this->getConfigValue('blt.root') . '/drush')
       ->run();
 
     return $result;

src/Robo/Commands/Tests/BehatCommand.php

@@ -171,7 +171,7 @@ protected function launchPhantomJs() {
     }
     $this->killPhantomJs();
     $this->say("Launching PhantomJS GhostDriver.");
-    $this->taskExec("{$this->getConfigValue('composer.bin')}/phantomjs")
+    $this->taskExec("'{$this->getConfigValue('composer.bin')}/phantomjs'")
       ->option("webdriver", 4444)
       ->setVerbosityThreshold(VerbosityThresholdInterface::VERBOSITY_VERBOSE)
       ->background()

src/Robo/Common/Executor.php

@@ -80,7 +80,7 @@ public function drush($command) {
     if (!empty($drush_alias)) {
       $drush_alias = "@$drush_alias";
     }
-    $process_executor = Robo::process(new Process("$bin/drush $drush_alias $command"));
+    $process_executor = Robo::process(new Process("'$bin/drush' $drush_alias $command"));
     return $process_executor->dir($this->getConfigValue('docroot'))
       ->interactive(FALSE)
       ->printOutput(FALSE)

src/Robo/Tasks/DrushTask.php

@@ -200,7 +200,13 @@ public function includePath($path) {
    * Sets up drush defaults using config.
    */
   protected function init() {
-    $this->executable = $this->getConfig()->get('drush.bin') ?: 'drush';
+    if ($this->getConfig()->get('drush.bin')) {
+      $this->executable = str_replace(' ', '\\ ', $this->getConfig()->get('drush.bin'));
+    }
+    else {
+      $this->executable = 'drush';
+    }
+
     if (!isset($this->dir)) {
       $this->dir($this->getConfig()->get('drush.dir'));
     }

template/drush.wrapper

@@ -28,13 +28,13 @@
 # `../vendor/bin/drush.launcher --local $@` is a common variant for
 # composer-managed Drupal sites.
 #
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd "`dirname $0`"
 
-if [ ! -f ${DIR}/vendor/drush/drush/drush.launcher ]; then
+if [ ! -f "${DIR}/vendor/drush/drush/drush.launcher" ]; then
   echo >&2 "Drush was not found in this project's vendor directory. You can install it by typing:"
   echo >&2 "composer install"
   exit 1
 fi
 
-vendor/drush/drush/drush.launcher --config=${DIR}/drush/drushrc.php --alias-path=${DIR}/drush/site-aliases "$@"
+vendor/drush/drush/drush.launcher --config="${DIR}/drush/drushrc.php" --alias-path="${DIR}/drush/site-aliases" "$@"