Initial pass for PSR-0 autoloading support. Refs #4001

classes/kohana/minion/exception/handler.php → classes/Kohana/Minion/Exception/Handler.php

@@ -13,9 +13,9 @@ class Kohana_Minion_Exception_Handler extends Kohana_Kohana_Exception {
 	/**
 	 * Inline exception handler, displays the error message, source of the
 	 * exception, and the stack trace of the error.
-	 * 
+	 *
 	 * Should this display a stack trace? It's useful.
-	 * 
+	 *
 	 * Should this still log? Maybe not as useful since we'll see the error on the screen.
 	 *
 	 * @uses    Kohana_Exception::text
@@ -41,4 +41,4 @@ public static function handler(Exception $e)
 			exit(1);
 		}
 	}
-}
+}

classes/kohana/minion/task.php → classes/Kohana/Minion/Task.php

@@ -12,6 +12,8 @@ abstract class Kohana_Minion_Task {
 
 	protected $_options = array();
 
+	protected $_defaults = array();
+
 	protected $_method = '_execute';
 
 	/**

classes/Minion/Exception/Handler.php

@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Minion_Exception_Handler extends Kohana_Minion_Exception_Handler {}

classes/task/help.php → classes/Task/Help.php

@@ -8,7 +8,7 @@
  * @copyright  (c) 2009-2011 Kohana Team
  * @license    http://kohanaframework.org/license
  */
-class Minion_Task_Help extends Minion_Task
+class Task_Help extends Minion_Task
 {
 	/**
 	 * Generates a help list for all tasks
@@ -25,4 +25,4 @@ protected function _execute(array $params)
 
 		echo $view;
 	}
-}
+}

init.php

@@ -1,8 +1,7 @@
 <?php
 
-
 Route::set('minion', 'minion(/<action>)(/<task>)', array('action' => 'help'))
 	->defaults(array(
-		'controller' => 'minion',
+		'controller' => 'Minion',
 		'action'     => 'execute',
 	));

minion

@@ -1,26 +1,105 @@
-#!/bin/bash
-#
-# Usage: ./minion [task:name] [--option1=optval1 --option2=optval2]
-#
-# And so on.
-#
-# To get help, pass in --help
-#
-# # Minion general help
-# ./minion --help
-# ./minion
-#
-# # Task specific help
-# ./minion task:name --help
-#
-
-if [[ $# > 0 && $1 != --* ]]
-then
-	TASK="--task=$1"
-	shift 1
-fi
-
-php index.php --uri=minion "$TASK" "$@"
-
-# Pass the exit code back out
-exit $?
+#!/usr/bin/env php
+<?php
+
+/**
+ * The directory in which your application specific resources are located.
+ * The application directory must contain the bootstrap.php file.
+ *
+ * @link http://kohanaframework.org/guide/about.install#application
+ */
+$application = '../../application';
+
+/**
+ * The directory in which your modules are located.
+ *
+ * @link http://kohanaframework.org/guide/about.install#modules
+ */
+$modules = '../../modules';
+
+/**
+ * The directory in which the Kohana resources are located. The system
+ * directory must contain the classes/kohana.php file.
+ *
+ * @link http://kohanaframework.org/guide/about.install#system
+ */
+$system = '../../system';
+
+/**
+ * The default extension of resource files. If you change this, all resources
+ * must be renamed to use the new extension.
+ *
+ * @link http://kohanaframework.org/guide/about.install#ext
+ */
+define('EXT', '.php');
+
+/**
+ * Set the PHP error reporting level. If you set this in php.ini, you remove this.
+ * @link http://www.php.net/manual/errorfunc.configuration#ini.error-reporting
+ *
+ * When developing your application, it is highly recommended to enable notices
+ * and strict warnings. Enable them by using: E_ALL | E_STRICT
+ *
+ * In a production environment, it is safe to ignore notices and strict warnings.
+ * Disable them by using: E_ALL ^ E_NOTICE
+ *
+ * When using a legacy application with PHP >= 5.3, it is recommended to disable
+ * deprecated notices. Disable with: E_ALL & ~E_DEPRECATED
+ */
+error_reporting(E_ALL | E_STRICT);
+
+/**
+ * End of standard configuration! Changing any of the code below should only be
+ * attempted by those with a working knowledge of Kohana internals.
+ *
+ * @link http://kohanaframework.org/guide/using.configuration
+ */
+
+// Set the full path to the docroot
+define('DOCROOT', realpath(dirname(__FILE__)).DIRECTORY_SEPARATOR);
+
+// Make the application relative to the docroot, for symlink'd index.php
+if ( ! is_dir($application) AND is_dir(DOCROOT.$application))
+	$application = DOCROOT.$application;
+
+// Make the modules relative to the docroot, for symlink'd index.php
+if ( ! is_dir($modules) AND is_dir(DOCROOT.$modules))
+	$modules = DOCROOT.$modules;
+
+// Make the system relative to the docroot, for symlink'd index.php
+if ( ! is_dir($system) AND is_dir(DOCROOT.$system))
+	$system = DOCROOT.$system;
+
+// Define the absolute paths for configured directories
+define('APPPATH', realpath($application).DIRECTORY_SEPARATOR);
+define('MODPATH', realpath($modules).DIRECTORY_SEPARATOR);
+define('SYSPATH', realpath($system).DIRECTORY_SEPARATOR);
+
+// Clean up the configuration vars
+unset($application, $modules, $system);
+
+/**
+ * Define the start time of the application, used for profiling.
+ */
+if ( ! defined('KOHANA_START_TIME'))
+{
+	define('KOHANA_START_TIME', microtime(TRUE));
+}
+
+/**
+ * Define the memory usage at the start of the application, used for profiling.
+ */
+if ( ! defined('KOHANA_START_MEMORY'))
+{
+	define('KOHANA_START_MEMORY', memory_get_usage());
+}
+
+// Bootstrap the application
+require APPPATH.'bootstrap'.EXT;
+
+#set_exception_handler(array('Minion_Exception_Handler', 'handler'));
+
+/**
+ * Execute the main request. A source of the URI can be passed, eg: $_SERVER['PATH_INFO'].
+ * If no source is specified, the URI will be automatically detected.
+ */
+Minion_Task::factory(CLI::options())->execute();