terminal_rb 0.9.5 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d20a3a35e0ac4ef63e9275befee56d97d7fd611db9dcc3438de5a49bb0938eef
-  data.tar.gz: 86475f7f6d2f89e86353e25fe9bae8803d4a75a3df0a8aab2ae58b4fdd4a5a92
+  metadata.gz: 151c319bb4dc4f395db83f3966bd37dd2436736b33f89c124baa3eb19ff7412a
+  data.tar.gz: 3a5a1fa68a55cf7de4a63688c76587dc4f6f5f03ad6a4531a7586abcc6c6601b
 SHA512:
-  metadata.gz: b10bd0a2329433e8452b63b2291d4e888937ef8329d5557da7943605131b1a1ec8a42cbb77e6b8f2757f70525b8723d1c1a8242bd1f18593b1a47be6b7c7a655
-  data.tar.gz: d08a89d748cf95019615005bfa5370884e2f235f1721df29963a2acaf733ce2e6c06c912d9833cfa4660ca99972126b19477af380641673d63019ae6a9af5827
+  metadata.gz: 978e14d08f3335a08ba06a70a4c92f4ed8a188eed03a255a7892fbf155ab11a66380a1eafb203fd81e398b49cfc4c46e81e05f4ff0dc7c8a134fed22f9bcfdb6
+  data.tar.gz: fc42bc22a4a92feea2eab08684ebe7fd0b9ccfc8d1ff08ee4e6ca2020e3a374c4ca2c048bd7d8ac8271e4b7c210d1a30697b42d9c7d9bc430d6b51b9375a7bd3

data/lib/terminal/ansi.rb

@@ -297,9 +297,9 @@ module Terminal
           .chars
           .map! do |char|
             i = (seed + ((pos += 1) / spread)) * frequency
-            "\e[38;2;#{(Math.sin(i) * 255).abs.to_i};" \
-              "#{(Math.sin(i + PI2_THIRD) * 255).abs.to_i};" \
-              "#{(Math.sin(i + PI4_THIRD) * 255).abs.to_i}m#{char}"
+            "\e[38;2;#{(Math.sin(i) * 255).to_i.abs};" \
+              "#{(Math.sin(i + PI2_THIRD) * 255).to_i.abs};" \
+              "#{(Math.sin(i + PI4_THIRD) * 255).to_i.abs}m#{char}"
           end
           .join << RESET
       end
@@ -390,6 +390,7 @@ module Terminal
 
       # Erase screen part.
       #
+      # @param [:below, :above, :all, :scrollback] part screen part to erase
       # @return (see cursor_up)
       def screen_erase(part = :all)
         "\e[#{
@@ -446,6 +447,7 @@ module Terminal
 
       # Erase part of line.
       #
+      # @param [:to_end, :to_start, :all] part line part to erase
       # @return (see cursor_up)
       def line_erase(part = :all)
         "\e[#{
@@ -468,14 +470,26 @@ module Terminal
       def title(title) = "\e]2;#{title}\a"
 
       # Set  tab title.
-      # This is not widely supported.
+      # This is not widely supported; works for
+      # Hyper,
+      # iTerm2,
+      # Kitty,
+      # MacOS Terminal,
+      # Tabby,
+      # WezTerm.
       #
       # @param (see title)
       # @return (see cursor_up)
       def tab_title(title) = "\e]0;#{title}\a"
 
       # Create a hyperlink.
-      # This is not widely supported.
+      # This is not widely supported; works for
+      # Ghosty,
+      # iTerm2,
+      # Kitty,
+      # Rio,
+      # Tabby,
+      # WezTerm.
       #
       # @param [#to_s] url URL to link to
       # @param [#to_s] text text to display for the link
@@ -485,7 +499,7 @@ module Terminal
       # Create scaled text.
       # It uses the
       # [text sizing protocol](https://sw.kovidgoyal.net/kitty/text-sizing-protocol).
-      # This is not widely supported.
+      # This is not widely supported; works for Kitty.
       #
       # @example Double-height Greeting
       #   Terminal::Ansi.scale('Hello Ruby!', scale: 2)
@@ -672,6 +686,7 @@ module Terminal
     #   def chars_delete(count = 1) = "\e[#{count}P"
     #   def chars_erase(count = 1) = "\e[#{count}X"
     #   def notify(title) = "\e]9;#{title}\a"
+    #   def set_scroll_region(top = nil, bottom = nil) = "\e[#{top};#{bottom}r"
 
     # @comment TODO:
     #   https://sw.kovidgoyal.net/kitty/desktop-notifications

data/lib/terminal/detect.rb

@@ -6,19 +6,19 @@ module Terminal
       def application
         return :kitty if ENV.key?('KITTY_PID')
         return :alacritty if ENV.key?('ALACRITTY_WINDOW_ID')
-        app_from_term_program || app_from_term
+        app_by_tp || app_by_term
       end
 
       def colors
-        if KNOW_APP_WITH_TRUE_COLOR.include?(app_from_term_program) ||
-             (ENV['COLORTERM'] == 'truecolor')
+        return 16_777_216 if ENV['COLORTERM'] == 'truecolor'
+        if %i[ghostty iterm kitty rio vscode wezterm tabby].include?(app_by_tp)
           return 16_777_216
         end
         term = ENV['TERM'] or return 8
         return 16_777_216 if /[+-]direct/.match?(term)
         match = /[-+](\d+)color/.match(term) and return match[1].to_i
         match = /[-+](\d+)bit/.match(term) and return 2**match[1].to_i
-        ret = color_by_name[term] and return ret
+        ret = color_by[term] and return ret
         case term
         when /^(?:iTerm\s?\d*\.app|nsterm-build\d+|terminology(-[0-9.]+)?)$/
           256
@@ -31,8 +31,7 @@ module Terminal
 
       private
 
-      def app_from_term_program
-        value = ENV['TERM_PROGRAM'] or return
+      def app_by_tp
         {
           'Apple_Terminal' => :macos,
           'CodeEditApp_Terminal' => :code_edit,
@@ -49,37 +48,43 @@ module Terminal
           'WarpTerminal' => :warp,
           'WezTerm' => :wezterm
         }[
-          value
+          ENV['TERM_PROGRAM']
         ]
       end
 
-      def app_from_term
-        value = ENV['TERM'] or return
-        {
-          'alacritty' => :alacritty,
-          'amiga' => :amiga,
-          'd430' => :dg_unix,
-          'd470' => :dg_unix,
-          'dg+' => :dg_unix,
-          'dgunix' => :dg_unix,
-          'hp+' => :hpterm,
-          'hpterm' => :hpterm,
-          'mintty' => :mintty,
-          'ms-terminal' => :ms_terminal,
-          'ncr260' => :ncr260,
-          'nsterm' => :nsterm,
-          'terminator' => :terminator,
-          'terminology' => :terminology,
-          'termite' => :termite,
-          'vt100' => :vt100,
-          'wy350' => :wyse,
-          'wy370' => :wyse,
-          'xnuppc' => :xnuppc
-        }.each_pair { |str, type| return type if value.start_with?(str) }
-        nil
+      def app_by_term
+        term = ENV['TERM'] or return
+        case term[0]
+        when 'a'
+          return :alacritty if term.start_with?('alacritty')
+          :amiga if term.start_with?('amiga')
+        when 'd'
+          if term.start_with?('dg+') || term.start_with?('dgunix') ||
+               /\Ad4[37]0/.match?(term)
+            :dg_unix
+          end
+        when 'h'
+          :hpterm if term.start_with?('hp+') || term.start_with?('hpterm')
+        when 'm'
+          return :mintty if term.start_with?('mintty')
+          :ms_terminal if term.start_with?('ms-terminal')
+        when 'n'
+          return :ncr260 if term.start_with?('ncr260')
+          :nsterm if term.start_with?('nsterm')
+        when 't'
+          return :terminator if term.start_with?('terminator')
+          return :terminology if term.start_with?('terminology')
+          :termite if term.start_with?('termite')
+        when 'v'
+          :vt100 if term.start_with?('vt100')
+        when 'w'
+          :wyse if /\Awy3\d\d/.match?(term)
+        when 'x'
+          :xnuppc if term.start_with?('xnuppc')
+        end
       end
 
-      def color_by_name
+      def color_by
         {
           'alacritty' => 256,
           'kitty' => 256,
@@ -142,9 +147,6 @@ module Terminal
           'dummy' => 2
         }
       end
-
-      KNOW_APP_WITH_TRUE_COLOR = %i[kitty ghostty vscode iterm].freeze
-      private_constant :KNOW_APP_WITH_TRUE_COLOR
     end
   end
 

data/lib/terminal/input/csiu_keys.rb

@@ -30,11 +30,16 @@ module Terminal
       end
 
       def unicode(key)
-        with_modifier(key) { ORD[_1] || _1.chr(Encoding::UTF_8) }
+        with_modifier(key) do |ord|
+          ORD[ord] || UNICODE_ORD[ord] || ord.chr(Encoding::UTF_8)
+        end
       end
 
       def legacy(key)
-        with_modifier(key) { _1 == 13 ? 'F3' : ORD[_1] }
+        with_modifier(key) do |ord|
+          return 'F3' if ord == 13
+          ord == 57_427 ? 'KpBegin' : ORD[ord]
+        end
       end
 
       def with_modifier(key)
@@ -51,6 +56,7 @@ module Terminal
     ORD = {
       0x02 => 'Ins',
       0x03 => 'Del',
+      0x04 => 'Del',
       0x05 => 'PageUp',
       0x06 => 'PageDown',
       0x07 => 'Home',
@@ -72,6 +78,88 @@ module Terminal
       0x7f => 'Back'
     }.compare_by_identity.freeze
 
+    # ESC [ ? u
+    UNICODE_ORD = {
+      57_376 => 'F13',
+      57_377 => 'F14',
+      57_378 => 'F15',
+      57_379 => 'F16',
+      57_380 => 'F17',
+      57_381 => 'F18',
+      57_382 => 'F19',
+      57_383 => 'F20',
+      57_384 => 'F21',
+      57_385 => 'F22',
+      57_386 => 'F23',
+      57_387 => 'F24',
+      57_388 => 'F25',
+      57_389 => 'F26',
+      57_390 => 'F27',
+      57_391 => 'F28',
+      57_392 => 'F29',
+      57_393 => 'F30',
+      57_394 => 'F31',
+      57_395 => 'F32',
+      57_396 => 'F33',
+      57_397 => 'F34',
+      57_398 => 'F35',
+      57_399 => 'Kp0',
+      57_400 => 'Kp1',
+      57_401 => 'Kp2',
+      57_402 => 'Kp3',
+      57_403 => 'Kp4',
+      57_404 => 'Kp5',
+      57_405 => 'Kp6',
+      57_406 => 'Kp7',
+      57_407 => 'Kp8',
+      57_408 => 'Kp9',
+      57_409 => 'KpDecimal',
+      57_410 => 'KpDivide',
+      57_411 => 'KpMultiply',
+      57_412 => 'KpSubtract',
+      57_413 => 'KpAdd',
+      57_414 => 'KpEnter',
+      57_415 => 'KpEqual',
+      57_416 => 'KpSeparator',
+      57_417 => 'KpLeft',
+      57_418 => 'KpRight',
+      57_419 => 'KpUp',
+      57_420 => 'KpDown',
+      57_421 => 'KpPage_up',
+      57_422 => 'KpPage_down',
+      57_423 => 'KpHome',
+      57_424 => 'KpEnd',
+      57_425 => 'KpInsert',
+      57_426 => 'KpDelete',
+      57_428 => 'MediaPlay',
+      57_429 => 'MediaPause',
+      57_430 => 'MediaPlay Pause',
+      57_431 => 'MediaReverse',
+      57_432 => 'MediaStop',
+      57_433 => 'MediaFast Forward',
+      57_434 => 'MediaRewind',
+      57_435 => 'MediaTrack Next',
+      57_436 => 'MediaTrack Previous',
+      57_437 => 'MediaRecord',
+      57_438 => 'LowerVolume',
+      57_439 => 'RaiseVolume',
+      57_440 => 'MuteVolume',
+      57_441 => 'LeftShift',
+      57_442 => 'LeftControl',
+      57_443 => 'LeftAlt',
+      57_444 => 'LeftSuper',
+      57_445 => 'LeftHyper',
+      57_446 => 'LeftMeta',
+      57_447 => 'RightShift',
+      57_448 => 'RightControl',
+      57_449 => 'RightAlt',
+      57_450 => 'RightSuper',
+      57_451 => 'RightHyper',
+      57_452 => 'RightMeta',
+      57_453 => 'IsoLevel3Shift',
+      57_454 => 'IsoLevel5Shift'
+    }.compare_by_identity.freeze
+
     # ESC ?
     C0_LEGACY = {
       0x00 => 'Ctrl+Space',

data/lib/terminal/input/dumb_keys.rb

@@ -15,4 +15,5 @@ module Terminal
       0x1b => 'Esc'
     }.compare_by_identity.freeze
   end
+  private_constant :DumbKeys
 end

data/lib/terminal/input.rb

@@ -86,6 +86,7 @@ module Terminal
 
     def find_input_mode
       return :dumb unless STDIN.tty?
+      STDIN.sync = true
       return :legacy if !ansi? || _write("\e[>1u\e[?u\e[c").nil? || !csi_u?
       _write("\e[<u")
       :csi_u
@@ -94,6 +95,7 @@ module Terminal
     end
 
     def csi_u?
+      # iTerm2 returns result in two chunks :/
       ret = false
       while true
         result = read_tty or return false
@@ -108,5 +110,5 @@ module Terminal
   autoload :CSIuKeys, "#{dir}/input/csiu_keys.rb"
   autoload :DumbKeys, "#{dir}/input/dumb_keys.rb"
   autoload :LegacyKeys, "#{dir}/input/legacy_keys.rb"
-  private_constant :CSIuKeys, :LegacyKeys
+  private_constant :CSIuKeys, :DumbKeys, :LegacyKeys
 end

data/lib/terminal/rspec/helper.rb

@@ -1,34 +1,60 @@
 # frozen_string_literal: true
 
-RSpec.shared_context 'with Terminal' do |mod, ansi: true, winsize: [25, 80]|
-  let(:wrapper_module) { Module.new }
-  let(:stdout) { double(:STDOUT, winsize: winsize, tty?: ansi) }
-  let(:stdoutput) { [] }
-  let(:terminal) do
-    load('terminal/ansi/attributes.rb', wrapper_module)
-    load('terminal/ansi.rb', wrapper_module)
-    load('terminal/input/legacy_mode.rb', wrapper_module)
-    load('terminal/input.rb', wrapper_module)
-    load('terminal/detect.rb', wrapper_module)
-    load('terminal.rb', wrapper_module)
-    wrapper_module::Terminal
-  end
+RSpec.shared_context 'with Terminal.rb' do |ansi: true, application: :kitty, colors: 256, size: [25, 80], pos: [1, 1]|
+  let(:stdout) { [] }
+  let(:stdoutstr) { stdout.join }
 
   before do
-    allow(stdout).to receive(:write) do |*args|
-      stdoutput.concat(args)
-      nil
+    allow(Terminal).to receive(:ansi?).with(no_args).and_return(ansi)
+    allow(Terminal).to receive(:application).with(no_args).and_return(
+      application
+    )
+    allow(Terminal).to receive(:colors).with(no_args).and_return(
+      colors == :true_color ? 16_777_216 : colors
+    )
+    allow(Terminal).to receive(:size).with(no_args).and_return(size)
+    allow(Terminal).to receive(:pos).with(no_args).and_return(pos)
+    allow(Terminal).to receive(:hide_cursor).with(no_args).and_return(Terminal)
+    allow(Terminal).to receive(:show_cursor).with(no_args).and_return(Terminal)
+
+    bbc =
+      if ansi
+        ->(s) { Terminal::Ansi.bbcode(s) }
+      else
+        ->(s) { Terminal::Ansi.plain(s) }
+      end
+
+    nobbc = ansi ? lambda(&:to_s) : ->(s) { Terminal::Ansi.undecorate(s) }
+
+    allow(Terminal).to receive(:<<) do |object|
+      stdout.push(bbcode[object]) unless object.nil?
+      Terminal
     end
 
-    wrapper_module::STDOUT = stdout unless defined?(wrapper_module::STDOUT)
+    allow(Terminal).to receive(:print) do |*objects, bbcode: true|
+      bbcode = bbcode ? bbc : nobbc
+      objects.flatten.each { stdout.push(bbcode[_1]) unless _1.nil? }
+      nil
+    end
 
-    unless ansi
-      allow(ENV).to receive(:[]).and_call_original
-      allow(ENV).to receive(:[]).with('LINES').and_return winsize.first
-      allow(ENV).to receive(:[]).with('COLUMNS').and_return winsize.last
+    allow(Terminal).to receive(:puts) do |*objects, bbcode: true|
+      objects.flatten!
+      if objects.empty?
+        stdout.push("\n")
+        next
+      end
+      bbcode = bbcode ? bbc : nobbc
+      objects.each do |s|
+        next stdout.push("\n") if s.nil?
+        stdout.push(s = bbcode[s])
+        stdout.push("\n") if s[-1] != "\n"
+      end
+      nil
     end
 
-    mod.__send__(:remove_const, :Terminal) if defined?(mod::Terminal)
-    mod.__send__(:const_set, :Terminal, terminal)
+    allow(Terminal).to receive(:_write) do |object|
+      stdout.push(object = object.to_s)
+      object.bytesize
+    end
   end
 end

data/lib/terminal/text.rb

@@ -67,19 +67,15 @@ module Terminal
         ignore_newline: false,
         &block
       )
-        if limit
-          limit = limit.to_i
-          raise(ArgumentError, "invalid limit - #{limit}") if limit < 1
-          if block
-            lim_lines(text, bbcode, ansi, ignore_newline, limit, &block)
-          else
-            to_enum(:lim_lines, text, bbcode, ansi, ignore_newline, limit)
-          end
-        elsif block
-          lines(text, bbcode, ansi, ignore_newline, &block)
-        else
-          to_enum(:lines, text, bbcode, ansi, ignore_newline)
+        unless limit
+          snippeds = as_snippeds(text, bbcode, ansi, ignore_newline, Word)
+          return block ? lines(snippeds, &block) : to_enum(:lines, snippeds)
         end
+        limit = limit.to_i
+        raise(ArgumentError, "invalid limit - #{limit}") if limit < 1
+        snippeds = as_snippeds(text, bbcode, ansi, ignore_newline, WordEx)
+        return lim_lines(snippeds, limit, &block) if block
+        to_enum(:lim_lines, snippeds, limit)
       end
       alias each each_line
 
@@ -101,19 +97,15 @@ module Terminal
         ignore_newline: false,
         &block
       )
-        if limit
-          limit = limit.to_i
-          raise(ArgumentError, "invalid limit - #{limit}") if limit < 1
-          if block
-            lim_pairs(text, bbcode, ansi, ignore_newline, limit, &block)
-          else
-            to_enum(:lim_pairs, text, bbcode, ansi, ignore_newline, limit)
-          end
-        elsif block
-          pairs(text, bbcode, ansi, ignore_newline, &block)
-        else
-          to_enum(:pairs, text, bbcode, ansi, ignore_newline)
+        unless limit
+          snippeds = as_snippeds(text, bbcode, ansi, ignore_newline, Word)
+          return block ? pairs(snippeds, &block) : to_enum(:pairs, snippeds)
         end
+        limit = limit.to_i
+        raise(ArgumentError, "invalid limit - #{limit}") if limit < 1
+        snippeds = as_snippeds(text, bbcode, ansi, ignore_newline, WordEx)
+        return lim_pairs(snippeds, limit, &block) if block
+        to_enum(:lim_pairs, snippeds, limit)
       end
       alias each_with_size each_line_with_size
 
@@ -130,17 +122,11 @@ module Terminal
         sco == 0xff9e || sco == 0xff9f ? 2 : 1
       end
 
-      def lim_pairs(text, bbcode, ansi, ignore_newline, limit)
+      def lim_pairs(snippeds, limit)
         line = EMPTY.dup
         size = 0
         csi = nil
-        as_snippeds(
-          text,
-          bbcode,
-          ansi,
-          ignore_newline,
-          WordEx
-        ).each do |snipped|
+        snippeds.each do |snipped|
           if snipped == :space
             next if size == 0
             next line << ' ' if (size += 1) <= limit
@@ -150,13 +136,13 @@ module Terminal
           end
 
           if snipped == :nl
-            yield(line, size)
+            line[-1] == ' ' ? yield(line.chop, size - 1) : yield(line, size)
             line = "#{csi}"
             next size = 0
           end
 
           if snipped == :hard_nl
-            yield(line, size)
+            line[-1] == ' ' ? yield(line.chop, size - 1) : yield(line, size)
             line = EMPTY.dup
             csi = nil
             next size = 0
@@ -183,13 +169,13 @@ module Terminal
           end
           yield(line, size) if size != 0
 
-          if snipped.size < limit
+          if snipped.size <= limit
             line = "#{csi}#{snipped}"
             next size = snipped.size
           end
 
           words = snipped.split(limit)
-          if words[-1].size < limit
+          if words[-1].size <= limit
             snipped = words.pop
             line = "#{csi}#{snipped}"
             size = snipped.size
@@ -202,17 +188,50 @@ module Terminal
         nil
       end
 
-      def lim_lines(text, bbcode, ansi, ignore_newline, limit)
+      def pairs(snippeds)
+        line = EMPTY.dup
+        size = 0
+        csi = nil
+        snippeds.each do |snipped|
+          if snipped == :space
+            next if size == 0
+            line << ' '
+            next size += 1
+          end
+
+          if snipped == :nl
+            line[-1] == ' ' ? yield(line.chop, size - 1) : yield(line, size)
+            line = "#{csi}"
+            next size = 0
+          end
+
+          if snipped == :hard_nl
+            line[-1] == ' ' ? yield(line.chop, size - 1) : yield(line, size)
+            line = EMPTY.dup
+            csi = nil
+            next size = 0
+          end
+
+          if snipped == CsiEnd
+            line << CsiEnd if csi
+            next csi = nil
+          end
+
+          next line << (csi = snipped) if snipped.is_a?(Csi)
+          next line << snipped if snipped.is_a?(Osc)
+
+          # Word:
+          line << snipped
+          size += snipped.size
+        end
+        nil
+      end
+
+      def lim_lines(snippeds, limit)
         line = EMPTY.dup
         size = 0
         csi = nil
-        as_snippeds(
-          text,
-          bbcode,
-          ansi,
-          ignore_newline,
-          WordEx
-        ).each do |snipped|
+        snippeds.each do |snipped|
           if snipped == :space
             next if size == 0
             next line << ' ' if (size += 1) <= limit
@@ -222,13 +241,13 @@ module Terminal
           end
 
           if snipped == :nl
-            yield(line)
+            yield(line[-1] == ' ' ? line.chop : line)
             line = "#{csi}"
             next size = 0
           end
 
           if snipped == :hard_nl
-            yield(line)
+            yield(line[-1] == ' ' ? line.chop : line)
             line = EMPTY.dup
             csi = nil
             next size = 0
@@ -255,13 +274,13 @@ module Terminal
           end
           yield(line) if size != 0
 
-          if snipped.size < limit
+          if snipped.size <= limit
             line = "#{csi}#{snipped}"
             next size = snipped.size
           end
 
           words = snipped.split(limit)
-          if words[-1].size < limit
+          if words[-1].size <= limit
             snipped = words.pop
             line = "#{csi}#{snipped}"
             size = snipped.size
@@ -274,11 +293,11 @@ module Terminal
         nil
       end
 
-      def pairs(text, bbcode, ansi, ignore_newline)
+      def lines(snippeds)
         line = EMPTY.dup
         size = 0
         csi = nil
-        as_snippeds(text, bbcode, ansi, ignore_newline, Word).each do |snipped|
+        snippeds.each do |snipped|
           if snipped == :space
             next if size == 0
             line << ' '
@@ -286,13 +305,13 @@ module Terminal
           end
 
           if snipped == :nl
-            yield(line, size)
+            yield(line[-1] == ' ' ? line.chop : line)
             line = "#{csi}"
             next size = 0
           end
 
           if snipped == :hard_nl
-            yield(line, size)
+            yield(line[-1] == ' ' ? line.chop : line)
             line = EMPTY.dup
             csi = nil
             next size = 0
@@ -313,62 +332,43 @@ module Terminal
         nil
       end
 
-      def lines(text, bbcode, ansi, ignore_newline)
-        line = EMPTY.dup
-        csi = nil
-        as_snippeds(text, bbcode, ansi, ignore_newline, Word).each do |snipped|
-          next line << ' ' if snipped == :space
-
-          if snipped == :nl
-            next if line.empty?
-            yield(line)
-            next line = "#{csi}"
-          end
-
-          if snipped == :hard_nl
-            yield(line)
-            line = EMPTY.dup
-            next csi = nil
-          end
-
-          if snipped == CsiEnd
-            line << CsiEnd if csi
-            next csi = nil
-          end
-
-          csi = snipped if snipped.is_a?(Csi)
-          # Csi, Osc, Word:
-          line << snipped
-        end
-        nil
-      end
-
       def as_snippeds(text, bbcode, ansi, ignore_newline, word_class)
         ret = []
         last = nil
         text.each do |txt|
           if (txt = bbcode ? Ansi.bbcode(txt) : txt.to_s).empty?
-            next ret[-1] = last = :hard_nl if ret[-1] == :space
+            next ret[-1] = last = :hard_nl if last.is_a?(Symbol)
             next ret << (last = :hard_nl)
           end
+
           txt = txt.encode(ENC) if txt.encoding != ENC
+
           txt.scan(SCAN_EXPR) do |nl, csi, osc, space, gc|
             if gc
               next last.add(gc, char_width(gc)) if last.is_a?(word_class)
               next ret << (last = word_class.new(gc, char_width(gc)))
             end
+
             next last.is_a?(Symbol) ? nil : ret << (last = :space) if space
+
             if nl
-              if ignore_newline
+              if ignore_newline # handle nl like space
                 next last.is_a?(Symbol) ? nil : ret << (last = :space)
               end
               next last == :space ? ret[-1] = last = :nl : ret << (last = :nl)
             end
+
             next unless ansi
+
             next ret << (last = Osc.new(osc)) if osc
-            next ret << (last = CsiEnd) if csi == "\e[m" || csi == "\e[0m"
+
+            if csi == "\e[m" || csi == "\e[0m"
+              next last == CsiEnd ? nil : ret << (last = CsiEnd)
+            end
+
             last.is_a?(Csi) ? last.add(csi) : ret << (last = Csi.new(csi))
           end
+
           next ret[-1] = last = :hard_nl if last.is_a?(Symbol)
           ret << (last = :hard_nl)
         end
@@ -378,15 +378,14 @@ module Terminal
 
     class Osc
       attr_reader :to_str, :size
-
+      alias _to_s to_s
       alias to_s to_str
+      def inspect = "#{_to_s.chop} #{@to_str.inspect}>"
 
       def initialize(str)
         @to_str = str
         @size = 0
       end
-
-      def inspect = "#{to_s.chop} #{@to_str.inspect}>"
     end
 
     class Csi < Osc
@@ -403,8 +402,9 @@ module Terminal
 
     class Word
       attr_reader :to_str, :size
-
+      alias _to_s to_s
       alias to_s to_str
+      def inspect = "#{_to_s.chop} #{@size}:#{@to_str.inspect}>"
 
       def initialize(char, size)
         @to_str = char.dup
@@ -415,8 +415,6 @@ module Terminal
         @to_str << char
         @size += size
       end
-
-      def inspect = "#{to_s.chop} #{@size}:#{@to_str.inspect}>"
     end
 
     class WordEx < Word

data/lib/terminal/version.rb

@@ -2,5 +2,5 @@
 
 module Terminal
   # The version number of the gem.
-  VERSION = '0.9.5'
+  VERSION = '0.9.7'
 end

data/lib/terminal.rb

@@ -24,7 +24,7 @@ module Terminal
     #
     # @attribute [r] ansi?
     # @return [Boolean] whether ANSI control codes are supported
-    def ansi? = (@mode == :ansi)
+    def ansi? = @ansi
 
     # Terminal application identifier.
     #
@@ -182,7 +182,7 @@ module Terminal
     # @param [#to_s] object object to write
     # @return [Terminal] itself
     def <<(object)
-      @out.write(@bbcode[object]) unless object.nil? || @out.nil?
+      @out&.write(@bbcode[object]) unless object.nil?
       self
     rescue IOError
       @out = nil
@@ -197,8 +197,10 @@ module Terminal
     # @return [nil]
     def print(*objects, bbcode: true)
       return unless @out
-      bbcode = bbcode ? @bbcode : @nobbcode
-      objects.flatten.each { @out.write(bbcode[_1]) unless _1.nil? }
+      objects.flatten!
+      return if (line = objects.join).empty?
+      return if (line = (bbcode ? @bbcode : @nobbcode)[line]).empty?
+      @out.write(line)
       nil
     rescue IOError
       @out = nil
@@ -245,25 +247,31 @@ module Terminal
       [rows > 0 ? rows : 25, columns > 0 ? columns : 80]
     end
 
-    def _determine_mode
-      # order is important:
-      return :dumb unless STDOUT.tty?
-      ENV.key?('NO_COLOR') || ENV['TERM'] == 'dumb' ? :dumb : :ansi
+    def _determine_modes
+      # order is important!
+      tty = STDOUT.tty?
+      return tty, true if ENV['ANSI'] == 'force'
+      return false, false if ENV.key?('NO_COLOR') || ENV['TERM'] == 'dumb'
+      [tty, tty]
     rescue IOError
-      nil
+      [nil, false]
     end
   end
 
-  @mode = _determine_mode
-  @out = STDOUT if @mode
   @cc = 0
+  tty, @ansi = _determine_modes
 
-  if ansi?
-    @bbcode = ->(s) { Ansi.bbcode(s) }
-    @nobbcode = lambda(&:to_s)
+  (@out = STDOUT).sync = true unless tty.nil?
+
+  if tty
     @inf = STDOUT
     @con = IO.console
     Signal.trap('WINCH') { @size = nil } if Signal.list.key?('WINCH')
+  end
+
+  if @ansi
+    @bbcode = ->(s) { Ansi.bbcode(s) }
+    @nobbcode = lambda(&:to_s)
   else
     @bbcode = ->(s) { Ansi.plain(s) }
     @nobbcode = ->(s) { Ansi.undecorate(s) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terminal_rb
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.7
 platform: ruby
 authors:
 - Mike Blumtritt
@@ -49,7 +49,7 @@ metadata:
   rubygems_mfa_required: 'true'
   source_code_uri: https://codeberg.org/mblumtritt/Terminal.rb
   bug_tracker_uri: https://codeberg.org/mblumtritt/Terminal.rb/issues
-  documentation_uri: https://rubydoc.info/gems/terminal_rb/0.9.5/Terminal
+  documentation_uri: https://rubydoc.info/gems/terminal_rb/0.9.7/Terminal
 rdoc_options: []
 require_paths:
 - lib