Status improvments (#750)

mooxbot · mooxbot · commit ce91e0cc0474 · 2025-02-28T00:43:30.000Z
diff --git a/src/Console/Commands/DeployCommand.php b/src/Console/Commands/DeployCommand.php
@@ -27,7 +27,7 @@ class DeployCommand extends Command
 
     protected string $packagesPath;
 
-    protected string $errorMessage;
+    private string $errorMessage = '';
 
     public function __construct()
     {
diff --git a/src/Console/Commands/StatusCommand.php b/src/Console/Commands/StatusCommand.php
@@ -23,7 +23,7 @@ class StatusCommand extends Command
 
     protected string $packagesPath;
 
-    protected string $errorMessage;
+    protected string $errorMessage = '';
 
     public function __construct()
     {
diff --git a/src/Console/Traits/Check.php b/src/Console/Traits/Check.php
@@ -15,7 +15,7 @@ private function check(): array
             $status = 'linked';
             $message = 'Devlink is linked, happy coding!';
         } elseif (! $hasDevlink && $hasDeploy) {
-            $status = 'unlinked';
+            $status = 'deploy';
             $message = 'Devlink is unlinked, ready for deployment!';
         }
 
@@ -38,18 +38,15 @@ private function check(): array
             $isLocal = ($package['type'] ?? '') === 'local';
             $isPrivate = ($package['type'] ?? '') === 'private';
 
-            // Check if package is linked
             $isLinked = false;
             if ($isLocal) {
-                // Local packages: check for path entry in composer.json
                 foreach ($repositories as $repo) {
                     if (($repo['type'] ?? '') === 'path' && ($repo['url'] ?? '') === $packagePath) {
                         $isLinked = true;
                         break;
                     }
                 }
             } else {
-                // Public and Private packages: check for symlink
                 $isLinked = is_link($packagePath);
             }
 
@@ -104,7 +101,7 @@ private function check(): array
         }
 
         if (file_exists(base_path('composer.json-deploy'))) {
-            $status = 'unlinked';
+            $status = 'deploy';
             $message = 'Devlink is unlinked and ready for deployment';
         }
 
@@ -144,9 +141,4 @@ private function checkUpdated(): bool
 
         return true;
     }
-
-    private function resolvePath(string $path): string
-    {
-        return str_starts_with($path, '~/') ? str_replace('~', getenv('HOME'), $path) : rtrim(realpath($path) ?: $path, '/');
-    }
 }
diff --git a/src/Console/Traits/Deploy.php b/src/Console/Traits/Deploy.php
@@ -9,37 +9,34 @@ trait Deploy
 {
     private function deploy(): void
     {
-        $this->unlink();
-        $this->cleanup();
+        $this->removeSymlinks();
+        $this->cleanupDirectory();
         $this->moveComposerFiles();
     }
 
-    /**
-     * Remove all symlinks in the packages directory.
-     */
-    private function unlink(): void
+    private function removeSymlinks(): void
     {
         if (is_dir($this->packagesPath)) {
             $i = 0;
             foreach (scandir($this->packagesPath) as $item) {
                 if ($item !== '.' && $item !== '..' && is_link("$this->packagesPath/$item")) {
                     unlink("$this->packagesPath/$item");
                     $i++;
+                    info("Removed $item");
                 }
             }
 
             info("Removed $i symlinks");
         }
     }
 
-    /**
-     * Remove the packages directory if it is empty.
-     */
-    private function cleanup(): void
+    private function cleanupDirectory(): void
     {
         if (is_dir($this->packagesPath) && count(scandir($this->packagesPath)) === 2) {
             info('Removing packages directory...');
             rmdir($this->packagesPath);
+        } else {
+            info('Packages directory is not empty, skipping cleanup.');
         }
     }
 
@@ -48,6 +45,12 @@ private function moveComposerFiles(): void
         $linked = $this->composerJsonPath.'-linked';
         $deploy = $this->composerJsonPath.'-deploy';
 
+        if (! file_exists($linked) && file_exists($deploy)) {
+            info('Project is already in deployment state.');
+
+            return;
+        }
+
         if (! file_exists($linked)) {
             $this->errorMessage = 'composer.json-linked not found!';
             error($this->errorMessage);
diff --git a/src/Console/Traits/Show.php b/src/Console/Traits/Show.php
@@ -14,6 +14,7 @@ trait Show
     private function show(): void
     {
         $fullStatus = $this->check();
+        $isInSync = $this->arePackagesInSync($fullStatus['packages']);
 
         $headers = ['Package', 'Type', 'Enabled', 'Valid', 'Active', 'Version', 'Path'];
         $rows = array_map(function ($row) {
@@ -47,26 +48,22 @@ private function show(): void
             $badge = '<fg=black;bg=red;options=bold> ';
         }
 
-        if ($fullStatus['status'] === 'unlinked') {
-            $badge = '<fg=black;bg=gray;options=bold> ';
+        if ($fullStatus['status'] === 'deploy') {
+            $badge = '<fg=black;bg=blue;options=bold> ';
         }
 
         if ($fullStatus['status'] === 'linked') {
             $badge = '<fg=black;bg=green;options=bold> ';
         }
 
-        if ($fullStatus['status'] === 'deployed') {
-            $badge = '<fg=black;bg=green;options=bold> ';
-        }
-
-        if ($fullStatus['updated']) {
+        if ($isInSync) {
             $updateBadge = '<fg=black;bg=green;options=bold> ';
         } else {
             $updateBadge = '<fg=black;bg=red;options=bold> ';
         }
 
         info('  '.$badge.strtoupper($fullStatus['status']).' </> '.$fullStatus['message']);
-        info('  '.$updateBadge.' UPDATE </> '.($fullStatus['updated'] ? 'All packages are in sync with composer.json' : 'You need to run `php artisan devlink:link` to update the packages'));
+        info('  '.$updateBadge.' UPDATE </> '.($isInSync ? 'All packages are in sync with composer.json' : 'You need to run `php artisan devlink:link` to update the packages'));
         info(' ');
     }
 
@@ -77,6 +74,16 @@ private function getInstalledVersion(string $name, array $package): ?string
             return null;
         }
 
+        $path = $package['path'] ?? '';
+        if ($path && ! str_contains($path, 'disabled/')) {
+            $composerJson = realpath(base_path($path)).'/composer.json';
+            if (file_exists($composerJson)) {
+                $composerData = json_decode(file_get_contents($composerJson), true);
+
+                return $composerData['version'] ?? 'dev-main';
+            }
+        }
+
         $composerLock = base_path('composer.lock');
         if (! file_exists($composerLock)) {
             return null;
@@ -97,15 +104,6 @@ private function getInstalledVersion(string $name, array $package): ?string
             }
         }
 
-        // If not found in lock file but composer.json exists, assume dev-main
-        $path = $package['path'] ?? '';
-        if ($path && ! str_contains($path, 'disabled/')) {
-            $composerJson = realpath(base_path($path)).'/composer.json';
-            if (file_exists($composerJson)) {
-                return 'dev-main';
-            }
-        }
-
         return null;
     }
 
@@ -159,4 +157,48 @@ private function getPackageName(string $name, array $package): ?string
 
         return $data['name'] ?? null;
     }
+
+    private function arePackagesInSync(array $packages): bool
+    {
+        $composerJson = base_path('composer.json');
+        if (! file_exists($composerJson)) {
+            return false;
+        }
+
+        $composerData = json_decode(file_get_contents($composerJson), true);
+        if (! $composerData) {
+            return false;
+        }
+
+        $composerRequire = array_merge(
+            $composerData['require'] ?? [],
+            $composerData['require-dev'] ?? []
+        );
+
+        foreach ($packages as $package) {
+            $packageName = $this->getPackageName($package['name'], $package['config']);
+            if (! $packageName) {
+                continue;
+            }
+
+            $expectedPath = $package['config']['path'] ?? '';
+            if (empty($expectedPath)) {
+                continue;
+            }
+
+            if (! isset($composerRequire[$packageName])) {
+                return false;
+            }
+
+            $composerPath = $composerRequire[$packageName];
+            if (str_contains($composerPath, 'path:')) {
+                $composerPath = trim(str_replace('path:', '', $composerPath));
+                if ($composerPath !== $expectedPath) {
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class DeployCommand extends Command`
`27`	`27`
`28`	`28`	`protected string $packagesPath;`
`29`	`29`
`30`		`- protected string $errorMessage;`
	`30`	`+ private string $errorMessage = '';`
`31`	`31`
`32`	`32`	`public function __construct()`
`33`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class StatusCommand extends Command`
`23`	`23`
`24`	`24`	`protected string $packagesPath;`
`25`	`25`
`26`		`- protected string $errorMessage;`
	`26`	`+ protected string $errorMessage = '';`
`27`	`27`
`28`	`28`	`public function __construct()`
`29`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ private function check(): array`
`15`	`15`	`$status = 'linked';`
`16`	`16`	`$message = 'Devlink is linked, happy coding!';`
`17`	`17`	`} elseif (! $hasDevlink && $hasDeploy) {`
`18`		`- $status = 'unlinked';`
	`18`	`+ $status = 'deploy';`
`19`	`19`	`$message = 'Devlink is unlinked, ready for deployment!';`
`20`	`20`	`}`
`21`	`21`
`@@ -38,18 +38,15 @@ private function check(): array`
`38`	`38`	`$isLocal = ($package['type'] ?? '') === 'local';`
`39`	`39`	`$isPrivate = ($package['type'] ?? '') === 'private';`
`40`	`40`
`41`		`- // Check if package is linked`
`42`	`41`	`$isLinked = false;`
`43`	`42`	`if ($isLocal) {`
`44`		`- // Local packages: check for path entry in composer.json`
`45`	`43`	`foreach ($repositories as $repo) {`
`46`	`44`	`if (($repo['type'] ?? '') === 'path' && ($repo['url'] ?? '') === $packagePath) {`
`47`	`45`	`$isLinked = true;`
`48`	`46`	`break;`
`49`	`47`	`}`
`50`	`48`	`}`
`51`	`49`	`} else {`
`52`		`- // Public and Private packages: check for symlink`
`53`	`50`	`$isLinked = is_link($packagePath);`
`54`	`51`	`}`
`55`	`52`
`@@ -104,7 +101,7 @@ private function check(): array`
`104`	`101`	`}`
`105`	`102`
`106`	`103`	`if (file_exists(base_path('composer.json-deploy'))) {`
`107`		`- $status = 'unlinked';`
	`104`	`+ $status = 'deploy';`
`108`	`105`	`$message = 'Devlink is unlinked and ready for deployment';`
`109`	`106`	`}`
`110`	`107`
`@@ -144,9 +141,4 @@ private function checkUpdated(): bool`
`144`	`141`
`145`	`142`	`return true;`
`146`	`143`	`}`
`147`		`-`
`148`		`- private function resolvePath(string $path): string`
`149`		`- {`
`150`		`- return str_starts_with($path, '~/') ? str_replace('~', getenv('HOME'), $path) : rtrim(realpath($path) ?: $path, '/');`
`151`		`- }`
`152`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,37 +9,34 @@ trait Deploy`
`9`	`9`	`{`
`10`	`10`	`private function deploy(): void`
`11`	`11`	`{`
`12`		`- $this->unlink();`
`13`		`- $this->cleanup();`
	`12`	`+ $this->removeSymlinks();`
	`13`	`+ $this->cleanupDirectory();`
`14`	`14`	`$this->moveComposerFiles();`
`15`	`15`	`}`
`16`	`16`
`17`		`- /**`
`18`		`- * Remove all symlinks in the packages directory.`
`19`		`- */`
`20`		`- private function unlink(): void`
	`17`	`+ private function removeSymlinks(): void`
`21`	`18`	`{`
`22`	`19`	`if (is_dir($this->packagesPath)) {`
`23`	`20`	`$i = 0;`
`24`	`21`	`foreach (scandir($this->packagesPath) as $item) {`
`25`	`22`	`if ($item !== '.' && $item !== '..' && is_link("$this->packagesPath/$item")) {`
`26`	`23`	`unlink("$this->packagesPath/$item");`
`27`	`24`	`$i++;`
	`25`	`+ info("Removed $item");`
`28`	`26`	`}`
`29`	`27`	`}`
`30`	`28`
`31`	`29`	`info("Removed $i symlinks");`
`32`	`30`	`}`
`33`	`31`	`}`
`34`	`32`
`35`		`- /**`
`36`		`- * Remove the packages directory if it is empty.`
`37`		`- */`
`38`		`- private function cleanup(): void`
	`33`	`+ private function cleanupDirectory(): void`
`39`	`34`	`{`
`40`	`35`	`if (is_dir($this->packagesPath) && count(scandir($this->packagesPath)) === 2) {`
`41`	`36`	`info('Removing packages directory...');`
`42`	`37`	`rmdir($this->packagesPath);`
	`38`	`+ } else {`
	`39`	`+ info('Packages directory is not empty, skipping cleanup.');`
`43`	`40`	`}`
`44`	`41`	`}`
`45`	`42`
`@@ -48,6 +45,12 @@ private function moveComposerFiles(): void`
`48`	`45`	`$linked = $this->composerJsonPath.'-linked';`
`49`	`46`	`$deploy = $this->composerJsonPath.'-deploy';`
`50`	`47`
	`48`	`+ if (! file_exists($linked) && file_exists($deploy)) {`
	`49`	`+ info('Project is already in deployment state.');`
	`50`	`+`
	`51`	`+ return;`
	`52`	`+ }`
	`53`	`+`
`51`	`54`	`if (! file_exists($linked)) {`
`52`	`55`	`$this->errorMessage = 'composer.json-linked not found!';`
`53`	`56`	`error($this->errorMessage);`