ruby-shell 2.10.1 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee2ef357d1196f43811ad6974313bbdb057f61cf90219146936f70a2ec6f16bb
-  data.tar.gz: 85540ca12677d88d6b2fb6999f17ce871b7c5142f20a0fa14e03685f82f41853
+  metadata.gz: 539ffa4c43d681abff9a260ef5f78e8762906cd5ca566ea0a9e85e39bb74318a
+  data.tar.gz: 80a8ee4bbfb0717c4c2ada364ff65f76364f01dfce3daba83a88f8e41e21eb85
 SHA512:
-  metadata.gz: f7a35b051b9d768cb2065e6308eecc030f3b153a31881b31e25813a377de06ea98b5e76f55233dbc0ae1ec30920091ee62817352f43fc5645c3a3d69db746c78
-  data.tar.gz: f8aeb41fa3870b02d96b111126c1770fb74e235a01847947937461c1a697195e3fc6152eb5a45a147c1703278e12a1b8dc5c279e1c1e4b51d81fbeb0672ed27f
+  metadata.gz: 7fd78712cdf62fe52827bf2d935c5d7e92d3fecb6a82d564f84b077ef3e9c35101e3e1a9856bfda653f3f8433d74fe539e8cbf172e9e91af7434af2ad429523c
+  data.tar.gz: b3075ef2fcb9553e9e8cc071560b0f659c2ad21a30aa8c7e2429c53cd02d458984c5e659865a1fe879a997bda9a431e222e21fb45bf2a7c58d2f543e7784650e

data/bin/rsh

@@ -8,7 +8,7 @@
 # Web_site:   http://isene.com/
 # Github:     https://github.com/isene/rsh
 # License:    Public domain
-@version    = "2.10.1" # Bug fix: Improved && operator logic for proper conditional execution
+@version    = "2.11.0" # Enhanced TAB completion with smart context-aware completion, frequency scoring, fuzzy matching, and more
 
 # MODULES, CLASSES AND EXTENSIONS
 class String # Add coloring to strings (with escaping for Readline)
@@ -102,6 +102,9 @@ begin # Initialization
   @gnick       = {}                       # Initiate generic/global alias/nick hash
   @history     = []                       # Initiate history array
   @exe = []
+  @exe_cache_time = 0                     # Cache timestamp for executables
+  @exe_cache_paths = ""                   # Cached PATH value
+  @cmd_frequency = {}                     # Track command usage frequency
   # Paths
   @user = Etc.getpwuid(Process.euid).name # For use in @prompt
   @path        = ENV["PATH"].split(":")   # Get paths
@@ -180,6 +183,12 @@ def firstrun
   @c_taboption = 244  # Color for unselected tabcompleted item
   @c_stamp     = 244  # Color for time stamp/command
 
+  # TAB COMPLETION SETTINGS
+  @completion_limit = 10              # Max completion items to show
+  @completion_case_sensitive = false  # Case-insensitive completion
+  @completion_show_descriptions = false # Show help text inline
+  @completion_fuzzy = true            # Enable fuzzy matching
+
   @nick = {"ls"=>"ls --color -F"}
 RSHRC
   File.write(Dir.home+'/.rshrc', rc)
@@ -279,6 +288,7 @@ def getstr # A custom Readline-like function
       @c.col(c_col.modulo(@maxcol))
     end
     chr = getchr
+    puts "DEBUG: Got char: '#{chr}' (length: #{chr.length})" if ENV['RSH_DEBUG']
     case chr
     when 'C-G', 'C-C'
       @history[0] = "" 
@@ -401,6 +411,10 @@ def getstr # A custom Readline-like function
       @pos = 0
       lift = true
     when 'TAB'   # Tab completion of dirs and files
+      puts "\n=== TAB KEY DETECTED ===" if ENV['RSH_DEBUG']
+      puts "Current line: '#{@history[0]}'" if ENV['RSH_DEBUG']
+      puts "Cursor pos: #{@pos}" if ENV['RSH_DEBUG']
+      puts "======================" if ENV['RSH_DEBUG']
       @ci = nil
       #@tabsearch =~ /^-/ ? tabbing("switch") : tabbing("all")
       tab("all")
@@ -426,15 +440,59 @@ def tab(type)
   i = 0
   chr = ""
   @tabarray = []
+
   @pretab   = @history[0][0...@pos].to_s        # Extract the current line up to cursor
   @postab   = @history[0][@pos..].to_s          # Extract the current line from cursor to end
   @c_row, @c_col = @c.pos                       # Get cursor position
   @row0     = @c_row                            # Save original row
-  @tabstr   = @pretab.split(/[|, ]/).last.to_s  # Get the sustring that is being tab completed
-  @tabstr   = "" if @pretab[-1] =~ /[ |]/       # Tab from nothing if tabbing starts with space or pipe
-  @tabstr   = @pretab if type == "hist"         # Searching for matches with whole string in history
-  @pretab   = @pretab.delete_suffix(@tabstr)
-  type = "switch" if @tabstr[0] == "-"
+  # Special handling for environment variables first
+  if @pretab =~ /\$\w*$/
+    @tabstr = @pretab.match(/\$\w*$/)[0]
+    @pretab = @pretab.sub(/\$\w*$/, '')
+  else
+    @tabstr   = @pretab.split(/[|;&, ]/).last.to_s  # Get the sustring that is being tab completed
+    @tabstr   = "" if @pretab[-1] =~ /[ |;&]/       # Tab from nothing if tabbing starts with space, pipe, etc.
+    @tabstr   = @pretab if type == "hist"         # Searching for matches with whole string in history
+    @pretab   = @pretab.delete_suffix(@tabstr)
+  end
+  type = "switch" if @tabstr && @tabstr[0] == "-"
+  type = "env_vars" if @tabstr && @tabstr[0] == "$"
+
+  # Debug output when RSH_DEBUG is set
+  if ENV['RSH_DEBUG']
+    puts "\n=== TAB DEBUG ==="
+    puts "Input type: #{type}"
+    puts "@pretab: '#{@pretab}'"
+    puts "@tabstr: '#{@tabstr}'"
+    puts "Length: #{@tabstr.length}"
+    puts "First char: '#{@tabstr[0] if @tabstr}'"
+    puts "=================="
+  end
+
+  # Smart context-aware completion
+  unless type == "switch" || type == "hist"
+    if @pretab && !@pretab.empty?
+      cmd_parts = @pretab.strip.split(/[|;&]/).last.strip.split
+      last_cmd = cmd_parts.first if cmd_parts.any?
+    else
+      cmd_parts = []
+      last_cmd = nil
+    end
+
+    case last_cmd
+    when "cd", "pushd", "rmdir"
+      type = "dirs_only"
+    when "vim", "nano", "cat", "less", "more", "head", "tail", "file"
+      type = "files_only"
+    when "git"
+      type = "git_subcommands" if cmd_parts.length == 1
+    when "man", "info", "which", "whatis"
+      type = "commands_only"
+    when "export", "unset"
+      type = "env_vars"
+    end
+  end
+
   while chr != "ENTER"
     case type
     when "hist"         # Handle history completions ('UP' key)
@@ -448,26 +506,103 @@ def tab(type)
       hlp = hlp.map{|h| h.sub(/^\s*/, '').sub(/^--/, '    --')}
       hlp = hlp.reject{|h| /-</ =~ h}
       @tabarray = hlp
+    when "dirs_only"    # Only show directories
+      fdir = @tabstr + "*"
+      dirs = Dir.glob(fdir).select { |d| Dir.exist?(d) }.map { |d| d + "/" }
+      @tabarray = dirs
+    when "files_only"   # Only show files, not directories
+      fdir = @tabstr + "*"
+      files = Dir.glob(fdir).reject { |f| Dir.exist?(f) }
+      @tabarray = files
+    when "commands_only" # Only show executable commands
+      ex = @exe.dup
+      ex.prepend(*@nick.keys, *@gnick.keys)
+      regex_flags = @completion_case_sensitive ? 0 : Regexp::IGNORECASE
+      @tabarray = ex.select { |s| s =~ Regexp.new(@tabstr, regex_flags) }
+    when "git_subcommands" # Git subcommands
+      git_cmds = %w[add branch checkout clone commit diff fetch init log merge pull push rebase reset status tag]
+      regex_flags = @completion_case_sensitive ? 0 : Regexp::IGNORECASE
+      @tabarray = git_cmds.select { |cmd| cmd =~ Regexp.new(@tabstr, regex_flags) }
+    when "env_vars"     # Environment variables
+      env_vars = ENV.keys.map { |k| "$#{k}" }
+      regex_flags = @completion_case_sensitive ? 0 : Regexp::IGNORECASE
+      @tabarray = env_vars.select { |var| var =~ Regexp.new(@tabstr, regex_flags) }
     when "all"          # Handle all other tab completions
       ex  = []
       ex += @exe
       ex.sort!
       ex.prepend(*@nick.keys)        # Add nicks
       ex.prepend(*@gnick.keys)       # Add gnicks
-      compl      = ex.select {|s| s =~ Regexp.new(@tabstr)} # Select only that which matches so far
-      fdir       = @tabstr + "*"
-      compl.prepend(*Dir.glob(fdir)).map! do |e| 
-        if e =~ /(?<!\\) / 
-          e = e.sub(/(.*\/|^)(.*)/, '\1\'\2\'') unless  e =~ /'/
+
+      # Enhanced matching with case sensitivity and fuzzy support
+      regex_flags = @completion_case_sensitive ? 0 : Regexp::IGNORECASE
+
+      # Try multiple matching strategies
+      compl = []
+
+      # First try exact prefix matching
+      compl = ex.select { |s| s =~ Regexp.new("^#{@tabstr}", regex_flags) }
+
+      # If no results and fuzzy enabled, try fuzzy matching
+      if compl.empty? && @completion_fuzzy && @tabstr.length > 1
+        # Fuzzy matching: match from start with characters in order
+        fuzzy_pattern = "^#{@tabstr.chars.join('.*')}"
+        compl = ex.select { |s| s =~ Regexp.new(fuzzy_pattern, regex_flags) }
+      end
+
+      # If still no results, try substring matching
+      if compl.empty?
+        compl = ex.select { |s| s =~ Regexp.new(@tabstr, regex_flags) }
+      end
+
+      # Sort by frequency (most used first), then alphabetically
+      compl.sort! do |a, b|
+        freq_a = @cmd_frequency[a] || 0
+        freq_b = @cmd_frequency[b] || 0
+        if freq_a == freq_b
+          a <=> b
+        else
+          freq_b <=> freq_a
+        end
+      end
+
+      # File completion with hidden file handling
+      fdir = @tabstr + "*"
+      files = Dir.glob(fdir)
+
+      # Only show hidden files if tabstr starts with .
+      unless @tabstr.start_with?('.')
+        files.reject! { |f| File.basename(f).start_with?('.') }
+      end
+
+      files.map! do |e|
+        if e =~ /(?<!\\) /
+          e = e.sub(/(.*\/|^)(.*)/, '\1\'\2\'') unless e =~ /'/
         end
         Dir.exist?(e) ? e + "/" : e   # Add matching dirs
       end
-      @tabarray = compl               # Finally put it into @tabarray
+
+      # Separate directories and files for better ordering
+      dirs = files.select { |f| f.end_with?('/') }
+      files_only = files.reject { |f| f.end_with?('/') }
+
+      # Order: directories first, then files, then commands
+      @tabarray = dirs + files_only + compl
+
+      # Debug completion results
+      if ENV['RSH_DEBUG']
+        puts "=== COMPLETION RESULTS ==="
+        puts "Type: #{type}"
+        puts "Total matches: #{@tabarray.length}"
+        puts "First 5: #{@tabarray.first(5).inspect}"
+        puts "=========================="
+      end
     end
     return if @tabarray.empty?
     @tabarray.delete("")                                      # Don't remember why
     @c.clear_screen_down                                      # Here we go
-    @tabarray.length.to_i - i < 5 ? l = @tabarray.length.to_i - i : l = 5 # Max 5 rows of completion items
+    max_items = @completion_limit || 5
+    @tabarray.length.to_i - i < max_items ? l = @tabarray.length.to_i - i : l = max_items
     l.times do |x|                                            # Iterate through
       if x == 0                                               # First item goes onto the commandline
         @c.clear_line                                         # Clear the line
@@ -485,16 +620,28 @@ def tab(type)
         nextline                                              # Then start showing the completion items
         tabline  = @tabarray[i]                               # Get the next matching tabline
         # Can't nest ANSI codes, they must each complete/conclude or they will mess eachother up
-        tabline1 = tabline.sub(/(.*?)#{@tabstr}.*/, '\1').c(@c_tabselect) # Color the part before the @tabstr
-        tabline2 = tabline.sub(/.*?#{@tabstr}(.*)/, '\1').c(@c_tabselect) # Color the part after the @tabstr
-        print " " + tabline1 + @tabstr.c(@c_tabselect).u + tabline2       # Color & underline @tabstr
+        if tabline.include?(@tabstr)
+          tabline1 = tabline.sub(/(.*?)#{@tabstr}.*/, '\1').c(@c_tabselect) # Color the part before the @tabstr
+          tabline2 = tabline.sub(/.*?#{@tabstr}(.*)/, '\1').c(@c_tabselect) # Color the part after the @tabstr
+          print " " + tabline1 + @tabstr.c(@c_tabselect).u + tabline2       # Color & underline @tabstr
+        else
+          # For fuzzy matches, just show the whole word highlighted
+          print " " + tabline.c(@c_tabselect)
+        end
       else
         begin
           tabline = @tabarray[i+x]    # Next tabline, and next, etc (usually 4 times here)
-          tabline1 = tabline.sub(/(.*?)#{@tabstr}.*/, '\1').c(@c_taboption) # Color before @tabstr
-          tabline2 = tabline.sub(/.*?#{@tabstr}(.*)/, '\1').c(@c_taboption) # Color after @tabstr
-          print " " + tabline1 + @tabstr.c(@c_taboption).u + tabline2       # Print the whole line
-        rescue
+          if tabline.include?(@tabstr)
+            tabline1 = tabline.sub(/(.*?)#{@tabstr}.*/, '\1').c(@c_taboption) # Color before @tabstr
+            tabline2 = tabline.sub(/.*?#{@tabstr}(.*)/, '\1').c(@c_taboption) # Color after @tabstr
+            print " " + tabline1 + @tabstr.c(@c_taboption).u + tabline2       # Print the whole line
+          else
+            # For fuzzy matches, just show the whole word
+            print " " + tabline.c(@c_taboption)
+          end
+        rescue => e
+          # Log completion errors if debugging enabled
+          File.write("/tmp/rsh_completion.log", "#{Time.now}: Completion error - #{e}\n", mode: 'a') if ENV['RSH_DEBUG']
         end
       end
       nextline      # To not run off screen
@@ -605,6 +752,8 @@ def rshrc # Write updates to .rshrc
   conf += "@nick = #{@nick}\n"
   conf.sub!(/^@gnick.*\n/, "")
   conf += "@gnick = #{@gnick}\n"
+  conf.sub!(/^@cmd_frequency.*\n/, "")
+  conf += "@cmd_frequency = #{@cmd_frequency}\n"
   conf.sub!(/^@history.*\n/, "")
   # Ensure history is properly formatted as valid Ruby array
   begin
@@ -1139,6 +1288,7 @@ def load_rshrc_safe
     @history = [] unless @history.is_a?(Array)
     @nick = {} unless @nick.is_a?(Hash)
     @gnick = {} unless @gnick.is_a?(Hash)
+    @cmd_frequency = {} unless @cmd_frequency.is_a?(Hash)
 
   rescue SyntaxError => e
     puts "\n\033[31mERROR: Syntax error in .rshrc:\033[0m"
@@ -1195,8 +1345,8 @@ def auto_heal_rshrc
     end
 
     # Fix unclosed arrays
-    ['@history', '@nick', '@gnick'].each do |var|
-      if content =~ /^#{var}\s*=\s*[[{](?!.*[}\]]\s*$)/m
+    ['@history', '@nick', '@gnick', '@cmd_frequency'].each do |var|
+      if content =~ /^#{var}\s*=\s*[\[{](?!.*[}\]]\s*$)/m
         content.sub!(/^(#{var}\s*=\s*)(\[.*?)$/m) { "#{$1}#{$2}]" }
         content.sub!(/^(#{var}\s*=\s*)({.*?)$/m) { "#{$1}#{$2}}" }
         healed = true
@@ -1247,9 +1397,36 @@ def load_defaults
   @history ||= []
   @nick ||= {"ls" => "ls --color -F"}
   @gnick ||= {}
+  @completion_limit ||= 10
+  @completion_case_sensitive ||= false
+  @completion_show_descriptions ||= false
+  @completion_fuzzy ||= true
+  @cmd_frequency ||= {}
   puts "Loaded with default configuration."
 end
 
+def cache_executables
+  current_path = ENV["PATH"]
+  current_time = Time.now.to_i
+
+  # Only rebuild cache if PATH changed or cache is older than 60 seconds
+  return if @exe_cache_paths == current_path && (current_time - @exe_cache_time) < 60
+
+  @exe = []
+  @path = current_path.split(":")
+  @path.map! {|p| p + "/*"}
+
+  @path.each do |p|
+    Dir.glob(p).each do |c|
+      @exe.append(File.basename(c)) if File.executable?(c) and not Dir.exist?(c)
+    end
+  end
+
+  @exe.uniq!
+  @exe_cache_time = current_time
+  @exe_cache_paths = current_path
+end
+
 begin # Load .rshrc and populate @history
   trap "SIGINT" do end
   trap "SIGHUP" do
@@ -1309,12 +1486,7 @@ loop do
     @prompt.gsub!(/#{Dir.home}/, '~') # Simplify path in prompt
     system("printf \"\033]0;rsh: #{Dir.pwd}\007\"")   # Set Window title to path 
     @history[0] = "" unless @history[0]
-    @exe = []
-    @path.each do |p| # Add all executables in @path
-      Dir.glob(p).each do |c|
-        @exe.append(File.basename(c)) if File.executable?(c) and not Dir.exist?(c)
-      end
-    end
+    cache_executables  # Use cached executable lookup
     getstr # Main work is here
     @cmd = @history[0]
     @dirs.unshift(Dir.pwd)
@@ -1434,6 +1606,13 @@ loop do
           else 
             begin
               pre_cmd
+
+              # Track command frequency for intelligent completion
+              if @cmd && !@cmd.empty?
+                cmd_base = @cmd.split.first
+                @cmd_frequency[cmd_base] = (@cmd_frequency[cmd_base] || 0) + 1 if cmd_base
+              end
+
               # Handle background jobs
               if @cmd.end_with?(' &')
                 @cmd = @cmd[0..-3]  # Remove the &

metadata

@@ -1,21 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: ruby-shell
 version: !ruby/object:Gem::Version
-  version: 2.10.1
+  version: 2.11.0
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-22 00:00:00.000000000 Z
+date: 2025-09-23 00:00:00.000000000 Z
 dependencies: []
 description: 'A shell written in Ruby with extensive tab completions, aliases/nicks,
   history, syntax highlighting, theming, auto-cd, auto-opening files and more. UPDATE
-  v2.10.0: Auto-healing for corrupted .rshrc files and robust error handling. v2.9.0:
-  AI integration! Use @ for AI text responses and @@ for AI command suggestions. Works
-  with local Ollama or external providers like OpenAI. v2.8.0: Enhanced help system,
-  :info command, and easier nick management.'
+  v2.11.0: Major TAB completion overhaul! Smart context-aware completion (cd shows
+  only dirs, vim shows only files), frequency-based command scoring, fuzzy matching
+  with fallback, configurable completion options, performance optimizations with executable
+  caching, environment variable completion, better error handling, and much more.
+  A significant improvement to daily shell usage!'
 email: g@isene.com
 executables:
 - rsh