Merge pull request #455 from jolicode/remote

Fixed import of remote packages when a file is specified

castor.composer.json

@@ -3,12 +3,12 @@
         "sort-packages": true
     },
     "replace": {
-        "castor\/castor": "v0.15.0"
+        "castor/castor": "v0.15.0"
     },
     "require": {
-        "doctrine/collections": "^2.2",
-        "pyrech/castor-example": "^1.0",
-        "pyrech/castor-example-package-not-published": "*",
+        "doctrine/collections": "^2.2.2",
+        "pyrech/castor-example": "^1.2",
+        "pyrech/castor-example-package-not-published": "^1",
         "pyrech/foobar": "v1"
     },
     "repositories": [

examples/remote-import.php

@@ -8,6 +8,7 @@
 
 // Importing tasks from a Composer package
 import('composer://pyrech/castor-example');
+import('composer://pyrech/castor-example', file: 'foobar.php');
 // Importing tasks from a Composer package not published on packagist (but still having a composer.json)
 import('composer://pyrech/castor-example-package-not-published');
 // Importing tasks from a repository not using Composer

src/Import/Mount.php

@@ -13,6 +13,7 @@ public function __construct(
         public readonly bool $allowEmptyEntrypoint = false,
         public readonly ?string $namespacePrefix = null,
         public readonly bool $allowRemotePackage = true,
+        public readonly ?string $file = null,
     ) {
     }
 }

src/Import/Remote/Composer.php

@@ -125,10 +125,15 @@ public function importFromPackage(string $scheme, string $package, ?string $file
                 throw new ImportError(sprintf('The package "%s" is not installed, make sure you required it in your castor.composer.json file.', $package));
             }
 
+            if ($file && !file_exists($packageDirectory . '/' . $file)) {
+                throw new ImportError(sprintf('The file "%s" does not exist in the package "%s".', $file, $package));
+            }
+
             $this->kernel->addMount(new Mount(
-                PathHelper::getCastorVendorDir() . '/' . $package . '/' . ($file ?? ''),
+                PathHelper::getCastorVendorDir() . '/' . $package,
                 allowEmptyEntrypoint: true,
                 allowRemotePackage: false,
+                file: $file,
             ));
 
             return;

src/Kernel.php

@@ -88,7 +88,7 @@ private function load(
         }
 
         try {
-            $this->requireEntrypoint($mount->path);
+            $this->requireEntrypoint($mount);
         } catch (CouldNotFindEntrypointException $e) {
             if (!$mount->allowEmptyEntrypoint) {
                 throw $e;
@@ -152,8 +152,17 @@ private function load(
         );
     }
 
-    private function requireEntrypoint(string $path): void
+    private function requireEntrypoint(Mount $mount): void
     {
+        $path = $mount->path;
+
+        // It's an import, via a remote package, with a file specified
+        if ($mount->file) {
+            $this->importer->importFile($mount->path . '/' . $mount->file);
+
+            return;
+        }
+
         if (file_exists($file = $path . '/castor.php')) {
             $this->importer->importFile($file);
         } elseif (file_exists($file = $path . '/.castor/castor.php')) {

tests/Generated/ListTest.php.output.txt

@@ -56,6 +56,7 @@ parallel:exception                                                Sleep and thro
 parallel:sleep                                                    Sleeps for 5, 7, and 10 seconds in parallel
 pyrech:foobar                                                     Hello from foobar!
 pyrech:hello-example                                              Hello from example!
+pyrech:not-imported                                               Not imported task
 qa:cs:cs                                                          Fix CS
 qa:cs:install                                                     install dependencies
 qa:cs:update                                                      Update dependencies

tests/Generated/PyrechNotImportedTest.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Castor\Tests\Generated;
+
+use Castor\Tests\TaskTestCase;
+use Symfony\Component\Process\Exception\ProcessFailedException;
+
+class PyrechNotImportedTest extends TaskTestCase
+{
+    // pyrech:not-imported
+    public function test(): void
+    {
+        $process = $this->runTask(['pyrech:not-imported']);
+
+        if (1 !== $process->getExitCode()) {
+            throw new ProcessFailedException($process);
+        }
+
+        $this->assertStringEqualsFile(__FILE__ . '.output.txt', $process->getOutput());
+        $this->assertStringEqualsFile(__FILE__ . '.err.txt', $process->getErrorOutput());
+    }
+}

tests/Generated/PyrechNotImportedTest.php.err.txt

@@ -0,0 +1,4 @@
+
+  There are no commands defined in the "pyrech" namespace.
+
+