hauke/Magallanes
1
0
Fork 0
mirror of https://github.com/hauke68/Magallanes.git synced 2026-08-28 10:08:56 +02:00
Code Issues Releases Wiki Activity

New configuration usage. Changes on Releases Listing.

Browse Source
This commit is contained in:
Andrs Montaez
2012-01-01 15:46:05 -02:00
parent dd46e4d637
commit 2e35bfe129
9 changed files with 124 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Mage/Task/BuiltIn/Deployment/Releases.php
+6 -19
View File
@@ -9,28 +9,15 @@ class Mage_Task_BuiltIn_Deployment_Releases
public function run()
{
if (isset($this->_config['deploy']['releases']['enabled'])) {
if ($this->_config['deploy']['releases']['enabled'] == 'true') {
if (isset($this->_config['deploy']['releases']['directory'])) {
$releasesDirectory = $this->_config['deploy']['releases']['directory'];
} else {
$releasesDirectory = 'releases';
}
if (isset($this->_config['deploy']['releases']['symlink'])) {
$symlink = $this->_config['deploy']['releases']['symlink'];
} else {
$symlink = 'current';
}
if ($this->_config->release('enabled', false) == true) {
$releasesDirectory = $this->_config->release('directory', 'releases');
$symlink = $this->_config->release('symlink', 'current');
$currentCopy = $releasesDirectory
. '/' . $this->_config['deploy']['releases']['_id'];
$currentCopy = $releasesDirectory . '/' . $this->_config->getReleaseId();
$result = $this->_runRemoteCommand('ln -sf ' . $currentCopy . ' ' . $symlink);
return $result;
$result = $this->_runRemoteCommand('ln -sf ' . $currentCopy . ' ' . $symlink);
return $result;
} else {
return false;
}
} else {
return false;
}
Mage/Task/BuiltIn/Deployment/Rsync.php
+13 -27
View File
@@ -4,14 +4,10 @@ class Mage_Task_BuiltIn_Deployment_Rsync
{
public function getName()
{
if (isset($this->_config['deploy']['releases']['enabled'])) {
if ($this->_config['deploy']['releases']['enabled'] == 'true') {
return 'Rsync (with Releases) [built-in]';
} else {
return 'Rsync [built-in]';
}
if ($this->_config->release('enabled', false) == true) {
return 'Rsync (with Releases) [built-in]';
} else {
return 'Rsync [built-in]';
return 'Rsync [built-in]';
}
}
@@ -25,33 +21,23 @@ class Mage_Task_BuiltIn_Deployment_Rsync
);
// Look for User Excludes
if (isset($this->_config['deploy']['deployment']['excludes'])) {
$userExcludes = (array) $this->_config['deploy']['deployment']['excludes'];
} else {
$userExcludes = array();
}
$userExcludes = $this->_config->deployment('excludes', array());
// If we are working with releases
$deployToDirectory = $this->_config['deploy']['deployment']['to'];
if (isset($this->_config['deploy']['releases']['enabled'])) {
if ($this->_config['deploy']['releases']['enabled'] == 'true') {
if (isset($this->_config['deploy']['releases']['directory'])) {
$releasesDirectory = $this->_config['deploy']['releases']['directory'];
} else {
$releasesDirectory = 'releases';
}
$deployToDirectory = $this->_config->deployment('to');
if ($this->_config->release('enabled', false) == true) {
$releasesDirectory = $this->_config->release('directory', 'releases');
$deployToDirectory = rtrim($this->_config['deploy']['deployment']['to'], '/')
. '/' . $releasesDirectory
. '/' . $this->_config['deploy']['releases']['_id'];
$this->_runRemoteCommand('mkdir -p ' . $releasesDirectory . '/' . $this->_config['deploy']['releases']['_id']);
}
$deployToDirectory = rtrim($this->_config->deployment('to'), '/')
. '/' . $releasesDirectory
. '/' . $this->_config->getReleaseId();
$this->_runRemoteCommand('mkdir -p ' . $releasesDirectory . '/' . $this->_config->getReleaseId());
}
$command = 'rsync -avz '
. $this->_excludes(array_merge($excludes, $userExcludes)) . ' '
. $this->_config['deploy']['deployment']['from'] . ' '
. $this->_config['deploy']['deployment']['user'] . '@' . $this->_config['deploy']['host'] . ':' . $deployToDirectory;
. $this->_config->deployment('from') . ' '
. $this->_config->deployment('user') . '@' . $this->_config->getHost() . ':' . $deployToDirectory;
$result = $this->_runLocalCommand($command);
Mage/Task/BuiltIn/Releases/List.php
+35 -30
View File
@@ -9,39 +9,44 @@ class Mage_Task_BuiltIn_Releases_List
public function run()
{
if (isset($this->_config['deploy']['releases']['enabled'])) {
if ($this->_config['deploy']['releases']['enabled'] == 'true') {
if (isset($this->_config['deploy']['releases']['directory'])) {
$releasesDirectory = $this->_config['deploy']['releases']['directory'];
} else {
$releasesDirectory = 'releases';
}
if (isset($this->_config['deploy']['releases']['symlink'])) {
$symlink = $this->_config['deploy']['releases']['symlink'];
} else {
$symlink = 'current';
}
if ($this->_config->release('enabled', false) == true) {
$releasesDirectory = $this->_config->release('directory', 'releases');
$symlink = $this->_config->release('symlink', 'current');
Mage_Console::output('Releases available on <dark_gray>' . $this->_config['deploy']['host'] . '</dark_gray>');
$output = '';
$result = $this->_runRemoteCommand('ls -1 ' . $releasesDirectory, $output);
$releases = ($output == '') ? array() : explode(PHP_EOL, $output);
if (count($releases) == 0) {
Mage_Console::output('<dark_gray>No releases available</dark_gray> ... ', 2);
} else {
rsort($releases);
foreach ($releases as $releaseIndex => $releaseDate) {
Mage_Console::output('Index: ' . $releaseIndex . ' - <purple>' . $releaseDate . '</purple>', 2);
}
}
return $result;
Mage_Console::output('Releases available on <dark_gray>' . $this->_config->getHost() . '</dark_gray>');
$output = '';
$result = $this->_runRemoteCommand('ls -1 ' . $releasesDirectory, $output);
$releases = ($output == '') ? array() : explode(PHP_EOL, $output);
if (count($releases) == 0) {
Mage_Console::output('<dark_gray>No releases available</dark_gray> ... ', 2);
} else {
return false;
rsort($releases);
$releases = array_slice($releases, 0, 10);
foreach ($releases as $releaseIndex => $release) {
$releaseIndex = str_pad($releaseIndex * -1, 2, ' ', STR_PAD_LEFT);
$releaseDate = $release[0] . $release[1] . $release[2] .$release[3]
. '-'
. $release[4] . $release[5]
. '-'
. $release[6] . $release[7]
. ' '
. $release[8] . $release[9]
. ':'
. $release[10] . $release[11]
. ':'
. $release[12] . $release[13];
Mage_Console::output(
'Release: <purple>' . $release . '</purple> '
. '- Date: <dark_gray>' . $releaseDate . '</dark_gray> '
. '- Index: <dark_gray>' . $releaseIndex . '</dark_gray>', 2);
}
}
return $result;
} else {
return false;
}
Mage/Task/BuiltIn/Scm/Update.php
+2 -2
View File
@@ -11,7 +11,7 @@ class Mage_Task_BuiltIn_Scm_Update
public function init()
{
switch ($this->_config['scm']['type']) {
switch ($this->_config->scm('type')) {
case 'git':
$this->_name = 'SCM Update (GIT) [built-in]';
break;
@@ -24,7 +24,7 @@ class Mage_Task_BuiltIn_Scm_Update
public function run()
{
switch ($this->_config['scm']['type']) {
switch ($this->_config->scm('type')) {
case 'git':
$command = 'git pull';
break;