Improve shell suggestions.

Author: simi

crates/rb-cli/src/commands/shell_integration.rs

@@ -70,17 +70,35 @@ _rb_completion() {{
     completions=$(rb __bash_complete "${{COMP_LINE}}" "${{COMP_POINT}}" 2>/dev/null)
 
     if [ -n "$completions" ]; then
-        # Only use nospace when actively navigating through a directory path
-        # (i.e., when current word ends with /)
-        if [[ "$cur" =~ /$ ]]; then
+        # Check if all completions are directories (end with /)
+        # If so, don't add space to allow continued navigation
+        local all_dirs=true
+        while IFS= read -r line; do
+            if [[ ! "$line" =~ /$ ]]; then
+                all_dirs=false
+                break
+            fi
+        done <<< "$completions"
+        
+        if [ "$all_dirs" = true ]; then
             compopt -o nospace
         fi
 
         COMPREPLY=($(compgen -W "$completions" -- "$cur"))
     else
-        # No rb completions, fall back to default bash completion (files/dirs)
-        compopt -o default
-        COMPREPLY=()
+        # No rb completions - check if we're completing a directory-only flag
+        # For -C, -R, -G: don't fall back to default (which would show files)
+        case "$prev" in
+            -C|--work-dir|-R|--rubies-dir|-G|--gem-home)
+                # Return empty completions (no files for directory flags)
+                COMPREPLY=()
+                ;;
+            *)
+                # Fall back to default bash completion for other cases
+                compopt -o default
+                COMPREPLY=()
+                ;;
+        esac
     fi
 }}
 

spec/behaviour/bash_completion_nospace_integration_spec.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+# ShellSpec tests for bash completion nospace integration
+# Tests that the bash completion function logic is correct
+
+Describe "Ruby Butler Bash Completion Nospace Integration"
+  Include spec/support/helpers.sh
+
+  Describe "compopt nospace behavior with directory completions"
+    It "single directory completion does not add space (allows subdirectory navigation)"
+      When run rb __bash_complete "rb -C sp" 9
+      The status should equal 0
+      The output should equal "spec/"
+      The lines of output should equal 1
+      # Even with count=1, if it's a directory, nospace is applied
+    End
+
+    It "multiple directory completions do not add space"
+      When run rb __bash_complete "rb -C spec/" 13
+      The status should equal 0
+      The line 1 of output should end with "/"
+      The line 2 of output should end with "/"
+      The line 3 of output should end with "/"
+      # Multiple directories, nospace is applied
+    End
+  End
+
+  Describe "completion script logic validation"
+    It "generated script contains all_dirs flag"
+      When run rb shell-integration bash
+      The output should include "local all_dirs=true"
+    End
+
+    It "generated script applies nospace when all completions are directories"
+      When run rb shell-integration bash
+      # shellcheck disable=SC2016
+      The output should include 'if [ "$all_dirs" = true ]; then'
+      The output should include "compopt -o nospace"
+    End
+  End
+End

spec/behaviour/bash_completion_spec.sh

@@ -312,11 +312,11 @@ EOF
         The output should include "COMPREPLY=(\$(compgen -W \"\$completions\" -- \"\$cur\"))"
       End
 
-      It "includes fallback to default bash completion"
+      It "includes fallback to default bash completion for non-directory flags"
         When run rb shell-integration bash
         The status should equal 0
         The output should include "compopt -o default"
-        The output should include "# No rb completions, fall back to default bash completion"
+        The output should include "# No rb completions - check if we're completing a directory-only flag"
       End
     End
   End