ruby-shell 3.6.10 → 3.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76a48b3b13e6a1eb7fed0d68be6934d03182b8a176960d81b3c680367cd1d72e
-  data.tar.gz: 4491a5c43703b4ad519df7e51ec3804a80bd9e6f45c84e8c53745453ec695b94
+  metadata.gz: bc237db0d5ce57180ac174417e467c0c56514acb38e2513734ae0461bab02a42
+  data.tar.gz: 601a94aa508e4b36060533b81039b33dcf69bdee82fdb4d9d38ac3b3cc857c44
 SHA512:
-  metadata.gz: 9b502692bbb3d9471e24c97f8475c117381795ed431f002744a7774e98161ab2e9721e86e303c4e70e3b4685dbc07df30dd875bba8b178d180097a5a58ffedb0
-  data.tar.gz: 14c7824dcfcb688d3f63fbbe7fa621c06f3d41e7a9680376315c018ab4198defa22b47c74ef0644bcf046326bd4610502c7ef3ace49f05a5a8258f2c4af6d3ea
+  metadata.gz: 108f628485a2a6d62902e68e6ead540c870b08ac2670d3beeacf1f176ea18b5a1ccee5eab5c4a9f7e59c18f5bf5a76862e73a88971dab10f8b08f4f5614a01cf
+  data.tar.gz: 73c30f2461c7c45055485998756e7dc350b175f426a84eda6bd6d9d59f318b8f173357eea02d786778ebe5ab0de41de6ebf168494427fa26fd36f3b58cdbaf37

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.11" # Fix auto-heal destroying .rshrc on load errors
 
 # MODULES, CLASSES AND EXTENSIONS
 class String # Add coloring to strings (with escaping for Readline)
@@ -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,18 @@
 --- !ruby/object:Gem::Specification
 name: ruby-shell
 version: !ruby/object:Gem::Version
-  version: 3.6.10
+  version: 3.6.11
 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.11: Fix auto-heal destroying .rshrc - never strip user config on load errors.'
 email: g@isene.com
 executables:
 - rsh