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

- factored constants out; 

- fixed bug: "releases list" command would die checking for unnecessary --release parameter;
 - console prints log file name if if logging is enabled
1.0
Vladimir Grigor 11 years ago
parent
e7cad31681
commit
11bdd68fff
3 changed files with 61 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      Mage/Command/BuiltIn/DeployCommand.php
  2. 65
      Mage/Command/BuiltIn/ReleasesCommand.php
  3. 5
      Mage/Console.php

30
Mage/Command/BuiltIn/DeployCommand.php
Unescape View File

@ -30,7 +30,15 @@ use Exception;
*/
class DeployCommand extends AbstractCommand implements RequiresEnvironment
{
/**
const DEFAULT_RELEASE_IS_ENABLED = false;
const DEPLOY_STRATEGY_DISABLED = 'disabled';
const DEPLOY_STRATEGY_RSYNC = 'rsync';
const DEPLOY_STRATEGY_TARGZ = 'targz';
const DEPLOY_STRATEGY_GIT_REBASE = 'git-rebase';
const DEPLOY_STRATEGY_GUESS = 'guess';
const DEFAULT_DEPLOY_STRATEGY = self::DEPLOY_STRATEGY_GUESS;
/**
* Deploy has Failed
* @var string
*/
@ -523,24 +531,24 @@ class DeployCommand extends AbstractCommand implements RequiresEnvironment
protected function chooseDeployStrategy()
{
// Guess a Deploy Strategy
switch ($this->getConfig()->deployment('strategy', 'guess')) {
case 'disabled':
switch ($this->getConfig()->deployment('strategy', self::DEFAULT_DEPLOY_STRATEGY)) {
case self::DEPLOY_STRATEGY_DISABLED:
$deployStrategy = 'deployment/strategy/disabled';
break;
case 'rsync':
case self::DEPLOY_STRATEGY_RSYNC:
$deployStrategy = 'deployment/strategy/rsync';
break;
case 'targz':
case self::DEPLOY_STRATEGY_TARGZ:
$deployStrategy = 'deployment/strategy/tar-gz';
break;
case 'git-rebase':
case self::DEPLOY_STRATEGY_GIT_REBASE:
$deployStrategy = 'deployment/strategy/git-rebase';
break;
case 'guess':
case self::DEPLOY_STRATEGY_GUESS:
default:
if ($this->getConfig()->release('enabled', false) == true) {
$deployStrategy = 'deployment/strategy/tar-gz';
@ -558,10 +566,12 @@ class DeployCommand extends AbstractCommand implements RequiresEnvironment
protected function chooseReleaseStrategy()
{
if ($this->getConfig()->release('enabled', false) === true) {
$strategy = 'deployment/strategy/disabled';
} else {
if ($this->getConfig()->release('enabled', self::DEFAULT_RELEASE_IS_ENABLED)
&& $this->getConfig()->deployment('strategy', self::DEFAULT_DEPLOY_STRATEGY) !== self::DEPLOY_STRATEGY_DISABLED
) {
$strategy = 'deployment/release';
} else {
$strategy = 'deployment/strategy/disabled';
}
return $strategy;

65
Mage/Command/BuiltIn/ReleasesCommand.php
Unescape View File

@ -28,44 +28,51 @@ class ReleasesCommand extends AbstractCommand implements RequiresEnvironment
*/
public function run()
{
if (!is_numeric($this->getConfig()->getParameter('release', ''))) {
Console::output('<red>This release is mandatory.</red>', 1, 2);
return false;
}
$subcommand = $this->getConfig()->getArgument(1);
$lockFile = getcwd() . '/.mage/' . $this->getConfig()->getEnvironment() . '.lock';
if (file_exists($lockFile) && ($subcommand == 'rollback')) {
Console::output('<red>This environment is locked!</red>', 1, 2);
echo file_get_contents($lockFile);
return null;
}
$subCommand = $this->getConfig()->getArgument(1);
// Run Tasks for Deployment
$hosts = $this->getConfig()->getHosts();
if (count($hosts) == 0) {
Console::output('<light_purple>Warning!</light_purple> <dark_gray>No hosts defined, unable to get releases.</dark_gray>', 1, 3);
Console::output(
'<light_purple>Warning!</light_purple> <dark_gray>No hosts defined, unable to get releases.</dark_gray>',
1, 3
);
return false;
}
foreach ($hosts as $host) {
$this->getConfig()->setHost($host);
switch ($subCommand) {
case 'list':
$task = Factory::get('releases/list', $this->getConfig());
$task->init();
$result = $task->run();
break;
} else {
foreach ($hosts as $host) {
$this->getConfig()->setHost($host);
case 'rollback':
if (!is_numeric($this->getConfig()->getParameter('release', ''))) {
Console::output('<red>Missing required releaseid.</red>', 1, 2);
switch ($subcommand) {
case 'list':
$task = Factory::get('releases/list', $this->getConfig());
$task->init();
$result = $task->run();
break;
return false;
}
$lockFile = getcwd() . '/.mage/' . $this->getConfig()->getEnvironment() . '.lock';
if (file_exists($lockFile)) {
Console::output('<red>This environment is locked!</red>', 1, 2);
echo file_get_contents($lockFile);
case 'rollback':
$releaseId = $this->getConfig()->getParameter('release', '');
$task = Factory::get('releases/rollback', $this->getConfig());
$task->init();
$task->setRelease($releaseId);
$result = $task->run();
break;
return false;
}
$releaseId = $this->getConfig()->getParameter('release', '');
$task = Factory::get('releases/rollback', $this->getConfig());
$task->init();
$task->setRelease($releaseId);
$result = $task->run();
break;
}
}

5
Mage/Console.php
Unescape View File

@ -106,6 +106,11 @@ class Console
$showGreetings = false;
} else {
self::$logEnabled = $config->general('logging', false);
if(self::$logEnabled)
{
self::log("Logging enabled");
self::output('<red> Logging enabled: ' . self::getLogFile() . '</red>', 1, 1);
}
}
// Greetings

Write Preview
Loading…
Cancel
Save