ruby-shell 2.3 → 2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 430ac5700dcc8216283045a1d608e0c53982018c39797921b39eb262e8df22bb
-  data.tar.gz: 8af1ec08df62ec8c79f1f1177ee8629fd388dbf15975a827296ec99894b77fdd
+  metadata.gz: 5c5913a47ce444d23c974bea7579acfa7413ea40c127d8fe4f5fe22ff788b0ba
+  data.tar.gz: 9dc3737af78ee22e40f630f69e9ed60942edbd94d5bdbc08515b2e7692529fdd
 SHA512:
-  metadata.gz: 1182b247e8c1128e748d2c24a3f1066e10be2c0e561b50ed02df1b39cbef77450035fa383f9fdb4da50552de56b867201acb9f6e3e8797034da1c9a437dd96e2
-  data.tar.gz: 9b461d925debaed83878c368635c4b6a3b1a1543984896501ef43d5441d4c3b67667ffe4aae2cc0958ea8c82c226e7c46834352de90b3be56c98dcb0b17ed549
+  metadata.gz: ef49ff226a32103a6a345b5087f0b54776efbd02e4c7435dbb3e4ef2aac439c3221c6f8b4b361a7b38fecdc40b9301bdd6a247c7716353e69b8b8dfdf94dc1b0
+  data.tar.gz: 519693833b835995ab7cdd9f7c4c089c611646eb46d195a9f5dc7aa4565190c23f3e5303624169336c43711753173b6197db47f32404b02052031ad626778abb

data/bin/rsh

@@ -8,7 +8,7 @@
 # Web_site:   http://isene.com/
 # Github:     https://github.com/isene/rsh
 # License:    Public domain
-@version    = "2.3"
+@version    = "2.6"
 
 # MODULES, CLASSES AND EXTENSIONS
 class String # Add coloring to strings (with escaping for Readline)
@@ -42,6 +42,14 @@ module Cursor # Terminal cursor movement ANSI codes (thanks to https://github.co
     m = res.match /(?<row>\d+);(?<col>\d+)/
     return m[:row].to_i, m[:col].to_i
   end
+  def rowget
+    row, col = self.pos
+    return row
+  end
+  def colget
+    row, col = self.pos
+    return col
+  end
   def up(n = nil) # Move cursor up by n
     print(CSI + "#{(n || 1)}A")
   end
@@ -118,6 +126,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
@@ -259,12 +268,16 @@ def getstr # A custom Readline-like function
   @pos  = 0
   chr   = ""
   @history.unshift("")
+  @row0, p = @c.pos
   while chr != "ENTER" # Keep going with readline until user presses ENTER
     @ci   = nil
     lift  = false
     right = false
+    # The actual printing og the command line
+    @c.row(@row0)
     @c.clear_line
     print @prompt
+    @c.clear_screen_down
     row, @pos0 = @c.pos
     #@history[0] = "" if @history[0].nil?
     print cmd_check(@history[0])
@@ -277,7 +290,15 @@ def getstr # A custom Readline-like function
       print @ciprompt.c(@c_stamp)
       right = true
     end
-    @c.col(@pos0 + @pos)
+    c_col = @pos0 + @pos
+    c_row = @row0 + c_col/(@maxcol)
+    c_col == 0 ? @c.row(c_row + 1) : @c.row(c_row)
+    if c_col.modulo(@maxcol) == 0
+      @c.col(c_col)
+      @c.row(@c.rowget - 1)
+    else
+      @c.col(c_col.modulo(@maxcol))
+    end
     chr = getchr
     case chr
     when 'C-G', 'C-C'
@@ -310,6 +331,8 @@ def getstr # A custom Readline-like function
         end
         lift = false
       end
+      @c.row(@row0)
+      @c.clear_screen_down
     when 'DOWN'  # Go down in history
       if lift
         @history.unshift("")
@@ -329,6 +352,8 @@ def getstr # A custom Readline-like function
         @pos = @history[0].length
       end
       lift = false
+      @c.row(@row0)
+      @c.clear_screen_down
     when 'RIGHT' # Move right on the readline
       if right 
         if lift
@@ -355,6 +380,7 @@ def getstr # A custom Readline-like function
         @history[0][@pos] = ""
       end
       lift = true
+      @c.clear_line_after
     when 'WBACK' # Delete one word to the left (Ctrl-W)
       unless @pos == @pos0
         until @history[0][@pos - 1] == " " or @pos == 0
@@ -367,6 +393,7 @@ def getstr # A custom Readline-like function
         end
       end
       lift = true
+      @c.clear_line_after
     when 'C-Y'   # Copy command line to primary selection
       system("echo -n '#{@history[0]}' | xclip")
       puts "\n#{Time.now.strftime("%H:%M:%S")}: Copied to primary selection (paste with middle buttoni)".c(@c_stamp)
@@ -405,7 +432,7 @@ def getstr # A custom Readline-like function
       @pos += 1
     end
   end
-  @c.col(@pos0 + @history[0].length)
+  #@c.col(@pos0 + @history[0].length)
   @c.clear_screen_down
 end
 def tab(type)
@@ -434,16 +461,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 =~ /(?<!\\) / 
@@ -549,18 +572,18 @@ end
 def cmd_check(str) # Check if each element on the readline matches commands, nicks, paths; color them
   return if str.nil?
   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.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
@@ -669,6 +692,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,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: ruby-shell
 version: !ruby/object:Gem::Version
-  version: '2.3'
+  version: '2.6'
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-24 00:00:00.000000000 Z
+date: 2024-10-30 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.3: Better history search.'
+  other bug fixes. 2.6: Handling line longer than terminal width.'
 email: g@isene.com
 executables:
 - rsh