Skip to content
This repository has been archived by the owner on Sep 5, 2020. It is now read-only.

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Anahkiasen committed Oct 19, 2013
2 parents dd67f11 + b0248ed commit 4f65752
Show file tree
Hide file tree
Showing 32 changed files with 629 additions and 184 deletions.
11 changes: 10 additions & 1 deletion CHANGELOG.md
@@ -1,6 +1,15 @@
### Changelog

### 0.7.0 (stable)
### 0.8.0

- **Rocketeer can now have specific configurations for stages and connections**
- **Better handling of multiple connections**
- **Added facade shortcuts `Rocketeer::execute(Task)` and `Rocketeer::on(connection[s], Task)` to execute commands on the remote servers**
- Added the `--list` flag on the `rollback` command to show a list of available releases and pick one to rollback to
- Added the `--on` flag to all commands to specify which connections the task should be executed on (ex. `production`, `staging,production`)
- Added `deploy:flush` to clear Rocketeer's cache of credentials

### 0.7.0

- **Rocketeer can now work outside of Laravel**
- **Better handling of SSH keys**
Expand Down
102 changes: 54 additions & 48 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs
Submodule docs updated from 396795 to 542031
22 changes: 11 additions & 11 deletions src/Rocketeer/Commands/BaseDeployCommand.php
Expand Up @@ -25,6 +25,7 @@ protected function getOptions()
{
return array(
array('pretend', 'p', InputOption::VALUE_NONE, 'Returns an array of commands to be executed instead of actually executing them'),
array('on', 'C', InputOption::VALUE_REQUIRED, 'The connection(s) to execute the Task in'),
array('stage', 'S', InputOption::VALUE_REQUIRED, 'The stage to execute the Task in')
);
}
Expand Down Expand Up @@ -111,17 +112,16 @@ protected function getRepositoryCredentials()
*/
protected function getServerCredentials()
{
// Check for configured connections
$connections = $this->laravel['rocketeer.rocketeer']->getConnections();
if (empty($connections)) {
$connectionName = $this->ask('No connections have been set, please create one : (production)', 'production');
} else {
$connectionName = key($connections);
if ($connections = $this->option('on')) {
$this->laravel['rocketeer.rocketeer']->setConnections($connections);
}

// Set the found connection as default if none is specified
if (!isset($this->laravel['config']['remote.default'])) {
$this->laravel['config']->set('remote.default', $connectionName);
// Check for configured connections
$connections = $this->laravel['rocketeer.rocketeer']->getAvailableConnections();
$connectionName = $this->laravel['rocketeer.rocketeer']->getConnection();

if (is_null($connectionName)) {
$connectionName = $this->ask('No connections have been set, please create one : (production)', 'production');
}

// Check for server credentials
Expand All @@ -132,13 +132,13 @@ protected function getServerCredentials()
foreach ($credentials as $credential => $required) {
${$credential} = array_get($connection, $credential);
if (!${$credential} and $required) {
${$credential} = $this->ask('No '.$credential. ' is set for current connection, please provide one :');
${$credential} = $this->ask('No '.$credential. ' is set for [' .$connectionName. '], please provide one :');
}
}

// Get password or key
if (!$password and !$key) {
$type = $this->ask('No password or SSH key is set for current connection, which would you use ? [key/password]');
$type = $this->ask('No password or SSH key is set for [' .$connectionName. '], which would you use ? [key/password]');
if ($type == 'key') {
$key = $this->ask('Please enter the full path to your key');
} else {
Expand Down

0 comments on commit 4f65752

Please sign in to comment.