[console] Add allow_failure flag. (#152)

hechoendrupal · Apr 10, 2017 · 8986c38 · 8986c38
1 parent 3895bd3
commit 8986c38
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 11 deletions.
diff --git a/src/Command/Chain/ChainCommand.php b/src/Command/Chain/ChainCommand.php
@@ -24,6 +24,7 @@
 
 /**
  * Class ChainCommand
+ *
  * @package Drupal\Console\Core\Command\Chain
  */
 class ChainCommand extends Command
@@ -43,6 +44,7 @@ class ChainCommand extends Command
 
     /**
      * ChainCommand constructor.
+     *
      * @param ChainQueue     $chainQueue
      * @param ChainDiscovery $chainDiscovery
      */
@@ -292,6 +294,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $commands = $configData['commands'];
         }
 
+        $parameterOptions = $input->getOptions();
+        unset($parameterOptions['file']);
+
         foreach ($commands as $command) {
             $moduleInputs = [];
             $arguments = !empty($command['arguments']) ? $command['arguments'] : [];
@@ -305,11 +310,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $moduleInputs['--'.$key] = is_null($value) ? '' : $value;
             }
 
-            $parameterOptions = $input->getOptions();
-            unset($parameterOptions['file']);
-            foreach ($parameterOptions as $key => $value) {
-                if ($value===true) {
-                    $moduleInputs['--' . $key] = true;
+            foreach ($this->getApplication()->getDefinition()->getOptions() as $option) {
+                $optionName = $option->getName();
+                if (array_key_exists($optionName, $parameterOptions)) {
+                    $optionValue = $parameterOptions[$optionName];
+                    if ($optionValue) {
+                        $moduleInputs['--' . $optionName] = $optionValue;
+                    }
                 }
             }
 
@@ -320,13 +327,23 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 continue;
             }
 
+            $io->text($command['command']);
+            $io->newLine();
+
             $input = new ArrayInput($moduleInputs);
             if (!is_null($interactive)) {
-              $input->setInteractive($interactive);
+                $input->setInteractive($interactive);
             }
 
-            $io->text($command['command']);
-            $callCommand->run($input, $io);
+            $allowFailure = array_key_exists('allow_failure', $command)?$command['allow_failure']:false;
+            try {
+                $callCommand->run($input, $io);
+            } catch (\Exception $e) {
+                if (!$allowFailure) {
+                    $io->error($e->getMessage());
+                    return 1;
+                }
+            }
         }
 
         return 0;

diff --git a/src/EventSubscriber/CallCommandListener.php b/src/EventSubscriber/CallCommandListener.php
@@ -17,6 +17,7 @@
 
 /**
  * Class CallCommandListener
+ *
  * @package Drupal\Console\Core\EventSubscriber
  */
 class CallCommandListener implements EventSubscriberInterface
@@ -28,6 +29,7 @@ class CallCommandListener implements EventSubscriberInterface
 
     /**
      * CallCommandListener constructor.
+     *
      * @param ChainQueue $chainQueue
      */
     public function __construct(ChainQueue $chainQueue)
@@ -46,14 +48,14 @@ public function callCommands(ConsoleTerminateEvent $event)
         $io = new DrupalStyle($event->getInput(), $event->getOutput());
 
         if (!$command instanceof Command) {
-            return;
+            return 0;
         }
 
         $application = $command->getApplication();
         $commands = $this->chainQueue->getCommands();
 
         if (!$commands) {
-            return;
+            return 0;
         }
 
         foreach ($commands as $chainedCommand) {
@@ -69,7 +71,15 @@ public function callCommands(ConsoleTerminateEvent $event)
             }
 
             $io->text($chainedCommand['name']);
-            $callCommand->run($input, $io);
+            $allowFailure = array_key_exists('allow_failure', $chainedCommand)?$chainedCommand['allow_failure']:false;
+            try {
+                $callCommand->run($input, $io);
+            } catch (\Exception $e) {
+                if (!$allowFailure) {
+                    $io->error($e->getMessage());
+                    return 1;
+                }
+            }
         }
     }