cli-ui 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e859c2ecb4ac2b2b43b843c664284e8ee95e7a43
-  data.tar.gz: 102c74d7762e602e87fafba4eee93ba85f8e20cf
+  metadata.gz: 4fb23d4df6fad318d6479ddbaf72092658810cce
+  data.tar.gz: 95a95d0dedb08886780e853f663a2a733b57418b
 SHA512:
-  metadata.gz: 59ff9f79be424133981a6eb878b3a7b8818c200a9f24f545f9c036765dcd9b0bd13a4b313121bc603282b2aeeb9dc516ac0d788fac44c5e50888cd6f8c566e50
-  data.tar.gz: b9a1b36d13f0c9779f481e18cbabfbd42e62735e5de9705005bc3affaaffa2113be8aa3c1804d154352c2a699da13e17217e7fb1947cd9e55fe8d69fafba4857
+  metadata.gz: 7433e3e4a6a464b76698fa496f3760ec04beb8e0fdf280941ebdd33e6f5bbf5641100d9ac9adc8a783109ffb3f28404f9fd9e517cba104d4d2da5dc69cb5e8e2
+  data.tar.gz: f666dc948dc01d5c54a2d0c70333f716e9d22c181da8a4de1a8fb36a4ade3f863ec9b3c8226b6f48e11b04f6dd083fc987658cf8a4590f63103a951bcaedbeeb

data/lib/cli/ui/formatter.rb

@@ -84,7 +84,7 @@ module CLI
         @nodes = []
         stack = parse_body(StringScanner.new(@text))
         prev_fmt = nil
-        content = @nodes.each_with_object(String.new) do |(text, fmt), str|
+        content = @nodes.each_with_object(+'') do |(text, fmt), str|
           if prev_fmt != fmt && enable_color
             text = apply_format(text, fmt, sgr_map)
           end
@@ -106,7 +106,7 @@ module CLI
       private
 
       def apply_format(text, fmt, sgr_map)
-        sgr = fmt.each_with_object(String.new('0')) do |name, str|
+        sgr = fmt.each_with_object(+'0') do |name, str|
           next if name == LITERAL_BRACES
           begin
             str << ';' << sgr_map.fetch(name)

data/lib/cli/ui/frame.rb

@@ -175,7 +175,7 @@ module CLI
         # * +:color+ - The color of the prefix. Defaults to +Thread.current[:cliui_frame_color_override]+ or nil
         #
         def prefix(color: nil)
-          pfx = String.new
+          pfx = +''
           items = FrameStack.items
           items[0..-2].each do |item|
             pfx << CLI::UI.resolve_color(item).code << CLI::UI::Box::Heavy::VERT
@@ -215,7 +215,7 @@ module CLI
           color = CLI::UI.resolve_color(color)
           text  = CLI::UI.resolve_text("{{#{color.name}:#{text}}}")
 
-          prefix = String.new
+          prefix = +''
           FrameStack.items.each do |item|
             prefix << CLI::UI.resolve_color(item).code << CLI::UI::Box::Heavy::VERT
           end
@@ -227,7 +227,7 @@ module CLI
 
           termwidth = CLI::UI::Terminal.width
 
-          suffix = String.new
+          suffix = +''
           if right_text
             suffix << ' ' << right_text << ' '
           end
@@ -247,7 +247,7 @@ module CLI
             # next line and call it poor usage of this API.
           end
 
-          o = String.new
+          o = +''
 
           is_ci = ![0, '', nil].include?(ENV['CI'])
 

data/lib/cli/ui/prompt/interactive_options.rb

@@ -113,6 +113,7 @@ module CLI
           case @state
           when :root
             case char
+            when :timeout                  ; raise Interrupt # Timeout, use interrupt to simulate
             when ESC                       ; @state = :esc
             when 'k'                       ; up
             when 'j'                       ; down
@@ -123,22 +124,27 @@ module CLI
             end
           when :esc
             case char
-            when '[' ; @state = :esc_bracket
-            else     ; raise Interrupt # unhandled escape sequence.
+            when :timeout ; raise Interrupt # Timeout, use interrupt to simulate
+            when '['      ; @state = :esc_bracket
+            else          ; raise Interrupt # unhandled escape sequence.
             end
           when :esc_bracket
             @state = :root
             case char
-            when 'A' ; up
-            when 'B' ; down
-            else     ; raise Interrupt # unhandled escape sequence.
+            when :timeout ; raise Interrupt # Timeout, use interrupt to simulate
+            when 'A'      ; up
+            when 'B'      ; down
+            else          ; raise Interrupt # unhandled escape sequence.
             end
           end
         end
         # rubocop:enable Style/WhenThen,Layout/SpaceBeforeSemicolon
 
         def read_char
-          raw_tty! { $stdin.getc.chr }
+          raw_tty! do
+            getc = $stdin.getc
+            getc ? getc.chr : :timeout
+          end
         rescue IOError
           "\e"
         end

data/lib/cli/ui/stdout_router.rb

@@ -29,23 +29,36 @@ module CLI
           hook = Thread.current[:cliui_output_hook]
           # hook return of false suppresses output.
           if !hook || hook.call(args.first, @name) != false
-            args.first
-            @stream.write_without_cli_ui(*args)
+            @stream.write_without_cli_ui(*prepend_id(@stream, args))
             if dup = StdoutRouter.duplicate_output_to
-              dup.write(*args)
+              dup.write(*prepend_id(dup, args))
             end
           end
         end
 
         private
 
+        def prepend_id(stream, args)
+          return args unless prepend_id_for_stream(stream)
+          args.map do |a|
+            next a if a.chomp.empty? # allow new lines to be new lines
+            "[#{Thread.current[:cliui_output_id][:id]}] #{a}"
+          end
+        end
+
+        def prepend_id_for_stream(stream)
+          return false unless Thread.current[:cliui_output_id]
+          return true if Thread.current[:cliui_output_id][:streams].include?(stream)
+          false
+        end
+
         def auto_frame_inset?
           !Thread.current[:no_cliui_frame_inset]
         end
 
         def apply_line_prefix(str, prefix)
           return '' if str.empty?
-          prefixed = String.new
+          prefixed = +''
           str.force_encoding(Encoding::UTF_8).lines.each do |line|
             if @pending_newline
               prefixed << line
@@ -133,6 +146,26 @@ module CLI
 
         NotEnabled = Class.new(StandardError)
 
+        def with_id(on_streams:)
+          unless on_streams.is_a?(Array) && on_streams.all? { |s| s.respond_to?(:write) }
+            raise ArgumentError, <<~EOF
+            on_streams must be an array of objects that respond to `write`
+            These do not respond to write
+            #{on_streams.reject { |s| s.respond_to?(:write) }.map.with_index { |s| s.class.to_s }.join("\n")}
+            EOF
+          end
+
+          require 'securerandom'
+          id = format("%05d", rand(100))
+          Thread.current[:cliui_output_id] = {
+            id: id,
+            streams: on_streams
+          }
+          yield(id)
+        ensure
+          Thread.current[:cliui_output_id] = nil
+        end
+
         def assert_enabled!
           raise NotEnabled unless enabled?
         end

data/lib/cli/ui/version.rb

@@ -1,5 +1,5 @@
 module CLI
   module UI
-    VERSION = "1.1.1"
+    VERSION = "1.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cli-ui
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Burke Libbey
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-09 00:00:00.000000000 Z
+date: 2018-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler