ruby-shell 0.7 → 0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 800a622da17daf070678be93473db6ebebbc8a2387230d1344941136914b43f5
-  data.tar.gz: 3eb5c0b1067ed677d7215ac83e6d5ee2dc20075487bb3a090feb2614b5ab1220
+  metadata.gz: 947102ae716c38ff065cebc636d28aae8d41c558f498adc9b8a604c5bc3f63dc
+  data.tar.gz: f993423dc15b75bbace1628358f328b1a625f6b18d0afef80c2759b7f9b9a807
 SHA512:
-  metadata.gz: f6a32929246f8af6064bec27ab4428c4bb82d850eb893d81ae00fe127390280b43e942cfb3d5e084d1e3bd9137f587d5c642b9a92df018aafa37f8d83805c063
-  data.tar.gz: 4a8099fd7aa338d1f80845165b10cf7f225bf674951d3439feb719a6c7e2ccb520a45266e151357c3214f73b74951c8e6cc3fdfeff468ba32ed14b3ba16479eb
+  metadata.gz: 69a90e0445b80e42ca6c3f15da9ee4ca641e6465d09b3342c96d4abfec5179427261a2b4bc68709afc15f12ba3aeaa40790460daeff5dbeb8e0c42587572db8c
+  data.tar.gz: f7a5bba35ab0f40056e102dd7613761da1f3ce9d34f7043fa2ec616390a3626fab64aba52d7e55433abead4d9d74e1584073ada150d7bc7fd37de154449ebc07

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.6"
+@version    = "0.8"
 
 # MODULES, CLASSES AND EXTENSIONS
 class String # Add coloring to strings (with escaping for Readline)
@@ -423,7 +423,7 @@ def rshrc # Write updates to .rshrc
   conf.sub!(/^@history.*\n/, "") 
   conf += "@history = #{@history.last(@histsize)}\n"
   File.write(Dir.home+'/.rshrc', conf)
-  puts "\n .rshrc updated"
+  puts ".rshrc updated"
 end
 
 # RSH FUNCTIONS
@@ -480,24 +480,28 @@ end
 
 # MAIN PART
 loop do 
-  @user = Etc.getpwuid(Process.euid).name # For use in @prompt
-  @node = Etc.uname[:nodename]            # For use in @prompt
-  h = @history; load(Dir.home+'/.rshrc') if File.exist?(Dir.home+'/.rshrc'); @history = h # reload prompt but not history
-  @prompt.gsub!(/#{Dir.home}/, '~') # Simplify path in prompt
-  @cmd = getstr # Main work is here
-  hist_clean # Clean up the history
-  @cmd = "ls" if @cmd == "" # Default to ls when no command is given
-  print "\n"; @c.clear_screen_down
-  if @cmd == "r" # Integration with rtfm (https://github.com/isene/RTFM)
-    File.write("/tmp/.rshpwd", Dir.pwd)
-    system("rtfm /tmp/.rshpwd")
-    Dir.chdir(File.read("/tmp/.rshpwd"))
-    next
-  end
-  @cmd = "echo \"#{@cmd[1...]},prx,off\" | xrpn" if @cmd =~ /^\=/ # Integration with xrpn (https://github.com/isene/xrpn)
   begin
+    @user = Etc.getpwuid(Process.euid).name # For use in @prompt
+    @node = Etc.uname[:nodename]            # For use in @prompt
+    h = @history; load(Dir.home+'/.rshrc') if File.exist?(Dir.home+'/.rshrc'); @history = h # reload prompt but not history
+    @prompt.gsub!(/#{Dir.home}/, '~') # Simplify path in prompt
+    @cmd = getstr # Main work is here
+    hist_clean # Clean up the history
+    @cmd = "ls" if @cmd == "" # Default to ls when no command is given
+    print "\n"; @c.clear_screen_down
+    if @cmd == "r" # Integration with rtfm (https://github.com/isene/RTFM)
+      File.write("/tmp/.rshpwd", Dir.pwd)
+      system("rtfm /tmp/.rshpwd")
+      Dir.chdir(File.read("/tmp/.rshpwd"))
+      next
+    end
+    @cmd = "echo \"#{@cmd[1...]},prx,off\" | xrpn" if @cmd =~ /^\=/ # Integration with xrpn (https://github.com/isene/xrpn)
     if @cmd.match(/^\s*:/) # Ruby commands are prefixed with ":"
-      eval(@cmd[1..-1])
+      begin
+        eval(@cmd[1..-1])
+      rescue Exception => err
+        puts "#{err}"
+      end
     else # Execute command
       @cmd.sub!(/^cd (\S*).*/, '\1')
       @cmd = Dir.home if @cmd == "~"
@@ -510,7 +514,7 @@ loop do
         ga = @gnick.transform_keys {|k| /\b#{Regexp.escape k}\b/}
         @cmd = @cmd.gsub(Regexp.union(ga.keys), @gnick)
         puts "#{Time.now.strftime("%H:%M:%S")}: #{@cmd}".c(@c_stamp)
-        if @cmd == "fzf" # fzf integration (https://github.com/junegunn/fzf)
+        if @cmd == "f" # fzf integration (https://github.com/junegunn/fzf)
           res = `#{@cmd}`.chomp
           Dir.chdir(File.dirname(res))
         else

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: ruby-shell
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: '0.8'
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-30 00:00:00.000000000 Z
+date: 2023-06-01 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.7: Added XRPN integration :).'
+  0.8: Better error handling.'
 email: g@isene.com
 executables:
 - rsh