Update bake for task subcommand changes.

Subcommands can now be nested when using tasks. This means we can drop some gross code around method delegation in various bake tasks. Clean up remaining tests for execute() -> main() changes as well.
cakephp · Apr 24, 2014 · c2008e7 · c2008e7
1 parent 2b40223
commit c2008e7
Show file tree

Hide file tree

Showing 16 changed files with 61 additions and 105 deletions.
diff --git a/src/Console/Command/BakeShell.php b/src/Console/Command/BakeShell.php
@@ -194,7 +194,6 @@ public function all($name = null) {
 		$this->out('Bake All');
 		$this->hr();
 
-		$this->connection = 'default';
 		if (!empty($this->params['connection'])) {
 			$this->connection = $this->params['connection'];
 		}
@@ -218,7 +217,7 @@ public function all($name = null) {
 		$this->Model->bake($name);
 		$this->Controller->bake($name);
 
-		$this->View->execute($name);
+		$this->View->main($name);
 
 		$this->out(__d('cake_console', '<success>Bake All complete</success>'), 1, Shell::QUIET);
 		return true;

diff --git a/src/Console/Command/Task/BakeTask.php b/src/Console/Command/Task/BakeTask.php
@@ -113,6 +113,7 @@ public function getOptionParser() {
 			'help' => __d('cake_console', 'Force overwriting existing files without prompting.')
 		])->addOption('connection', [
 			'short' => 'c',
+			'default' => 'default',
 			'help' => __d('cake_console', 'The datasource connection to get data from.')
 		])->addOption('theme', [
 			'short' => 't',

diff --git a/src/Console/Command/Task/ControllerTask.php b/src/Console/Command/Task/ControllerTask.php
@@ -47,10 +47,6 @@ class ControllerTask extends BakeTask {
 	public function main($name = null) {
 		parent::main();
 
-		if (!isset($this->connection)) {
-			$this->connection = 'default';
-		}
-
 		if (empty($name)) {
 			$this->out(__d('cake_console', 'Possible controllers based on your current database:'));
 			foreach ($this->listAll() as $table) {
@@ -59,10 +55,6 @@ public function main($name = null) {
 			return true;
 		}
 
-		if (strtolower($name) === 'all') {
-			return $this->all();
-		}
-
 		$controller = $this->_controllerName($name);
 		$this->bake($controller);
 	}

diff --git a/src/Console/Command/Task/FixtureTask.php b/src/Console/Command/Task/FixtureTask.php
@@ -92,9 +92,6 @@ public function getOptionParser() {
  */
 	public function main($name = null) {
 		parent::main();
-		if (!isset($this->connection)) {
-			$this->connection = 'default';
-		}
 
 		if (empty($name)) {
 			$this->out(__d('cake_console', 'Choose a fixture to bake from the following:'));
@@ -104,9 +101,6 @@ public function main($name = null) {
 			return true;
 		}
 
-		if (strtolower($name) === 'all') {
-			return $this->all();
-		}
 		$table = null;
 		if (isset($this->params['table'])) {
 			$table = $this->params['table'];

diff --git a/src/Console/Command/Task/ModelTask.php b/src/Console/Command/Task/ModelTask.php
@@ -78,10 +78,6 @@ class ModelTask extends BakeTask {
 	public function main($name = null) {
 		parent::main();
 
-		if (!isset($this->connection)) {
-			$this->connection = 'default';
-		}
-
 		if (empty($name)) {
 			$this->out(__d('cake_console', 'Choose a model to bake from the following:'));
 			foreach ($this->listAll() as $table) {
@@ -90,10 +86,6 @@ public function main($name = null) {
 			return true;
 		}
 
-		if (strtolower($name) === 'all') {
-			return $this->all();
-		}
-
 		$this->bake($this->_modelName($name));
 	}
 

diff --git a/src/Console/Command/Task/ViewTask.php b/src/Console/Command/Task/ViewTask.php
@@ -101,10 +101,6 @@ public function initialize() {
 	public function main($name = null, $template = null, $action = null) {
 		parent::main();
 
-		if (!isset($this->connection)) {
-			$this->connection = 'default';
-		}
-
 		if (empty($name)) {
 			$this->out(__d('cake_console', 'Possible tables to bake views for based on your current database:'));
 			$this->Model->connection = $this->connection;
@@ -114,10 +110,6 @@ public function main($name = null, $template = null, $action = null) {
 			return true;
 		}
 
-		if (strtolower($name) === 'all') {
-			return $this->all();
-		}
-
 		$controller = null;
 		if (!empty($this->params['controller'])) {
 			$controller = $this->params['controller'];
@@ -219,7 +211,7 @@ public function all() {
 		$tables = $this->Model->listAll();
 
 		foreach ($tables as $table) {
-			$this->execute($table);
+			$this->main($table);
 		}
 	}
 

diff --git a/tests/TestCase/Console/Command/BakeShellTest.php b/tests/TestCase/Console/Command/BakeShellTest.php
@@ -78,7 +78,7 @@ public function testAllWithModelName() {
 			->will($this->returnValue(true));
 
 		$this->Shell->View->expects($this->once())
-			->method('execute')
+			->method('main')
 			->with('Comments');
 
 		$this->Shell->expects($this->at(0))

diff --git a/tests/TestCase/Console/Command/Task/ControllerTaskTest.php b/tests/TestCase/Console/Command/Task/ControllerTaskTest.php
@@ -280,23 +280,23 @@ public function testBakeTestDisabled() {
  *
  * @return void
  */
-	public function testExecuteNoArgs() {
+	public function testMainNoArgs() {
 		$this->Task->expects($this->never())
 			->method('createFile');
 
 		$this->Task->expects($this->at(0))
 			->method('out')
 			->with($this->stringContains('Possible controllers based on your current database'));
 
-		$this->Task->execute();
+		$this->Task->main();
 	}
 
 /**
  * test that execute runs all when the first arg == all
  *
  * @return void
  */
-	public function testExecuteIntoAll() {
+	public function testMainIntoAll() {
 		$count = count($this->Task->listAll());
 		if ($count != count($this->fixtures)) {
 			$this->markTestSkipped('Additional tables detected.');
@@ -316,11 +316,11 @@ public function testExecuteIntoAll() {
 			))
 			->will($this->returnValue(true));
 
-		$this->Task->execute('all');
+		$this->Task->all();
 	}
 
 /**
- * data provider for testExecuteWithControllerNameVariations
+ * data provider for testMainWithControllerNameVariations
  *
  * @return void
  */
@@ -336,14 +336,14 @@ public static function nameVariations() {
  * @dataProvider nameVariations
  * @return void
  */
-	public function testExecuteWithControllerNameVariations($name) {
+	public function testMainWithControllerNameVariations($name) {
 		$this->Task->connection = 'test';
 
 		$filename = $this->_normalizePath(APP . 'Controller/BakeArticlesController.php');
 		$this->Task->expects($this->once())
 			->method('createFile')
 			->with($filename, $this->stringContains('public function index()'));
-		$this->Task->execute($name);
+		$this->Task->main($name);
 	}
 
 }
diff --git a/tests/TestCase/Console/Command/Task/ExtractTaskTest.php b/tests/TestCase/Console/Command/Task/ExtractTaskTest.php
@@ -75,7 +75,7 @@ public function testExecute() {
 			->will($this->returnValue('y'));
 		$this->Task->expects($this->never())->method('_stop');
 
-		$this->Task->execute();
+		$this->Task->main();
 		$this->assertTrue(file_exists($this->path . DS . 'default.pot'));
 		$result = file_get_contents($this->path . DS . 'default.pot');
 
@@ -135,7 +135,7 @@ public function testExtractCategory() {
 			->will($this->returnValue('y'));
 		$this->Task->expects($this->never())->method('_stop');
 
-		$this->Task->execute();
+		$this->Task->main();
 		$this->assertTrue(file_exists($this->path . DS . 'LC_TIME' . DS . 'default.pot'));
 
 		$result = file_get_contents($this->path . DS . 'default.pot');
@@ -159,7 +159,7 @@ public function testExtractWithExclude() {
 		$this->Task->expects($this->any())->method('in')
 			->will($this->returnValue('y'));
 
-		$this->Task->execute();
+		$this->Task->main();
 		$this->assertTrue(file_exists($this->path . DS . 'default.pot'));
 		$result = file_get_contents($this->path . DS . 'default.pot');
 
@@ -186,7 +186,7 @@ public function testExtractMultiplePaths() {
 		$this->Task->params['extract-core'] = 'no';
 		$this->Task->expects($this->never())->method('err');
 		$this->Task->expects($this->never())->method('_stop');
-		$this->Task->execute();
+		$this->Task->main();
 
 		$result = file_get_contents($this->path . DS . 'default.pot');
 
@@ -213,7 +213,7 @@ public function testExtractExcludePlugins() {
 		$this->Task->params['output'] = $this->path . DS;
 		$this->Task->params['exclude-plugins'] = true;
 
-		$this->Task->execute();
+		$this->Task->main();
 		$result = file_get_contents($this->path . DS . 'default.pot');
 		$this->assertNotRegExp('#TestPlugin#', $result);
 	}
@@ -234,7 +234,7 @@ public function testExtractPlugin() {
 		$this->Task->params['output'] = $this->path . DS;
 		$this->Task->params['plugin'] = 'TestPlugin';
 
-		$this->Task->execute();
+		$this->Task->main();
 		$result = file_get_contents($this->path . DS . 'default.pot');
 		$this->assertNotRegExp('#Pages#', $result);
 		$this->assertRegExp('/translate\.ctp:\d+/', $result);
@@ -259,7 +259,7 @@ public function testExtractOverwrite() {
 		$this->assertTrue(file_exists($this->path . DS . 'default.pot'));
 		$original = file_get_contents($this->path . DS . 'default.pot');
 
-		$this->Task->execute();
+		$this->Task->main();
 		$result = file_get_contents($this->path . DS . 'default.pot');
 		$this->assertNotEquals($original, $result);
 	}
@@ -277,7 +277,7 @@ public function testExtractCore() {
 		$this->Task->params['output'] = $this->path . DS;
 		$this->Task->params['extract-core'] = 'yes';
 
-		$this->Task->execute();
+		$this->Task->main();
 		$this->assertTrue(file_exists($this->path . DS . 'cake.pot'));
 		$result = file_get_contents($this->path . DS . 'cake.pot');
 

diff --git a/tests/TestCase/Console/Command/Task/FixtureTaskTest.php b/tests/TestCase/Console/Command/Task/FixtureTaskTest.php
@@ -177,7 +177,7 @@ public function testImportRecordsNoEscaping() {
  *
  * @return void
  */
-	public function testExecuteWithTableOption() {
+	public function testMainWithTableOption() {
 		$this->Task->connection = 'test';
 		$this->Task->params = ['table' => 'comments'];
 		$filename = $this->_normalizePath(ROOT . '/Test/Fixture/ArticleFixture.php');
@@ -186,31 +186,31 @@ public function testExecuteWithTableOption() {
 			->method('createFile')
 			->with($filename, $this->stringContains("public \$table = 'comments';"));
 
-		$this->Task->execute('article');
+		$this->Task->main('article');
 	}
 
 /**
  * test that execute passes runs bake depending with named model.
  *
  * @return void
  */
-	public function testExecuteWithNamedModel() {
+	public function testMainWithNamedModel() {
 		$this->Task->connection = 'test';
 		$filename = $this->_normalizePath(ROOT . '/Test/Fixture/ArticleFixture.php');
 
 		$this->Task->expects($this->at(0))
 			->method('createFile')
 			->with($filename, $this->stringContains('class ArticleFixture'));
 
-		$this->Task->execute('article');
+		$this->Task->main('article');
 	}
 
 /**
  * test that execute runs all() when args[0] = all
  *
  * @return void
  */
-	public function testExecuteIntoAll() {
+	public function testMainIntoAll() {
 		$this->Task->connection = 'test';
 		$this->Task->Model->expects($this->any())
 			->method('listAll')
@@ -226,7 +226,7 @@ public function testExecuteIntoAll() {
 			->method('createFile')
 			->with($filename, $this->stringContains('class CommentFixture'));
 
-		$this->Task->execute('all');
+		$this->Task->all();
 	}
 
 /**
@@ -284,7 +284,7 @@ public function testAllWithSchemaImport() {
  *
  * @return void
  */
-	public function testExecuteNoArgs() {
+	public function testMainNoArgs() {
 		$this->Task->connection = 'test';
 
 		$this->Task->Model->expects($this->any())
@@ -295,7 +295,7 @@ public function testExecuteNoArgs() {
 		$this->Task->expects($this->never())
 			->method('createFile');
 
-		$this->Task->execute();
+		$this->Task->main();
 	}
 
 /**