terminal_rb 1.0.6 → 1.0.9

data/lib/terminal/output/ansi.rb

@@ -43,6 +43,8 @@ module Terminal
 
     def raw_write(object)
       @out.syswrite(object)
+    rescue Errno::EINTR
+      retry # fixes rare condition found on MacOS Terminal.app
     rescue IOError, SystemCallError
       __output_error(nil)
     end
@@ -86,19 +88,13 @@ module Terminal
       objects.flatten!
       return @out.puts if objects.empty?
       @out.puts(
-        Text::Formatter.format(
+        Text::Formatter.new(
           *objects,
           ansi: true,
           bbcode:,
           spaces:,
-          eol:,
-          align:,
-          width:,
-          height:,
-          padding:,
-          prefix:,
-          suffix:
-        )
+          eol:
+        ).format(align:, width:, height:, padding:, prefix:, suffix:)
       )
     rescue IOError, SystemCallError
       __output_error(nil)
@@ -137,16 +133,17 @@ module Terminal
       require('io/console')
       @con = IO.console
       return unless Signal.list.key?('WINCH')
-      Signal.trap('WINCH') do
-        @size = nil
-        @on_resize&.call
-      end
+      prev_winch =
+        Signal.trap('WINCH') do
+          @size = nil
+          @on_resize&.call
+          prev_winch.call if prev_winch.respond_to?(:call)
+        end
     end
 
     private_class_method def self.extended(mod)
       mod.instance_variable_set(:@cc, 0)
       mod.instance_variable_set(:@as, 0)
-      # at_exit { raw_write("#{Ansi::CURSOR_SHOW}#{Ansi::SCREEN_ALTERNATE_OFF}") }
     end
   end
 

data/lib/terminal/output/dumb.rb

@@ -69,19 +69,13 @@ module Terminal
       objects.flatten!
       return @out.puts if objects.empty?
       @out.puts(
-        Text::Formatter.format(
+        Text::Formatter.new(
           *objects,
           ansi: false,
           bbcode:,
           spaces:,
-          eol:,
-          align:,
-          width:,
-          height:,
-          padding:,
-          prefix:,
-          suffix:
-        )
+          eol:
+        ).format(align:, width:, height:, padding:, prefix:, suffix:)
       )
     rescue IOError, SystemCallError
       __output_error(nil)

data/lib/terminal/output.rb

@@ -27,7 +27,7 @@ module Terminal
     # @!group Output Attributes
     #
 
-    # @!attribute [r] tui?
+    # @attribute [r] tui?
     #
     #   Whether the terminal supports full TUI interaction (ANSI output
     #   with CSI-u or legacy keyboard input).
@@ -36,7 +36,7 @@ module Terminal
     #
     #   @return [true, false]
 
-    # @!attribute [r] ansi?
+    # @attribute [r] ansi?
     #
     #   Whether ANSI escape codes are supported.
     #
@@ -181,7 +181,6 @@ module Terminal
     # @!method show_cursor
     #   Show the cursor.
     #
-    #
     #   @note Reference-counted; safe for nested use.
     #
     #   @see .hide_cursor

data/lib/terminal/rspec/helper.rb

@@ -4,9 +4,10 @@ require 'stringio'
 
 # RSpec shared context for testing code that uses Terminal.rb.
 #
-# Stubs all Terminal I/O methods and provides `stdout`, `stdin`, and
-# `stdoutstr` test helpers. Output is captured into the `stdout` array;
-# input is read from the `stdin` array.
+# Stubs all Terminal I/O methods and provides the `stdout`, `stdout_lines`,
+# and `stdin` test helpers. Output is captured in the `stdout` StringIO;
+# `stdout_lines` returns its lines without line endings. Input is read from
+# the `stdin` array of raw key sequences.
 #
 # @example Basic usage
 #   RSpec.describe MyClass do
@@ -14,7 +15,7 @@ require 'stringio'
 #
 #     it 'prints a greeting' do
 #       my_object.greet
-#       expect(stdoutstr).to include('Hello')
+#       expect(stdout.string).to include('Hello')
 #     end
 #   end
 #