ruby-shell 0.16 → 0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f69b050eaa1e06a29a3e744fe6a0810ceeb7ccc3fd4eb0ce988e1a28932ece4
-  data.tar.gz: 9edc0f0d12ad882cf8fb1e7a1316b1ef19ee49e8a2c44f445d23be95cf0a02fd
+  metadata.gz: e8c4db771e1dbd372496d80bf721a96c79e39ad21406e0cc2f68e3b382dd7df4
+  data.tar.gz: 7b7c8335bec3b659f7cc82f3f655dd179e053f74a016eed112969a2008cd0ced
 SHA512:
-  metadata.gz: 39a5f34c1360543721e1b30a219cb8e3a31578a64a5e503f034dadc934a655f794360ee2eab065c73a937445c901c2b918695fc0ea478a8b1dffcf9633ce72f6
-  data.tar.gz: e3f29df7548b173a33e0ae882f651f8b8609de3a3228f366177866253b89c1483f9dfdfbeed59e2ae80168f4d6dd0eabb007ce26e35582a125afacb6dc91a3cc
+  metadata.gz: 0cfa55a0c59bfa616c725cee507632b85a2676a35cfc14f753bd673124d25bb74848a43ea6ac0cbdc09a8cf2c580f74ff93d0bb50602cfd8e760086365ec1705
+  data.tar.gz: 70f3584e3bfffe1b09f0bb3cc6bdf0b2aaa5028371d5b11ffae951bb2fd461babf4c989f682e22ccafea24fd9a1957ceaa7f6338b9443fa7baf44c6de46880f2

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,11 +40,9 @@ 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
 
-## 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`.
 
@@ -53,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). 
 
@@ -79,8 +86,15 @@ 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`.
+## The .rshrc
+`.rshrc` is the configuration file for rsh and it is located in your home directory. It is created when you first start rsh and you can modify it to suit your needs. A more detailed .rshrc is found in the the [rsh github repo](https://github.com/isene/rsh) - you can drop this into your home dir if you like. Set the basic environment variables like this:
+```
+@editor   = "vim"
+@lscolors = "/home/geir/.local/share/lscolors.sh"
+```
+The `@editor` sets your editor of choice. The `@lscolors` points to a file that sets your LS_COLORS variable. Use [my extended LS_COLORS setup](https://github.com/isene/LS_COLORS) to make this really fancy.
+
+You can add any Ruby code 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.19"
 
 # 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
@@ -421,7 +422,7 @@ def tab_switch(str) # TAB completion for command switches (TAB after "-")
   begin
     hlp = `#{str} --help`
     hlp = hlp.split("\n").grep(/^\s*-{1,2}[^-]/)
-    hlp = hlp.map {|h| h.sub(/^\s*/, '')}
+    hlp = hlp.map{|h| h.sub(/^\s*/, '').sub(/^--/, '    --')}
     switch = tabselect(hlp)
     switch = switch.sub(/ .*/, '').sub(/,/, '')
     @tabsearch = switch if switch
@@ -547,9 +548,12 @@ end
 def help
   puts @help
 end
-def history # Show history
+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 most recent history (up to 50 entries)
   puts "History:"
-  puts @history
+  @history.each_with_index {|h,i| puts i.to_s + "; " + h if i < 50}
 end
 def rmhistory # Delete history
   @history = []
@@ -595,6 +599,13 @@ begin # Load .rshrc and populate @history
   trap "SIGINT" do print "\n"; exit end
   firstrun unless File.exist?(Dir.home+'/.rshrc') # Initial loading - to get history
   load(Dir.home+'/.rshrc') 
+  ENV["EDITOR"] = @editor
+  if File.exist?(@lscolors)
+    ls = File.read(@lscolors) 
+    ls.sub!(/export.*/, '')
+    ls.sub!(/^LS_COLORS=/, 'ENV["LS_COLORS"]=')
+    eval(ls)
+  end
   @c = Cursor               # Initiate @c as Cursor
   @c.save                   # Get max row & col
   @c.row(8000)
@@ -619,6 +630,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
@@ -639,7 +654,7 @@ 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/}

metadata

@@ -1,18 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: ruby-shell
 version: !ruby/object:Gem::Version
-  version: '0.16'
+  version: '0.19'
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-08 00:00:00.000000000 Z
+date: 2023-06-12 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.16: Fixed several bugs, added screencast (https://youtu.be/4P2z8oSo1u4).'
+  0.19: Added environment variables to .rshrc (@editor and @lscolors) and prettified
+  tab completions for command switches/options.'
 email: g@isene.com
 executables:
 - rsh