ruby-shell 0.24 → 0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 206ad1334e7e4b4c43d32820d57946ae9a7cca94acd988bf4ebcdcc9aa4a72d7
-  data.tar.gz: 17eb90fec5ca92c0995c2bac991af47147389a193b4ff41641fd72f4bc9647e2
+  metadata.gz: 748af44619d5fa3fe9949d80a0bbe6ee20b59f930d0aeb3a509fc87e75358b4c
+  data.tar.gz: abf4fdf08919b9703b839b9cf482b4d7c04f29018bf86c5656f162b04406760b
 SHA512:
-  metadata.gz: 223b18a2c568229ef80bbbbe68c2807e8b747f7f435caba3123d6e250f0cd595bead703d5c3be9d10961d08179f200fbe73eefa40264c0e054a98e2da07e76aa
-  data.tar.gz: 7ab4adf5d00f22ebe20f34702539d329fe82a0dc53d0ef7e558952287bebf6f6b28b0cd783673cedf4e86052cafc494d18969f5f4bc53b54dac1b8193112dc8d
+  metadata.gz: 87ba4d133d7e1d9db8fe8725b51ba07f23fccb91d64f8f77acc6b48e9577da746edfbc296c4776c95311ef1b11bc50223576f0579072a3c12099749b968e5568
+  data.tar.gz: 9390042b865bf9bc03d4ff9c569ca797e68763632dd940713d0826051600943640d563932b08946e757f99476b82f8b9157c44e3d923c6b408d63551e5e27aef

data/README.md

@@ -23,9 +23,9 @@ Or simply `gem install ruby-shell`.
 * Tab completions for nicks, system commands, command switches and dirs/files
 * Tab completion presents matches in a list to pick from
 * When you start to write a command, rsh will suggest the first match in the history and present that in "toned down" letters - press the arrow right key to accept the suggestion.
-* Writing a partial command and pressing `UP` will search history for matches.  Go down/up in the list and press `TAB` or `ENTER` to accept or `Ctrl-G` to discard
+* Writing a partial command and pressing `UP` will search history for matches.  Go down/up in the list and press `TAB` or `ENTER` to accept, `Ctrl-g` or `Ctrl-c` to discard
 * History with editing, search and repeat a history command (with `!`)
-* Config file (.rshrc) updates on exit (with Ctrl-d) or not (with Ctrl-c)
+* Config file (.rshrc) updates on exit (with Ctrl-d) or not (with Ctrl-e)
 * Set of simple rsh specific commands like nick, nick?, history and rmhistory
 * rsh specific commands and full set of Ruby commands available via :<command>
 * All colors are themeable in .rshrc (see github link for possibilities)

data/bin/rsh

@@ -14,7 +14,7 @@
 #             for any damages resulting from its use. Further, I am under no
 #             obligation to maintain or extend this software. It is provided 
 #             on an 'as is' basis without any expressed or implied warranty.
-@version    = "0.24"
+@version    = "0.26"
 
 # MODULES, CLASSES AND EXTENSIONS
 class String # Add coloring to strings (with escaping for Readline)
@@ -147,9 +147,9 @@ end
   * When you start to write a command, rsh will suggest the first match in the history and
     present that in "toned down" letters - press the arrow right key to accept the suggestion
   * Writing a partial command and pressing `UP` will search history for matches.
-    Go down/up in the list and press `TAB` or `ENTER` to accept or `Ctrl-G` to discard
-* History with editing, search and repeat a history command (with `!`)
-  * Config file (.rshrc) updates on exit (with Ctrl-d) or not (with Ctrl-c)
+    Go down/up in the list and press `TAB` or `ENTER` to accept, `Ctrl-g` or `Ctrl-c` to discard
+  * History with editing, search and repeat a history command (with `!`)
+  * Config file (.rshrc) updates on exit (with Ctrl-d) or not (with Ctrl-e)
   * Set of simple rsh specific commands like nick, nick?, history and rmhistory
   * rsh specific commands and full set of Ruby commands available via :<command>
   * All colors are themeable in .rshrc (see github link for possibilities)
@@ -229,6 +229,7 @@ def getchr # Process key presses
   when "", "" then chr = "BACK"
   when "" then chr = "C-C"
   when "" then chr = "C-D"
+  when "" then chr = "C-E"
   when "" then chr = "C-G"
   when "" then chr = "C-K"
   when "" then chr = "C-L"
@@ -267,10 +268,10 @@ def getstr # A custom Readline-like function
     @c.col(@pos0 + @pos)
     chr = getchr
     case chr
-    when 'C-G'
+    when 'C-G', 'C-C'
       @history[0] = "" 
       return
-    when 'C-C'   # Ctrl-C exits gracefully but without updating .rshrc
+    when 'C-E'   # Ctrl-C exits gracefully but without updating .rshrc
       print "\n"
       exit
     when 'C-D'   # Ctrl-D exits after updating .rshrc
@@ -524,6 +525,8 @@ def cmd_check(str) # Check if each element on the readline matches commands, nic
   str.gsub(/\S+/) do |el|
     if @nick.include?(el)
       el.c(@c_nick)
+    elsif el == "r"
+      el.c(@c_nick)
     elsif @gnick.include?(el)
       el.c(@c_gnick)
     elsif File.exist?(el.sub(/^~/, "/home/#{@user}"))
@@ -608,7 +611,7 @@ end
 
 # INITIAL SETUP
 begin # Load .rshrc and populate @history
-  trap "SIGINT" do print "\n"; exit end
+  trap "SIGINT" do end
   firstrun unless File.exist?(Dir.home+'/.rshrc') # Initial loading - to get history
   load(Dir.home+'/.rshrc') 
   ENV["SHELL"] = __FILE__
@@ -690,19 +693,21 @@ loop do
         if @cmd == "f" # fzf integration (https://github.com/junegunn/fzf)
           res = `fzf`.chomp
           Dir.chdir(File.dirname(res))
-        else
-          if File.exist?(@cmd) and not File.executable?(@cmd)
-            if File.read(@cmd).force_encoding("UTF-8").valid_encoding?
-              system("#{ENV['EDITOR']} #{@cmd}") # Try open with user's editor
+        elsif File.exist?(@cmd) and not File.executable?(@cmd)
+          if File.read(@cmd).force_encoding("UTF-8").valid_encoding?
+            system("#{ENV['EDITOR']} #{@cmd}") # Try open with user's editor
+          else
+            if @runmailcap
+              Thread.new { system("run-mailcap #{@cmd} 2>/dev/null") }
             else
-              if @runmailcap
-                Thread.new { system("run-mailcap #{@cmd} 2>/dev/null") }
-              else
-                Thread.new { system("xdg-open #{@cmd} 2>/dev/null") }
-              end
+              Thread.new { system("xdg-open #{@cmd} 2>/dev/null") }
             end
-          elsif system(@cmd) # Try execute the command
-          else puts "No such command or nick: #{@cmd}"
+          end
+        else 
+          begin
+            puts "No such command or nick: #{@cmd}" unless system (@cmd) # Try execute the command
+          rescue StandardError => err
+            puts "\n#{err}"
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-shell
 version: !ruby/object:Gem::Version
-  version: '0.24'
+  version: '0.26'
 platform: ruby
 authors:
 - Geir Isene
@@ -12,7 +12,7 @@ date: 2023-06-19 00:00:00.000000000 Z
 dependencies: []
 description: 'A shell written in Ruby with extensive tab completions, aliases/nicks,
   history, syntax highlighting, theming and more. In continual development. New in
-  0.24: Minor bug fix in tab completion.'
+  0.26: Finally fixed a graceful handling of Ctrl-c.'
 email: g@isene.com
 executables:
 - rsh