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

New version. Added getters to config and task. 

New concept of "stage" where the task runs.
1.0
Andrs Montaez 13 years ago
parent
de772028bb
commit
3f0efc1a42
9 changed files with 39 additions and 17 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. 7
      Mage/Config.php
  2. 9
      Mage/Task/BuiltIn/Deployment/Releases.php
  3. 2
      Mage/Task/BuiltIn/Releases/Rollback.php
  4. 10
      Mage/Task/Deploy.php
  5. 6
      Mage/Task/Factory.php
  6. 2
      Mage/Task/Init.php
  7. 14
      Mage/Task/TaskAbstract.php
  8. 2
      bin/mage
  9. 2
      bin/mage.php

7
Mage/Config.php
Unescape View File

@ -1,6 +1,7 @@
<?php <?php
class Mage_Config class Mage_Config
{ {
private $_environmentName = null;
private $_environment = null; private $_environment = null;
private $_scm = null; private $_scm = null;
private $_general = null; private $_general = null;
@ -11,6 +12,7 @@ class Mage_Config
{ {
if (($environment != '') && file_exists('.mage/config/environment/' . $environment . '.yml')) { if (($environment != '') && file_exists('.mage/config/environment/' . $environment . '.yml')) {
$this->_environment = spyc_load_file('.mage/config/environment/' . $environment . '.yml'); $this->_environment = spyc_load_file('.mage/config/environment/' . $environment . '.yml');
$this->_environmentName = $environment;
} }
} }
@ -33,6 +35,11 @@ class Mage_Config
return $this->_environment; return $this->_environment;
} }
public function getEnvironmentName()
{
return $this->_environmentName;
}
public function getSCM() public function getSCM()
{ {
return $this->_scm; return $this->_scm;

9
Mage/Task/BuiltIn/Deployment/Releases.php
Unescape View File

@ -16,10 +16,13 @@ class Mage_Task_BuiltIn_Deployment_Releases
$currentCopy = $releasesDirectory . '/' . $this->_config->getReleaseId(); $currentCopy = $releasesDirectory . '/' . $this->_config->getReleaseId();
$userGroup = ''; // Fetch the user and group from base directory
$resultFetch = $this->_runRemoteCommand('ls -ld ' . $symlink . ' | awk \'{print \$3\":\"\$4}\'', $userGroup); $userGroup = '33:33';
$resultFetch = $this->_runRemoteCommand('ls -ld . | awk \'{print \$3\":\"\$4}\'', $userGroup);
// Remove symlink if exists; create new symlink and change owners
$command = 'rm -f ' . $symlink $command = 'rm -f ' . $symlink
. ' && ' . ' ; '
. 'ln -sf ' . $currentCopy . ' ' . $symlink . 'ln -sf ' . $currentCopy . ' ' . $symlink
. ' && ' . ' && '
. 'chown -h ' . $userGroup . ' ' . $symlink . 'chown -h ' . $userGroup . ' ' . $symlink

2
Mage/Task/BuiltIn/Releases/Rollback.php
Unescape View File

@ -73,7 +73,7 @@ class Mage_Task_BuiltIn_Releases_Rollback
} else { } else {
foreach ($tasksToRun as $taskName) { foreach ($tasksToRun as $taskName) {
$task = Mage_Task_Factory::get($taskName, $this->_config, true); $task = Mage_Task_Factory::get($taskName, $this->_config, true, 'deploy');
$task->init(); $task->init();
Mage_Console::output('Running <purple>' . $task->getName() . '</purple> ... ', 2, false); Mage_Console::output('Running <purple>' . $task->getName() . '</purple> ... ', 2, false);

10
Mage/Task/Deploy.php
Unescape View File

@ -28,7 +28,7 @@ class Mage_Task_Deploy
$tasks = 0; $tasks = 0;
$completedTasks = 0; $completedTasks = 0;
Mage_Console::output('Deploying to <dark_gray>' . $config->getHostName() . '</dark_gray>'); Mage_Console::output('Deploying to <dark_gray>' . $config->getHost() . '</dark_gray>');
$tasksToRun = $config->getTasks(); $tasksToRun = $config->getTasks();
array_unshift($tasksToRun, 'deployment/rsync'); array_unshift($tasksToRun, 'deployment/rsync');
@ -40,12 +40,12 @@ class Mage_Task_Deploy
if (count($tasksToRun) == 0) { if (count($tasksToRun) == 0) {
Mage_Console::output('<light_purple>Warning!</light_purple> <dark_gray>No </dark_gray><light_cyan>Deployment</light_cyan> <dark_gray>tasks defined.</dark_gray>', 2); Mage_Console::output('<light_purple>Warning!</light_purple> <dark_gray>No </dark_gray><light_cyan>Deployment</light_cyan> <dark_gray>tasks defined.</dark_gray>', 2);
Mage_Console::output('Deployment to <dark_gray>' . $config->getHostName() . '</dark_gray> skipped!', 1, 3); Mage_Console::output('Deployment to <dark_gray>' . $config->getHost() . '</dark_gray> skipped!', 1, 3);
} else { } else {
foreach ($tasksToRun as $taskName) { foreach ($tasksToRun as $taskName) {
$tasks++; $tasks++;
$task = Mage_Task_Factory::get($taskName, $config); $task = Mage_Task_Factory::get($taskName, $config, false, 'deploy');
$task->init(); $task->init();
Mage_Console::output('Running <purple>' . $task->getName() . '</purple> ... ', 2, false); Mage_Console::output('Running <purple>' . $task->getName() . '</purple> ... ', 2, false);
@ -65,7 +65,7 @@ class Mage_Task_Deploy
$tasksColor = 'red'; $tasksColor = 'red';
} }
Mage_Console::output('Deployment to <dark_gray>' . $config->getHostName() . '</dark_gray> compted: <' . $tasksColor . '>' . $completedTasks . '/' . $tasks . '</' . $tasksColor . '> tasks done.', 1, 3); Mage_Console::output('Deployment to <dark_gray>' . $config->getHost() . '</dark_gray> compted: <' . $tasksColor . '>' . $completedTasks . '/' . $tasks . '</' . $tasksColor . '> tasks done.', 1, 3);
} }
} }
} }
@ -101,7 +101,7 @@ class Mage_Task_Deploy
foreach ($tasksToRun as $taskName) { foreach ($tasksToRun as $taskName) {
$tasks++; $tasks++;
$task = Mage_Task_Factory::get($taskName, $config); $task = Mage_Task_Factory::get($taskName, $config, false, $stage);
$task->init(); $task->init();
Mage_Console::output('Running <purple>' . $task->getName() . '</purple> ... ', 2, 0); Mage_Console::output('Running <purple>' . $task->getName() . '</purple> ... ', 2, 0);

6
Mage/Task/Factory.php
Unescape View File

@ -8,7 +8,7 @@ class Mage_Task_Factory
* @param boolean $inRollback * @param boolean $inRollback
* @return Mage_Task_TaskAbstract * @return Mage_Task_TaskAbstract
*/ */
public static function get($taskName, Mage_Config $taskConfig, $inRollback = false) public static function get($taskName, Mage_Config $taskConfig, $inRollback = false, $stage = null)
{ {
$instance = null; $instance = null;
$taskName = ucwords(str_replace('-', ' ', $taskName)); $taskName = ucwords(str_replace('-', ' ', $taskName));
@ -17,12 +17,12 @@ class Mage_Task_Factory
if (strpos($taskName, '/') === false) { if (strpos($taskName, '/') === false) {
Mage_Autoload::loadUserTask($taskName); Mage_Autoload::loadUserTask($taskName);
$className = 'Task_' . ucfirst($taskName); $className = 'Task_' . ucfirst($taskName);
$instance = new $className($taskConfig, $inRollback); $instance = new $className($taskConfig, $inRollback, $stage);
} else { } else {
$taskName = str_replace(' ', '_', ucwords(str_replace('/', ' ', $taskName))); $taskName = str_replace(' ', '_', ucwords(str_replace('/', ' ', $taskName)));
$className = 'Mage_Task_BuiltIn_' . $taskName; $className = 'Mage_Task_BuiltIn_' . $taskName;
$instance = new $className($taskConfig, $inRollback); $instance = new $className($taskConfig, $inRollback, $stage);
} }
assert($instance instanceOf Mage_Task_TaskAbstract); assert($instance instanceOf Mage_Task_TaskAbstract);

2
Mage/Task/Init.php
Unescape View File

@ -17,7 +17,7 @@ class Mage_Task_Init
$results[] = mkdir($configDir . '/tasks'); $results[] = mkdir($configDir . '/tasks');
$results[] = mkdir($configDir . '/config'); $results[] = mkdir($configDir . '/config');
$results[] = mkdir($configDir . '/config/environment'); $results[] = mkdir($configDir . '/config/environment');
$results[] = file_put_contents($configDir . '/config/global.yml', '#global settings' . PHP_EOL . PHP_EOL); $results[] = file_put_contents($configDir . '/config/general.yml', '#global settings' . PHP_EOL . PHP_EOL);
$results[] = file_put_contents($configDir . '/config/scm.yml', '#scm settings' . PHP_EOL . PHP_EOL); $results[] = file_put_contents($configDir . '/config/scm.yml', '#scm settings' . PHP_EOL . PHP_EOL);
if (!in_array(false, $results)) { if (!in_array(false, $results)) {

14
Mage/Task/TaskAbstract.php
Unescape View File

@ -3,15 +3,17 @@ abstract class Mage_Task_TaskAbstract
{ {
protected $_config = null; protected $_config = null;
protected $_inRollback = false; protected $_inRollback = false;
protected $_stage = null;
public abstract function getName(); public abstract function getName();
public abstract function run(); public abstract function run();
public final function __construct(Mage_Config $config, $inRollback = false) public final function __construct(Mage_Config $config, $inRollback = false, $stage = null)
{ {
$this->_config = $config; $this->_config = $config;
$this->_inRollback = $inRollback; $this->_inRollback = $inRollback;
$this->_stage = $stage;
} }
public function inRollback() public function inRollback()
@ -19,6 +21,16 @@ abstract class Mage_Task_TaskAbstract
return $this->_inRollback; return $this->_inRollback;
} }
public function getStage()
{
return $this->_stage;
}
public function getConfig()
{
return $this->_config;
}
public function init() public function init()
{ {
} }

2
bin/mage
Unescape View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
#VERSION:0.9.7 #VERSION:0.9.8
SCRIPT=$(readlink -f $0) SCRIPT=$(readlink -f $0)
DIR=$(dirname $SCRIPT) DIR=$(dirname $SCRIPT)

2
bin/mage.php
Unescape View File

@ -24,7 +24,7 @@ date_default_timezone_set('UTC');
$baseDir = dirname(dirname(__FILE__)); $baseDir = dirname(dirname(__FILE__));
define('MAGALLANES_VERSION', '0.9.7'); define('MAGALLANES_VERSION', '0.9.8');
require_once $baseDir . '/Mage/spyc.php'; require_once $baseDir . '/Mage/spyc.php';
require_once $baseDir . '/Mage/Autoload.php'; require_once $baseDir . '/Mage/Autoload.php';

Write Preview
Loading…
Cancel
Save