ruby-shell 3.6.11 → 3.6.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc237db0d5ce57180ac174417e467c0c56514acb38e2513734ae0461bab02a42
-  data.tar.gz: 601a94aa508e4b36060533b81039b33dcf69bdee82fdb4d9d38ac3b3cc857c44
+  metadata.gz: 83be89da460ab7d6b0534773b414a23daebaa9c93e3dedae3c1e78d53fba1a3b
+  data.tar.gz: c95fffc211adbc81780bcf3e9d4003cd2880d0d370777ebeb9c70a90e9f4e5e3
 SHA512:
-  metadata.gz: 108f628485a2a6d62902e68e6ead540c870b08ac2670d3beeacf1f176ea18b5a1ccee5eab5c4a9f7e59c18f5bf5a76862e73a88971dab10f8b08f4f5614a01cf
-  data.tar.gz: 73c30f2461c7c45055485998756e7dc350b175f426a84eda6bd6d9d59f318b8f173357eea02d786778ebe5ab0de41de6ebf168494427fa26fd36f3b58cdbaf37
+  metadata.gz: fd7b51b6c55a5c84e4a3a04a7ab3ce127a6977e064cc4f133c2d2ebf9759835398b60f7044e76aeb6ecf1f286db59110815e37733b0ff6ce0949ed039e1cc71b
+  data.tar.gz: 84f6015d8eede6d78a226124730676bbb241dd9205077767776f8b4b19b9f45fa60716fc3b2a65d7bbd5547f85f6c8e3e50f6e52b71b272682d35353df780cdc

data/bin/rsh

@@ -8,7 +8,7 @@
 # Web_site:   http://isene.com/
 # Github:     https://github.com/isene/rsh
 # License:    Public domain
-@version    = "3.6.11" # Fix auto-heal destroying .rshrc on load errors
+@version    = "3.6.12" # Fix long command line wrapping
 
 # MODULES, CLASSES AND EXTENSIONS
 class String # Add coloring to strings (with escaping for Readline)
@@ -374,30 +374,23 @@ def getstr # A custom Readline-like function
     row, col = @c.pos
     @prompt_last_line = @display_prompt
     # Calculate visible length (strip ANSI) - don't trust @c.pos with complex prompts
-    @pos0 = @display_prompt.gsub(/\001\e\[[0-9;]*m\002/, '').length
+    @pos0 = @display_prompt.gsub(/\001?\e\[[0-9;]*m\002?/, '').length
     @cmd_row = @row0
     @is_multiline = false
   end
 
-  @skip_prompt_print = false  # Track if prompt already printed (for Ctrl-L)
-
   while chr != "ENTER" # Keep going with readline until user presses ENTER
     @ci   = nil
     lift  = false
     right = false
 
-    # Update command line display (not the prompt!)
+    # Clear from cmd_row down (handles wrapped lines from previous iteration)
     @c.row(@cmd_row)
+    @c.col(1)
+    @c.clear_screen_down
 
-    # Reprint the prompt line (preserves colors) - skip if Ctrl-L just printed it
-    unless @skip_prompt_print
-      @c.col(1)
-      print @prompt_last_line
-      @c.clear_line_after
-    end
-    @skip_prompt_print = false  # Reset flag
-
-    # Print command text with syntax highlighting
+    # Always reprint prompt + command text
+    print @prompt_last_line
     print cmd_check(@history[0])
 
     # Print history suggestion if available
@@ -411,12 +404,21 @@ def getstr # A custom Readline-like function
       right = true
     end
 
-    # Position cursor (unified - both now use string length which is 0-indexed)
-    # @pos0 = visible length of prompt (14 for "geir@juba: ~/ ")
-    # @pos = position in command text (0 = start, 5 = after 5 chars)
-    # Terminal columns are 1-indexed, so add +1
-    cursor_col = @pos0 + @pos + 1
-    @c.row(@cmd_row)
+    # Detect if terminal scrolled due to wrapping near the bottom
+    end_row, _ = @c.pos
+    printed_len = @pos0 + @history[0].to_s.length
+    printed_len += @ciprompt.to_s.length if right  # Include suggestion text
+    expected_rows = printed_len > 0 ? (printed_len - 1) / @maxcol : 0
+    actual_start = end_row - expected_rows
+    if actual_start < @cmd_row
+      @cmd_row = [actual_start, 1].max  # Terminal scrolled; adjust (min row 1)
+    end
+
+    # Position cursor with wrapping math
+    total_pos = @pos0 + @pos  # 0-indexed total position
+    cursor_row = @cmd_row + total_pos / @maxcol
+    cursor_col = total_pos % @maxcol + 1
+    @c.row(cursor_row)
     @c.col(cursor_col)
     chr = getchr
     puts "DEBUG: Got char: '#{chr}' (length: #{chr.length})" if ENV['RSH_DEBUG']
@@ -473,11 +475,10 @@ def getstr # A custom Readline-like function
         row, col = @c.pos
         @prompt_last_line = @display_prompt
         # Calculate visible length (match main init)
-        @pos0 = @display_prompt.gsub(/\001\e\[[0-9;]*m\002/, '').length
+        @pos0 = @display_prompt.gsub(/\001?\e\[[0-9;]*m\002?/, '').length
         @cmd_row = @row0
         @is_multiline = false
       end
-      @skip_prompt_print = true  # Skip reprinting on next loop iteration
     when 'UP'    # Go up in history
       if @stk == 0 and @history[0].length > 0
         @tabsearch = @history[0]
@@ -541,7 +542,6 @@ 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
         # Skip over any trailing spaces first
@@ -556,7 +556,6 @@ 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)
@@ -603,6 +602,7 @@ def getstr # A custom Readline-like function
     end
     while $stdin.ready?
       chr = $stdin.getc
+      chr = " " if chr == "\n" || chr == "\r"  # Flatten pasted newlines
       @history[0].insert(@pos,chr)
       @pos += 1
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-shell
 version: !ruby/object:Gem::Version
-  version: 3.6.11
+  version: 3.6.12
 platform: ruby
 authors:
 - Geir Isene
@@ -12,7 +12,8 @@ date: 2026-02-19 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. UPDATE
-  v3.6.11: Fix auto-heal destroying .rshrc - never strip user config on load errors.'
+  v3.6.12: Fix long command line wrapping - correct cursor positioning when commands
+  exceed terminal width.'
 email: g@isene.com
 executables:
 - rsh