silverstripe / deploynaut

code/tasks/MigrateDeploymentStatusTask.php

Spacing +2 added lines, -2 removed lines

@@ -4,8 +4,8 @@
 
 	public function run($request) {
 		$log = function($message) {
-			$message = sprintf('[%s] ', date('Y-m-d H:i:s')) . $message;
-			echo $message . PHP_EOL;
+			$message = sprintf('[%s] ', date('Y-m-d H:i:s')).$message;
+			echo $message.PHP_EOL;
 		};
 
 		if (!Director::is_cli()) {

code/model/GitonomyCache.php

Spacing +2 added lines, -2 removed lines

@@ -7,8 +7,8 @@
 	public static $cache = array();
 
 	public static function getIncludingBranches($commit) {
-		$cacheKey = 'getIncludingBranches-' . $commit->getRepository()->getPath() . '-' . $commit->gethash();
-		if(!isset(self::$cache[$cacheKey])) {
+		$cacheKey = 'getIncludingBranches-'.$commit->getRepository()->getPath().'-'.$commit->gethash();
+		if (!isset(self::$cache[$cacheKey])) {
 			self::$cache[$cacheKey] = $commit->getIncludingBranches();
 		}
 		return self::$cache[$cacheKey];

code/model/DNBranchList.php

Spacing +9 added lines, -9 removed lines

@@ -58,20 +58,20 @@ 
 
 		try {
 			$repository = new Gitonomy\Git\Repository($this->project->getLocalCVSPath());
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 			return $branches;
 		}
 
-		foreach($repository->getReferences()->getBranches() as $branch) {
+		foreach ($repository->getReferences()->getBranches() as $branch) {
 			/** @var DNBranch $obj */
 			$obj = DNBranch::create($branch, $this->project, $this->data);
-			if($branch->getName() == 'master') {
+			if ($branch->getName() == 'master') {
 				$firstBranch = array($branch->getName() => $obj);
 			} else {
 				$branches[$branch->getName()] = $obj;
 			}
 		}
-		if($firstBranch) {
+		if ($firstBranch) {
 			$branches = $firstBranch + $branches;
 		}
 
@@ -86,11 +86,11 @@ 
 	 * @return string
 	 */
 	public function byName($name) {
-		if($this->loaded === false) {
+		if ($this->loaded === false) {
 			$this->getIterator();
 		}
 
-		if(isset($this->items[$name])) {
+		if (isset($this->items[$name])) {
 			return $this->items[$name];
 		}
 
@@ -104,12 +104,12 @@ 
 	 * @return ArrayIterator
 	 */
 	public function getIterator() {
-		if($this->loaded === false) {
+		if ($this->loaded === false) {
 			$this->items = $this->getReferences();
 			$this->loaded = true;
 		}
-		foreach($this->items as $i => $item) {
-			if(is_array($item)) {
+		foreach ($this->items as $i => $item) {
+			if (is_array($item)) {
 				$this->items[$i] = new ArrayData($item);
 			}
 		}

code/model/DNDataArchive.php

Spacing +29 added lines, -29 removed lines

@@ -121,7 +121,7 @@ 
 	}
 
 	public function onBeforeWrite() {
-		if(!$this->AuthorID) {
+		if (!$this->AuthorID) {
 			$this->AuthorID = Member::currentUserID();
 		}
 
@@ -179,7 +179,7 @@ 
 	 * @return string The human-readable size of this archive file
 	 */
 	public function FileSize() {
-		if($this->ArchiveFile()->exists()) {
+		if ($this->ArchiveFile()->exists()) {
 			return $this->ArchiveFile()->getSize();
 		} else {
 			return "N/A";
@@ -187,7 +187,7 @@ 
 	}
 
 	public function getModeNice() {
-		if($this->Mode == 'all') {
+		if ($this->Mode == 'all') {
 			return 'database and assets';
 		} else {
 			return $this->Mode;
@@ -223,12 +223,12 @@ 
 	 */
 	public function canRestore($member = null) {
 		$memberID = $member ? $member->ID : Member::currentUserID();
-		if(!$memberID) {
+		if (!$memberID) {
 			return false;
 		}
 
-		$key = $memberID . '-' . $this->EnvironmentID;
-		if(!isset(self::$_cache_can_restore[$key])) {
+		$key = $memberID.'-'.$this->EnvironmentID;
+		if (!isset(self::$_cache_can_restore[$key])) {
 			self::$_cache_can_restore[$key] = $this->Environment()->canUploadArchive($member);
 		}
 
@@ -244,12 +244,12 @@ 
 	 */
 	public function canDownload($member = null) {
 		$memberID = $member ? $member->ID : Member::currentUserID();
-		if(!$memberID) {
+		if (!$memberID) {
 			return false;
 		}
 
-		$key = $memberID . '-' . $this->EnvironmentID;
-		if(!isset(self::$_cache_can_download[$key])) {
+		$key = $memberID.'-'.$this->EnvironmentID;
+		if (!isset(self::$_cache_can_download[$key])) {
 			self::$_cache_can_download[$key] = $this->Environment()->canDownloadArchive($member);
 		}
 		return self::$_cache_can_download[$key];
@@ -274,27 +274,27 @@ 
 	 * @return boolean true if $member can upload archives linked to this environment, false if they can't.
 	 */
 	public function canMoveTo($targetEnv, $member = null) {
-		if($this->Environment()->Project()->ID != $targetEnv->Project()->ID) {
+		if ($this->Environment()->Project()->ID != $targetEnv->Project()->ID) {
 			// We don't permit moving snapshots between projects at this stage.
 			return false;
 		}
 
-		if(!$member) {
+		if (!$member) {
 			$member = Member::currentUser();
 		}
 
 		// Must be logged in to check permissions
-		if(!$member) {
+		if (!$member) {
 			return false;
 		}
 
 		// Admin can always move.
-		if(Permission::checkMember($member, 'ADMIN')) {
+		if (Permission::checkMember($member, 'ADMIN')) {
 			return true;
 		}
 
 		// Checks if the user can actually access the archive.
-		if(!$this->canDownload($member)) {
+		if (!$this->canDownload($member)) {
 			return false;
 		}
 
@@ -403,7 +403,7 @@ 
 	 * @return bool
 	 */
 	public function extractArchive($workingDir = null) {
-		if(!is_dir($workingDir)) {
+		if (!is_dir($workingDir)) {
 			mkdir($workingDir, 0700, true);
 		}
 
@@ -422,28 +422,28 @@ 
 		));
 		$process->setTimeout(3600);
 		$process->run();
-		if(!$process->isSuccessful()) {
+		if (!$process->isSuccessful()) {
 			$cleanupFn();
 			throw new RuntimeException(sprintf('Could not extract the sspak file: %s', $process->getErrorOutput()));
 		}
 
 		// Extract database.sql.gz to <workingdir>/database.sql
-		if(file_exists($workingDir . DIRECTORY_SEPARATOR . 'database.sql.gz')) {
+		if (file_exists($workingDir.DIRECTORY_SEPARATOR.'database.sql.gz')) {
 			$process = new AbortableProcess('gunzip database.sql.gz', $workingDir);
 			$process->setTimeout(3600);
 			$process->run();
-			if(!$process->isSuccessful()) {
+			if (!$process->isSuccessful()) {
 				$cleanupFn();
 				throw new RuntimeException(sprintf('Could not extract the db archive: %s', $process->getErrorOutput()));
 			}
 		}
 
 		// Extract assets.tar.gz to <workingdir>/assets/
-		if(file_exists($workingDir . DIRECTORY_SEPARATOR . 'assets.tar.gz')) {
+		if (file_exists($workingDir.DIRECTORY_SEPARATOR.'assets.tar.gz')) {
 			$process = new AbortableProcess('tar xzf assets.tar.gz', $workingDir);
 			$process->setTimeout(3600);
 			$process->run();
-			if(!$process->isSuccessful()) {
+			if (!$process->isSuccessful()) {
 				$cleanupFn();
 				throw new RuntimeException(sprintf('Could not extract the assets archive: %s', $process->getErrorOutput()));
 			}
@@ -467,7 +467,7 @@ 
 
 		$file = $this->ArchiveFile()->FullPath;
 
-		if(!is_readable($file)) {
+		if (!is_readable($file)) {
 			$result->error(sprintf('SSPak file "%s" cannot be read.', $file));
 			return $result;
 		}
@@ -475,19 +475,19 @@ 
 		$process = new AbortableProcess(sprintf('tar -tf %s', escapeshellarg($file)));
 		$process->setTimeout(120);
 		$process->run();
-		if(!$process->isSuccessful()) {
+		if (!$process->isSuccessful()) {
 			throw new RuntimeException(sprintf('Could not list files in archive: %s', $process->getErrorOutput()));
 		}
 
 		$output = explode(PHP_EOL, $process->getOutput());
 		$files = array_filter($output);
 
-		if(in_array($mode, array('all', 'db')) && !in_array('database.sql.gz', $files)) {
+		if (in_array($mode, array('all', 'db')) && !in_array('database.sql.gz', $files)) {
 			$result->error('The snapshot is missing the database.');
 			return $result;
 		}
 
-		if(in_array($mode, array('all', 'assets')) && !in_array('assets.tar.gz', $files)) {
+		if (in_array($mode, array('all', 'assets')) && !in_array('assets.tar.gz', $files)) {
 			$result->error('The snapshot is missing assets.');
 			return $result;
 		}
@@ -517,11 +517,11 @@ 
 			sprintf('find %s -type f -exec chmod 644 {} +', escapeshellarg($workingDir))
 		);
 
-		foreach($fixCmds as $cmd) {
+		foreach ($fixCmds as $cmd) {
 			$process = new AbortableProcess($cmd);
 			$process->setTimeout(3600);
 			$process->run();
-			if(!$process->isSuccessful()) {
+			if (!$process->isSuccessful()) {
 				throw new RuntimeException($process->getErrorOutput());
 			}
 		}
@@ -540,11 +540,11 @@ 
 	 */
 	public function setArchiveFromFiles($workingDir) {
 		$commands = array();
-		if($this->Mode == 'db') {
+		if ($this->Mode == 'db') {
 			$commands[] = 'gzip database.sql';
 			$commands[] = sprintf('tar -cf %s database.sql.gz', $this->ArchiveFile()->FullPath);
 			$commands[] = 'rm -f database.sql.gz';
-		} elseif($this->Mode == 'assets') {
+		} elseif ($this->Mode == 'assets') {
 			$commands[] = 'GZIP=-1 tar --dereference -czf assets.tar.gz assets';
 			$commands[] = sprintf('tar -cf %s assets.tar.gz', $this->ArchiveFile()->FullPath);
 			$commands[] = 'rm -f assets.tar.gz';
@@ -558,7 +558,7 @@ 
 		$process = new AbortableProcess(implode(' && ', $commands), $workingDir);
 		$process->setTimeout(3600);
 		$process->run();
-		if(!$process->isSuccessful()) {
+		if (!$process->isSuccessful()) {
 			throw new RuntimeException($process->getErrorOutput());
 		}
 

code/model/jobs/DNCreateEnvironment.php

Spacing +9 added lines, -9 removed lines

@@ -68,7 +68,7 @@ 
 	 * @return string
 	 */
 	public function LogLink() {
-		return $this->Link() . '/log';
+		return $this->Link().'/log';
 	}
 
 	/**
@@ -110,9 +110,9 @@ 
 		$status = new Resque_Job_Status($this->ResqueToken);
 		$statusCode = $status->get();
 		// The Resque job can no longer be found, fallback to the DNDeployment.Status
-		if($statusCode === false) {
+		if ($statusCode === false) {
 			// Translate from the DNDeployment.Status to the Resque job status for UI purposes
-			switch($this->Status) {
+			switch ($this->Status) {
 				case 'Finished':
 					return 'Complete';
 				case 'Started':
@@ -139,11 +139,11 @@ 
 			'projectName' => $project->Name
 		);
 
-		if(!$this->CreatorID) {
+		if (!$this->CreatorID) {
 			$this->CreatorID = Member::currentUserID();
 		}
 
-		if($this->CreatorID) {
+		if ($this->CreatorID) {
 			$creator = $this->Creator();
 			$message = sprintf(
 				'Environment creation for project %s initiated by %s (%s), with IP address %s',
@@ -171,7 +171,7 @@ 
 
 	public function createEnvironment() {
 		$backend = $this->getBackend();
-		if($backend) {
+		if ($backend) {
 			return $backend->createEnvironment($this);
 		}
 		throw new Exception("Unable to find backend.");
@@ -185,12 +185,12 @@ 
 	 */
 	public function getBackend() {
 		$data = unserialize($this->Data);
-		if(isset($data['EnvironmentType']) && class_exists($data['EnvironmentType'])) {
+		if (isset($data['EnvironmentType']) && class_exists($data['EnvironmentType'])) {
 			$env = Injector::inst()->get($data['EnvironmentType']);
-			if($env instanceof EnvironmentCreateBackend) {
+			if ($env instanceof EnvironmentCreateBackend) {
 				return $env;
 			} else {
-				throw new Exception("Invalid backend: " . $data['EnvironmentType']);
+				throw new Exception("Invalid backend: ".$data['EnvironmentType']);
 			}
 		}
 		return null;

code/model/jobs/DNDataTransfer.php

Spacing +13 added lines, -13 removed lines

@@ -112,7 +112,7 @@ 
 	}
 
 	public function getTitle() {
-		return $this->dbObject('Created')->Nice() . " (Status: {$this->Status})";
+		return $this->dbObject('Created')->Nice()." (Status: {$this->Status})";
 	}
 
 	public function Link() {
@@ -169,11 +169,11 @@ 
 			'backupBeforePush' => $this->backupBeforePush
 		);
 
-		if(!$this->AuthorID) {
+		if (!$this->AuthorID) {
 			$this->AuthorID = Member::currentUserID();
 		}
 
-		if($this->AuthorID) {
+		if ($this->AuthorID) {
 			$author = $this->Author();
 			$message = sprintf(
 				'Data transfer on %s (%s, %s) initiated by %s (%s), with IP address %s',
@@ -231,23 +231,23 @@ 
 
 	public function getDescription() {
 		$envName = $this->Environment()->getFullName();
-		if($this->Direction == 'get') {
-			if($this->Origin == 'ManualUpload') {
-				$description = 'Manual upload of ' . $this->getModeNice() . ' to ' . $envName;
-			} elseif($this->IsBackupDataTransfer()) {
-				$description = 'Automated backup of ' . $this->getModeNice() . ' from ' . $envName;
+		if ($this->Direction == 'get') {
+			if ($this->Origin == 'ManualUpload') {
+				$description = 'Manual upload of '.$this->getModeNice().' to '.$envName;
+			} elseif ($this->IsBackupDataTransfer()) {
+				$description = 'Automated backup of '.$this->getModeNice().' from '.$envName;
 			} else {
-				$description = 'Backup of ' . $this->getModeNice() . ' to ' . $envName;
+				$description = 'Backup of '.$this->getModeNice().' to '.$envName;
 			}
 		} else {
-			$description = 'Restore ' . $this->getModeNice() . ' to ' . $envName;
+			$description = 'Restore '.$this->getModeNice().' to '.$envName;
 		}
 
 		return $description;
 	}
 
 	public function getModeNice() {
-		if($this->Mode == 'all') {
+		if ($this->Mode == 'all') {
 			return 'database and assets';
 		} else {
 			return $this->Mode;
@@ -287,9 +287,9 @@ 
 		$status = new Resque_Job_Status($this->ResqueToken);
 		$statusCode = $status->get();
 		// The Resque job can no longer be found, fallback to the DNDataTransfer.Status
-		if($statusCode === false) {
+		if ($statusCode === false) {
 			// Translate from the DNDataTransfer.Status to the Resque job status for UI purposes
-			switch($this->Status) {
+			switch ($this->Status) {
 				case 'Finished':
 					return 'Complete';
 				case 'Started':

code/model/jobs/DNGitFetch.php

Spacing +4 added lines, -4 removed lines

@@ -54,11 +54,11 @@ 
 		$project = $this->Project();
 		$log = $this->log();
 
-		if(!$this->DeployerID) {
+		if (!$this->DeployerID) {
 			$this->DeployerID = Member::currentUserID();
 		}
 
-		if($this->DeployerID) {
+		if ($this->DeployerID) {
 			$deployer = $this->Deployer();
 			$message = sprintf(
 				'Update repository job for %s initiated by %s (%s)',
@@ -131,9 +131,9 @@ 
 		$status = new Resque_Job_Status($this->ResqueToken);
 		$statusCode = $status->get();
 		// The Resque job can no longer be found, fallback to the DNDeployment.Status
-		if($statusCode === false) {
+		if ($statusCode === false) {
 			// Translate from the DNDeployment.Status to the Resque job status for UI purposes
-			switch($this->Status) {
+			switch ($this->Status) {
 				case 'Finished':
 					return 'Complete';
 				case 'Started':

code/model/jobs/DNPing.php

Spacing +3 added lines, -3 removed lines

@@ -37,7 +37,7 @@ 
 	 * @return string
 	 */
 	public function LogLink() {
-		return $this->Link() . '/log';
+		return $this->Link().'/log';
 	}
 
 	/**
@@ -107,11 +107,11 @@ 
 			'pingID' => $this->ID
 		);
 
-		if(!$this->DeployerID) {
+		if (!$this->DeployerID) {
 			$this->DeployerID = Member::currentUserID();
 		}
 
-		if($this->DeployerID) {
+		if ($this->DeployerID) {
 			$deployer = $this->Deployer();
 			$message = sprintf(
 				'Ping to %s initiated by %s (%s)',

code/model/DNData.php

Spacing +21 added lines, -21 removed lines

@@ -59,7 +59,7 @@ 
 		parent::__construct();
 
 		// Better to use injector to set these
-		if(func_num_args() == 0) {
+		if (func_num_args() == 0) {
 			return;
 		}
 		Deprecation::notice(
@@ -88,8 +88,8 @@ 
 	 * @param string $environmentDir
 	 */
 	public function setEnvironmentDir($environmentDir) {
-		if($environmentDir[0] != "/") {
-			$environmentDir = BASE_PATH . '/' . $environmentDir;
+		if ($environmentDir[0] != "/") {
+			$environmentDir = BASE_PATH.'/'.$environmentDir;
 		}
 		$this->environmentDir = realpath($environmentDir) ?: $environmentDir;
 	}
@@ -109,8 +109,8 @@ 
 	 * @param string $keyDir
 	 */
 	public function setKeyDir($keyDir) {
-		if($keyDir[0] != "/") {
-			$keyDir = BASE_PATH . '/' . $keyDir;
+		if ($keyDir[0] != "/") {
+			$keyDir = BASE_PATH.'/'.$keyDir;
 		}
 		$this->keyDir = realpath($keyDir) ?: $keyDir;
 	}
@@ -126,8 +126,8 @@ 
 	 * @param string $signalDir
 	 */
 	public function setSignalDir($signalDir) {
-		if($signalDir[0] != "/") {
-			$signalDir = BASE_PATH . '/' . $signalDir;
+		if ($signalDir[0] != "/") {
+			$signalDir = BASE_PATH.'/'.$signalDir;
 		}
 		$this->signalDir = realpath($signalDir) ?: $signalDir;
 	}
@@ -168,10 +168,10 @@ 
 	 * @param string $transferDir
 	 */
 	public function setDataTransferDir($transferDir) {
-		if($transferDir[0] != "/") {
-			$transferDir = BASE_PATH . '/' . $transferDir;
+		if ($transferDir[0] != "/") {
+			$transferDir = BASE_PATH.'/'.$transferDir;
 		}
-		if(strpos($transferDir, ASSETS_PATH) === false) {
+		if (strpos($transferDir, ASSETS_PATH) === false) {
 			throw new LogicException(sprintf(
 				'DNData::dataTransferDir needs to be located within <webroot>assets/ (location: %s)',
 				$transferDir
@@ -198,16 +198,16 @@ 
 	 */
 	public function getProjectPaths() {
 		$paths = array();
-		if(!file_exists($this->getEnvironmentDir())) {
-			$eMessage = 'The environment directory ' . $this->getEnvironmentDir() . ' doesn\'t exist. Create it '
+		if (!file_exists($this->getEnvironmentDir())) {
+			$eMessage = 'The environment directory '.$this->getEnvironmentDir().' doesn\'t exist. Create it '
 			. 'first and add some projects to it.';
 			throw new Exception($eMessage);
 		}
-		foreach(scandir($this->getEnvironmentDir()) as $project) {
+		foreach (scandir($this->getEnvironmentDir()) as $project) {
 			// Exlcude dot-prefixed directories (.git was getting in the way)
-			if(preg_match('/^[^\.]/', $project)) {
-				$path = $this->getEnvironmentDir() . '/' . $project;
-				if(is_dir($path) && $project != '.' && $project != '..') {
+			if (preg_match('/^[^\.]/', $project)) {
+				$path = $this->getEnvironmentDir().'/'.$project;
+				if (is_dir($path) && $project != '.' && $project != '..') {
 					$paths[] = $project;
 				}
 			}
@@ -221,15 +221,15 @@ 
 	 * Returns an array of paths
 	 */
 	public function getEnvironmentPaths($project) {
-		$baseDir = $this->getEnvironmentDir() . '/' . $project;
+		$baseDir = $this->getEnvironmentDir().'/'.$project;
 
 		$paths = array();
-		if(!file_exists($baseDir)) {
-			throw new Exception('Environment directory ' . $baseDir . ' doesn\'t exist. Create it first.');
+		if (!file_exists($baseDir)) {
+			throw new Exception('Environment directory '.$baseDir.' doesn\'t exist. Create it first.');
 		}
 		// Search the directory for config files.
-		foreach(scandir($baseDir) as $environmentFile) {
-			if(preg_match('/\.rb$/', $environmentFile)) {
+		foreach (scandir($baseDir) as $environmentFile) {
+			if (preg_match('/\.rb$/', $environmentFile)) {
 				// Config found, wrap it into an object.
 				$paths[] = "$baseDir/$environmentFile";
 			}