ruby-shell 3.6.17 → 3.6.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47a8896d9151658c431c1f2302f18b0d143887c9fe67d410a64d9c18bd143347
-  data.tar.gz: 230a1b7784618c69c860d169e36be458a09509d66052cd3350e1bb6e16620908
+  metadata.gz: 2e9ecc77e9137be0869ab5108ca168b9af1fe7482f7c48db56d222381f3e0c2b
+  data.tar.gz: ffb83039ed726fdc1484e9c4d283525205dc39cd8a346c981005da8f14c3e5ac
 SHA512:
-  metadata.gz: 1c841a0dc5675dbd5bf1bb9341b0f9edeead426cec47357a2e1655dc1d67465732822a596d71468a5972f511c2a6f0f2f983ee19ed24317567de6b05affef665
-  data.tar.gz: 61c8fb056e30ad6eba62bca87be4d4d60da8817fb69acee4924d672fa32dcd8f050250a7accae2af6bb288de43907b06c95b38956980af53cdf205c437952f28
+  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.17" # Optimize core input loop
+@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)
@@ -1522,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
@@ -1819,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
@@ -3814,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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-shell
 version: !ruby/object:Gem::Version
-  version: 3.6.17
+  version: 3.6.18
 platform: ruby
 authors:
 - Geir Isene
@@ -12,8 +12,7 @@ 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.17: Optimize core input loop with cached syntax highlighting and math-based
-  scroll detection.'
+  v3.6.18: Fix nick deletion persistence and hyphenated command substitution.'
 email: g@isene.com
 executables:
 - rsh