Make installation more robust

* Remove autoload.php generation
* Make using the puli/cli in the same project work

Author: helhum

src/PuliPluginImpl.php

@@ -14,9 +14,11 @@
 use Composer\Composer;
 use Composer\Config;
 use Composer\IO\IOInterface;
+use Composer\Json\JsonFile;
 use Composer\Package\AliasPackage;
 use Composer\Package\PackageInterface;
 use Composer\Script\Event;
+use Composer\Util\RemoteFilesystem;
 use Exception;
 use RuntimeException;
 use Symfony\Component\Filesystem\Filesystem;
@@ -103,11 +105,6 @@ class PuliPluginImpl
      */
     private $initialized = false;
 
-    /**
-     * @var string
-     */
-    private $autoloadFile;
-
     public function __construct(Event $event, PuliRunner $puliRunner = null)
     {
         $this->composer = $event->getComposer();
@@ -116,38 +113,19 @@ public function __construct(Event $event, PuliRunner $puliRunner = null)
         $this->isDev = $event->isDevMode();
         $this->puliRunner = $puliRunner;
         $this->rootDir = Path::normalize(getcwd());
-
-        $vendorDir = $this->config->get('vendor-dir');
-
-        // On TravisCI, $vendorDir is a relative path. Probably an old Composer
-        // build or something. Usually, $vendorDir should be absolute already.
-        $vendorDir = Path::makeAbsolute($vendorDir, $this->rootDir);
-
-        $this->autoloadFile = $vendorDir.'/autoload.php';
     }
 
     public function preAutoloadDump()
     {
-        if (!$this->initialized) {
-            $this->initialize();
-        }
-
-        // This method is called twice. Run it only once.
+        // This method is called multiple times. Run it only once.
         if (!$this->runPreAutoloadDump) {
             return;
         }
 
         $this->runPreAutoloadDump = false;
 
-        try {
-            $factoryClass = $this->getConfigKey('factory.in.class');
-            $factoryFile = $this->getConfigKey('factory.in.file');
-        } catch (PuliRunnerException $e) {
-            $this->printWarning('Could not load Puli configuration', $e);
-
-            return;
-        }
-
+        $factoryClass = $this->getConfigKey('factory.in.class');
+        $factoryFile = $this->getConfigKey('factory.in.file');
         $factoryFile = Path::makeAbsolute($factoryFile, $this->rootDir);
 
         $autoload = $this->composer->getPackage()->getAutoload();
@@ -178,7 +156,7 @@ public function postAutoloadDump()
             $this->initialize();
         }
 
-        // This method is called twice. Run it only once.
+        // This method is called multiple times. Run it only once.
         if (!$this->runPostAutoloadDump) {
             return;
         }
@@ -193,8 +171,15 @@ public function postAutoloadDump()
             return;
         }
 
-        $this->insertFactoryClassConstant($this->autoloadFile, $factoryClass);
-        $this->setBootstrapFile($this->autoloadFile);
+        $vendorDir = $this->config->get('vendor-dir');
+
+        // On TravisCI, $vendorDir is a relative path. Probably an old Composer
+        // build or something. Usually, $vendorDir should be absolute already.
+        $vendorDir = Path::makeAbsolute($vendorDir, $this->rootDir);
+
+        $autoloadFile = $vendorDir.'/autoload.php';
+        $this->insertFactoryClassConstant($autoloadFile, $factoryClass);
+        $this->setBootstrapFile($autoloadFile);
     }
 
     /**
@@ -206,7 +191,7 @@ public function postInstall()
             $this->initialize();
         }
 
-        // This method is called twice. Run it only once.
+        // This method is called multiple times. Run it only once.
         if (!$this->runPostInstall) {
             return;
         }
@@ -251,13 +236,6 @@ public function postInstall()
 
     private function initialize()
     {
-        if (!file_exists($this->autoloadFile)) {
-            $filesystem = new Filesystem();
-            // Avoid problems if using the runner before autoload.php has been
-            // generated
-            $filesystem->dumpFile($this->autoloadFile, '');
-        }
-
         $this->initialized = true;
 
         // Keep the manually set runner
@@ -535,6 +513,33 @@ private function loadComposerPackages()
 
     private function getConfigKey($key)
     {
+        if (null === $this->puliRunner) {
+            $puliJsonPath = realpath(substr($this->config->get('vendor-dir'), 0, -strlen($this->config->get('vendor-dir', Config::RELATIVE_PATHS)))) . DIRECTORY_SEPARATOR . 'puli.json';
+            if (file_exists($puliJsonPath)) {
+                $puliJsonFile = new JsonFile($puliJsonPath, new RemoteFilesystem($this->io));
+                $puliConfig = $puliJsonFile->read();
+                if (empty($puliConfig['version']) || '1.0' !== $puliConfig['version']) {
+                    throw new \RuntimeException('Invalid configuration version schema!');
+                }
+            }
+            switch ($key) {
+                case 'factory.in.file':
+                    if (empty($puliConfig) || empty($puliConfig['config']['factory']['in']['file'])) {
+                        return '.puli/GeneratedPuliFactory';
+                    }
+                    return $puliConfig['config']['factory']['in']['file'];
+                    break;
+                case 'factory.in.class':
+                    if (empty($puliConfig) || empty($puliConfig['config']['factory']['in']['class'])) {
+                        return 'Puli\\GeneratedPuliFactory';
+                    }
+                    return $puliConfig['config']['factory']['in']['class'];
+                    break;
+                default:
+                    throw new \RuntimeException(sprintf('Cannot extract key "%s" from config!', $key));
+            }
+        }
+
         $value = trim($this->puliRunner->run('config %key% --parsed', array(
             'key' => $key,
         )));