Fix runInFolder not correctly working for LocalConnection

rocketeers · Mar 10, 2015 · 2dfc99a · 2dfc99a
1 parent f20999e
commit 2dfc99a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/src/Rocketeer/Services/Connections/LocalConnection.php b/src/Rocketeer/Services/Connections/LocalConnection.php
@@ -65,15 +65,15 @@ public function task($task, Closure $callback = null)
     public function run($commands, Closure $callback = null)
     {
         $commands = (array) $commands;
-        foreach ($commands as $command) {
-            exec($command, $output, $status);
+        $commands = implode(' && ', $commands);
 
-            $this->previousStatus = $status;
-            if ($callback) {
-                $output = (array) $output;
-                foreach ($output as $line) {
-                    $callback($line.PHP_EOL);
-                }
+        exec($commands, $output, $status);
+
+        $this->previousStatus = $status;
+        if ($callback) {
+            $output = (array) $output;
+            foreach ($output as $line) {
+                $callback($line.PHP_EOL);
             }
         }
     }
@@ -95,7 +95,6 @@ public function status()
      * @param string $remote
      *
      * @codeCoverageIgnore
-     *
      * @return int
      */
     public function put($local, $remote)
@@ -111,7 +110,6 @@ public function put($local, $remote)
      * @param string $remote
      *
      * @codeCoverageIgnore
-     *
      * @return string
      */
     public function getString($remote)
@@ -140,7 +138,6 @@ public function display($line)
      * @param string $contents
      *
      * @codeCoverageIgnore
-     *
      * @return int
      */
     public function putString($remote, $contents)

diff --git a/src/Rocketeer/Services/ReleasesManager.php b/src/Rocketeer/Services/ReleasesManager.php
@@ -87,6 +87,7 @@ public function getReleases()
             rsort($releases);
 
             $this->releases = (array) $releases;
+            $this->releases = array_map('intval', $this->releases);
         }
 
         return $this->releases;

diff --git a/src/Rocketeer/Tasks/Rollback.php b/src/Rocketeer/Tasks/Rollback.php
@@ -75,6 +75,6 @@ protected function getRollbackRelease()
             $release = $this->releasesManager->getPreviousRelease();
         }
 
-        return $release;
+        return (int) $release;
     }
 }