ruby-shell 3.4.4 → 3.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 587406cf97c8f8aeba405779d229d073b0c8963b24c224edd1a24d72441411d5
-  data.tar.gz: aa4ea0471988e2004e057c575684f6d2a3f2b3875872e49ee769f22045d52bd5
+  metadata.gz: 8180bf48f336b9667d34fc01d5df5ddf7a3412ff5f35cfc443d10846a81f6686
+  data.tar.gz: acd063a28be3a5bfe7ccb9ec6623ddb7e061deba44806725c1b76781fcf45acb
 SHA512:
-  metadata.gz: 8fc3e11246348f5eae8bec22ac1d62d990a5ab2727573202363a9c04d6f6e8448bb265fd776ae664004249ac9133baf12a78042da5045b8fe3589e8484414221
-  data.tar.gz: a4305bfba19e86a643440a4d6727e71c3e5d74467fdb9ccf5070345f66a5792256276b299e04714e389d6801e5aadf0253b3da645203bb4135412f5ffa9ec9a2
+  metadata.gz: 05d07658f8356edad6da19da615170e2423785fc4a3f9074cfb5b9ef3a7f602b3f109172cb6ba799f9b2bc0bbc7363a9c0ff29b4d9d27cfebb05b2883156aad6
+  data.tar.gz: 6e1d7c8d6c16c0ce6f2d7cf67a5229b3a31f3e0d096438fd59877c3647dd5f8b1530ff0b0c46cd95bd377d25663e79e7f0cbef8dc8599f61cb281a395c54bc94

data/PLUGIN_GUIDE.md

@@ -661,6 +661,113 @@ Planned for v4.0:
 
 ---
 
+## Included Plugins
+
+rsh comes with several useful plugins out of the box. Enable them with `:plugins "enable", "pluginname"`.
+
+### venv - Virtual Environment Indicators
+
+Shows active Python venv, Ruby rbenv/rvm, Node nvm, and Conda environments in your prompt.
+
+**Features:**
+- Detects Python virtualenv: `(py:myenv)`
+- Shows Ruby rbenv/rvm versions: `(rb:3.2.0)`
+- Displays Node version: `(node:18.0.0)`
+- Shows Conda environments: `(conda:base)`
+- Color-coded indicators (green for Python, red for Ruby, yellow for Node, cyan for Conda)
+
+**Usage:** Simply enable the plugin, indicators appear automatically when in an active environment.
+
+### extract - Universal Archive Handler
+
+Extract any archive format with a single command.
+
+**Features:**
+- Handles: `.tar.gz`, `.tar.bz2`, `.tar.xz`, `.zip`, `.rar`, `.7z`, `.gz`, `.bz2`, `.xz`, `.Z`, `.deb`, `.rpm`
+- Auto-detects format from extension
+- Success/error feedback with color
+
+**Commands:**
+- `extract file.tar.gz` - Extract any supported archive
+
+**Example:**
+```ruby
+extract project.tar.gz
+extract backup.zip
+extract archive.7z
+```
+
+### docker - Container Integration
+
+Quick Docker container management with prompt indicators.
+
+**Features:**
+- Shows running container count in prompt: `[docker:3]`
+- Quick container management commands
+- Docker Compose shortcuts
+
+**Commands:**
+- `dps` - List running containers (docker ps)
+- `dpsa` - List all containers (docker ps -a)
+- `dex <container>` - Execute bash in container
+- `dlogs <container> [lines]` - Show container logs (default 50 lines)
+- `dstop` - Stop all running containers
+- `dclean` - Remove all stopped containers
+- `dcup` - Docker compose up -d
+- `dcdown` - Docker compose down
+- `dcrestart` - Docker compose restart
+
+**Example:**
+```ruby
+dps                    # List running containers
+dex web_1              # Enter bash in web_1 container
+dlogs nginx 100        # Show last 100 log lines
+```
+
+### clipboard - Cross-Platform Clipboard
+
+Copy and paste text to/from system clipboard.
+
+**Features:**
+- Auto-detects clipboard tool (xclip, xsel, wl-copy/paste, pbcopy/paste, clip.exe)
+- Works on Linux (X11/Wayland), macOS, and Windows WSL
+- Copy last command, arbitrary text, or file contents
+
+**Commands:**
+- `clip [text]` - Copy text to clipboard (copies last command if no args)
+- `clipp` - Paste from clipboard and display
+- `clipf <file>` - Copy file contents to clipboard
+
+**Example:**
+```ruby
+clip                   # Copy last command
+clip some text here    # Copy this text
+clipf config.yml       # Copy file contents
+clipp                  # Show clipboard contents
+```
+
+### git_prompt - Git Branch Indicator
+
+Shows current git branch in prompt when in a git repository.
+
+**Features:**
+- Displays current branch: `[main]`
+- Only shows when in a git repo
+- Yellow color coding
+
+**Usage:** Enable and branch appears automatically in prompt.
+
+### command_logger - Command Logging
+
+Logs all commands to a file for audit/review.
+
+**Features:**
+- Logs commands with timestamp
+- Customizable log file location
+- Useful for command history analysis
+
+---
+
 ## Example Plugin Templates
 
 ### Minimal Plugin

data/README.md

@@ -476,6 +476,27 @@ Also, a special variable for better LS_COLOR setup:
 ```
 Point `@lscolors` to a file that sets your LS_COLORS variable. Use [my extended LS_COLORS setup](https://github.com/isene/LS_COLORS) to make this really fancy.
 
+### Directory Colors in Prompt
+
+**rsh is fully LS_COLORS compliant** - both tab completion and prompt paths use LS_COLORS for consistent theming.
+
+You can override directory colors in the prompt using pattern matching (like RTFM's @topmatch):
+```ruby
+@dir_colors = [
+  ["PassionFruit", 171],  # Paths containing "PassionFruit" -> magenta
+  ["Dualog", 72],         # Paths containing "Dualog" -> cyan
+  ["/G", 172],            # Paths containing "/G" -> orange
+]
+```
+
+How it works:
+- Array of `[pattern, color]` pairs
+- First matching pattern wins (uses Ruby's `include?` method)
+- If no pattern matches, uses LS_COLORS 'di' value (your configured directory color)
+- Pattern matching is simple substring matching: "/G" matches "/home/user/Main/G/..."
+
+This lets you visually distinguish different project directories at a glance in your prompt.
+
 You can add any Ruby code to your .rshrc.
 
 # Enter the world of Ruby

data/bin/rsh

@@ -8,7 +8,7 @@
 # Web_site:   http://isene.com/
 # Github:     https://github.com/isene/rsh
 # License:    Public domain
-@version    = "3.4.4" # Split .rshrc/.rshstate, performance improvements, symlink colors, auto-migration
+@version    = "3.4.6" # Plugin help system, 4 new plugins, plugins disabled by default, Ctrl-W fix
 
 # MODULES, CLASSES AND EXTENSIONS
 class String # Add coloring to strings (with escaping for Readline)
@@ -154,7 +154,7 @@ begin # Initialization
   @slow_command_threshold = 0             # Threshold for slow command alerts (0 = disabled)
   @plugin_dir = Dir.home + '/.rsh/plugins' # Plugins directory
   @plugins = []                           # Loaded plugin instances
-  @plugin_disabled = []                   # List of disabled plugin names
+  @plugin_enabled = []                    # List of enabled plugin names (whitelist)
   @plugin_commands = {}                   # Commands added by plugins
   @validation_rules = []                  # Custom validation rules
   @completion_weights = {}                # Completion learning weights
@@ -352,7 +352,7 @@ def getstr # A custom Readline-like function
     # The actual printing og the command line
     @c.row(@row0)
     @c.clear_line
-    print @prompt
+    print @display_prompt
     @c.clear_screen_down
     row, @pos0 = @c.pos
     #@history[0] = "" if @history[0].nil?
@@ -476,11 +476,13 @@ def getstr # A custom Readline-like function
       @c.clear_line_after
     when 'WBACK' # Delete one word to the left (Ctrl-W)
       unless @pos == @pos0
-        until @history[0][@pos - 1] == " " or @pos == 0
+        # Skip over any trailing spaces first
+        while @pos > 0 && @history[0][@pos - 1] == " "
           @pos -= 1
           @history[0][@pos] = ""
         end
-        if @history[0][@pos - 1] == " "
+        # Delete the word (until we hit a space or start)
+        while @pos > 0 && @history[0][@pos - 1] != " "
           @pos -= 1
           @history[0][@pos] = ""
         end
@@ -622,7 +624,7 @@ def tab(type)
     @c_col = @pos0 + @pos
     @c.clear_line
     line_display = cmd_check(@history[0]).to_s
-    print @prompt + line_display
+    print @display_prompt + line_display
     @c.col(@c_col)
     return
   end
@@ -645,14 +647,22 @@ def tab(type)
       @tabarray = @recordings.keys
     when "plugin_args"
       # Completions for :plugins command
-      @tabarray = %w[reload info]
-      # Add plugin names for enable/disable/info
+      @tabarray = %w[reload]
+      # Add help for all available plugins
+      if Dir.exist?(@plugin_dir)
+        available = Dir.glob(@plugin_dir + '/*.rb').map { |f| File.basename(f, '.rb') }
+        @tabarray += available.map { |p| "help #{p}" }
+        @tabarray += available.map { |p| "info #{p}" }
+      end
+      # Add plugin names for enable/disable
       if @plugins.any?
         @tabarray += @plugins.map { |p| "disable #{p[:name]}" }
-        @tabarray += @plugins.map { |p| "info #{p[:name]}" }
       end
-      if @plugin_disabled.any?
-        @tabarray += @plugin_disabled.map { |p| "enable #{p}" }
+      # Show "enable" for disabled plugins (available but not enabled)
+      if Dir.exist?(@plugin_dir)
+        available = Dir.glob(@plugin_dir + '/*.rb').map { |f| File.basename(f, '.rb') }
+        disabled = available - @plugin_enabled
+        @tabarray += disabled.map { |p| "enable #{p}" } if disabled.any?
       end
     when "switch"
       cmdswitch = @pretab.split(/[|, ]/).last.to_s.strip
@@ -839,7 +849,7 @@ def tab(type)
         # Escape regex special characters in @tabstr for pattern matching
         escaped_tabstr = Regexp.escape(@tabstr)
         tabline   = display_choice.sub(/(.*)#{escaped_tabstr}(.*)/, '\1'.c(choice_color) + @tabstr.u.c(choice_color) + '\2'.c(choice_color))
-        print @prompt + line1 + tabline + line2               # Print the commandline
+        print @display_prompt + line1 + tabline + line2       # Print the commandline
         @pos   = @pretab.length.to_i + tabchoice.length.to_i  # Set the position on that commandline
         @c_col = @pos0 + @pos                                 # The cursor position must include the prompt as well
         @c.col(@c_col)                                        # Set the cursor position
@@ -1262,6 +1272,18 @@ def get_file_color(filename) # Get color for a file based on LS_COLORS
   file_color = 7 if file_color == 0  # 0 means "reset to default" in LS_COLORS
   file_color
 end
+def get_dir_color(path) # Get color for directory path in prompt
+  # Check pattern matches first (like RTFM's @topmatch)
+  # Set @dir_colors in .rshrc as array of [pattern, color] pairs
+  # Example: @dir_colors = [["PassionFruit", 171], ["Dualog", 72], ["/G", 172], ["", 33]]
+  if @dir_colors && @dir_colors.is_a?(Array)
+    match = @dir_colors.find { |pattern, _| pattern.empty? || path.include?(pattern) }
+    return match.last if match
+  end
+
+  # Fall back to LS_COLORS directory color
+  @ls_colors['di'] || 33
+end
 def format_tab_item(item, show_metadata: false) # Format tab item with color and optional metadata
   color = get_file_color(item)
   formatted = item
@@ -1335,7 +1357,12 @@ def cmd_check(str) # Check if each element on the readline matches commands, nic
       # Color bookmarks (after commands and nicks)
       el.c(@c_bookmark)
     elsif File.exist?(clean_el)
-      el.c(@c_path)
+      # Use directory color matching for directories, @c_path for files
+      if File.directory?(clean_el)
+        el.c(get_dir_color(File.expand_path(clean_el)))
+      else
+        el.c(@c_path)
+      end
     elsif el[0] == "-"
       el.c(@c_switch)
     else
@@ -1372,8 +1399,8 @@ def rshrc # Write user configuration to .rshrc (portable between machines)
   conf += "@completion_learning = #{@completion_learning}\n" unless @completion_learning
   conf.sub!(/^@completion_show_metadata.*(\n|$)/, "")
   conf += "@completion_show_metadata = #{@completion_show_metadata}\n" if @completion_show_metadata
-  conf.sub!(/^@plugin_disabled.*(\n|$)/, "")
-  conf += "@plugin_disabled = #{@plugin_disabled}\n" unless @plugin_disabled.empty?
+  conf.sub!(/^@plugin_enabled.*(\n|$)/, "")
+  conf += "@plugin_enabled = #{@plugin_enabled}\n" unless @plugin_enabled.empty?
   conf.sub!(/^@validation_rules.*(\n|$)/, "")
   conf += "@validation_rules = #{@validation_rules}\n" unless @validation_rules.empty?
 
@@ -2233,8 +2260,8 @@ def load_plugins # Load all plugins from plugin directory
   plugin_files.each do |plugin_file|
     plugin_name = File.basename(plugin_file, '.rb')
 
-    # Skip if disabled
-    next if @plugin_disabled.include?(plugin_name)
+    # Only load if explicitly enabled (whitelist)
+    next unless @plugin_enabled.include?(plugin_name)
 
     begin
       # Load the plugin file
@@ -2304,22 +2331,26 @@ def call_plugin_hook(hook_name, *args) # Call a lifecycle hook for all plugins
 end
 def plugins(*args) # Plugin management command
   if args.empty?
-    # List all plugins
-    if @plugins.empty?
-      puts "\nNo plugins loaded"
+    # List all available plugins
+    available_plugins = Dir.exist?(@plugin_dir) ? Dir.glob(@plugin_dir + '/*.rb').map { |f| File.basename(f, '.rb') }.sort : []
+
+    if available_plugins.empty?
+      puts "\nNo plugins found"
       puts "Place .rb files in #{@plugin_dir}"
       return
     end
 
-    puts "\n  Loaded Plugins:".c(@c_prompt).b
-    @plugins.each do |plugin|
-      status = @plugin_disabled.include?(plugin[:name]) ? '[disabled]'.c(196) : '[enabled]'.c(@c_path)
-      puts "    #{plugin[:name].ljust(20)} #{status} (#{plugin[:class]})"
-    end
-
-    unless @plugin_disabled.empty?
-      puts "\n  Disabled Plugins:".c(@c_stamp)
-      @plugin_disabled.each { |name| puts "    #{name}" }
+    puts "\n  Available Plugins:".c(@c_prompt).b
+    available_plugins.each do |name|
+      if @plugin_enabled.include?(name)
+        status = '[enabled]'.c(@c_path)
+        plugin = @plugins.find { |p| p[:name] == name }
+        class_info = plugin ? " (#{plugin[:class]})" : ""
+      else
+        status = '[disabled]'.c(196)
+        class_info = ""
+      end
+      puts "    #{name.ljust(20)} #{status}#{class_info}"
     end
     puts
   elsif args[0] == 'reload'
@@ -2331,15 +2362,15 @@ def plugins(*args) # Plugin management command
   elsif args[0] == 'enable' && args[1]
     # Enable a plugin
     plugin_name = args[1]
-    @plugin_disabled.delete(plugin_name)
+    unless @plugin_enabled.include?(plugin_name)
+      @plugin_enabled << plugin_name
+    end
     puts "Plugin '#{plugin_name}' enabled. Use :plugins reload to load it"
     rshrc
   elsif args[0] == 'disable' && args[1]
     # Disable a plugin
     plugin_name = args[1]
-    unless @plugin_disabled.include?(plugin_name)
-      @plugin_disabled << plugin_name
-    end
+    @plugin_enabled.delete(plugin_name)
     @plugins.reject! { |p| p[:name] == plugin_name }
     puts "Plugin '#{plugin_name}' disabled"
     rshrc
@@ -2365,6 +2396,51 @@ def plugins(*args) # Plugin management command
     else
       puts "Plugin '#{plugin_name}' not found"
     end
+  elsif args[0] == 'help' && args[1]
+    # Show plugin help
+    plugin_name = args[1]
+    plugin_file = "#{@plugin_dir}/#{plugin_name}.rb"
+
+    if File.exist?(plugin_file)
+      content = File.read(plugin_file)
+
+      # Extract help block (lines starting with # at top of file)
+      help_lines = []
+      in_help = true
+      content.each_line do |line|
+        if in_help && line =~ /^#\s*(.*)$/
+          help_text = $1
+          next if help_text =~ /^-+$/ # Skip separator lines
+          help_lines << help_text
+        elsif line.strip.empty?
+          next
+        else
+          in_help = false
+          break
+        end
+      end
+
+      if help_lines.any?
+        puts "\n#{help_lines.join("\n")}\n"
+      else
+        puts "No help available for plugin '#{plugin_name}'"
+      end
+
+      # Extract and show available commands
+      commands = []
+      content.scan(/def (\w+)\(/) { |match| commands << match[0] unless match[0] == 'initialize' }
+
+      if commands.any?
+        puts "\nCommands: #{commands.join(', ')}".c(@c_nick)
+        puts
+      end
+    else
+      puts "Plugin '#{plugin_name}' not found"
+      puts "Available plugins:"
+      Dir.glob(@plugin_dir + '/*.rb').each do |file|
+        puts "  #{File.basename(file, '.rb')}"
+      end
+    end
   else
     puts "Usage:"
     puts "  :plugins              List all plugins"
@@ -2372,6 +2448,7 @@ def plugins(*args) # Plugin management command
     puts "  :plugins enable NAME  Enable a plugin"
     puts "  :plugins disable NAME Disable a plugin"
     puts "  :plugins info NAME    Show plugin details"
+    puts "  :plugins help NAME    Show plugin help/usage"
   end
 end
 def validate_command(cmd) # Syntax validation before execution
@@ -2982,7 +3059,7 @@ def load_rshrc_safe
     @session_autosave = 0 unless @session_autosave.is_a?(Integer)
     @auto_correct = false unless [@auto_correct].any? { |v| v == true || v == false }
     @slow_command_threshold = 0 unless @slow_command_threshold.is_a?(Integer)
-    @plugin_disabled = [] unless @plugin_disabled.is_a?(Array)
+    @plugin_enabled = [] unless @plugin_enabled.is_a?(Array)
     @plugins = [] unless @plugins.is_a?(Array)
     @plugin_commands = {} unless @plugin_commands.is_a?(Hash)
     @validation_rules = [] unless @validation_rules.is_a?(Array)
@@ -3137,7 +3214,7 @@ def load_defaults
   @session_autosave ||= 0
   @auto_correct ||= false
   @slow_command_threshold ||= 0
-  @plugin_disabled ||= []
+  @plugin_enabled ||= []
   @plugins ||= []
   @plugin_commands ||= {}
   @validation_rules ||= []
@@ -3211,6 +3288,8 @@ begin # Load .rshrc and populate @history
     exit
   end
   firstrun unless File.exist?(Dir.home+'/.rshrc') # Initial loading - to get history
+  # Initialize @ls_colors with defaults so get_dir_color() works in .rshrc prompt
+  @ls_colors = { 'di' => 33, 'ex' => 2, 'ln' => 14, 'fi' => 7 }
   load_rshrc_safe
   migrate_to_split_config  # Migrate from old format if needed (v3.4.3+)
   # Load login shell files if rsh is running as login shell
@@ -3235,6 +3314,7 @@ begin # Load .rshrc and populate @history
   ENV["TERM"]  = "rxvt-unicode-256color"
   ENV["PATH"]  ? ENV["PATH"] += ":" : ENV["PATH"] = ""
   ENV["PATH"] += "/home/#{@user}/bin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+  # Load actual LS_COLORS from file (now that @lscolors is set from .rshrc)
   if @lscolors and File.exist?(@lscolors)
     ls = File.read(@lscolors)
     ls.sub!(/export.*/, '')
@@ -3273,9 +3353,10 @@ loop do
       load_plugins
       @plugins_loaded = true
     end
-    # Append plugin prompt additions (after plugins loaded)
+    # Build display prompt with plugin additions (don't modify @prompt)
     plugin_prompts = call_plugin_hook(:on_prompt)
-    @prompt += plugin_prompts.join if plugin_prompts.any?
+    @display_prompt = @prompt.dup
+    @display_prompt += plugin_prompts.join if plugin_prompts.any?
     # Auto-save session if enabled and interval elapsed
     if @session_autosave && @session_autosave > 0
       current_time = Time.now.to_i
@@ -3322,7 +3403,7 @@ loop do
     # Move cursor to end of line and print the full command before clearing
     @c.row(@row0)
     @c.clear_line
-    print @prompt + cmd_check(@cmd)
+    print @display_prompt + cmd_check(@cmd)
     print "\n"; @c.clear_screen_down
     if @cmd == "r" # Integration with rtfm (https://github.com/isene/RTFM)
       t  = Time.now

metadata

@@ -1,21 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: ruby-shell
 version: !ruby/object:Gem::Version
-  version: 3.4.4
+  version: 3.4.6
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-25 00:00:00.000000000 Z
+date: 2025-10-26 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
-  v3.4.0: COMPLETION LEARNING - Shell learns which TAB completions you use most and
-  intelligently ranks them higher. Context-aware learning per command. :completion_stats
-  shows patterns. Persistent across sessions. Plus all v3.3 features: quote-less syntax,
-  parametrized nicks, Ctrl-G editing, validation rules, shell scripts!'
+  v3.4.6: PLUGIN SYSTEM ENHANCED - Plugin help system, 4 new plugins (venv/extract/docker/clipboard),
+  plugins disabled by default. Plus v3.4.5: Full LS_COLORS compliance with pattern-based
+  directory coloring (@dir_colors like RTFM''s @topmatch)!'
 email: g@isene.com
 executables:
 - rsh