tty-prompt 0.15.0 → 0.16.0

data/lib/tty/prompt/mask_question.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 require_relative 'question'
 require_relative 'symbols'
@@ -52,18 +53,18 @@ module TTY
       #
       # @api private
       def render_question
-        header = "#{@prefix}#{message} "
+        header = ["#{@prefix}#{message} "]
         if echo?
-          masked = "#{@mask * "#{@input}".length}"
+          masked = @mask.to_s * @input.to_s.length
           if @done_masked && !@failure
             masked = @prompt.decorate(masked, @active_color)
           elsif @done_masked && @failure
             masked = @prompt.decorate(masked, @error_color)
           end
-          header += masked
+          header << masked
         end
         header << "\n" if @done
-        header
+        header.join
       end
 
       def render_error(errors)

data/lib/tty/prompt/multi_list.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 require_relative 'list'
 
@@ -47,6 +48,10 @@ module TTY
         # At this stage, @choices matches all the visible choices.
         @selected = @choices.values_at(*@default.map { |d| d - 1 })
         @active = @default.last unless @selected.empty?
+        if choices[@active - 1] && choices[@active - 1].disabled?
+          raise ConfigurationError,
+                "active choice '#{choices[@active - 1]}' matches disabled item"
+        end
       end
 
       # Generate selected items names
@@ -90,14 +95,18 @@ module TTY
       #
       # @api private
       def render_menu
-        output = ''
+        output = []
+
         @paginator.paginate(choices, @active, @per_page) do |choice, index|
           num = enumerate? ? (index + 1).to_s + @enum + ' ' : ''
           indicator = (index + 1 == @active) ?  @marker : ' '
           indicator += ' '
-          message = if @selected.include?(choice)
+          message = if @selected.include?(choice) && !choice.disabled?
                       selected = @prompt.decorate(symbols[:radio_on], @active_color)
                       selected + ' ' + num + choice.name
+                    elsif choice.disabled?
+                      @prompt.decorate(symbols[:cross], :red) +
+                        ' ' + num + choice.name + ' ' + choice.disabled.to_s
                     else
                       symbols[:radio_off] + ' ' + num + choice.name
                     end
@@ -105,7 +114,8 @@ module TTY
           newline = (index == max_index) ? '' : "\n"
           output << indicator + message + newline
         end
-        output
+
+        output.join
       end
     end # MultiList
   end # Prompt

data/lib/tty/prompt/multiline.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 require_relative 'question'
 require_relative 'symbols'
@@ -40,17 +41,17 @@ module TTY
       alias keyenter keyreturn
 
       def render_question
-        header = "#{@prefix}#{message} "
+        header = ["#{@prefix}#{message} "]
         if !echo?
           header
         elsif @done
-          header += @prompt.decorate("#{@input}", @active_color)
+          header << @prompt.decorate("#{@input}", @active_color)
         elsif @first_render
-          header += @prompt.decorate(help, @help_color)
+          header << @prompt.decorate(help, @help_color)
           @first_render = false
         end
-        header += "\n"
-        header
+        header << "\n"
+        header.join
       end
 
       def process_input(question)

data/lib/tty/prompt/paginator.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module TTY
   class Prompt

data/lib/tty/prompt/question.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 require_relative 'converters'
 require_relative 'evaluator'
@@ -20,7 +21,7 @@ module TTY
         def to_s
           "undefined"
         end
-        alias inspect to_s
+        alias_method :inspect, :to_s
       end
 
       # Store question message
@@ -46,7 +47,7 @@ module TTY
         @convert    = options.fetch(:convert) { UndefinedSetting }
         @active_color = options.fetch(:active_color) { @prompt.active_color }
         @help_color = options.fetch(:help_color) { @prompt.help_color }
-        @error_color = options.fetch(:error_color)  { :red }
+        @error_color = options.fetch(:error_color) { :red }
         @messages   = Utils.deep_copy(options.fetch(:messages) { { } })
         @done       = false
         @input      = nil
@@ -129,16 +130,16 @@ module TTY
       #
       # @api private
       def render_question
-        header = "#{@prefix}#{message} "
+        header = ["#{@prefix}#{message} "]
         if !echo?
           header
         elsif @done
-          header += @prompt.decorate("#{@input}", @active_color)
+          header << @prompt.decorate(@input.to_s, @active_color)
         elsif default? && !Utils.blank?(@default)
-          header += @prompt.decorate("(#{default})", @help_color) + ' '
+          header << @prompt.decorate("(#{default})", @help_color) + ' '
         end
         header << "\n" if @done
-        header
+        header.join
       end
 
       # Decide how to handle input from user
@@ -180,7 +181,7 @@ module TTY
       #
       # @api private
       def refresh(lines, lines_to_clear)
-        output = ''
+        output = []
         if @done
           if @errors.count.zero?
             output << @prompt.cursor.up(lines)
@@ -191,7 +192,7 @@ module TTY
         else
           output << @prompt.cursor.up(lines)
         end
-        output + @prompt.clear_lines(lines_to_clear)
+        output.join + @prompt.clear_lines(lines_to_clear)
       end
 
       # Convert value to expected type
@@ -321,7 +322,7 @@ module TTY
 
       # @api public
       def to_s
-        "#{message}"
+        message.to_s
       end
 
       # String representation of this question

data/lib/tty/prompt/question/checks.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module TTY
   class Prompt

data/lib/tty/prompt/question/modifier.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module TTY
   class Prompt

data/lib/tty/prompt/question/validation.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module TTY
   class Prompt

data/lib/tty/prompt/result.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module TTY
   class Prompt

data/lib/tty/prompt/slider.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 require_relative 'symbols'
 
@@ -160,7 +161,7 @@ module TTY
       #
       # @api private
       def render_question
-        header = "#{@prefix}#{@question} "
+        header = ["#{@prefix}#{@question} "]
         if @done
           header << @prompt.decorate(answer.to_s, @active_color)
           header << "\n"
@@ -171,7 +172,7 @@ module TTY
           header << "\n" + @prompt.decorate(HELP, @help_color)
           @first_render = false
         end
-        header
+        header.join
       end
 
       # Render slider representation

data/lib/tty/prompt/statement.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module TTY
   # A class responsible for shell prompt interactions.

data/lib/tty/prompt/suggestion.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 require_relative 'distance'
 
@@ -97,16 +98,13 @@ module TTY
 
       # @api private
       def build_single_suggestion
-        suggestion = ''
-        suggestion << single_text + "\n"
-        suggestion << (' ' * indent + @suggestions.first)
+        single_text + "\n" + (' ' * indent) + @suggestions.first
       end
 
       # @api private
       def build_multiple_suggestions
-        suggestion = ''
-        suggestion << plural_text + "\n"
-        suggestion << @suggestions.map do |sugest|
+        plural_text + "\n" +
+        @suggestions.map do |sugest|
           ' ' * indent + sugest
         end.join("\n")
       end

data/lib/tty/prompt/symbols.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module TTY
   class Prompt
@@ -28,7 +29,7 @@ module TTY
 
       WIN_KEYS = {
         tick: '√',
-        cross: '×',
+        cross: 'x',
         star: '*',
         square: '[█]',
         square_empty: '[ ]',

data/lib/tty/prompt/timeout.rb

@@ -1,16 +1,15 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 require 'timers'
 
 module TTY
   class Prompt
     class Timeout
-      Error = Class.new(RuntimeError)
-
-      TIMEOUT_HANDLER = proc { |t| t.raise Error, 'timeout expired' }
-
+      # A class responsible for measuring interval
+      #
+      # @api private
       def initialize(options = {})
-        @timeout_handler  = options.fetch(:timeout_handler) { TIMEOUT_HANDLER }
         @interval_handler = options.fetch(:interval_handler) { proc {} }
         @lock    = Mutex.new
         @running = true
@@ -30,17 +29,23 @@ module TTY
       #
       # @api public
       def timeout(time, interval, &job)
-        @runner = async_run(time, interval)
-        job.()
-        @runner.join
+        input_thread  = Thread.new { job.() }
+        timing_thread = measure_intervals(time, interval, input_thread)
+        [input_thread, timing_thread].each(&:join)
       end
 
+      # Cancel this timeout measurement
+      #
+      # @api public
       def cancel
         return unless @running
         @running = false
       end
 
-      def async_run(time, interval)
+      # Measure intervals and terminate input
+      #
+      # @api private
+      def measure_intervals(time, interval, input_thread)
         Thread.new do
           Thread.current.abort_on_exception = true
           start = Time.now
@@ -60,12 +65,12 @@ module TTY
               delta = time - runtime
 
               if delta <= 0.0
-                @timeout_handler.(Thread.current)
-                break
+                @running = false
               end
             }
           end
 
+          input_thread.terminate
           interval_timer.cancel
         end
       end

data/lib/tty/prompt/utils.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module TTY
   module Utils

data/lib/tty/prompt/version.rb

@@ -2,6 +2,6 @@
 
 module TTY
   class Prompt
-    VERSION = '0.15.0'.freeze
+    VERSION = '0.16.0'.freeze
   end # Prompt
 end # TTY

data/lib/tty/test_prompt.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 require_relative 'prompt'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tty-prompt
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Piotr Murach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-08 00:00:00.000000000 Z
+date: 2018-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: necromancer
@@ -151,9 +151,10 @@ files:
 - examples/ask_valid.rb
 - examples/collect.rb
 - examples/echo.rb
-- examples/enum.rb
-- examples/enum_paged.rb
 - examples/enum_select.rb
+- examples/enum_select_disabled.rb
+- examples/enum_select_paged.rb
+- examples/enum_select_wrapped.rb
 - examples/expand.rb
 - examples/in.rb
 - examples/inputs.rb
@@ -161,12 +162,17 @@ files:
 - examples/keypress.rb
 - examples/mask.rb
 - examples/multi_select.rb
+- examples/multi_select_disabled.rb
 - examples/multi_select_paged.rb
+- examples/multi_select_wrapped.rb
 - examples/multiline.rb
 - examples/pause.rb
 - examples/select.rb
+- examples/select_disabled.rb
+- examples/select_enum.rb
 - examples/select_filtered.rb
 - examples/select_paginated.rb
+- examples/select_wrapped.rb
 - examples/slider.rb
 - examples/validation.rb
 - examples/yes_no.rb
@@ -227,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A beautiful and powerful interactive command line prompt.