ruby-shell 0.4 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03f10b7b8ca979952b3a717420c8cc6002c2ad443933b7006ba9c460e83ef09e
-  data.tar.gz: fee02bd24b9796a4ab8852fa4a9ca6d591942b4aa08461e7decaf7ecf73da334
+  metadata.gz: a90c70f4301d27cd625341258f896e214b489b7bc7f94df209696970f00d44e9
+  data.tar.gz: 769a76676650f1bc307c22dcc4f6b2198196673b7c70acead191d6a08c802e30
 SHA512:
-  metadata.gz: 817094937e32711d26dcc291c5c470e85a1f3901a335c427eede150465747f0761939ce5ccd686630bc3daf0200976533d4fe5e9f3259a364ed384c983aafb0f
-  data.tar.gz: 1f6401e2afef2bb22089b5e28e5c977cf42b85e66182a223e780c25319ec77e168588afc74ea9713224e20bbd1d892da52510c66dc02876b1cec67013c09d231
+  metadata.gz: 78db98d6b5f0925ad5460985479480e95f03faa42ec8a4d136ad63962d956b41aab7df0077131a05546fd3d05329023242e848f138ffa87ccc0ba138f9a07d24
+  data.tar.gz: 306debaadf9e812c4cb6ee47e153964a2c00c866ec4208e8b5ea04b645b571004136c081e6529f54a3696515e6446bb206d9c0cfee653a24bce6e69bf3ae975a

data/README.md

@@ -29,7 +29,9 @@ Or simply `gem install ruby-shell`.
 Add command nicks (aliases) with `:nick "some_nick = some_command"`, e.g. `:nick "ls = ls --color"`. Add general nicks that will substitute anything on a command line (not just commands) like this `:gnick "some_gnick = some_command"`, e.g. `:gnick "x = /home/user/somewhere"`. List (g)nicks with `:nick?`. Remove a nick with `:nick "-some_command"`, e.g. `:nick "-ls"` to remove an `ls` nick. Same for gnicks.
 
 ## Tab completion
-You can tab complete almost anything. Hitting `TAB` will try to complete in this priority: nicks, gnicks, commands, dirs/files. Hitting `TAB`after a `-` will list the command switches for the preceding command with a short explanation (from the command's --help), like this `ls -`(`TAB`) will list all the switches/options for the `ls` command.
+You can tab complete almost anything. Hitting `TAB` will try to complete in this priority: nicks, gnicks, commands, dirs/files. Hitting `TAB`after a `-` will list the command switches for the preceding command with a short explanation (from the command's --help), like this `ls -`(`TAB`) will list all the switches/options for the `ls` command. You can add to (or subtract from) the search criteria while selecting possible matches - hit any letter to specify the search, while backspace removes a letter from the search criteria. 
+
+Hitting Shift-TAB will do a similar search through the command history - but with a general match of the search criteria (not only matching at the start).
 
 ## Integrations
 rsh is integrated with the [rtfm file manager](https://github.com/isene/RTFM) and with [fzf](https://github.com/junegunn/fzf). Just enter the command `r` and rtfm will be launched - and when you quit the file manager, you will drop back into rsh in the directory you where you exited rtfm. Enter the command `fzf` to launch the fuzzy finder - select the directory/file you want, press `ENTER` and you will find yourself in the directory where that item resides. 

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.6"
 
 # MODULES, CLASSES AND EXTENSIONS
 class String # Add coloring to strings (with escaping for Readline)
@@ -38,7 +38,7 @@ module Cursor # Terminal cursor movement ANSI codes (thanks to https://github.co
   def pos # Query cursor current position
     res = ''
     $stdin.raw do |stdin|
-      $stdout << "\e[6n"
+      $stdout << CSI + '6n' # Tha actual ANSI get-position
       $stdout.flush
       while (c = stdin.getc) != 'R'
         res << c if c
@@ -93,6 +93,7 @@ module Cursor # Terminal cursor movement ANSI codes (thanks to https://github.co
     print(CSI + 'J')
   end
 end
+
 # INITIALIZATION
 begin # Requires
   require 'etc'
@@ -127,6 +128,7 @@ begin # Initialization
   # Variable initializations
   @cmd         = ""                       # Initiate variable @cmd
 end
+
 # GENERIC FUNCTIONS
 def getchr # Process key presses
   c = STDIN.getch
@@ -244,29 +246,9 @@ def getstr # A custom Readline-like function
       @history_copy[@stk] = ""
       @pos = 0
     when 'TAB'   # Tab completion of dirs and files
-      @tabstr    = @history_copy[@stk][0...@pos]
-      @tabend    = @history_copy[@stk][@pos..]
-      elements   = @tabstr.split(" ")
-      if @tabstr.match(" $")
-        elements.append("")
-        @tabsearch = ""
-      else
-        @tabsearch = elements.last.to_s
-        @tabstr = @tabstr[0...-@tabsearch.length]
-      end
-      i = elements.length - 1
-      if @tabsearch =~ /^-/
-        until i == 0
-          i -= 1
-          if elements[i] !~ /^-/
-            tab_switch(elements[i])
-            break
-          end
-        end
-      else
-        tab_all(@tabsearch)
-      end
-      @history_copy[@stk] = @tabstr.to_s + @tabsearch.to_s + @tabend.to_s
+      @tabsearch =~ /^-/ ? tabbing("switch") : tabbing("all")
+    when 'S-TAB'
+      tabbing("hist")
     when /^.$/
       @history_copy[@stk].insert(@pos,chr)
       @pos += 1
@@ -280,18 +262,32 @@ def getstr # A custom Readline-like function
   @history.insert(0, @history_copy[@stk])
   @history[0]
 end
-def tab_switch(str) # TAB completion for command switches (TAB after "-")
-  begin
-    hlp = `#{str} --help`
-    hlp = hlp.split("\n").grep(/^\s*-{1,2}[^-]/)
-    hlp = hlp.map {|h| h.sub(/^\s*/, '')}
-    switch = tabselect(hlp)
-    switch = switch.sub(/ .*/, '').sub(/,/, '')
-    @tabsearch.chop!
-    @tabsearch += switch
-    @pos = @tabstr.length + @tabsearch.length
-  rescue
+def tabbing(type)
+  @tabstr    = @history_copy[@stk][0...@pos]
+  @tabend    = @history_copy[@stk][@pos..]
+  elements   = @tabstr.split(" ")
+  if @tabstr.match(" $")
+    elements.append("")
+    @tabsearch = ""
+  else
+    @tabsearch = elements.last.to_s
+    @tabstr = @tabstr[0...-@tabsearch.length]
   end
+  i = elements.length - 1
+  if @tabsearch =~ /^-/
+    until i == 0
+      i -= 1
+      if elements[i] !~ /^-/
+        tab_switch(elements[i])
+        break
+      end
+    end
+  elsif type == 'all'
+    tab_all(@tabsearch)
+  elsif type == 'hist'
+    tab_hist(@tabsearch)
+  end
+  @history_copy[@stk] = @tabstr.to_s + @tabsearch.to_s + @tabend.to_s
 end
 def tab_all(str) # TAB completion for Dirs/files, nicks and commands
   exe = []
@@ -302,34 +298,56 @@ def tab_all(str) # TAB completion for Dirs/files, nicks and commands
   end
   exe.prepend(*@nick.keys)
   exe.prepend(*@gnick.keys)
-  compl       = exe.select {|s| s =~ Regexp.new("^" + str)}
-  fdir        = str
-  fdir       += "/" if Dir.exist?(fdir)
-  fdir       += "*"
+  compl      = exe.select {|s| s =~ Regexp.new("^" + str)}
+  fdir       = str
+  fdir      += "/" if Dir.exist?(fdir)
+  fdir      += "*"
   compl.prepend(*Dir.glob(fdir))
-  match       = tabselect(compl) unless compl.empty?
-  @tabsearch  = match if match
-  @pos        = @tabstr.length + @tabsearch.length if match
+  match      = tabselect(compl) unless compl.empty?
+  @tabsearch = match if match
+  @pos       = @tabstr.length + @tabsearch.length if match
 end
-def tabselect(ary) # Let user select from the incoming array
+def tab_switch(str) # TAB completion for command switches (TAB after "-")
+  begin
+    hlp = `#{str} --help`
+    hlp = hlp.split("\n").grep(/^\s*-{1,2}[^-]/)
+    hlp = hlp.map {|h| h.sub(/^\s*/, '')}
+    switch = tabselect(hlp)
+    switch = switch.sub(/ .*/, '').sub(/,/, '')
+    @tabsearch = switch if switch
+    @pos = @tabstr.length + @tabsearch.length
+  rescue
+  end
+end
+def tab_hist(str)
+  sel  = @history.select {|el| el =~ /#{str}/}
+  hist = tabselect(sel, true)
+  @tabsearch = hist if hist
+  @pos       = @tabstr.length + @tabsearch.length if hist
+end
+def tabselect(ary, hist=false) # Let user select from the incoming array
+  ary.uniq!
   @c_row, @c_col = @c.pos
   chr = ""
   i = 0
-  ary.length < 5 ? l = ary.length : l = 5
   while chr != "ENTER"
     @c.clear_screen_down
+    ary.length - i < 5 ? l = ary.length - i : l = 5
     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
+        print " " + ary[i].sub(/(.*?)#{@tabsearch}(.*)/, '\1'.c(@c_tabselect) + @tabsearch + '\2'.c(@c_tabselect))
       else
-        print " #{ary[x+i]}".c(@c_taboption) # Next option unselected
+        begin
+          print " " + ary[i+x].sub(/(.*?)#{@tabsearch}(.*)/, '\1'.c(@c_taboption) + @tabsearch + '\2'.c(@c_taboption))
+        rescue
+        end
       end
       nextline
     end
@@ -348,11 +366,11 @@ def tabselect(ary) # Let user select from the incoming array
       chr = "ENTER"
     when 'BACK'
       @tabsearch.chop! unless @tabsearch == ''
-      tab_all(@tabsearch)
+      hist ? tab_hist(@tabsearch) : tab_all(@tabsearch)
       return @tabsearch
     when /^[[:print:]]$/
       @tabsearch += chr
-      tab_all(@tabsearch)
+      hist ? tab_hist(@tabsearch) : tab_all(@tabsearch)
       return @tabsearch
     end
   end
@@ -380,7 +398,7 @@ def cmd_check(str) # Check if each element on the readline matches commands, nic
       el.c(@c_nick)
     elsif @gnick.include?(el)
       el.c(@c_gnick)
-    elsif File.exists?(el.sub(/^~/, "/home/#{@user}"))
+    elsif File.exist?(el.sub(/^~/, "/home/#{@user}"))
       el.c(@c_path)
     elsif system "which #{el}", %i[out err] => File::NULL
       el.c(@c_cmd)
@@ -407,6 +425,7 @@ def rshrc # Write updates to .rshrc
   File.write(Dir.home+'/.rshrc', conf)
   puts "\n .rshrc updated"
 end
+
 # RSH FUNCTIONS
 def history # Show history
   puts "History:"
@@ -468,38 +487,35 @@ 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)
+    else # Execute command
+      @cmd.sub!(/^cd (\S*).*/, '\1')
+      @cmd = Dir.home if @cmd == "~"
+      dir  = @cmd.strip.sub(/~/, Dir.home)
+      if Dir.exists?(dir)
+        Dir.chdir(dir) 
+      else
         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))
+        if @cmd == "fzf" # fzf integration (https://github.com/junegunn/fzf)
+          res = `#{@cmd}`.chomp
+          Dir.chdir(File.dirname(res))
+        else
+          if File.exist?(@cmd) then system("#{ENV['EDITOR']} #{@cmd}") # Try open with user's editor
           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}")
+          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.6'
 platform: ruby
 authors:
 - Geir Isene
@@ -11,7 +11,9 @@ 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, theming and more. In continual development. New in
+  0.6: Included history search with Shift-TAB + general improvements (thanks to folks
+  at #ruby at Libera.Chat).'
 email: g@isene.com
 executables:
 - rsh