ruby-shell 3.6.10 → 3.6.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76a48b3b13e6a1eb7fed0d68be6934d03182b8a176960d81b3c680367cd1d72e
-  data.tar.gz: 4491a5c43703b4ad519df7e51ec3804a80bd9e6f45c84e8c53745453ec695b94
+  metadata.gz: 83be89da460ab7d6b0534773b414a23daebaa9c93e3dedae3c1e78d53fba1a3b
+  data.tar.gz: c95fffc211adbc81780bcf3e9d4003cd2880d0d370777ebeb9c70a90e9f4e5e3
 SHA512:
-  metadata.gz: 9b502692bbb3d9471e24c97f8475c117381795ed431f002744a7774e98161ab2e9721e86e303c4e70e3b4685dbc07df30dd875bba8b178d180097a5a58ffedb0
-  data.tar.gz: 14c7824dcfcb688d3f63fbbe7fa621c06f3d41e7a9680376315c018ab4198defa22b47c74ef0644bcf046326bd4610502c7ef3ace49f05a5a8258f2c4af6d3ea
+  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.10" # OSC 7: Report cwd to terminal (for wezterm etc.)
+@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
@@ -1495,6 +1495,7 @@ def cmd_check(str) # Check if each element on the readline matches commands, nic
   end
 end
 def rshrc # Write user configuration to .rshrc (portable between machines)
+  return if @rshrc_load_failed  # Never overwrite .rshrc if we couldn't parse it
   hist_clean  # Clean history before saving
   if File.exist?(Dir.home+'/.rshrc')
     conf = File.read(Dir.home+'/.rshrc')
@@ -3349,13 +3350,15 @@ def load_rshrc_safe
         load_defaults
       end
     else
-      puts "\033[31mAuto-heal failed. Loading with defaults.\033[0m"
+      puts "\033[31mAuto-heal failed. Loading with defaults (your .rshrc is preserved).\033[0m"
+      @rshrc_load_failed = true
       load_defaults
     end
 
   rescue => e
     puts "\n\033[31mERROR loading .rshrc: #{e.message}\033[0m"
-    puts "\033[33mLoading with defaults...\033[0m\n"
+    puts "\033[33mLoading with defaults (your .rshrc is preserved)...\033[0m\n"
+    @rshrc_load_failed = true
     load_defaults
   end
 end
@@ -3399,31 +3402,17 @@ def auto_heal_rshrc
     end
 
     # Validate Ruby syntax of the healed content
+    # Only check syntax - never strip unknown lines, as user configs
+    # may contain ENV settings, if/else blocks, method calls, etc.
     begin
-      # Try to parse the content
-      eval("BEGIN {return true}\n" + content)
+      RubyVM::InstructionSequence.compile(content)
     rescue SyntaxError => e
-      # If still has syntax errors, extract only valid parts
-      new_content = ""
-
-      # Extract valid variable assignments
-      content.each_line do |line|
-        if line =~ /^(@\w+|\w+)\s*=\s*.+$/
-          begin
-            eval(line)
-            new_content += line
-          rescue
-            # Skip invalid lines
-          end
-        elsif line =~ /^(def|class|module|end|if|else|elsif|when|case|begin|rescue)/
-          new_content += line
-        elsif line.strip.start_with?('#') || line.strip.empty?
-          new_content += line
-        end
-      end
-
-      content = new_content
-      healed = true
+      # Log the error but do NOT destructively rewrite the file.
+      # Stripping "invalid" lines destroys legitimate config like
+      # ENV assignments, prompt logic, and File.read() calls.
+      puts "Warning: .rshrc has syntax error: #{e.message}"
+      puts "Please fix manually. Your config was NOT modified."
+      return false
     end
 
     if healed && content != original_content

metadata

@@ -1,18 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: ruby-shell
 version: !ruby/object:Gem::Version
-  version: 3.6.10
+  version: 3.6.12
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-01-18 00:00:00.000000000 Z
+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.10: OSC 7 support - reports cwd to terminal for wezterm/kitty spawn-in-same-dir.'
+  v3.6.12: Fix long command line wrapping - correct cursor positioning when commands
+  exceed terminal width.'
 email: g@isene.com
 executables:
 - rsh