hauke/Magallanes
1
0
Fork 0
mirror of https://github.com/hauke68/Magallanes.git synced 2025-11-04 09:00:18 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/andres-montanez/Magallanes

Browse Source 
Conflicts:
	Mage/Task/Factory.php
This commit is contained in:
Andrés Montañez 2014-06-12 16:18:14 -03:00
commit 66ea107229
16 changed files with 190 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -311,6 +311,10 @@ class DeployCommand extends AbstractCommand implements RequiresEnvironment
$deployStrategy = 'deployment/strategy/tar-gz';
break;
case 'git-rebase':
$deployStrategy = 'deployment/strategy/git-rebase';
break;
case 'guess':
default:
if ($this->getConfig()->release('enabled', false) == true) {

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

@ -54,7 +54,7 @@ class UpgradeCommand extends AbstractCommand
// Check version
$version = json_decode(file_get_contents(self::UPGRADE));
if ($version !== false) {
if ($version !== false && $version !== null) {
$versionCompare = version_compare(MAGALLANES_VERSION, $version->latest);
if ($versionCompare == 0) {
Console::output('<yellow>SKIP</yellow>', 0, 1);

1
Mage/Command/Factory.php
View File

@ -10,7 +10,6 @@
namespace Mage\Command;
use Mage\Command\AbstractCommand;
use Mage\Config;
use Mage\Autoload;

11
Mage/Config.php
View File

@ -10,7 +10,6 @@
namespace Mage;
use Symfony\Component\Yaml\Yaml;
use Exception;
/**
@ -345,6 +344,16 @@ class Config
return $info[1];
}
/**
* Get the general Host Identity File Option
*
* @return string
*/
public function getHostIdentityFileOption()
{
return $this->deployment('identity-file') ? ('-i ' . $this->deployment('identity-file') . ' ') : '';
}
/**
* Get the current Host
*

1
Mage/Console.php
View File

@ -10,7 +10,6 @@
namespace Mage;
use Mage\Config;
use Mage\Command\Factory;
use Mage\Command\RequiresEnvironment;
use Mage\Console\Colors;

1
Mage/Mailer.php
View File

@ -10,7 +10,6 @@
namespace Mage;
use Mage\Console;
/**
* Mailer Helper.

4
Mage/Task/AbstractTask.php
View File

@ -12,8 +12,6 @@ namespace Mage\Task;
use Mage\Console;
use Mage\Config;
use Mage\Task\ErrorWithMessageException;
use Mage\Task\SkipException;
use Mage\Task\Releases\IsReleaseAware;
use Exception;
@ -192,7 +190,7 @@ abstract class AbstractTask
// if general.yml includes "ssy_needs_tty: true", then add "-t" to the ssh command
$needs_tty = ($this->getConfig()->general('ssh_needs_tty',false) ? '-t' : '');
$localCommand = 'ssh ' . $needs_tty . ' -p ' . $this->getConfig()->getHostPort() . ' '
$localCommand = 'ssh ' . $this->getConfig()->getHostIdentityFileOption() . $needs_tty . ' -p ' . $this->getConfig()->getHostPort() . ' '
. '-q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no '
. $this->getConfig()->deployment('user') . '@' . $this->getConfig()->getHostName() . ' '
. '"cd ' . rtrim($this->getConfig()->deployment('to'), '/') . $releasesDirectory . ' && '

40
Mage/Task/BuiltIn/Composer/GenerateAutoload.php Normal file
View File

@ -0,0 +1,40 @@
<?php
namespace Mage\Task\BuiltIn\Composer;
use Exception;
use Mage\Task\AbstractTask;
use Mage\Task\ErrorWithMessageException;
use Mage\Task\SkipException;
class GenerateAutoload extends AbstractTask
{
/**
* Returns the Title of the Task
* @return string
*/
public function getName()
{
return 'Generating autoload files via composer [built-in]';
}
/**
* Runs the task
*
* @return boolean
* @throws Exception
* @throws ErrorWithMessageException
* @throws SkipException
*/
public function run()
{
$releasesDirectory = $this->getConfig()->release('directory', 'releases');
$releasesDirectory = rtrim($this->getConfig()->deployment('to'), '/') . '/' . $releasesDirectory;
$currentCopy = $releasesDirectory . '/' . $this->getConfig()->getReleaseId();
$sharedFolderName = $this->getParameter('shared', 'shared');
$sharedFolderName = rtrim($this->getConfig()->deployment('to'), '/') . '/' . $sharedFolderName;
$composerPath = $this->getParameter('composer', "$sharedFolderName/composer.phar");
return $this->runCommandRemote("/usr/bin/env php $composerPath --working-dir=$currentCopy dumpautoload --optimize", $output);
}
}

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

@ -59,14 +59,13 @@ class ReleaseTask extends AbstractTask implements IsReleaseAware, SkipOnOverride
$command .= ' && '
. 'chown -h ' . $userGroup . ' ' . $symlink
. ' && '
. 'chown -R ' . $userGroup . ' ' . $currentCopy;
. 'chown -R ' . $userGroup . ' ' . $currentCopy
. ' && '
. 'chown ' . $userGroup . ' ' . $releasesDirectory;
}
$result = $this->runCommandRemote($command);
// Set Directory Releases to same owner
$result = $this->runCommandRemote('chown ' . $userGroup . ' ' . $releasesDirectory);
return $result;
} else {

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

@ -35,12 +35,12 @@ class GitRebaseTask extends AbstractTask implements IsReleaseAware
*/
public function run()
{
$branch = $this->getParameter('branch');
$remote = $this->getParameter('remote');
$branch = $this->getParameter('branch', 'master');
$remote = $this->getParameter('remote', 'origin');
// Fetch Remote
$command = 'git fetch ' . $remote;
$result = $this->runCommandRemote($command) && $result;
$result = $this->runCommandRemote($command);
// Checkout
$command = 'git checkout ' . $branch;

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

@ -94,7 +94,7 @@ class RsyncTask extends AbstractTask implements IsReleaseAware
}
$command = 'rsync -avz '
. '--rsh="ssh -p' . $this->getConfig()->getHostPort() . '" '
. '--rsh="ssh ' . $this->getConfig()->getHostIdentityFileOption() . '-p' . $this->getConfig()->getHostPort() . '" '
. $this->excludes(array_merge($excludes, $userExcludes)) . ' '
. $this->getConfig()->deployment('from') . ' '
. $this->getConfig()->deployment('user') . '@' . $this->getConfig()->getHostName() . ':' . $deployToDirectory;

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

@ -89,7 +89,7 @@ class TarGzTask extends AbstractTask implements IsReleaseAware
$result = $this->runCommandLocal($command);
// Copy Tar Gz to Remote Host
$command = 'scp -P ' . $this->getConfig()->getHostPort() . ' ' . $localTarGz . '.tar.gz '
$command = 'scp ' . $this->getConfig()->getHostIdentityFileOption() . '-P ' . $this->getConfig()->getHostPort() . ' ' . $localTarGz . '.tar.gz '
. $this->getConfig()->deployment('user') . '@' . $this->getConfig()->getHostName() . ':' . $deployToDirectory;
$result = $this->runCommandLocal($command) && $result;

50
Mage/Task/BuiltIn/Filesystem/ApplyFacls.php Normal file
View File

@ -0,0 +1,50 @@
<?php
namespace Mage\Task\BuiltIn\Filesystem;
use Exception;
use Mage\Task\AbstractTask;
use Mage\Task\ErrorWithMessageException;
use Mage\Task\SkipException;
use Mage\Task\Releases\IsReleaseAware;
class ApplyFacls extends AbstractTask implements IsReleaseAware
{
/**
* Returns the Title of the Task
* @return string
*/
public function getName()
{
return 'Set file ACLs on remote system [built-in]';
}
/**
* Runs the task
*
* @return boolean
* @throws Exception
* @throws ErrorWithMessageException
* @throws SkipException
*/
public function run()
{
$releasesDirectory = $this->getConfig()->release('directory', 'releases');
$releasesDirectory = rtrim($this->getConfig()->deployment('to'), '/') . '/' . $releasesDirectory;
$currentCopy = $releasesDirectory . '/' . $this->getConfig()->getReleaseId();
$aclParam = $this->getParameter('acl_param', '');
if (empty($aclParam)) {
throw new SkipException('Parameter acl_param not set.');
}
$folders = $this->getParameter('folders', []);
$recursive = $this->getParameter('recursive', false) ? ' -R ' : ' ';
foreach ($folders as $folder) {
$this->runCommandRemote("setfacl$recursive-m $aclParam $currentCopy/$folder", $output);
}
return true;
}
}

54
Mage/Task/BuiltIn/Filesystem/LinkSharedFilesTask.php Normal file
View File

@ -0,0 +1,54 @@
<?php
namespace Mage\Task\BuiltIn\Filesystem;
use Mage\Task\AbstractTask;
use Mage\Task\Releases\IsReleaseAware;
use Mage\Task\SkipException;
class LinkSharedFilesTask extends AbstractTask implements IsReleaseAware
{
/**
* Returns the Title of the Task
* @return string
*/
public function getName()
{
return 'Linking files/folders from the shared folder into the current release [built-in]';
}
/**
* Runs the task
*
* @return boolean
* @throws Exception
* @throws \Mage\Task\ErrorWithMessageException
* @throws SkipException
*/
public function run()
{
$linkedFiles = $this->getParameter('linked_files', []);
$linkedFolders = $this->getParameter('linked_folders', []);
if (sizeof($linkedFiles) == 0 && sizeof($linkedFolders) == 0) {
throw new SkipException('No files and folders configured for sym-linking.');
}
$sharedFolderName = $this->getParameter('shared', 'shared');
$sharedFolderName = rtrim($this->getConfig()->deployment('to'), '/') . '/' . $sharedFolderName;
$releasesDirectory = $this->getConfig()->release('directory', 'releases');
$releasesDirectory = rtrim($this->getConfig()->deployment('to'), '/') . '/' . $releasesDirectory;
$currentCopy = $releasesDirectory . '/' . $this->getConfig()->getReleaseId();
foreach ($linkedFolders as $folder) {
$command = "ln -nfs $sharedFolderName/$folder $currentCopy/$folder";
$this->runCommandRemote($command);
}
foreach ($linkedFiles as $folder) {
$command = "ln -nfs $sharedFolderName/$folder $currentCopy/$folder";
$this->runCommandRemote($command);
}
return true;
}
}

3
Mage/Task/BuiltIn/Scm/ChangeBranchTask.php
View File

@ -63,8 +63,7 @@ class ChangeBranchTask extends AbstractTask
*/
public function run()
{
$scmConfig = $this->getConfig()->general('scm', array());
switch ((isset($scmConfig['type']) ? $scmConfig['type'] : false)) {
switch ($this->getConfig()->general('scm')) {
case 'git':
if ($this->getParameter('_changeBranchRevert', false)) {
$command = 'git checkout ' . self::$startingBranch;

3
Mage/Task/Factory.php
View File

@ -12,8 +12,6 @@ namespace Mage\Task;
use Mage\Config;
use Mage\Autoload;
use Mage\Task\ErrorWithMessageException;
use Mage\Task\AbstractTask;
use Exception;
@ -29,6 +27,7 @@ class Factory
*
* @param string|array $taskData
* @param \Mage\Config $taskConfig
* @param Config $taskConfig
* @param boolean $inRollback
* @param string $stage
* @return \Mage\Task\AbstractTask