gitbash 0.2.6 → 1.1.0

package/README.md

@@ -7,7 +7,7 @@ Interactive git utilities for bash with fzf-powered menus.
 ### Via npm
 
 ```bash
-npm i -g gitbash
+npm i -g gitbash && gitbash --config
 ```
 
 ### Options

package/bin/gitbash

@@ -19,6 +19,7 @@ configure_gitbash() {
     local current_merge="${GITBASH_MERGE_COMMAND:-fork}"
 
     echo "Configure gitbash (writes to $CONFIG_FILE)"
+    echo
 
     local input prefix merge_cmd
 
@@ -36,7 +37,159 @@ GITBASH_FEATURE_BRANCH_PREFIX="$prefix"
 GITBASH_MERGE_COMMAND="$merge_cmd"
 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=""
+    local shell_files=("$HOME/.zshrc" "$HOME/.bashrc" "$HOME/.bash_profile")
+    
+    # Find the first existing shell rc file
+    for file in "${shell_files[@]}"; do
+        if [[ -f "$file" ]]; then
+            shell_rc="$file"
+            break
+        fi
+    done
+
+    if [[ -z "$shell_rc" ]]; then
+        echo
+        echo "No shell config file found (.zshrc, .bashrc, .bash_profile)"
+        return 0
+    fi
+
+    # Check if gitbash integration already exists
+    local has_init=false
+    local has_alias=false
+
+    if grep -q 'eval.*gitbash --init' "$shell_rc" 2>/dev/null; then
+        has_init=true
+    fi
+
+    if grep -q 'alias.*gitbash' "$shell_rc" 2>/dev/null; then
+        has_alias=true
+    fi
+
+    # If neither init nor alias found, offer to add
+    if [[ "$has_init" == false && "$has_alias" == false ]]; then
+        echo
+        echo "Shell integration not found in $shell_rc"
+        local add_init
+        read -e -p "Add 'eval \"\$(gitbash --init)\"' to $shell_rc? (Y/n): " add_init
+        case "$add_init" in
+            [nN][oO]|[nN])
+                echo "Skipped shell integration."
+                ;;
+            *)
+                echo >> "$shell_rc"
+                echo '# gitbash shell integration' >> "$shell_rc"
+                echo 'eval "$(gitbash --init)"' >> "$shell_rc"
+                echo
+                echo "Added to $shell_rc"
+                echo "Run 'source $shell_rc' or restart your shell to activate."
+                ;;
+        esac
+    else
+        echo
+        echo "Shell integration already configured in $shell_rc"
+    fi
 }
 
 # Resolve symlinks to get the actual script location

package/commands/_utils.sh

@@ -32,3 +32,26 @@ prompt_read_edit() {
         read -e -rp "$prompt" "$varname"
     fi
 }
+
+# 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
+        echo "delta --light"
+    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
+        git diff "$@" | delta --light
+    else
+        git diff "$@"
+    fi
+}

package/commands/branch.sh

@@ -176,12 +176,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

@@ -126,7 +126,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

@@ -111,9 +111,6 @@ EOF
     # -----------------------------
     # 2. Fetch and prune to sync with remote
     # -----------------------------
-    if [[ "$json_mode" == false ]]; then
-        echo "Fetching and pruning remote..."
-    fi
     if ! git fetch --prune origin 2>/dev/null; then
         if [[ "$json_mode" == false ]]; then
             echo "⚠ Fetch failed; continuing with local data." >&2

package/commands/commit.sh

@@ -86,8 +86,11 @@ EOF
     esac
   done
 
-  # Join message parts with spaces
-  local msg="${msg_parts[*]}"
+  # Join message parts with spaces (handle empty array for set -u)
+  local msg=""
+  if [[ ${#msg_parts[@]} -gt 0 ]]; then
+    msg="${msg_parts[*]}"
+  fi
 
   # If no commit message was provided...
   if [ -z "$msg" ]; then

package/commands/commits.sh

@@ -139,7 +139,7 @@ Showing last $count commits" \
                 echo "";
                 echo "─────────────────────────────────────────────────────";
                 echo "";
-                git show --color=always "$hash" 2>/dev/null | head -100;
+                git show --color=always "$hash" 2>/dev/null | head -100 | delta --light 2>/dev/null || git show --color=always "$hash" 2>/dev/null | head -100;
             fi
         ' \
         --preview-window=right:50% \

package/commands/stashes.sh

@@ -175,12 +175,24 @@ EOF
     # -----------------------------
     case "$selection" in
         "$stash_option")
+            # Source stash.sh if stash function not available
+            if ! declare -f stash >/dev/null 2>&1; then
+                source "$SOURCE_DIR/stash.sh"
+            fi
             stash
             ;;
         "$unstash_option")
+            # Source unstash.sh if unstash function not available
+            if ! declare -f unstash >/dev/null 2>&1; then
+                source "$SOURCE_DIR/unstash.sh"
+            fi
             unstash
             ;;
         "$cleanup_option")
+            # Source cleanstash.sh if cleanstash function not available
+            if ! declare -f cleanstash >/dev/null 2>&1; then
+                source "$SOURCE_DIR/cleanstash.sh"
+            fi
             cleanstash
             ;;
         "$abort_label")

package/commands/status.sh

@@ -156,23 +156,23 @@ EOF
             # Untracked file - show contents
             echo "=== UNTRACKED FILE ===";
             echo;
-            bat --color=always --style=numbers "$file" 2>/dev/null || cat "$file" 2>/dev/null || echo "Cannot preview file";
+            bat --color=always --style=numbers --theme=\"GitHub\" "$file" 2>/dev/null || cat "$file" 2>/dev/null || echo "Cannot preview file";
           elif [[ "$file_status" =~ ^[MAC] ]]; then
             # Staged file - show cached diff
             echo "=== STAGED CHANGES ===";
             echo;
-            git diff --cached --color=always "$file" 2>/dev/null | delta 2>/dev/null || git diff --cached --color=always "$file" 2>/dev/null;
+            git diff --cached --color=always "$file" 2>/dev/null | delta --light 2>/dev/null || git diff --cached --color=always "$file" 2>/dev/null;
             if git diff --color=always "$file" 2>/dev/null | grep -q .; then
               echo;
               echo "=== UNSTAGED CHANGES ===";
               echo;
-              git diff --color=always "$file" 2>/dev/null | delta 2>/dev/null || git diff --color=always "$file" 2>/dev/null;
+              git diff --color=always "$file" 2>/dev/null | delta --light 2>/dev/null || git diff --color=always "$file" 2>/dev/null;
             fi
           else
             # Unstaged changes
             echo "=== UNSTAGED CHANGES ===";
             echo;
-            git diff --color=always "$file" 2>/dev/null | delta 2>/dev/null || git diff --color=always "$file" 2>/dev/null;
+            git diff --color=always "$file" 2>/dev/null | delta --light 2>/dev/null || git diff --color=always "$file" 2>/dev/null;
           fi
         ' \
         --preview-window=right:60% \
@@ -326,6 +326,10 @@ EOF
           echo "Continuing..."
           ;;
         *)
+          # Source commit.sh if commit function not available
+          if ! declare -f commit >/dev/null 2>&1; then
+            source "$SOURCE_DIR/commit.sh"
+          fi
           # Use the commit function with staged and push flags
           commit -s -p
           break

package/commands/unstash.sh

@@ -129,7 +129,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/package.json

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