ruby-shell 2.9.1 → 2.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ceae5891b4b0deebdf2e2876232999e8c64374f4730ab4d5e8ef09ff2dc3835
-  data.tar.gz: bee38e735fb5f9eb1b4b133471ea649faec9531c7138ef035c6c9a089db87f06
+  metadata.gz: ee2ef357d1196f43811ad6974313bbdb057f61cf90219146936f70a2ec6f16bb
+  data.tar.gz: 85540ca12677d88d6b2fb6999f17ce871b7c5142f20a0fa14e03685f82f41853
 SHA512:
-  metadata.gz: 7e586a0d583b1d3c33f441ce1dcabf001dc1a12d3a375581ad2337db8cab2822850455cf599b5a5e7ba21a31d750f2133c10b0a71c3e9bdc6ff62454c98296ee
-  data.tar.gz: 8b7ae87743f8fe9f0414dda5ae607f632ece3f8289131519d21d8ebc20d54d13d7d7361364b8eeef7d9c68d6af9006731790decbee4eb0862a159997af0f306c
+  metadata.gz: f7a35b051b9d768cb2065e6308eecc030f3b153a31881b31e25813a377de06ea98b5e76f55233dbc0ae1ec30920091ee62817352f43fc5645c3a3d69db746c78
+  data.tar.gz: f8aeb41fa3870b02d96b111126c1770fb74e235a01847947937461c1a697195e3fc6152eb5a45a147c1703278e12a1b8dc5c279e1c1e4b51d81fbeb0672ed27f

data/bin/rsh

@@ -8,7 +8,7 @@
 # Web_site:   http://isene.com/
 # Github:     https://github.com/isene/rsh
 # License:    Public domain
-@version    = "2.9.1" # Bug fix: Improved command coloring for local executables and after ENTER
+@version    = "2.10.1" # Bug fix: Improved && operator logic for proper conditional execution
 
 # MODULES, CLASSES AND EXTENSIONS
 class String # Add coloring to strings (with escaping for Readline)
@@ -32,15 +32,20 @@ module Cursor # Terminal cursor movement ANSI codes (thanks to https://github.co
   end
   def pos # Query cursor current position
     res = ''
-    $stdin.raw do |stdin|
-      $stdout << CSI + '6n' # Tha actual ANSI get-position
-      $stdout.flush
-      while (c = stdin.getc) != 'R'
-        res << c if c
+    begin
+      $stdin.raw do |stdin|
+        $stdout << CSI + '6n' # Tha actual ANSI get-position
+        $stdout.flush
+        while (c = stdin.getc) != 'R'
+          res << c if c
+      end
       end
+    rescue Errno::ENOTTY
+      # Not a TTY, return default values
+      return 25, 80
     end
     m = res.match /(?<row>\d+);(?<col>\d+)/
-    return m[:row].to_i, m[:col].to_i
+    return m ? [m[:row].to_i, m[:col].to_i] : [25, 80]
   end
   def rowget
     row, col = self.pos
@@ -596,12 +601,19 @@ def rshrc # Write updates to .rshrc
   else
     conf = ""
   end
-  conf.sub!(/^@nick.*\n/, "") 
+  conf.sub!(/^@nick.*\n/, "")
   conf += "@nick = #{@nick}\n"
-  conf.sub!(/^@gnick.*\n/, "") 
+  conf.sub!(/^@gnick.*\n/, "")
   conf += "@gnick = #{@gnick}\n"
-  conf.sub!(/^@history.*\n/, "") 
-  conf += "@history = #{@history.last(@histsize)}\n"
+  conf.sub!(/^@history.*\n/, "")
+  # Ensure history is properly formatted as valid Ruby array
+  begin
+    history_str = @history.last(@histsize).inspect
+    conf += "@history = #{history_str}\n"
+  rescue => e
+    conf += "@history = []\n"
+    puts "Warning: Error saving history: #{e.message}"
+  end
   File.write(Dir.home+'/.rshrc', conf)
   puts "\n.rshrc updated"
 end
@@ -853,27 +865,39 @@ end
 def execute_conditional(cmd_line)
   # Split on && and || while preserving the operators
   parts = cmd_line.split(/(\s*&&\s*|\s*\|\|\s*)/)
-  
-  result = true
+
+  result = nil  # Start with nil to handle first command
   i = 0
+
   while i < parts.length
-    command = parts[i].strip
-    next if command.empty?
-    
-    if command == '&&'
-      i += 1
-      next unless result  # Skip if previous command failed
-    elsif command == '||'
-      i += 1
-      next if result      # Skip if previous command succeeded
+    part = parts[i].strip
+    i += 1
+    next if part.empty?
+
+    if part == '&&'
+      # If previous command failed, skip the rest until we find || or end
+      unless result
+        while i < parts.length && parts[i].strip != '||'
+          i += 1
+        end
+      end
+    elsif part == '||'
+      # If previous command succeeded, skip the rest until we find && or end
+      if result
+        while i < parts.length && parts[i].strip != '&&'
+          i += 1
+        end
+      end
     else
       # Execute the command
-      success = system(command)
+      success = system(part)
       result = success
-      puts " Command failed: #{command} (exit #{$?.exitstatus})" unless success
+      @last_exit = $?.exitstatus
+      puts " Command failed: #{part} (exit #{@last_exit})" unless success
     end
-    i += 1
   end
+
+  result
 end
 def expand_braces(str)
   # Simple brace expansion: {a,b,c} -> a b c
@@ -1104,18 +1128,140 @@ def ai_setup_help
 end
 
 # INITIAL SETUP
+def load_rshrc_safe
+  return unless File.exist?(Dir.home+'/.rshrc')
+
+  begin
+    # Try to load the .rshrc file
+    load(Dir.home+'/.rshrc')
+
+    # Validate critical variables
+    @history = [] unless @history.is_a?(Array)
+    @nick = {} unless @nick.is_a?(Hash)
+    @gnick = {} unless @gnick.is_a?(Hash)
+
+  rescue SyntaxError => e
+    puts "\n\033[31mERROR: Syntax error in .rshrc:\033[0m"
+    puts e.message
+    puts "\n\033[33mAttempting to auto-heal .rshrc...\033[0m\n"
+
+    if auto_heal_rshrc
+      puts "\033[32m.rshrc has been healed! Retrying...\033[0m\n"
+      begin
+        load(Dir.home+'/.rshrc')
+      rescue => e2
+        puts "\033[31mAuto-heal failed. Loading with defaults.\033[0m"
+        load_defaults
+      end
+    else
+      puts "\033[31mAuto-heal failed. Loading with defaults.\033[0m"
+      load_defaults
+    end
+
+  rescue => e
+    puts "\n\033[31mERROR loading .rshrc: #{e.message}\033[0m"
+    puts "\033[33mLoading with defaults...\033[0m\n"
+    load_defaults
+  end
+end
+
+def auto_heal_rshrc
+  begin
+    rshrc_path = Dir.home + '/.rshrc'
+    return false unless File.exist?(rshrc_path)
+
+    # Backup the corrupted file
+    backup_path = rshrc_path + '.backup.' + Time.now.strftime('%Y%m%d_%H%M%S')
+    File.write(backup_path, File.read(rshrc_path))
+    puts "Backed up corrupted .rshrc to #{backup_path}"
+
+    content = File.read(rshrc_path)
+    original_content = content.dup
+    healed = false
+
+    # Fix common history array issues
+    if content =~ /^@history\s*=\s*\[.*\]\s*\n\s*,/m
+      # Fix case where array ends with ] followed by comma on next line
+      content.gsub!(/^(@history\s*=\s*\[.*\])\s*\n\s*,(.*)$/m) do |match|
+        # Remove the extra closing bracket and merge the lines
+        history_line = $1
+        continuation = $2
+        # Remove trailing ] from first part
+        history_line = history_line.sub(/\]\s*$/, '')
+        # Combine and close properly
+        "#{history_line}, #{continuation}]"
+      end
+      healed = true
+    end
+
+    # Fix unclosed arrays
+    ['@history', '@nick', '@gnick'].each do |var|
+      if content =~ /^#{var}\s*=\s*[[{](?!.*[}\]]\s*$)/m
+        content.sub!(/^(#{var}\s*=\s*)(\[.*?)$/m) { "#{$1}#{$2}]" }
+        content.sub!(/^(#{var}\s*=\s*)({.*?)$/m) { "#{$1}#{$2}}" }
+        healed = true
+      end
+    end
+
+    # Validate Ruby syntax of the healed content
+    begin
+      # Try to parse the content
+      eval("BEGIN {return true}\n" + 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
+    end
+
+    if healed && content != original_content
+      File.write(rshrc_path, content)
+      return true
+    end
+
+    false
+  rescue => e
+    puts "Error during auto-heal: #{e.message}"
+    false
+  end
+end
+
+def load_defaults
+  @history ||= []
+  @nick ||= {"ls" => "ls --color -F"}
+  @gnick ||= {}
+  puts "Loaded with default configuration."
+end
+
 begin # Load .rshrc and populate @history
   trap "SIGINT" do end
-  trap "SIGHUP" do 
+  trap "SIGHUP" do
     rshrc
     exit
   end
-  trap "SIGTERM" do 
+  trap "SIGTERM" do
     rshrc
     exit
   end
   firstrun unless File.exist?(Dir.home+'/.rshrc') # Initial loading - to get history
-  load(Dir.home+'/.rshrc')
+  load_rshrc_safe
   # Load login shell files if rsh is running as login shell
   if ENV['LOGIN_SHELL'] or $0 == "-rsh" or ARGV.include?('-l') or ARGV.include?('--login')
     ['/etc/profile', Dir.home+'/.profile', Dir.home+'/.bash_profile', Dir.home+'/.bashrc'].each do |f|
@@ -1159,7 +1305,7 @@ loop do
   begin
     @user = Etc.getpwuid(Process.euid).name # For use in @prompt
     @node = Etc.uname[:nodename]            # For use in @prompt
-    h = @history; load(Dir.home+'/.rshrc') if File.exist?(Dir.home+'/.rshrc'); @history = h # reload prompt but not history
+    h = @history; load_rshrc_safe; @history = h # reload prompt but not history safely
     @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]

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: ruby-shell
 version: !ruby/object:Gem::Version
-  version: 2.9.1
+  version: 2.10.1
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-13 00:00:00.000000000 Z
+date: 2025-09-22 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
-  v2.9.0: AI integration! Use @ for AI text responses and @@ for AI command suggestions.
-  Works with local Ollama or external providers like OpenAI. v2.8.0: Enhanced help
-  system, :info command, and easier nick management. v2.7.0: Ruby Functions, job control,
-  command substitution, and more.'
+  v2.10.0: Auto-healing for corrupted .rshrc files and robust error handling. v2.9.0:
+  AI integration! Use @ for AI text responses and @@ for AI command suggestions. Works
+  with local Ollama or external providers like OpenAI. v2.8.0: Enhanced help system,
+  :info command, and easier nick management.'
 email: g@isene.com
 executables:
 - rsh