ruby-shell 2.11.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea3ed53a591708e2637c362c1286a489f75a6cc549d8d057b3b2352594225142
-  data.tar.gz: 3fa6fbf94b9cea324a7b2f48ecd42858f44055bdd014b3604424b26551f3ba9e
+  metadata.gz: 121b91f0e19b4e13cd6cacf00094552851ea44bf376c4e1f0e6554c83ee99a34
+  data.tar.gz: e63b51b9f7742b87b4bbc96ee41da6ba12ef93df0631b4ac564548b87f6d0a33
 SHA512:
-  metadata.gz: 677514dfac4853286598fcf60e0b8332ef89540b01aba2ec1b133b9352348c6a757cce46228d42f86073481c0663e2374c5d7ede28b7f8116b8b977fa141ca70
-  data.tar.gz: f94f381747aff0afd4ef8adca14b8e589a9929806c332a159c25c0a5772aac9ccb6bf1969c3f8ebda502fdeb782574ebb60eb8e8d92ecb9cac9219f30fa565e5
+  metadata.gz: bc4fb4e0cc354ff353532a01f334ba85e23725cc5757328118ea85c0b25f46c814f12e9e63dfcf2ca83ef48f3c015696ffd9b8c6661b94398295a67c0be285dc
+  data.tar.gz: 1790d5590bcdec77d461dd491fc34fb915324e78eea7d385bbdd35e2f71f86eaa9ab3995fcbd3855c640dad029530baa7615994318fb9a42718aa7246ea938a9

data/README.md

@@ -33,7 +33,18 @@ Or simply `gem install ruby-shell`.
 * All colors are themeable in .rshrc (see github link for possibilities)
 * Copy current command line to primary selection (paste w/middle button) with `Ctrl-y`
 
-## NEW in v2.9.0 - AI Integration ⭐
+## NEW in v3.0.0 - Major Feature Release ⭐⭐⭐
+* **Persistent Ruby Functions**: defun functions now save to .rshrc and persist across sessions
+* **Smart Command Suggestions**: Typo detection with "Did you mean...?" suggestions using Levenshtein distance
+* **Command Analytics**: New `:stats` command shows usage statistics, performance metrics, and most-used commands
+* **Switch Completion Caching**: Command switches from --help are cached for instant completion
+* **Enhanced Bookmarks**: Bookmark directories with tags - `:bookmark name path #tag1,tag2`
+* **Session Management**: Save and restore entire shell sessions with `:save_session` and `:load_session`
+* **Syntax Validation**: Pre-execution warnings for common mistakes, dangerous commands, and typos
+* **Option Value Completion**: TAB completion for option values like `--format=<TAB>` → json, yaml, xml
+* **Command Performance Tracking**: Automatically tracks execution time and shows slowest commands
+
+## AI Integration (v2.9.0) ⭐
 * **AI-powered command assistance**: Get help with commands using natural language
 * **`@ <question>`**: Ask questions and get AI-generated text responses
 * **`@@ <request>`**: Describe what you want to do, and AI suggests the command
@@ -73,13 +84,18 @@ Special functions/integrations:
 Special commands:
 * `:nick 'll = ls -l'` to make a command alias (ll) point to a command (ls -l)
 * `:gnick 'h = /home/me'` to make a general alias (h) point to something (/home/me)
-* `:nickdel 'name'` to delete a command nick (or use `:nick '-name'`)
-* `:gnickdel 'name'` to delete a general nick (or use `:gnick '-name'`)
-* `:nick?` will list all command nicks and general nicks (you can edit your nicks in .rshrc)
+* `:nick` lists all command nicks, `:gnick` lists general nicks (NEW in v3.0)
+* `:nick '-name'` delete a command nick, `:gnick '-name'` delete a general nick (NEW in v3.0)
 * `:history` will list the command history, while `:rmhistory` will delete the history
 * `:jobs` will list background jobs, `:fg [job_id]` brings jobs to foreground, `:bg [job_id]` resumes stopped jobs
-* `:defun 'func(args) = code'` defines Ruby functions callable as shell commands
+* `:defun 'func(args) = code'` defines Ruby functions callable as shell commands (now persistent!)
 * `:defun?` lists all user-defined functions, `:defun '-func'` removes functions
+* `:stats` shows command execution statistics and analytics (NEW in v3.0)
+* `:bm "name"` or `:bookmark "name"` bookmark current directory, `:bm "name path #tags"` with tags (NEW in v3.0)
+* `:bm` lists all bookmarks, just type bookmark name to jump (e.g., `work`) (NEW in v3.0)
+* `:bm "-name"` delete bookmark, `:bm "?tag"` search by tag (NEW in v3.0)
+* `:save_session` saves current shell session (pwd, history, bookmarks, defuns) (NEW in v3.0)
+* `:load_session` restores previously saved session (NEW in v3.0)
 * `:info` shows introduction and feature overview
 * `:version` Shows the rsh version number and the last published gem file version
 * `:help` will display a compact command reference in two columns
@@ -185,7 +201,7 @@ Enter the command `f` to launch the fuzzy finder - select the directory/file you
 If you start a line with "=", the rest of the line will be interpreted as an XRPN program. This gives you the full power of XRPN right at your fingertips. You can do simple stuff like this: `=13,23,*,x^2` and the answer to `(13 * 23)^2` will be given (89401) in the format that you have set in your `.xrpn/conf`. Or you can do more elaborate stuff like `=fix 6,5,sto c,time,'Time now is: ',atime,aview,pse,fix 0,lbl a,rcl c,prx,dse c,gto a`. Go crazy. Use single-quotes for any Alpha entry.
 
 ## Syntax highlighting
-rsh will highlight nicks, gnicks, commands and dirs/files as they are written on the command line.
+rsh will highlight nicks, gnicks, bookmarks, commands, switches and dirs/files as they are written on the command line. Each element type has its own color (customizable in .rshrc).
 
 ## Theming
 In the supplied `.rshrc`, you will find a set of colors that you can change:
@@ -197,6 +213,8 @@ Variable        | Description
 `@c_nick`       | Color for matching nick
 `@c_gnick`      | Color for matching gnick
 `@c_path`       | Color for valid path
+`@c_switch`     | Color for command switches/options
+`@c_bookmark`   | Color for bookmarks (NEW in v3.0)
 `@c_tabselect`  | Color for selected tabcompleted item
 `@c_taboption`  | Color for unselected tabcompleted item
 `@c_stamp`      | Color for time stamp/command

data/bin/rsh

@@ -8,7 +8,7 @@
 # Web_site:   http://isene.com/
 # Github:     https://github.com/isene/rsh
 # License:    Public domain
-@version    = "2.11.0" # Enhanced TAB completion with smart context-aware completion, frequency scoring, fuzzy matching, and more
+@version    = "3.0.0" # Major release: Persistent defuns, switch caching, smart suggestions, analytics, tooltips, bookmarks, validation, sessions
 
 # MODULES, CLASSES AND EXTENSIONS
 class String # Add coloring to strings (with escaping for Readline)
@@ -92,6 +92,7 @@ begin # Initialization
   @c_gnick     = 14                       # Color for matching gnick
   @c_path      = 3                        # Color for valid path
   @c_switch    = 6                        # Color for switches/options
+  @c_bookmark  = 13                       # Color for bookmarks
   @c_tabselect = 5                        # Color for selected tabcompleted item
   @c_taboption = 244                      # Color for unselected tabcompleted item
   @c_stamp     = 244                      # Color for time stamp/command
@@ -119,6 +120,25 @@ begin # Initialization
   @job_id      = 0                        # Job counter
   @ai_suggestion = nil                    # Store AI command suggestion
   @last_exit   = 0                        # Last command exit status
+  # Command completions for subcommands
+  @cmd_completions = {
+    "git" => %w[add bisect branch checkout clone commit diff fetch grep init log merge mv pull push rebase reset restore rm show stash status switch tag],
+    "apt" => %w[install remove update upgrade search show list autoremove purge],
+    "apt-get" => %w[install remove update upgrade dist-upgrade autoremove purge clean autoclean],
+    "docker" => %w[build run ps images pull push start stop restart rm rmi exec logs inspect network volume],
+    "systemctl" => %w[start stop restart reload status enable disable is-active is-enabled list-units],
+    "cargo" => %w[build run test check clean doc new init add search publish install update],
+    "npm" => %w[install uninstall update run build test start init publish],
+    "gem" => %w[install uninstall update list search build push],
+    "bundle" => %w[install update exec check config]
+  }
+  # New v3.0 features initialization
+  @switch_cache = {}                      # Cache for command switches from --help
+  @switch_cache_time = {}                 # Timestamp for cache expiry
+  @bookmarks = {}                         # Enhanced bookmarks with tags
+  @defuns = {}                            # Store defun definitions for persistence
+  @cmd_stats = {}                         # Command execution statistics
+  @session_file = Dir.home + '/.rsh_session' # Session save file
   def pre_cmd; end                        # User-defined function to be run BEFORE command execution
   def post_cmd; end                       # User-defined function to be run AFTER  command execution
 end
@@ -126,31 +146,37 @@ end
 # HELP TEXT
 @info = <<~INFO
 
-  Hello #{@user}, welcome to rsh - the Ruby SHell. 
-  
-  rsh does not attempt to compete with the grand old shells like bash and zsh. 
-  It serves the specific needs and wants of its author. If you like it, then feel free 
+  Hello #{@user}, welcome to rsh v3.0 - the Ruby SHell.
+
+  rsh does not attempt to compete with the grand old shells like bash and zsh.
+  It serves the specific needs and wants of its author. If you like it, then feel free
   to ask for more or different features here: https://github.com/isene/rsh.
-  
-  Features:
+
+  Core Features:
   * Aliases (called nicks in rsh) - both for commands and general nicks
-  * Syntax highlighting, matching nicks, system commands and valid dirs/files
+  * Syntax highlighting for nicks, bookmarks, commands, switches and valid dirs/files
   * Tab completions for nicks, system commands, command switches and dirs/files
-  * Tab completion presents matches in a list to pick from
-  * When you start to write a command, rsh will suggest the first match in the history and
-    present that in "toned down" letters - press the arrow right key to accept the suggestion
-  * Writing a partial command and pressing `UP` will search history for matches.
-    Go down/up in the list and press `TAB` or `ENTER` to accept, `Ctrl-g` or `Ctrl-c` to discard
-  * History with editing, search and repeat a history command (with `!`)
-  * Config file (.rshrc) updates on exit (with Ctrl-d) or not (with Ctrl-e)
-  * Set of simple rsh specific commands like nick, nick?, history and rmhistory
-  * rsh specific commands and full set of Ruby commands available via :<command>
-  * All colors are themeable in .rshrc (see github link for possibilities)
-  * Copy current command line to primary selection (paste w/middle button) with `Ctrl-y`
-  * AI integration: Use @ for text responses and @@ for command suggestions (requires ollama or OpenAI)
-  
-  Use `:help` for command reference.
-  
+  * Smart context-aware tab completion for git, apt, docker, systemctl, cargo, npm, gem, bundle
+  * History with editing, search and repeat (use `!` or UP arrow)
+  * Auto-suggestions from history (press RIGHT arrow to accept)
+  * Ruby functions callable as shell commands (persistent across sessions)
+  * AI integration: Use @ for text responses and @@ for command suggestions
+
+  NEW in v3.0:
+  * Command analytics - :stats shows usage patterns and performance metrics
+  * Enhanced bookmarks with tags - :bm "name path #tag1,tag2" then just type name to jump
+  * Session management - :save_session and :load_session preserve your entire shell state
+  * Smart typo detection - "Did you mean...?" suggestions for misspelled commands
+  * Switch caching - Faster TAB completion for command options
+  * Option value completion - TAB complete values like --format=json
+  * Syntax validation - Pre-execution warnings for dangerous or malformed commands
+  * Unified command syntax - :nick, :gnick, :bm all work the same way (list/create/delete)
+
+  Config file (.rshrc) updates on exit (Ctrl-d) or not (Ctrl-e).
+  All colors are themeable in .rshrc (see github link for possibilities).
+
+  Use `:help` for complete command reference.
+
 INFO
 
 @help = <<~HELP
@@ -179,6 +205,7 @@ def firstrun
   @c_gnick     = 87   # Color for matching gnick
   @c_path      = 208  # Color for valid path
   @c_switch    = 148  # Color for switches/options
+  @c_bookmark  = 13   # Color for bookmarks
   @c_tabselect = 207  # Color for selected tabcompleted item
   @c_taboption = 244  # Color for unselected tabcompleted item
   @c_stamp     = 244  # Color for time stamp/command
@@ -455,7 +482,8 @@ def tab(type)
     @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 = "switch" if @tabstr && @tabstr[0] == "-" && !@tabstr.include?("=")
+  type = "option_value" if @tabstr && @tabstr =~ /^--?[\w-]+=/
   type = "env_vars" if @tabstr && @tabstr[0] == "$"
 
   # Debug output when RSH_DEBUG is set
@@ -484,12 +512,16 @@ def tab(type)
       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"
+    else
+      # Check if command has defined completions and we're on the first argument
+      if @cmd_completions.key?(last_cmd) && cmd_parts.length == 1
+        type = "cmd_subcommands"
+        @current_cmd = last_cmd
+      end
     end
   end
 
@@ -500,12 +532,29 @@ def tab(type)
       @tabarray.shift   # Take away @history[0]
       return if @tabarray.empty?
     when "switch"
-      cmdswitch = @pretab.split(/[|, ]/).last.to_s
-      hlp = `#{cmdswitch} --help 2>/dev/null`
-      hlp = hlp.split("\n").grep(/^\s*-{1,2}[^-]/)
-      hlp = hlp.map{|h| h.sub(/^\s*/, '').sub(/^--/, '    --')}
-      hlp = hlp.reject{|h| /-</ =~ h}
-      @tabarray = hlp
+      cmdswitch = @pretab.split(/[|, ]/).last.to_s.strip
+      @tabarray = get_command_switches(cmdswitch)
+    when "option_value"  # Completion for option values like --format=<value>
+      if @tabstr =~ /^--?[\w-]+=(.*)/
+        value_prefix = $1
+        option = @tabstr.sub(/=.*/, '')
+        # Define common option value completions
+        value_completions = {
+          /format/ => %w[json yaml xml csv plain],
+          /output/ => %w[json yaml xml text html],
+          /level|log-level/ => %w[debug info warn error fatal],
+          /color/ => %w[auto always never],
+          /type/ => %w[file dir link all]
+        }
+        matches = []
+        value_completions.each do |pattern, values|
+          if option =~ pattern
+            matches = values.select { |v| v.start_with?(value_prefix) }
+            break unless matches.empty?
+          end
+        end
+        @tabarray = matches.map { |v| "#{option}=#{v}" }
+      end
     when "dirs_only"    # Only show directories
       fdir = @tabstr + "*"
       dirs = Dir.glob(fdir).select { |d| Dir.exist?(d) }.map { |d| d + "/" }
@@ -519,10 +568,10 @@ def tab(type)
       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]
+    when "cmd_subcommands" # Command-specific subcommands (git, apt, docker, etc.)
+      subcommands = @cmd_completions[@current_cmd] || []
       regex_flags = @completion_case_sensitive ? 0 : Regexp::IGNORECASE
-      @tabarray = git_cmds.select { |cmd| cmd =~ Regexp.new(@tabstr, regex_flags) }
+      @tabarray = subcommands.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
@@ -700,6 +749,85 @@ def tabend
   @c_col = @pos0 + @pos
   @c.col(@c_col)
 end
+def get_command_switches(command) # Helper function to extract switches from --help
+  # Check cache first (cache expires after 1 hour)
+  cache_key = command.to_s.strip
+  return [] if cache_key.empty?
+
+  current_time = Time.now.to_i
+  if @switch_cache[cache_key] && @switch_cache_time[cache_key] && (current_time - @switch_cache_time[cache_key]) < 3600
+    return @switch_cache[cache_key]
+  end
+
+  # Parse --help output
+  hlp = `#{command} --help 2>/dev/null`
+  # Try -h if --help didn't work
+  hlp = `#{command} -h 2>/dev/null` if hlp.empty?
+  return [] if hlp.empty?
+
+  switches = []
+
+  # Method 1: Lines starting with switches (traditional format)
+  switches = hlp.split("\n").grep(/^\s*-{1,2}[^-]/)
+  switches.map! { |h| h.sub(/^\s*/, '').sub(/^--/, '    --') }
+  switches.reject! { |h| /-</ =~ h }
+
+  # Method 2: Extract switches from usage line (git-style format)
+  if switches.empty?
+    usage_lines = hlp.split("\n").select { |l| l =~ /usage:|Usage:/ }
+    usage_lines.each do |line|
+      # Extract all switches from the usage line
+      line.scan(/(-[a-zA-Z]|--[a-z-]+)/).each do |match|
+        switch = match[0]
+        switches << (switch.start_with?('--') ? "    #{switch}" : switch)
+      end
+    end
+    switches.uniq!
+  end
+
+  # Cache the result (even if empty, to avoid repeated failures)
+  @switch_cache[cache_key] = switches
+  @switch_cache_time[cache_key] = current_time
+
+  switches
+end
+def levenshtein_distance(s, t) # Calculate edit distance for smart suggestions
+  m = s.length
+  n = t.length
+  return m if n == 0
+  return n if m == 0
+  d = Array.new(m+1) {Array.new(n+1)}
+  (0..m).each {|i| d[i][0] = i}
+  (0..n).each {|j| d[0][j] = j}
+  (1..n).each do |j|
+    (1..m).each do |i|
+      d[i][j] = if s[i-1] == t[j-1]
+        d[i-1][j-1]
+      else
+        [d[i-1][j]+1, d[i][j-1]+1, d[i-1][j-1]+1].min
+      end
+    end
+  end
+  d[m][n]
+end
+def suggest_command(cmd) # Smart command suggestions for typos
+  return nil if cmd.nil? || cmd.empty?
+  return nil if @exe.include?(cmd) || @nick.include?(cmd)
+
+  # Find commands with small edit distance
+  candidates = (@exe + @nick.keys).select do |c|
+    next false if c.length < 2
+    dist = levenshtein_distance(cmd, c)
+    max_dist = [cmd.length / 3, 2].max
+    dist <= max_dist && dist > 0
+  end
+
+  return nil if candidates.empty?
+
+  # Sort by distance
+  candidates.sort_by! { |c| levenshtein_distance(cmd, c) }
+  candidates.first(3)
+end
 def hist_clean # Clean up @history
   @history.uniq!
   @history.compact!
@@ -717,6 +845,7 @@ def cmd_check(str) # Check if each element on the readline matches commands, nic
 
   str.gsub(/(?:\S'[^']*'|[^ '])+/) do |el|
     clean_el = el.gsub("'", "")
+    # Priority: commands > nicks > bookmarks > paths
     if @exe.include?(el)
       el.c(@c_cmd)
     elsif el == "cd"
@@ -724,8 +853,6 @@ def cmd_check(str) # Check if each element on the readline matches commands, nic
     elsif clean_el =~ /^\.\/(.+)/ && File.exist?(clean_el) && File.executable?(clean_el)
       # Color local executables starting with ./
       el.c(@c_cmd)
-    elsif File.exist?(clean_el)
-      el.c(@c_path)
     elsif @nick.include?(el)
       el.c(@c_nick)
     elsif el == "r" or el == "f"
@@ -734,6 +861,11 @@ def cmd_check(str) # Check if each element on the readline matches commands, nic
       el.c(@c_gnick)
     elsif self.respond_to?(el) && singleton_class.instance_methods(false).include?(el.to_sym)
       el.c(@c_nick).b  # Ruby functions in bold nick color
+    elsif @bookmarks && @bookmarks.include?(el)
+      # Color bookmarks (after commands and nicks)
+      el.c(@c_bookmark)
+    elsif File.exist?(clean_el)
+      el.c(@c_path)
     elsif el[0] == "-"
       el.c(@c_switch)
     else
@@ -754,6 +886,16 @@ def rshrc # Write updates to .rshrc
   conf += "@gnick = #{@gnick}\n"
   conf.sub!(/^@cmd_frequency.*(\n|$)/, "")
   conf += "@cmd_frequency = #{@cmd_frequency}\n"
+  conf.sub!(/^@cmd_stats.*(\n|$)/, "")
+  conf += "@cmd_stats = #{@cmd_stats}\n" unless @cmd_stats.empty?
+  conf.sub!(/^@bookmarks.*(\n|$)/, "")
+  conf += "@bookmarks = #{@bookmarks}\n" unless @bookmarks.empty?
+  conf.sub!(/^@defuns.*(\n|$)/, "")
+  conf += "@defuns = #{@defuns}\n" unless @defuns.empty?
+  # Only write @cmd_completions if user has customized it
+  unless conf =~ /^@cmd_completions\s*=/
+    # Don't write default completions to avoid cluttering .rshrc
+  end
   conf.sub!(/^@history.*(\n|$)/, "")
   # Ensure history is properly formatted as valid Ruby array
   begin
@@ -799,9 +941,10 @@ def help
   left_col << "SPECIAL COMMANDS:".c(@c_prompt).b
   left_col << ":nick 'll = ls -l'  Command alias"
   left_col << ":gnick 'h = /home'  General alias"
-  left_col << ":nickdel 'name'     Delete nick"
-  left_col << ":gnickdel 'name'    Delete gnick"
-  left_col << ":nick?              List all nicks"
+  left_col << ":nick               List nicks"
+  left_col << ":gnick              List gnicks"
+  left_col << ":nick '-name'       Delete nick"
+  left_col << ":gnick '-name'      Delete gnick"
   left_col << ":history            Show history"
   left_col << ":rmhistory          Clear history"
   left_col << ":info               About rsh"
@@ -821,6 +964,16 @@ def help
   right_col << ":fg [id]            Foreground job"
   right_col << ":bg [id]            Resume in bg"
   right_col << ""
+  right_col << "v3.0 NEW FEATURES:".c(@c_prompt).b
+  right_col << ":stats              Command analytics"
+  right_col << ":bm \"name\"          Create bookmark"
+  right_col << "name                Jump to bookmark"
+  right_col << ":bm                 List bookmarks"
+  right_col << ":bm \"-name\"         Delete bookmark"
+  right_col << ":bm \"?tag\"          Search by tag"
+  right_col << ":save_session       Save session"
+  right_col << ":load_session       Restore session"
+  right_col << ""
   right_col << "INTEGRATIONS:".c(@c_prompt).b
   right_col << "r                   Launch rtfm"
   right_col << "f                   Launch fzf"
@@ -831,6 +984,12 @@ def help
   right_col << "@ <question>        AI text response"
   right_col << "@@ <request>        AI command → prompt"
   right_col << ""
+  right_col << "SMART COMPLETIONS:".c(@c_prompt).b
+  right_col << "git <TAB>           Git subcommands"
+  right_col << "apt/docker <TAB>    Command options"
+  right_col << "--format=<TAB>      Option values"
+  right_col << "Typo suggestions    Auto-correct"
+  right_col << ""
   right_col << "EXPANSIONS:".c(@c_prompt).b
   right_col << "~                   Home directory"
   right_col << "$VAR, ${VAR}        Environment var"
@@ -872,43 +1031,47 @@ def rmhistory # Delete history
   @history = []
   puts "History deleted."
 end
-def nick(nick_str)  # Define a new nick like this: `:nick "ls = ls --color"`
-  if nick_str.match(/^\s*-/)
+def nick(nick_str = nil)  # Define a new nick like this: `:nick "ls = ls --color"`
+  if nick_str.nil? || nick_str.empty?
+    # List all nicks
+    puts "\n  Command nicks:".c(@c_nick).b
+    if @nick.empty?
+      puts "  (none defined)"
+    else
+      @nick.sort.each {|key, value| puts "  #{key.c(@c_nick)} = #{value}"}
+    end
+    puts
+  elsif nick_str.match(/^\s*-/)
     source = nick_str.sub(/^\s*-/, '')
     @nick.delete(source)
+    rshrc
   else
     source = nick_str.sub(/ =.*/, '')
     target = nick_str.sub(/.*= /, '')
     @nick[source] = target
+    rshrc
   end
-  rshrc
 end
-def gnick(nick_str) # Define a generic/global nick to match not only commands (format like nick)
-  if nick_str.match(/^\s*-/)
+def gnick(nick_str = nil) # Define a generic/global nick to match not only commands (format like nick)
+  if nick_str.nil? || nick_str.empty?
+    # List all gnicks
+    puts "\n  General nicks:".c(@c_gnick).b
+    if @gnick.empty?
+      puts "  (none defined)"
+    else
+      @gnick.sort.each {|key, value| puts "  #{key.c(@c_gnick)} = #{value}"}
+    end
+    puts
+  elsif nick_str.match(/^\s*-/)
     source = nick_str.sub(/^\s*-/, '')
     @gnick.delete(source)
+    rshrc
   else
     source = nick_str.sub(/ =.*/, '')
     target = nick_str.sub(/.*= /, '')
     @gnick[source] = target
+    rshrc
   end
-  rshrc
-end
-def nick? # Show nicks
-  puts "  Command nicks:".c(@c_nick)
-  @nick.sort.each {|key, value| puts "  #{key} = #{value}"}
-  puts "  General nicks:".c(@c_gnick)
-  @gnick.sort.each {|key, value| puts "  #{key} = #{value}"}
-end
-def nickdel(nick_name) # Delete a command nick
-  @nick.delete(nick_name)
-  rshrc
-  puts "Nick '#{nick_name}' deleted"
-end
-def gnickdel(nick_name) # Delete a general/global nick
-  @gnick.delete(nick_name)
-  rshrc
-  puts "General nick '#{nick_name}' deleted"
 end
 def dirs
   puts "Past direactories:"
@@ -967,6 +1130,7 @@ def defun(func_def)  # Define a Ruby function like: `:defun "myls(*args) = Dir.g
     func_name = func_def.sub(/^\s*-/, '')
     if self.respond_to?(func_name)
       singleton_class.remove_method(func_name.to_sym)
+      @defuns.delete(func_name)
       puts "Function '#{func_name}' removed"
     else
       puts "Function '#{func_name}' not found"
@@ -978,11 +1142,12 @@ def defun(func_def)  # Define a Ruby function like: `:defun "myls(*args) = Dir.g
       func_name = $1
       func_params = $2
       func_body = $3
-      
+
       begin
         eval_code = "def #{func_name}(#{func_params}); #{func_body}; end"
         puts "  DEBUG: Evaluating: #{eval_code}" if ENV['RSH_DEBUG']
         singleton_class.class_eval(eval_code)
+        @defuns[func_name] = func_def  # Store for persistence
         puts "Function '#{func_name}' defined"
         puts "  DEBUG: Method created? #{respond_to?(func_name)}" if ENV['RSH_DEBUG']
       rescue SyntaxError => e
@@ -1011,6 +1176,202 @@ def defun?  # Show all user-defined functions
     end
   end
 end
+def stats # Show command execution statistics and analytics
+  puts "\n  Command Execution Statistics".c(@c_prompt).b
+  puts "  " + "="*50
+
+  # Most used commands
+  if @cmd_frequency && !@cmd_frequency.empty?
+    puts "\n  Top 10 Most Used Commands:".c(@c_nick)
+    sorted = @cmd_frequency.sort_by { |_, count| -count }.first(10)
+    sorted.each_with_index do |(cmd, count), i|
+      bar = "■" * ([count / 5, 20].min)
+      puts "  #{(i+1).to_s.rjust(2)}. #{cmd.ljust(20)} #{count.to_s.rjust(5)}x #{bar.c(@c_path)}"
+    end
+  end
+
+  # Command statistics from @cmd_stats
+  if @cmd_stats && !@cmd_stats.empty?
+    total_time = @cmd_stats.values.map { |s| s[:total_time] || 0 }.sum
+    total_cmds = @cmd_stats.values.map { |s| s[:count] || 0 }.sum
+
+    puts "\n  Performance Statistics:".c(@c_nick)
+    puts "  Total commands executed: #{total_cmds}"
+    puts "  Total execution time: #{'%.2f' % total_time}s"
+    puts "  Average time per command: #{'%.2f' % (total_time / total_cmds)}s" if total_cmds > 0
+
+    puts "\n  Slowest Commands:".c(@c_nick)
+    slowest = @cmd_stats.sort_by { |_, s| -(s[:avg_time] || 0) }.first(5)
+    slowest.each_with_index do |(cmd, stats), i|
+      puts "  #{(i+1).to_s.rjust(2)}. #{cmd.ljust(20)} avg: #{'%.3f' % (stats[:avg_time] || 0)}s"
+    end
+  end
+
+  # History statistics
+  puts "\n  History Statistics:".c(@c_nick)
+  puts "  Total history entries: #{@history.length}"
+  puts "  Unique commands: #{@history.uniq.length}"
+
+  # Success/failure tracking
+  puts "\n  Last command exit status: #{@last_exit == 0 ? 'Success'.c(@c_path) : "Failed (#{@last_exit})".c(196)}"
+  puts
+end
+def bm(args = nil) # Enhanced bookmark management with tags
+  if args.nil? || args.empty?
+    # List all bookmarks
+    if @bookmarks.empty?
+      puts "No bookmarks defined. Use :bookmark <name> to bookmark current directory"
+      return
+    end
+    puts "\n  Bookmarks:".c(@c_prompt).b
+    @bookmarks.each do |name, data|
+      path = data.is_a?(Hash) ? data[:path] : data
+      tags = data.is_a?(Hash) && data[:tags] ? " [#{data[:tags].join(', ')}]" : ""
+      puts "  #{name.c(@c_nick)} → #{path}#{tags.c(@c_stamp)}"
+    end
+    puts
+  elsif args =~ /^(\w+)\s+(.+)$/
+    # Set bookmark with optional tags
+    name, rest = $1, $2
+    if rest.include?('#')
+      path_part, tag_part = rest.split('#', 2)
+      path = path_part.strip
+      path = Dir.pwd if path.empty?
+      tags = tag_part.split(',').map(&:strip)
+      @bookmarks[name] = {path: path, tags: tags}
+    else
+      @bookmarks[name] = {path: rest.strip, tags: []}
+    end
+    puts "Bookmark '#{name}' set to #{@bookmarks[name][:path]}"
+    rshrc
+  elsif args =~ /^-(\w+)$/
+    # Delete bookmark
+    name = $1
+    if @bookmarks.delete(name)
+      puts "Bookmark '#{name}' deleted"
+      rshrc
+    else
+      puts "Bookmark '#{name}' not found"
+    end
+  elsif args =~ /^\?(\w*)$/
+    # Search bookmarks by tag
+    tag = $1
+    if tag.empty?
+      puts "Available tags:"
+      all_tags = @bookmarks.values.flat_map { |d| d.is_a?(Hash) ? d[:tags] : [] }.uniq.sort
+      puts "  " + all_tags.join(", ")
+    else
+      matches = @bookmarks.select do |_, data|
+        data.is_a?(Hash) && data[:tags] && data[:tags].include?(tag)
+      end
+      if matches.empty?
+        puts "No bookmarks with tag '#{tag}'"
+      else
+        puts "Bookmarks with tag '#{tag}':"
+        matches.each { |name, data| puts "  #{name} → #{data[:path]}" }
+      end
+    end
+  else
+    # Bookmark current directory
+    name = args.strip
+    @bookmarks[name] = {path: Dir.pwd, tags: []}
+    puts "Bookmark '#{name}' set to #{Dir.pwd}"
+    rshrc
+  end
+end
+def bookmark(args = nil) # Alias for bm
+  bm(args)
+end
+def save_session # Save current session state
+  session = {
+    pwd: Dir.pwd,
+    history: @history.first(50),
+    bookmarks: @bookmarks,
+    defuns: @defuns,
+    timestamp: Time.now.to_i
+  }
+  begin
+    require 'json'
+    File.write(@session_file, JSON.pretty_generate(session))
+    puts "Session saved to #{@session_file}"
+  rescue => e
+    puts "Error saving session: #{e.message}"
+  end
+end
+def load_session # Restore previous session
+  unless File.exist?(@session_file)
+    puts "No saved session found"
+    return
+  end
+  begin
+    require 'json'
+    session = JSON.parse(File.read(@session_file), symbolize_names: true)
+
+    # Restore state
+    Dir.chdir(session[:pwd]) if session[:pwd] && Dir.exist?(session[:pwd])
+
+    # Merge history (prepend saved history)
+    if session[:history]
+      @history = (session[:history] + @history).uniq.first(@histsize)
+    end
+
+    # Restore bookmarks
+    if session[:bookmarks]
+      session[:bookmarks].each do |name, data|
+        bookmark_data = data.is_a?(Hash) ? data.transform_keys(&:to_sym) : data
+        @bookmarks[name.to_s] = bookmark_data
+      end
+    end
+
+    # Restore defuns
+    if session[:defuns]
+      session[:defuns].each do |name, func_def|
+        next unless func_def.is_a?(String)
+        @defuns[name.to_s] = func_def
+        # Re-evaluate the function
+        if func_def =~ /^(\w+)\s*\(([^)]*)\)\s*=\s*(.+)$/
+          func_name, func_params, func_body = $1, $2, $3
+          eval_code = "def #{func_name}(#{func_params}); #{func_body}; end"
+          singleton_class.class_eval(eval_code) rescue nil
+        end
+      end
+    end
+
+    saved_time = Time.at(session[:timestamp] || 0).strftime("%Y-%m-%d %H:%M:%S")
+    puts "Session restored from #{saved_time}"
+    rshrc
+  rescue => e
+    puts "Error loading session: #{e.message}"
+  end
+end
+def validate_command(cmd) # Syntax validation before execution
+  return nil if cmd.nil? || cmd.empty?
+  warnings = []
+
+  # Check for common mistakes
+  warnings << "Unmatched quotes" if cmd.count("'").odd? || cmd.count('"').odd?
+  warnings << "Unmatched parentheses" if cmd.count("(") != cmd.count(")")
+  warnings << "Unmatched brackets" if cmd.count("[") != cmd.count("]")
+  warnings << "Unmatched braces" if cmd.count("{") != cmd.count("}")
+
+  # Check for potentially dangerous patterns
+  warnings << "WARNING: Recursive rm detected" if cmd =~ /rm\s+.*-r.*\//
+  warnings << "WARNING: Force flag without path" if cmd =~ /rm\s+-[rf]+\s*$/
+  warnings << "WARNING: Sudo with redirection" if cmd =~ /sudo.*>/
+
+  # Check for common typos in popular commands
+  if cmd =~ /^(\w+)/
+    first_cmd = $1
+    unless @exe.include?(first_cmd) || @nick.include?(first_cmd) || first_cmd == "cd"
+      suggestions = suggest_command(first_cmd)
+      if suggestions && !suggestions.empty?
+        warnings << "Command '#{first_cmd}' not found. Did you mean: #{suggestions.join(', ')}?"
+      end
+    end
+  end
+
+  warnings.empty? ? nil : warnings
+end
 def execute_conditional(cmd_line)
   # Split on && and || while preserving the operators
   parts = cmd_line.split(/(\s*&&\s*|\s*\|\|\s*)/)
@@ -1289,6 +1650,25 @@ def load_rshrc_safe
     @nick = {} unless @nick.is_a?(Hash)
     @gnick = {} unless @gnick.is_a?(Hash)
     @cmd_frequency = {} unless @cmd_frequency.is_a?(Hash)
+    @cmd_stats = {} unless @cmd_stats.is_a?(Hash)
+    @bookmarks = {} unless @bookmarks.is_a?(Hash)
+    @defuns = {} unless @defuns.is_a?(Hash)
+
+    # Restore defuns from .rshrc
+    if @defuns && !@defuns.empty?
+      @defuns.each do |name, func_def|
+        next unless func_def.is_a?(String)
+        if func_def =~ /^(\w+)\s*\(([^)]*)\)\s*=\s*(.+)$/
+          func_name, func_params, func_body = $1, $2, $3
+          begin
+            eval_code = "def #{func_name}(#{func_params}); #{func_body}; end"
+            singleton_class.class_eval(eval_code)
+          rescue => e
+            puts "Warning: Could not load defun '#{name}': #{e.message}" if ENV['RSH_DEBUG']
+          end
+        end
+      end
+    end
 
   rescue SyntaxError => e
     puts "\n\033[31mERROR: Syntax error in .rshrc:\033[0m"
@@ -1402,6 +1782,11 @@ def load_defaults
   @completion_show_descriptions ||= false
   @completion_fuzzy ||= true
   @cmd_frequency ||= {}
+  @cmd_stats ||= {}
+  @bookmarks ||= {}
+  @defuns ||= {}
+  @switch_cache ||= {}
+  @switch_cache_time ||= {}
   puts "Loaded with default configuration."
 end
 
@@ -1482,7 +1867,7 @@ loop do
   begin
     @user = Etc.getpwuid(Process.euid).name # For use in @prompt
     @node = Etc.uname[:nodename]            # For use in @prompt
-    h = @history; load_rshrc_safe; @history = h # reload prompt but not history safely
+    h = @history; f = @cmd_frequency; s = @cmd_stats; b = @bookmarks; d = @defuns; load_rshrc_safe; @history = h; @cmd_frequency = f; @cmd_stats = s; @bookmarks = b; @defuns = d # reload prompt but preserve runtime data
     @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]
@@ -1582,11 +1967,22 @@ loop do
         @cmd = Dir.home if @cmd == "~"
         @cmd = @dirs[1] if @cmd == "-"
         @cmd = @dirs[@cmd.to_i] if @cmd =~ /^\d$/
-        # Check if it's a directory to change to
+        # Check if it's a directory to change to first
         dir = @cmd.strip.sub(/~/, Dir.home)
         if Dir.exist?(dir)
-          Dir.chdir(dir) 
+          Dir.chdir(dir)
           system("git status .") if Dir.exist?(".git")
+        # Then check if it's a bookmark (commands and nicks already handled above)
+        elsif @bookmarks && @bookmarks[@cmd]
+          bookmark_data = @bookmarks[@cmd]
+          bm_dir = bookmark_data.is_a?(Hash) ? bookmark_data[:path] : bookmark_data
+          if Dir.exist?(bm_dir)
+            Dir.chdir(bm_dir)
+            puts "Jumped to bookmark '#{@cmd}' → #{bm_dir}".c(@c_path)
+            system("git status .") if Dir.exist?(".git")
+          else
+            puts "Bookmark '#{@cmd}' points to non-existent directory: #{bm_dir}".c(196)
+          end
         else
           puts "#{Time.now.strftime("%H:%M:%S")}: #{@cmd}".c(@c_stamp)
           if @cmd == "f" # fzf integration (https://github.com/junegunn/fzf)
@@ -1603,16 +1999,34 @@ loop do
                 Thread.new { system("xdg-open #{@cmd} 2>/dev/null") }
               end
             end
-          else 
+          else
             begin
+              # Validate command before execution
+              warnings = validate_command(@cmd)
+              if warnings && !warnings.empty?
+                warnings.each { |w| puts "#{w}".c(196) }
+                # For critical warnings, ask for confirmation
+                if warnings.any? { |w| w.start_with?("WARNING:") }
+                  print "Continue anyway? (y/N): "
+                  response = $stdin.gets.chomp
+                  unless response.downcase == 'y'
+                    puts "Command cancelled"
+                    next
+                  end
+                end
+              end
+
               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
+              cmd_base = @cmd.split.first if @cmd && !@cmd.empty?
+              if cmd_base
+                @cmd_frequency[cmd_base] = (@cmd_frequency[cmd_base] || 0) + 1
               end
 
+              # Start timing
+              start_time = Time.now
+
               # Handle background jobs
               if @cmd.end_with?(' &')
                 @cmd = @cmd[0..-3]  # Remove the &
@@ -1626,13 +2040,23 @@ loop do
                 @jobs[@job_id] = {pid: pid, cmd: @cmd, status: :running}
                 puts "[#{@job_id}] #{pid} #{@cmd}"
               else
-                # Better handling of pipes and redirections  
+                # Better handling of pipes and redirections
                 @current_pid = spawn(@cmd)
                 Process.wait(@current_pid)
                 @last_exit = $?.exitstatus
                 @current_pid = nil
                 puts " Command failed: #{@cmd} (exit #{@last_exit})" unless @last_exit == 0
               end
+
+              # Track execution time
+              elapsed = Time.now - start_time
+              if cmd_base && elapsed > 0.01  # Only track if > 10ms
+                @cmd_stats[cmd_base] ||= {count: 0, total_time: 0.0, avg_time: 0.0}
+                @cmd_stats[cmd_base][:count] += 1
+                @cmd_stats[cmd_base][:total_time] += elapsed
+                @cmd_stats[cmd_base][:avg_time] = @cmd_stats[cmd_base][:total_time] / @cmd_stats[cmd_base][:count]
+              end
+
               post_cmd
             rescue StandardError => err
               puts "\nError: #{err}"

metadata

@@ -1,19 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: ruby-shell
 version: !ruby/object:Gem::Version
-  version: 2.11.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-04 00:00:00.000000000 Z
+date: 2025-10-22 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.11.1: Critical bugfix for nick persistence - nicks now save correctly to .rshrc
-  without duplication when file doesn''t end with newline.'
+  v3.0.0: MAJOR RELEASE - Persistent defuns, smart command suggestions with typo detection,
+  command analytics with :stats, switch caching, enhanced bookmarks with tags, session
+  save/restore, syntax validation, option value completion, and performance tracking.'
 email: g@isene.com
 executables:
 - rsh