From b97efcf80685989157632d32e37274825e4a2fa7 Mon Sep 17 00:00:00 2001 From: Lorenzo Pisani Date: Fri, 1 Jul 2011 20:47:01 -0700 Subject: [PATCH 1/4] 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 @@ */ -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 @@ */ -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 */ -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 From 1d3f5e736cf0f024254685dd62fdda223fec271c Mon Sep 17 00:00:00 2001 From: Lorenzo Pisani Date: Fri, 1 Jul 2011 20:48:30 -0700 Subject: [PATCH 2/4] removing the migrate-* prefix to the migrations:run options (refs #11) --- classes/minion/task/migrations/run.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/classes/minion/task/migrations/run.php b/classes/minion/task/migrations/run.php index 2400fdd..7fd2133 100644 --- a/classes/minion/task/migrations/run.php +++ b/classes/minion/task/migrations/run.php @@ -53,9 +53,9 @@ class Minion_Task_Migrations_Run extends Minion_Task protected $_config = array( 'group', 'groups', - 'migrate-up', - 'migrate-down', - 'migrate-to', + 'up', + 'down', + 'to', 'dry-run', 'quiet' ); @@ -70,12 +70,12 @@ class Minion_Task_Migrations_Run extends Minion_Task $k_config = Kohana::config('minion/migration'); $groups = Arr::get($config, 'group', Arr::get($config, 'groups', NULL)); - $target = Arr::get($config, 'migrate-to', NULL); + $target = Arr::get($config, 'to', NULL); $dry_run = array_key_exists('dry-run', $config); $quiet = array_key_exists('quiet', $config); - $up = array_key_exists('migrate-up', $config); - $down = array_key_exists('migrate-down', $config); + $up = array_key_exists('up', $config); + $down = array_key_exists('down', $config); $groups = $this->_parse_groups($groups); From c6e24b2d8130a1d14e729ebcfc9e89416f1b6443 Mon Sep 17 00:00:00 2001 From: Lorenzo Pisani Date: Fri, 1 Jul 2011 20:49:20 -0700 Subject: [PATCH 3/4] updating documentation (refs #11) --- classes/minion/task/migrations/run.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/classes/minion/task/migrations/run.php b/classes/minion/task/migrations/run.php index 7fd2133..7b2c635 100644 --- a/classes/minion/task/migrations/run.php +++ b/classes/minion/task/migrations/run.php @@ -7,15 +7,15 @@ * * Available config options are: * - * --migrate-down + * --down * * Migrate the group(s) down * - * --migrate-up + * --up * * Migrate the group(s) up * - * --migrate-to=(timestamp|+up_migrations|down_migrations) + * --to=(timestamp|+up_migrations|down_migrations) * * Migrate to a specific timestamp, or up $up_migrations, or down $down_migrations * @@ -30,7 +30,7 @@ * 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 + * Note, only --up and --down can be used with --groups * * --dry-run * From 6005b8567035dabc75e00d149a94b2ee2eaf7d42 Mon Sep 17 00:00:00 2001 From: Lorenzo Pisani Date: Fri, 1 Jul 2011 20:56:12 -0700 Subject: [PATCH 4/4] fixing the documentation for migrations:new --- classes/minion/task/migrations/new.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/classes/minion/task/migrations/new.php b/classes/minion/task/migrations/new.php index c7d96ba..90bcf4c 100644 --- a/classes/minion/task/migrations/new.php +++ b/classes/minion/task/migrations/new.php @@ -5,17 +5,20 @@ * * Available config options are: * - * --group=path/to/migration/group + * --group=group_name * * This is a required config option, use it specify in which group the - * migration should be stored. Due to the nature of the cascading filesystem - * minion doesn't automatically know where a migration is stored so make sure - * you pass in the full path to your migrations folder, e.g. + * migration should be stored. Migrations are stored in a `migrations` + * directory followed by the group name specified. By default, the `migrations` + * directory is created in `APPPATH` but that can be changed with `--location` * - * # The group of the migrations folder is modules/myapp/migrations/myapp/ - * --group=modules/myapp/migrations/myapp/ + * --location=modules/auth * - * On nix based systems you should be able to tab complete the path + * Specified the path of the migration (without the `migrations` directory). + * This value is defaulted to `APPPATH` + * + * # The migration will be created in `modules/myapp/migrations/myapp/` + * --group=myapp --location=modules/myapp * * --description="Description of migration here" * @@ -23,8 +26,6 @@ * filename. It is required but can be changed manually later on without * affecting the integrity of the migration. * - * The description will be - * * @author Matt Button */ class Minion_Task_Migrations_New extends Minion_Task