ruby-shell 0.13 → 0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60559c89ac1578e5677855dba379bd293acb3279bb132a072b7218c58055fce0
-  data.tar.gz: 4bc782571e3e56fc19177a24c22c386d4ac764bcb12a8042f8fed3c9563822dc
+  metadata.gz: 0cc8a3f3e80656d09aeb3dc8e1d4a803d0cdd4230d2e32036d0de7fb24746b19
+  data.tar.gz: b08319ac8b7c86c6ba235a45b03f84727e833477ea4aeb3f26a4422a19032632
 SHA512:
-  metadata.gz: 8a41cfe97a651db1d15d3ea5f06552d2b353d50fb8effa918ce701c907c3735f04e2c049c2922a3e9764e2372d7eadb2225589ad590179575bde9c70c05efd8b
-  data.tar.gz: 60e7c66ff3c6db7cbc9e50f226de7469a95737a202d0373c13e7155f430142e38b9a175eec986788887b1cebb4a88991e45262a6c6e5f2f29e1d8c6e287d00dc
+  metadata.gz: 5f9f896f49182e320519dce320605c8c9d1cdde7cbb072379062c148a8764f546673150bb8a7e18bf7fa8d841cffeb7f89966f9500b9c99cdc9b551778dfbba2
+  data.tar.gz: 89fde9f621cf09e57dae9a2ce5f1182755769dc2d0ee53a91cec797ee0e1954b107f97d4cf9a879f0df13d27574d6fe19821632bc78de08137ee8f0efbbb9d7b

data/README.md

@@ -39,6 +39,9 @@ Special commands:
 * `:history` will list the command history, while `:rmhistory` will delete the history
 * `:help` will display this help text
 
+## Moving around
+While you `cd` around to different directories, you can see the last 10 directories visited via the command `:dirs` or the convenient shortcut `#`. Entering the number in the list (like `6` and ENTER) will jump you to that directory. Entering `-` will jump you back to the previous dir (equivalent of `1`. Entering `~` will get you to your home dir. If you want to bookmark a special directory, you can do that via a general nick like this: `:gnick "x = /path/to/a/dir/"` - this would bookmark the directory to the single letter `x`.
+
 ## 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.
 
@@ -52,7 +55,7 @@ rsh is integrated with the [rtfm file manager](https://github.com/isene/RTFM), w
 
 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. 
+Enter the command `f` 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.
 

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.13"
+@version    = "0.15"
 
 # MODULES, CLASSES AND EXTENSIONS
 class String # Add coloring to strings (with escaping for Readline)
@@ -128,7 +128,7 @@ begin # Initialization
   # Use run-mailcap instead of xgd-open? Set = true in .rshrc if iyou want run-mailcap
   @runmailcap  = false
   # Variable initializations
-  @cmd         = ""                       # Initiate variable @cmd
+  @dirs        = ["."]*10
 end
 
 # HELP TEXT
@@ -245,30 +245,28 @@ end
 def getstr # A custom Readline-like function
   @stk  = 0
   @pos  = 0
-  right = false
   chr   = ""
-  @history.insert(0, "")
-  @history_copy = @history.map(&:clone)
+  @history.unshift("")
   while chr != "ENTER" # Keep going with readline until user presses ENTER
-    text = @history_copy[@stk]
+    @ci   = nil
+    lift  = false
+    right = false
     @c.clear_line
     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
+    print cmd_check(@history[0])
+    @ci  = @history[1..].find_index {|e| e =~ /^#{Regexp.escape(@history[0])}/}
+    @ci += 1 unless @ci == nil
+    if @history[0].length > 2 and @ci
+      print @history[@ci][@history[0].length..].to_s.c(@c_stamp)
+      right = true
     end
     @c.col(@pos0 + @pos)
     chr = getchr
-    return "\n" if chr == "C-G" # Ctrl-G escapes the reasdline
     case chr
+    when 'C-G'
+      @history[0] = "" 
+      return
     when 'C-C'   # Ctrl-C exits gracefully but without updating .rshrc
       print "\n"
       exit
@@ -279,73 +277,104 @@ def getstr # A custom Readline-like function
       @c.row(1)
       @c.clear_screen_down
     when 'UP'    # Go up in history
-      unless @stk >= @history_copy.length - 1
+      if lift
+        @history.unshift("")
+        @history[0] = @history[@stk].dup
+        @stk += 1 
+      end
+      unless @stk >= @history.length - 1
         @stk += 1 
-        @pos = @history_copy[@stk].length
+        @history[0] = @history[@stk].dup
+        @pos = @history[0].length
       end
+      lift = false
     when 'DOWN'  # Go down in history
-      unless @stk == 0
+      if lift
+        @history.unshift("")
+        @history[0] = @history[@stk].dup
+        @stk += 1 
+      end
+      if @stk == 0
+        @history[0] = ""
+        @pos = 0
+      elsif @stk == 1
         @stk -= 1 
-        @pos = @history_copy[@stk].length
+        @history[0] = ""
+        @pos = 0
+      else
+        @stk -= 1 
+        @history[0] = @history[@stk].dup
+        @pos = @history[0].length
       end
+      lift = false
     when 'RIGHT' # Move right on the readline
       if right 
-        @history_copy[@stk] = cmpl 
-        @pos = @history_copy[@stk].length
+        if lift
+          @history.unshift("")
+          @history[0] = @history[@stk].dup
+          @stk += 1 
+        end
+        @history[0] = @history[@ci].dup
+        @pos = @history[0].length
       end
-      @pos += 1 unless @pos >= @history_copy[@stk].length
+      @pos += 1 unless @pos >= @history[0].length
     when 'LEFT'  # Move left on the readline
       @pos -= 1 unless @pos <= 0
     when 'HOME'  # Go to beginning of the readline
       @pos = 0
     when 'END'   # Go to the end of the readline
-      @pos = @history_copy[@stk].length
+      @pos = @history[0].length
     when 'DEL'   # Delete one character
-      @history_copy[@stk][@pos] = ""
+      @history[0][@pos] = ""
+      lift = true
     when 'BACK'  # Delete one character to the left
       unless @pos <= 0
         @pos -= 1
-        @history_copy[@stk][@pos] = ""
+        @history[0][@pos] = ""
       end
+      lift = true
     when 'WBACK' # Delete one word to the left (Ctrl-W)
       unless @pos == @pos0
-        until @history_copy[@stk][@pos - 1] == " " or @pos == 0
+        until @history[0][@pos - 1] == " " or @pos == 0
           @pos -= 1
-          @history_copy[@stk][@pos] = ""
+          @history[0][@pos] = ""
         end
-        if @history_copy[@stk][@pos - 1] == " "
+        if @history[0][@pos - 1] == " "
           @pos -= 1
-          @history_copy[@stk][@pos] = ""
+          @history[0][@pos] = ""
         end
       end
+      lift = true
     when 'C-K'   # Kill/delete that entry in the history
-      @history_copy.delete_at(@stk)
       @history.delete_at(@stk)
       @stk -= 1
-      @pos  = @history_copy[@stk].length
+      @history[0] = @history[@stk].dup
+      @pos = @history[0].length
     when 'LDEL'  # Delete readline (Ctrl-U)
-      @history_copy[@stk] = ""
+      @history[0] = ""
       @pos = 0
+      lift = true
     when 'TAB'   # Tab completion of dirs and files
       @tabsearch =~ /^-/ ? tabbing("switch") : tabbing("all")
+      lift = true
     when 'S-TAB'
       tabbing("hist")
+      lift = true
     when /^.$/
-      @history_copy[@stk].insert(@pos,chr)
+      @history[0].insert(@pos,chr)
       @pos += 1
+      lift = true
     end
     while STDIN.ready?
       chr = STDIN.getc
-      @history_copy[@stk].insert(@pos,chr)
+      @history[0].insert(@pos,chr)
       @pos += 1
     end
   end
-  @history.insert(0, @history_copy[@stk])
-  @history[0]
 end
 def tabbing(type)
-  @tabstr    = @history_copy[@stk][0...@pos]
-  @tabend    = @history_copy[@stk][@pos..]
+  @tabstr    = @history[@stk][0...@pos]
+  @tabend    = @history[@stk][@pos..]
   elements   = @tabstr.split(" ")
   if @tabstr.match(" $")
     elements.append("")
@@ -368,7 +397,7 @@ def tabbing(type)
   elsif type == 'hist'
     tab_hist(@tabsearch)
   end
-  @history_copy[@stk] = @tabstr.to_s + @tabsearch.to_s + @tabend.to_s
+  @history[@stk] = @tabstr.to_s + @tabsearch.to_s + @tabend.to_s
 end
 def tab_all(str) # TAB completion for Dirs/files, nicks and commands
   exe = []
@@ -552,6 +581,12 @@ def nick? # Show nicks
   puts "  General nicks:".c(@c_gnick)
   @gnick.each {|key, value| puts "  #{key} = #{value}"}
 end
+def dirs
+  puts "Past direactories:"
+  @dirs.each_with_index do |e,i|
+    puts "#{i}: #{e}"
+  end
+end
 
 # INITIAL SETUP
 begin # Load .rshrc and populate @history
@@ -575,7 +610,11 @@ loop do
     @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
+    system("printf \"\033]0;rsh: #{Dir.pwd}\007\"")   # Set Window title to path 
+    getstr # Main work is here
+    @cmd = @history[0]
+    @dirs.unshift(Dir.pwd)
+    @dirs.pop
     hist_clean # Clean up the history
     @cmd = "ls" if @cmd == "" # Default to ls when no command is given
     print "\n"; @c.clear_screen_down
@@ -598,18 +637,22 @@ loop do
       rescue Exception => err
         puts "\n#{err}"
       end
+    elsif @cmd == '#'
+      dirs
     else # Execute command
+      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)
       @cmd.sub!(/^cd (\S*).*/, '\1')
       @cmd = Dir.home if @cmd == "~"
+      @cmd = @dirs[1] if @cmd == "-"
+      @cmd = @dirs[@cmd.to_i] if @cmd =~ /^\d$/
       dir  = @cmd.strip.sub(/~/, Dir.home)
       if Dir.exist?(dir)
         Dir.chdir(dir) 
         system("git status .") if Dir.exist?(".git")
       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)
         if @cmd == "f" # fzf integration (https://github.com/junegunn/fzf)
           res = `#{@cmd}`.chomp

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: ruby-shell
 version: !ruby/object:Gem::Version
-  version: '0.13'
+  version: '0.15'
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-04 00:00:00.000000000 Z
+date: 2023-06-08 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.13: Automatic git status when entering a git repo/dir.'
+  0.15: Better stack handling for history.'
 email: g@isene.com
 executables:
 - rsh