From 9d1e5564861f0d9578617eb54d99eab149eceb8c Mon Sep 17 00:00:00 2001 From: AD7six Date: Sun, 9 Aug 2009 22:36:15 +0200 Subject: [PATCH] Revert "mend" This reverts commit a0f42640cc10342f96effe4d08be188bb51bd0db. --- app/tmp/cache/persistent/empty | 0 cake/console/cake.php | 68 +++++++------------------- cake/tests/cases/console/cake.test.php | 53 ++++++++++---------- vendors/css/empty | 0 vendors/js/empty | 0 5 files changed, 43 insertions(+), 78 deletions(-) create mode 100755 app/tmp/cache/persistent/empty create mode 100644 vendors/css/empty create mode 100644 vendors/js/empty diff --git a/app/tmp/cache/persistent/empty b/app/tmp/cache/persistent/empty new file mode 100755 index 000000000..e69de29bb diff --git a/cake/console/cake.php b/cake/console/cake.php index e3e1c85ba..ab4d6c891 100644 --- a/cake/console/cake.php +++ b/cake/console/cake.php @@ -27,7 +27,6 @@ if (!defined('E_DEPRECATED')) { define('E_DEPRECATED', 8192); } - /** * Shell dispatcher * @@ -403,7 +402,6 @@ class ShellDispatcher { $this->stderr($title . "\n" . $message . "\n"); return false; } - /** * Get shell to use, either plugin shell or application shell * @@ -608,56 +606,26 @@ class ShellDispatcher { $this->stdout("Example: -app relative/path/to/myapp or -app /absolute/path/to/myapp"); $this->stdout("\nAvailable Shells:"); - $shellList = array(); + $_shells = array(); foreach ($this->shellPaths as $path) { - if (!is_dir($path)) { - continue; - } - $shells = App::objects('file', $path); - if (empty($shells)) { - continue; - } - if (preg_match('@plugins[\\\/]([^\\\/]*)@', $path, $matches)) { - $type = Inflector::camelize($matches[1]); - } elseif (preg_match('@([^\\\/]*)[\\\/]vendors[\\\/]@', $path, $matches)) { - $type = $matches[1]; - } elseif (strpos($path, CAKE_CORE_INCLUDE_PATH . DS . 'cake') === 0) { - $type = 'CORE'; - } else { - $type = 'app'; - } - foreach ($shells as $shell) { - if ($shell !== 'shell.php') { - $shell = str_replace('.php', '', $shell); - $shellList[$shell][$type] = $type; - } - } - } - if ($shellList) { - ksort($shellList); - if (DS === '/') { - $width = exec('tput cols') - 2; - } - if (empty($width)) { - $width = 80; - } - $columns = max(1, floor($width / 30)); - $rows = ceil(count($shellList) / $columns); + if (is_dir($path)) { + $shells = App::objects('file', $path); + $path = str_replace(CAKE_CORE_INCLUDE_PATH . DS . 'cake' . DS, 'CORE' . DS, $path); + $path = str_replace(APP, 'APP' . DS, $path); + $path = str_replace(ROOT, 'ROOT', $path); + $path = rtrim($path, DS); + $this->stdout("\n " . $path . ":"); + if (empty($shells)) { + $this->stdout("\t - none"); + } else { + sort($shells); + foreach ($shells as $shell) { - foreach($shellList as $shell => $types) { - sort($types); - $shellList[$shell] = str_pad($shell . ' [' . implode ($types, ', ') . ']', $width / $columns); - } - $out = array_chunk($shellList, $rows); - for($i = 0; $i < $rows; $i++) { - $row = ''; - for($j = 0; $j < $columns; $j++) { - if (!isset($out[$j][$i])) { - continue; - } - $row .= $out[$j][$i]; - } - $this->stdout(" " . $row); + if ($shell !== 'shell.php') { + $this->stdout("\t " . str_replace('.php', '', $shell)); + } + } + } } } $this->stdout("\nTo run a command, type 'cake shell_name [args]'"); diff --git a/cake/tests/cases/console/cake.test.php b/cake/tests/cases/console/cake.test.php index ef725f168..de7d8793e 100644 --- a/cake/tests/cases/console/cake.test.php +++ b/cake/tests/cases/console/cake.test.php @@ -36,8 +36,8 @@ if (!class_exists('ShellDispatcher')) { ob_end_clean(); } -require_once CONSOLE_LIBS . 'shell.php'; +require_once CONSOLE_LIBS . 'shell.php'; /** * TestShellDispatcher class * @@ -85,7 +85,6 @@ class TestShellDispatcher extends ShellDispatcher { * @access public */ var $TestShell; - /** * _initEnvironment method * @@ -139,7 +138,6 @@ class TestShellDispatcher extends ShellDispatcher { $this->stopped = 'Stopped with status: ' . $status; return $status; } - /** * getShell * @@ -150,7 +148,6 @@ class TestShellDispatcher extends ShellDispatcher { function getShell($plugin = null) { return $this->_getShell($plugin); } - /** * _getShell * @@ -442,6 +439,7 @@ class ShellDispatcherTest extends CakeTestCase { $Dispatcher->parseParams($params); $this->assertEqual($expected, $Dispatcher->params); + $params = array( 'cake.php', '-working', @@ -512,7 +510,6 @@ class ShellDispatcherTest extends CakeTestCase { $result = $Dispatcher->getShell('test_plugin'); $this->assertIsA($result, 'ExampleShell'); } - /** * Verify correct dispatch of Shell subclasses with a main method * @@ -603,7 +600,6 @@ class ShellDispatcherTest extends CakeTestCase { $result = $Dispatcher->dispatch(); $this->assertFalse($result); } - /** * Verify correct dispatch of Shell subclasses without a main method * @@ -675,7 +671,6 @@ class ShellDispatcherTest extends CakeTestCase { $result = $Dispatcher->dispatch(); $this->assertFalse($result); } - /** * Verify correct dispatch of custom classes with a main method * @@ -755,7 +750,6 @@ class ShellDispatcherTest extends CakeTestCase { $result = $Dispatcher->dispatch(); $this->assertFalse($result); } - /** * Verify correct dispatch of custom classes without a main method * @@ -825,7 +819,6 @@ class ShellDispatcherTest extends CakeTestCase { $result = $Dispatcher->dispatch(); $this->assertFalse($result); } - /** * Verify that a task is called instead of the shell if the first arg equals * the name of the task @@ -874,7 +867,6 @@ class ShellDispatcherTest extends CakeTestCase { $result = $Dispatcher->dispatch(); $this->assertTrue($result); } - /** * Verify shifting of arguments * @@ -914,34 +906,39 @@ class ShellDispatcherTest extends CakeTestCase { function testHelpCommand() { $Dispatcher =& new TestShellDispatcher(); - $expected = "/example \[.*TestPlugin, TestPluginTwo.*\]/"; + $expected = "/ CORE(\\\|\/)tests(\\\|\/)test_app(\\\|\/)plugins(\\\|\/)test_plugin(\\\|\/)vendors(\\\|\/)shells:"; + $expected .= "\n\t example"; + $expected .= "\n/"; $this->assertPattern($expected, $Dispatcher->stdout); - $expected = "/welcome \[.*TestPluginTwo.*\]/"; + $expected = "/ CORE(\\\|\/)tests(\\\|\/)test_app(\\\|\/)plugins(\\\|\/)test_plugin_two(\\\|\/)vendors(\\\|\/)shells:"; + $expected .= "\n\t example"; + $expected .= "\n\t welcome"; + $expected .= "\n/"; $this->assertPattern($expected, $Dispatcher->stdout); - $expected = "/acl \[.*CORE.*\]/"; + $expected = "/ APP(\\\|\/)vendors(\\\|\/)shells:"; + $expected .= "\n/"; $this->assertPattern($expected, $Dispatcher->stdout); - $expected = "/api \[.*CORE.*\]/"; + $expected = "/ ROOT(\\\|\/)vendors(\\\|\/)shells:"; + $expected .= "\n/"; $this->assertPattern($expected, $Dispatcher->stdout); - $expected = "/bake \[.*CORE.*\]/"; + $expected = "/ CORE(\\\|\/)console(\\\|\/)libs:"; + $expected .= "\n\t acl"; + $expected .= "\n\t api"; + $expected .= "\n\t bake"; + $expected .= "\n\t console"; + $expected .= "\n\t i18n"; + $expected .= "\n\t schema"; + $expected .= "\n\t testsuite"; + $expected .= "\n/"; $this->assertPattern($expected, $Dispatcher->stdout); - $expected = "/console \[.*CORE.*\]/"; - $this->assertPattern($expected, $Dispatcher->stdout); - - $expected = "/i18n \[.*CORE.*\]/"; - $this->assertPattern($expected, $Dispatcher->stdout); - - $expected = "/schema \[.*CORE.*\]/"; - $this->assertPattern($expected, $Dispatcher->stdout); - - $expected = "/testsuite \[.*CORE.*\]/"; - $this->assertPattern($expected, $Dispatcher->stdout); - - $expected = "/sample \[.*test_app.*\]/"; + $expected = "/ CORE(\\\|\/)tests(\\\|\/)test_app(\\\|\/)vendors(\\\|\/)shells:"; + $expected .= "\n\t sample"; + $expected .= "\n/"; $this->assertPattern($expected, $Dispatcher->stdout); } } diff --git a/vendors/css/empty b/vendors/css/empty new file mode 100644 index 000000000..e69de29bb diff --git a/vendors/js/empty b/vendors/js/empty new file mode 100644 index 000000000..e69de29bb