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

Allow override parameters in Host configuration.

Browse Source
This commit is contained in:
Andrés Montañez
2013-07-07 19:14:32 -03:00
parent 80e0a283ff
commit 46d00e2f08
5 changed files with 75 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Mage/Command/BuiltIn/Deploy.php
+16 -1
View File
@@ -37,8 +37,20 @@ class Mage_Command_BuiltIn_Deploy
} else {
$this->_startTimeHosts = time();
foreach ($hosts as $host) {
foreach ($hosts as $_hostKey => $host) {
// Check if Host has specific configuration
$hostConfig = null;
if (is_array($host)) {
$hostConfig = $host;
$host = $_hostKey;
}
// Set Host and Host Specific Config
$this->getConfig()->setHost($host);
$this->getConfig()->setHostConfig($hostConfig);
// Prepare Tasks
$tasks = 0;
$completedTasks = 0;
@@ -71,6 +83,9 @@ class Mage_Command_BuiltIn_Deploy
Mage_Console::output('Deployment to <dark_gray>' . $this->getConfig()->getHost() . '</dark_gray> completed: <' . $tasksColor . '>' . $completedTasks . '/' . $tasks . '</' . $tasksColor . '> tasks done.', 1, 3);
}
// Reset Host Config
$this->getConfig()->setHostConfig(null);
}
$this->_endTimeHosts = time();
Mage/Config.php
+37 -1
View File
@@ -5,6 +5,7 @@ class Mage_Config
private $_parameters = array();
private $_environment = false;
private $_host = null;
private $_hostConfig = null;
private $_releaseId = null;
private $_config = array(
'general' => array(),
@@ -115,6 +116,14 @@ class Mage_Config
{
$tasks = array();
$config = $this->_getEnvironmentOption('tasks', array());
// Host Config
if (is_array($this->_hostConfig) && isset($this->_hostConfig['tasks'])) {
if (isset($this->_hostConfig['tasks'][$stage])) {
$config[$stage] = $this->_hostConfig['tasks'][$stage];
}
}
if (isset($config[$stage])) {
$tasksData = ($config[$stage] ? (array) $config[$stage] : array());
foreach ($tasksData as $taskName => $taskData) {
@@ -171,6 +180,18 @@ class Mage_Config
return $this;
}
/**
* Set the host specific configuration
*
* @param array $hostConfig
* @return Mage_Config
*/
public function setHostConfig($hostConfig = null)
{
$this->_hostConfig = $hostConfig;
return $this;
}
/**
* Get the current host name
*
@@ -234,6 +255,14 @@ class Mage_Config
*/
public function deployment($option, $default = false)
{
// Host Config
if (is_array($this->_hostConfig) && isset($this->_hostConfig['deployment'])) {
if (isset($this->_hostConfig['deployment'][$option])) {
return $this->_hostConfig['deployment'][$option];
}
}
// Global Config
$config = $this->_getEnvironmentOption('deployment', array());
if (isset($config[$option])) {
if (is_array($default) && ($config[$option] == '')) {
@@ -254,7 +283,14 @@ class Mage_Config
* @return mixed
*/
public function release($option, $default = false)
{
{
// Host Config
if (is_array($this->_hostConfig) && isset($this->_hostConfig['releases'])) {
if (isset($this->_hostConfig['releases'][$option])) {
return $this->_hostConfig['releases'][$option];
}
}
$config = $this->_getEnvironmentOption('releases', array());
if (isset($config[$option])) {
if (is_array($default) && ($config[$option] == '')) {