chore: subsplit wip — Enzo will have to change this title :)

app/Git/FakeGit.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Git;
+
+final class FakeGit implements Git
+{
+    public array $commands = [];
+    private string $branch = 'test';
+
+    public function __construct(
+        private readonly string $path,
+    ) {}
+
+    public function isInitialized(): bool
+    {
+        return true;
+    }
+
+    public function tryInit(string $remote): void
+    {
+        $this->commands[] = 'git init';
+    }
+
+    public function checkoutBranch(string $branch): void
+    {
+        $this->branch = $branch;
+        $this->commands[] = 'git checkout -b ' . $branch;
+    }
+
+    public function pull(): void
+    {
+        $this->commands[] = 'git pull origin ' . $this->getCurrentBranch();
+    }
+
+    public function push(): void
+    {
+        $this->commands[] = 'git push origin ' . $this->getCurrentBranch();
+    }
+
+    public function getCurrentBranch(): string
+    {
+        return 'test';
+    }
+
+    public function status(): string
+    {
+        return '';
+    }
+
+    public function commit(string $message): void
+    {
+        $this->commands[] = 'git add . && git commit -m "' . $message . '"';
+    }
+}

app/Git/GenericGit.php

@@ -0,0 +1,101 @@
+<?php
+
+namespace App\Git;
+
+use Tempest\Container\Autowire;
+use function Tempest\Support\path;
+use Tempest\Support\Filesystem;
+
+#[Autowire]
+final readonly class GenericGit implements Git
+{
+    public function __construct(
+        private string $path,
+    ) {}
+
+    public function isInitialized(): bool
+    {
+        return Filesystem\exists(path($this->path . '/.git/'));
+    }
+
+    public function tryInit(string $remote): void
+    {
+        if ($this->isInitialized()) {
+            return;
+        }
+
+        exec("cd {$this->path}; git init && git remote add origin {$remote};", result_code: $result);
+
+        if ($result !== 0) {
+            throw new GitOperationFailed('Failed to initialize git repository.');
+        }
+    }
+
+    public function checkoutBranch(string $branch): void
+    {
+        exec("cd {$this->path}; git checkout -b {$branch} &> /dev/null", result_code: $result);
+
+        if ($result === 0) {
+            return;
+        }
+
+        exec("cd {$this->path}; git checkout &> {$branch}", result_code: $result);
+
+        if ($result !== 0) {
+            throw new GitOperationFailed('Failed to checkout branch.');
+        }
+    }
+
+    public function pull(): void
+    {
+        exec("cd {$this->path}; git pull origin {$this->getCurrentBranch()} &> /dev/null", result_code: $result);
+
+        if ($result !== 0) {
+            throw new GitOperationFailed('Failed to pull changes from remote.');
+        }
+    }
+
+    public function push(): void
+    {
+        exec("cd {$this->path}; git push origin {$this->getCurrentBranch()} &> /dev/null", result_code: $result);
+
+        if ($result !== 0) {
+            throw new GitOperationFailed('Failed to push changes to remote.');
+        }
+    }
+
+    public function getCurrentBranch(): string
+    {
+        exec("cd {$this->path}; git branch --show-current", output: $output, result_code: $result);
+
+        if ($result !== 0 || $output === []) {
+            throw new GitOperationFailed('Failed get current branch.');
+        }
+
+        return $output[0];
+    }
+
+    public function status(): string
+    {
+        exec("cd {$this->path}; git status" , output: $output, result_code: $result);
+
+        if ($result !== 0) {
+            throw new GitOperationFailed('Failed to get git status.');
+        }
+
+        return implode(PHP_EOL, $output);
+    }
+
+    public function commit(string $message): void
+    {
+        if (str_contains($this->status(), 'nothing to commit')) {
+            return;
+        }
+
+        exec("cd {$this->path}; git add . && git commit -m \"{$message}\"" , result_code: $result);
+
+        if ($result !== 0) {
+            throw new GitOperationFailed('Failed to commit changes.');
+        }
+    }
+}

app/Git/Git.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Git;
+
+interface Git
+{
+    public function isInitialized(): bool;
+
+    public function tryInit(string $remote): void;
+
+    public function checkoutBranch(string $branch): void;
+
+    public function pull(): void;
+
+    public function push(): void;
+
+    public function getCurrentBranch(): string;
+
+    public function status(): string;
+
+    public function commit(string $message): void;
+}

app/Git/GitOperationFailed.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Git;
+
+use Exception;
+
+final class GitOperationFailed extends Exception
+{
+
+}

app/Subsplit/Package.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Subsplit;
+
+use Tempest\Support\Arr\ImmutableArray;
+use function Tempest\Support\arr;
+
+final class Package
+{
+    public function __construct(
+        public readonly string $path,
+        public readonly string $name,
+    ) {}
+
+    public string $remote {
+        get => "git@github.com:tempestphp/tempest-{$this->name}.git";
+    }
+
+    public string $buildPath {
+        get => __DIR__ . '/../../build/packages/' . $this->name . '/';
+    }
+
+    public string $sourcePath {
+        get => __DIR__ . '/../../packages/' . $this->name . '/';
+    }
+
+    /** @return ImmutableArray<array-key, self> */
+    public static function all(): ImmutableArray
+    {
+        return arr(glob(__DIR__ . '/../../packages/*'))
+            ->map(fn (string $path) => self::fromPath($path));
+    }
+
+    public static function fromPath(string $path): self
+    {
+        return new self(
+            path: $path,
+            name: pathinfo($path, PATHINFO_FILENAME),
+        );
+    }
+}

app/Subsplit/TempestSubsplitCommand.php

@@ -0,0 +1,86 @@
+<?php
+
+namespace App\Subsplit;
+
+use App\Git\Git;
+use App\Git\GitOperationFailed;
+use Tempest\Console\ConsoleCommand;
+use Tempest\Console\HasConsole;
+use Tempest\Console\Middleware\ForceMiddleware;
+use Tempest\Container\Container;
+use Tempest\Support\Filesystem;
+use App\Git\GenericGit;
+use function Tempest\root_path;
+
+final class TempestSubsplitCommand
+{
+    use HasConsole;
+
+    public function __construct(
+        private Container $container,
+    ) {}
+
+    #[ConsoleCommand(middleware: [ForceMiddleware::class])]
+    public function __invoke(?string $package = null): void
+    {
+        $packages = Package::all();
+
+        if ($package) {
+            $packages = $packages->filter(fn (Package $search) => $search->name === $package)->values();
+        }
+
+        if ($packages->isEmpty()) {
+            $this->error('No packages found');
+            return;
+        }
+
+        $total = $packages->count();
+
+        $currentBranch = $this->container->get(Git::class, path: root_path())->getCurrentBranch();
+
+        $this->confirm("Subsplitting on `{$currentBranch}`, continue?");
+
+        foreach ($packages as $i => $package) {
+            $this->info("{$i}/{$total} <em>tempest/{$package->name}</em>");
+
+            try {
+                $git = $this->container->get(Git::class, path: $package->buildPath);
+
+                Filesystem\ensure_directory_exists($package->buildPath);
+
+                if ( ! $git->isInitialized()) {
+                    $git->tryInit($package->remote);
+                    $this->writeln(' - New remote initialized');
+                }
+
+                $this->writeln(" - Checking out <em>{$currentBranch}</em> branch");
+                $git->checkoutBranch($currentBranch);
+
+                $this->writeln(' - Pulling latest changes');
+
+                try {
+                    $git->pull();
+                } catch (GitOperationFailed) {
+                    // Remote branch does not exist yet
+                }
+
+                // Don't we have a recursive directory copy function somewhere??
+                exec("cp -R {$package->sourcePath} {$package->buildPath}");
+                $this->writeln(" - Copied updated contents from <em>{$package->sourcePath}</em> to <em>{$package->buildPath}</em>");
+
+                // TODO: Validate composer, LICENSE, README, and what else?
+
+                $this->writeln(" - Committing changes");
+                $git->commit("chore: subsplit");
+
+                $this->writeln(" - Pushing changes");
+                $git->push();
+
+                $this->success('Done');
+            } catch (GitOperationFailed $e) {
+                $this->error($e->getMessage());
+                continue;
+            }
+        }
+    }
+}

app/TempestReleaseCommand.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App;
+
+use Tempest\Console\ConsoleCommand;
+use Tempest\Console\HasConsole;
+
+final class TempestReleaseCommand
+{
+    use HasConsole;
+
+    #[ConsoleCommand]
+    public function __invoke(): void
+    {
+        // Move all logic of the `bin/release` script into here
+
+        $this->info('Todo');
+    }
+}

composer.json

@@ -202,6 +202,7 @@
     },
     "autoload-dev": {
         "psr-4": {
+            "App\\": "app/",
             "Tempest\\Auth\\Tests\\": "packages/auth/tests",
             "Tempest\\Cache\\Tests\\": "packages/cache/tests",
             "Tempest\\Clock\\Tests\\": "packages/clock/tests",

packages/container/src/AutowireDiscovery.php

@@ -28,13 +28,13 @@ public function discover(DiscoveryLocation $location, ClassReflector $class): vo
             return;
         }
 
-        $this->discoveryItems->add($location, [$class, $autowire]);
+        $this->discoveryItems->add($location, [$class, $autowire, $class->getAttribute(Singleton::class)]);
     }
 
     public function apply(): void
     {
-        foreach ($this->discoveryItems as [$class, $autowire]) {
-            if ($autowire !== null) {
+        foreach ($this->discoveryItems as [$class, $autowire, $singleton]) {
+            if ($singleton !== null) {
                 $this->discoverAsSingleton($class);
             } else {
                 $this->discoverAsDefinition($class);
@@ -49,7 +49,7 @@ private function discoverAsSingleton(ClassReflector $class): void
         foreach ($interfaces as $interface) {
             $this->container->singleton(
                 $interface,
-                static fn (Container $container) => $container->get($class->getName()),
+                static fn (Container $container, mixed ...$params) => $container->get($class->getName(), ...$params),
             );
         }
     }
@@ -61,7 +61,7 @@ private function discoverAsDefinition(ClassReflector $class): void
         foreach ($interfaces as $interface) {
             $this->container->register(
                 $interface,
-                static fn (Container $container) => $container->get($class->getName()),
+                static fn (Container $container, mixed ...$params) => $container->get($class->getName(), ...$params),
             );
         }
     }