ruby-shell 0.14 → 0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 749e7195bab599d30f9685f7f6195b0691a68754a82c0d7a0ad2a47449aabb3d
-  data.tar.gz: 9a0f880c651ee3b53786b76d883a3bb44bdcb7b7260a615c72226eb220f202c1
+  metadata.gz: 0f69b050eaa1e06a29a3e744fe6a0810ceeb7ccc3fd4eb0ce988e1a28932ece4
+  data.tar.gz: 9edc0f0d12ad882cf8fb1e7a1316b1ef19ee49e8a2c44f445d23be95cf0a02fd
 SHA512:
-  metadata.gz: 47bd21ba4c0be03d47d51ec094c1ec62f3cac58de19b86d57fc263b23bdd74fe13c352ccd584816e3c8de761a1e402254d6d64d2eb6dd04971b0b8b64ee23f30
-  data.tar.gz: 3b477ce839dcc6811677265981e635ac37394babe40992e06ba6192b6d776615a3dfe71ad69e006a5bb2b63357d4cdf78c129aff8815f152befafb4ff5a0fcb5
+  metadata.gz: 39a5f34c1360543721e1b30a219cb8e3a31578a64a5e503f034dadc934a655f794360ee2eab065c73a937445c901c2b918695fc0ea478a8b1dffcf9633ce72f6
+  data.tar.gz: e3f29df7548b173a33e0ae882f651f8b8609de3a3228f366177866253b89c1483f9dfdfbeed59e2ae80168f4d6dd0eabb007ce26e35582a125afacb6dc91a3cc

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
 
+## Screencast
+[![rsh screencast](/img/rsh-screencast.png)](https://youtu.be/4P2z8oSo1u4)
+
 ## 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`.
 

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.14"
+@version    = "0.15"
 
 # MODULES, CLASSES AND EXTENSIONS
 class String # Add coloring to strings (with escaping for Readline)
@@ -246,9 +246,10 @@ def getstr # A custom Readline-like function
   @stk  = 0
   @pos  = 0
   chr   = ""
-  @history.insert(0, "")
+  @history.unshift("")
   while chr != "ENTER" # Keep going with readline until user presses ENTER
     @ci   = nil
+    lift  = false
     right = false
     @c.clear_line
     print @prompt
@@ -276,12 +277,23 @@ def getstr # A custom Readline-like function
       @c.row(1)
       @c.clear_screen_down
     when 'UP'    # Go up in history
+      if lift
+        @history.unshift("")
+        @history[0] = @history[@stk].dup
+        @stk += 1 
+      end
       unless @stk >= @history.length - 1
         @stk += 1 
         @history[0] = @history[@stk].dup
         @pos = @history[0].length
       end
+      lift = false
     when 'DOWN'  # Go down in history
+      if lift
+        @history.unshift("")
+        @history[0] = @history[@stk].dup
+        @stk += 1 
+      end
       if @stk == 0
         @history[0] = ""
         @pos = 0
@@ -294,8 +306,14 @@ def getstr # A custom Readline-like function
         @history[0] = @history[@stk].dup
         @pos = @history[0].length
       end
+      lift = false
     when 'RIGHT' # Move right on the readline
       if right 
+        if lift
+          @history.unshift("")
+          @history[0] = @history[@stk].dup
+          @stk += 1 
+        end
         @history[0] = @history[@ci].dup
         @pos = @history[0].length
       end
@@ -308,11 +326,13 @@ def getstr # A custom Readline-like function
       @pos = @history[0].length
     when 'DEL'   # Delete one character
       @history[0][@pos] = ""
+      lift = true
     when 'BACK'  # Delete one character to the left
       unless @pos <= 0
         @pos -= 1
         @history[0][@pos] = ""
       end
+      lift = true
     when 'WBACK' # Delete one word to the left (Ctrl-W)
       unless @pos == @pos0
         until @history[0][@pos - 1] == " " or @pos == 0
@@ -324,6 +344,7 @@ def getstr # A custom Readline-like function
           @history[0][@pos] = ""
         end
       end
+      lift = true
     when 'C-K'   # Kill/delete that entry in the history
       @history.delete_at(@stk)
       @stk -= 1
@@ -332,13 +353,17 @@ def getstr # A custom Readline-like function
     when 'LDEL'  # Delete readline (Ctrl-U)
       @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[0].insert(@pos,chr)
       @pos += 1
+      lift = true
     end
     while STDIN.ready?
       chr = STDIN.getc
@@ -492,6 +517,8 @@ def cmd_check(str) # Check if each element on the readline matches commands, nic
       el.c(@c_path)
     elsif system "which #{el}", %i[out err] => File::NULL
       el.c(@c_cmd)
+    elsif el == "cd"
+      el.c(@c_cmd)
     elsif el =~ /^-/
       el.c(@c_switch)
     else
@@ -585,6 +612,7 @@ 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
+    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)
@@ -618,6 +646,7 @@ loop do
       @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 = "~" if @cmd == "cd"
       @cmd.sub!(/^cd (\S*).*/, '\1')
       @cmd = Dir.home if @cmd == "~"
       @cmd = @dirs[1] if @cmd == "-"
@@ -629,7 +658,7 @@ loop do
       else
         puts "#{Time.now.strftime("%H:%M:%S")}: #{@cmd}".c(@c_stamp)
         if @cmd == "f" # fzf integration (https://github.com/junegunn/fzf)
-          res = `#{@cmd}`.chomp
+          res = `fzf`.chomp
           Dir.chdir(File.dirname(res))
         else
           if File.exist?(@cmd)

metadata

@@ -1,19 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: ruby-shell
 version: !ruby/object:Gem::Version
-  version: '0.14'
+  version: '0.16'
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-06 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.14: Reworked readline, quirks fixed. Added shortcuts to latest dir visited (number
-  & #) - see Readme or Github for explanation'
+  0.16: Fixed several bugs, added screencast (https://youtu.be/4P2z8oSo1u4).'
 email: g@isene.com
 executables:
 - rsh