Fix PluginTask to deny option of ROOT/plugins and fixed autoloader generation

Merge branch 'DSchalla/master' into master.

Closes #26

Author: markstory

src/Shell/Task/PluginTask.php

@@ -215,9 +215,11 @@ protected function _modifyAutoloader($plugin, $path)
             return false;
         }
 
+        $autoloadPath = str_replace(ROOT, '.', $this->path);
+
         $config = json_decode(file_get_contents($file), true);
-        $config['autoload']['psr-4'][$plugin . '\\'] = "./plugins/$plugin/src";
-        $config['autoload-dev']['psr-4'][$plugin . '\\Test\\'] = "./plugins/$plugin/tests";
+        $config['autoload']['psr-4'][$plugin . '\\'] = $autoloadPath . $plugin . "/src";
+        $config['autoload-dev']['psr-4'][$plugin . '\\Test\\'] = $autoloadPath . $plugin . "/tests";
 
         $this->out('<info>Modifying composer autoloader</info>');
 
@@ -235,7 +237,7 @@ protected function _modifyAutoloader($plugin, $path)
             $cwd = getcwd();
 
             // Windows makes running multiple commands at once hard.
-            chdir(dirname($path));
+            chdir(dirname($this->_rootComposerFilePath()));
             $command = 'php ' . escapeshellarg($composer) . ' dump-autoload';
             $this->callProcess($command);
 
@@ -252,7 +254,7 @@ protected function _modifyAutoloader($plugin, $path)
     /**
      * The path to the main application's composer file
      *
-     * This is a test issolation wrapper
+     * This is a test isolation wrapper
      *
      * @return string the abs file path
      */
@@ -276,8 +278,18 @@ public function findPath(array $pathOptions)
             }
         }
         $pathOptions = array_values($pathOptions);
-
         $max = count($pathOptions);
+
+        if ($max == 0) {
+            $this->err('No valid plugin paths found! Please configure a plugin path that exists.');
+            throw new \RuntimeException();
+        }
+
+        if ($max === 1) {
+            $this->path = $pathOptions[0];
+            return;
+        }
+
         while (!$valid) {
             foreach ($pathOptions as $i => $option) {
                 $this->out($i + 1 . '. ' . $option);

tests/TestCase/Shell/Task/PluginTaskTest.php

@@ -138,6 +138,10 @@ public function testMainUpdateComposer()
         $file = TMP . 'tests' . DS . 'main-composer.json';
         file_put_contents($file, '{}');
 
+        $savePath = $this->Task->path;
+
+        $this->Task->path = ROOT . DS . 'tests' . DS . 'BakedPlugins/';
+
         $this->Task->expects($this->any())
             ->method('_rootComposerFilePath')
             ->will($this->returnValue($file));
@@ -150,17 +154,21 @@ public function testMainUpdateComposer()
 
         $result = file_get_contents($file);
         $this->assertSameAsFile(__FUNCTION__ . '.json', $result);
+
+        $folder = new Folder($this->Task->path);
+        $folder->delete();
+
+        $this->Task->path = $savePath;
     }
 
     /**
      * Test that findPath ignores paths that don't exist.
      *
      * @return void
      */
-    public function testFindPathNonExistant()
+    public function testFindPathNonExistent()
     {
         $paths = App::path('Plugin');
-        $last = count($paths);
 
         array_unshift($paths, '/fake/path');
         $paths[] = '/fake/path2';
@@ -172,13 +180,29 @@ public function testFindPathNonExistant()
         );
         $this->Task->path = TMP . 'tests' . DS;
 
-        // Make sure the added path is filtered out.
-        $this->Task->expects($this->exactly($last))
-            ->method('out');
+        $this->Task->method('findPath')
+            ->will($this->returnValue($paths[0]));
 
-        $this->Task->expects($this->once())
-            ->method('in')
-            ->will($this->returnValue($last));
+        $this->Task->findPath($paths);
+    }
+
+    /**
+     * Test that findPath throws RunTimeException when no
+     * path exists for plugins
+     *
+     * @expectedException \RunTimeException
+     * @return void
+     */
+    public function testFindPathEmpty()
+    {
+        $paths = ['/fake/path', '/fake/path2'];
+
+        $this->Task = $this->getMock(
+            'Bake\Shell\Task\PluginTask',
+            ['in', 'out', 'err', '_stop'],
+            [$this->io]
+        );
+        $this->Task->path = TMP . 'tests' . DS;
 
         $this->Task->findPath($paths);
     }

tests/comparisons/Plugin/testMainUpdateComposer.json

@@ -1,12 +1,12 @@
 {
     "autoload": {
         "psr-4": {
-            "ComposerExample\\": "./plugins/ComposerExample/src"
+            "ComposerExample\\": "./tests/BakedPlugins/ComposerExample/src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "ComposerExample\\Test\\": "./plugins/ComposerExample/tests"
+            "ComposerExample\\Test\\": "./tests/BakedPlugins/ComposerExample/tests"
         }
     }
 }