ruby-shell 0.3.1 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae06a31d3704b03f547c511116723ebfc3b890000fb74fac0b5cd098a44dbad5
-  data.tar.gz: 81a6f4a939ebed04a679579e16daa6921d25a45bed4f30e8b59caba5c1300e75
+  metadata.gz: 43147c77abd46c4331dc8cf1c7ed4902f2849c7d11a67f00309ac45da5211c55
+  data.tar.gz: 99926b773d53e5b7302a954d62eb3f766ef6caf0c6837cfd77dbdabe4f6a7132
 SHA512:
-  metadata.gz: 40bf4cf2c129d0ef8bdc114aec76e96b41b961467b2cc72bf962a2f7bb43d2225f6b9d2a142c7c90037ef4b526e35cb4e892906b984f22a85a142b1f9b0b5ae3
-  data.tar.gz: 1cd7e4bc2ad55bf3906d107702f604e1931d555cad50b491a573556d4cc23d0273980aa0744f803dbec1d6f23a582f6adf7904f473b257917e06a00c0cf85a14
+  metadata.gz: f53b1c639d01623da942f8255bbfe3b32a53b95faf693c18a4520ac5541c3937a073e67cdd0cee5c2b3b24d71805ca412a45293cd85311bc90c1499af11ba271
+  data.tar.gz: a7c9b7d2255c62169b6cbf3b019f49a61843e3b0051836863c495278b69ce121b99b57208aea75e35a6d5d2b33085cd770644383d7505f3361501e6941aebed2

data/README.md

@@ -1,4 +1,6 @@
 # rsh
+![Ruby](https://img.shields.io/badge/language-Ruby-red) [![Gem Version](https://badge.fury.io/rb/ruby-shell.svg)](https://badge.fury.io/rb/ruby-shell) ![Unlicense](https://img.shields.io/badge/license-Unlicense-green) ![Stay Amazing](https://img.shields.io/badge/Stay-Amazing-important)
+
 The Ruby SHell
 
 # Why?
@@ -29,6 +31,9 @@ Add command nicks (aliases) with `:nick "some_nick = some_command"`, e.g. `:nick
 ## 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.
 
+## 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. 
+
 ## Syntax highlighting
 rsh will highlight nicks, gnicks, commands and dirs/files as they are written on the command line.
 
@@ -44,6 +49,7 @@ Variable        | Description
 `@c_path`       | Color for valid path
 `@c_tabselect`  | Color for selected tabcompleted item
 `@c_taboption`  | Color for unselected tabcompleted item
+`@c_stamp`      | Color for time stamp/command
 
 # Enter the world of Ruby
 By entering `:some-ruby-command` you have full access to the Ruby universe right from your command line. You can do anything from `:puts 2 + 13` or `:if 0.7 > Math::sin(34) then puts "OK" end` or whatever tickles you fancy.

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)
@@ -101,31 +101,31 @@ begin # Requires
 end
 begin # Initialization
   # Theming
-  @c_prompt    = 196                    # Color for basic prompt
-  @c_cmd       = 48                     # Color for valid command
-  @c_nick      = 51                     # Color for matching nick
-  @c_gnick     = 87                     # Color for matching gnick
-  @c_path      = 208                    # Color for valid path
-  @c_switch    = 148                    # Color for switches/options
-  @c_tabselect = 207                    # Color for selected tabcompleted item
-  @c_taboption = 244                    # Color for unselected tabcompleted item
+  @c_prompt    = 196                      # Color for basic prompt
+  @c_cmd       = 48                       # Color for valid command
+  @c_nick      = 51                       # Color for matching nick
+  @c_gnick     = 87                       # Color for matching gnick
+  @c_path      = 208                      # Color for valid path
+  @c_switch    = 148                      # Color for switches/options
+  @c_tabselect = 207                      # Color for selected tabcompleted item
+  @c_taboption = 244                      # Color for unselected tabcompleted item
+  @c_stamp     = 244                      # Color for time stamp/command
   # Prompt
-  @user        = Etc.getlogin           # For use in @prompt
-  @node        = Etc.uname[:nodename]   # For use in @prompt
-  @prompt      = "rsh >".c(@c_prompt).b # Very basic prompt if not defined in .rshrc
+  @prompt      = "rsh > ".c(@c_prompt).b  # Very basic prompt if not defined in .rshrc
   # Hash & array initializations
-  @nick        = {}                     # Initiate alias/nick hash
-  @gnick       = {}                     # Initiate generic/global alias/nick hash
-  @history     = []                     # Initiate history array
+  @nick        = {}                       # Initiate alias/nick hash
+  @gnick       = {}                       # Initiate generic/global alias/nick hash
+  @history     = []                       # Initiate history array
   # Paths
+  @user = Etc.getpwuid(Process.euid).name # For use in @prompt
   @path        = ["/bin", 
                   "/usr/bin", 
-                  "/home/#{@user}/bin"] # Basic paths for executables if not set in .rshrc
+                  "/home/#{@user}/bin"]   # Basic paths for executables if not set in .rshrc
   # History
-  @histsize    = 100                    # Max history if not set in .rshrc
-  @hloaded     = false                  # Variable to determine if history is loaded
+  @histsize    = 100                      # Max history if not set in .rshrc
+  @hloaded     = false                    # Variable to determine if history is loaded
   # Variable initializations
-  @cmd         = ""                     # Initiate variable @cmd
+  @cmd         = ""                       # Initiate variable @cmd
 end
 # GENERIC FUNCTIONS
 def getchr # Process key presses
@@ -184,9 +184,9 @@ def getstr # A custom Readline-like function
     text = @history_copy[@stk]
     @c.clear_line
     print @prompt
-    row, pos0 = @c.pos
+    row, @pos0 = @c.pos
     print cmd_check(text)
-    @c.col(pos0 + @pos)
+    @c.col(@pos0 + @pos)
     chr = getchr
     return "\n" if chr == "C-G" # Ctrl-G escapes the reasdline
     case chr
@@ -225,7 +225,7 @@ def getstr # A custom Readline-like function
         @history_copy[@stk][@pos] = ""
       end
     when 'WBACK' # Delete one word to the left (Ctrl-W)
-      unless @pos == pos0
+      unless @pos == @pos0
         until @history_copy[@stk][@pos - 1] == " " or @pos == 0
           @pos -= 1
           @history_copy[@stk][@pos] = ""
@@ -244,25 +244,29 @@ 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(" ")
-      elements.append("") if @tabstr.match(" $")
+      @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
-      m = elements[i].to_s
-      if m == "-"
+      if @tabsearch =~ /^-/
         until i == 0
           i -= 1
           if elements[i] !~ /^-/
-            @tabstr.chop!
             tab_switch(elements[i])
             break
           end
         end
       else
-        tab_all(m)
+        tab_all(@tabsearch)
       end
-      @history_copy[@stk] = @tabstr + @tabend
+      @history_copy[@stk] = @tabstr.to_s + @tabsearch.to_s + @tabend.to_s
     when /^.$/
       @history_copy[@stk].insert(@pos,chr)
       @pos += 1
@@ -277,13 +281,17 @@ def getstr # A custom Readline-like function
   @history[0]
 end
 def tab_switch(str) # TAB completion for command switches (TAB after "-")
-  hlp = `#{str} --help`
-  hlp = hlp.split("\n").grep(/^\s*-{1,2}[^-]/)
-  hlp = hlp.map {|h| h.sub(/^\s*/, '')}
-  switch, tab = tabselect(hlp)
-  switch = switch.sub(/ .*/, '').sub(/,/, '')
-  @tabstr += switch
-  @pos = @tabstr.length
+  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
+  end
 end
 def tab_all(str) # TAB completion for Dirs/files, nicks and commands
   exe = []
@@ -294,41 +302,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 = File.expand_path(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))
-  @tabstr = @tabstr.sub(/#{str}$/, '') unless compl.empty?
-  match, tab = tabselect(compl) unless compl.empty?
-  @tabstr += match if match
-  @tabstr += str if match == ""
-  @pos = @tabstr.length if match
-end
-def nextline # Handle going to the next line in the terminal
-  row, col = @c.pos
-  if row == @maxrow
-    @c.scroll_down
-    @c_row -= 1
-  end
-  @c.next_line
+  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
   @c_row, @c_col = @c.pos
   chr = ""
-  tab = false
   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
-        print "#{@prompt}#{@tabstr}#{ary[i].sub(/(.*?)[ ,].*/, '\1')}#{@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 + tabchoice.length
         nextline
-        print " #{ary[i]}".c(@c_tabselect)
+        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)
+        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
@@ -343,15 +351,30 @@ def tabselect(ary) # Let user select from the incoming array
       i += 1 unless i > ary.length - 2
     when 'UP'
       i -= 1 unless i == 0
-    when'TAB'
+    when 'TAB'
       chr = "ENTER"
-      tab = true
+    when 'BACK'
+      @tabsearch.chop! unless @tabsearch == ''
+      tab_all(@tabsearch)
+      return @tabsearch
+    when /^[[:print:]]$/
+      @tabsearch += chr
+      tab_all(@tabsearch)
+      return @tabsearch
     end
   end
   @c.clear_screen_down
   @c.row(@c_row)
   @c.col(@c_col)
-  return ary[i], tab
+  return ary[i]
+end
+def nextline # Handle going to the next line in the terminal
+  row, col = @c.pos
+  if row == @maxrow
+    @c.scroll_down
+    @c_row -= 1
+  end
+  @c.next_line
 end
 def hist_clean # Clean up @history
   @history.uniq!
@@ -445,45 +468,41 @@ 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" # Newline
-  if @cmd == "x" then rshrc; break; end # A simple way to exit rsh
+  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(244)
-        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,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: ruby-shell
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: '0.5'
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-24 00:00:00.000000000 Z
+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.3.1: Removed unwanted control
-  chars in input.'
+  history, syntax highlighting and theming. New in 0.5: Code clean-up. Even better
+  tab completion.'
 email: g@isene.com
 executables:
 - rsh