From ff74c311d4c0248def01e1e118b76b894c2eff01 Mon Sep 17 00:00:00 2001
From: Jeremy Bush <contractfrombelow@gmail.com>
Date: Mon, 30 Jan 2012 13:53:39 -0600
Subject: [PATCH] Remove `Minion_` prefix requirement from tasks

---
 README.md                      |  2 +-
 classes/controller/minion.php  |  2 +-
 classes/kohana/minion/task.php |  2 +-
 classes/kohana/minion/util.php |  2 +-
 classes/minion/task/help.php   |  2 +-
 guide/minion/tasks.md          |  6 +++---
 tests/minion/util.php          | 12 ++++++------
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 4808968..fb61088 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ examples with
 
 ## Writing your own tasks
 
-All minion tasks must be located in `classes/minion/task/`.  They can be in any module, thus allowing you to 
+All minion tasks must be located in `classes/task/`.  They can be in any module, thus allowing you to 
 ship custom minion tasks with your own module / product.
 
 Each task must extend the abstract class `Minion_Task` and implement `Minion_Task::execute()`.
diff --git a/classes/controller/minion.php b/classes/controller/minion.php
index bec0453..075f18c 100644
--- a/classes/controller/minion.php
+++ b/classes/controller/minion.php
@@ -61,7 +61,7 @@ protected function _retrieve_task()
 	 */
 	public function action_help()
 	{
-		$tasks = Minion_Util::compile_task_list(Kohana::list_files('classes/minion/task'));
+		$tasks = Minion_Util::compile_task_list(Kohana::list_files('classes/task'));
 		$view  = NULL;
 
 		if (empty($this->_task))
diff --git a/classes/kohana/minion/task.php b/classes/kohana/minion/task.php
index 96c735c..2af4dce 100644
--- a/classes/kohana/minion/task.php
+++ b/classes/kohana/minion/task.php
@@ -197,7 +197,7 @@ abstract protected function _execute(array $params);
 	 */
 	protected function _help(array $params)
 	{
-		$tasks = Minion_Util::compile_task_list(Kohana::list_files('classes/minion/task'));
+		$tasks = Minion_Util::compile_task_list(Kohana::list_files('classes/task'));
 
 		$inspector = new ReflectionClass($this);
 
diff --git a/classes/kohana/minion/util.php b/classes/kohana/minion/util.php
index 1e5a435..f86cdb0 100644
--- a/classes/kohana/minion/util.php
+++ b/classes/kohana/minion/util.php
@@ -107,7 +107,7 @@ public static function convert_task_to_class_name($task)
 		if (empty($task))
 			return '';
 
-		return 'Minion_Task_'.implode('_', array_map('ucfirst', explode(Minion_Util::$task_separator, $task)));
+		return 'Task_'.implode('_', array_map('ucfirst', explode(Minion_Util::$task_separator, $task)));
 	}
 
 	/**
diff --git a/classes/minion/task/help.php b/classes/minion/task/help.php
index 6a78bb4..394867a 100644
--- a/classes/minion/task/help.php
+++ b/classes/minion/task/help.php
@@ -17,7 +17,7 @@ class Minion_Task_Help extends Minion_Task
 	 */
 	protected function _execute(array $params)
 	{
-		$tasks = Minion_Util::compile_task_list(Kohana::list_files('classes/minion/task'));
+		$tasks = Minion_Util::compile_task_list(Kohana::list_files('classes/task'));
 
 		$view = new View('minion/help/list');
 
diff --git a/guide/minion/tasks.md b/guide/minion/tasks.md
index 371583c..4bda3ef 100644
--- a/guide/minion/tasks.md
+++ b/guide/minion/tasks.md
@@ -1,10 +1,10 @@
 # Writing Tasks
 
-Writing a task in minion is very easy. Simply create a new class called `Minion_Task_<Taskname>` and put it inside `classes/minion/task/<taskname>.php`.
+Writing a task in minion is very easy. Simply create a new class called `Task_<Taskname>` and put it inside `classes/task/<taskname>.php`.
 
 	<?php defined('SYSPATH') or die('No direct script access.');
 
-	class Minion_Task_Demo extends Minion_Task
+	class Task_Demo extends Minion_Task
 	{
 		protected $_defaults = array(
 			'foo' = 'bar',
@@ -32,7 +32,7 @@ You'll notice a few things here:
 
 ## Namespacing Tasks
 
-You can "namespace" tasks by placing them all in a subdirectory: `classes/minion/task/database/generate.php`. This task will be named `database:generate` and can be called with this task name.
+You can "namespace" tasks by placing them all in a subdirectory: `classes/task/database/generate.php`. This task will be named `database:generate` and can be called with this task name.
 
 # Parameter Validations
 
diff --git a/tests/minion/util.php b/tests/minion/util.php
index 088f2bf..cf7d1c7 100644
--- a/tests/minion/util.php
+++ b/tests/minion/util.php
@@ -56,9 +56,9 @@ public function provider_compile_task_list()
 					'db:status',
 				),
 				array (
-					'classes/minion/task/db' => array (
-						'classes/minion/task/db/migrate.php' => '/var/www/memberful/memberful-core/modules/kohana-minion/classes/minion/task/db/migrate.php',
-						'classes/minion/task/db/status.php' => '/var/www/memberful/memberful-core/modules/kohana-minion/classes/minion/task/db/status.php',
+					'classes/task/db' => array (
+						'classes/task/db/migrate.php' => '/var/www/memberful/memberful-core/modules/kohana-minion/classes/task/db/migrate.php',
+						'classes/task/db/status.php' => '/var/www/memberful/memberful-core/modules/kohana-minion/classes/task/db/status.php',
 					),
 				),
 			),
@@ -89,8 +89,8 @@ public function test_compile_task_list($expected, $files, $prefix = '', $separat
 	public function provider_convert_task_to_class_name()
 	{
 		return array(
-			array('Minion_Task_Db_Migrate', 'db:migrate'),
-			array('Minion_Task_Db_Status',  'db:status'),
+			array('Task_Db_Migrate', 'db:migrate'),
+			array('Task_Db_Status',  'db:status'),
 			array('', ''),
 		);
 	}
@@ -117,7 +117,7 @@ public function test_convert_task_to_class_name($expected, $task_name)
 	public function provider_convert_class_to_task()
 	{
 		return array(
-			array('db:migrate', 'Minion_Task_Db_Migrate'),
+			array('db:migrate', 'Task_Db_Migrate'),
 		);
 	}