Fixes #1589: @executeInDrupalVm not respected during invokeCommand. (#…

…1595)

* Fixes #1589: @executeInDrupalVm not respected during invokeCommand.

* Making invokeCommand() trigger Command Events.

src/Robo/Application.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Acquia\Blt\Robo;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Application as ConsoleApplication;
+
+/**
+ * Class Application
+ * @package Acquia\Blt\Robo
+ */
+class Application extends ConsoleApplication {
+
+  /**
+   * @param \Symfony\Component\Console\Command\Command $command
+   * @param \Symfony\Component\Console\Input\InputInterface $input
+   * @param \Symfony\Component\Console\Output\OutputInterface $output
+   *
+   * @return int
+   *   The exit code.
+   */
+  public function runCommand(Command $command, InputInterface $input, OutputInterface $output) {
+    return $this->doRunCommand($command, $input, $output);
+  }
+
+}

src/Robo/Blt.php

@@ -20,7 +20,6 @@
 use Robo\Config\Config;
 use Robo\Robo;
 use Robo\Runner as RoboRunner;
-use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -224,7 +223,8 @@ public function configureContainer($container) {
    *   The exiting status code of the application
    */
   public function run(InputInterface $input, OutputInterface $output) {
-    $status_code = $this->runner->run($input, $output, NULL, $this->commands);
+    $application = $this->getContainer()->get('application');
+    $status_code = $this->runner->run($input, $output, $application, $this->commands);
 
     return $status_code;
   }

src/Robo/BltTasks.php

@@ -93,16 +93,17 @@ protected function invokeCommand($command_name, array $args = []) {
       return 0;
     }
 
-    /** @var \Robo\Application $application */
+    /** @var \Acquia\Blt\Robo\Application $application */
     $application = $this->getContainer()->get('application');
     $command = $application->find($command_name);
+
     $input = new ArrayInput($args);
     $prefix = str_repeat(">", $this->invokeDepth);
     $this->output->writeln("<comment>$prefix $command_name</comment>");
-    $returnCode = $command->run($input, $this->output());
+    $return_code = $application->runCommand($command, $input, $this->output());
     $this->invokeDepth--;
 
-    return $returnCode;
+    return $return_code;
   }
 
   /**

src/Robo/Hooks/CommandEventHook.php

@@ -36,6 +36,7 @@ public function executeInDrupalVm(ConsoleCommandEvent $event) {
     if (method_exists($command, 'getAnnotationData')) {
       /* @var \Consolidation\AnnotatedCommand\AnnotationData */
       $annotation_data = $event->getCommand()->getAnnotationData();
+      $this->warnIfDrupalVmNotRunning();
       if ($annotation_data->has('executeInDrupalVm') && $this->shouldExecuteInDrupalVm()) {
         $event->disableCommand();
         $args = $this->getCliArgs();
@@ -95,4 +96,13 @@ protected function shouldExecuteInDrupalVm() {
       && !$this->getInspector()->isVmCli();
   }
 
+  /**
+   * Emits a warning if Drupal VM is initialized but not running.
+   */
+  protected function warnIfDrupalVmNotRunning() {
+    if ($this->getInspector()->isDrupalVmLocallyInitialized() && !$this->getInspector()->isDrupalVmBooted()) {
+      $this->logger->warning("Drupal VM is locally initialized, but it not running.");
+    }
+  }
+
 }