ruby-shell 2.5 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4cbdfe9d1c09e98287dff7de8cfabb7dd776fa6f7617f4a0801d17f7b463bad
-  data.tar.gz: cf3b1311d1891caa516b427ef065f79f3d6b23e2486f5d070111f7040a812a05
+  metadata.gz: c448c172084960387cf539a563720fdc291cac640eb74a5d34fa4b65bc21b966
+  data.tar.gz: bf946b66b54703b33e8f001739ae5b143475525b2faa7e6428f027a7303475de
 SHA512:
-  metadata.gz: 673ee174f332d75d8cc0bf5a9570f18d02931e047386e23e727fb6f8ecb16a694095d59d609cc45b7438b49d5b7be4b801465398fe831f84bbc78b38287af69a
-  data.tar.gz: 35a0eac8a83bbf933deb101fd5e920414c59827dd43292889a300a26d0979cf1de9967acbb78c56ee332da7f605311e57bd7caba799eb82ea15b5dd3160fb3b2
+  metadata.gz: f098198470e145eae96a6d59438279d38f786129b1b45370b407403a4de8c11d595304b5d975b0d590aca5ae8bf4e5cab2b9311a3c3806b6d2b41d6cbd307a46
+  data.tar.gz: e682544786e24f145682628c7598e1b848a99f3db2e8df910adeb3b30f7c422d15f50c80326b9d7d02a8d7ca11fef8d8d50b332ff7b327b614fbb21dd79b319a

data/bin/rsh

@@ -8,7 +8,7 @@
 # Web_site:   http://isene.com/
 # Github:     https://github.com/isene/rsh
 # License:    Public domain
-@version    = "2.5"
+@version    = "2.6.1"
 
 # 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
@@ -260,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])
@@ -278,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'
@@ -292,6 +312,7 @@ def getstr # A custom Readline-like function
       exit
     when 'C-L'   # Clear screen and set position to top of the screen
       @c.row(1)
+      @row0 = 1
       @c.clear_screen_down
     when 'UP'    # Go up in history
       if @stk == 0 and @history[0].length > 0
@@ -311,6 +332,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("")
@@ -330,6 +353,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
@@ -356,6 +381,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
@@ -368,6 +394,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)
@@ -406,7 +433,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)
@@ -545,17 +572,11 @@ 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 @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)

metadata

@@ -1,19 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: ruby-shell
 version: !ruby/object:Gem::Version
-  version: '2.5'
+  version: 2.6.1
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-29 00:00:00.000000000 Z
+date: 2024-10-31 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.5: Speedup of syntax highlighting and tab completions.'
+  other bug fixes. 2.6: Handling line longer than terminal width. 2.6.1: Fixed Ctrl-L
+  bug.'
 email: g@isene.com
 executables:
 - rsh