ruby-shell 0.4 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03f10b7b8ca979952b3a717420c8cc6002c2ad443933b7006ba9c460e83ef09e
-  data.tar.gz: fee02bd24b9796a4ab8852fa4a9ca6d591942b4aa08461e7decaf7ecf73da334
+  metadata.gz: 43147c77abd46c4331dc8cf1c7ed4902f2849c7d11a67f00309ac45da5211c55
+  data.tar.gz: 99926b773d53e5b7302a954d62eb3f766ef6caf0c6837cfd77dbdabe4f6a7132
 SHA512:
-  metadata.gz: 817094937e32711d26dcc291c5c470e85a1f3901a335c427eede150465747f0761939ce5ccd686630bc3daf0200976533d4fe5e9f3259a364ed384c983aafb0f
-  data.tar.gz: 1f6401e2afef2bb22089b5e28e5c977cf42b85e66182a223e780c25319ec77e168588afc74ea9713224e20bbd1d892da52510c66dc02876b1cec67013c09d231
+  metadata.gz: f53b1c639d01623da942f8255bbfe3b32a53b95faf693c18a4520ac5541c3937a073e67cdd0cee5c2b3b24d71805ca412a45293cd85311bc90c1499af11ba271
+  data.tar.gz: a7c9b7d2255c62169b6cbf3b019f49a61843e3b0051836863c495278b69ce121b99b57208aea75e35a6d5d2b33085cd770644383d7505f3361501e6941aebed2

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.3.1"
+@version    = "0.5"
 
 # MODULES, CLASSES AND EXTENSIONS
 class String # Add coloring to strings (with escaping for Readline)
@@ -315,21 +315,28 @@ def tabselect(ary) # Let user select from the incoming array
   @c_row, @c_col = @c.pos
   chr = ""
   i = 0
-  ary.length < 5 ? l = ary.length : l = 5
+  ary.length - i < 5 ? l = ary.length - i : l = 5
   while chr != "ENTER"
     @c.clear_screen_down
     l.times do |x|
+      tl = @tabsearch.length
       if x == 0
         @c.clear_line
-        tabstart  = cmd_check(@tabstr)
-        tabchoice = ary[i].sub(/(.*?)[ ,].*/, '\1')[@tabsearch.length..]
-        tabline   = "#{@prompt}#{tabstart}#{@tabsearch.c(@c_tabselect)}#{tabchoice}#{@tabend}"
+        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 + @tabsearch.length + tabchoice.length
+        @c_col = @pos0 + @tabstr.length + tabchoice.length
         nextline
-        print " #{ary[i]}".c(@c_tabselect)   # Top option selected
+        sel0 = " " + ary[i][0...tl]
+        sel1 = ary[i][tl...].c(@c_tabselect)
+        print sel0 + sel1   # Top option selected
       else
-        print " #{ary[x+i]}".c(@c_taboption) # Next option unselected
+        begin
+          opt0 = " " + ary[i+x][0...tl]
+          opt1 = ary[i+x][tl...].c(@c_taboption)
+          print opt0 + opt1   # Next option unselected
+        rescue
+        end
       end
       nextline
     end
@@ -468,39 +475,34 @@ loop do
   @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" # Newline
+  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
-  begin # Execute command
+  begin
     if @cmd.match(/^\s*:/) # Ruby commands are prefixed with ":"
       eval(@cmd[1..-1])
-    else
-      begin # Try cd to cmd
-        @cmd.sub!(/^cd (\S*).*/, '\1')
-        @cmd = Dir.home if @cmd == "~"
-        Dir.chdir(@cmd.strip.sub(/~/, Dir.home))
-      rescue # If cd fails, execute cmd (unless no such cmd)
-        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/}
-        @cmd = @cmd.gsub(Regexp.union(ga.keys), @gnick)
-        puts "#{Time.now.strftime("%H:%M:%S")}: #{@cmd}".c(@c_stamp)
-        begin
-          if @cmd == "fzf" # fzf integration (https://github.com/junegunn/fzf)
-            res = `#{@cmd}`.chomp
-            Dir.chdir(File.dirname(res))
-          elsif system(@cmd) # Try execute the command
-          else
-            puts "No such command: #{@cmd}"
-          end
-        rescue
-          if File.exist?(@cmd) # Try to open file with user's editor
-            system("#{ENV['EDITOR']} #{@cmd}")
-          end
+    else # Execute command
+      @cmd.sub!(/^cd (\S*).*/, '\1')
+      @cmd = Dir.home if @cmd == "~"
+      dir  = @cmd.strip.sub(/~/, Dir.home)
+      Dir.chdir(dir) if Dir.exists?(dir)
+      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/}
+      @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)
+        res = `#{@cmd}`.chomp
+        Dir.chdir(File.dirname(res))
+      else
+        if File.exist?(@cmd) # Try to open file with user's editor
+          system("#{ENV['EDITOR']} #{@cmd}")
+        elsif system(@cmd) # Try execute the command
+        else puts "No such command: #{@cmd}"
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-shell
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
 platform: ruby
 authors:
 - Geir Isene
@@ -11,7 +11,8 @@ cert_chain: []
 date: 2023-05-26 00:00:00.000000000 Z
 dependencies: []
 description: 'A shell written in Ruby with extensive tab completions, aliases/nicks,
-  history, syntax highlighting and theming. New in 0.4: Much better tab completion.'
+  history, syntax highlighting and theming. New in 0.5: Code clean-up. Even better
+  tab completion.'
 email: g@isene.com
 executables:
 - rsh