From 241a3bf6240ddcdfe7c1db64e3c3dc6865af80cc Mon Sep 17 00:00:00 2001 From: Jose Lorenzo Rodriguez Date: Mon, 11 Apr 2011 21:43:40 -0430 Subject: [PATCH] Fixing ProjectTask tests and renaming folders in skel directory --- lib/Cake/Console/Command/Task/ProjectTask.php | 12 ++++++------ .../shells/tasks => Console/Command/Task}/empty | 0 .../Console/templates/skel/{console => Console}/cake | 0 .../templates/skel/{console => Console}/cake.bat | 0 .../templates/skel/{console => Console}/cake.php | 0 .../{controllers => Controller}/AppController.php | 0 .../components => Controller/Component}/empty | 0 .../{controllers => Controller}/PagesController.php | 0 lib/Cake/Console/templates/skel/{libs => Lib}/empty | 0 .../templates/skel/{models => Model}/AppModel.php | 0 .../skel/{models/behaviors => Model/Behavior}/empty | 0 .../{models/datasources => Model/Datasource}/empty | 0 .../{views/helpers => View/Helper}/AppHelper.php | 0 .../skel/{views/elements => View/Helper}/empty | 0 .../{views => View}/elements/email/html/default.ctp | 0 .../{views => View}/elements/email/text/default.ctp | 0 .../skel/{views/errors => View/elements}/empty | 0 .../skel/{views/helpers => View/errors}/empty | 0 .../templates/skel/{views => View}/layouts/ajax.ctp | 0 .../skel/{views => View}/layouts/default.ctp | 0 .../{views => View}/layouts/email/html/default.ctp | 0 .../{views => View}/layouts/email/text/default.ctp | 0 .../templates/skel/{views => View}/layouts/flash.ctp | 0 .../skel/{views => View}/layouts/js/default.ctp | 0 .../skel/{views => View}/layouts/rss/default.ctp | 0 .../skel/{views => View}/layouts/xml/default.ctp | 0 .../templates/skel/{views => View}/pages/empty | 0 .../templates/skel/{views => View}/scaffolds/empty | 0 .../{ErrorHanlderTest.php => ErrorHandlerTest.php} | 0 29 files changed, 6 insertions(+), 6 deletions(-) rename lib/Cake/Console/templates/skel/{console/shells/tasks => Console/Command/Task}/empty (100%) rename lib/Cake/Console/templates/skel/{console => Console}/cake (100%) rename lib/Cake/Console/templates/skel/{console => Console}/cake.bat (100%) rename lib/Cake/Console/templates/skel/{console => Console}/cake.php (100%) rename lib/Cake/Console/templates/skel/{controllers => Controller}/AppController.php (100%) rename lib/Cake/Console/templates/skel/{controllers/components => Controller/Component}/empty (100%) rename lib/Cake/Console/templates/skel/{controllers => Controller}/PagesController.php (100%) rename lib/Cake/Console/templates/skel/{libs => Lib}/empty (100%) rename lib/Cake/Console/templates/skel/{models => Model}/AppModel.php (100%) rename lib/Cake/Console/templates/skel/{models/behaviors => Model/Behavior}/empty (100%) rename lib/Cake/Console/templates/skel/{models/datasources => Model/Datasource}/empty (100%) rename lib/Cake/Console/templates/skel/{views/helpers => View/Helper}/AppHelper.php (100%) rename lib/Cake/Console/templates/skel/{views/elements => View/Helper}/empty (100%) rename lib/Cake/Console/templates/skel/{views => View}/elements/email/html/default.ctp (100%) rename lib/Cake/Console/templates/skel/{views => View}/elements/email/text/default.ctp (100%) rename lib/Cake/Console/templates/skel/{views/errors => View/elements}/empty (100%) rename lib/Cake/Console/templates/skel/{views/helpers => View/errors}/empty (100%) rename lib/Cake/Console/templates/skel/{views => View}/layouts/ajax.ctp (100%) rename lib/Cake/Console/templates/skel/{views => View}/layouts/default.ctp (100%) rename lib/Cake/Console/templates/skel/{views => View}/layouts/email/html/default.ctp (100%) rename lib/Cake/Console/templates/skel/{views => View}/layouts/email/text/default.ctp (100%) rename lib/Cake/Console/templates/skel/{views => View}/layouts/flash.ctp (100%) rename lib/Cake/Console/templates/skel/{views => View}/layouts/js/default.ctp (100%) rename lib/Cake/Console/templates/skel/{views => View}/layouts/rss/default.ctp (100%) rename lib/Cake/Console/templates/skel/{views => View}/layouts/xml/default.ctp (100%) rename lib/Cake/Console/templates/skel/{views => View}/pages/empty (100%) rename lib/Cake/Console/templates/skel/{views => View}/scaffolds/empty (100%) rename lib/Cake/tests/Case/Error/{ErrorHanlderTest.php => ErrorHandlerTest.php} (100%) diff --git a/lib/Cake/Console/Command/Task/ProjectTask.php b/lib/Cake/Console/Command/Task/ProjectTask.php index b2a8b2e5dd6..6f254c96b84 100644 --- a/lib/Cake/Console/Command/Task/ProjectTask.php +++ b/lib/Cake/Console/Command/Task/ProjectTask.php @@ -102,9 +102,9 @@ public function execute() { $success = false; } if ($this->consolePath($path) === true) { - $this->out(__d('cake_console', ' * app/console/cake.php path set.')); + $this->out(__d('cake_console', ' * app/Console/cake.php path set.')); } else { - $this->err(__d('cake_console', 'Unable to set console path for app/console.')); + $this->err(__d('cake_console', 'Unable to set console path for app/Console.')); $success = false; } @@ -194,7 +194,7 @@ function bake($path, $skel = null, $skip = array('empty')) { public function createHome($dir) { $app = basename($dir); $path = $dir . 'views' . DS . 'pages' . DS; - $source = CAKE . 'console' . DS . 'templates' . DS .'default' . DS . 'views' . DS . 'home.ctp'; + $source = LIBS . 'Console' . DS . 'templates' . DS .'default' . DS . 'views' . DS . 'home.ctp'; include($source); return $this->createFile($path.'home.ctp', $output); } @@ -207,10 +207,10 @@ public function createHome($dir) { * @return boolean success */ public function consolePath($path) { - $File = new File($path . 'console' . DS . 'cake.php'); + $File = new File($path . 'Console' . DS . 'cake.php'); $contents = $File->read(); if (preg_match('/(__CAKE_PATH__)/', $contents, $match)) { - $path = CAKE_CORE_INCLUDE_PATH . DS . 'cake' . DS . 'console' . DS; + $path = LIBS . 'Console' . DS; $replacement = "'" . str_replace(DS, "' . DIRECTORY_SEPARATOR . '", $path) . "'"; $result = str_replace($match[0], $replacement, $contents); if ($File->write($result)) { @@ -252,7 +252,7 @@ public function securityCipherSeed($path) { $contents = $File->read(); if (preg_match('/([\s]*Configure::write\(\'Security.cipherSeed\',[\s\'A-z0-9]*\);)/', $contents, $match)) { if (!class_exists('Security')) { - require LIBS . 'security.php'; + require LIBS . 'Utility' . DS . 'security.php'; } $string = substr(bin2hex(Security::generateAuthKey()), 0, 30); $result = str_replace($match[0], "\t" . 'Configure::write(\'Security.cipherSeed\', \''.$string.'\');', $contents); diff --git a/lib/Cake/Console/templates/skel/console/shells/tasks/empty b/lib/Cake/Console/templates/skel/Console/Command/Task/empty similarity index 100% rename from lib/Cake/Console/templates/skel/console/shells/tasks/empty rename to lib/Cake/Console/templates/skel/Console/Command/Task/empty diff --git a/lib/Cake/Console/templates/skel/console/cake b/lib/Cake/Console/templates/skel/Console/cake similarity index 100% rename from lib/Cake/Console/templates/skel/console/cake rename to lib/Cake/Console/templates/skel/Console/cake diff --git a/lib/Cake/Console/templates/skel/console/cake.bat b/lib/Cake/Console/templates/skel/Console/cake.bat similarity index 100% rename from lib/Cake/Console/templates/skel/console/cake.bat rename to lib/Cake/Console/templates/skel/Console/cake.bat diff --git a/lib/Cake/Console/templates/skel/console/cake.php b/lib/Cake/Console/templates/skel/Console/cake.php similarity index 100% rename from lib/Cake/Console/templates/skel/console/cake.php rename to lib/Cake/Console/templates/skel/Console/cake.php diff --git a/lib/Cake/Console/templates/skel/controllers/AppController.php b/lib/Cake/Console/templates/skel/Controller/AppController.php similarity index 100% rename from lib/Cake/Console/templates/skel/controllers/AppController.php rename to lib/Cake/Console/templates/skel/Controller/AppController.php diff --git a/lib/Cake/Console/templates/skel/controllers/components/empty b/lib/Cake/Console/templates/skel/Controller/Component/empty similarity index 100% rename from lib/Cake/Console/templates/skel/controllers/components/empty rename to lib/Cake/Console/templates/skel/Controller/Component/empty diff --git a/lib/Cake/Console/templates/skel/controllers/PagesController.php b/lib/Cake/Console/templates/skel/Controller/PagesController.php similarity index 100% rename from lib/Cake/Console/templates/skel/controllers/PagesController.php rename to lib/Cake/Console/templates/skel/Controller/PagesController.php diff --git a/lib/Cake/Console/templates/skel/libs/empty b/lib/Cake/Console/templates/skel/Lib/empty similarity index 100% rename from lib/Cake/Console/templates/skel/libs/empty rename to lib/Cake/Console/templates/skel/Lib/empty diff --git a/lib/Cake/Console/templates/skel/models/AppModel.php b/lib/Cake/Console/templates/skel/Model/AppModel.php similarity index 100% rename from lib/Cake/Console/templates/skel/models/AppModel.php rename to lib/Cake/Console/templates/skel/Model/AppModel.php diff --git a/lib/Cake/Console/templates/skel/models/behaviors/empty b/lib/Cake/Console/templates/skel/Model/Behavior/empty similarity index 100% rename from lib/Cake/Console/templates/skel/models/behaviors/empty rename to lib/Cake/Console/templates/skel/Model/Behavior/empty diff --git a/lib/Cake/Console/templates/skel/models/datasources/empty b/lib/Cake/Console/templates/skel/Model/Datasource/empty similarity index 100% rename from lib/Cake/Console/templates/skel/models/datasources/empty rename to lib/Cake/Console/templates/skel/Model/Datasource/empty diff --git a/lib/Cake/Console/templates/skel/views/helpers/AppHelper.php b/lib/Cake/Console/templates/skel/View/Helper/AppHelper.php similarity index 100% rename from lib/Cake/Console/templates/skel/views/helpers/AppHelper.php rename to lib/Cake/Console/templates/skel/View/Helper/AppHelper.php diff --git a/lib/Cake/Console/templates/skel/views/elements/empty b/lib/Cake/Console/templates/skel/View/Helper/empty similarity index 100% rename from lib/Cake/Console/templates/skel/views/elements/empty rename to lib/Cake/Console/templates/skel/View/Helper/empty diff --git a/lib/Cake/Console/templates/skel/views/elements/email/html/default.ctp b/lib/Cake/Console/templates/skel/View/elements/email/html/default.ctp similarity index 100% rename from lib/Cake/Console/templates/skel/views/elements/email/html/default.ctp rename to lib/Cake/Console/templates/skel/View/elements/email/html/default.ctp diff --git a/lib/Cake/Console/templates/skel/views/elements/email/text/default.ctp b/lib/Cake/Console/templates/skel/View/elements/email/text/default.ctp similarity index 100% rename from lib/Cake/Console/templates/skel/views/elements/email/text/default.ctp rename to lib/Cake/Console/templates/skel/View/elements/email/text/default.ctp diff --git a/lib/Cake/Console/templates/skel/views/errors/empty b/lib/Cake/Console/templates/skel/View/elements/empty similarity index 100% rename from lib/Cake/Console/templates/skel/views/errors/empty rename to lib/Cake/Console/templates/skel/View/elements/empty diff --git a/lib/Cake/Console/templates/skel/views/helpers/empty b/lib/Cake/Console/templates/skel/View/errors/empty similarity index 100% rename from lib/Cake/Console/templates/skel/views/helpers/empty rename to lib/Cake/Console/templates/skel/View/errors/empty diff --git a/lib/Cake/Console/templates/skel/views/layouts/ajax.ctp b/lib/Cake/Console/templates/skel/View/layouts/ajax.ctp similarity index 100% rename from lib/Cake/Console/templates/skel/views/layouts/ajax.ctp rename to lib/Cake/Console/templates/skel/View/layouts/ajax.ctp diff --git a/lib/Cake/Console/templates/skel/views/layouts/default.ctp b/lib/Cake/Console/templates/skel/View/layouts/default.ctp similarity index 100% rename from lib/Cake/Console/templates/skel/views/layouts/default.ctp rename to lib/Cake/Console/templates/skel/View/layouts/default.ctp diff --git a/lib/Cake/Console/templates/skel/views/layouts/email/html/default.ctp b/lib/Cake/Console/templates/skel/View/layouts/email/html/default.ctp similarity index 100% rename from lib/Cake/Console/templates/skel/views/layouts/email/html/default.ctp rename to lib/Cake/Console/templates/skel/View/layouts/email/html/default.ctp diff --git a/lib/Cake/Console/templates/skel/views/layouts/email/text/default.ctp b/lib/Cake/Console/templates/skel/View/layouts/email/text/default.ctp similarity index 100% rename from lib/Cake/Console/templates/skel/views/layouts/email/text/default.ctp rename to lib/Cake/Console/templates/skel/View/layouts/email/text/default.ctp diff --git a/lib/Cake/Console/templates/skel/views/layouts/flash.ctp b/lib/Cake/Console/templates/skel/View/layouts/flash.ctp similarity index 100% rename from lib/Cake/Console/templates/skel/views/layouts/flash.ctp rename to lib/Cake/Console/templates/skel/View/layouts/flash.ctp diff --git a/lib/Cake/Console/templates/skel/views/layouts/js/default.ctp b/lib/Cake/Console/templates/skel/View/layouts/js/default.ctp similarity index 100% rename from lib/Cake/Console/templates/skel/views/layouts/js/default.ctp rename to lib/Cake/Console/templates/skel/View/layouts/js/default.ctp diff --git a/lib/Cake/Console/templates/skel/views/layouts/rss/default.ctp b/lib/Cake/Console/templates/skel/View/layouts/rss/default.ctp similarity index 100% rename from lib/Cake/Console/templates/skel/views/layouts/rss/default.ctp rename to lib/Cake/Console/templates/skel/View/layouts/rss/default.ctp diff --git a/lib/Cake/Console/templates/skel/views/layouts/xml/default.ctp b/lib/Cake/Console/templates/skel/View/layouts/xml/default.ctp similarity index 100% rename from lib/Cake/Console/templates/skel/views/layouts/xml/default.ctp rename to lib/Cake/Console/templates/skel/View/layouts/xml/default.ctp diff --git a/lib/Cake/Console/templates/skel/views/pages/empty b/lib/Cake/Console/templates/skel/View/pages/empty similarity index 100% rename from lib/Cake/Console/templates/skel/views/pages/empty rename to lib/Cake/Console/templates/skel/View/pages/empty diff --git a/lib/Cake/Console/templates/skel/views/scaffolds/empty b/lib/Cake/Console/templates/skel/View/scaffolds/empty similarity index 100% rename from lib/Cake/Console/templates/skel/views/scaffolds/empty rename to lib/Cake/Console/templates/skel/View/scaffolds/empty diff --git a/lib/Cake/tests/Case/Error/ErrorHanlderTest.php b/lib/Cake/tests/Case/Error/ErrorHandlerTest.php similarity index 100% rename from lib/Cake/tests/Case/Error/ErrorHanlderTest.php rename to lib/Cake/tests/Case/Error/ErrorHandlerTest.php