mirror of
https://github.com/andres-montanez/Magallanes
synced 2024-06-07 16:22:15 +02:00
Tweaks and fixes.
This commit is contained in:
parent
a97d172a6d
commit
4e01cc3517
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -2,6 +2,7 @@
|
|||
.settings/*
|
||||
.project
|
||||
.buildpath
|
||||
.idea
|
||||
|
||||
# OS generated files # // GitHub Recommendation
|
||||
######################
|
||||
|
|
|
@ -449,7 +449,7 @@ class DeployCommand extends AbstractCommand implements RequiresEnvironment
|
|||
|
||||
$runTask = true;
|
||||
if (($task instanceOf SkipOnOverride) && $this->getConfig()->getParameter('overrideRelease', false)) {
|
||||
$runTask == false;
|
||||
$runTask = false;
|
||||
}
|
||||
|
||||
$result = false;
|
||||
|
@ -516,6 +516,7 @@ class DeployCommand extends AbstractCommand implements RequiresEnvironment
|
|||
/**
|
||||
* Send Email Notification if enabled
|
||||
* @param boolean $result
|
||||
* @return boolean
|
||||
*/
|
||||
protected function sendNotification($result)
|
||||
{
|
||||
|
@ -534,6 +535,8 @@ class DeployCommand extends AbstractCommand implements RequiresEnvironment
|
|||
->setLogFile(Console::getLogFile())
|
||||
->setEnvironment($this->getConfig()->getEnvironment())
|
||||
->send($result);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -32,7 +32,7 @@ class ReleasesCommand extends AbstractCommand implements RequiresEnvironment
|
|||
$lockFile = '.mage/' . $this->getConfig()->getEnvironment() . '.lock';
|
||||
if (file_exists($lockFile) && ($subcommand == 'rollback')) {
|
||||
Console::output('<red>This environment is locked!</red>', 1, 2);
|
||||
return;
|
||||
return null;
|
||||
}
|
||||
|
||||
// Run Tasks for Deployment
|
||||
|
@ -47,17 +47,17 @@ class ReleasesCommand extends AbstractCommand implements RequiresEnvironment
|
|||
|
||||
switch ($subcommand) {
|
||||
case 'list':
|
||||
$task = Factory::get('releases/list', $this->getConfig());
|
||||
$task->init();
|
||||
$task = Factory::get('releases/list', $this->getConfig());
|
||||
$task->init();
|
||||
$result = $task->run();
|
||||
break;
|
||||
|
||||
case 'rollback':
|
||||
$releaseId = $this->getConfig()->getParameter('release', '');
|
||||
$task = Factory::get('releases/rollback', $this->getConfig());
|
||||
$releaseId = $this->getConfig()->getParameter('release', '');
|
||||
$task = Factory::get('releases/rollback', $this->getConfig());
|
||||
$task->init();
|
||||
$task->setRelease($releaseId);
|
||||
$result = $task->run();
|
||||
$task->setRelease($releaseId);
|
||||
$result = $task->run();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -316,12 +316,13 @@ class EncryptTask extends AbstractTask
|
|||
* Switch our current source dir to the ioncube srouce dir and create new empty dir to encrypt into
|
||||
* Write the IonCube project file (this is the file that controls IonCube encoder)
|
||||
* Run IonCube encoder
|
||||
* Delete the tempory files that we created (so long as we hadn't set 'keeptemp')
|
||||
* Delete the temporary files that we created (so long as we hadn't set 'keeptemp')
|
||||
* Return the result of the IonCube encoder
|
||||
*
|
||||
* @see \Mage\Task\AbstractTask::run()
|
||||
*
|
||||
* @return bool
|
||||
* @return boolan
|
||||
* @throws \Mage\Task\ErrorWithMessageException
|
||||
*/
|
||||
public function run() {
|
||||
$this->switchSrcToTmp ();
|
||||
|
|
|
@ -28,10 +28,11 @@ class Factory
|
|||
* Gets an instance of a Task.
|
||||
*
|
||||
* @param string|array $taskData
|
||||
* @param Mage\Config $taskConfig
|
||||
* @param \Mage\Config $taskConfig
|
||||
* @param boolean $inRollback
|
||||
* @param string $stage
|
||||
* @return \Mage\Task\AbstractTask
|
||||
* @throws \Exception|\Mage\Task\ErrorWithMessageException
|
||||
*/
|
||||
public static function get($taskData, Config $taskConfig, $inRollback = false, $stage = null)
|
||||
{
|
||||
|
@ -44,7 +45,7 @@ class Factory
|
|||
}
|
||||
|
||||
$instance = null;
|
||||
$taskName = ucwords(str_replace('-', ' ', $taskName));
|
||||
$taskName = ucwords(str_replace('-', ' ', $taskName));
|
||||
$taskName = str_replace(' ', '', $taskName);
|
||||
|
||||
if (strpos($taskName, '/') === false) {
|
||||
|
|
Loading…
Reference in a new issue