ruby-shell 0.8 → 0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 947102ae716c38ff065cebc636d28aae8d41c558f498adc9b8a604c5bc3f63dc
-  data.tar.gz: f993423dc15b75bbace1628358f328b1a625f6b18d0afef80c2759b7f9b9a807
+  metadata.gz: 37f126a017a54cab294467b035635ce6992f4ae1d67befcd7d4a33882929be5a
+  data.tar.gz: 7210fde457362b3a08e793e62ecf27059e244f514bd77f7aaf8f980c47974826
 SHA512:
-  metadata.gz: 69a90e0445b80e42ca6c3f15da9ee4ca641e6465d09b3342c96d4abfec5179427261a2b4bc68709afc15f12ba3aeaa40790460daeff5dbeb8e0c42587572db8c
-  data.tar.gz: f7a5bba35ab0f40056e102dd7613761da1f3ce9d34f7043fa2ec616390a3626fab64aba52d7e55433abead4d9d74e1584073ada150d7bc7fd37de154449ebc07
+  metadata.gz: 5690e8bed0c4efbcf3194e8a2d5e1cdfa5e339c26cee90281818e6c7d35a4b0ce3c64dbe769b67fc86ff89220304598a15a8f56844c179376ca4813b2baafa71
+  data.tar.gz: 4f0c21b28d1ae2f19cd28d7727e2dce0e8097479188b122092649b49080e60f9210f489155ec2e81b2d7551f3b226f7ee78229abe3814cfc3093140a0c757d38

data/.rshrc

@@ -1,12 +1,24 @@
-@prompt = "#{@user}@#{@node}".c(46) + ":".c(255) + " #{Dir.pwd}/".c(196) + " ".c(7)
-@nick = {"ls"=>"ls --color -F", "la"=>"ls -a --color -F", "ll"=>"ls -l --color -F", "l"=>"less"}
-@gnick = {}
-@history = []
+# vim: set ft=ruby sw=2 sts=2 et :
+
+# PROMPT
+# The numbers in parenthesis are 256 color codes (the '.c()' is a String extention
+# to color text in the terminal. Add '.b' for bold and '.i' for italics.
+if @user == "root"
+  @prompt = "#{@user}@#{@node}".c(160) + ":".c(255) + " #{Dir.pwd}/".c(196) + " ".c(7)
+else
+  @prompt = "#{@user}@#{@node}".c(46) + ":".c(255) + " #{Dir.pwd}/".c(196) + " ".c(7)
+end
+
+# THEME
 @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
 
+# UPDATED ON CTRL-D EXIT
+@nick = {"ls"=>"ls --color -F"}

data/README.md

@@ -15,15 +15,28 @@ Clone this repo and drop `rsh` into your preferred bin directory. Drop `.rshrc`
 Or simply `gem install ruby-shell`.
 
 # Features
-* Aliases (called `nicks`in rsh) - both for commands and general nicks
+* Aliases (called nicks in rsh) - both for commands and general nicks
 * 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
-* History with simple editing
-* Config file (`.rshrc`) updates on exit
-* Set of simple rsh specific commands like `nick`, `nick?`, `history` and `rmhistory`
-* rsh specific commands and full set of Ruby commands available via `:command`
-* All colors are themeable in `.rshrc`
+* 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 editing, search
+* Config file (.rshrc) updates on exit (with Ctrl-d) or not (with Ctrl-c)
+* Set of simple rsh specific commands like nick, nick?, history and rmhistory
+* rsh specific commands and full set of Ruby commands available via :<command>
+* All colors are themeable in .rshrc (see github link for possibilities)
+  
+Special functions/integrations:
+* Use `r` to launch rtfm (https://github.com/isene/RTFM) - if you have it installed
+* Use `f` to launch fzf (https://github.com/junegunn/fzf) - if you have it installed
+* Use `=` followed by xrpn commands separated by commas (https://github.com/isene/xrpn)
+* Use `:` followed by a Ruby expression to access the whole world of Ruby
+
+Special commands:
+* `:nick 'll = ls -l'` to make a command alias (ll) point to a command (ls -l)
+* `:gnick 'h = /home/me'` to make a general alias (h) point to something (/home/me)
+* `:nick?` will list all command nicks and general nicks (you can edit your nicks in .rshrc)
+* `:history` will list the command history, while `:rmhistory` will delete the history
 
 ## Nicks
 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.

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.8"
+@version    = "0.10"
 
 # MODULES, CLASSES AND EXTENSIONS
 class String # Add coloring to strings (with escaping for Readline)
@@ -130,6 +130,68 @@ begin # Initialization
 end
 
 # GENERIC FUNCTIONS
+def firstrun
+  @firstrun = <<~FIRSTRUN
+  Hello #{@user}, welcome to rsh - the Ruby SHell. 
+  
+  rsh does not attempt to compete with the grand old shells like bash and zsh. 
+  It serves the specific needs and wants of its author. If you like it, then feel free 
+  to ask for more or different features here: https://github.com/isene/rsh. Features:
+
+  * Aliases (called nicks in rsh) - both for commands and general nicks
+  * 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 editing, search
+  * Config file (.rshrc) updates on exit (with Ctrl-d) or not (with Ctrl-c)
+  * Set of simple rsh specific commands like nick, nick?, history and rmhistory
+  * rsh specific commands and full set of Ruby commands available via :<command>
+  * All colors are themeable in .rshrc (see github link for possibilities)
+  
+  Special functions/integrations:
+  * Use `r` to launch rtfm (https://github.com/isene/RTFM) - if you have it installed
+  * Use `f` to launch fzf (https://github.com/junegunn/fzf) - if you have it installed
+  * Use `=` followed by xrpn commands separated by commas (https://github.com/isene/xrpn)
+  * Use `:` followed by a Ruby expression to access the whole world of Ruby
+  Special commands:
+  * `:nick 'll = ls -l'` to make a command alias (ll) point to a command (ls -l)
+  * `:gnick 'h = /home/me'` to make a general alias (h) point to something (/home/me)
+  * `:nick?` will list all command nicks and general nicks (you can edit your nicks in .rshrc)
+  * `:history` will list the command history, while `:rmhistory` will delete the history
+  
+  Since there is no rsh configuration file (.rshrc), I will help you set it up to suit your needs.
+FIRSTRUN
+
+  puts @firstrun
+  puts "The prompt you see now is the very basic rsh prompt: "
+  print "#{@prompt} (press ENTER)"
+  STDIN.gets
+  puts "I will now change the prompt into something more useful."
+  puts "Feel free to amend the prompt in your .rshrc."
+  rc = <<~RSHRC
+  # PROMPT
+  # The numbers in parenthesis are 256 color codes (the '.c()' is a String extention
+  # to color text in the terminal. Add '.b' for bold and '.i' for italics.
+  @prompt = "\#{@user}@\#{@node}".c(46) + ":".c(255) + " \#{Dir.pwd}/".c(196) + " ".c(7)
+
+  # THEME
+  @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
+
+  @nick = {"ls"=>"ls --color -F"}
+RSHRC
+  File.write(Dir.home+'/.rshrc', rc)
+
+end
 def getchr # Process key presses
   c = STDIN.getch
   case c
@@ -177,9 +239,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 +251,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 +285,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 +398,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 +435,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 +443,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:]]$/
@@ -467,7 +549,8 @@ end
 # INITIAL SETUP
 begin # Load .rshrc and populate @history
   trap "SIGINT" do print "\n"; exit end
-  load(Dir.home+'/.rshrc') if File.exist?(Dir.home+'/.rshrc') # Initial loading - to get history
+  firstrun unless File.exist?(Dir.home+'/.rshrc') # Initial loading - to get history
+  load(Dir.home+'/.rshrc') 
   @c = Cursor               # Initiate @c as Cursor
   @c.save                   # Get max row & col
   @c.row(8000)
@@ -490,17 +573,22 @@ loop do
     @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"))
+      t  = Time.now
+      t0 = t.nsec.to_s
+      tf = "/tmp/.rshpwd" + t0
+      File.write(tf, Dir.pwd)
+      system("rtfm #{tf}")
+      Dir.chdir(File.read(tf))
+      File.delete(tf)
       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 ":"
       begin
         eval(@cmd[1..-1])
-      rescue Exception => err
-        puts "#{err}"
+      rescue StandardError => err
+      #rescue Exception => err
+        puts "\n#{err}"
       end
     else # Execute command
       @cmd.sub!(/^cd (\S*).*/, '\1')
@@ -526,7 +614,7 @@ loop do
       end
     end
   rescue StandardError => err # Throw error nicely
-    puts "#{err}"
+    puts "\n#{err}"
   end
 end
 

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: ruby-shell
 version: !ruby/object:Gem::Version
-  version: '0.8'
+  version: '0.10'
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-01 00:00:00.000000000 Z
+date: 2023-06-03 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.8: Better error handling.'
+  0.10: Added introduction and creation of .rshrc on first run. Improved rtfm integration.'
 email: g@isene.com
 executables:
 - rsh