improve the command line flag remove --yes with --components

Author: ptrthomas

.github/workflows/test-installer.yml

@@ -17,8 +17,8 @@ jobs:
           curl -fsSL https://karate.sh/install.sh | sh -s -- --bin-dir $HOME/.local/bin
           echo "$HOME/.local/bin" >> $GITHUB_PATH
 
-      - name: Setup Karate (JAR only, use system JRE)
-        run: karate setup path
+      - name: Setup Karate (uses system JRE, downloads JAR)
+        run: karate setup --components jar
 
       - name: Verify installation (system JRE)
         run: |
@@ -33,8 +33,8 @@ jobs:
           karate smoke.feature
           echo "Exit code: $?"
 
-      - name: Setup managed JRE
-        run: karate setup jre
+      - name: Download managed JRE
+        run: karate setup --components jre --force
 
       - name: Verify installation (managed JRE)
         env:
@@ -62,8 +62,8 @@ jobs:
           .\install.ps1 -InstallDir $InstallDir
           echo "$InstallDir" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
 
-      - name: Setup Karate (JAR only, use system JRE)
-        run: karate setup path
+      - name: Setup Karate (uses system JRE, downloads JAR)
+        run: karate setup --components jar
 
       - name: Verify installation (system JRE)
         run: |
@@ -78,8 +78,8 @@ jobs:
           karate smoke.feature
           echo "Exit code: $LASTEXITCODE"
 
-      - name: Setup managed JRE
-        run: karate setup jre
+      - name: Download managed JRE
+        run: karate setup --components jre --force
 
       - name: Verify installation (managed JRE)
         env:

aws-amplify/index.html

@@ -258,8 +258,8 @@ <h2>macOS / Linux</h2>
                 <div class="more-options-content">
                     <p class="option-label">With auto-setup (downloads JRE + JAR immediately):</p>
                     <div class="code-block">
-                        <code>curl -fsSL https://karate.sh/install.sh | sh -s -- --yes</code>
-                        <button class="copy-btn" onclick="copyToClipboard('curl -fsSL https://karate.sh/install.sh | sh -s -- --yes', this)">Copy</button>
+                        <code>curl -fsSL https://karate.sh/install.sh | sh -s -- --all</code>
+                        <button class="copy-btn" onclick="copyToClipboard('curl -fsSL https://karate.sh/install.sh | sh -s -- --all', this)">Copy</button>
                     </div>
                 </div>
             </details>
@@ -276,8 +276,8 @@ <h2>Windows (PowerShell)</h2>
                 <div class="more-options-content">
                     <p class="option-label">With auto-setup (downloads JRE + JAR immediately):</p>
                     <div class="code-block">
-                        <code>iex "& { $(irm https://karate.sh/install.ps1) } -Yes"</code>
-                        <button class="copy-btn" onclick="copyToClipboard('iex \"& { $(irm https://karate.sh/install.ps1) } -Yes\"', this)">Copy</button>
+                        <code>iex "& { $(irm https://karate.sh/install.ps1) } -All"</code>
+                        <button class="copy-btn" onclick="copyToClipboard('iex \"& { $(irm https://karate.sh/install.ps1) } -All\"', this)">Copy</button>
                     </div>
                 </div>
             </details>

aws-amplify/install.ps1

@@ -1,14 +1,14 @@
 # Karate CLI Installer for Windows
 # Usage: irm https://karate.sh/install.ps1 | iex
-#        irm https://karate.sh/install.ps1 | iex -Args '--yes'
+#        iex "& { $(irm https://karate.sh/install.ps1) } -All"
 #
 # Options:
-#   -Yes              Non-interactive, accept defaults
+#   -All              Download JRE + JAR immediately after install
 #   -InstallDir DIR   Install to custom directory (default: %LOCALAPPDATA%\Programs\Karate)
 #   -Version VER      Install specific version (default: latest)
 
 param(
-    [switch]$Yes,
+    [switch]$All,
     [string]$InstallDir = "$env:LOCALAPPDATA\Programs\Karate",
     [string]$Version = "latest",
     [switch]$Help
@@ -93,7 +93,7 @@ function Show-Help {
     Write-Host "       .\install.ps1 [OPTIONS]"
     Write-Host ""
     Write-Host "Options:"
-    Write-Host "  -Yes              Non-interactive, accept defaults"
+    Write-Host "  -All              Download JRE + JAR immediately after install"
     Write-Host "  -InstallDir DIR   Install to custom directory"
     Write-Host "                    (default: %LOCALAPPDATA%\Programs\Karate)"
     Write-Host "  -Version VER      Install specific version (default: latest)"
@@ -186,9 +186,9 @@ function Main {
         }
 
         # Run setup if requested
-        if ($Yes) {
+        if ($All) {
             Write-Info "Running karate setup..."
-            & $binaryPath setup --yes
+            & $binaryPath setup --all
         } else {
             Write-Host "Next steps:"
             Write-Host ""

aws-amplify/install.sh

@@ -1,10 +1,10 @@
 #!/bin/sh
 # Karate CLI Installer for Unix/macOS
 # Usage: curl -fsSL https://karate.sh/install.sh | sh
-#        curl -fsSL https://karate.sh/install.sh | sh -s -- --yes
+#        curl -fsSL https://karate.sh/install.sh | sh -s -- --all
 #
 # Options:
-#   --yes           Non-interactive, accept defaults
+#   --all           Download JRE + JAR immediately after install
 #   --bin-dir DIR   Install to custom directory (default: ~/.local/bin)
 #   --version VER   Install specific version (default: latest)
 
@@ -53,8 +53,8 @@ error() {
 # Parse arguments
 while [ $# -gt 0 ]; do
     case "$1" in
-        --yes|-y)
-            AUTO_SETUP="--yes"
+        --all|-a)
+            AUTO_SETUP="--all"
             shift
             ;;
         --bin-dir)
@@ -71,7 +71,7 @@ while [ $# -gt 0 ]; do
             echo "Usage: curl -fsSL https://karate.sh/install.sh | sh -s -- [OPTIONS]"
             echo ""
             echo "Options:"
-            echo "  --yes, -y        Non-interactive, accept defaults"
+            echo "  --all, -a        Download JRE + JAR immediately after install"
             echo "  --bin-dir DIR    Install to custom directory (default: ~/.local/bin)"
             echo "  --version VER    Install specific version (default: latest)"
             echo "  --help, -h       Show this help"
@@ -276,7 +276,7 @@ main() {
     # Run setup if requested
     if [ -n "$AUTO_SETUP" ]; then
         info "Running karate setup..."
-        "${INSTALL_DIR}/karate" setup --yes
+        "${INSTALL_DIR}/karate" setup --all
     else
         echo "Next steps:"
         echo ""

docs/spec.md

@@ -96,9 +96,10 @@ Commands fully implemented in Rust:
 | Command | Description |
 |---------|-------------|
 | `karate setup` | Interactive first-run wizard |
-| `karate setup path` | Install CLI to PATH only |
-| `karate setup jre` | Install/update JRE only |
-| `karate upgrade [--yes] [--version <ver>]` | Update to latest/specific version |
+| `karate setup --all` | Install JAR + JRE non-interactively |
+| `karate setup --components jar` | Install JAR only (use system JRE) |
+| `karate setup --components jre` | Install/update JRE only |
+| `karate upgrade [--version <ver>]` | Update to latest/specific version |
 | `karate config [--global\|--local\|--show]` | Edit or view configuration |
 | `karate jre list` | List installed JREs |
 | `karate jre doctor` | Check JRE health |
@@ -132,7 +133,7 @@ Everything else passes through to the JVM:
   * Download matching JustJ JRE
   * Store in `~/.karate/`
   * Offer to add to PATH
-* Support automated/non-interactive mode (`--yes`).
+* Support automated/non-interactive mode (`--all` or `--components`).
 * **Explicit bootstrap required** — running `karate run` without setup shows helpful error.
 
 ### **B. Self-Management**
@@ -263,32 +264,38 @@ Runtime Commands (JAR-delegated):
 ### **setup**
 
 ```
-karate setup [--yes]
-karate setup path [--bin-dir <path>] [--modify-shell-profile]
-karate setup jre [--version <ver>]
+karate setup [--all] [--components <list>] [--force] [--java-version <ver>]
 ```
 
 Interactive first-run wizard. Downloads JRE and Karate JAR, offers PATH setup.
 
-**Subcommands:**
-* `path` — Only set up PATH/symlinks
-* `jre` — Only install/update JRE
-
 **Flags:**
-* `--yes` — Non-interactive, accept defaults
+* `--all` — Install all components (JAR + JRE) non-interactively
+* `--components <list>` — Install specific components (comma-separated: jar, jre)
+* `--force` — Force download even if components already installed
+* `--java-version <ver>` — Specific Java major version (default: 21)
+
+**Examples:**
+```
+karate setup                    # Interactive wizard
+karate setup --all              # Install everything non-interactively
+karate setup --components jar   # JAR only (use system JRE)
+karate setup --components jre   # JRE only
+karate setup --components jar,jre --force  # Force re-download both
+```
 
 ---
 
 ### **upgrade**
 
 ```
-karate upgrade [--yes] [--version <ver>]
+karate upgrade [--all] [--version <ver>]
 ```
 
 Check for updates and download new versions.
 
 **Flags:**
-* `--yes` — Non-interactive
+* `--all` — Non-interactive (upgrade all components)
 * `--version <ver>` — Install specific version instead of latest
 
 ---
@@ -639,7 +646,7 @@ irm https://karate.sh/install.ps1 | iex
 **Implementation:**
 - `karate.sh` serves a shell script that detects OS/arch
 - Downloads the correct binary from GitHub releases
-- Optionally runs `karate setup --yes` for full bootstrap
+- Optionally runs `karate setup --all` for full bootstrap
 - Provides clear instructions for PATH setup
 
 ## **10.2 npm Package**
@@ -678,7 +685,7 @@ karate-npm/
 2. Download matching Rust binary from GitHub releases
 3. Verify SHA256 checksum
 4. Make executable (Unix)
-5. First run triggers `karate setup --yes` for JRE/JAR bootstrap
+5. First run triggers `karate setup --all` for JRE/JAR bootstrap
 
 **User experience:**
 ```bash
@@ -713,7 +720,7 @@ class Karate < Formula
   end
 
   def post_install
-    system "#{bin}/karate", "setup", "--yes"
+    system "#{bin}/karate", "setup", "--all"
   end
 end
 ```

docs/tracker.md

@@ -37,11 +37,12 @@
 - [x] `karate setup jre` with --force option
 
 ### Setup & Bootstrap
-- [x] `karate setup` - Full wizard (JRE + JAR)
-- [x] `karate setup jre` - JRE only
+- [x] `karate setup` - Interactive wizard
+- [x] `karate setup --all` - Install JAR + JRE non-interactively
+- [x] `karate setup --components jar` - JAR only (use system JRE)
+- [x] `karate setup --components jre` - JRE only
 - [x] Downloads latest Karate JAR from GitHub releases
 - [x] SHA256 checksum support infrastructure (not yet enforced)
-- [x] Non-interactive mode (--yes flag)
 
 ### Diagnostics
 - [x] `karate doctor` - Full system diagnostics
@@ -95,7 +96,7 @@
   - [ ] Download new JAR if available
   - [ ] Download new JRE if available
   - [ ] --version flag for specific version
-  - [ ] --yes flag for non-interactive
+  - [ ] --all flag for non-interactive
 
 #### Config Editing
 - [ ] `karate config` - Interactive editing
@@ -115,7 +116,7 @@
   - [x] Binary download from GitHub releases
   - [x] SHA256 verification
   - [x] PATH setup instructions
-  - [x] --yes flag for auto-setup after install
+  - [x] --all flag for auto-setup after install
 - [x] PowerShell script for Windows (install.ps1)
   - [x] Same functionality
   - [x] Auto-adds to user PATH
@@ -229,7 +230,7 @@ curl -fsSL https://karate.sh/install.sh | sh -s -- --bin-dir /tmp/karate-test
 # Test Linux installation in Docker
 docker run --rm ubuntu:latest bash -c '
   apt-get update && apt-get install -y curl
-  curl -fsSL https://karate.sh/install.sh | sh -s -- --bin-dir /tmp/bin --yes
+  curl -fsSL https://karate.sh/install.sh | sh -s -- --bin-dir /tmp/bin --all
   /tmp/bin/karate doctor --json
 '
 ```

src/cli.rs

@@ -50,48 +50,21 @@ pub enum Command {
 
 #[derive(Args, Debug)]
 pub struct SetupArgs {
-    /// Non-interactive mode, accept all defaults
-    #[arg(short, long)]
-    pub yes: bool,
+    /// Install all components (JAR + JRE) non-interactively
+    #[arg(long, conflicts_with = "components")]
+    pub all: bool,
 
-    #[command(subcommand)]
-    pub subcommand: Option<SetupSubcommand>,
-}
-
-#[derive(Subcommand, Debug)]
-pub enum SetupSubcommand {
-    /// Set up PATH/symlinks only
-    Path(SetupPathArgs),
-
-    /// Install/update JRE only
-    #[command(disable_version_flag = true)]
-    Jre(SetupJreArgs),
-}
-
-#[derive(Args, Debug)]
-pub struct SetupPathArgs {
-    /// Directory to install the karate binary
-    #[arg(long)]
-    pub bin_dir: Option<String>,
-
-    /// Modify shell profile to add to PATH (Unix only)
-    #[arg(long)]
-    pub modify_shell_profile: bool,
+    /// Install specific components: jar, jre (comma-separated)
+    #[arg(long, value_delimiter = ',')]
+    pub components: Option<Vec<String>>,
 
-    /// Add to system PATH (Windows only)
-    #[arg(long)]
-    pub add_to_path: bool,
-}
+    /// Force download even if components are already installed
+    #[arg(long, short)]
+    pub force: bool,
 
-#[derive(Args, Debug)]
-pub struct SetupJreArgs {
     /// Specific Java major version to install (e.g., 17, 21)
     #[arg(long = "java-version")]
-    pub version: Option<String>,
-
-    /// Force download even if a suitable system JRE is available
-    #[arg(long, short)]
-    pub force: bool,
+    pub java_version: Option<String>,
 }
 
 // ============================================================================
@@ -100,9 +73,9 @@ pub struct SetupJreArgs {
 
 #[derive(Args, Debug)]
 pub struct UpgradeArgs {
-    /// Non-interactive mode
-    #[arg(short, long)]
-    pub yes: bool,
+    /// Non-interactive mode (upgrade all components)
+    #[arg(long)]
+    pub all: bool,
 
     /// Install specific version instead of latest
     #[arg(long)]