ruby-shell 3.6.15 → 3.6.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b48490df2e369dfa33c4d92ce4c713573d7b1e54ff565a53b62a217db070ca6
-  data.tar.gz: d79027f5999c4765f99b900d7d4bc9edd7dfd90f195799815e6715577ed2bcd8
+  metadata.gz: 47a8896d9151658c431c1f2302f18b0d143887c9fe67d410a64d9c18bd143347
+  data.tar.gz: 230a1b7784618c69c860d169e36be458a09509d66052cd3350e1bb6e16620908
 SHA512:
-  metadata.gz: 81b35c1a4f9b1e30b29381ad3c563b4da9efdf5d4fee1157409c87e7fb256f096fa855f352b4cb7faa1d0d9bd60c9755326f818991a52b8fe2f2eb3365c16409
-  data.tar.gz: ee3bffbbd08096c6651dc8abf6984acb17f1d373d5d2558ea4354c56e1e8d1f6659205be9b339deb1b8e502d875975ade197153e48a787266a0082c074ded8e7
+  metadata.gz: 1c841a0dc5675dbd5bf1bb9341b0f9edeead426cec47357a2e1655dc1d67465732822a596d71468a5972f511c2a6f0f2f983ee19ed24317567de6b05affef665
+  data.tar.gz: 61c8fb056e30ad6eba62bca87be4d4d60da8817fb69acee4924d672fa32dcd8f050250a7accae2af6bb288de43907b06c95b38956980af53cdf205c437952f28

data/bin/rsh

@@ -8,7 +8,7 @@
 # Web_site:   http://isene.com/
 # Github:     https://github.com/isene/rsh
 # License:    Public domain
-@version    = "3.6.15" # Fix config persistence bugs in .rshrc
+@version    = "3.6.17" # Optimize core input loop
 
 # 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)
@@ -387,38 +388,39 @@ def getstr # A custom Readline-like function
     lift  = false
     right = false
 
-    # Clear from cmd_row down (handles wrapped lines from previous iteration)
-    @c.row(@cmd_row)
-    @c.col(1)
-    @c.clear_screen_down
-
-    # Always reprint prompt + command text
-    print @prompt_last_line
-    print cmd_check(@history[0])
+    # Cache syntax highlighting (skip re-highlighting on cursor-only moves)
+    cmd_text = @history[0].to_s
+    if cmd_text != @_hl_text
+      @_hl_text = cmd_text.dup
+      @_hl_result = cmd_check(@history[0])
+    end
 
-    # Print history suggestion if available
-    @ci  = @history[1..].find_index {|e| e =~ /^#{Regexp.escape(@history[0].to_s)}./}
+    # History suggestion lookup
+    @ci  = @history[1..].find_index {|e| e =~ /^#{Regexp.escape(cmd_text)}./}
     unless @ci == nil
       @ci += 1
-      @ciprompt = @history[@ci][@history[0].to_s.length..].to_s
-    end
-    if @history[0].to_s.length > 1 and @ci
-      print @ciprompt.c(@c_stamp)
-      right = true
+      @ciprompt = @history[@ci][cmd_text.length..].to_s
     end
+    right = cmd_text.length > 1 && @ci
 
-    # Detect if terminal scrolled due to wrapping near the bottom
-    end_row, _ = @c.pos
-    printed_len = @pos0 + @history[0].to_s.length
-    printed_len += @ciprompt.to_s.length if right  # Include suggestion text
+    # Compute scroll adjustment before drawing (avoids terminal round-trip)
+    printed_len = @pos0 + cmd_text.length
+    printed_len += @ciprompt.to_s.length if right
     expected_rows = printed_len > 0 ? (printed_len - 1) / @maxcol : 0
-    actual_start = end_row - expected_rows
-    if actual_start < @cmd_row
-      @cmd_row = [actual_start, 1].max  # Terminal scrolled; adjust (min row 1)
+    if @cmd_row + expected_rows > @maxrow
+      @cmd_row = [@maxrow - expected_rows, 1].max
     end
 
+    # Redraw prompt + command
+    @c.row(@cmd_row)
+    @c.col(1)
+    @c.clear_screen_down
+    print @prompt_last_line
+    print @_hl_result
+    print @ciprompt.c(@c_stamp) if right
+
     # Position cursor with wrapping math
-    total_pos = @pos0 + @pos  # 0-indexed total position
+    total_pos = @pos0 + @pos
     cursor_row = @cmd_row + total_pos / @maxcol
     cursor_col = total_pos % @maxcol + 1
     @c.row(cursor_row)
@@ -429,7 +431,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 +563,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 +970,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 +1006,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 +1090,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 +1101,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 +1246,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 +1254,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 +1444,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 +1523,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 +1533,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
@@ -1535,21 +1547,23 @@ def rshrc # Write user configuration to .rshrc (portable between machines)
     conf.sub!(/^#{Regexp.escape(var)} =.*\n?/, "")
   end
 
-  # Persist user-editable configuration using helper
+  # 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)
-  conf = persist_var(conf, '@session_autosave', @session_autosave)
-  conf = persist_var(conf, '@auto_correct', @auto_correct)
-  conf = persist_var(conf, '@slow_command_threshold', @slow_command_threshold)
-  conf = persist_var(conf, '@completion_learning', @completion_learning)
-  conf = persist_var(conf, '@show_tips', @show_tips)
-  conf = persist_var(conf, '@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
@@ -3850,12 +3864,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,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: ruby-shell
 version: !ruby/object:Gem::Version
-  version: 3.6.15
+  version: 3.6.17
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-27 00:00:00.000000000 Z
+date: 2026-03-23 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.15: Fix config persistence bugs - scalar settings now always persist, runtime
-  data stripped from .rshrc.'
+  v3.6.17: Optimize core input loop with cached syntax highlighting and math-based
+  scroll detection.'
 email: g@isene.com
 executables:
 - rsh