silverstripe / deploynaut

code/tasks/DNMigrate1_1to1_2.php

Indentation +32 added lines, -32 removed lines

@@ -1,39 +1,39 @@
 <?php
 /**
- * Will convert the Filename to the version 1.2 of deploynaut where it
- * more or less is exactly is the same as the Name but with .rb
- */
+	 * Will convert the Filename to the version 1.2 of deploynaut where it
+	 * more or less is exactly is the same as the Name but with .rb
+	 */
 class DNMigrate1_1to1_2 extends BuildTask
 {
-    /**
-     * @param SS_HTTPRequest $request
-     */
-    public function run($request = null)
-    {
-        $projects = DNProject::get();
+	/**
+	 * @param SS_HTTPRequest $request
+	 */
+	public function run($request = null)
+	{
+		$projects = DNProject::get();
 
-        foreach ($projects as $project) {
-            $environments = $project->DNEnvironmentList();
-            foreach ($environments as $environment) {
-                $newFilename = basename($environment->Filename);
-                if ($environment->Filename != $newFilename) {
-                    echo 'Migrating "' . $environment->Filename . '" to ' . $newFilename . PHP_EOL;
-                    $environment->Filename = $newFilename;
-                    $environment->write();
-                }
-            }
-        }
+		foreach ($projects as $project) {
+			$environments = $project->DNEnvironmentList();
+			foreach ($environments as $environment) {
+				$newFilename = basename($environment->Filename);
+				if ($environment->Filename != $newFilename) {
+					echo 'Migrating "' . $environment->Filename . '" to ' . $newFilename . PHP_EOL;
+					$environment->Filename = $newFilename;
+					$environment->write();
+				}
+			}
+		}
 
-        $warnings = false;
-        // Check if all project folders exists
-        foreach ($projects as $project) {
-            if (!$project->projectFolderExists()) {
-                $warnings = true;
-                echo 'Project ' . $project->Name . ' don\'t have a cap project folder' . PHP_EOL;
-            }
-        }
-        if ($warnings) {
-            exit(1);
-        }
-    }
+		$warnings = false;
+		// Check if all project folders exists
+		foreach ($projects as $project) {
+			if (!$project->projectFolderExists()) {
+				$warnings = true;
+				echo 'Project ' . $project->Name . ' don\'t have a cap project folder' . PHP_EOL;
+			}
+		}
+		if ($warnings) {
+			exit(1);
+		}
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -12,11 +12,11 @@ 
     {
         $projects = DNProject::get();
 
-        foreach ($projects as $project) {
+        foreach($projects as $project) {
             $environments = $project->DNEnvironmentList();
-            foreach ($environments as $environment) {
+            foreach($environments as $environment) {
                 $newFilename = basename($environment->Filename);
-                if ($environment->Filename != $newFilename) {
+                if($environment->Filename != $newFilename) {
                     echo 'Migrating "' . $environment->Filename . '" to ' . $newFilename . PHP_EOL;
                     $environment->Filename = $newFilename;
                     $environment->write();
@@ -26,13 +26,13 @@ 
 
         $warnings = false;
         // Check if all project folders exists
-        foreach ($projects as $project) {
-            if (!$project->projectFolderExists()) {
+        foreach($projects as $project) {
+            if(!$project->projectFolderExists()) {
                 $warnings = true;
                 echo 'Project ' . $project->Name . ' don\'t have a cap project folder' . PHP_EOL;
             }
         }
-        if ($warnings) {
+        if($warnings) {
             exit(1);
         }
     }

Braces +2 added lines, -4 removed lines

@@ -3,13 +3,11 @@
  * Will convert the Filename to the version 1.2 of deploynaut where it
  * more or less is exactly is the same as the Name but with .rb
  */
-class DNMigrate1_1to1_2 extends BuildTask
-{
+class DNMigrate1_1to1_2 extends BuildTask {
     /**
      * @param SS_HTTPRequest $request
      */
-    public function run($request = null)
-    {
+    public function run($request = null) {
         $projects = DNProject::get();
 
         foreach ($projects as $project) {

code/tasks/FilesystemSyncTask.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Surface Filesystem::sync() as a dev task in case CMS has not been included.
- */
+	 * Surface Filesystem::sync() as a dev task in case CMS has not been included.
+	 */
 class CMSFilesystemSyncTask extends BuildTask
 {
-    public function run($request = null)
-    {
-        Filesystem::sync();
-    }
+	public function run($request = null)
+	{
+		Filesystem::sync();
+	}
 }

Braces +2 added lines, -4 removed lines

@@ -2,10 +2,8 @@
 /**
  * Surface Filesystem::sync() as a dev task in case CMS has not been included.
  */
-class CMSFilesystemSyncTask extends BuildTask
-{
-    public function run($request = null)
-    {
+class CMSFilesystemSyncTask extends BuildTask {
+    public function run($request = null) {
         Filesystem::sync();
     }
 }

code/tasks/SyncProjectsAndEnvironments.php

Indentation +172 added lines, -172 removed lines

@@ -2,176 +2,176 @@
 
 class SyncProjectsAndEnvironments extends BuildTask
 {
-    /**
-     * @param SS_HTTPRequest|null $request
-     */
-    public function run($request = null)
-    {
-        // should syncing remove obsolete records?
-        $remove = true;
-        $dryRun = true;
-
-        if ($request && $request->requestVar('remove') !== null) {
-            $remove = (bool)$request->requestVar('remove');
-        }
-
-        if ($request && $request->requestVar('dryrun') !== null) {
-            $dryRun = (bool)$request->requestVar('dryrun');
-        }
-
-        if ($dryRun) {
-            echo "Running in dry run mode, no changes commited, ";
-            echo "the output shows a prediction on what will happen." . PHP_EOL;
-            echo "To skip dryrun, run the task like this:" . PHP_EOL;
-            echo "./framework/sake dev/tasks/SyncProjectsAndEnvironments dryrun=0" . PHP_EOL . PHP_EOL;
-            sleep(3);
-        }
-
-        $data = DNData::inst();
-        $projectPaths = $data->getProjectPaths();
-
-        // Sync projects
-        $projects = DNProject::get();
-        if ($remove) {
-            $this->echoHeader('Removing obsolete projects');
-            $this->removeObsoleteProjects($projectPaths, $dryRun);
-        }
-        $this->echoHeader('Adding new projects');
-        $this->syncProjectPaths($projectPaths, $dryRun);
-
-        $this->echoHeader('Syncing environment files');
-        foreach ($projects as $project) {
-            $this->echoHeader($project->Name);
-            // Sync environments for each project
-            $environmentPaths = $data->getEnvironmentPaths($project->Name);
-            $this->removeObsoleteEnvironments($environmentPaths, $project, $dryRun);
-            $this->syncEnvironmentPaths($environmentPaths, $project, $dryRun);
-        }
-    }
-
-    /**
-     * Remove environment files that can't be found on disk
-     *
-     * @param array $paths Array of pathnames
-     * @param DNProject
-     * @param bool $dryRun
-     */
-    protected function removeObsoleteEnvironments($paths, $project, $dryRun = false)
-    {
-        $list = $project->Environments();
-
-        $basePaths = array_map(function ($path) {
-            return basename($path);
-        }, $paths);
-
-        $removeList = $list->filter('Filename:not', $basePaths);
-        if ($removeList->count() === 0) {
-            return;
-        }
-
-        foreach ($removeList as $remove) {
-            $this->message('Removing "' . basename($remove->Name) . '" from db');
-            if (!$dryRun) {
-                $removeList->remove($remove);
-            }
-        }
-    }
-
-    /**
-     * Remove projects that don't exists on disk but in the database
-     *
-     * @todo add a archive functionality
-     *
-     * @param array $paths
-     */
-    protected function removeObsoleteProjects($paths, $dryrun = false)
-    {
-        $removeList = DNProject::get()->filter('Name:not', $paths);
-        if ($removeList->count() == 0) {
-            return;
-        }
-
-        foreach ($removeList as $remove) {
-            $this->message($remove->Name . ' ' . $remove->Path);
-            if (!$dryrun) {
-                $removeList->remove($remove);
-            }
-        }
-    }
-
-    /**
-     * Sync the in-db project list with a list of file paths
-     *
-     * @param array $paths Array of pathnames
-     * @param DNProject
-     * @param bool $dryRun
-     */
-    protected function syncEnvironmentPaths($paths, $project, $dryRun = false)
-    {
-        $list = $project->Environments();
-
-        // Normalise paths in DB
-        foreach ($list as $item) {
-            $real = realpath($item->Filename);
-            if ($real && $real != $item->Filename) {
-                $item->Filename = $real;
-                $item->write();
-            }
-        }
-
-        foreach ($paths as $path) {
-            $path = basename($path);
-            if ($list->filter('Filename', $path)->count()) {
-                continue;
-            }
-
-            $this->message('Adding "' . basename($path) . '" to db');
-            if (!$dryRun) {
-                $environment = DNEnvironment::create_from_path($path);
-                $environment->ProjectID = $project->ID;
-                $environment->write();
-            }
-        }
-    }
-
-    /**
-     * Sync the in-db project list with a list of file paths
-     *
-     * @param array $paths Array of pathnames
-     * @param boolean $dryRun
-     */
-    public function syncProjectPaths($paths, $dryRun = false)
-    {
-        foreach ($paths as $path) {
-            if (!DNProject::get()->filter('Name', $path)->count()) {
-                $this->message($path);
-                if (!$dryRun) {
-                    DNProject::create_from_path($path)->write();
-                }
-            }
-        }
-    }
-
-    /**
-     * @param string $text
-     */
-    protected function message($text)
-    {
-        if (PHP_SAPI !== 'cli') {
-            $text = '<p>' . $text . '</p>' . PHP_EOL;
-        }
-        echo ' - ' . $text . PHP_EOL;
-    }
-
-    /**
-     * @param string $text
-     */
-    protected function echoHeader($text)
-    {
-        if (PHP_SAPI !== 'cli') {
-            echo '<h2>' . $text . '</h2>' . PHP_EOL;
-        } else {
-            echo '# ' . $text . PHP_EOL;
-        }
-    }
+	/**
+	 * @param SS_HTTPRequest|null $request
+	 */
+	public function run($request = null)
+	{
+		// should syncing remove obsolete records?
+		$remove = true;
+		$dryRun = true;
+
+		if ($request && $request->requestVar('remove') !== null) {
+			$remove = (bool)$request->requestVar('remove');
+		}
+
+		if ($request && $request->requestVar('dryrun') !== null) {
+			$dryRun = (bool)$request->requestVar('dryrun');
+		}
+
+		if ($dryRun) {
+			echo "Running in dry run mode, no changes commited, ";
+			echo "the output shows a prediction on what will happen." . PHP_EOL;
+			echo "To skip dryrun, run the task like this:" . PHP_EOL;
+			echo "./framework/sake dev/tasks/SyncProjectsAndEnvironments dryrun=0" . PHP_EOL . PHP_EOL;
+			sleep(3);
+		}
+
+		$data = DNData::inst();
+		$projectPaths = $data->getProjectPaths();
+
+		// Sync projects
+		$projects = DNProject::get();
+		if ($remove) {
+			$this->echoHeader('Removing obsolete projects');
+			$this->removeObsoleteProjects($projectPaths, $dryRun);
+		}
+		$this->echoHeader('Adding new projects');
+		$this->syncProjectPaths($projectPaths, $dryRun);
+
+		$this->echoHeader('Syncing environment files');
+		foreach ($projects as $project) {
+			$this->echoHeader($project->Name);
+			// Sync environments for each project
+			$environmentPaths = $data->getEnvironmentPaths($project->Name);
+			$this->removeObsoleteEnvironments($environmentPaths, $project, $dryRun);
+			$this->syncEnvironmentPaths($environmentPaths, $project, $dryRun);
+		}
+	}
+
+	/**
+	 * Remove environment files that can't be found on disk
+	 *
+	 * @param array $paths Array of pathnames
+	 * @param DNProject
+	 * @param bool $dryRun
+	 */
+	protected function removeObsoleteEnvironments($paths, $project, $dryRun = false)
+	{
+		$list = $project->Environments();
+
+		$basePaths = array_map(function ($path) {
+			return basename($path);
+		}, $paths);
+
+		$removeList = $list->filter('Filename:not', $basePaths);
+		if ($removeList->count() === 0) {
+			return;
+		}
+
+		foreach ($removeList as $remove) {
+			$this->message('Removing "' . basename($remove->Name) . '" from db');
+			if (!$dryRun) {
+				$removeList->remove($remove);
+			}
+		}
+	}
+
+	/**
+	 * Remove projects that don't exists on disk but in the database
+	 *
+	 * @todo add a archive functionality
+	 *
+	 * @param array $paths
+	 */
+	protected function removeObsoleteProjects($paths, $dryrun = false)
+	{
+		$removeList = DNProject::get()->filter('Name:not', $paths);
+		if ($removeList->count() == 0) {
+			return;
+		}
+
+		foreach ($removeList as $remove) {
+			$this->message($remove->Name . ' ' . $remove->Path);
+			if (!$dryrun) {
+				$removeList->remove($remove);
+			}
+		}
+	}
+
+	/**
+	 * Sync the in-db project list with a list of file paths
+	 *
+	 * @param array $paths Array of pathnames
+	 * @param DNProject
+	 * @param bool $dryRun
+	 */
+	protected function syncEnvironmentPaths($paths, $project, $dryRun = false)
+	{
+		$list = $project->Environments();
+
+		// Normalise paths in DB
+		foreach ($list as $item) {
+			$real = realpath($item->Filename);
+			if ($real && $real != $item->Filename) {
+				$item->Filename = $real;
+				$item->write();
+			}
+		}
+
+		foreach ($paths as $path) {
+			$path = basename($path);
+			if ($list->filter('Filename', $path)->count()) {
+				continue;
+			}
+
+			$this->message('Adding "' . basename($path) . '" to db');
+			if (!$dryRun) {
+				$environment = DNEnvironment::create_from_path($path);
+				$environment->ProjectID = $project->ID;
+				$environment->write();
+			}
+		}
+	}
+
+	/**
+	 * Sync the in-db project list with a list of file paths
+	 *
+	 * @param array $paths Array of pathnames
+	 * @param boolean $dryRun
+	 */
+	public function syncProjectPaths($paths, $dryRun = false)
+	{
+		foreach ($paths as $path) {
+			if (!DNProject::get()->filter('Name', $path)->count()) {
+				$this->message($path);
+				if (!$dryRun) {
+					DNProject::create_from_path($path)->write();
+				}
+			}
+		}
+	}
+
+	/**
+	 * @param string $text
+	 */
+	protected function message($text)
+	{
+		if (PHP_SAPI !== 'cli') {
+			$text = '<p>' . $text . '</p>' . PHP_EOL;
+		}
+		echo ' - ' . $text . PHP_EOL;
+	}
+
+	/**
+	 * @param string $text
+	 */
+	protected function echoHeader($text)
+	{
+		if (PHP_SAPI !== 'cli') {
+			echo '<h2>' . $text . '</h2>' . PHP_EOL;
+		} else {
+			echo '# ' . $text . PHP_EOL;
+		}
+	}
 }

Spacing +22 added lines, -22 removed lines

@@ -11,15 +11,15 @@ 
         $remove = true;
         $dryRun = true;
 
-        if ($request && $request->requestVar('remove') !== null) {
+        if($request && $request->requestVar('remove') !== null) {
             $remove = (bool)$request->requestVar('remove');
         }
 
-        if ($request && $request->requestVar('dryrun') !== null) {
+        if($request && $request->requestVar('dryrun') !== null) {
             $dryRun = (bool)$request->requestVar('dryrun');
         }
 
-        if ($dryRun) {
+        if($dryRun) {
             echo "Running in dry run mode, no changes commited, ";
             echo "the output shows a prediction on what will happen." . PHP_EOL;
             echo "To skip dryrun, run the task like this:" . PHP_EOL;
@@ -32,7 +32,7 @@ 
 
         // Sync projects
         $projects = DNProject::get();
-        if ($remove) {
+        if($remove) {
             $this->echoHeader('Removing obsolete projects');
             $this->removeObsoleteProjects($projectPaths, $dryRun);
         }
@@ -40,7 +40,7 @@ 
         $this->syncProjectPaths($projectPaths, $dryRun);
 
         $this->echoHeader('Syncing environment files');
-        foreach ($projects as $project) {
+        foreach($projects as $project) {
             $this->echoHeader($project->Name);
             // Sync environments for each project
             $environmentPaths = $data->getEnvironmentPaths($project->Name);
@@ -60,18 +60,18 @@ 
     {
         $list = $project->Environments();
 
-        $basePaths = array_map(function ($path) {
+        $basePaths = array_map(function($path) {
             return basename($path);
         }, $paths);
 
         $removeList = $list->filter('Filename:not', $basePaths);
-        if ($removeList->count() === 0) {
+        if($removeList->count() === 0) {
             return;
         }
 
-        foreach ($removeList as $remove) {
+        foreach($removeList as $remove) {
             $this->message('Removing "' . basename($remove->Name) . '" from db');
-            if (!$dryRun) {
+            if(!$dryRun) {
                 $removeList->remove($remove);
             }
         }
@@ -87,13 +87,13 @@ 
     protected function removeObsoleteProjects($paths, $dryrun = false)
     {
         $removeList = DNProject::get()->filter('Name:not', $paths);
-        if ($removeList->count() == 0) {
+        if($removeList->count() == 0) {
             return;
         }
 
-        foreach ($removeList as $remove) {
+        foreach($removeList as $remove) {
             $this->message($remove->Name . ' ' . $remove->Path);
-            if (!$dryrun) {
+            if(!$dryrun) {
                 $removeList->remove($remove);
             }
         }
@@ -111,22 +111,22 @@ 
         $list = $project->Environments();
 
         // Normalise paths in DB
-        foreach ($list as $item) {
+        foreach($list as $item) {
             $real = realpath($item->Filename);
-            if ($real && $real != $item->Filename) {
+            if($real && $real != $item->Filename) {
                 $item->Filename = $real;
                 $item->write();
             }
         }
 
-        foreach ($paths as $path) {
+        foreach($paths as $path) {
             $path = basename($path);
-            if ($list->filter('Filename', $path)->count()) {
+            if($list->filter('Filename', $path)->count()) {
                 continue;
             }
 
             $this->message('Adding "' . basename($path) . '" to db');
-            if (!$dryRun) {
+            if(!$dryRun) {
                 $environment = DNEnvironment::create_from_path($path);
                 $environment->ProjectID = $project->ID;
                 $environment->write();
@@ -142,10 +142,10 @@ 
      */
     public function syncProjectPaths($paths, $dryRun = false)
     {
-        foreach ($paths as $path) {
-            if (!DNProject::get()->filter('Name', $path)->count()) {
+        foreach($paths as $path) {
+            if(!DNProject::get()->filter('Name', $path)->count()) {
                 $this->message($path);
-                if (!$dryRun) {
+                if(!$dryRun) {
                     DNProject::create_from_path($path)->write();
                 }
             }
@@ -157,7 +157,7 @@ 
      */
     protected function message($text)
     {
-        if (PHP_SAPI !== 'cli') {
+        if(PHP_SAPI !== 'cli') {
             $text = '<p>' . $text . '</p>' . PHP_EOL;
         }
         echo ' - ' . $text . PHP_EOL;
@@ -168,7 +168,7 @@ 
      */
     protected function echoHeader($text)
     {
-        if (PHP_SAPI !== 'cli') {
+        if(PHP_SAPI !== 'cli') {
             echo '<h2>' . $text . '</h2>' . PHP_EOL;
         } else {
             echo '# ' . $text . PHP_EOL;

Braces +8 added lines, -16 removed lines

@@ -1,12 +1,10 @@ 
 <?php
 
-class SyncProjectsAndEnvironments extends BuildTask
-{
+class SyncProjectsAndEnvironments extends BuildTask {
     /**
      * @param SS_HTTPRequest|null $request
      */
-    public function run($request = null)
-    {
+    public function run($request = null) {
         // should syncing remove obsolete records?
         $remove = true;
         $dryRun = true;
@@ -56,8 +54,7 @@ 
      * @param DNProject
      * @param bool $dryRun
      */
-    protected function removeObsoleteEnvironments($paths, $project, $dryRun = false)
-    {
+    protected function removeObsoleteEnvironments($paths, $project, $dryRun = false) {
         $list = $project->Environments();
 
         $basePaths = array_map(function ($path) {
@@ -84,8 +81,7 @@ 
      *
      * @param array $paths
      */
-    protected function removeObsoleteProjects($paths, $dryrun = false)
-    {
+    protected function removeObsoleteProjects($paths, $dryrun = false) {
         $removeList = DNProject::get()->filter('Name:not', $paths);
         if ($removeList->count() == 0) {
             return;
@@ -106,8 +102,7 @@ 
      * @param DNProject
      * @param bool $dryRun
      */
-    protected function syncEnvironmentPaths($paths, $project, $dryRun = false)
-    {
+    protected function syncEnvironmentPaths($paths, $project, $dryRun = false) {
         $list = $project->Environments();
 
         // Normalise paths in DB
@@ -140,8 +135,7 @@ 
      * @param array $paths Array of pathnames
      * @param boolean $dryRun
      */
-    public function syncProjectPaths($paths, $dryRun = false)
-    {
+    public function syncProjectPaths($paths, $dryRun = false) {
         foreach ($paths as $path) {
             if (!DNProject::get()->filter('Name', $path)->count()) {
                 $this->message($path);
@@ -155,8 +149,7 @@ 
     /**
      * @param string $text
      */
-    protected function message($text)
-    {
+    protected function message($text) {
         if (PHP_SAPI !== 'cli') {
             $text = '<p>' . $text . '</p>' . PHP_EOL;
         }
@@ -166,8 +159,7 @@ 
     /**
      * @param string $text
      */
-    protected function echoHeader($text)
-    {
+    protected function echoHeader($text) {
         if (PHP_SAPI !== 'cli') {
             echo '<h2>' . $text . '</h2>' . PHP_EOL;
         } else {