From b97efcf80685989157632d32e37274825e4a2fa7 Mon Sep 17 00:00:00 2001
From: Lorenzo Pisani <zeelot3k@gmail.com>
Date: Fri, 1 Jul 2011 20:47:01 -0700
Subject: [PATCH] renaming the migration tasks for cleaner separation (refs
 #11)

---
 .../task/{db/generate.php => migrations/new.php} | 10 +++++-----
 .../task/{db/migrate.php => migrations/run.php}  | 16 ++++++++--------
 .../minion/task/{db => migrations}/status.php    |  4 ++--
 .../{db/generate => migrations/new}/template.php |  0
 .../task/{db/migrate.php => migrations/run.php}  |  0
 .../{db/migrate => migrations/run}/exception.php |  0
 views/minion/task/{db => migrations}/status.php  |  0
 7 files changed, 15 insertions(+), 15 deletions(-)
 rename classes/minion/task/{db/generate.php => migrations/new.php} (93%)
 rename classes/minion/task/{db/migrate.php => migrations/run.php} (93%)
 rename classes/minion/task/{db => migrations}/status.php (81%)
 rename views/minion/task/{db/generate => migrations/new}/template.php (100%)
 rename views/minion/task/{db/migrate.php => migrations/run.php} (100%)
 rename views/minion/task/{db/migrate => migrations/run}/exception.php (100%)
 rename views/minion/task/{db => migrations}/status.php (100%)

diff --git a/classes/minion/task/db/generate.php b/classes/minion/task/migrations/new.php
similarity index 93%
rename from classes/minion/task/db/generate.php
rename to classes/minion/task/migrations/new.php
index c2fe360..c7d96ba 100644
--- a/classes/minion/task/db/generate.php
+++ b/classes/minion/task/migrations/new.php
@@ -1,7 +1,7 @@
 <?php defined('SYSPATH') or die('No direct script access.');
 
 /**
- * The generate task provides an easy way to create migration files
+ * The new task provides an easy way to create migration files
  *
  * Available config options are:
  *
@@ -27,7 +27,7 @@
  *
  * @author Matt Button <matthew@sigswitch.com>
  */
-class Minion_Task_Db_Generate extends Minion_Task
+class Minion_Task_Migrations_New extends Minion_Task
 {
 	/**
 	 * A set of config options that this task accepts
@@ -49,7 +49,7 @@ class Minion_Task_Db_Generate extends Minion_Task
 		try
 		{
 			$file = $this->generate($config);
-			Minion_CLI::write('Migration generated: '.$file);	
+			Minion_CLI::write('Migration generated: '.$file);
 		}
 		catch(ErrorException $e)
 		{
@@ -57,7 +57,7 @@ class Minion_Task_Db_Generate extends Minion_Task
 		}
 
 	}
-	
+
 	public function generate($config, $up = null, $down = null)
 	{
 		$defaults = array(
@@ -86,7 +86,7 @@ class Minion_Task_Db_Generate extends Minion_Task
 		$file = $this->_generate_filename($location, $group, $time, $description);
 
 
-		$data = Kohana::FILE_SECURITY.View::factory('minion/task/db/generate/template')
+		$data = Kohana::FILE_SECURITY.View::factory('minion/task/migrations/new/template')
 			->set('class', $class)
 			->set('description', $description)
 			->set('up', $up)
diff --git a/classes/minion/task/db/migrate.php b/classes/minion/task/migrations/run.php
similarity index 93%
rename from classes/minion/task/db/migrate.php
rename to classes/minion/task/migrations/run.php
index 8009a78..2400fdd 100644
--- a/classes/minion/task/db/migrate.php
+++ b/classes/minion/task/migrations/run.php
@@ -1,8 +1,8 @@
 <?php defined('SYSPATH') or die('No direct script access.');
 
 /**
- * The Migrate task compares the current version of the database with the target 
- * version and then executes the necessary commands to bring the database up to 
+ * The Run task compares the current version of the database with the target
+ * version and then executes the necessary commands to bring the database up to
  * date
  *
  * Available config options are:
@@ -27,24 +27,24 @@
  *
  * --groups=group[,group2[,group3...]]
  *
- *   A list of groups that will be used to source migration files.  By default 
+ *   A list of groups that will be used to source migration files.  By default
  *   migrations will be loaded from all available groups.
  *
  *   Note, only --migrate-up and --migrate-down can be used with --groups
  *
  * --dry-run
  *
- *  No value taken, if this is specified then instead of executing the SQL it 
+ *  No value taken, if this is specified then instead of executing the SQL it
  *  will be printed to the console
  *
  * --quiet
  *
- *  Suppress all unnecessary output.  If --dry-run is enabled then only dry run 
+ *  Suppress all unnecessary output.  If --dry-run is enabled then only dry run
  *  SQL will be output
  *
  * @author Matt Button <matthew@sigswitch.com>
  */
-class Minion_Task_Db_Migrate extends Minion_Task
+class Minion_Task_Migrations_Run extends Minion_Task
 {
 	/**
 	 * A set of config options that this task accepts
@@ -110,12 +110,12 @@ class Minion_Task_Db_Migrate extends Minion_Task
 		}
 		catch(Minion_Migration_Exception $e)
 		{
-			return View::factory('minion/task/db/migrate/exception')
+			return View::factory('minion/task/migrations/run/exception')
 				->set('migration', $e->get_migration())
 				->set('error',     $e->getMessage());
 		}
 
-		$view = View::factory('minion/task/db/migrate')
+		$view = View::factory('minion/task/migrations/run')
 			->set('dry_run', $dry_run)
 			->set('quiet', $quiet)
 			->set('dry_run_sql', $manager->get_dry_run_sql())
diff --git a/classes/minion/task/db/status.php b/classes/minion/task/migrations/status.php
similarity index 81%
rename from classes/minion/task/db/status.php
rename to classes/minion/task/migrations/status.php
index 7ec7c5b..311f611 100644
--- a/classes/minion/task/db/status.php
+++ b/classes/minion/task/migrations/status.php
@@ -7,7 +7,7 @@
  *
  * @author Matt Button <matthew@sigswitch.com>
  */
-class Minion_Task_Db_Status extends Minion_Task {
+class Minion_Task_Migrations_Status extends Minion_Task {
 
 	/**
 	 * Execute the task
@@ -19,7 +19,7 @@ class Minion_Task_Db_Status extends Minion_Task {
 		$db        = Database::instance();
 		$model     = new Model_Minion_Migration($db);
 
-		$view = new View('minion/task/db/status');
+		$view = new View('minion/task/migrations/status');
 
 		$view->groups = $model->get_group_statuses();
 
diff --git a/views/minion/task/db/generate/template.php b/views/minion/task/migrations/new/template.php
similarity index 100%
rename from views/minion/task/db/generate/template.php
rename to views/minion/task/migrations/new/template.php
diff --git a/views/minion/task/db/migrate.php b/views/minion/task/migrations/run.php
similarity index 100%
rename from views/minion/task/db/migrate.php
rename to views/minion/task/migrations/run.php
diff --git a/views/minion/task/db/migrate/exception.php b/views/minion/task/migrations/run/exception.php
similarity index 100%
rename from views/minion/task/db/migrate/exception.php
rename to views/minion/task/migrations/run/exception.php
diff --git a/views/minion/task/db/status.php b/views/minion/task/migrations/status.php
similarity index 100%
rename from views/minion/task/db/status.php
rename to views/minion/task/migrations/status.php