ruby-shell 3.4.3 → 3.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa582c1417712c47e836881c478b375ec93f4def3b7f75b4ad9c486c3bfc36d3
-  data.tar.gz: e6c40f3e4eb1277bdd72ec20413a3bee631abb102a818e71d7e18716b665ebf0
+  metadata.gz: 587406cf97c8f8aeba405779d229d073b0c8963b24c224edd1a24d72441411d5
+  data.tar.gz: aa4ea0471988e2004e057c575684f6d2a3f2b3875872e49ee769f22045d52bd5
 SHA512:
-  metadata.gz: 2c9adb770a67ec3c7ac67c42bf7a963b2cedd3c7a4aec8f1d0460210f3fb965286ec528df049426598ca1890df2e00cd174ec96d078e93796acde6ff7ff857e1
-  data.tar.gz: ec2dc6f60a5daf6394d3fc57ad0a977b7e1c9e2e0b4e231c8967cc20052d007b68f2c3e85f226885d26da4f706ff86b6976827b1455bf35fcbbfa1b59fed0ac6
+  metadata.gz: 8fc3e11246348f5eae8bec22ac1d62d990a5ab2727573202363a9c04d6f6e8448bb265fd776ae664004249ac9133baf12a78042da5045b8fe3589e8484414221
+  data.tar.gz: a4305bfba19e86a643440a4d6727e71c3e5d74467fdb9ccf5070345f66a5792256276b299e04714e389d6801e5aadf0253b3da645203bb4135412f5ffa9ec9a2

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.4" # Split .rshrc/.rshstate, performance improvements, symlink colors, auto-migration
 
 # 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
@@ -1338,21 +1343,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 +1368,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 +3007,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
@@ -3169,6 +3212,7 @@ begin # Load .rshrc and populate @history
   end
   firstrun unless File.exist?(Dir.home+'/.rshrc') # Initial loading - to get history
   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|
@@ -3212,8 +3256,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 +3265,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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-shell
 version: !ruby/object:Gem::Version
-  version: 3.4.3
+  version: 3.4.4
 platform: ruby
 authors:
 - Geir Isene