ruby-shell 2.2 → 2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16401f8cae0a48a872039d91e89c0dfc441e1a6e06eba0c27d5035176daa6c24
-  data.tar.gz: df7f01fe21f17b7e38578c5ef539532ea37f0af23f9c35b2cbcc214cfbe8624c
+  metadata.gz: e4cbdfe9d1c09e98287dff7de8cfabb7dd776fa6f7617f4a0801d17f7b463bad
+  data.tar.gz: cf3b1311d1891caa516b427ef065f79f3d6b23e2486f5d070111f7040a812a05
 SHA512:
-  metadata.gz: 771ef428fc45880ca4bcfc954b4296a7d1cb98903b038a85aa8d959e2c1f0b5c7f568060b47adc7068020543fd1663a6473cfbf04ea636b7038e467115f89e13
-  data.tar.gz: 69be18e3477784987d41b16b8376894a43d8efbe0e1313b36926342abece6769750a8965046f848bd138f5680d4a214cb9a1f08c93bbe99ad803f990030bbb94
+  metadata.gz: 673ee174f332d75d8cc0bf5a9570f18d02931e047386e23e727fb6f8ecb16a694095d59d609cc45b7438b49d5b7be4b801465398fe831f84bbc78b38287af69a
+  data.tar.gz: 35a0eac8a83bbf933deb101fd5e920414c59827dd43292889a300a26d0979cf1de9967acbb78c56ee332da7f605311e57bd7caba799eb82ea15b5dd3160fb3b2

data/bin/rsh

@@ -8,7 +8,7 @@
 # Web_site:   http://isene.com/
 # Github:     https://github.com/isene/rsh
 # License:    Public domain
-@version    = "2.2"
+@version    = "2.5"
 
 # MODULES, CLASSES AND EXTENSIONS
 class String # Add coloring to strings (with escaping for Readline)
@@ -118,6 +118,7 @@ begin # Initialization
   @nick        = {}                       # Initiate alias/nick hash
   @gnick       = {}                       # Initiate generic/global alias/nick hash
   @history     = []                       # Initiate history array
+  @exe = []
   # Paths
   @user = Etc.getpwuid(Process.euid).name # For use in @prompt
   @path        = ENV["PATH"].split(":")   # Get paths
@@ -416,7 +417,8 @@ def tab(type)
   @postab = @history[0][@pos..].to_s          # Extract the current line from cursor to end
   @c_row, @c_col = @c.pos                     # Get cursor position
   @tabstr = @pretab.split(/[|, ]/).last.to_s  # Get the sustring that is being tab completed
-  @tabstr = "" if @pretab[-1] =~ /[ |]/
+  @tabstr = "" if @pretab[-1] =~ /[ |]/       # Tab from nothing if tabbing starts with space or pipe
+  @tabstr = @pretab if type == "hist"         # Searching for matches with whole string in history
   @pretab = @pretab.delete_suffix(@tabstr)
   type = "switch" if @tabstr[0] == "-"
   while chr != "ENTER"
@@ -433,16 +435,12 @@ def tab(type)
       hlp = hlp.reject{|h| /-</ =~ h}
       @tabarray = hlp
     when "all"          # Handle all other tab completions
-      exe = []
-      @path.each do |p| # Add all executables in @path
-        Dir.glob(p).each do |c|
-          exe.append(File.basename(c)) if File.executable?(c) and not Dir.exist?(c)
-        end
-      end
-      exe.sort!
-      exe.prepend(*@nick.keys)        # Add nicks
-      exe.prepend(*@gnick.keys)       # Add gnicks
-      compl      = exe.select {|s| s =~ Regexp.new(@tabstr)} # Select only that which matches so far
+      ex  = []
+      ex += @exe
+      ex.sort!
+      ex.prepend(*@nick.keys)        # Add nicks
+      ex.prepend(*@gnick.keys)       # Add gnicks
+      compl      = ex.select {|s| s =~ Regexp.new(@tabstr)} # Select only that which matches so far
       fdir       = @tabstr + "*"
       compl.prepend(*Dir.glob(fdir)).map! do |e| 
         if e =~ /(?<!\\) / 
@@ -547,19 +545,25 @@ def hist_clean # Clean up @history
 end
 def cmd_check(str) # Check if each element on the readline matches commands, nicks, paths; color them
   return if str.nil?
+ #elements = str.scan(/[^\s']+|'.+?'/)
+ #elements.map! do |el|
+ # .... the ifs
+ #elements.join(" ")
   str.gsub(/(?:\S'[^']*'|[^ '])+/) do |el|
-    if @nick.include?(el)
+    if @exe.include?(el)
+      el.c(@c_cmd)
+    elsif el == "cd"
+      el.c(@c_cmd)
+    elsif File.executable?(el.gsub("'", ""))
+      el.c(@c_cmd)
+    elsif File.exist?(el.gsub("'", ""))
+      el.c(@c_path)
+    elsif @nick.include?(el)
       el.c(@c_nick)
     elsif el == "r" or el == "f"
       el.c(@c_nick)
     elsif @gnick.include?(el)
       el.c(@c_gnick)
-    elsif File.exist?(el.gsub("'", ""))
-      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[0] == "-"
       el.c(@c_switch)
     else
@@ -668,6 +672,12 @@ loop do
     @prompt.gsub!(/#{Dir.home}/, '~') # Simplify path in prompt
     system("printf \"\033]0;rsh: #{Dir.pwd}\007\"")   # Set Window title to path 
     @history[0] = "" unless @history[0]
+    @exe = []
+    @path.each do |p| # Add all executables in @path
+      Dir.glob(p).each do |c|
+        @exe.append(File.basename(c)) if File.executable?(c) and not Dir.exist?(c)
+      end
+    end
     getstr # Main work is here
     @cmd = @history[0]
     @dirs.unshift(Dir.pwd)

metadata

@@ -1,20 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: ruby-shell
 version: !ruby/object:Gem::Version
-  version: '2.2'
+  version: '2.5'
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-24 00:00:00.000000000 Z
+date: 2024-10-29 00:00:00.000000000 Z
 dependencies: []
 description: 'A shell written in Ruby with extensive tab completions, aliases/nicks,
   history, syntax highlighting, theming, auto-cd, auto-opening files and more. In
   continual development. New in 2.0: Full rewrite of tab completion engine. Lots of
-  other bug fixes. 2.1: Better error handling. 2.2: Fixed pasting to commandline and
-  reading of PATH'
+  other bug fixes. 2.5: Speedup of syntax highlighting and tab completions.'
 email: g@isene.com
 executables:
 - rsh