Skip to content

Commit

Permalink
Remove Minion_ prefix requirement from tasks
Browse files Browse the repository at this point in the history
  • Loading branch information
zombor committed Jan 30, 2012
1 parent d73d037 commit ff74c31
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -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()`.
Expand Down
2 changes: 1 addition & 1 deletion classes/controller/minion.php
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion classes/kohana/minion/task.php
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion classes/kohana/minion/util.php
Expand Up @@ -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)));
}

/**
Expand Down
2 changes: 1 addition & 1 deletion classes/minion/task/help.php
Expand Up @@ -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');

Expand Down
6 changes: 3 additions & 3 deletions 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',
Expand Down Expand Up @@ -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

Expand Down
12 changes: 6 additions & 6 deletions tests/minion/util.php
Expand Up @@ -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',
),
),
),
Expand Down Expand Up @@ -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('', ''),
);
}
Expand All @@ -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'),
);
}

Expand Down

0 comments on commit ff74c31

Please sign in to comment.