cli-ui 1.3.0 → 1.4.0

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

@@ -15,8 +15,13 @@ module CLI
           @options[option] = handler
         end
 
-        def call(option)
-          @options[option].call(option)
+        def call(options)
+          case options
+          when Array
+            options.map { |option| @options[option].call(options) }
+          else
+            @options[options].call(options)
+          end
         end
       end
     end

data/lib/cli/ui/spinner.rb

@@ -10,13 +10,11 @@ module CLI
       PERIOD = 0.1 # seconds
       TASK_FAILED = :task_failed
 
-      RUNES = %w(⠋ ⠙ ⠹ ⠸ ⠼ ⠴ ⠦ ⠧ ⠇ ⠏).freeze
+      RUNES = CLI::UI::OS.current.supports_emoji? ? %w(⠋ ⠙ ⠹ ⠸ ⠼ ⠴ ⠦ ⠧ ⠇ ⠏).freeze : %w(\\ | / - \\ | / -).freeze
 
-      begin
-        colors = [CLI::UI::Color::CYAN.code] * 5 + [CLI::UI::Color::MAGENTA.code] * 5
-        raise unless RUNES.size == colors.size
-        GLYPHS = colors.zip(RUNES).map(&:join)
-      end
+      colors = [CLI::UI::Color::CYAN.code] * (RUNES.size / 2).ceil +
+        [CLI::UI::Color::MAGENTA.code] * (RUNES.size / 2).to_i
+      GLYPHS = colors.zip(RUNES).map(&:join)
 
       class << self
         attr_accessor(:index)

data/lib/cli/ui/spinner/spin_group.rb

@@ -25,6 +25,7 @@ module CLI
           @consumed_lines = 0
           @tasks = []
           @auto_debrief = auto_debrief
+          @start = Time.new
         end
 
         class Task
@@ -51,8 +52,9 @@ module CLI
               end
             end
 
+            @m = Mutex.new
             @force_full_render = false
-            @done      = false
+            @done = false
             @exception = nil
             @success   = false
           end
@@ -95,13 +97,15 @@ module CLI
           # * +width+ - current terminal width to format for
           #
           def render(index, force = true, width: CLI::UI::Terminal.width)
-            if force || @always_full_render || @force_full_render
-              full_render(index, width)
-            else
-              partial_render(index)
+            @m.synchronize do
+              if force || @always_full_render || @force_full_render
+                full_render(index, width)
+              else
+                partial_render(index)
+              end
+            ensure
+              @force_full_render = false
             end
-          ensure
-            @force_full_render = false
           end
 
           # Update the spinner title
@@ -111,9 +115,11 @@ module CLI
           # * +title+ - title to change the spinner to
           #
           def update_title(new_title)
-            @always_full_render = new_title =~ Formatter::SCAN_WIDGET
-            @title = new_title
-            @force_full_render = true
+            @m.synchronize do
+              @always_full_render = new_title =~ Formatter::SCAN_WIDGET
+              @title = new_title
+              @force_full_render = true
+            end
           end
 
           private
@@ -197,7 +203,7 @@ module CLI
                     @consumed_lines += 1
                   else
                     offset = @consumed_lines - int_index
-                    move_to   = CLI::UI::ANSI.cursor_up(offset) + "\r"
+                    move_to = CLI::UI::ANSI.cursor_up(offset) + "\r"
                     move_from = "\r" + CLI::UI::ANSI.cursor_down(offset)
 
                     print(move_to + task.render(idx, idx.zero?, width: width) + move_from)
@@ -233,7 +239,7 @@ module CLI
               out = task.stdout
               err = task.stderr
 
-              CLI::UI::Frame.open('Task Failed: ' + task.title, color: :red) do
+              CLI::UI::Frame.open('Task Failed: ' + task.title, color: :red, timing: Time.new - @start) do
                 if e
                   puts "#{e.class}: #{e.message}"
                   puts "\tfrom #{e.backtrace.join("\n\tfrom ")}"

data/lib/cli/ui/stdout_router.rb

@@ -26,13 +26,14 @@ module CLI
             end
           end
 
-          hook = Thread.current[:cliui_output_hook]
           # hook return of false suppresses output.
-          if !hook || hook.call(args.first, @name) != false
-            @stream.write_without_cli_ui(*prepend_id(@stream, args))
-            if dup = StdoutRouter.duplicate_output_to
-              dup.write(*prepend_id(dup, args))
-            end
+          if (hook = Thread.current[:cliui_output_hook])
+            return if hook.call(args.map(&:to_s).join, @name) == false
+          end
+
+          @stream.write_without_cli_ui(*prepend_id(@stream, args))
+          if (dup = StdoutRouter.duplicate_output_to)
+            dup.write(*prepend_id(dup, args))
           end
         end
 
@@ -117,6 +118,10 @@ module CLI
           prev_frame_inset = Thread.current[:no_cliui_frame_inset]
           prev_hook = Thread.current[:cliui_output_hook]
 
+          if Thread.current.respond_to?(:report_on_exception)
+            Thread.current.report_on_exception = false
+          end
+
           self.class.with_stdin_masked do
             Thread.current[:no_cliui_frame_inset] = !@with_frame_inset
             Thread.current[:cliui_output_hook] = ->(data, stream) do
@@ -159,7 +164,7 @@ module CLI
           id = format("%05d", rand(10**5))
           Thread.current[:cliui_output_id] = {
             id: id,
-            streams: on_streams
+            streams: on_streams,
           }
           yield(id)
         ensure

data/lib/cli/ui/terminal.rb

@@ -8,28 +8,38 @@ module CLI
       DEFAULT_HEIGHT = 24
 
       # Returns the width of the terminal, if possible
-      # Otherwise will return 80
+      # Otherwise will return DEFAULT_WIDTH
       #
       def self.width
-        if console = IO.respond_to?(:console) && IO.console
-          width = console.winsize[1]
-          width.zero? ? DEFAULT_WIDTH : width
-        else
-          DEFAULT_WIDTH
-        end
-      rescue Errno::EIO
-        DEFAULT_WIDTH
+        winsize[1]
       end
 
+      # Returns the width of the terminal, if possible
+      # Otherwise, will return DEFAULT_HEIGHT
+      #
       def self.height
-        if console = IO.respond_to?(:console) && IO.console
-          height = console.winsize[0]
-          height.zero? ? DEFAULT_HEIGHT : height
-        else
-          DEFAULT_HEIGHT
+        winsize[0]
+      end
+
+      def self.winsize
+        @winsize ||= begin
+          winsize = IO.console.winsize
+          setup_winsize_trap
+
+          if winsize.any?(&:zero?)
+            [DEFAULT_HEIGHT, DEFAULT_WIDTH]
+          else
+            winsize
+          end
+        rescue
+          [DEFAULT_HEIGHT, DEFAULT_WIDTH]
+        end
+      end
+
+      def self.setup_winsize_trap
+        @winsize_trap ||= Signal.trap('WINCH') do
+          @winsize = nil
         end
-      rescue Errno::EIO
-        DEFAULT_HEIGHT
       end
     end
   end

data/lib/cli/ui/truncater.rb

@@ -52,11 +52,11 @@ module CLI
                 end
               end
             when PARSE_ESC
-              case cp
+              mode = case cp
               when LEFT_SQUARE_BRACKET
-                mode = PARSE_ANSI
+                PARSE_ANSI
               else
-                mode = PARSE_ROOT
+                PARSE_ROOT
               end
             when PARSE_ANSI
               # ANSI escape codes preeeetty much have the format of:

data/lib/cli/ui/version.rb

@@ -1,5 +1,5 @@
 module CLI
   module UI
-    VERSION = "1.3.0"
+    VERSION = "1.4.0"
   end
 end

data/lib/cli/ui/widgets.rb

@@ -49,6 +49,7 @@ module CLI
 
       class InvalidWidgetHandle < ArgumentError
         def initialize(handle)
+          super
           @handle = handle
         end
 
@@ -61,6 +62,7 @@ module CLI
 
       class InvalidWidgetArguments < ArgumentError
         def initialize(argstring, pattern)
+          super
           @argstring = argstring
           @pattern   = pattern
         end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: cli-ui
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Burke Libbey
 - Julian Nadeau
 - Lisa Ugray
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-08-14 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -49,12 +49,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".dependabot/config.yml"
 - ".github/CODEOWNERS"
 - ".github/probots.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -63,11 +65,16 @@ files:
 - dev.yml
 - lib/cli/ui.rb
 - lib/cli/ui/ansi.rb
-- lib/cli/ui/box.rb
 - lib/cli/ui/color.rb
 - lib/cli/ui/formatter.rb
 - lib/cli/ui/frame.rb
+- lib/cli/ui/frame/frame_stack.rb
+- lib/cli/ui/frame/frame_style.rb
+- lib/cli/ui/frame/frame_style/box.rb
+- lib/cli/ui/frame/frame_style/bracket.rb
 - lib/cli/ui/glyph.rb
+- lib/cli/ui/os.rb
+- lib/cli/ui/printer.rb
 - lib/cli/ui/progress.rb
 - lib/cli/ui/prompt.rb
 - lib/cli/ui/prompt/interactive_options.rb
@@ -86,7 +93,7 @@ homepage: https://github.com/shopify/cli-ui
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -101,8 +108,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.0.2
+signing_key:
 specification_version: 4
 summary: Terminal UI framework
 test_files: []

data/lib/cli/ui/box.rb

@@ -1,15 +0,0 @@
-require 'cli/ui'
-
-module CLI
-  module UI
-    module Box
-      module Heavy
-        VERT = '┃'
-        HORZ = '━'
-        DIV  = "┣"
-        TL   = '┏'
-        BL   = '┗'
-      end
-    end
-  end
-end