minro fixes, prmopt changes, bump version

Author: toptobes

README.md

@@ -84,7 +84,7 @@ You can also download a specific version, or the latest prerelease version, usin
 
 ```bash
 # Upgrade (or downgrade!) to a specific version
-astra upgrade --version 1.0.0-rc.5
+astra upgrade --version 1.0.0-rc.6
 
 # Upgrade to the latest prerelease version
 astra upgrade --pre

build.gradle.kts

@@ -16,7 +16,7 @@ plugins {
 }
 
 group = "com.dtsx.astra.cli"
-version = "1.0.0-rc.5"
+version = "1.0.0-rc.6"
 
 val mockitoAgent = configurations.create("mockitoAgent")
 

scripts/install.ps1

@@ -114,7 +114,7 @@ function Get-Env {
 }
 
 # Constants
-$ASTRA_CLI_VERSION = "1.0.0-rc.5"
+$ASTRA_CLI_VERSION = "1.0.0-rc.6"
 
 if ($env:ASTRA_HOME) {
     $ASTRA_CLI_DIR = "$env:ASTRA_HOME\cli"

scripts/install.sh

@@ -37,7 +37,7 @@ renderCommand() {
 }
 
 # Constants
-ASTRA_CLI_VERSION="1.0.0-rc.5"
+ASTRA_CLI_VERSION="1.0.0-rc.6"
 
 get_astra_dir() {
   if [ -n "${ASTRA_HOME:-}" ]; then

src/main/java/com/dtsx/astra/cli/commands/SetupCmd.java

@@ -26,6 +26,8 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static com.dtsx.astra.cli.core.output.ExitCode.INVALID_TOKEN;
 import static com.dtsx.astra.cli.core.output.ExitCode.UNSUPPORTED_EXECUTION;
@@ -155,6 +157,14 @@ protected Operation<SetupResult> mkOperation() {
     }
 
     private void assertShouldSetup(Path existing) {
+        assertShouldSetup(existing, true);
+    }
+
+    private void assertShouldContinueIfAlreadySetup(Path existing) {
+        assertShouldSetup(existing, false);
+    }
+
+    private void assertShouldSetup(Path path, boolean newUser) {
         ctx.log().banner();
 
         if (ctx.isNotTty()) {
@@ -170,57 +180,39 @@ private void assertShouldSetup(Path existing) {
         }
 
         val prompt = """
-          @|bold Welcome to the Astra CLI setup!|@
-        
-          @|faint A configuration file with your profile will be created at|@ @|faint,italic %s|@
+          @|bold Welcome to the interactive Astra CLI setup!|@
         
-          If you'd prefer to provide credentials on a per-command basis rather than storing them in a file, you can either:
-          - Use the per-command @'!--token!@ flag to pass your existing @!AstraCS!@ token directly.
-          - Use the per-command @'!--config-file!@ flag to specify an existing @!.astrarc!@ file.
-        
-          %s
-          %s
+          @|faint Your configuration file %s at|@ @|faint,italic %s|@
         """.formatted(
-            existing,
-            renderComment(ctx.colors(), "Example:"),
-            renderCommand(ctx.colors(), "${cli.name} db list --token <your_token>")
+            (newUser) ? "will be created" : "already exists",
+            path
         );
 
-        ctx.console().println(trimIndent(prompt));
+        val addendum = (!newUser)
+            ? NL + NL + "Do you want to continue and create a new profile?"
+            : mkArgsAddendum();
+
+        ctx.console().println(trimIndent(prompt) + addendum);
         ctx.console().println();
         ctx.console().unsafeReadLine(ctx.colors().format("Press @!Enter!@ to continue, or use @!Ctrl+C!@ to cancel. "), false);
         ctx.console().println();
     }
 
-    private void assertShouldContinueIfAlreadySetup(Path existing) {
-        ctx.log().banner();
+    private String mkArgsAddendum() {
+        if ($env.isEmpty() && $token.isEmpty()) {
+            if ($name.isPresent()) {
+                return "%n%n@|faint The profile will be called '%s'.|@".formatted($name.get());
+            }
+            return "";
+        }
 
-        val prompt = """
-          @|bold Looks like you're already set up!|@
-        
-          @|faint Your config file already exists at|@ @|faint,italic %s|@
-        
-          Hint: You can use the @'!${cli.name} config!@ commands to manage your profiles.
-       
-          %s
-          %s
-        
-          Do you want to continue and create a new profile?
-        """.formatted(
-            existing,
-            renderComment(ctx.colors(), "Example:"),
-            renderCommand(ctx.colors(), "${cli.name} config list")
+        return "%n%n@|faint %s will be created%s.|@".formatted(
+            $name.map(n -> "Profile '" + n + "'").orElse("The profile"),
+            Stream.concat(
+                $token.stream().map(t -> " with token " + t),
+                $env.stream().map(e -> " in env '" + e.name().toLowerCase() + "'")
+            ).collect(Collectors.joining(""))
         );
-
-        val shouldContinue = ctx.console().confirm(prompt)
-            .defaultYes()
-            .fallbackFlag("")
-            .fix(List.of(), "")
-            .clearAfterSelection();
-
-        if (!shouldContinue) {
-            throw new ExecutionCancelledException();
-        }
     }
 
     private void assertShouldOverwriteExistingProfile(Profile existing) {

src/main/java/com/dtsx/astra/cli/commands/UpgradeCmd.java

@@ -2,7 +2,6 @@
 
 import com.dtsx.astra.cli.AstraCli;
 import com.dtsx.astra.cli.core.datatypes.Unit;
-import com.dtsx.astra.cli.core.exceptions.internal.cli.ExecutionCancelledException;
 import com.dtsx.astra.cli.core.help.Example;
 import com.dtsx.astra.cli.core.models.Version;
 import com.dtsx.astra.cli.core.output.formats.OutputHuman;
@@ -68,12 +67,6 @@ public static class VersionMod {
         public boolean $includePreReleases;
     }
 
-    @Option(
-        names = { "-y", "--yes" },
-        description = "Install the upgrade without any confirmation prompting"
-    )
-    public boolean $yes;
-
     @Option(
         names = { "--allow-reinstall" },
         description = "Allow re-installing the same version"
@@ -115,20 +108,6 @@ protected void confirmUpgrade(Version version, String moveCommand) {
         );
 
         ctx.console().println(trimIndent(infoMsg));
-
-        if ($yes) {
-            return;
-        }
-
-        val proceed = ctx.console().confirm(NL + NL + "Do you want to proceed?")
-            .defaultYes()
-            .fallbackFlag("--yes")
-            .fix(originalArgs(), "--yes")
-            .clearAfterSelection();
-
-        if (!proceed) {
-            throw new ExecutionCancelledException();
-        }
     }
 
     @Override

src/main/java/com/dtsx/astra/cli/core/models/Version.java

@@ -15,7 +15,7 @@
 @EqualsAndHashCode
 @RequiredArgsConstructor(access = AccessLevel.PRIVATE)
 public class Version implements Highlightable, Comparable<Version> {
-    private static final Pattern VERSION_PATTERN = Pattern.compile("^v?(\\d+)\\.(\\d+)\\.(\\d+)(?:-([a-zA-Z0-9-_]+\\.\\d+))?$");
+    private static final Pattern VERSION_PATTERN = Pattern.compile("^v?(\\d+)\\.(\\d+)(?:\\.(\\d+))?(?:-([a-zA-Z0-9-_]+\\.\\d+))?$");
 
     private final int major;
     private final int minor;
@@ -29,7 +29,7 @@ public static Either<String, Version> parse(String version) {
             if (matcher.matches()) {
                 val major = Integer.parseInt(matcher.group(1));
                 val minor = Integer.parseInt(matcher.group(2));
-                val patch = Integer.parseInt(matcher.group(3));
+                val patch = matcher.group(3) != null ? Integer.parseInt(matcher.group(3)) : 0;
 
                 val preRelease = Optional.ofNullable(matcher.group(4))
                     .map((pr) -> {
@@ -39,7 +39,7 @@ public static Either<String, Version> parse(String version) {
 
                 return Either.pure(new Version(major, minor, patch, preRelease));
             } else {
-                return Either.left("Invalid version format: " + trimmed + " (expected format: x.y.z[-<label>.n])");
+                return Either.left("Invalid version format: " + trimmed + " (expected format: x.y[.z][-<label>.n])");
             }
         });
     }

src/main/java/com/dtsx/astra/cli/core/upgrades/UpgradeNotifier.java

@@ -49,13 +49,13 @@ public static String buildAnnoyingText(CliContext ctx, UpgradeStatus status) {
         val latestVersion = status.latestVersion().orElseThrow().toString();
 
         val versionMsg = "Update available! " + ctx.colors().NEUTRAL_400.use(currentVersion) + " -> " + ctx.colors().YELLOW_300.use(latestVersion);
-        val commandMsg = mkUpgradeCommandMsg(ctx);
+        val commandMsg = ctx.colors().format(mkUpgradeCommandMsg(ctx));
 
         val versionMsgLength = stripAnsi(versionMsg).length();
         val commandMsgLength = stripAnsi(commandMsg).length();
 
         val maxTextWidth = Math.max(versionMsgLength, commandMsgLength);
-        val boxWidth = Math.max(versionMsgLength, commandMsgLength) + PADDING * 2;
+        val boxWidth = Math.max(versionMsgLength, commandMsgLength) + PADDING * 2 + 2;
 
         val main = new StringBuilder();
         val blue = ctx.colors().BLUE_300;
@@ -84,14 +84,18 @@ private static String mkUpgradeCommandMsg(CliContext ctx) {
     }
 
     private static void appendFillerLine(StringBuilder main, int boxWidth, AstraColor blue, char l, char m, char r) {
-        main.append(blue.on()).append(l).repeat(m, boxWidth).append(r).append(blue.off()).append(NL);
+        main.append(blue.on()).append(l).repeat(m, boxWidth - 2).append(r).append(blue.off()).append(NL);
     }
 
     private static void appendTextualLine(StringBuilder main, String text, int maxTextWidth, int actualLength, AstraColor blue) {
+        int leftPadding = PADDING + Math.floorDiv(maxTextWidth - actualLength, 2);
+        int contentWidth = maxTextWidth + 2 * PADDING;
+        int rightPadding = contentWidth - actualLength - leftPadding;
+
         main.append(blue.on()).append("│").append(blue.off())
-            .repeat(' ', PADDING + Math.floorDiv(maxTextWidth - actualLength, 2))
+            .repeat(' ', leftPadding)
             .append(text)
-            .repeat(' ', PADDING + Math.ceilDiv(maxTextWidth - actualLength, 2))
+            .repeat(' ', rightPadding)
             .append(blue.on()).append("│").append(blue.off())
             .append(NL);
     }

src/main/java/com/dtsx/astra/cli/core/upgrades/UpgradeStatus.java

@@ -38,14 +38,14 @@ private static Optional<UpgradeStatus> loadFromExistingPath(Properties propertie
             val rawLastChecked = properties.getProperty(LAST_CHECKED_KEY);
             val rawLastNotified = properties.getProperty(LAST_NOTIFIED_KEY);
 
-            if (rawLatestVersion == null || rawLastChecked == null) {
+            if (rawLatestVersion == null || rawLastChecked == null || rawLastNotified == null) {
                 ctx.log().exception("Upgrade notifier properties file is missing required keys. Recreating it.");
                 return createNewStatusFile(properties, ctx, path);
             }
 
             val version = Optional.of(rawLatestVersion).filter(s -> !s.isEmpty()).map(Version::parse);
             val lastChecked = Either.tryCatch(() -> Long.parseLong(rawLastChecked), Exception::getMessage);
-             val lastNotified = Either.tryCatch(() -> Long.parseLong(rawLastNotified), Exception::getMessage);
+            val lastNotified = Either.tryCatch(() -> Long.parseLong(rawLastNotified), Exception::getMessage);
 
             if (version.isPresent() && version.get().isLeft()) {
                 ctx.log().exception("Upgrade notifier properties file has invalid latest version value '" + rawLatestVersion + "'. Recreating it.");

src/main/java/com/dtsx/astra/cli/core/upgrades/UpgradeStatusKeeper.java

@@ -94,7 +94,7 @@ private static String runUnix(CliContext ctx, UpgradeStatus status, Path path, b
           # update properties file
           echo "LATEST_VERSION=$latest_version
           LAST_CHECKED=$last_checked
-          LAST_NOTIFIED=$last_notified" > "$(printf %%q '%s')"
+          LAST_NOTIFIED=$last_notified" > '%s'
         """).formatted(pathStr);
 
         return script;