gitbash 0.2.7 → 1.2.0

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2025 Matthias Jäggli
+Copyright (c) 2025 Matthias Jäggli, https://github.com/jaggli
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -2,12 +2,14 @@
 
 Interactive git utilities for bash with fzf-powered menus.
 
+![screenshot-status..png](./doc/screenshot-status.png)
+
 ## Installation
 
 ### Via npm
 
 ```bash
-npm i -g gitbash
+npm i -g gitbash && gitbash --config
 ```
 
 ### Options
@@ -19,33 +21,6 @@ gitbash --init      # Print shell init code
 gitbash --config    # Interactive configuration wizard
 ```
 
-### Shell Aliases
-
-Add these aliases to your `.zshrc` or `.bashrc` for individual command access:
-
-```bash
-alias branch="gitbash branch"
-alias cleanstash="gitbash cleanstash"
-alias cleanup="gitbash cleanup"
-alias commit="gitbash commit"
-alias commits="gitbash commits"
-alias create="gitbash create"
-alias pr="gitbash pr"
-alias stale="gitbash stale"
-alias stash="gitbash stash"
-alias stashes="gitbash stashes"
-alias status="gitbash status"
-alias switch="gitbash switch"
-alias unstash="gitbash unstash"
-alias update="gitbash update"
-```
-
-Or use the built-in shell integration, for all commands:
-
-```bash
-eval "$(gitbash --init)"
-```
-
 ### Dependencies
 
 ```bash
@@ -216,6 +191,29 @@ commits        # Show last 20 commits
 commits 50     # Show last 50 commits
 ```
 
+### Individual aliases
+
+Instead of adding every command via `eval "$(gitbash --init)"` in `.zshrc` or `.bashrc`
+direct usage with `gitbash [command]` is also possible. Or if desired, individual aliases
+can be made.
+
+```bash
+alias branch="gitbash branch"
+alias cleanstash="gitbash cleanstash"
+alias cleanup="gitbash cleanup"
+alias commit="gitbash commit"
+alias commits="gitbash commits"
+alias create="gitbash create"
+alias pr="gitbash pr"
+alias stale="gitbash stale"
+alias stash="gitbash stash"
+alias stashes="gitbash stashes"
+alias status="gitbash status"
+alias switch="gitbash switch"
+alias unstash="gitbash unstash"
+alias update="gitbash update"
+```
+
 ## License
 
 See [LICENSE](LICENSE) file for details.

package/bin/gitbash

@@ -17,33 +17,169 @@ configure_gitbash() {
 
     local current_prefix="${GITBASH_FEATURE_BRANCH_PREFIX:-feature/}"
     local current_merge="${GITBASH_MERGE_COMMAND:-fork}"
+    local current_theme="${GITBASH_THEME:-auto}"
+    local current_stale_months="${GITBASH_STALE_MONTHS:-3}"
+    local current_cleanup_days="${GITBASH_CLEANUP_DAYS:-7}"
 
     echo "Configure gitbash (writes to $CONFIG_FILE)"
     echo
 
-    local input prefix merge_cmd
+    local input prefix merge_cmd theme stale_months cleanup_days
 
+    # Branch prefix
     read -e -p "Feature branch prefix (used by create) [${current_prefix}]: " input
     prefix=${input:-$current_prefix}
 
+    # Merge tool
     read -e -p "Merge tool command (used by update on conflicts) [${current_merge}]: " input
     merge_cmd=${input:-$current_merge}
 
+    # Theme preference
+    echo
+    echo "Theme preference for delta/bat (affects diff highlighting):"
+    echo "  auto  - Use terminal's theme detection"
+    echo "  dark  - Force dark theme"
+    echo "  light - Force light theme (GitHub style)"
+    read -e -p "Theme [${current_theme}]: " input
+    theme=${input:-$current_theme}
+    case "$theme" in
+        auto|dark|light) ;;
+        *) 
+            echo "Invalid theme. Using 'auto'."
+            theme="auto"
+            ;;
+    esac
+
+    # Stale branch threshold
+    echo
+    read -e -p "Stale branch threshold in months (used by stale) [${current_stale_months}]: " input
+    stale_months=${input:-$current_stale_months}
+    if ! [[ "$stale_months" =~ ^[0-9]+$ ]] || [[ "$stale_months" -lt 1 ]]; then
+        echo "Invalid value. Using default of 3 months."
+        stale_months=3
+    fi
+
+    # Cleanup threshold
+    read -e -p "Cleanup threshold in days (used by cleanup) [${current_cleanup_days}]: " input
+    cleanup_days=${input:-$current_cleanup_days}
+    if ! [[ "$cleanup_days" =~ ^[0-9]+$ ]] || [[ "$cleanup_days" -lt 1 ]]; then
+        echo "Invalid value. Using default of 7 days."
+        cleanup_days=7
+    fi
+
     cat > "$CONFIG_FILE" <<EOF
 # gitbash configuration
 # Prefix for feature branches created by 'create'
 GITBASH_FEATURE_BRANCH_PREFIX="$prefix"
 # Merge tool command invoked by 'update' when conflicts occur
 GITBASH_MERGE_COMMAND="$merge_cmd"
+# Theme for delta/bat: auto, dark, or light
+GITBASH_THEME="$theme"
+# Stale branch threshold in months (branches older than this in 'stale')
+GITBASH_STALE_MONTHS="$stale_months"
+# Cleanup threshold in days (branches merged more than this many days ago)
+GITBASH_CLEANUP_DAYS="$cleanup_days"
 EOF
 
     echo
     echo "Saved configuration to $CONFIG_FILE"
 
+    # Check for dependencies
+    check_dependencies
+
     # Check for shell integration
     check_shell_integration
 }
 
+# Check and offer to install dependencies
+check_dependencies() {
+    local missing_required=()
+    local missing_optional=()
+
+    # Required dependencies
+    if ! command -v fzf >/dev/null 2>&1; then
+        missing_required+=("fzf")
+    fi
+
+    # Optional dependencies
+    if ! command -v delta >/dev/null 2>&1; then
+        missing_optional+=("git-delta")
+    fi
+    if ! command -v bat >/dev/null 2>&1; then
+        missing_optional+=("bat")
+    fi
+
+    # If nothing missing, we're done
+    if [[ ${#missing_required[@]} -eq 0 && ${#missing_optional[@]} -eq 0 ]]; then
+        echo
+        echo "All dependencies installed ✓"
+        return 0
+    fi
+
+    echo
+    echo "Dependencies:"
+
+    # Show status of each dependency
+    if command -v fzf >/dev/null 2>&1; then
+        echo "  ✓ fzf (required)"
+    else
+        echo "  ✗ fzf (required) - fuzzy finder for interactive selection"
+    fi
+
+    if command -v delta >/dev/null 2>&1; then
+        echo "  ✓ git-delta (optional)"
+    else
+        echo "  ✗ git-delta (optional) - better diff highlighting"
+    fi
+
+    if command -v bat >/dev/null 2>&1; then
+        echo "  ✓ bat (optional)"
+    else
+        echo "  ✗ bat (optional) - syntax highlighting for file previews"
+    fi
+
+    # Build list of all missing dependencies
+    local all_missing=()
+    [[ ${#missing_required[@]} -gt 0 ]] && all_missing+=("${missing_required[@]}")
+    [[ ${#missing_optional[@]} -gt 0 ]] && all_missing+=("${missing_optional[@]}")
+
+    # If nothing to install, we're done
+    if [[ ${#all_missing[@]} -eq 0 ]]; then
+        return 0
+    fi
+
+    # Check if Homebrew is available
+    if ! command -v brew >/dev/null 2>&1; then
+        echo
+        echo "Homebrew not found. Install dependencies manually:"
+        for dep in "${all_missing[@]}"; do
+            echo "  brew install $dep"
+        done
+        return 0
+    fi
+
+    # Offer to install missing dependencies
+    echo
+    local install_deps
+    read -e -p "Install missing dependencies with Homebrew? (Y/n): " install_deps
+    case "$install_deps" in
+        [nN][oO]|[nN])
+            echo "Skipped dependency installation."
+            ;;
+        *)
+            echo "Installing dependencies..."
+            for dep in "${all_missing[@]}"; do
+                echo "  Installing $dep..."
+                if brew install "$dep" 2>/dev/null; then
+                    echo "  ✓ $dep installed"
+                else
+                    echo "  ✗ Failed to install $dep"
+                fi
+            done
+            ;;
+    esac
+}
+
 # Check if gitbash shell integration is set up
 check_shell_integration() {
     local shell_rc=""

package/commands/_utils.sh

@@ -2,6 +2,33 @@
 # shellcheck disable=SC2155
 # Common utilities for gitbash commands - compatible with bash and zsh
 
+# Color codes for consistent output
+COLOR_RED='\033[0;31m'
+COLOR_GREEN='\033[0;32m'
+COLOR_YELLOW='\033[0;33m'
+COLOR_BLUE='\033[0;34m'
+COLOR_RESET='\033[0m'
+
+# Print success message (green checkmark)
+print_success() {
+    echo -e "${COLOR_GREEN}✓${COLOR_RESET} $*"
+}
+
+# Print error message (red X)
+print_error() {
+    echo -e "${COLOR_RED}✗${COLOR_RESET} $*" >&2
+}
+
+# Print warning message (yellow warning)
+print_warning() {
+    echo -e "${COLOR_YELLOW}⚠${COLOR_RESET} $*"
+}
+
+# Print info message (blue)
+print_info() {
+    echo -e "${COLOR_BLUE}ℹ${COLOR_RESET} $*"
+}
+
 # Portable read with prompt that works in both bash and zsh
 # Usage: prompt_read "prompt text" variable_name
 # The result is stored in the variable name provided
@@ -32,3 +59,118 @@ prompt_read_edit() {
         read -e -rp "$prompt" "$varname"
     fi
 }
+
+# Check if fzf is installed, offer to install if not
+# Returns 0 if fzf is available, 1 if not
+require_fzf() {
+    if command -v fzf >/dev/null 2>&1; then
+        return 0
+    fi
+
+    print_error "fzf is not installed."
+    
+    local ans
+    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
+                print_error "Homebrew is not installed. Aborting."
+                return 1
+            fi
+            if brew install fzf; then
+                # 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
+                print_success "fzf installed successfully."
+                return 0
+            else
+                print_error "fzf install failed. Aborting."
+                return 1
+            fi
+            ;;
+        *)
+            echo "Aborted (skipped fzf installation)."
+            return 1
+            ;;
+    esac
+}
+
+# Check if inside a git repository
+# Returns 0 if in a git repo, 1 if not
+require_git_repo() {
+    if git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
+        return 0
+    fi
+    print_error "Not inside a git repository."
+    return 1
+}
+
+# Get delta arguments based on theme setting
+# Uses GITBASH_THEME: auto (default), dark, or light
+_get_delta_args() {
+    local theme="${GITBASH_THEME:-auto}"
+    case "$theme" in
+        light)
+            echo "--light"
+            ;;
+        dark)
+            echo "--dark"
+            ;;
+        *)
+            # auto - let delta detect (no args needed, but we can add --light for lighter terminals)
+            echo ""
+            ;;
+    esac
+}
+
+# Get bat arguments based on theme setting
+_get_bat_args() {
+    local theme="${GITBASH_THEME:-auto}"
+    case "$theme" in
+        light)
+            echo "--theme=GitHub"
+            ;;
+        dark)
+            echo "--theme=Dracula"
+            ;;
+        *)
+            # auto - let bat detect
+            echo ""
+            ;;
+    esac
+}
+
+# Get the diff command to use (delta if installed, otherwise git diff)
+# Usage: get_diff_cmd
+# Returns the command name to use for diffs
+get_diff_cmd() {
+    if command -v delta >/dev/null 2>&1; then
+        local delta_args
+        delta_args=$(_get_delta_args)
+        if [[ -n "$delta_args" ]]; then
+            echo "delta $delta_args"
+        else
+            echo "delta"
+        fi
+    else
+        echo "git diff"
+    fi
+}
+
+# Show a diff using delta if available, otherwise git diff
+# Usage: show_diff [git diff args...]
+# Example: show_diff --cached
+# Example: show_diff HEAD~1
+show_diff() {
+    if command -v delta >/dev/null 2>&1; then
+        local delta_args
+        delta_args=$(_get_delta_args)
+        # shellcheck disable=SC2086
+        git diff "$@" | delta $delta_args
+    else
+        git diff "$@"
+    fi
+}

package/commands/branch.sh

@@ -107,31 +107,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
@@ -176,12 +152,24 @@ EOF
     # -----------------------------
     case "$selection" in
         "$create_option")
+            # Source create.sh if create function not available
+            if ! declare -f create >/dev/null 2>&1; then
+                source "$SOURCE_DIR/create.sh"
+            fi
             create
             ;;
         "$switch_option")
+            # Source switch.sh if switch function not available
+            if ! declare -f switch >/dev/null 2>&1; then
+                source "$SOURCE_DIR/switch.sh"
+            fi
             switch
             ;;
         "$update_option")
+            # Source update.sh if update function not available
+            if ! declare -f update >/dev/null 2>&1; then
+                source "$SOURCE_DIR/update.sh"
+            fi
             update
             ;;
         "$abort_label")

package/commands/cleanstash.sh

@@ -73,31 +73,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
@@ -126,7 +102,7 @@ EOF
               --preview='
                     sel=$(echo {} | grep -o "stash@{[0-9]\+}" || true);
                     if [[ -n "$sel" ]]; then
-                        git stash show -p "$sel";
+                        git stash show -p "$sel" | delta --light 2>/dev/null || git stash show -p "$sel";
                     else
                         echo "No preview";
                     fi

package/commands/cleanup.sh

@@ -12,6 +12,8 @@ cleanup() {
     # 0. Check for help/version flag and parse options
     # -----------------------------
     local json_mode=false
+    local dry_run=false
+    local days_threshold="${GITBASH_CLEANUP_DAYS:-7}"
     
     while [[ $# -gt 0 ]]; do
         case "$1" in
@@ -26,15 +28,17 @@ Usage: cleanup [OPTIONS]
 Find and delete local branches that are no longer needed.
 
 Options:
-  -h, --help    Show this help message
-  --json        Output branch data as JSON (non-interactive)
+  -h, --help       Show this help message
+  --json           Output branch data as JSON (non-interactive)
+  --dry-run        Show what would be deleted without actually deleting
+  --days=N         Override stale threshold (default: 7 days, configurable via GITBASH_CLEANUP_DAYS)
 
 Categories (pre-selected for deletion):
   - Merged branches: Local branches whose remote was merged and deleted
-  - Stale branches: Local branches with no commits in 7+ days
+  - Stale branches: Local branches with no commits in N+ days (default 7)
 
 Not pre-selected (but listed):
-  - Recent branches: Local branches with commits in the last 7 days
+  - Recent branches: Local branches with commits in the last N days
 
 Navigation:
   ↑/↓ or j/k    Navigate through branches
@@ -42,6 +46,9 @@ Navigation:
   Enter         Delete selected branch(es)
   ESC/Ctrl-C    Exit without action
 
+Configuration:
+  GITBASH_CLEANUP_DAYS - Set default days threshold (run 'gitbash --config')
+
 Notes:
   - Only deletes LOCAL branches (never touches remote)
   - If current branch is selected, switches to main/master first
@@ -55,6 +62,12 @@ Examples:
     [RECENT]  feature/work-in-progress   2 days ago
     ✖ Abort
 
+  $ cleanup --dry-run
+  # Shows what would be deleted without deleting
+
+  $ cleanup --days=14
+  # Use 14-day threshold for stale branches
+
   $ cleanup --json
   [{"last_change_timestamp":1733123456,"author_email":"dev@example.com",...}]
 
@@ -69,6 +82,18 @@ EOF
                 json_mode=true
                 shift
                 ;;
+            --dry-run)
+                dry_run=true
+                shift
+                ;;
+            --days=*)
+                days_threshold="${1#--days=}"
+                if ! [[ "$days_threshold" =~ ^[0-9]+$ ]] || [[ "$days_threshold" -lt 1 ]]; then
+                    print_error "Invalid days value: $days_threshold"
+                    return 1
+                fi
+                shift
+                ;;
             *)
                 echo "Unknown option: $1"
                 return 1
@@ -82,38 +107,20 @@ EOF
         if [[ "$json_mode" == true ]]; then
             echo "[]"
         else
-            echo "Not inside a git repository." >&2
+            print_error "Not inside a git repository."
         fi
         return 1
     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; }
-                    ;;
-                *)
-                    echo "Aborted (skipped fzf installation)."
-                    return 1
-                    ;;
-            esac
-        fi
+        require_fzf || return 1
     fi
-
     # -----------------------------
     # 2. Fetch and prune to sync with remote
     # -----------------------------
     if ! git fetch --prune origin 2>/dev/null; then
         if [[ "$json_mode" == false ]]; then
-            echo "⚠ Fetch failed; continuing with local data." >&2
+            print_warning "Fetch failed; continuing with local data." >&2
         fi
     fi
 
@@ -141,8 +148,8 @@ EOF
     # 4. Build branch lists
     # -----------------------------
     local abort_label="✖ Abort"
-    local one_week_ago
-    one_week_ago=$(date -v-7d +%s 2>/dev/null || date -d "7 days ago" +%s 2>/dev/null)
+    local threshold_ago
+    threshold_ago=$(date -v-"${days_threshold}d" +%s 2>/dev/null || date -d "${days_threshold} days ago" +%s 2>/dev/null)
 
     # Get list of remote branches (without origin/ prefix)
     local remote_branches
@@ -185,8 +192,8 @@ EOF
         if [[ "$has_remote" == false && -n "$configured_upstream" ]]; then
             # Had upstream but remote is gone = merged and deleted remotely
             merged_branches+=("$entry")
-        elif [[ -n "$last_commit_ts" && "$last_commit_ts" -lt "$one_week_ago" ]]; then
-            # Stale: no commits in 7+ days (pre-select for deletion)
+        elif [[ -n "$last_commit_ts" && "$last_commit_ts" -lt "$threshold_ago" ]]; then
+            # Stale: no commits in N+ days (pre-select for deletion)
             stale_branches+=("$entry")
         else
             # Recent: has recent activity (don't pre-select)
@@ -458,6 +465,16 @@ Found $total_count branches ($preselect_count pre-selected for deletion)" \
     fi
     echo ""
 
+    # Handle dry-run mode
+    if [[ "$dry_run" == true ]]; then
+        print_info "Dry run mode - no branches will be deleted"
+        echo "Would delete ${#branches_to_delete[@]} branch(es):"
+        for branch in "${branches_to_delete[@]}"; do
+            echo "  - $branch"
+        done
+        return 0
+    fi
+
     # Default to Y if only merged branches, otherwise N
     local confirm
     if [[ "$only_merged" == true ]]; then
@@ -482,20 +499,20 @@ Found $total_count branches ($preselect_count pre-selected for deletion)" \
 
     # Switch to base branch if needed
     if [[ "$need_switch" == true ]]; then
-        echo "Switching to '$base_branch'..."
+        print_info "Switching to '$base_branch'..."
         git checkout "$base_branch" || {
-            echo "⚠ Failed to switch to '$base_branch'. Aborting deletion."
+            print_warning "Failed to switch to '$base_branch'. Aborting deletion."
             return 1
         }
     fi
 
-    echo "Deleting branches..."
+    print_info "Deleting branches..."
     for branch in "${branches_to_delete[@]}"; do
         echo "Deleting $branch ..."
         if git branch -D "$branch" 2>/dev/null; then
-            echo "✓ Deleted $branch"
+            print_success "Deleted $branch"
         else
-            echo "✗ Failed to delete $branch"
+            print_error "Failed to delete $branch"
         fi
     done
 }