Merge pull request #62 from open-sausages/pulls/2.0/actually-working-…

…repository BUG Fix --repository so that it actually works
silverstripe · Dec 6, 2017 · d27b173 · d27b173
2 parents 1ee78d9 + 7cae2df
commit d27b173
Show file tree

Hide file tree

Showing 2 changed files with 88 additions and 14 deletions.
diff --git a/src/Commands/Release/Archive.php b/src/Commands/Release/Archive.php
@@ -22,13 +22,14 @@ protected function fire()
         // Get arguments
         $project = $this->getProject();
         $releasePlan = $this->getReleasePlan();
+        $repository = $this->getInputRepository();
 
         // Ensure we wait, even if just building archive
         $wait = new WaitStep($this, $project, $releasePlan);
         $wait->run($this->input, $this->output);
 
         // Create packages
-        $package = new BuildArchive($this, $project, $releasePlan);
+        $package = new BuildArchive($this, $project, $releasePlan, $repository);
         $package->run($this->input, $this->output);
     }
 }
diff --git a/src/Utility/Composer.php b/src/Utility/Composer.php
@@ -45,27 +45,100 @@ public static function createProject(
         $repository = null,
         $preferDist = false
     ) {
-        $command = [
-            "composer",
-            "create-project",
+        // Create-options
+        $createOptions = [
+            "--no-secure-http",
             "--no-interaction",
             "--ignore-platform-reqs",
-            $recipe,
-            $directory,
-            $version
         ];
+
+        // Set dev / stable options
         if ($preferDist) {
-            $command[] = "--prefer-dist";
-            $command[] = "--no-dev";
+            $createOptions[] = "--prefer-dist";
+            $createOptions[] = "--no-dev";
         } else {
-            $command[] = "--prefer-source";
-            $command[] = "--keep-vcs";
+            $createOptions[] = "--prefer-source";
+            $createOptions[] = "--keep-vcs"; // create only
         }
+
+        // If using a repository, we must delay for a later update
+        if ($repository) {
+            $createOptions[] = '--repository';
+            $createOptions[] = $repository;
+            $createOptions[] = '--no-install';
+        }
+
+        // Create comand
+        $runner->runCommand(array_merge([
+            "composer",
+            "create-project",
+            $recipe,
+            $directory,
+            $version
+        ], $createOptions), "Could not create project with version {$version}");
+
+        // Update un-installed project with custom repository
         if ($repository) {
-            $command[] = '--repository';
-            $command[] = $repository;
+            // Add repository temporarily
+            $runner->runCommand([
+                'composer',
+                'config',
+                'repositories.temp',
+                'composer',
+                $repository,
+                '--working-dir',
+                $directory,
+            ]);
+            // Enable http:// local repositories
+            $runner->runCommand([
+                'composer',
+                'config',
+                'secure-http',
+                'false',
+                '--working-dir',
+                $directory,
+            ]);
+
+            // update options
+            $updateOptions = [
+                "--no-interaction",
+                "--ignore-platform-reqs",
+            ];
+
+            // Set dev / stable options
+            if ($preferDist) {
+                $updateOptions[] = "--prefer-dist";
+                $updateOptions[] = "--no-dev";
+            } else {
+                $updateOptions[] = "--prefer-source";
+            }
+
+            // Update with the given repository
+            $runner->runCommand(array_merge([
+                'composer',
+                'update',
+                '--working-dir',
+                $directory,
+            ], $updateOptions), "Could not update project");
+
+            // Revert changes made above
+            $runner->runCommand([
+                'composer',
+                'config',
+                '--unset',
+                'repositories.temp',
+                '--working-dir',
+                $directory,
+            ]);
+            $runner->runCommand([
+                'composer',
+                'config',
+                '--unset',
+                'secure-http',
+                '--working-dir',
+                $directory,
+            ]);
         }
-        $runner->runCommand($command, "Could not create project with version {$version}");
     }
 
     /**