From ec2bb12bf4c5ddc435173cbe2900940ea0ce7682 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Monta=C3=B1ez?= <andresmontanez@gmail.com>
Date: Wed, 6 Aug 2014 14:17:26 -0300
Subject: [PATCH] Fixes and tweaks.

---
 Mage/Command/BuiltIn/DeployCommand.php       | 4 ++--
 Mage/Command/BuiltIn/ReleasesCommand.php     | 2 +-
 Mage/Command/BuiltIn/RollbackCommand.php     | 2 +-
 Mage/Console.php                             | 2 ++
 Mage/Task/BuiltIn/Deployment/ReleaseTask.php | 7 -------
 Mage/Task/BuiltIn/Releases/RollbackTask.php  | 9 ++-------
 6 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/Mage/Command/BuiltIn/DeployCommand.php b/Mage/Command/BuiltIn/DeployCommand.php
index e6e7e02..45ee323 100644
--- a/Mage/Command/BuiltIn/DeployCommand.php
+++ b/Mage/Command/BuiltIn/DeployCommand.php
@@ -421,11 +421,11 @@ class DeployCommand extends AbstractCommand implements RequiresEnvironment
     /**
      * Runs a Task
      *
-     * @param string $task
+     * @param AbstractTask $task
      * @param string $title
      * @return boolean
      */
-    protected function runTask($task, $title = null)
+    protected function runTask(AbstractTask $task, $title = null)
     {
         $task->init();
 
diff --git a/Mage/Command/BuiltIn/ReleasesCommand.php b/Mage/Command/BuiltIn/ReleasesCommand.php
index 2be055e..12e1e1e 100644
--- a/Mage/Command/BuiltIn/ReleasesCommand.php
+++ b/Mage/Command/BuiltIn/ReleasesCommand.php
@@ -68,9 +68,9 @@ class ReleasesCommand extends AbstractCommand implements RequiresEnvironment
                     }
 
                     $releaseId = $this->getConfig()->getParameter('release', '');
+                    $this->getConfig()->setReleaseId($releaseId);
                     $task = Factory::get('releases/rollback', $this->getConfig());
                     $task->init();
-                    $task->setRelease($releaseId);
                     $result = $task->run();
                     break;
             }
diff --git a/Mage/Command/BuiltIn/RollbackCommand.php b/Mage/Command/BuiltIn/RollbackCommand.php
index 0eb7eff..c154ecf 100644
--- a/Mage/Command/BuiltIn/RollbackCommand.php
+++ b/Mage/Command/BuiltIn/RollbackCommand.php
@@ -51,9 +51,9 @@ class RollbackCommand extends AbstractCommand implements RequiresEnvironment
             foreach ($hosts as $host) {
                 $this->getConfig()->setHost($host);
 
+                $this->getConfig()->setReleaseId($releaseId);
                 $task = Factory::get('releases/rollback', $this->getConfig());
                 $task->init();
-                $task->setRelease($releaseId);
                 $result = $task->run();
             }
         }
diff --git a/Mage/Console.php b/Mage/Console.php
index ab02351..dac0dfc 100644
--- a/Mage/Console.php
+++ b/Mage/Console.php
@@ -16,6 +16,7 @@ use Mage\Console\Colors;
 
 use Exception;
 use RecursiveDirectoryIterator;
+use SplFileInfo;
 
 /**
  * Magallanes interface between the Tasks and Commands and the User's Console.
@@ -265,6 +266,7 @@ class Console
 
             $logs = array();
             foreach (new RecursiveDirectoryIterator(getcwd() . '/.mage/logs', RecursiveDirectoryIterator::SKIP_DOTS) as $log) {
+                /* @var $log SplFileInfo */
                 if (strpos($log->getFilename(), 'log-') === 0) {
                     $logs[] = $log->getFilename();
                 }
diff --git a/Mage/Task/BuiltIn/Deployment/ReleaseTask.php b/Mage/Task/BuiltIn/Deployment/ReleaseTask.php
index c8f1e37..5dd1ec7 100644
--- a/Mage/Task/BuiltIn/Deployment/ReleaseTask.php
+++ b/Mage/Task/BuiltIn/Deployment/ReleaseTask.php
@@ -46,13 +46,6 @@ class ReleaseTask extends AbstractTask implements IsReleaseAware, SkipOnOverride
 
             $releaseId = $this->getConfig()->getReleaseId();
 
-            if ($this->getConfig()->release('compressreleases', false) == true) {
-                // Tar.gz releases
-                $result = $this->tarReleases() && $result;
-                // Untar new release
-                $result = $this->untarRelease($releaseId) && $result;
-            }
-
             $currentCopy = $releasesDirectory . '/' . $releaseId;
 
             //Check if target user:group is specified
diff --git a/Mage/Task/BuiltIn/Releases/RollbackTask.php b/Mage/Task/BuiltIn/Releases/RollbackTask.php
index fe2f8e5..3f053d7 100644
--- a/Mage/Task/BuiltIn/Releases/RollbackTask.php
+++ b/Mage/Task/BuiltIn/Releases/RollbackTask.php
@@ -116,6 +116,7 @@ class RollbackTask extends AbstractTask implements IsReleaseAware
                         Console::output('Running <purple>' . $task->getName() . '</purple> ... ', 2, false);
 
                         if ($task instanceOf RollbackAware) {
+                            /* @var $task AbstractTask */
                             $tasks++;
                             $result = $task->run();
 
@@ -130,13 +131,6 @@ class RollbackTask extends AbstractTask implements IsReleaseAware
                         }
                     }
 
-                    if ($this->getConfig()->release('compressreleases', false) == true) {
-                        // Tar the current
-                        $result = $this->tarReleases() && $result;
-                        // Untar the rollbackto
-                        $result = $this->untarRelease($releaseId) && $result;
-                    }
-
                     // Changing Release
                     Console::output('Running <purple>Rollback Release [id=' . $releaseId . ']</purple> ... ', 2, false);
 
@@ -167,6 +161,7 @@ class RollbackTask extends AbstractTask implements IsReleaseAware
                         Console::output('Running <purple>' . $task->getName() . '</purple> ... ', 2, false);
 
                         if ($task instanceOf RollbackAware) {
+                            /* @var $task AbstractTask */
                             $tasks++;
                             $result = $task->run();