Merge pull request #23 from rplansky/bugfix/stop-on-error

Fixed dployer to stop on errors
leroy-merlin-br · Oct 7, 2015 · f23be2d · f23be2d
2 parents 91386e9 + d5b4ab4
commit f23be2d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/app/Dployer/Event/ScriptRunner.php b/app/Dployer/Event/ScriptRunner.php
@@ -128,13 +128,15 @@ protected function execute($script, OutputInterface $output)
             false
         );
 
-        $isForce      = ($this->stopOnError && false === $this->interactive);
-        $confirmAbort = ($this->interactive &&
-            false === $this->helper->ask($this->input, $output, $question)
-        );
+        if ($error) {
+            $stopOnError  = ($this->stopOnError && false === $this->interactive);
+            $confirmAbort = ($this->interactive &&
+                false === $this->helper->ask($this->input, $output, $question)
+            );
 
-        if ($error && ($isForce || $confirmAbort)) {
-            throw new ScriptErrorException();
+            if ($stopOnError || $confirmAbort) {
+                throw new ScriptErrorException();
+            }
         }
 
         return true;

diff --git a/app/bootstrap.php b/app/bootstrap.php
@@ -10,7 +10,7 @@
 
 // Bind the Symfony Console application
 $app->bind('console', function () {
-    return new Symfony\Component\Console\Application('Dployment', '0.1 BETA');
+    return new Symfony\Component\Console\Application('dployer', '1.2.1');
 }, true);
 
 function app()

diff --git a/dployer b/dployer