bug and ux fixes

Author: Marcinthecloud

.claude/settings.local.json

@@ -25,7 +25,9 @@
       "Bash(timeout 2 bin/r2sql-shell-macos:*)",
       "Bash(timeout 2 ./bin/r2sql-shell-macos:*)",
       "Bash(npm run build:macos:*)",
-      "Bash(npm run:*)"
+      "Bash(npm run:*)",
+      "Bash(git rm:*)",
+      "Bash(git check-ignore:*)"
     ],
     "deny": [],
     "ask": []

.gitignore

@@ -35,3 +35,4 @@ test*
 PUBLISH_CHECKLIST.md
 HOMEBREW*
 get-sha256.sh
+CLAUDE.md

CLAUDE.md

@@ -0,0 +1,21 @@
+class R2sqlShell < Formula
+  desc "Interactive shell for querying R2 Data Catalog with R2 SQL"
+  homepage "https://github.com/marcinthecloud/r2sql-shell"
+  url "https://github.com/marcinthecloud/r2sql-shell/releases/download/v1.0.0/r2sql-shell-macos"
+  sha256 "Y326c722240c05460f0651e1e2746ac62bf8d1dbdd726eb790c10ee3b47884364"  # Run: shasum -a 256 bin/r2sql-shell-macos
+  version "1.0.0"
+  license "MIT"
+
+  def install
+    # Install the binary as "r2sql-shell" command
+    bin.install "r2sql-shell-macos" => "r2sql-shell"
+  end
+
+  test do
+    # Test that the binary runs and returns correct version
+    assert_match "1.0.0", shell_output("#{bin}/r2sql-shell --version")
+
+    # Test that help works
+    assert_match "Interactive shell", shell_output("#{bin}/r2sql-shell --help")
+  end
+end

Formula/r2sql-shell.rb

@@ -53,7 +53,7 @@ R2_BUCKET_NAME=your_bucket_name_here
 CLOUDFLARE_API_TOKEN=your_api_token_here
 ```
 
-OR simply start `r2sql` for the first time to set it up
+OR simply start `r2sql-shell` for the first time to set it up
 
 ### Getting Your Credentials
 
@@ -67,13 +67,16 @@ OR simply start `r2sql` for the first time to set it up
 
 ### Via Homebrew
 
+**Option 1 (Recommended - One command):**
 ```bash
-brew tap YOUR_USERNAME/r2sql
-brew install r2sql
-r2sql
+brew install marcinthecloud/r2sql-shell/r2sql-shell
 ```
 
-Replace `YOUR_USERNAME` with the GitHub username where the repository is published.
+**Option 2 (Tap first):**
+```bash
+brew tap marcinthecloud/r2sql-shell
+brew install r2sql-shell
+```
 
 For publishing instructions, see [HOMEBREW_SETUP.md](HOMEBREW_SETUP.md).
 
@@ -100,11 +103,11 @@ For publishing instructions, see [HOMEBREW_SETUP.md](HOMEBREW_SETUP.md).
    npm link
    ```
 
-   Now you can run `r2sql` from anywhere!
+   Now you can run `r2sql-shell` from anywhere!
 
 ### Download Pre-built Binary (Coming Soon)
 
-Download the latest release for your platform from the [releases page](https://github.com/YOUR_USERNAME/r2sql-shell/releases):
+Download the latest release for your platform from the [releases page](https://github.com/marcinthecloud/r2sql-shell/releases):
 - macOS (Intel/Apple Silicon)
 - Linux (x64)
 - Windows (x64)
@@ -116,15 +119,15 @@ Download the latest release for your platform from the [releases page](https://g
 Just run the command and you'll be prompted for your credentials:
 
 ```bash
-r2sql
+r2sql-shell
 # or if running from source:
 npm start
 ```
 
 ### Option 2: Using Command-Line Arguments
 
 ```bash
-r2sql --account-id YOUR_ACCOUNT_ID --bucket YOUR_BUCKET --token YOUR_API_TOKEN
+r2sql-shell --account-id YOUR_ACCOUNT_ID --bucket YOUR_BUCKET --token YOUR_API_TOKEN
 ```
 
 ### Option 3: Using Environment Variables
@@ -146,15 +149,15 @@ CLOUDFLARE_API_TOKEN=your_api_token_here
 Then run:
 
 ```bash
-r2sql
+r2sql-shell
 ```
 
 ## Usage
 
 ### Command-Line Options
 
 ```bash
-r2sql [options]
+r2sql-shell [options]
 
 Options:
   --account-id <id>        Cloudflare Account ID
@@ -173,22 +176,22 @@ Options:
 
 ```bash
 # Start with interactive prompt for credentials
-r2sql
+r2sql-shell
 
 # Start in TUI mode with credentials
-r2sql --account-id YOUR_ID --bucket YOUR_BUCKET --token YOUR_TOKEN
+r2sql-shell --account-id YOUR_ID --bucket YOUR_BUCKET --token YOUR_TOKEN
 
 # Execute a query on startup
-r2sql -e "SELECT * FROM my_namespace.my_table LIMIT 10"
+r2sql-shell -e "SELECT * FROM my_namespace.my_table LIMIT 10"
 
 # Enable query history logging
-r2sql --history
+r2sql-shell --history
 
 # Start in simple REPL mode
-r2sql --simple
+r2sql-shell --simple
 
 # Combine options
-r2sql --account-id YOUR_ID --bucket YOUR_BUCKET --token YOUR_TOKEN \
+r2sql-shell --account-id YOUR_ID --bucket YOUR_BUCKET --token YOUR_TOKEN \
       -e "SELECT * FROM default.logs LIMIT 5" --history
 ```
 
@@ -337,7 +340,7 @@ npm start
 
 ### Creating Executables
 
-To package r2sql as a standalone executable:
+To package r2sql-shell as a standalone executable:
 
 ```bash
 # Package for your current platform

README.md

@@ -1,11 +1,11 @@
 {
-  "name": "r2sql",
+  "name": "r2sql-shell",
   "version": "1.0.0",
   "description": "Interactive REPL for querying R2 Data Catalog with R2 SQL",
   "main": "dist/index.js",
   "type": "module",
   "bin": {
-    "r2sql": "./dist/index.js"
+    "r2sql-shell": "./dist/index.js"
   },
   "scripts": {
     "build": "tsc",
@@ -17,7 +17,7 @@
     "package:macos": "npm run bundle && pkg dist/bundle.cjs --targets node18-macos-x64 --output ./bin/r2sql-shell-macos",
     "package:linux": "npm run bundle && pkg dist/bundle.cjs --targets node18-linux-x64 --output ./bin/r2sql-shell-linux",
     "package:windows": "npm run bundle && pkg dist/bundle.cjs --targets node18-win-x64 --output ./bin/r2sql-shell-win.exe",
-    "package:all": "npm run bundle && pkg dist/bundle.cjs --targets node18-macos-x64,node18-linux-x64,node18-win-x64 --out-path ./bin"
+    "package:all": "npm run package:macos && npm run package:linux && npm run package:windows"
   },
   "keywords": [
     "r2",

package.json

@@ -9,7 +9,7 @@ import chalk from 'chalk';
 const program = new Command();
 
 program
-  .name('r2sql')
+  .name('r2sql-shell')
   .description('Interactive shell for querying R2 Data Catalog with R2 SQL')
   .version('1.0.0')
   .option('--account-id <id>', 'Cloudflare Account ID')
@@ -22,25 +22,25 @@ program
   .option('--simple', 'Use simple REPL mode instead of TUI')
   .addHelpText('after', `
 Examples:
-  $ r2sql
+  $ r2sql-shell
     Start with interactive prompts for credentials
 
-  $ r2sql --account-id abc123 --bucket my-bucket --token xyz789
+  $ r2sql-shell --account-id abc123 --bucket my-bucket --token xyz789
     Start with credentials from command line
 
-  $ r2sql -e "SELECT * FROM default.logs LIMIT 10"
+  $ r2sql-shell -e "SELECT * FROM default.logs LIMIT 10"
     Execute a query on startup (uses .env for credentials)
 
-  $ r2sql --account-id abc123 --bucket my-bucket --token xyz789 -e "SELECT * FROM default.logs"
+  $ r2sql-shell --account-id abc123 --bucket my-bucket --token xyz789 -e "SELECT * FROM default.logs"
     Combine credentials and query execution
 
-  $ r2sql --history
+  $ r2sql-shell --history
     Enable query history logging to r2sql-history.txt
 
-  $ r2sql --debug
+  $ r2sql-shell --debug
     Enable debug logging to r2sql-debug.log
 
-  $ r2sql --simple
+  $ r2sql-shell --simple
     Use simple REPL mode instead of TUI
 
 Configuration: