mirror of
https://github.com/andres-montanez/Magallanes
synced 2024-06-01 21:32:16 +02:00
Merge branch 'develop'
This commit is contained in:
commit
97e9fde28a
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -3,6 +3,7 @@
|
||||||
.project
|
.project
|
||||||
.buildpath
|
.buildpath
|
||||||
.idea
|
.idea
|
||||||
|
vendor
|
||||||
|
|
||||||
# OS generated files # // GitHub Recommendation
|
# OS generated files # // GitHub Recommendation
|
||||||
######################
|
######################
|
||||||
|
|
|
@ -35,6 +35,7 @@ class DeployCommand extends AbstractCommand implements RequiresEnvironment
|
||||||
const DEPLOY_STRATEGY_RSYNC = 'rsync';
|
const DEPLOY_STRATEGY_RSYNC = 'rsync';
|
||||||
const DEPLOY_STRATEGY_TARGZ = 'targz';
|
const DEPLOY_STRATEGY_TARGZ = 'targz';
|
||||||
const DEPLOY_STRATEGY_GIT_REBASE = 'git-rebase';
|
const DEPLOY_STRATEGY_GIT_REBASE = 'git-rebase';
|
||||||
|
const DEPLOY_STRATEGY_GIT_REMOTE_CACHE = 'git-remote-cache';
|
||||||
const DEPLOY_STRATEGY_GUESS = 'guess';
|
const DEPLOY_STRATEGY_GUESS = 'guess';
|
||||||
const DEFAULT_DEPLOY_STRATEGY = self::DEPLOY_STRATEGY_GUESS;
|
const DEFAULT_DEPLOY_STRATEGY = self::DEPLOY_STRATEGY_GUESS;
|
||||||
|
|
||||||
|
@ -557,6 +558,10 @@ class DeployCommand extends AbstractCommand implements RequiresEnvironment
|
||||||
$deployStrategy = 'deployment/strategy/git-rebase';
|
$deployStrategy = 'deployment/strategy/git-rebase';
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case self::DEPLOY_STRATEGY_GIT_REMOTE_CACHE:
|
||||||
|
$deployStrategy = 'deployment/strategy/git-remote-cache';
|
||||||
|
break;
|
||||||
|
|
||||||
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) {
|
||||||
|
|
|
@ -19,8 +19,9 @@ use Mage\Task\AbstractTask;
|
||||||
*/
|
*/
|
||||||
abstract class ComposerAbstractTask extends AbstractTask
|
abstract class ComposerAbstractTask extends AbstractTask
|
||||||
{
|
{
|
||||||
protected function getComposerPath()
|
protected function getComposerCmd()
|
||||||
{
|
{
|
||||||
return $this->getConfig()->general('composer_path', 'php composer.phar');
|
$composerCmd = $this->getParameter('composer_cmd', $this->getConfig()->general('composer_cmd', 'php composer.phar'));
|
||||||
|
return $this->getConfig()->general('composer_cmd', $composerCmd);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,6 +23,6 @@ class GenerateAutoloadTask extends ComposerAbstractTask
|
||||||
*/
|
*/
|
||||||
public function run()
|
public function run()
|
||||||
{
|
{
|
||||||
return $this->runCommand($this->getComposerPath() . ' dumpautoload --optimize');
|
return $this->runCommand($this->getComposerCmd() . ' dumpautoload --optimize');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,6 +23,7 @@ class InstallTask extends ComposerAbstractTask
|
||||||
*/
|
*/
|
||||||
public function run()
|
public function run()
|
||||||
{
|
{
|
||||||
return $this->runCommand($this->getComposerPath() . ' install');
|
$dev = $this->getParameter('dev', true);
|
||||||
|
return $this->runCommand($this->getComposerCmd() . ' install' . ($dev ? ' --dev' : ' --no-dev'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -111,7 +111,7 @@ class RsyncTask extends BaseStrategyTaskAbstract implements IsReleaseAware
|
||||||
{
|
{
|
||||||
$excludesRsync = '';
|
$excludesRsync = '';
|
||||||
foreach ($excludes as $exclude) {
|
foreach ($excludes as $exclude) {
|
||||||
$excludesRsync .= ' --exclude ' . $exclude . ' ';
|
$excludesRsync .= ' --exclude=' . escapeshellarg($exclude) . ' ';
|
||||||
}
|
}
|
||||||
|
|
||||||
$excludesRsync = trim($excludesRsync);
|
$excludesRsync = trim($excludesRsync);
|
||||||
|
|
16
bin/mage
16
bin/mage
|
@ -9,19 +9,21 @@
|
||||||
* file that was distributed with this source code.
|
* file that was distributed with this source code.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Mage\Autoload;
|
|
||||||
|
|
||||||
date_default_timezone_set('UTC');
|
date_default_timezone_set('UTC');
|
||||||
|
|
||||||
$baseDir = dirname(dirname(__FILE__));
|
$baseDir = dirname(dirname(__FILE__));
|
||||||
|
|
||||||
define('MAGALLANES_VERSION', '1.0.1');
|
define('MAGALLANES_VERSION', '1.0.2');
|
||||||
define('MAGALLANES_DIRECTORY', $baseDir);
|
define('MAGALLANES_DIRECTORY', $baseDir);
|
||||||
|
|
||||||
// Preload
|
if (file_exists(__DIR__ . '/../vendor/autoload.php')) {
|
||||||
require_once $baseDir . '/Mage/Autoload.php';
|
require_once __DIR__ . '/../vendor/autoload.php';
|
||||||
$loader = new Autoload();
|
} else {
|
||||||
spl_autoload_register(array($loader, 'autoLoad'));
|
require_once $baseDir . '/Mage/Autoload.php';
|
||||||
|
$loader = new \Mage\Autoload();
|
||||||
|
spl_autoload_register(array($loader, 'autoLoad'));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// Clean arguments
|
// Clean arguments
|
||||||
array_shift($argv);
|
array_shift($argv);
|
||||||
|
|
|
@ -8,6 +8,13 @@
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=5.3"
|
"php": ">=5.3"
|
||||||
},
|
},
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"Mage\\": "./Mage",
|
||||||
|
"Task\\": ".mage/tasks",
|
||||||
|
"Command\\": ".mage/commands"
|
||||||
|
}
|
||||||
|
},
|
||||||
"bin": [
|
"bin": [
|
||||||
"bin/mage"
|
"bin/mage"
|
||||||
]
|
]
|
||||||
|
|
Loading…
Reference in a new issue