ruby-shell 3.6.14 → 3.6.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 909cecd4b06d6987e56e2d8a79dd0aa769e863cd1d80e989c3211f656d4e70e0
-  data.tar.gz: e3d9a6271b77a828559355c1d27fce6d3868e16ff4a3c66820c9ca65aec2fc24
+  metadata.gz: 3e133cdb364d88a5e82942a136ffd6a284105553a5e367bc5415e4623b1715ef
+  data.tar.gz: e712cf81e8ffccebadfb579272892d54617da2e59e53a95fab02b5e6766a5a9f
 SHA512:
-  metadata.gz: e94c7d2e9b6ee78aa6be988923d16765578bf89a3f34888ec52bd40bf9b75eb31cc30d62ab8b6e8384f4513f7825a8e79cd41f9195c9afaf6a8d361bbe13eeb1
-  data.tar.gz: 5b6c42e9cbf4eb548f6640bd4f96429202dc964dd91b42b1655c23b4b35cf4131009f029b11e21b40de7b8b38844b05c496ba61cf053efef52374d28af9fa8d7
+  metadata.gz: f3d81facd0b334b13a4112a17c02aa43e0364844d1405d45e3d989ef2122d24ea0dad9ebf80a86bfa1840fd0d1f1e56c2cddf1fe0c01590aa9feb8df764bc88f
+  data.tar.gz: 7cf717175c6319230ab76586a02d065196e41a51b0e429a26d16bd5dd37ef3c037262a89f59697b4c31b7ad149664e32d8c19cbc9ff6d5581fa6d378463ed421

data/bin/rsh

@@ -8,7 +8,7 @@
 # Web_site:   http://isene.com/
 # Github:     https://github.com/isene/rsh
 # License:    Public domain
-@version    = "3.6.14" # Fix tab completion creating new lines at bottom of screen
+@version    = "3.6.15" # Fix config persistence bugs in .rshrc
 
 # MODULES, CLASSES AND EXTENSIONS
 class String # Add coloring to strings (with escaping for Readline)
@@ -162,6 +162,7 @@ begin # Initialization
   @history_dedup = 'smart'                # History dedup mode: 'off', 'full', 'smart'
   @auto_correct = false                   # Auto-correct typos (default: off)
   @slow_command_threshold = 0             # Threshold for slow command alerts (0 = disabled)
+  @config_dirty = []                      # Track which config vars were changed via :config
   @plugin_dir = Dir.home + '/.rsh/plugins' # Plugins directory
   @plugins = []                           # Loaded plugin instances
   @plugin_enabled = []                    # List of enabled plugin names (whitelist)
@@ -429,7 +430,7 @@ def getstr # A custom Readline-like function
     when 'C-G'   # Ctrl-G opens command in $EDITOR
       temp_file = "/tmp/rsh_edit_#{Process.pid}.tmp"
       File.write(temp_file, @history[0] || "")
-      system("#{ENV['EDITOR'] || 'vi'} #{temp_file}")
+      system(ENV['EDITOR'] || 'vi', temp_file)
       if File.exist?(temp_file)
         edited = File.read(temp_file).strip
         # Convert multi-line to single line with proper separators
@@ -561,7 +562,7 @@ def getstr # A custom Readline-like function
       end
       lift = true
     when 'C-Y'   # Copy command line to primary selection
-      system("echo -n '#{@history[0]}' | xclip")
+      IO.popen('xclip', 'w') { |io| io.write(@history[0]) }
       puts "\n#{Time.now.strftime("%H:%M:%S")}: Copied to primary selection (paste with middle buttoni)".c(@c_stamp)
     when 'C-Z'   # Suspend current process (background job)
       if @current_pid
@@ -968,7 +969,7 @@ def tab(type)
             begin
               count = Dir.entries(clean_item).length - 2
               print " [#{count}]".c(244)
-            rescue
+            rescue Errno::EACCES, Errno::ENOENT
             end
           else
             size = File.size(clean_item)
@@ -1004,7 +1005,7 @@ def tab(type)
               begin
                 count = Dir.entries(clean_item).length - 2
                 print " [#{count}]".c(244)
-              rescue
+              rescue Errno::EACCES, Errno::ENOENT
               end
             else
               size = File.size(clean_item)
@@ -1088,6 +1089,7 @@ def tabend
   @c.col(@c_col)
 end
 def get_command_switches(command) # Helper function to extract switches from --help
+  require 'shellwords' unless defined?(Shellwords)
   # Check cache first (cache expires after 1 hour)
   cache_key = command.to_s.strip
   return [] if cache_key.empty?
@@ -1098,9 +1100,10 @@ def get_command_switches(command) # Helper function to extract switches from --h
   end
 
   # Parse --help output
-  hlp = `#{command} --help 2>/dev/null`
+  escaped = Shellwords.escape(command)
+  hlp = `#{escaped} --help 2>/dev/null`
   # Try -h if --help didn't work
-  hlp = `#{command} -h 2>/dev/null` if hlp.empty?
+  hlp = `#{escaped} -h 2>/dev/null` if hlp.empty?
   return [] if hlp.empty?
 
   switches = []
@@ -1242,6 +1245,7 @@ def config(*args) # Configure rsh settings
   when 'history_dedup'
     if %w[off full smart].include?(value)
       @history_dedup = value
+      @config_dirty << '@history_dedup'
       puts "History deduplication set to '#{value}'"
       rshrc
     else
@@ -1249,30 +1253,37 @@ def config(*args) # Configure rsh settings
     end
   when 'session_autosave'
     @session_autosave = value.to_i
+    @config_dirty << '@session_autosave'
     puts "Session auto-save set to #{value}s #{value.to_i > 0 ? '(enabled)' : '(disabled)'}"
     rshrc
   when 'auto_correct'
     @auto_correct = %w[on true yes 1].include?(value.to_s.downcase)
+    @config_dirty << '@auto_correct'
     puts "Auto-correct #{@auto_correct ? 'enabled' : 'disabled'}"
     rshrc
   when 'slow_command_threshold'
     @slow_command_threshold = value.to_i
+    @config_dirty << '@slow_command_threshold'
     puts "Slow command threshold set to #{value}s #{value.to_i > 0 ? '(enabled)' : '(disabled)'}"
     rshrc
   when 'completion_learning'
     @completion_learning = %w[on true yes 1].include?(value.to_s.downcase)
+    @config_dirty << '@completion_learning'
     puts "Completion learning #{@completion_learning ? 'enabled' : 'disabled'}"
     rshrc
   when 'completion_limit'
     @completion_limit = value.to_i
+    @config_dirty << '@completion_limit'
     puts "Completion limit set to #{value}"
     rshrc
   when 'completion_show_metadata'
     @completion_show_metadata = %w[on true yes 1].include?(value.to_s.downcase)
+    @config_dirty << '@completion_show_metadata'
     puts "Completion metadata display #{@completion_show_metadata ? 'enabled' : 'disabled'}"
     rshrc
   when 'show_tips'
     @show_tips = %w[on true yes 1].include?(value.to_s.downcase)
+    @config_dirty << '@show_tips'
     puts "Startup tips #{@show_tips ? 'enabled' : 'disabled'}"
     rshrc
   else
@@ -1432,7 +1443,7 @@ def format_tab_item(item, show_metadata: false) # Format tab item with color and
         begin
           count = Dir.entries(clean_name).length - 2  # Exclude . and ..
           meta = "[dir, #{count} items]"
-        rescue
+        rescue Errno::EACCES, Errno::ENOENT
           meta = "[dir]"
         end
       else
@@ -1511,7 +1522,7 @@ def rshrc # Write user configuration to .rshrc (portable between machines)
       begin
         file_nicks = eval($1)
         @nick = file_nicks.merge(@nick) if file_nicks.is_a?(Hash)
-      rescue
+      rescue SyntaxError, StandardError
         # If eval fails, keep current @nick
       end
     end
@@ -1521,7 +1532,7 @@ def rshrc # Write user configuration to .rshrc (portable between machines)
       begin
         file_gnicks = eval($1)
         @gnick = file_gnicks.merge(@gnick) if file_gnicks.is_a?(Hash)
-      rescue
+      rescue SyntaxError, StandardError
         # If eval fails, keep current @gnick
       end
     end
@@ -1529,21 +1540,29 @@ def rshrc # Write user configuration to .rshrc (portable between machines)
     conf = ""
   end
 
-  # Persist user-editable configuration using helper
+  # Strip runtime data that belongs in .rshstate (may linger from pre-split config)
+  %w[@cmd_frequency @cmd_stats @exe_cache @exe_cache_path @exe_cache_time
+     @completion_weights @history @recordings @plugin_enabled].each do |var|
+    conf.sub!(/^#{Regexp.escape(var)} =.*\n?/, "")
+  end
+
+  # Persist runtime data (nicks, bookmarks, etc. change during normal use)
   conf = persist_var(conf, '@nick', @nick)
   conf = persist_var(conf, '@gnick', @gnick)
   conf = persist_var(conf, '@bookmarks', @bookmarks, !@bookmarks.empty?)
   conf = persist_var(conf, '@defuns', @defuns, !@defuns.empty?)
-  conf = persist_var(conf, '@history_dedup', @history_dedup, @history_dedup && @history_dedup != 'smart')
-  conf = persist_var(conf, '@session_autosave', @session_autosave, @session_autosave && @session_autosave > 0)
-  conf = persist_var(conf, '@auto_correct', @auto_correct, @auto_correct)
-  conf = persist_var(conf, '@slow_command_threshold', @slow_command_threshold, @slow_command_threshold && @slow_command_threshold > 0)
-  conf = persist_var(conf, '@completion_learning', @completion_learning, !@completion_learning)
-  conf = persist_var(conf, '@show_tips', @show_tips, !@show_tips)
-  conf = persist_var(conf, '@completion_show_metadata', @completion_show_metadata, @completion_show_metadata)
   conf = persist_var(conf, '@plugin_disabled', @plugin_disabled, !@plugin_disabled.empty?)
   conf = persist_var(conf, '@validation_rules', @validation_rules, !@validation_rules.empty?)
 
+  # Only persist config vars that were explicitly changed via :config in this session
+  conf = persist_var(conf, '@history_dedup', @history_dedup, @config_dirty.include?('@history_dedup'))
+  conf = persist_var(conf, '@session_autosave', @session_autosave, @config_dirty.include?('@session_autosave'))
+  conf = persist_var(conf, '@auto_correct', @auto_correct, @config_dirty.include?('@auto_correct'))
+  conf = persist_var(conf, '@slow_command_threshold', @slow_command_threshold, @config_dirty.include?('@slow_command_threshold'))
+  conf = persist_var(conf, '@completion_learning', @completion_learning, @config_dirty.include?('@completion_learning'))
+  conf = persist_var(conf, '@show_tips', @show_tips, @config_dirty.include?('@show_tips'))
+  conf = persist_var(conf, '@completion_show_metadata', @completion_show_metadata, @config_dirty.include?('@completion_show_metadata'))
+
   File.write(Dir.home+'/.rshrc', conf)
   rshstate  # Also save runtime state
 end
@@ -3844,12 +3863,13 @@ loop do
             puts "#{Time.now.strftime("%H:%M:%S")}: #{@cmd}".c(@c_stamp)
             # Only auto-open files if it's a single filename (no spaces = no command with args)
             if File.read(@cmd).force_encoding("UTF-8").valid_encoding?
-              system("#{ENV['EDITOR']} #{@cmd}") # Try open with user's editor
+              system(ENV['EDITOR'] || 'vi', @cmd) # Try open with user's editor
             else
+              require 'shellwords' unless defined?(Shellwords)
               if @runmailcap
-                Thread.new { system("run-mailcap #{@cmd} 2>/dev/null") }
+                Thread.new { system("run-mailcap #{Shellwords.escape(@cmd)} 2>/dev/null") }
               else
-                Thread.new { system("xdg-open #{@cmd} 2>/dev/null") }
+                Thread.new { system("xdg-open #{Shellwords.escape(@cmd)} 2>/dev/null") }
               end
             end
           else

metadata

@@ -1,18 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: ruby-shell
 version: !ruby/object:Gem::Version
-  version: 3.6.14
+  version: 3.6.16
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-27 00:00:00.000000000 Z
+date: 2026-03-21 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.6.14: Fix tab completion creating duplicate lines at bottom of screen.'
+  v3.6.16: Security hardening, fix shell injection in xclip/editor/mailcap calls,
+  narrow bare rescues.'
 email: g@isene.com
 executables:
 - rsh