feat: switch to composer versions

Author: mychidarko

bin/leaf

@@ -7,8 +7,11 @@ if (file_exists(dirname(__DIR__, 3) . "/autoload.php")) {
     require dirname(__DIR__) . "/vendor/autoload.php";
 }
 
-$leafCli = json_decode(file_get_contents(dirname(__DIR__) . "/composer.json"));
-$currentVersion = $leafCli->version;
+// composer.json carries no version key (packagist derives it from tags),
+// so ask composer's runtime for the installed version instead
+$currentVersion = \Composer\InstalledVersions::isInstalled('leafs/cli')
+    ? \Composer\InstalledVersions::getPrettyVersion('leafs/cli')
+    : 'dev';
 
 $app = sprout()->createApp([
     'name' => "
@@ -17,7 +20,7 @@ $app = sprout()->createApp([
 | |__/ -_) _` |  _| | (__| |__ | | 
 |____\___\__,_|_|    \___|____|___|
     ",
-    'version' => ''
+    'version' => $currentVersion
 ]);
 
 $app->register(Leaf\Console\CreateCommand::class);

composer.json

@@ -2,7 +2,6 @@
     "name": "leafs/cli",
     "description": "A simple command line tool for installing and interacting with your leaf apps",
     "homepage": "https://cli.leafphp.dev",
-    "version": "v5.0-dev",
     "keywords": [
         "leaf",
         "php",

src/Utils/Package.php

@@ -26,9 +26,11 @@ public static function info()
      */
     public static function version()
     {
-        $meta = static::info();
+        if (\Composer\InstalledVersions::isInstalled('leafs/cli')) {
+            return \Composer\InstalledVersions::getPrettyVersion('leafs/cli');
+        }
 
-        return $meta->version;
+        return static::info()->version ?? 'dev';
     }
 
     /**
@@ -64,8 +66,15 @@ public static function ltsVersion()
      */
     public static function updateAvailable()
     {
-        $currentVersion = ltrim(static::version(), 'v');
-        $latestVersion = ltrim(static::ltsVersion(), 'v');
+        $currentVersion = ltrim((string) static::version(), 'v');
+
+        // dev checkouts (contributors, CI) never self-update — this also
+        // keeps the check off the network for test runs
+        if ($currentVersion === '' || strpos($currentVersion, 'dev') !== false) {
+            return false;
+        }
+
+        $latestVersion = ltrim((string) static::ltsVersion(), 'v');
 
         return version_compare($currentVersion, $latestVersion, '<');
     }

tests/commands.test.php

@@ -77,3 +77,18 @@
         ->and($output)->toContain('github.com/leafsphp/cli/issues')
         ->and($output)->toContain('No composer.json found');
 });
+
+test('--version prints the version and nothing else', function () {
+    [$exit, $output] = leaf('--version');
+
+    expect($exit)->toBe(0)
+        ->and(trim($output))->not->toBe('')
+        ->and($output)->not->toContain('Available commands');
+});
+
+test('the banner prints the version exactly once', function () {
+    [, $version] = leaf('--version');
+    [, $banner] = leaf('');
+
+    expect(substr_count($banner, trim($version)))->toBe(1);
+});