ruby-shell 0.7 → 0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 800a622da17daf070678be93473db6ebebbc8a2387230d1344941136914b43f5
-  data.tar.gz: 3eb5c0b1067ed677d7215ac83e6d5ee2dc20075487bb3a090feb2614b5ab1220
+  metadata.gz: 2eb807ee53179bcbc57da83b9bdbf7d46d524ad01d384c450df00c0036e636f1
+  data.tar.gz: '0595692866bfd1acf9afda02e157232d7e86701063cf7e5deff2654fe9a1c0d0'
 SHA512:
-  metadata.gz: f6a32929246f8af6064bec27ab4428c4bb82d850eb893d81ae00fe127390280b43e942cfb3d5e084d1e3bd9137f587d5c642b9a92df018aafa37f8d83805c063
-  data.tar.gz: 4a8099fd7aa338d1f80845165b10cf7f225bf674951d3439feb719a6c7e2ccb520a45266e151357c3214f73b74951c8e6cc3fdfeff468ba32ed14b3ba16479eb
+  metadata.gz: 7e9349dee0b04e6f9e0d91afcb4f60d90111249b80d3820b75a4efa16fdcea26e702ba64c895f84c0e903ec018748f8a9258a369015097e9e55f81a9ee1d7d40
+  data.tar.gz: d0ba07abb7b5490609691cafa88fc4c4299823ae91990daab7d5616c69535b2a9e69269141bf93e45721369eaaa93defd496b94101641d2c143b4631134af02f

data/README.md

@@ -19,6 +19,9 @@ Or simply `gem install ruby-shell`.
 * Syntax highlighting, matching nicks, system commands and valid dirs/files
 * Tab completions for nicks, system commands, command switches and dirs/files
 * Tab completion presents matches in a list to pick from
+* When you start to write a command, rsh will suggest the first match in the
+  history and present that in "toned down" letters - press the arrow right key
+  to accept the suggestion.
 * History with simple editing
 * Config file (`.rshrc`) updates on exit
 * Set of simple rsh specific commands like `nick`, `nick?`, `history` and `rmhistory`

data/bin/rsh

@@ -2,11 +2,11 @@
 # encoding: utf-8
 #
 # SCRIPT INFO 
-# Name:       RTFM - Ruby Terminal File Manager
+# Name:       rsh - Ruby SHell
 # Language:   Pure Ruby, best viewed in VIM
 # Author:     Geir Isene <g@isene.com>
 # Web_site:   http://isene.com/
-# Github:     https://github.com/isene/RTFM
+# Github:     https://github.com/isene/rsh
 # License:    I release all copyright claims. This code is in the public domain.
 #             Permission is granted to use, copy modify, distribute, and sell
 #             this software for any purpose. I make no guarantee about the
@@ -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.9"
 
 # MODULES, CLASSES AND EXTENSIONS
 class String # Add coloring to strings (with escaping for Readline)
@@ -177,9 +177,10 @@ def getchr # Process key presses
   return chr
 end
 def getstr # A custom Readline-like function
-  @stk = 0
+  @stk  = 0
   @pos  = 0
-  chr  = ""
+  right = false
+  chr   = ""
   @history.insert(0, "")
   @history_copy = @history.map(&:clone)
   while chr != "ENTER" # Keep going with readline until user presses ENTER
@@ -188,6 +189,16 @@ def getstr # A custom Readline-like function
     print @prompt
     row, @pos0 = @c.pos
     print cmd_check(text)
+    begin
+      cmpl = @history[1..].find {|e| e =~ /^#{Regexp.escape(text)}/}
+      if text.length > 2 and cmpl
+        print cmpl[text.length..].to_s.c(@c_stamp)
+        right = true
+      else
+        right = false
+      end
+    rescue
+    end
     @c.col(@pos0 + @pos)
     chr = getchr
     return "\n" if chr == "C-G" # Ctrl-G escapes the reasdline
@@ -212,6 +223,10 @@ def getstr # A custom Readline-like function
         @pos = @history_copy[@stk].length
       end
     when 'RIGHT' # Move right on the readline
+      if right 
+        @history_copy[@stk] = cmpl 
+        @pos = @history_copy[@stk].length
+      end
       @pos += 1 unless @pos >= @history_copy[@stk].length
     when 'LEFT'  # Move left on the readline
       @pos -= 1 unless @pos <= 0
@@ -321,6 +336,7 @@ def tab_switch(str) # TAB completion for command switches (TAB after "-")
 end
 def tab_hist(str)
   sel  = @history.select {|el| el =~ /#{str}/}
+  sel.delete("")
   hist = tabselect(sel, true)
   @tabsearch = hist if hist
   @pos       = @tabstr.length + @tabsearch.length if hist
@@ -357,7 +373,7 @@ def tabselect(ary, hist=false) # Let user select from the incoming array
     case chr
     when 'C-G', 'C-C'
       @c.clear_screen_down
-      return ""
+      return @tabsearch
     when 'DOWN'
       i += 1 unless i > ary.length - 2
     when 'UP'
@@ -365,7 +381,11 @@ def tabselect(ary, hist=false) # Let user select from the incoming array
     when 'TAB'
       chr = "ENTER"
     when 'BACK'
-      @tabsearch.chop! unless @tabsearch == ''
+      if @tabsearch == ''
+        @c.clear_screen_down
+        return ""
+      end
+      @tabsearch.chop!
       hist ? tab_hist(@tabsearch) : tab_all(@tabsearch)
       return @tabsearch
     when /^[[:print:]]$/
@@ -423,7 +443,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 +500,29 @@ 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 StandardError => err
+      #rescue Exception => err
+        puts "\n#{err}"
+      end
     else # Execute command
       @cmd.sub!(/^cd (\S*).*/, '\1')
       @cmd = Dir.home if @cmd == "~"
@@ -510,7 +535,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
@@ -522,7 +547,7 @@ loop do
       end
     end
   rescue StandardError => err # Throw error nicely
-    puts "#{err}"
+    puts "\n#{err}"
   end
 end
 

metadata

@@ -1,18 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: ruby-shell
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: '0.9'
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-30 00:00:00.000000000 Z
+date: 2023-06-02 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.9: Added the feature to suggdest the first match in history when you start writing
+  a command - press the right arrow key to accept.'
 email: g@isene.com
 executables:
 - rsh