Moving code from BakeShell to BakeTask.

Adding a base execute method to contain common code shared amongst all the bake tasks.
Updating test cases as $name attributes value has changed.

Author: markstory

cake/console/shells/bake.php

@@ -50,15 +50,6 @@ public function startup() {
 			if (isset($this->params['connection'])) {
 				$this->{$task}->connection = $this->params['connection'];
 			}
-			foreach($this->args as $i => $arg) {
-				if (strpos($arg, '.')) {
-					list($this->params['plugin'], $this->args[$i]) = pluginSplit($arg);
-					break;
-				}
-			}
-			if (isset($this->params['plugin'])) {
-				$this->{$task}->plugin = $this->params['plugin'];
-			}
 		}
 	}
 

cake/console/shells/tasks/bake.php

@@ -51,9 +51,27 @@ class BakeTask extends Shell {
 	public function getPath() {
 		$path = $this->path;
 		if (isset($this->plugin)) {
-			$name = substr($this->name, 0, strlen($this->name) - 4);
-			$path = $this->_pluginPath($this->plugin) . Inflector::pluralize(Inflector::underscore($name)) . DS;
+			$path = $this->_pluginPath($this->plugin) . Inflector::pluralize(Inflector::underscore($this->name)) . DS;
 		}
 		return $path;
 	}
+
+/**
+ * Base execute method parses some parameters and sets some properties on the bake tasks.
+ * call when overriding execute()
+ *
+ * @return void
+ */
+	public function execute() {
+		foreach($this->args as $i => $arg) {
+			if (strpos($arg, '.')) {
+				list($this->params['plugin'], $this->args[$i]) = pluginSplit($arg);
+				break;
+			}
+		}
+		if (isset($this->params['plugin'])) {
+			$this->plugin = $this->params['plugin'];
+		}
+	}
+
 }

cake/console/shells/tasks/controller.php

@@ -56,6 +56,7 @@ public function initialize() {
  *
  */
 	public function execute() {
+		parent::execute();
 		if (empty($this->args)) {
 			return $this->_interactive();
 		}

cake/console/shells/tasks/fixture.php

@@ -95,6 +95,7 @@ public function getOptionParser() {
  * @return void
  */
 	public function execute() {
+		parent::execute();
 		if (empty($this->args)) {
 			$this->_interactive();
 		}

cake/console/shells/tasks/model.php

@@ -74,6 +74,7 @@ class ModelTask extends BakeTask {
  */
 	public function execute() {
 		App::import('Model', 'Model', false);
+		parent::execute();
 
 		if (empty($this->args)) {
 			$this->_interactive();

cake/console/shells/tasks/test.php

@@ -65,6 +65,7 @@ class TestTask extends BakeTask {
  *
  */
 	public function execute() {
+		parent::execute();
 		if (empty($this->args)) {
 			$this->_interactive();
 		}

cake/console/shells/tasks/view.php

@@ -97,6 +97,7 @@ public function initialize() {
  *
  */
 	public function execute() {
+		parent::execute();
 		if (empty($this->args)) {
 			$this->_interactive();
 		}

cake/tests/cases/console/shells/tasks/controller.test.php

@@ -75,7 +75,7 @@ public function setUp() {
 			array('in', 'out', 'err', 'hr', 'createFile', '_stop', '_checkUnitTest'),
 			array(&$this->Dispatcher, $out, $out, $in)
 		);
-		$this->Task->name = 'ControllerTask';
+		$this->Task->name = 'Controller';
 		$this->Task->Template = new TemplateTask($this->Dispatcher, $out, $out, $in);
 		$this->Task->Template->params['theme'] = 'default';
 

cake/tests/cases/console/shells/tasks/model.test.php

@@ -91,7 +91,7 @@ protected function _setupOtherMocks() {
 		$this->Task->Test = $this->getMock('FixtureTask', array(), array(&$this->Dispatcher, $out, $out, $in));
 		$this->Task->Template = new TemplateTask($this->Task->Dispatch, $out, $out, $in);
 
-		$this->Task->name = 'ModelTask';
+		$this->Task->name = 'Model';
 		$this->Task->interactive = true;
 	}
 

cake/tests/cases/console/shells/tasks/test.test.php

@@ -250,7 +250,7 @@ public function setup() {
 			array('in', 'err', 'createFile', '_stop', 'isLoadableClass'),
 			array(&$this->Dispatcher, $out, $out, $in)
 		);
-		$this->Task->name = 'TestTask';
+		$this->Task->name = 'Test';
 		$this->Task->Template = new TemplateTask($this->Dispatcher, $out, $out, $in);
 	}
 

cake/tests/cases/console/shells/tasks/view.test.php

@@ -394,7 +394,7 @@ public function testBakeWithPlugin() {
 		$this->Task->controllerName = 'ViewTaskComments';
 		$this->Task->controllerPath = 'view_task_comments';
 		$this->Task->plugin = 'TestTest';
-		$this->Task->name = 'ViewTask';
+		$this->Task->name = 'View';
 
 		$path = APP . 'plugins' . DS . 'test_test' . DS . 'views' . DS . 'view_task_comments' . DS  . 'view.ctp';
 		$this->Task->expects($this->once())->method('createFile')