From 2ec4f58c775b6a6da87102a173bd282ba2faac23 Mon Sep 17 00:00:00 2001
From: Andrs Montaez <andresmontanez@gmail.com>
Date: Wed, 15 Feb 2012 18:45:59 -0200
Subject: [PATCH] Tweak on yaml parser. Added option for ssh port.

---
 Mage/Config.php                        | 2 +-
 Mage/Task/BuiltIn/Deployment/Rsync.php | 1 +
 Mage/Task/TaskAbstract.php             | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Mage/Config.php b/Mage/Config.php
index 9f87f65..ac5c253 100644
--- a/Mage/Config.php
+++ b/Mage/Config.php
@@ -116,7 +116,7 @@ class Mage_Config
         $config = $this->getEnvironment();
 
         if (isset($config[$type]) && isset($config[$type][$stage])) {
-            $tasks = (array) $config[$type][$stage];
+            $tasks = ($config[$type][$stage] ? (array) $config[$type][$stage] : array());
         }
 
         return $tasks;
diff --git a/Mage/Task/BuiltIn/Deployment/Rsync.php b/Mage/Task/BuiltIn/Deployment/Rsync.php
index 10c7bdf..3ec972a 100644
--- a/Mage/Task/BuiltIn/Deployment/Rsync.php
+++ b/Mage/Task/BuiltIn/Deployment/Rsync.php
@@ -36,6 +36,7 @@ class Mage_Task_BuiltIn_Deployment_Rsync
         }
 
         $command = 'rsync -avz '
+                 . '--rsh="ssh -p' . $this->_config->deployment('port', '22') . '" '
                  . $this->_excludes(array_merge($excludes, $userExcludes)) . ' '
                  . $this->_config->deployment('from') . ' '
                  . $this->_config->deployment('user') . '@' . $this->_config->getHost() . ':' . $deployToDirectory;
diff --git a/Mage/Task/TaskAbstract.php b/Mage/Task/TaskAbstract.php
index d9f91ad..06289b4 100644
--- a/Mage/Task/TaskAbstract.php
+++ b/Mage/Task/TaskAbstract.php
@@ -45,7 +45,8 @@ abstract class Mage_Task_TaskAbstract
             $releasesDirectory = '';
         }
         
-        $localCommand = 'ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no '
+        $localCommand = 'ssh -p ' . $this->_config->deployment('port', '22') . ' '
+                      . '-q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no '
                       . $this->_config->deployment('user') . '@' . $this->_config->getHost() . ' '
                       . '"cd ' . rtrim($this->_config->deployment('to'), '/') . $releasesDirectory . ' && '
                       . $command . '"';