ruby-shell 3.6.17 → 3.6.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47a8896d9151658c431c1f2302f18b0d143887c9fe67d410a64d9c18bd143347
-  data.tar.gz: 230a1b7784618c69c860d169e36be458a09509d66052cd3350e1bb6e16620908
+  metadata.gz: 6a7f4341f245a647d8c45ea36e67f17af871a3dd8dd67b0344257b152d7284ab
+  data.tar.gz: 3a5ec017025daf61f39070689728ef14b787a47964084058be21279b2ef9f795
 SHA512:
-  metadata.gz: 1c841a0dc5675dbd5bf1bb9341b0f9edeead426cec47357a2e1655dc1d67465732822a596d71468a5972f511c2a6f0f2f983ee19ed24317567de6b05affef665
-  data.tar.gz: 61c8fb056e30ad6eba62bca87be4d4d60da8817fb69acee4924d672fa32dcd8f050250a7accae2af6bb288de43907b06c95b38956980af53cdf205c437952f28
+  metadata.gz: 1757bf42491dbde8d205d2756d8c3f41fba9dca3145e523d573ad40c6ffed4009ec35774f56da340936e8ddb71b7ebf53b6da366610a7564a296e08859a4a632
+  data.tar.gz: 302631f9c4d365913bdb796179d8dcb2e67f45038230470d2ba3500e7d2f8606bee41543dfa35f4c87077150472327f7a9a156effc32435044809af9e15c4038

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.19" # Fix nick deletion and hyphenated command handling
 
 # MODULES, CLASSES AND EXTENSIONS
 class String # Add coloring to strings (with escaping for Readline)
@@ -562,9 +562,18 @@ def getstr # A custom Readline-like function
         end
       end
       lift = true
-    when 'C-Y'   # Copy command line to primary selection
-      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-Y'   # Copy to clipboard
+      if @history[0].empty? && @history[1]
+        # Empty line: copy last command to clipboard
+        IO.popen('xclip -selection clipboard', 'w') { |io| io.write(@history[1]) } rescue nil
+        IO.popen('xclip -selection primary', 'w') { |io| io.write(@history[1]) } rescue nil
+        puts "\n#{Time.now.strftime("%H:%M:%S")}: Last command copied to clipboard".c(@c_stamp)
+      else
+        # Non-empty line: copy current line to clipboard
+        IO.popen('xclip -selection clipboard', 'w') { |io| io.write(@history[0]) } rescue nil
+        IO.popen('xclip -selection primary', 'w') { |io| io.write(@history[0]) } rescue nil
+        puts "\n#{Time.now.strftime("%H:%M:%S")}: Copied to clipboard".c(@c_stamp)
+      end
     when 'C-Z'   # Suspend current process (background job)
       if @current_pid
         puts "\n[#{@job_id}] Suspended #{@current_pid}"
@@ -1522,7 +1531,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 +1831,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 +3827,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.17
+  version: 3.6.19
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-23 00:00:00.000000000 Z
+date: 2026-03-25 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