ruby-shell 0.15 → 0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cc8a3f3e80656d09aeb3dc8e1d4a803d0cdd4230d2e32036d0de7fb24746b19
-  data.tar.gz: b08319ac8b7c86c6ba235a45b03f84727e833477ea4aeb3f26a4422a19032632
+  metadata.gz: 6ea645b8bba423139ea6be4e7733105473c56e38d7a3906d45d4168b8acc2326
+  data.tar.gz: 5673ee1c0114d7f23526489c8110643190c49b1727b2558dd75d82bf41ad4442
 SHA512:
-  metadata.gz: 5f9f896f49182e320519dce320605c8c9d1cdde7cbb072379062c148a8764f546673150bb8a7e18bf7fa8d841cffeb7f89966f9500b9c99cdc9b551778dfbba2
-  data.tar.gz: 89fde9f621cf09e57dae9a2ce5f1182755769dc2d0ee53a91cec797ee0e1954b107f97d4cf9a879f0df13d27574d6fe19821632bc78de08137ee8f0efbbb9d7b
+  metadata.gz: 0ae62a4ab5e9723e317dd8b6146e849350fcd9083b0702a00ce2ea27ead76749c9fb41156931bc22386aa6c0fe06cf9d11ebd98c64f80852c331c1c3bccd39be
+  data.tar.gz: 5c053d2d1c193843c5b8112bc947541ae14169cb89a8a7b5153f1808394efea7a1eb223e2a28ff25352a6a39d6beccaa199a1eb054db71b11d791dc6e68a8fe1

data/README.md

@@ -14,13 +14,16 @@ Clone this repo and drop `rsh` into your preferred bin directory. Drop `.rshrc`
 
 Or simply `gem install ruby-shell`.
 
+# Screencast
+[![rsh screencast](/img/rsh-screencast.png)](https://youtu.be/4P2z8oSo1u4)
+
 # 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
+* History with editing, search and repeat a history command (with `!`)
 * 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>
@@ -37,6 +40,7 @@ Special commands:
 * `: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
+* `:version` Shows the rsh version number and the last published gem file version
 * `:help` will display this help text
 
 ## Moving around
@@ -50,6 +54,12 @@ You can tab complete almost anything. Hitting `TAB` will try to complete in this
 
 Hitting Shift-TAB will do a similar search through the command history - but with a general match of the search criteria (not only matching at the start).
 
+## Open files
+If you press `ENTER` after writing or tab-completing to a file, rsh will try to open the file in the user's EDITOR of choice (if it is a valid text file) or use `xdg-open` to open the file using the correct program. If you, for some reason want to use `run-mailcap` instead of `xdg-open` as the file opener, simply add `@runmailcap = true` to your `.rshrc`.
+
+## History
+Show the history with `:history`. Redo a history command with an exclamation mark and the number corresponding to the position in the history, like `!5` would do the 5th history command again.
+
 ## Integrations
 rsh is integrated with the [rtfm file manager](https://github.com/isene/RTFM), with [fzf](https://github.com/junegunn/fzf) and with the programming language [XRPN](https://github.com/isene/xrpn). 
 
@@ -76,9 +86,6 @@ Variable        | Description
 `@c_taboption`  | Color for unselected tabcompleted item
 `@c_stamp`      | Color for time stamp/command
 
-# Open files
-If you press `ENTER` after writing or tab-completing to a file, rsh will try to open the file in the user's EDITOR of choice (if it is a valid text file) or use `xdg-open` to open the file using the correct program. If you, for some reason want to use `run-mailcap` instead of `xdg-open` as the file opener, simply add `@runmailcap = true` to your `.rshrc`.
-
 # 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.15"
+@version    = "0.17"
 
 # MODULES, CLASSES AND EXTENSIONS
 class String # Add coloring to strings (with escaping for Readline)
@@ -146,7 +146,7 @@ end
   * 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
+  * History with editing, search and repeat a history command (with `!`)
   * 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>
@@ -162,6 +162,7 @@ end
   * `: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
+  * `:version` Shows the rsh version number and the last published gem file version
   * `:help` will display this help text
   
 HELP
@@ -517,6 +518,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
@@ -545,9 +548,12 @@ end
 def help
   puts @help
 end
+def version
+  puts "rsh version = #{@version} (latest RubyGems version is #{Gem.latest_version_for("ruby-shell").version} - https://github.com/isene/rsh)"
+end
 def history # Show history
   puts "History:"
-  puts @history
+  @history.each_with_index {|h,i| puts i.to_s + "; " + h}
 end
 def rmhistory # Delete history
   @history = []
@@ -617,6 +623,10 @@ loop do
     @dirs.pop
     hist_clean # Clean up the history
     @cmd = "ls" if @cmd == "" # Default to ls when no command is given
+    if @cmd.match(/^!\d+/)
+      hi = @history[@cmd.sub(/^!(\d+)$/, '\1').to_i+1] 
+      @cmd = hi if hi
+    end
     print "\n"; @c.clear_screen_down
     if @cmd == "r" # Integration with rtfm (https://github.com/isene/RTFM)
       t  = Time.now
@@ -637,13 +647,14 @@ loop do
       rescue Exception => err
         puts "\n#{err}"
       end
-    elsif @cmd == '#'
+    elsif @cmd == '#' # List previous directories
       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 = "~" if @cmd == "cd"
       @cmd.sub!(/^cd (\S*).*/, '\1')
       @cmd = Dir.home if @cmd == "~"
       @cmd = @dirs[1] if @cmd == "-"
@@ -655,7 +666,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,18 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: ruby-shell
 version: !ruby/object:Gem::Version
-  version: '0.15'
+  version: '0.17'
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-08 00:00:00.000000000 Z
+date: 2023-06-09 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.15: Better stack handling for history.'
+  0.17: Added the ! convention to redo history commands (like !5 to redo the 5th command
+  in hisotry)'
 email: g@isene.com
 executables:
 - rsh