From 8ed0154749bfa1c9167caf9c8780f2e364de3f49 Mon Sep 17 00:00:00 2001 From: Andrs Montaez Date: Sat, 26 Nov 2011 23:02:47 -0200 Subject: [PATCH] Added the possibility defining (by the user) Excludes for the rsync. --- Mage/Task/Add.php | 1 + Mage/Task/BuiltIn/Deployment/Rsync.php | 30 ++++++++++++++++++++------ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/Mage/Task/Add.php b/Mage/Task/Add.php index 2cd3d42..c5d73db 100644 --- a/Mage/Task/Add.php +++ b/Mage/Task/Add.php @@ -16,6 +16,7 @@ class Mage_Task_Add . 'user: dummy' . PHP_EOL . 'deploy-from: ./' . PHP_EOL . 'deploy-to: /var/www/vhosts/example.com/www' . PHP_EOL + . 'rsync-excludes:' . PHP_EOL . 'hosts:' . PHP_EOL . 'pre-tasks:' . PHP_EOL . 'tasks:' . PHP_EOL diff --git a/Mage/Task/BuiltIn/Deployment/Rsync.php b/Mage/Task/BuiltIn/Deployment/Rsync.php index e001e3a..abf78ba 100644 --- a/Mage/Task/BuiltIn/Deployment/Rsync.php +++ b/Mage/Task/BuiltIn/Deployment/Rsync.php @@ -9,15 +9,22 @@ class Mage_Task_BuiltIn_Deployment_Rsync public function run() { - $ignores = array( - '--exclude .git', - '--exclude .svn', - '--exclude .mage', - '--exclude .gitignore' + $excludes = array( + '.git', + '.svn', + '.mage', + '.gitignore' ); + + // Look for User Excludes + if (isset($this->_config['deploy']['rsync-excludes'])) { + $userExcludes = (array) $this->_config['deploy']['rsync-excludes']; + } else { + $userExcludes = array(); + } $command = 'rsync -avz ' - . implode(' ', $ignores) .' ' + . $this->_excludes($excludes + $userExcludes) . ' ' . $this->_config['deploy']['deploy-from'] . ' ' . $this->_config['deploy']['user'] . '@' . $this->_config['deploy']['host'] . ':' . $this->_config['deploy']['deploy-to']; @@ -25,4 +32,15 @@ class Mage_Task_BuiltIn_Deployment_Rsync return $result; } + + private function _excludes(Array $excludes) + { + $excludesRsync = ''; + foreach ($excludes as $exclude) { + $excludesRsync .= ' --exclude ' . $exclude . ' '; + } + + $excludesRsync = trim($excludesRsync); + return $excludesRsync; + } } \ No newline at end of file