ruby-shell 3.6.16 → 3.6.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e133cdb364d88a5e82942a136ffd6a284105553a5e367bc5415e4623b1715ef
-  data.tar.gz: e712cf81e8ffccebadfb579272892d54617da2e59e53a95fab02b5e6766a5a9f
+  metadata.gz: 2e9ecc77e9137be0869ab5108ca168b9af1fe7482f7c48db56d222381f3e0c2b
+  data.tar.gz: ffb83039ed726fdc1484e9c4d283525205dc39cd8a346c981005da8f14c3e5ac
 SHA512:
-  metadata.gz: f3d81facd0b334b13a4112a17c02aa43e0364844d1405d45e3d989ef2122d24ea0dad9ebf80a86bfa1840fd0d1f1e56c2cddf1fe0c01590aa9feb8df764bc88f
-  data.tar.gz: 7cf717175c6319230ab76586a02d065196e41a51b0e429a26d16bd5dd37ef3c037262a89f59697b4c31b7ad149664e32d8c19cbc9ff6d5581fa6d378463ed421
+  metadata.gz: a5bd6cc37c73511c6267b246c86048f55a48bb6054d9e2242b958f5d6a164a81d04c090b6c0ff053afa84e4ac64fcac2b4e36cae11926f45f7553af1461a27ee
+  data.tar.gz: abe9d8a5fcb1738492c99301c2f2171b4abb5450a4c24f79294b2eebe98a12e7962557e13d0bd79f068423d970223ea4af94358f6f7d40a577af81315efee2e3

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.18" # Fix nick deletion and hyphenated command handling
 
 # MODULES, CLASSES AND EXTENSIONS
 class String # Add coloring to strings (with escaping for Readline)
@@ -388,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)
@@ -1521,7 +1522,10 @@ def rshrc # Write user configuration to .rshrc (portable between machines)
     if conf =~ /@nick\s*=\s*(\{.*?\})/m
       begin
         file_nicks = eval($1)
-        @nick = file_nicks.merge(@nick) if file_nicks.is_a?(Hash)
+        if file_nicks.is_a?(Hash)
+          file_nicks.reject! { |k, _| @deleted_nicks&.include?(k) }
+          @nick = file_nicks.merge(@nick)
+        end
       rescue SyntaxError, StandardError
         # If eval fails, keep current @nick
       end
@@ -1818,8 +1822,9 @@ def nick(nick_str = nil)  # Define a new nick like this: `:nick "ls = ls --color
     puts "Imported #{imported.length} nicks"
     rshrc
   elsif nick_str.match(/^\s*-/)
-    source = nick_str.sub(/^\s*-/, '')
+    source = nick_str.sub(/^\s*-/, '').strip
     if @nick.delete(source)
+      (@deleted_nicks ||= []) << source
       puts "Nick '#{source}' deleted"
       rshrc
     else
@@ -3813,9 +3818,9 @@ loop do
           used_param_nick = first_cmd && @nick[first_cmd] && @nick[first_cmd].include?('{{')
 
           # Do nick/gnick substitution
-          ca = @nick.transform_keys {|k| /((^\K\s*\K)|(\|\K\s*\K))\b(?<!-)#{Regexp.escape k}\b/}
+          ca = @nick.transform_keys {|k| /((^\K\s*\K)|(\|\K\s*\K))\b(?<!-)#{Regexp.escape k}\b(?!-)/}
           @cmd = @cmd.gsub(Regexp.union(ca.keys), @nick)
-          ga = @gnick.transform_keys {|k| /\b(?<!-)#{Regexp.escape k}\b/}
+          ga = @gnick.transform_keys {|k| /\b(?<!-)#{Regexp.escape k}\b(?!-)/}
           @cmd = @cmd.gsub(Regexp.union(ga.keys), @gnick)
 
           # Expand placeholders if parametrized nick was used

metadata

@@ -1,19 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: ruby-shell
 version: !ruby/object:Gem::Version
-  version: 3.6.16
+  version: 3.6.18
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-21 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.16: Security hardening, fix shell injection in xclip/editor/mailcap calls,
-  narrow bare rescues.'
+  v3.6.18: Fix nick deletion persistence and hyphenated command substitution.'
 email: g@isene.com
 executables:
 - rsh