ruby-shell 0.5 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43147c77abd46c4331dc8cf1c7ed4902f2849c7d11a67f00309ac45da5211c55
-  data.tar.gz: 99926b773d53e5b7302a954d62eb3f766ef6caf0c6837cfd77dbdabe4f6a7132
+  metadata.gz: 800a622da17daf070678be93473db6ebebbc8a2387230d1344941136914b43f5
+  data.tar.gz: 3eb5c0b1067ed677d7215ac83e6d5ee2dc20075487bb3a090feb2614b5ab1220
 SHA512:
-  metadata.gz: f53b1c639d01623da942f8255bbfe3b32a53b95faf693c18a4520ac5541c3937a073e67cdd0cee5c2b3b24d71805ca412a45293cd85311bc90c1499af11ba271
-  data.tar.gz: a7c9b7d2255c62169b6cbf3b019f49a61843e3b0051836863c495278b69ce121b99b57208aea75e35a6d5d2b33085cd770644383d7505f3361501e6941aebed2
+  metadata.gz: f6a32929246f8af6064bec27ab4428c4bb82d850eb893d81ae00fe127390280b43e942cfb3d5e084d1e3bd9137f587d5c642b9a92df018aafa37f8d83805c063
+  data.tar.gz: 4a8099fd7aa338d1f80845165b10cf7f225bf674951d3439feb719a6c7e2ccb520a45266e151357c3214f73b74951c8e6cc3fdfeff468ba32ed14b3ba16479eb

data/README.md

@@ -29,10 +29,18 @@ 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. 
+rsh is integrated with the [rtfm file manager](https://github.com/isene/RTFM), with [fzf](https://github.com/junegunn/fzf) and with the programming language [XRPN](https://github.com/isene/xrpn). 
+
+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. 
+
+If you start a line with "=", the rest of the line will be interpreted as an XRPN program. This gives you the full power of XRPN right at your fingertips. You can do simple stuff like this: `=13,23,*,x^2` and the answer to `(13 * 23)^2` will be given (89401) in the format that you have set in your `.xrpn/conf`. Or you can do more elaborate stuff like `=fix 6,5,sto c,time,'Time now is: ',atime,aview,pse,fix 0,lbl a,rcl c,prx,dse c,gto a`. Go crazy. Use single-quotes for any Alpha entry.
 
 ## Syntax highlighting
 rsh will highlight nicks, gnicks, commands and dirs/files as they are written on the command line.

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.5"
+@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,22 +298,41 @@ 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 - i < 5 ? l = ary.length - i : 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
@@ -327,14 +342,10 @@ def tabselect(ary) # Let user select from the incoming array
         print tabline # Full command line
         @c_col = @pos0 + @tabstr.length + tabchoice.length
         nextline
-        sel0 = " " + ary[i][0...tl]
-        sel1 = ary[i][tl...].c(@c_tabselect)
-        print sel0 + sel1   # Top option selected
+        print " " + ary[i].sub(/(.*?)#{@tabsearch}(.*)/, '\1'.c(@c_tabselect) + @tabsearch + '\2'.c(@c_tabselect))
       else
         begin
-          opt0 = " " + ary[i+x][0...tl]
-          opt1 = ary[i+x][tl...].c(@c_taboption)
-          print opt0 + opt1   # Next option unselected
+          print " " + ary[i+x].sub(/(.*?)#{@tabsearch}(.*)/, '\1'.c(@c_taboption) + @tabsearch + '\2'.c(@c_taboption))
         rescue
         end
       end
@@ -355,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
@@ -387,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)
@@ -414,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:"
@@ -482,6 +494,7 @@ loop do
     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
     if @cmd.match(/^\s*:/) # Ruby commands are prefixed with ":"
       eval(@cmd[1..-1])
@@ -489,20 +502,22 @@ loop do
       @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))
+      if Dir.exists?(dir)
+        Dir.chdir(dir) 
       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}"
+        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) 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
         end
       end
     end

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: ruby-shell
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.7'
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-26 00:00:00.000000000 Z
+date: 2023-05-30 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.5: Code clean-up. Even better
-  tab completion.'
+  history, syntax highlighting, theming and more. In continual development. New in
+  0.7: Added XRPN integration :).'
 email: g@isene.com
 executables:
 - rsh