ruby-shell 0.19 → 0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8c4db771e1dbd372496d80bf721a96c79e39ad21406e0cc2f68e3b382dd7df4
-  data.tar.gz: 7b7c8335bec3b659f7cc82f3f655dd179e053f74a016eed112969a2008cd0ced
+  metadata.gz: a8d28ba94f7b6a6e05496bccb94efe444ba34871ab036b448fb0d074dcadf59d
+  data.tar.gz: 041e37fe2d4876a59b097d74eddd846be9de62915ee857943c4c86b2e4080a50
 SHA512:
-  metadata.gz: 0cfa55a0c59bfa616c725cee507632b85a2676a35cfc14f753bd673124d25bb74848a43ea6ac0cbdc09a8cf2c580f74ff93d0bb50602cfd8e760086365ec1705
-  data.tar.gz: 70f3584e3bfffe1b09f0bb3cc6bdf0b2aaa5028371d5b11ffae951bb2fd461babf4c989f682e22ccafea24fd9a1957ceaa7f6338b9443fa7baf44c6de46880f2
+  metadata.gz: a681b059f27359fa185cc6f1092ac3bf2b8e9084a79ee5650f154b906b25ec84a20eb4920961576a945787cb6d925c6f16cab915383ea9b07ba3a2ed58bc634d
+  data.tar.gz: 04bde7676375ce81782b2ba15abda281a650de049d79734eb23b0db4b67987f089db1b2fd4bf3be52bc5dc6730f900d95acc2ade046fe70097272cf09730673e

data/.rshrc

@@ -1,10 +1,13 @@
 # vim: set ft=ruby sw=2 sts=2 et :
 
+# ENVIRONMENT
+#@lscolors       = "/home/geir/.local/share/lscolors.sh"
+ENV["EDITOR"]   = "vim"
+ENV["MANPAGER"] = "vim +MANPAGER -"
+
 # 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)
+  @prompt = "#{@user}@#{@node}".c(160).b + ":".c(255) + " #{Dir.pwd}/".c(196) + " ".c(7)
 else
   @prompt = "#{@user}@#{@node}".c(46) + ":".c(255) + " #{Dir.pwd}/".c(196) + " ".c(7)
 end
@@ -20,5 +23,7 @@ end
 @c_taboption = 244  # Color for unselected tabcompleted item
 @c_stamp     = 244  # Color for time stamp/command
 
-# UPDATED ON CTRL-D EXIT
+# NICKS AND HISTORY
 @nick = {"ls"=>"ls --color -F"}
+@gnick = {}
+@history = []

data/README.md

@@ -23,6 +23,7 @@ Or simply `gem install ruby-shell`.
 * 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.
+* Writing a partial command and pressing `UP` will search history for matches.  Go down/up in the list and press `TAB` or `ENTER` to accept or `Ctrl-G` to discard
 * 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
@@ -89,10 +90,14 @@ Variable        | Description
 ## 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"
+ENV["EDITOR"]   = "vim"
+ENV["MANPAGER"] = "vim +MANPAGER -"
+```
+Also, a special variable for better LS_COLOR setup:
+```
 @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.
+Point `@lscolors` 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.
 

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.19"
+@version    = "0.21"
 
 # MODULES, CLASSES AND EXTENSIONS
 class String # Add coloring to strings (with escaping for Readline)
@@ -145,8 +145,10 @@ end
   * 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 and repeat a history command (with `!`)
+    present that in "toned down" letters - press the arrow right key to accept the suggestion
+  * Writing a partial command and pressing `UP` will search history for matches.
+    Go down/up in the list and press `TAB` or `ENTER` to accept or `Ctrl-G` to discard
+* 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>
@@ -278,17 +280,22 @@ 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
+      if @stk == 0 and @history[0].length > 0
+        @tabsearch = @history[0]
+        tabbing("hist")
+      else
+        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
       end
-      lift = false
     when 'DOWN'  # Go down in history
       if lift
         @history.unshift("")
@@ -434,8 +441,11 @@ 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
+  if hist
+    @tabsearch = hist 
+    @tabstr    = ""
+    @pos       = @tabsearch.length
+  end
 end
 def tabselect(ary, hist=false) # Let user select from the incoming array
   ary.uniq!
@@ -599,7 +609,10 @@ 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
+  ENV["SHELL"] = __FILE__
+  ENV["TERM"]  = "rxvt-unicode-256color"
+  ENV["PATH"]  ? ENV["PATH"] += ":" : ENV["PATH"] = ""
+  ENV["PATH"] += "/home/#{@user}/bin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
   if File.exist?(@lscolors)
     ls = File.read(@lscolors) 
     ls.sub!(/export.*/, '')
@@ -676,7 +689,7 @@ loop do
           res = `fzf`.chomp
           Dir.chdir(File.dirname(res))
         else
-          if File.exist?(@cmd)
+          if File.exist?(@cmd) and not File.executable?(@cmd)
             if File.read(@cmd).force_encoding("UTF-8").valid_encoding?
               system("#{ENV['EDITOR']} #{@cmd}") # Try open with user's editor
             else
@@ -687,7 +700,7 @@ loop do
               end
             end
           elsif system(@cmd) # Try execute the command
-          else puts "No such command: #{@cmd}"
+          else puts "No such command or nick: #{@cmd}"
           end
         end
       end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: ruby-shell
 version: !ruby/object:Gem::Version
-  version: '0.19'
+  version: '0.21'
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-12 00:00:00.000000000 Z
+date: 2023-06-15 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.19: Added environment variables to .rshrc (@editor and @lscolors) and prettified
-  tab completions for command switches/options.'
+  0.20: Better history search - write a partial command and press UP to get matches
+  in history.'
 email: g@isene.com
 executables:
 - rsh