- add-project -b オプションの挙動変更 http://sourceforge.jp/ticket/browse.php?group_id=1343...

diff --git a/class/Plugin/Generator/Ethna_Plugin_Generator_Project.php b/class/Plugin/Generator/Ethna_Plugin_Generator_Project.php
index f0f02b8..4454469 100644 (file)
--- a/class/Plugin/Generator/Ethna_Plugin_Generator_Project.php
+++ b/class/Plugin/Generator/Ethna_Plugin_Generator_Project.php
@@ -71,8 +71,6 @@ class Ethna_Plugin_Generator_Project extends Ethna_Plugin_Generator
             return $r;
         }
 
-        $basedir = sprintf("%s/%s", $basedir, $id);
-
         // ディレクトリ作成
         if (is_dir($basedir) == false) {
             // confirm

diff --git a/class/Plugin/Handle/Ethna_Plugin_Handle_AddProject.php b/class/Plugin/Handle/Ethna_Plugin_Handle_AddProject.php
index c895f0b..ff975fd 100644 (file)
--- a/class/Plugin/Handle/Ethna_Plugin_Handle_AddProject.php
+++ b/class/Plugin/Handle/Ethna_Plugin_Handle_AddProject.php
@@ -46,7 +46,7 @@ class Ethna_Plugin_Handle_AddProject extends Ethna_Plugin_Handle
         if (isset($opt_list['basedir'])) {
             $basedir = realpath(end($opt_list['basedir']));
         } else {
-            $basedir = getcwd();
+            $basedir = sprintf("%s/%s", getcwd(), strtolower($app_id));
         }
 
         // skeldir

diff --git a/test/Ethna_MockProject.php b/test/Ethna_MockProject.php
index 7427d5a..2cd797f 100644 (file)
--- a/test/Ethna_MockProject.php
+++ b/test/Ethna_MockProject.php
@@ -65,7 +65,7 @@ class Ethna_MockProject
         $id = 'add-project';
         $options = array(
                        '-b',
-                       $this->basedir,
+                       $this->basedir . '/' . $this->project_name,
                        '-s',
                        $this->skel_dir, 
                        $this->project_name,