ruby-shell 3.4.3 → 3.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa582c1417712c47e836881c478b375ec93f4def3b7f75b4ad9c486c3bfc36d3
-  data.tar.gz: e6c40f3e4eb1277bdd72ec20413a3bee631abb102a818e71d7e18716b665ebf0
+  metadata.gz: 1a0c1e45454167bc454071a1419673d2ca195980970208c54b2745870709e024
+  data.tar.gz: 4981d0f400409d059e703df8d6daa9eab3be19e6a4e0da3f96de7533aac66c6c
 SHA512:
-  metadata.gz: 2c9adb770a67ec3c7ac67c42bf7a963b2cedd3c7a4aec8f1d0460210f3fb965286ec528df049426598ca1890df2e00cd174ec96d078e93796acde6ff7ff857e1
-  data.tar.gz: ec2dc6f60a5daf6394d3fc57ad0a977b7e1c9e2e0b4e231c8967cc20052d007b68f2c3e85f226885d26da4f706ff86b6976827b1455bf35fcbbfa1b59fed0ac6
+  metadata.gz: 6632764744a12eb79fda32cf92677e44e0ded8cab07e9b41cad11cfb911df0f678c63d9f8448390c8556fca89d11bb83a37864050f75c716c9589e05c88d4e67
+  data.tar.gz: fe1dee534ac7e91a7ad925ba6845acc49e9ca897763486973589d5f8997a6b78771ae1155f20ef8bf42d982a3fe4f37255a33a8a1499223cec77fa3b7319b935

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.3" # Enhanced tab completion: LS_COLORS, visual indicators, smart context, auto-complete ..
+@version    = "3.4.5" # Dynamic directory colors in prompt via LS_COLORS integration
 
 # MODULES, CLASSES AND EXTENSIONS
 class String # Add coloring to strings (with escaping for Readline)
@@ -1233,14 +1233,19 @@ end
 def get_file_color(filename) # Get color for a file based on LS_COLORS
   return 7 unless @ls_colors  # Default to white if not initialized
 
+  # Remove quotes and trailing slash for checking
+  clean_name = filename.gsub(/['"]/, '').chomp('/')
+
+  # Check if it's a symlink (before directory check!)
+  if File.symlink?(clean_name)
+    return @ls_colors['ln'] || 14  # Symlinks get special color
+  end
+
   # Check if it's a directory
   if filename.end_with?('/')
     return @ls_colors['di'] || 33
   end
 
-  # Remove quotes and trailing slash for checking
-  clean_name = filename.gsub(/['"]/, '').chomp('/')
-
   # Check if file exists and is executable
   if File.exist?(clean_name) && File.executable?(clean_name) && !File.directory?(clean_name)
     return @ls_colors['ex'] || 2
@@ -1257,6 +1262,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
@@ -1330,7 +1347,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
@@ -1338,21 +1360,19 @@ def cmd_check(str) # Check if each element on the readline matches commands, nic
     end
   end
 end
-def rshrc # Write updates to .rshrc
-  hist_clean
+def rshrc # Write user configuration to .rshrc (portable between machines)
+  hist_clean  # Clean history before saving
   if File.exist?(Dir.home+'/.rshrc')
     conf = File.read(Dir.home+'/.rshrc')
   else
     conf = ""
   end
+
+  # Only update user-editable items in .rshrc
   conf.sub!(/^@nick.*(\n|$)/, "")
   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!(/^@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|$)/, "")
@@ -1365,40 +1385,71 @@ def rshrc # Write updates to .rshrc
   conf += "@auto_correct = #{@auto_correct}\n" if @auto_correct
   conf.sub!(/^@slow_command_threshold.*(\n|$)/, "")
   conf += "@slow_command_threshold = #{@slow_command_threshold}\n" if @slow_command_threshold && @slow_command_threshold > 0
+  conf.sub!(/^@completion_learning.*(\n|$)/, "")
+  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!(/^@validation_rules.*(\n|$)/, "")
   conf += "@validation_rules = #{@validation_rules}\n" unless @validation_rules.empty?
-  conf.sub!(/^@completion_weights.*(\n|$)/, "")
-  conf += "@completion_weights = #{@completion_weights}\n" unless @completion_weights.empty?
-  conf.sub!(/^@completion_learning.*(\n|$)/, "")
-  conf += "@completion_learning = #{@completion_learning}\n" unless @completion_learning
-  conf.sub!(/^@recordings.*(\n|$)/, "")
-  conf += "@recordings = #{@recordings}\n" unless @recordings.empty?
+
+  File.write(Dir.home+'/.rshrc', conf)
+  rshstate  # Also save runtime state
+end
+def rshstate # Write runtime state to .rshstate (auto-managed, machine-specific)
+  state = ""
+
+  # Runtime data that changes frequently
+  state += "@cmd_frequency = #{@cmd_frequency}\n" unless @cmd_frequency.empty?
+  state += "@cmd_stats = #{@cmd_stats}\n" unless @cmd_stats.empty?
+  state += "@completion_weights = #{@completion_weights}\n" unless @completion_weights.empty?
+  state += "@recordings = #{@recordings}\n" unless @recordings.empty?
+
   # Persist executable cache for faster startup
   if @exe && @exe.length > 100
-    conf.sub!(/^@exe_cache.*(\n|$)/, "")
-    conf += "@exe_cache = #{@exe.inspect}\n"
-    conf.sub!(/^@exe_cache_path.*(\n|$)/, "")
-    conf += "@exe_cache_path = #{ENV['PATH'].inspect}\n"
-    conf.sub!(/^@exe_cache_time.*(\n|$)/, "")
-    conf += "@exe_cache_time = #{Time.now.to_i}\n"
-  end
-  # 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|$)/, "")
+    state += "@exe_cache = #{@exe.inspect}\n"
+    state += "@exe_cache_path = #{ENV['PATH'].inspect}\n"
+    state += "@exe_cache_time = #{Time.now.to_i}\n"
+  end
+
   # Ensure history is properly formatted as valid Ruby array
   begin
     history_str = @history.last(@histsize).inspect
-    conf += "@history = #{history_str}\n"
+    state += "@history = #{history_str}\n"
   rescue => e
-    conf += "@history = []\n"
-    puts "Warning: Error saving history: #{e.message}"
+    state += "@history = []\n"
+    puts "Warning: Error saving history: #{e.message}" if ENV['RSH_DEBUG']
   end
+
+  File.write(Dir.home+'/.rshstate', state)
+end
+def migrate_to_split_config # Migrate from old single .rshrc to split .rshrc + .rshstate
+  return if File.exist?(Dir.home+'/.rshstate')  # Already migrated
+  return unless File.exist?(Dir.home+'/.rshrc')  # Nothing to migrate
+
+  puts "\nMigrating to split configuration (.rshrc + .rshstate)..."
+
+  # Runtime data will already be loaded from .rshrc by load_rshrc_safe
+  # Just need to save it to .rshstate and clean .rshrc
+
+  # Create .rshstate with current runtime data
+  rshstate
+
+  # Clean runtime data from .rshrc
+  conf = File.read(Dir.home+'/.rshrc')
+  conf.sub!(/^@cmd_frequency.*(\n|$)/, "")
+  conf.sub!(/^@cmd_stats.*(\n|$)/, "")
+  conf.sub!(/^@exe_cache.*(\n|$)/, "")
+  conf.sub!(/^@exe_cache_path.*(\n|$)/, "")
+  conf.sub!(/^@exe_cache_time.*(\n|$)/, "")
+  conf.sub!(/^@completion_weights.*(\n|$)/, "")
+  conf.sub!(/^@history =.*(\n|$)/, "")
   File.write(Dir.home+'/.rshrc', conf)
-  puts ".rshrc updated"
+
+  puts "Migration complete!"
+  puts "  .rshrc     -> User config (portable)"
+  puts "  .rshstate  -> Runtime data (auto-managed)\n"
 end
 
 # RSH FUNCTIONS
@@ -2973,6 +3024,15 @@ def load_rshrc_safe
       end
     end
 
+    # Load runtime state from .rshstate (separate file)
+    if File.exist?(Dir.home+'/.rshstate')
+      begin
+        load(Dir.home+'/.rshstate')
+      rescue => e
+        puts "Warning: Could not load .rshstate: #{e.message}" if ENV['RSH_DEBUG']
+      end
+    end
+
   rescue SyntaxError => e
     puts "\n\033[31mERROR: Syntax error in .rshrc:\033[0m"
     puts e.message
@@ -3168,7 +3228,10 @@ 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
   if ENV['LOGIN_SHELL'] or $0 == "-rsh" or ARGV.include?('-l') or ARGV.include?('--login')
     ['/etc/profile', Dir.home+'/.profile', Dir.home+'/.bash_profile', Dir.home+'/.bashrc'].each do |f|
@@ -3191,6 +3254,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.*/, '')
@@ -3212,8 +3276,8 @@ end
 # MAIN PART
 loop do 
   begin
-    @user = Etc.getpwuid(Process.euid).name # For use in @prompt
-    @node = Etc.uname[:nodename]            # For use in @prompt
+    @user ||= Etc.getpwuid(Process.euid).name # Cached for performance
+    @node ||= Etc.uname[:nodename]            # Cached for performance
     # Only reload .rshrc if directory changed (optimization)
     current_dir = Dir.pwd
     if @last_prompt_dir != current_dir
@@ -3221,7 +3285,7 @@ loop do
       @last_prompt_dir = current_dir
     end
     @prompt.gsub!(/#{Dir.home}/, '~') # Simplify path in prompt
-    system("printf \"\033]0;rsh: #{Dir.pwd}\007\"")   # Set Window title to path
+    print "\033]0;rsh: #{current_dir}\007"   # Set window title (no spawn)
     @history[0] = "" unless @history[0]
     cache_executables  # Use cached executable lookup
     # Load plugins on first command (lazy loading)

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: ruby-shell
 version: !ruby/object:Gem::Version
-  version: 3.4.3
+  version: 3.4.5
 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.5: FULL LS_COLORS COMPLIANCE - Prompt and command line now use LS_COLORS with
+  pattern-based directory coloring. Configure @dir_colors like RTFM''s @topmatch for
+  visual project distinction. Plus v3.4.0: Completion learning, context-aware ranking,
+  persistent patterns across sessions!'
 email: g@isene.com
 executables:
 - rsh