rcurses 5.1.4 → 5.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42249bd3b99cf1989bef47c062a23c1c576c2ed3a35ff2c28264cf6c6b1712cd
-  data.tar.gz: 84ea09a778a340d627dd5c45a06e5b32c4a413a8ecb61e620b9ac7666c87026f
+  metadata.gz: bd5e0ec070d80452ce6733eed313a97b78b33db8ec992f329d2153ae3fcb6901
+  data.tar.gz: b9b7a0c97d31385dc2698e18b2e29baa0c95c9d584eaf7b7f0acde11b1c8910b
 SHA512:
-  metadata.gz: 72a020908e7efeb1cbe79f1afd31c7b3eca08b7b54fa72f82ea372ee3fa08903f4c58ccc834b0b7772dfc573be6163423bef751f401f2ecbc3e68684c1919782
-  data.tar.gz: 842393733ca9452063f86531fb3ae8b7129f35362ee5d5b03d1ddcf8bf7d92533f2734329614ca20d97b46a35d03d3482c60535b3b233c9dfa151f45333b96b8
+  metadata.gz: a0e343b3cad38bd4f96b1ba47ca414ba84456c836a9fb1c64c624665101d7e0c214895a34ecaae8dfb87fc3de14c0e2dceb44db36f0c86e72303cb82a20b182f
+  data.tar.gz: 226e33514574213c955582af9eddbe3d45d18c5ecc3b84fd4f78250e2d2fb376261ea28120f4944fbe2c166edd3597006a0f5b13a752767cc93e9a761ce5010a

data/lib/rcurses.rb

@@ -5,7 +5,7 @@
 # Web_site:   http://isene.com/
 # Github:     https://github.com/isene/rcurses
 # License:    Public domain
-# Version:    5.1.4: Added error handling with terminal restoration
+# Version:    5.1.6: Ruby 3.4+ compatibility - handle potential raw!/cooked! blocking
 
 require 'io/console' # Basic gem for rcurses
 require 'io/wait'    # stdin handling
@@ -26,8 +26,33 @@ module Rcurses
       return unless $stdin.tty?
 
       # enter raw mode, disable echo
-      $stdin.raw!
-      $stdin.echo = false
+      # Ruby 3.4+ compatibility: Handle potential blocking in raw!
+      begin
+        if RUBY_VERSION >= "3.4.0"
+          # Flush outputs before changing terminal mode (Ruby 3.4+ requirement)
+          $stdout.flush if $stdout.respond_to?(:flush)
+          $stderr.flush if $stderr.respond_to?(:flush)
+          
+          # Use timeout to detect hanging raw! call
+          begin
+            Timeout::timeout(0.5) do
+              $stdin.raw!
+              $stdin.echo = false
+            end
+          rescue Timeout::Error
+            # Fallback to stty for Ruby 3.4+ if raw! hangs
+            system("stty raw -echo 2>/dev/null")
+            @using_stty = true
+          end
+        else
+          # Original code for Ruby < 3.4
+          $stdin.raw!
+          $stdin.echo = false
+        end
+      rescue Errno::ENOTTY, Errno::ENODEV
+        # Not a real terminal
+        return
+      end
 
       # ensure cleanup on normal exit
       at_exit do
@@ -51,9 +76,42 @@ module Rcurses
     def cleanup!
       return if @cleaned_up
 
-      $stdin.cooked!
-      $stdin.echo = true
-      Rcurses.clear_screen
+      # Restore terminal to normal mode
+      begin
+        if @using_stty
+          # If we used stty for init, use it for cleanup
+          system("stty sane 2>/dev/null")
+        elsif RUBY_VERSION >= "3.4.0"
+          # Ruby 3.4+ with timeout protection
+          begin
+            Timeout::timeout(0.5) do
+              $stdin.cooked!
+              $stdin.echo = true
+            end
+          rescue Timeout::Error
+            # Fallback if cooked! hangs
+            system("stty sane 2>/dev/null")
+          end
+        else
+          # Original code for Ruby < 3.4
+          $stdin.cooked!
+          $stdin.echo = true
+        end
+      rescue => e
+        # Last resort fallback
+        system("stty sane 2>/dev/null")
+      end
+      
+      # Only clear screen if there's no error to display
+      # This preserves the error context on screen
+      if @error_to_display.nil?
+        Rcurses.clear_screen
+      else
+        # Just move cursor to bottom of screen without clearing
+        print "\e[999;1H"  # Move to bottom-left
+        print "\e[K"       # Clear current line
+      end
+      
       Cursor.show
 
       @cleaned_up = true
@@ -69,20 +127,25 @@ module Rcurses
       # Only display if we're in a TTY and not in a test environment
       return unless $stdout.tty?
       
-      puts "\n\e[31m═══ Application Error ═══\e[0m"
-      puts "\e[33m#{error.class}:\e[0m #{error.message}"
+      # Add some spacing and make the error very visible
+      puts "\n\n\e[41;37m                    APPLICATION CRASHED                    \e[0m"
+      puts "\e[31m═══════════════════════════════════════════════════════════\e[0m"
+      puts "\e[33mError Type:\e[0m #{error.class}"
+      puts "\e[33mMessage:\e[0m    #{error.message}"
       
       # Show backtrace if debug mode is enabled
       if ENV['DEBUG'] || ENV['RCURSES_DEBUG']
-        puts "\n\e[90mBacktrace:\e[0m"
-        error.backtrace.first(10).each do |line|
+        puts "\n\e[33mBacktrace:\e[0m"
+        error.backtrace.first(15).each do |line|
           puts "  \e[90m#{line}\e[0m"
         end
       else
-        puts "\e[90m(Set DEBUG=1 or RCURSES_DEBUG=1 for backtrace)\e[0m"
+        puts "\n\e[90mTip: Set DEBUG=1 or RCURSES_DEBUG=1 to see the full backtrace\e[0m"
       end
       
-      puts "\e[31m═══════════════════════\e[0m\n"
+      puts "\e[31m═══════════════════════════════════════════════════════════\e[0m"
+      puts "\e[33mNote:\e[0m The application state above shows where the error occurred."
+      puts ""
     end
     
     # Public: Run a block with proper error handling and terminal cleanup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rcurses
 version: !ruby/object:Gem::Version
-  version: 5.1.4
+  version: 5.1.6
 platform: ruby
 authors:
 - Geir Isene