ruby-shell 0.25 → 1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 585443f4d2aa3921ec34a8267e09aab78a12e3f79cdcdb59da6ea8296abb76bf
-  data.tar.gz: a401d6baf0b938900678e48d0a81dab507f116afa1c60017bfb4657f48a3c84e
+  metadata.gz: b401cd958da9d499c8f83e10c0668100c8a37fe2ceada25115643c508ba79153
+  data.tar.gz: 14c6c94195fb174413aa92aa9b96a00dd4b7160c0321a5f12906734dbbde96f3
 SHA512:
-  metadata.gz: 8e96de7caf23de35f75872a314b056d503576631fb758104fd11f349a18a9563f0b0073be4b346f92aaee24ccc716530ba9006410450ad80f763cefe488f1f3d
-  data.tar.gz: b176b1a6f61a8f175de4f2509230f713c82d83be6758eb8cebf86847982cb7eb10bfc79a79c09103dc663f10ce599d03471e948098046fe3d0ad4759eda6a945
+  metadata.gz: aa7dadcea2331c1d524be7a987e4e6f7ed0a38e3ad8dbef5f5c4152011bb7ea9314ba4f7b73dbfc45e8a18537413e291283bdfe52b68095aeb6c7572176d385d
+  data.tar.gz: 160864330f697225deb7c391491266c82b1289b220724ef974609f13095bc8192196779ea99326d49524875d0da53aa2ee14d8db81b9c0308834442b09792426

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.25"
+@version    = "1.0"
 
 # MODULES, CLASSES AND EXTENSIONS
 class String # Add coloring to strings (with escaping for Readline)
@@ -270,7 +270,7 @@ def getstr # A custom Readline-like function
     case chr
     when 'C-G', 'C-C'
       @history[0] = "" 
-      return
+      @pos = 0
     when 'C-E'   # Ctrl-C exits gracefully but without updating .rshrc
       print "\n"
       exit
@@ -357,8 +357,13 @@ def getstr # A custom Readline-like function
     when 'C-K'   # Kill/delete that entry in the history
       @history.delete_at(@stk)
       @stk -= 1
-      @history[0] = @history[@stk].dup
-      @pos = @history[0].length
+      if @stk == 0
+        @history[0] = "" 
+        @pos = 0
+      else
+        @history[0] = @history[@stk].dup
+        @pos = @history[0].length
+      end
     when 'LDEL'  # Delete readline (Ctrl-U)
       @history[0] = ""
       @pos = 0
@@ -430,7 +435,7 @@ def tab_all(str) # TAB completion for Dirs/files, nicks and commands
 end
 def tab_switch(str) # TAB completion for command switches (TAB after "-")
   begin
-    hlp = `#{str} --help`
+    hlp = `#{str} --help 2>/dev/null`
     hlp = hlp.split("\n").grep(/^\s*-{1,2}[^-]/)
     hlp = hlp.map{|h| h.sub(/^\s*/, '').sub(/^--/, '    --')}
     switch = tabselect(hlp)
@@ -462,7 +467,7 @@ def tabselect(ary, hist=false) # Let user select from the incoming array
       tl = @tabsearch.length
       if x == 0
         @c.clear_line
-        tabchoice = ary[i].sub(/(.*?)[ ,].*/, '\1')
+        tabchoice = ary[i].sub(/^ *(.*?)[ ,].*/, '\1')
         tabline   = "#{@prompt}#{cmd_check(@tabstr)}#{tabchoice.c(@c_tabselect)}#{@tabend}"
         print tabline # Full command line
         @c_col = @pos0 + @tabstr.length + tabchoice.length
@@ -506,7 +511,7 @@ def tabselect(ary, hist=false) # Let user select from the incoming array
   @c.clear_screen_down
   @c.row(@c_row)
   @c.col(@c_col)
-  return ary[i]
+  return ary[i].sub(/^ */, '')
 end
 def nextline # Handle going to the next line in the terminal
   row, col = @c.pos
@@ -525,6 +530,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}"))
@@ -609,7 +616,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__
@@ -691,19 +698,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.25'
+  version: '1.0'
 platform: ruby
 authors:
 - Geir Isene
@@ -11,9 +11,8 @@ cert_chain: []
 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.25: Ctrl-C no longer exits rsh, it cancels the current input. Ctrl-e exits without
-  config save.'
+  history, syntax highlighting, theming, auto-cd, auto-opening files and more. In
+  continual development. New in 1.0: Several fixes. Celebrating rsh as my sole shell.'
 email: g@isene.com
 executables:
 - rsh