feat(cli): Re-implement celest upgrade (#296)

Re-implements the upgrade command to account for installations via `pub global`.

Author: dnys1

apps/cli/CHANGELOG.md

@@ -1,6 +1,7 @@
 ## 1.0.9-wip
 
 - chore: Remove unused native assets code
+- feat: Re-implement `celest upgrade`
 
 ## 1.0.8
 

apps/cli/bin/celest.dart

@@ -10,8 +10,7 @@ void main(List<String> args) async {
     ..addCommand(StartCommand())
     ..addCommand(BuildCommand())
     ..addCommand(AnalysisServerCommand())
-    // TODO(dnys1): Re-implement the upgrade command
-    // ..addCommand(UpgradeCommand())
+    ..addCommand(UpgradeCommand())
     ..addCommand(UninstallCommand())
     ..addCommand(PrecacheCommand());
 

apps/cli/fixtures/fixtures_test.dart

@@ -28,7 +28,7 @@ import 'package:celest_cli/src/project/project_linker.dart';
 import 'package:celest_cli/src/pub/pub_action.dart';
 import 'package:celest_cli/src/sdk/dart_sdk.dart';
 import 'package:celest_cli/src/sdk/sdk_finder.dart';
-import 'package:celest_cli/src/utils/cli.dart';
+import 'package:celest_cli/src/utils/process.dart';
 import 'package:celest_cli/src/utils/recase.dart';
 import 'package:dart_jsonwebtoken/dart_jsonwebtoken.dart';
 import 'package:file/file.dart';

apps/cli/lib/celest_cli.dart

@@ -1,4 +1,4 @@
-export 'src/cli.dart';
+export 'src/cli/cli.dart';
 export 'src/commands/analysis_server_command.dart';
 export 'src/commands/build_command.dart';
 export 'src/commands/init_command.dart';

apps/cli/lib/src/cli.dart apps/cli/lib/src/cli/cli.dartapps/cli/lib/src/cli.dart renamed to apps/cli/lib/src/cli/cli.dart

@@ -0,0 +1,17 @@
+import 'package:celest_cli/src/context.dart';
+
+enum CliRuntime {
+  pubGlobal,
+  aot,
+  local;
+
+  static CliRuntime get current {
+    if (fileSystem.path.fromUri(platform.script).endsWith('.snapshot')) {
+      return pubGlobal;
+    } else if (platform.executable.contains('dart')) {
+      return local;
+    } else {
+      return aot;
+    }
+  }
+}

apps/cli/lib/src/cli/cli_runtime.dart

@@ -1,8 +1,8 @@
 import 'package:celest_cli/src/commands/celest_command.dart';
-import 'package:celest_cli/src/commands/project_init.dart';
-import 'package:celest_cli/src/commands/project_migrate.dart';
 import 'package:celest_cli/src/context.dart';
 import 'package:celest_cli/src/frontend/celest_frontend.dart';
+import 'package:celest_cli/src/init/project_init.dart';
+import 'package:celest_cli/src/init/project_migrate.dart';
 import 'package:mason_logger/src/mason_logger.dart';
 
 final class BuildCommand extends CelestCommand with Configure, Migrate {

apps/cli/lib/src/commands/build_command.dart

@@ -3,15 +3,17 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:args/command_runner.dart';
+import 'package:celest_cli/src/cli/cli_runtime.dart';
 import 'package:celest_cli/src/context.dart';
 import 'package:celest_cli/src/models.dart';
+import 'package:celest_cli/src/releases/celest_release_info.dart';
 import 'package:celest_cli/src/releases/latest_release.dart';
 import 'package:celest_cli/src/sdk/dart_sdk.dart';
-import 'package:cli_util/cli_util.dart';
+import 'package:celest_cli/src/version.dart';
+import 'package:collection/collection.dart';
 import 'package:http/http.dart' as http;
 import 'package:logging/logging.dart';
 import 'package:meta/meta.dart';
-import 'package:path/path.dart' as p;
 import 'package:pub_semver/pub_semver.dart';
 
 /// Base class for all commands in this package providing common functionality.
@@ -24,16 +26,6 @@ abstract base class CelestCommand extends Command<int> {
   /// Whether verbose logging is enabled.
   bool get verbose => globalResults?['verbose'] as bool? ?? false;
 
-  /// The path to the Flutter SDK, if installed.
-  late final String? flutterRoot = () {
-    final dartSdkPath = getSdkPath();
-    final flutterBin = p.dirname(p.dirname(dartSdkPath));
-    if (File(p.join(flutterBin, 'flutter')).existsSync()) {
-      return p.dirname(flutterBin);
-    }
-    return null;
-  }();
-
   /// Resolves the latest version information from `pub.dev`.
   Future<PubVersionInfo?> resolveVersionInfo(String package) async {
     // Get the currently published version of the package.
@@ -66,23 +58,57 @@ abstract base class CelestCommand extends Command<int> {
     return PubVersionInfo(semvers..sort());
   }
 
-  Future<void> checkForLatestVersion() async {
+  Future<void> checkForLatestVersion({bool? includeDev}) async {
+    final (latestVersion, _) = await getLatestVersion(includeDev: includeDev);
+    if (latestVersion < currentVersion) {
+      cliLogger.warn(
+        'A new version of Celest is available! Run `celest upgrade` '
+        'to get the latest changes.',
+      );
+    }
+  }
+
+  Future<(Version, CelestReleaseInfo?)> getLatestVersion({
+    bool? includeDev,
+  }) async {
+    includeDev ??= currentVersion.isPreRelease;
     try {
-      final latestRelease = await performance.trace(
+      final (latestVersion, releaseInfo) = await performance.trace(
         'CelestCommand',
         'retrieveLatestRelease',
-        () =>
-            retrieveLatestRelease(version).timeout(const Duration(seconds: 3)),
+        () => switch (CliRuntime.current) {
+          CliRuntime.aot => retrieveLatestRelease(includeDev: includeDev!)
+              .then((release) => (release.version, release)),
+          CliRuntime.local => Future.value((currentVersion, null)),
+          CliRuntime.pubGlobal => _latestVersionPub(includeDev: includeDev!)
+              .then((version) => (version, null)),
+        }
+            .timeout(const Duration(seconds: 3)),
       );
-      if (latestRelease.version > Version.parse(version)) {
-        cliLogger.warn(
-          'A new version of Celest is available! Run `celest upgrade` '
-          'to get the latest changes.',
-        );
-      }
+      return (latestVersion, releaseInfo);
     } on Object catch (e, st) {
       performance.captureError(e, stackTrace: st);
+      return (currentVersion, null);
+    }
+  }
+
+  Future<Version> _latestVersionPub({
+    bool includeDev = false,
+  }) async {
+    final versionInfo = await resolveVersionInfo('celest_cli');
+    if (versionInfo == null) {
+      throw Exception(
+        'Failed to resolve version information for celest_cli.',
+      );
     }
+    return maxBy(
+      [
+        currentVersion,
+        versionInfo.latestVersion,
+        if (includeDev) versionInfo.latestPrerelease,
+      ].nonNulls,
+      (v) => v,
+    )!;
   }
 
   @override

apps/cli/lib/src/commands/celest_command.dart

@@ -1,8 +1,9 @@
 import 'dart:io';
 
+import 'package:celest_cli/src/cli/cli_runtime.dart';
 import 'package:celest_cli/src/commands/celest_command.dart';
-import 'package:celest_cli/src/commands/project_init.dart';
 import 'package:celest_cli/src/context.dart';
+import 'package:celest_cli/src/init/project_init.dart';
 import 'package:mason_logger/mason_logger.dart';
 
 final class InitCommand extends CelestCommand with Configure, ProjectCreator {
@@ -22,32 +23,29 @@ final class InitCommand extends CelestCommand with Configure, ProjectCreator {
 
   /// Precache assets in the background.
   Future<void> _precacheInBackground() async {
-    final List<String> command;
-    if (fileSystem.path.fromUri(platform.script).endsWith('.snapshot')) {
-      command = <String>[
-        platform.resolvedExecutable,
-        'pub',
-        'global',
-        'run',
-        'celest_cli:celest',
-        'precache',
-        projectPaths.projectRoot,
-      ];
-    } else if (platform.executable.contains('dart')) {
-      command = <String>[
-        platform.resolvedExecutable,
-        'run',
-        platform.script.toFilePath(),
-        'precache',
-        projectPaths.projectRoot,
-      ];
-    } else {
-      command = <String>[
-        platform.resolvedExecutable,
-        'precache',
-        projectPaths.projectRoot,
-      ];
-    }
+    final command = switch (CliRuntime.current) {
+      CliRuntime.pubGlobal => <String>[
+          platform.resolvedExecutable,
+          'pub',
+          'global',
+          'run',
+          'celest_cli:celest',
+          'precache',
+          projectPaths.projectRoot,
+        ],
+      CliRuntime.local => <String>[
+          platform.resolvedExecutable,
+          'run',
+          platform.script.toFilePath(),
+          'precache',
+          projectPaths.projectRoot,
+        ],
+      CliRuntime.aot => <String>[
+          platform.resolvedExecutable,
+          'precache',
+          projectPaths.projectRoot,
+        ],
+    };
     try {
       logger.fine('Precaching assets in background...');
       await processManager.start(
@@ -71,11 +69,11 @@ final class InitCommand extends CelestCommand with Configure, ProjectCreator {
 
     final projectRoot = projectPaths.projectRoot;
 
-    var command = 'celest start';
     // `celest start` can be run from either the project root, the attached
     // Flutter app's root if there is one, or any subdirectory therof.
     //
     // If we're in none of those, then add a `cd` command to the start messsage.
+    var command = 'celest start';
     final currentDir = fileSystem.currentDirectory.path;
     final appRoot = celestProject.parentProject?.path ?? projectRoot;
     if (!p.equals(appRoot, currentDir) && !p.isWithin(appRoot, currentDir)) {

apps/cli/lib/src/commands/init_command.dart

@@ -1,9 +1,9 @@
 import 'package:celest_cli/src/commands/celest_command.dart';
-import 'package:celest_cli/src/commands/project_init.dart';
-import 'package:celest_cli/src/commands/project_migrate.dart';
 import 'package:celest_cli/src/context.dart';
 import 'package:celest_cli/src/frontend/celest_frontend.dart';
 import 'package:celest_cli/src/frontend/child_process.dart';
+import 'package:celest_cli/src/init/project_init.dart';
+import 'package:celest_cli/src/init/project_migrate.dart';
 import 'package:mason_logger/mason_logger.dart';
 
 final class StartCommand extends CelestCommand