gitbash 1.1.0 → 1.3.0

package/commands/stale.sh

@@ -13,6 +13,7 @@ stale() {
     local json_mode=false
     local my_mode=false
     local filter_args=()
+    local stale_months="${GITBASH_STALE_MONTHS:-3}"
     
     while [[ $# -gt 0 ]]; do
         case "$1" in
@@ -31,18 +32,22 @@ Arguments:
   FILTER...     Optional search filter words to pre-fill fzf (joined with spaces)
 
 Options:
-  -h, --help    Show this help message
-  -m, --my      Pre-fill filter with your git username (from git config user.name)
-  --json        Output branch data as JSON (non-interactive)
+  -h, --help      Show this help message
+  -m, --my        Pre-fill filter with your git username (from git config user.name)
+  --json          Output branch data as JSON (non-interactive)
+  --age=N         Override stale threshold in months (default: 3, configurable via GITBASH_STALE_MONTHS)
 
 Features:
   - Lists all remote branches sorted by last commit date (oldest first)
-  - By default, only shows branches older than 3 months (truly stale)
+  - By default, only shows branches older than N months (default 3)
   - Shows branch name, relative date, and author
   - Interactive selection with fzf
   - Preview shows recent commits on the selected branch
   - Delete selected branches directly from the list
 
+Configuration:
+  GITBASH_STALE_MONTHS - Set default threshold in months (run 'gitbash --config')
+
 Navigation:
   ↑/↓ or j/k    Navigate through branches
   TAB           Select/deselect branch (multi-select)
@@ -58,6 +63,12 @@ Examples:
     feature/old-feature                    3 months ago    John Doe
     ✖ Abort
 
+  $ stale --age=1
+  # Show branches older than 1 month
+
+  $ stale --age=6
+  # Show branches older than 6 months
+
   # Press Ctrl-A to show all branches including recent ones
   # Select branches with TAB, press Enter to delete
 
@@ -88,6 +99,14 @@ EOF
                 my_mode=true
                 shift
                 ;;
+            --age=*)
+                stale_months="${1#--age=}"
+                if ! [[ "$stale_months" =~ ^[0-9]+$ ]] || [[ "$stale_months" -lt 1 ]]; then
+                    print_error "Invalid age value: $stale_months"
+                    return 1
+                fi
+                shift
+                ;;
             *)
                 filter_args+=("$1")
                 shift
@@ -108,29 +127,7 @@ EOF
     fi
 
     if [[ "$json_mode" == false ]]; then
-        if ! command -v fzf >/dev/null 2>&1; then
-            echo "fzf is not installed."
-
-            prompt_read "Install fzf with Homebrew? (y/N): " ans
-            case "$ans" in
-                [yY][eE][sS]|[yY])
-                    echo "Installing fzf with brew..."
-                    if ! command -v brew >/dev/null 2>&1; then
-                        echo "Homebrew is not installed. Aborting."
-                        return 1
-                    fi
-                    brew install fzf || { echo "fzf install failed. Aborting."; return 1; }
-                    if [[ -f "$(brew --prefix)/opt/fzf/install" ]]; then
-                        echo "Running fzf install script..."
-                        yes | "$(brew --prefix)/opt/fzf/install"
-                    fi
-                    ;;
-                *)
-                    echo "Aborted (skipped fzf installation)."
-                    return 1
-                    ;;
-            esac
-        fi
+        require_fzf || return 1
     fi
 
     # -----------------------------
@@ -164,9 +161,9 @@ EOF
     local abort_label="✖ Abort"
     local max_branch_length=65
     
-    # Calculate date 3 months ago
-    local three_months_ago
-    three_months_ago=$(date -v-3m +%s 2>/dev/null || date -d "3 months ago" +%s 2>/dev/null)
+    # Calculate date N months ago (based on stale_months)
+    local threshold_ago
+    threshold_ago=$(date -v-"${stale_months}m" +%s 2>/dev/null || date -d "${stale_months} months ago" +%s 2>/dev/null)
     
     # Build full branch list (all branches)
     # Format: display_branch | date | author | full_branch (tab-separated, last field is full branch for operations)
@@ -193,7 +190,7 @@ EOF
         grep -v '^origin$' | \
         while IFS='|' read -r branch date author timestamp; do
             # Only include if older than 3 months
-            if [[ "$timestamp" -lt "$three_months_ago" ]]; then
+            if [[ "$timestamp" -lt "$threshold_ago" ]]; then
                 # Remove origin/ prefix for display
                 local full_branch="${branch#origin/}"
                 local display_branch="$full_branch"
@@ -238,7 +235,7 @@ EOF
         while IFS='|' read -r branch rel_date author_name author_email timestamp; do
             [[ -z "$branch" ]] && continue
             # Only include if older than 3 months
-            if [[ "$timestamp" -lt "$three_months_ago" ]]; then
+            if [[ "$timestamp" -lt "$threshold_ago" ]]; then
                 local name="${branch#origin/}"
                 # Remove angle brackets from email
                 author_email="${author_email#<}"
@@ -302,7 +299,7 @@ TOGGLE_EOF
 #!/bin/bash
 state=\$(cat "$state_file")
 if [[ "\$state" == "stale" ]]; then
-    echo "Stale branches (>3 months, oldest first) > "
+    echo "Stale branches (>${stale_months}mo, oldest first) > "
 else
     echo "All branches (oldest first) > "
 fi
@@ -316,7 +313,7 @@ PROMPT_EOF
 state=\$(cat "$state_file")
 if [[ "\$state" == "stale" ]]; then
     echo "[TAB] select | [Ctrl-A] toggle all/stale | [Enter] delete | [ESC] exit
-Showing $stale_count stale branches (older than 3 months)"
+Showing $stale_count stale branches (older than ${stale_months} months)"
 else
     echo "[TAB] select | [Ctrl-A] toggle all/stale | [Enter] delete | [ESC] exit
 Showing all $all_count branches"
@@ -327,13 +324,13 @@ HEADER_EOF
     local selection
     selection=$(
         fzf \
-            --prompt="Stale branches (>3 months, oldest first) > " \
+            --prompt="Stale branches (>${stale_months}mo, oldest first) > " \
             --query="$filter" \
             -i \
             --reverse \
             --border \
             --header="[TAB] select | [Ctrl-A] toggle all/stale | [Enter] delete | [ESC] exit
-Showing $stale_count stale branches (older than 3 months)" \
+Showing $stale_count stale branches (older than ${stale_months} months)" \
             --multi \
             --delimiter=$'\t' \
             --with-nth=1 \

package/commands/stash.sh

@@ -1,3 +1,11 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2155
+
+# Source common utilities
+SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd)"
+# shellcheck source=_utils.sh
+source "$SOURCE_DIR/_utils.sh"
+
 stash() {
     # -----------------------------
     # 0. Check for help/version flag
@@ -80,7 +88,7 @@ EOF
         read -r stash_name
 
         if [[ -z "$stash_name" ]]; then
-            echo "Error: Stash name cannot be empty."
+            print_error "Stash name cannot be empty."
             return 1
         fi
     fi
@@ -89,9 +97,9 @@ EOF
     # 4. Create the stash
     # -----------------------------
     if git stash push -u -m "$stash_name"; then
-        echo "✓ Created stash: $stash_name"
+        print_success "Created stash: $stash_name"
     else
-        echo "Error: Failed to create stash."
+        print_error "Failed to create stash."
         return 1
     fi
 }

package/commands/stashes.sh

@@ -106,31 +106,7 @@ EOF
     # -----------------------------
     # 1. Check for fzf
     # -----------------------------
-    if ! command -v fzf >/dev/null 2>&1; then
-        echo "fzf is not installed."
-
-        # Ask whether to install with Homebrew
-        prompt_read "Install fzf with Homebrew? (y/N): " ans
-        case "$ans" in
-            [yY][eE][sS]|[yY])
-                echo "Installing fzf with brew..."
-                if ! command -v brew >/dev/null 2>&1; then
-                    echo "Homebrew is not installed. Aborting."
-                    return 1
-                fi
-                brew install fzf || { echo "fzf install failed. Aborting."; return 1; }
-                # Optional: install shell integrations automatically
-                if [[ -f "$(brew --prefix)/opt/fzf/install" ]]; then
-                    echo "Running fzf install script..."
-                    yes | "$(brew --prefix)/opt/fzf/install"
-                fi
-                ;;
-            *)
-                echo "Aborted (skipped fzf installation)."
-                return 1
-                ;;
-        esac
-    fi
+    require_fzf || return 1
 
     # -----------------------------
     # 2. Build action menu

package/commands/status.sh

@@ -74,36 +74,8 @@ EOF
   # -----------------------------
   # 1. Check prerequisites
   # -----------------------------
-  if ! git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
-    echo "Not inside a git repository."
-    return 1
-  fi
-
-  if ! command -v fzf >/dev/null 2>&1; then
-    echo "fzf is not installed."
-
-    # Ask whether to install with Homebrew
-    prompt_read "Install fzf with Homebrew? (y/N): " ans
-    case "$ans" in
-      [yY][eE][sS]|[yY])
-        echo "Installing fzf with brew..."
-        if ! command -v brew >/dev/null 2>&1; then
-          echo "Homebrew is not installed. Aborting."
-          return 1
-        fi
-        brew install fzf || { echo "fzf install failed. Aborting."; return 1; }
-        # Optional: install shell integrations automatically
-        if [[ -f "$(brew --prefix)/opt/fzf/install" ]]; then
-          echo "Running fzf install script..."
-          yes | "$(brew --prefix)/opt/fzf/install"
-        fi
-        ;;
-      *)
-        echo "Aborted (skipped fzf installation)."
-        return 1
-        ;;
-    esac
-  fi
+  require_git_repo || return 1
+  require_fzf || return 1
 
   # -----------------------------
   # 2. Get git status and format with staging info

package/commands/switch.sh

@@ -59,36 +59,8 @@ EOF
   # -----------------------------
   # 1. Check prerequisites
   # -----------------------------
-  if ! git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
-    echo "Not inside a git repository."
-    return 1
-  fi
-
-  if ! command -v fzf >/dev/null 2>&1; then
-    echo "fzf is not installed."
-
-    # Ask whether to install with Homebrew
-    prompt_read "Install fzf with Homebrew? (y/N): " ans
-    case "$ans" in
-      [yY][eE][sS]|[yY])
-        echo "Installing fzf with brew..."
-        if ! command -v brew >/dev/null 2>&1; then
-          echo "Homebrew is not installed. Aborting."
-          return 1
-        fi
-        brew install fzf || { echo "fzf install failed. Aborting."; return 1; }
-        # Optional: install shell integrations automatically
-        if [[ -f "$(brew --prefix)/opt/fzf/install" ]]; then
-          echo "Running fzf install script..."
-          yes | "$(brew --prefix)/opt/fzf/install"
-        fi
-        ;;
-      *)
-        echo "Aborted (skipped fzf installation)."
-        return 1
-        ;;
-    esac
-  fi
+  require_git_repo || return 1
+  require_fzf || return 1
 
   # -----------------------------
   # 2. Get current branch and filter
@@ -183,9 +155,9 @@ EOF
   fi
 
   if [[ $? -eq 0 ]]; then
-    echo "✓ Successfully switched to branch: $(git rev-parse --abbrev-ref HEAD)"
+    print_success "Successfully switched to branch: $(git rev-parse --abbrev-ref HEAD)"
   else
-    echo "✗ Failed to switch branch."
+    print_error "Failed to switch branch."
     return 1
   fi
 }

package/commands/unstash.sh

@@ -76,31 +76,7 @@ EOF
     # -----------------------------
     # 1. Check for fzf
     # -----------------------------
-    if ! command -v fzf >/dev/null 2>&1; then
-        echo "fzf is not installed."
-
-        # Ask whether to install with Homebrew
-        prompt_read "Install fzf with Homebrew? (y/N): " ans
-        case "$ans" in
-            [yY][eE][sS]|[yY])
-                echo "Installing fzf with brew..."
-                if ! command -v brew >/dev/null 2>&1; then
-                    echo "Homebrew is not installed. Aborting."
-                    return 1
-                fi
-                brew install fzf || { echo "fzf install failed. Aborting."; return 1; }
-                # Optional: install shell integrations automatically
-                if [[ -f "$(brew --prefix)/opt/fzf/install" ]]; then
-                    echo "Running fzf install script..."
-                    yes | "$(brew --prefix)/opt/fzf/install"
-                fi
-                ;;
-            *)
-                echo "Aborted (skipped fzf installation)."
-                return 1
-                ;;
-        esac
-    fi
+    require_fzf || return 1
 
     # -----------------------------
     # 2. Build menu entries

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitbash",
-  "version": "1.1.0",
+  "version": "1.3.0",
   "description": "Opinionated git utilities for bash with fzf-powered menus",
   "author": "jaggli",
   "license": "MIT",