Merge branch 'develop'

CHANGELOG.md

@@ -4,7 +4,11 @@
 
 - Ability to select which severs a Task executes on, on a per-task basis
 
-### 0.6.0 (stable)
+### 0.6.1 (stable)
+
+- Fix a bug where the configured user would not have the rights to set permissions
+
+### 0.6.0
 
 - **Add multistage strategy**
 - **Add compatibility to Laravel 4.0**

src/Rocketeer/Bash.php

@@ -123,7 +123,12 @@ public function run($commands, $silent = false, $array = false)
 	 */
 	public function runInFolder($folder = null, $tasks = array())
 	{
-		if (!is_array($tasks)) $tasks = array($tasks);
+		// Convert to array
+		if (!is_array($tasks)) {
+			$tasks = array($tasks);
+		}
+
+		// Prepend folder
 		array_unshift($tasks, 'cd '.$this->rocketeer->getFolder($folder));
 
 		return $this->run($tasks);
@@ -287,7 +292,7 @@ public function runRemoteCommands($commands, $array = false)
 		$output = null;
 
 		// Run commands
-		$this->remote->run($commands, function($results) use (&$output) {
+		$this->remote->run($commands, function ($results) use (&$output) {
 			$output .= $results;
 		});
 
@@ -346,5 +351,4 @@ protected function processCommands($commands)
 
 		return $commands;
 	}
-
 }

src/Rocketeer/Commands/BaseDeployCommand.php

@@ -51,5 +51,4 @@ protected function getOptions()
       array('stage',   'S', InputOption::VALUE_REQUIRED, 'The stage to execute the Task in')
     );
   }
-
 }

src/Rocketeer/Commands/BaseTaskCommand.php

@@ -46,5 +46,4 @@ public function fire()
 	{
 		return $this->fireTasksQueue($this->task);
 	}
-
 }

src/Rocketeer/Commands/DeployCommand.php

@@ -25,5 +25,4 @@ public function fire()
 	{
 		$this->line('<info>Rocketeer</info> version <comment>'.Rocketeer::VERSION.'</comment>');
 	}
-
 }

src/Rocketeer/Commands/DeployDeployCommand.php

@@ -49,5 +49,4 @@ protected function getOptions()
       array('seed',    's', InputOption::VALUE_NONE, 'Seed the database after migrating the database'),
   	));
   }
-
 }

src/Rocketeer/Commands/DeployRollbackCommand.php

@@ -44,5 +44,4 @@ protected function getArguments()
 			array('release', InputArgument::OPTIONAL, 'The release to rollback to'),
 		);
 	}
-
 }

src/Rocketeer/Commands/DeployTestCommand.php

@@ -31,5 +31,4 @@ public function fire()
 		$this->input->setOption('verbose', true);
 		return $this->fireTasksQueue('Rocketeer\Tasks\Test');
 	}
-
 }

src/Rocketeer/Commands/DeployUpdateCommand.php

@@ -45,5 +45,4 @@ protected function getOptions()
       array('seed',    's', InputOption::VALUE_NONE, 'Seed the database after migrating the database'),
   	));
   }
-
 }

src/Rocketeer/Facades/Rocketeer.php

@@ -18,5 +18,4 @@ protected static function getFacadeAccessor()
 	{
 		return 'rocketeer.tasks';
 	}
-
 }

src/Rocketeer/ReleasesManager.php

@@ -136,5 +136,4 @@ public function updateCurrentRelease($release)
 	{
 		$this->app['rocketeer.server']->setValue('current_release', $release);
 	}
-
 }

src/Rocketeer/Rocketeer.php

@@ -170,8 +170,7 @@ public function getRepository($username = null, $password = null)
 		if ($username or $password) {
 
 			// Build credentials chain
-			$credentials = $username;
-			if ($password) $credentials .= ':'.$password;
+			$credentials  = $password ? $username.':'.$password : $username;
 			$credentials .= '@';
 
 			// Add them in chain
@@ -211,7 +210,9 @@ public function getRepositoryBranch()
 	public function getFolder($folder = null)
 	{
 		$base   = $this->getHomeFolder().'/';
-		if ($folder and $this->stage) $base .= $this->stage.'/';
+		if ($folder and $this->stage) {
+			$base .= $this->stage.'/';
+		}
 		$folder = str_replace($base, null, $folder);
 
 		return $base.$folder;
@@ -229,5 +230,4 @@ public function getHomeFolder()
 
 		return $rootDirectory.$this->getApplicationName();
 	}
-
 }

src/Rocketeer/RocketeerServiceProvider.php

@@ -76,23 +76,23 @@ public function provides()
 	 */
 	public function bindClasses(Container $app)
 	{
-		$app->singleton('rocketeer.rocketeer', function($app) {
+		$app->singleton('rocketeer.rocketeer', function ($app) {
 			return new Rocketeer($app);
 		});
 
-		$app->bind('rocketeer.releases', function($app) {
+		$app->bind('rocketeer.releases', function ($app) {
 			return new ReleasesManager($app);
 		});
 
-		$app->bind('rocketeer.server', function($app) {
+		$app->bind('rocketeer.server', function ($app) {
 			return new Server($app);
 		});
 
-		$app->bind('rocketeer.bash', function($app) {
+		$app->bind('rocketeer.bash', function ($app) {
 			return new Bash($app);
 		});
 
-		$app->singleton('rocketeer.tasks', function($app) {
+		$app->singleton('rocketeer.tasks', function ($app) {
 			return new TasksQueue($app);
 		});
 
@@ -112,7 +112,7 @@ public function bindScm(Container $app)
 		$scm = $this->app['rocketeer.rocketeer']->getOption('scm.scm');
 		$scm = 'Rocketeer\Scm\\'.ucfirst($scm);
 
-		$app->bind('rocketeer.scm', function($app) use ($scm) {
+		$app->bind('rocketeer.scm', function ($app) use ($scm) {
 			return new $scm($app);
 		});
 
@@ -156,7 +156,9 @@ public function bindCommands(Container $app)
 			// Build command slug
 			if ($fakeCommand) {
 				$taskInstance = $this->app['rocketeer.tasks']->buildTask($task);
-				if (is_numeric($slug)) $slug = $taskInstance->getSlug();
+				if (is_numeric($slug)) {
+					$slug = $taskInstance->getSlug();
+				}
 			}
 
 			// Add command to array
@@ -165,14 +167,13 @@ public function bindCommands(Container $app)
 
 			// Look for an existing command
 			if (!$fakeCommand) {
-				$this->app->bind($command, function($app) use ($commandClass) {
+				$this->app->bind($command, function ($app) use ($commandClass) {
 					return new $commandClass;
 				});
-			}
 
 			// Else create a fake one
-			else {
-				$this->app->bind($command, function($app) use ($taskInstance, $slug) {
+			} else {
+				$this->app->bind($command, function ($app) use ($taskInstance, $slug) {
 					return new Commands\BaseTaskCommand($taskInstance, $slug);
 				});
 			}
@@ -181,5 +182,4 @@ public function bindCommands(Container $app)
 
 		return $app;
 	}
-
 }

src/Rocketeer/Scm/Git.php

@@ -88,5 +88,4 @@ public function update()
 	{
 		return 'git pull';
 	}
-
-}
+}

src/Rocketeer/Scm/Scm.php

@@ -43,5 +43,4 @@ public function reset();
 	 * @return string
 	 */
 	public function update();
-
-}
+}

src/Rocketeer/Server.php

@@ -50,7 +50,7 @@ public function getSeparator()
 	{
 		$bash = $this->app['rocketeer.bash'];
 
-		return $this->getValue('directory_separator', function($server) use ($bash) {
+		return $this->getValue('directory_separator', function ($server) use ($bash) {
 			$separator = $bash->runRemoteCommands('php -r "echo DIRECTORY_SEPARATOR;"');
 			$server->setValue('directory_separator', $separator);
 
@@ -67,7 +67,7 @@ public function getLineEndings()
 	{
 		$bash = $this->app['rocketeer.bash'];
 
-		return $this->getValue('line_endings', function($server) use ($bash) {
+		return $this->getValue('line_endings', function ($server) use ($bash) {
 			$endings = $bash->runRemoteCommands('php -r "echo PHP_EOL;"');
 			$server->setValue('line_endings', $endings);
 
@@ -157,5 +157,4 @@ public function deleteRepository()
 	{
 		return $this->app['files']->delete($this->repository);
 	}
-
 }

src/Rocketeer/Tasks/Abstracts/Task.php

@@ -204,7 +204,7 @@ public function setPermissions($folder)
 		$apache = $this->rocketeer->getOption('remote.apache');
 
 		$output  = $this->run(array(
-			'chmod -R +x ' .$folder,
+			'chmod -R 775 ' .$folder,
 			'chmod -R g+s ' .$folder,
 			sprintf('chown -R %s:%s %s', $apache['user'], $apache['group'], $folder),
 		));
@@ -270,7 +270,9 @@ public function runTests($arguments = null)
 	{
 		// Look for PHPUnit
 		$phpunit = $this->which('phpunit', $this->releasesManager->getCurrentReleasePath().'/vendor/bin/phpunit');
-		if (!$phpunit) return true;
+		if (!$phpunit) {
+			return true;
+		}
 
 		// Run PHPUnit
 		$this->command->info('Running tests...');
@@ -280,5 +282,4 @@ public function runTests($arguments = null)
 
 		return $this->checkStatus('Tests failed', $output, 'Tests passed successfully');
 	}
-
 }

src/Rocketeer/Tasks/Check.php

@@ -159,5 +159,4 @@ public function checkPhpExtension($extension)
 
 		return in_array($extension, $this->extensions);
 	}
-
 }

src/Rocketeer/Tasks/Cleanup.php

@@ -41,5 +41,4 @@ public function execute()
 
 		return $this->command->line($message);
 	}
-
 }

src/Rocketeer/Tasks/Closure.php

@@ -48,5 +48,4 @@ public function execute()
 
 		return $closure($this);
 	}
-
 }

src/Rocketeer/Tasks/CurrentRelease.php

@@ -37,5 +37,4 @@ public function execute()
 
 		return $this->command->line($message);
 	}
-
 }

src/Rocketeer/Tasks/Deploy.php

@@ -122,5 +122,4 @@ protected function setApplicationPermissions()
 		$this->setPermissions('app/storage');
 		$this->setPermissions('public');
 	}
-
 }

src/Rocketeer/Tasks/Rollback.php

@@ -35,5 +35,4 @@ protected function getRollbackRelease()
 	{
 		return array_get($this->command->argument(), 'release', $this->releasesManager->getPreviousRelease());
 	}
-
 }

src/Rocketeer/Tasks/Setup.php

@@ -70,7 +70,9 @@ protected function createStages()
 	{
 		// Get stages
 		$stages = $this->rocketeer->getStages();
-		if (empty($stages)) $stages = array(null);
+		if (empty($stages)) {
+			$stages = array(null);
+		}
 
 		// Create folders
 		foreach ($stages as $stage) {
@@ -80,5 +82,4 @@ protected function createStages()
 			$this->createFolder('shared', true);
 		}
 	}
-
 }

src/Rocketeer/Tasks/Teardown.php

@@ -38,5 +38,4 @@ public function execute()
 
 		$this->command->info('The application was successfully removed from the remote servers');
 	}
-
 }

src/Rocketeer/Tasks/Test.php

@@ -20,5 +20,4 @@ public function execute()
 		$this->command->info('Testing the application');
 		$this->runTests();
 	}
-
 }

src/Rocketeer/Tasks/Update.php

@@ -42,5 +42,4 @@ public function execute()
 
 		$this->command->info('Successfully updated application');
 	}
-
 }