Delegate Releases Deletion to Rsync.

Mage/Task/BuiltIn/Deployment/Release.php

@@ -34,32 +34,6 @@ class Mage_Task_BuiltIn_Deployment_Release
                      . 'chown -R ' . $userGroup . ' ' . $currentCopy;
             $result = $this->_runRemoteCommand($command);
 
-            // Count Releases
-            $maxReleases = $this->getConfig()->release('max', false);
-            if (($maxReleases !== false) && ($maxReleases > 0)) {
-                $releasesList = '';
-                $countReleasesFetch = $this->_runRemoteCommand('ls -1 ' . $releasesDirectory, $releasesList);
-                $releasesList = trim($releasesList);
-
-                if ($releasesList != '') {
-                    $releasesList = explode(PHP_EOL, $releasesList);
-                    if (count($releasesList) > $maxReleases) {
-                        $releasesToDelete = array_diff($releasesList, array($this->getConfig()->getReleaseId()));
-                        sort($releasesToDelete);
-                        $releasesToDeleteCount = count($releasesToDelete) - $maxReleases;
-                        $releasesToDelete = array_slice($releasesToDelete, 0, $releasesToDeleteCount + 1);
-
-                        foreach ($releasesToDelete as $releaseIdToDelete) {
-                            $directoryToDelete = $releasesDirectory . '/' . $releaseIdToDelete;
-                            if ($directoryToDelete != '/') {
-                                $command = 'rm -rf ' . $directoryToDelete;
-                                $result = $result && $this->_runRemoteCommand($command);
-                            }
-                        }
-                    }
-                }
-            }
-
             return $result;
 
         } else {

Mage/Task/BuiltIn/Deployment/Rsync.php

@@ -56,6 +56,41 @@ class Mage_Task_BuiltIn_Deployment_Rsync
                  . $this->getConfig()->deployment('user') . '@' . $this->getConfig()->getHostName() . ':' . $deployToDirectory;
 
         $result = $this->_runLocalCommand($command);
+        
+        // Count Releases
+        if ($this->getConfig()->release('enabled', false) == true) {
+            $releasesDirectory = $this->getConfig()->release('directory', 'releases');
+            $symlink = $this->getConfig()->release('symlink', 'current');
+            
+            if (substr($symlink, 0, 1) == '/') {
+                $releasesDirectory = rtrim($this->getConfig()->deployment('to'), '/') . '/' . $releasesDirectory;
+            }
+            
+            $maxReleases = $this->getConfig()->release('max', false);
+            if (($maxReleases !== false) && ($maxReleases > 0)) {
+                $releasesList = '';
+                $countReleasesFetch = $this->_runRemoteCommand('ls -1 ' . $releasesDirectory, $releasesList);
+                $releasesList = trim($releasesList);
+            
+                if ($releasesList != '') {
+                    $releasesList = explode(PHP_EOL, $releasesList);
+                    if (count($releasesList) > $maxReleases) {
+                        $releasesToDelete = array_diff($releasesList, array($this->getConfig()->getReleaseId()));
+                        sort($releasesToDelete);
+                        $releasesToDeleteCount = count($releasesToDelete) - $maxReleases;
+                        $releasesToDelete = array_slice($releasesToDelete, 0, $releasesToDeleteCount + 1);
+            
+                        foreach ($releasesToDelete as $releaseIdToDelete) {
+                            $directoryToDelete = $releasesDirectory . '/' . $releaseIdToDelete;
+                            if ($directoryToDelete != '/') {
+                                $command = 'rm -rf ' . $directoryToDelete;
+                                $result = $result && $this->_runRemoteCommand($command);
+                            }
+                        }
+                    }
+                }
+            }
+        }
 
         return $result;
     }