hauke/Magallanes
1
0
Fork 0
mirror of https://github.com/hauke68/Magallanes.git synced 2025-09-13 12:40:18 +02:00
Code Issues Releases Wiki Activity

Boolean and Null should be compared strictly.

Browse Source
This commit is contained in:
Andrés Montañez 2014-10-11 14:43:57 -02:00
parent 5d39e46d9e
commit f20091afc6
11 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Mage/Command/BuiltIn/DeployCommand.php
View File

@ -356,7 +356,7 @@ class DeployCommand extends AbstractCommand implements RequiresEnvironment
} }
// Releasing // Releasing
if (self::$deployStatus == self::SUCCEDED && $this->getConfig()->release('enabled', false) == true) { if (self::$deployStatus == self::SUCCEDED && $this->getConfig()->release('enabled', false) === true) {
// Execute the Releases // Execute the Releases
Console::output('Starting the <dark_gray>Releasing</dark_gray>'); Console::output('Starting the <dark_gray>Releasing</dark_gray>');
$completedTasks = 0; $completedTasks = 0;
@ -439,7 +439,7 @@ class DeployCommand extends AbstractCommand implements RequiresEnvironment
{ {
$task->init(); $task->init();
if ($title == null) { if ($title === null) {
$title = 'Running <purple>' . $task->getName() . '</purple> ... '; $title = 'Running <purple>' . $task->getName() . '</purple> ... ';
} }
Console::output($title, 2, 0); Console::output($title, 2, 0);
@ -449,11 +449,11 @@ class DeployCommand extends AbstractCommand implements RequiresEnvironment
$runTask = false; $runTask = false;
} }
if ($runTask == true) { if ($runTask === true) {
try { try {
$result = $task->run(); $result = $task->run();
if ($result == true) { if ($result === true) {
Console::output('<green>OK</green>', 0); Console::output('<green>OK</green>', 0);
$result = true; $result = true;
@ -564,7 +564,7 @@ class DeployCommand extends AbstractCommand implements RequiresEnvironment
case self::DEPLOY_STRATEGY_GUESS: case self::DEPLOY_STRATEGY_GUESS:
default: default:
if ($this->getConfig()->release('enabled', false) == true) { if ($this->getConfig()->release('enabled', false) === true) {
$deployStrategy = 'deployment/strategy/tar-gz'; $deployStrategy = 'deployment/strategy/tar-gz';
} else { } else {
$deployStrategy = 'deployment/strategy/rsync'; $deployStrategy = 'deployment/strategy/rsync';

2
Mage/Command/BuiltIn/UpdateCommand.php
View File

@ -35,7 +35,7 @@ class UpdateCommand extends AbstractCommand
Console::output('Updating application via ' . $task->getName() . ' ... ', 1, 0); Console::output('Updating application via ' . $task->getName() . ' ... ', 1, 0);
$result = $task->run(); $result = $task->run();
if ($result == true) { if ($result === true) {
Console::output('<green>OK</green>' . PHP_EOL, 0); Console::output('<green>OK</green>' . PHP_EOL, 0);
$exitCode = 0; $exitCode = 0;

4
Mage/Console.php
View File

@ -131,7 +131,7 @@ class Console
$command = Factory::get($commandName, $config); $command = Factory::get($commandName, $config);
if ($command instanceOf RequiresEnvironment) { if ($command instanceOf RequiresEnvironment) {
if ($config->getEnvironment() == false) { if ($config->getEnvironment() === false) {
throw new Exception('You must specify an environment for this command.'); throw new Exception('You must specify an environment for this command.');
} }
} }
@ -222,7 +222,7 @@ class Console
public static function log($message) public static function log($message)
{ {
if (self::$logEnabled) { if (self::$logEnabled) {
if (self::$log == null) { if (self::$log === null) {
self::$logFile = realpath(getcwd() . '/.mage/logs') . '/log-' . date('Ymd-His') . '.log'; self::$logFile = realpath(getcwd() . '/.mage/logs') . '/log-' . date('Ymd-His') . '.log';
self::$log = fopen(self::$logFile, 'w'); self::$log = fopen(self::$logFile, 'w');
} }

4
Mage/Task/AbstractTask.php
View File

@ -181,7 +181,7 @@ abstract class AbstractTask
*/ */
protected final function runCommandRemote($command, &$output = null, $cdToDirectoryFirst = true) protected final function runCommandRemote($command, &$output = null, $cdToDirectoryFirst = true)
{ {
if ($this->getConfig()->release('enabled', false) == true) { if ($this->getConfig()->release('enabled', false) === true) {
if ($this instanceOf IsReleaseAware) { if ($this instanceOf IsReleaseAware) {
$releasesDirectory = ''; $releasesDirectory = '';
@ -238,7 +238,7 @@ abstract class AbstractTask
*/ */
protected function getReleasesAwareCommand($command) protected function getReleasesAwareCommand($command)
{ {
if ($this->getConfig()->release('enabled', false) == true) { if ($this->getConfig()->release('enabled', false) === true) {
$releasesDirectory = $this->getConfig()->release('directory', 'releases'); $releasesDirectory = $this->getConfig()->release('directory', 'releases');
$deployToDirectory = $releasesDirectory . '/' . $this->getConfig()->getReleaseId(); $deployToDirectory = $releasesDirectory . '/' . $this->getConfig()->getReleaseId();

4
Mage/Task/BuiltIn/Deployment/ReleaseTask.php
View File

@ -37,7 +37,7 @@ class ReleaseTask extends AbstractTask implements IsReleaseAware, SkipOnOverride
public function run() public function run()
{ {
$resultFetch = false; $resultFetch = false;
if ($this->getConfig()->release('enabled', false) == true) { if ($this->getConfig()->release('enabled', false) === true) {
$releasesDirectory = $this->getConfig()->release('directory', 'releases'); $releasesDirectory = $this->getConfig()->release('directory', 'releases');
$symlink = $this->getConfig()->release('symlink', 'current'); $symlink = $this->getConfig()->release('symlink', 'current');
@ -107,7 +107,7 @@ class ReleaseTask extends AbstractTask implements IsReleaseAware, SkipOnOverride
protected function cleanUpReleases() protected function cleanUpReleases()
{ {
// Count Releases // Count Releases
if ($this->getConfig()->release('enabled', false) == true) { if ($this->getConfig()->release('enabled', false) === true) {
$releasesDirectory = $this->getConfig()->release('directory', 'releases'); $releasesDirectory = $this->getConfig()->release('directory', 'releases');
$symlink = $this->getConfig()->release('symlink', 'current'); $symlink = $this->getConfig()->release('symlink', 'current');

2
Mage/Task/BuiltIn/Deployment/Strategy/BaseStrategyTaskAbstract.php
View File

@ -30,7 +30,7 @@ abstract class BaseStrategyTaskAbstract extends AbstractTask implements IsReleas
$overrideRelease = $this->getParameter('overrideRelease', false); $overrideRelease = $this->getParameter('overrideRelease', false);
$symlink = $this->getConfig()->release('symlink', 'current'); $symlink = $this->getConfig()->release('symlink', 'current');
if ($overrideRelease == true) { if ($overrideRelease === true) {
$releaseToOverride = false; $releaseToOverride = false;
$resultFetch = $this->runCommandRemote('ls -ld ' . $symlink . ' | cut -d"/" -f2', $releaseToOverride); $resultFetch = $this->runCommandRemote('ls -ld ' . $symlink . ' | cut -d"/" -f2', $releaseToOverride);
if ($resultFetch && is_numeric($releaseToOverride)) { if ($resultFetch && is_numeric($releaseToOverride)) {

4
Mage/Task/BuiltIn/Deployment/Strategy/GitRemoteCacheTask.php
View File

@ -42,7 +42,7 @@ class GitRemoteCacheTask extends AbstractTask implements IsReleaseAware
{ {
$overrideRelease = $this->getParameter('overrideRelease', false); $overrideRelease = $this->getParameter('overrideRelease', false);
if ($overrideRelease == true) { if ($overrideRelease === true) {
$releaseToOverride = false; $releaseToOverride = false;
$resultFetch = $this->runCommandRemote('ls -ld current | cut -d"/" -f2', $releaseToOverride); $resultFetch = $this->runCommandRemote('ls -ld current | cut -d"/" -f2', $releaseToOverride);
if ($resultFetch && is_numeric($releaseToOverride)) { if ($resultFetch && is_numeric($releaseToOverride)) {
@ -63,7 +63,7 @@ class GitRemoteCacheTask extends AbstractTask implements IsReleaseAware
$userExcludes = $this->getConfig()->deployment('excludes', array()); $userExcludes = $this->getConfig()->deployment('excludes', array());
$deployToDirectory = $this->getConfig()->deployment('to'); $deployToDirectory = $this->getConfig()->deployment('to');
if ($this->getConfig()->release('enabled', false) == true) { if ($this->getConfig()->release('enabled', false) === true) {
$releasesDirectory = $this->getConfig()->release('directory', 'releases'); $releasesDirectory = $this->getConfig()->release('directory', 'releases');
$deployToDirectory = rtrim($this->getConfig()->deployment('to'), '/') $deployToDirectory = rtrim($this->getConfig()->deployment('to'), '/')

6
Mage/Task/BuiltIn/Deployment/Strategy/RsyncTask.php
View File

@ -27,8 +27,8 @@ class RsyncTask extends BaseStrategyTaskAbstract implements IsReleaseAware
*/ */
public function getName() public function getName()
{ {
if ($this->getConfig()->release('enabled', false) == true) { if ($this->getConfig()->release('enabled', false) === true) {
if ($this->getConfig()->getParameter('overrideRelease', false) == true) { if ($this->getConfig()->getParameter('overrideRelease', false) === true) {
return 'Deploy via Rsync (with Releases override) [built-in]'; return 'Deploy via Rsync (with Releases override) [built-in]';
} else { } else {
$rsync_copy = $this->getConfig()->deployment("rsync"); $rsync_copy = $this->getConfig()->deployment("rsync");
@ -55,7 +55,7 @@ class RsyncTask extends BaseStrategyTaskAbstract implements IsReleaseAware
// If we are working with releases // If we are working with releases
$deployToDirectory = $this->getConfig()->deployment('to'); $deployToDirectory = $this->getConfig()->deployment('to');
if ($this->getConfig()->release('enabled', false) == true) { if ($this->getConfig()->release('enabled', false) === true) {
$releasesDirectory = $this->getConfig()->release('directory', 'releases'); $releasesDirectory = $this->getConfig()->release('directory', 'releases');
$symlink = $this->getConfig()->release('symlink', 'current'); $symlink = $this->getConfig()->release('symlink', 'current');

6
Mage/Task/BuiltIn/Deployment/Strategy/TarGzTask.php
View File

@ -27,8 +27,8 @@ class TarGzTask extends BaseStrategyTaskAbstract implements IsReleaseAware
*/ */
public function getName() public function getName()
{ {
if ($this->getConfig()->release('enabled', false) == true) { if ($this->getConfig()->release('enabled', false) === true) {
if ($this->getConfig()->getParameter('overrideRelease', false) == true) { if ($this->getConfig()->getParameter('overrideRelease', false) === true) {
return 'Deploy via TarGz (with Releases override) [built-in]'; return 'Deploy via TarGz (with Releases override) [built-in]';
} else { } else {
return 'Deploy via TarGz (with Releases) [built-in]'; return 'Deploy via TarGz (with Releases) [built-in]';
@ -50,7 +50,7 @@ class TarGzTask extends BaseStrategyTaskAbstract implements IsReleaseAware
// If we are working with releases // If we are working with releases
$deployToDirectory = $this->getConfig()->deployment('to'); $deployToDirectory = $this->getConfig()->deployment('to');
if ($this->getConfig()->release('enabled', false) == true) { if ($this->getConfig()->release('enabled', false) === true) {
$releasesDirectory = $this->getConfig()->release('directory', 'releases'); $releasesDirectory = $this->getConfig()->release('directory', 'releases');
$deployToDirectory = rtrim($this->getConfig()->deployment('to'), '/') $deployToDirectory = rtrim($this->getConfig()->deployment('to'), '/')
. '/' . $releasesDirectory . '/' . $releasesDirectory

2
Mage/Task/BuiltIn/Releases/ListTask.php
View File

@ -34,7 +34,7 @@ class ListTask extends AbstractTask implements IsReleaseAware
*/ */
public function run() public function run()
{ {
if ($this->getConfig()->release('enabled', false) == true) { if ($this->getConfig()->release('enabled', false) === true) {
$releasesDirectory = $this->getConfig()->release('directory', 'releases'); $releasesDirectory = $this->getConfig()->release('directory', 'releases');
$symlink = $this->getConfig()->release('symlink', 'current'); $symlink = $this->getConfig()->release('symlink', 'current');

6
Mage/Task/BuiltIn/Releases/RollbackTask.php
View File

@ -47,7 +47,7 @@ class RollbackTask extends AbstractTask implements IsReleaseAware
*/ */
public function run() public function run()
{ {
if ($this->getConfig()->release('enabled', false) == true) { if ($this->getConfig()->release('enabled', false) === true) {
$releasesDirectory = $this->getConfig()->release('directory', 'releases'); $releasesDirectory = $this->getConfig()->release('directory', 'releases');
$symlink = $this->getConfig()->release('symlink', 'current'); $symlink = $this->getConfig()->release('symlink', 'current');
@ -111,7 +111,7 @@ class RollbackTask extends AbstractTask implements IsReleaseAware
$tasks++; $tasks++;
$result = $task->run(); $result = $task->run();
if ($result == true) { if ($result === true) {
Console::output('<green>OK</green>', 0); Console::output('<green>OK</green>', 0);
$completedTasks++; $completedTasks++;
} else { } else {
@ -161,7 +161,7 @@ class RollbackTask extends AbstractTask implements IsReleaseAware
$tasks++; $tasks++;
$result = $task->run(); $result = $task->run();
if ($result == true) { if ($result === true) {
Console::output('<green>OK</green>', 0); Console::output('<green>OK</green>', 0);
$completedTasks++; $completedTasks++;
} else { } else {