hauke
/
Magallanes
mirror of https://github.com/hauke68/Magallanes
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Changes on configuration. 

Preparation for Post Release tasks.
1.0
Andrs Montaez 13 years ago
parent
1349f296c0
commit
9c03ae6bed
7 changed files with 68 additions and 50 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      Mage/Config.php
  2. 16
      Mage/Task/Add.php
  3. 12
      Mage/Task/BuiltIn/Deployment/Rsync.php
  4. 18
      Mage/Task/Deploy.php
  5. 4
      Mage/Task/TaskAbstract.php
  6. 19
      docs/example-config/.mage/config/environment/production.yaml
  7. 13
      docs/example-config/.mage/config/environment/staging.yaml

26
Mage/Config.php
Unescape View File

@ -40,28 +40,36 @@ class Mage_Config
return $hosts; return $hosts;
} }
public function getTasks($type = 'tasks') public function getTasks($stage = 'on-deploy')
{ {
switch ($type) { switch ($stage) {
case 'pre': case 'pre-deploy':
$type = 'pre-tasks'; $type = 'tasks';
$stage = 'pre-deploy';
break;
case 'post-deploy':
$type = 'tasks';
$stage = 'post-deploy';
break; break;
case 'post': case 'post-release':
$type = 'post-tasks'; $type = 'releases';
$stage = 'post-release';
break; break;
case 'tasks': case 'on-deploy':
default: default:
$type = 'tasks'; $type = 'tasks';
$stage = 'on-deploy';
break; break;
} }
$tasks = array(); $tasks = array();
$config = $this->getEnvironment(); $config = $this->getEnvironment();
if (isset($config[$type])) { if (isset($config[$type]) && isset($config[$type][$stage])) {
$tasks = (array) $config[$type]; $tasks = (array) $config[$type][$stage];
} }
return $tasks; return $tasks;

16
Mage/Task/Add.php
Unescape View File

@ -13,15 +13,17 @@ class Mage_Task_Add
Mage_Console::output('<light_red>Error!!</light_red> Already exists an environment called <dark_gray>' . $environmentName . '</dark_gray>', 1, 2); Mage_Console::output('<light_red>Error!!</light_red> Already exists an environment called <dark_gray>' . $environmentName . '</dark_gray>', 1, 2);
} else { } else {
$baseConfig = '#' . $environmentName . PHP_EOL $baseConfig = '#' . $environmentName . PHP_EOL
. 'user: dummy' . PHP_EOL . 'deployment:'
. 'deploy-from: ./' . PHP_EOL . ' user: dummy' . PHP_EOL
. 'deploy-to: /var/www/vhosts/example.com/www' . PHP_EOL . ' from: ./' . PHP_EOL
. 'rsync-excludes:' . PHP_EOL . ' to: /var/www/vhosts/example.com/www' . PHP_EOL
. ' excludes:' . PHP_EOL
. 'hosts:' . PHP_EOL . 'hosts:' . PHP_EOL
. 'pre-tasks:' . PHP_EOL . 'tasks:'
. 'tasks:' . PHP_EOL . ' pre-deploy:' . PHP_EOL
. ' on-deploy:' . PHP_EOL
. ' - deployment/rsync' . PHP_EOL . ' - deployment/rsync' . PHP_EOL
. 'post-tasks:' . PHP_EOL; . ' post-deploy:' . PHP_EOL;
$result = file_put_contents($environmentConfigFile, $baseConfig); $result = file_put_contents($environmentConfigFile, $baseConfig);
if ($result) { if ($result) {

12
Mage/Task/BuiltIn/Deployment/Rsync.php
Unescape View File

@ -25,14 +25,14 @@ class Mage_Task_BuiltIn_Deployment_Rsync
); );
// Look for User Excludes // Look for User Excludes
if (isset($this->_config['deploy']['rsync-excludes'])) { if (isset($this->_config['deploy']['deployment']['excludes'])) {
$userExcludes = (array) $this->_config['deploy']['rsync-excludes']; $userExcludes = (array) $this->_config['deploy']['deployment']['excludes'];
} else { } else {
$userExcludes = array(); $userExcludes = array();
} }
// If we are working with releases // If we are working with releases
$deployToDirectory = $this->_config['deploy']['deploy-to']; $deployToDirectory = $this->_config['deploy']['deployment']['to'];
if (isset($this->_config['deploy']['releases']['enabled'])) { if (isset($this->_config['deploy']['releases']['enabled'])) {
if ($this->_config['deploy']['releases']['enabled'] == 'true') { if ($this->_config['deploy']['releases']['enabled'] == 'true') {
if (isset($this->_config['deploy']['releases']['directory'])) { if (isset($this->_config['deploy']['releases']['directory'])) {
@ -41,7 +41,7 @@ class Mage_Task_BuiltIn_Deployment_Rsync
$releasesDirectory = 'releases'; $releasesDirectory = 'releases';
} }
$deployToDirectory = rtrim($this->_config['deploy']['deploy-to'], '/') $deployToDirectory = rtrim($this->_config['deploy']['deployment']['to'], '/')
. '/' . $releasesDirectory . '/' . $releasesDirectory
. '/' . $this->_config['deploy']['releases']['_id']; . '/' . $this->_config['deploy']['releases']['_id'];
$this->_runRemoteCommand('mkdir -p ' . $releasesDirectory . '/' . $this->_config['deploy']['releases']['_id']); $this->_runRemoteCommand('mkdir -p ' . $releasesDirectory . '/' . $this->_config['deploy']['releases']['_id']);
@ -50,8 +50,8 @@ class Mage_Task_BuiltIn_Deployment_Rsync
$command = 'rsync -avz ' $command = 'rsync -avz '
. $this->_excludes(array_merge($excludes, $userExcludes)) . ' ' . $this->_excludes(array_merge($excludes, $userExcludes)) . ' '
. $this->_config['deploy']['deploy-from'] . ' ' . $this->_config['deploy']['deployment']['from'] . ' '
. $this->_config['deploy']['user'] . '@' . $this->_config['deploy']['host'] . ':' . $deployToDirectory; . $this->_config['deploy']['deployment']['user'] . '@' . $this->_config['deploy']['host'] . ':' . $deployToDirectory;
$result = $this->_runLocalCommand($command); $result = $this->_runLocalCommand($command);

18
Mage/Task/Deploy.php
Unescape View File

@ -14,7 +14,7 @@ class Mage_Task_Deploy
$this->_config = $config; $this->_config = $config;
// Run Pre-Deployment Tasks // Run Pre-Deployment Tasks
$this->_runNonDeploymentTasks('pre', $config); $this->_runNonDeploymentTasks('pre-deploy', $config, 'Pre-Deployment');
// Run Tasks for Deployment // Run Tasks for Deployment
$hosts = $config->getHosts(); $hosts = $config->getHosts();
@ -60,6 +60,8 @@ class Mage_Task_Deploy
} }
} }
// Run Post-Deployment Tasks
if ($completedTasks == $tasks) { if ($completedTasks == $tasks) {
$tasksColor = 'green'; $tasksColor = 'green';
} else { } else {
@ -72,18 +74,18 @@ class Mage_Task_Deploy
} }
// Run Post-Deployment Tasks // Run Post-Deployment Tasks
$this->_runNonDeploymentTasks('post', $config); $this->_runNonDeploymentTasks('post-deploy', $config, 'Post-Deployment');
} }
private function _runNonDeploymentTasks($type, Mage_Config $config) private function _runNonDeploymentTasks($stage, Mage_Config $config, $title)
{ {
$tasksToRun = $config->getTasks($type); $tasksToRun = $config->getTasks($stage);
if (count($tasksToRun) == 0) { if (count($tasksToRun) == 0) {
Mage_Console::output('<dark_gray>No </dark_gray><light_cyan>' . ucfirst($type) . '-Deployment</light_cyan> <dark_gray>tasks defined.</dark_gray>', 1, 3); Mage_Console::output('<dark_gray>No </dark_gray><light_cyan>' . $title . '</light_cyan> <dark_gray>tasks defined.</dark_gray>', 1, 3);
} else { } else {
Mage_Console::output('Starting <dark_gray>' . ucfirst($type) . '-Deployment</dark_gray> tasks:'); Mage_Console::output('Starting <dark_gray>' . $title . '</dark_gray> tasks:');
$taskConfig = $config->getConfig(); $taskConfig = $config->getConfig();
$tasks = 0; $tasks = 0;
@ -94,7 +96,7 @@ class Mage_Task_Deploy
$task = Mage_Task_Factory::get($taskName, $taskConfig); $task = Mage_Task_Factory::get($taskName, $taskConfig);
$task->init(); $task->init();
Mage_Console::output('Running <purple>' . $task->getName() . '</purple> ... ', 2, false); Mage_Console::output('Running <purple>' . $task->getName() . '</purple> ... ', 2, 0);
$result = $task->run(); $result = $task->run();
if ($result == true) { if ($result == true) {
@ -111,7 +113,7 @@ class Mage_Task_Deploy
$tasksColor = 'red'; $tasksColor = 'red';
} }
Mage_Console::output('Finished <dark_gray>' . ucfirst($type) . '-Deployment</dark_gray> tasks: <' . $tasksColor . '>' . $completedTasks . '/' . $tasks . '</' . $tasksColor . '> tasks done.', 1, 3); Mage_Console::output('Finished <dark_gray>' . $title . '</dark_gray> tasks: <' . $tasksColor . '>' . $completedTasks . '/' . $tasks . '</' . $tasksColor . '> tasks done.', 1, 3);
} }

4
Mage/Task/TaskAbstract.php
Unescape View File

@ -24,8 +24,8 @@ abstract class Mage_Task_TaskAbstract
protected final function _runRemoteCommand($command) protected final function _runRemoteCommand($command)
{ {
$localCommand = 'ssh ' $localCommand = 'ssh '
. $this->_config['deploy']['user'] . '@' . $this->_config['deploy']['host'] . ' ' . $this->_config['deploy']['deployment']['user'] . '@' . $this->_config['deploy']['host'] . ' '
. '"cd ' . $this->_config['deploy']['deploy-to'] . ' && ' . '"cd ' . $this->_config['deploy']['deployment']['to'] . ' && '
. $command . '"'; . $command . '"';
return $this->_runLocalCommand($localCommand); return $this->_runLocalCommand($localCommand);

19
docs/example-config/.mage/config/environment/production.yaml
Unescape View File

@ -1,21 +1,24 @@
#production #production
user: root deployment:
deploy-from: ./ user: root
deploy-to: /var/www/vhosts/example.com/www from: ./
to: /var/www/vhosts/example.com/www
excludes:
- application/data/cache/twig/*
releases: releases:
enabled: true enabled: true
symlink: current symlink: current
directory: releases directory: releases
tasks:
hosts: hosts:
- s01.example.com - s01.example.com
- s02.example.com - s02.example.com
- s03.example.com - s03.example.com
- s05.example.com - s05.example.com
rsync-excludes:
- application/data/cache/twig/*
pre-tasks:
- scm/update
tasks: tasks:
pre-deploy:
- scm/update
on-deploy:
- deployment/rsync - deployment/rsync
- privileges - privileges
#post-tasks: #post-deploy:

13
docs/example-config/.mage/config/environment/staging.yaml
Unescape View File

@ -1,11 +1,14 @@
#staging #staging
user: stg_example deployment:
deploy-from: application user: stg_user
deploy-to: /var/www/vhosts/example.com/staging from: ./
to: /var/www/vhosts/example.com/staging
hosts: hosts:
- staging.example.com - staging.example.com
pre-tasks:
- scm/update
tasks: tasks:
pre-deploy:
- scm/update
on-deploy:
- deployment/rsync - deployment/rsync
- privileges - privileges
#post-deploy:
Write Preview
Loading…
Cancel
Save