tty-prompt 0.21.0 → 0.22.0

data/lib/tty/prompt/mask_question.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'question'
+require_relative "question"
 
 module TTY
   class Prompt
@@ -75,7 +75,7 @@ module TTY
       def read_input(question)
         @done_masked = false
         @failure = false
-        @input = ''
+        @input = ""
         @prompt.print(question)
         until @done_masked
           @prompt.read_keypress

data/lib/tty/prompt/multi_list.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require_relative 'list'
+require_relative "list"
+require_relative "selected_choices"
 
 module TTY
   class Prompt
@@ -9,8 +10,6 @@ module TTY
     #
     # @api private
     class MultiList < List
-      HELP = '(Use %s arrow%s keys, press Space to select and Enter to finish%s)'
-
       # Create instance of TTY::Prompt::MultiList menu.
       #
       # @param [Prompt] :prompt
@@ -19,7 +18,7 @@ module TTY
       # @api public
       def initialize(prompt, **options)
         super
-        @selected = []
+        @selected = SelectedChoices.new
         @help = options[:help]
         @echo = options.fetch(:echo, true)
         @min  = options[:min]
@@ -44,11 +43,11 @@ module TTY
       #
       # @api private
       def keyenter(*)
-        if @min
-          super if @selected.size >= @min
-        else
-          super
-        end
+        valid = true
+        valid = @min <= @selected.size if @min
+        valid = @selected.size <= @max if @max
+
+        super if valid
       end
       alias keyreturn keyenter
 
@@ -58,13 +57,33 @@ module TTY
       def keyspace(*)
         active_choice = choices[@active - 1]
         if @selected.include?(active_choice)
-          @selected.delete(active_choice)
+          @selected.delete_at(@active - 1)
         else
           return if @max && @selected.size >= @max
-          @selected << active_choice
+          @selected.insert(@active - 1, active_choice)
         end
       end
 
+      # Selects all choices when Ctrl+A is pressed
+      #
+      # @api private
+      def keyctrl_a(*)
+        return if @max && @max < choices.size
+        @selected = SelectedChoices.new(choices.enabled, choices.enabled_indexes)
+      end
+
+      # Revert currently selected choices when Ctrl+I is pressed
+      #
+      # @api private
+      def keyctrl_r(*)
+        return if @max && @max < choices.size
+        indexes = choices.each_with_index.reduce([]) do |acc, (choice, idx)|
+                    acc << idx if !choice.disabled? && !@selected.include?(choice)
+                    acc
+                  end
+        @selected = SelectedChoices.new(choices.enabled - @selected.to_a, indexes)
+      end
+
       private
 
       # Setup default options and active selection
@@ -73,7 +92,9 @@ module TTY
       def setup_defaults
         validate_defaults
         # At this stage, @choices matches all the visible choices.
-        @selected = @choices.values_at(*@default.map { |d| d - 1 })
+        default_indexes = @default.map { |d| d - 1 }
+        @selected = SelectedChoices.new(@choices.values_at(*default_indexes),
+                                        default_indexes)
 
         if !@default.empty?
           @active = @default.last
@@ -88,7 +109,7 @@ module TTY
       #
       # @api private
       def selected_names
-        @selected.map(&:name).join(', ')
+        @selected.map(&:name).join(", ")
       end
 
       # Header part showing the minimum/maximum number of choices
@@ -100,7 +121,28 @@ module TTY
         help = []
         help << "min. #{@min}" if @min
         help << "max. #{@max}" if @max
-        "(%s) " % [ help.join(' ') ]
+        "(%s) " % [help.join(", ")]
+      end
+
+      # Build a default help text
+      #
+      # @return [String]
+      #
+      # @api private
+      def default_help
+        str = []
+        str << "(Press "
+        str << "#{arrows_help} arrow"
+        str << " or 1-#{choices.size} number" if enumerate?
+        str << " to move, Space"
+        str << "/Ctrl+A|R" if @max.nil?
+        str << " to select"
+        str << " (all|rev)" if @max.nil?
+        str << (filterable? ? "," : " and")
+        str << " Enter to finish"
+        str << " and letters to filter" if filterable?
+        str << ")"
+        str.join
       end
 
       # Render initial help text and then currently selected choices
@@ -109,19 +151,21 @@ module TTY
       def render_header
         instructions = @prompt.decorate(help, @help_color)
         minmax_suffix = @min || @max ? minmax_help : ""
+        print_selected = @selected.size.nonzero? && @echo
 
         if @done && @echo
           @prompt.decorate(selected_names, @active_color)
-        elsif @selected.size.nonzero? && @echo
-          help_suffix = filterable? && @filter.any? ? " #{filter_help}" : ""
-          minmax_suffix + selected_names +
-            (@first_render ? " #{instructions}" : help_suffix)
-        elsif @first_render
-          minmax_suffix + instructions
+        elsif (@first_render && (help_start? || help_always?)) ||
+              (help_always? && !@filter.any? && !@done)
+          minmax_suffix +
+            (print_selected ? "#{selected_names} " : "") +
+            instructions
         elsif filterable? && @filter.any?
-          minmax_suffix + filter_help
-        elsif @min || @max
-          minmax_help
+          minmax_suffix +
+            (print_selected ? "#{selected_names} " : "") +
+            @prompt.decorate(filter_help, @help_color)
+        else
+          minmax_suffix + (print_selected ? selected_names : "")
         end
       end
 
@@ -144,9 +188,9 @@ module TTY
 
         sync_paginators if @paging_changed
         paginator.paginate(choices, @active, @per_page) do |choice, index|
-          num = enumerate? ? (index + 1).to_s + @enum + ' ' : ''
-          indicator = (index + 1 == @active) ?  @symbols[:marker] : ' '
-          indicator += ' '
+          num = enumerate? ? (index + 1).to_s + @enum + " " : ""
+          indicator = (index + 1 == @active) ?  @symbols[:marker] : " "
+          indicator += " "
           message = if @selected.include?(choice) && !choice.disabled?
                       selected = @prompt.decorate(@symbols[:radio_on], @active_color)
                       "#{selected} #{num}#{choice.name}"
@@ -157,7 +201,7 @@ module TTY
                       "#{@symbols[:radio_off]} #{num}#{choice.name}"
                     end
           end_index = paginated? ? paginator.end_index : choices.size - 1
-          newline = (index == end_index) ? '' : "\n"
+          newline = (index == end_index) ? "" : "\n"
           output << indicator + message + newline
         end
 

data/lib/tty/prompt/multiline.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative 'question'
-require_relative 'symbols'
+require_relative "question"
+require_relative "symbols"
 
 module TTY
   class Prompt
@@ -9,7 +9,7 @@ module TTY
     #
     # @api private
     class Multiline < Question
-      HELP = '(Press CTRL-D or CTRL-Z to finish)'.freeze
+      HELP = "(Press Ctrl+D or Ctrl+Z to finish)".freeze
 
       def initialize(prompt, **options)
         super
@@ -55,8 +55,9 @@ module TTY
         @prompt.print(question)
         @lines = read_input
         @input = "#{@lines.first.strip} ..." unless @lines.first.to_s.empty?
-        if Utils.blank?(@input)
-          @input = default? ? default : nil
+        if Utils.blank?(@input) && default?
+          @input = default
+          @lines = default
         end
         @evaluator.(@lines)
       end

data/lib/tty/prompt/paginator.rb

@@ -40,7 +40,7 @@ module TTY
       #
       # @api private
       def check_page_size!
-        raise InvalidArgument, 'per_page must be > 0' if @per_page < 1
+        raise InvalidArgument, "per_page must be > 0" if @per_page < 1
       end
 
       # Paginate collection given an active index

data/lib/tty/prompt/question.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative 'converters'
-require_relative 'evaluator'
-require_relative 'question/modifier'
-require_relative 'question/validation'
-require_relative 'question/checks'
-require_relative 'utils'
+require_relative "converters"
+require_relative "evaluator"
+require_relative "question/modifier"
+require_relative "question/validation"
+require_relative "question/checks"
+require_relative "utils"
 
 module TTY
   # A class responsible for shell prompt interactions.
@@ -35,23 +35,30 @@ module TTY
       #
       # @api public
       def initialize(prompt, **options)
-        @prompt     = prompt
-        @prefix     = options.fetch(:prefix) { @prompt.prefix }
-        @default    = options.fetch(:default) { UndefinedSetting }
-        @required   = options.fetch(:required) { false }
-        @echo       = options.fetch(:echo) { true }
-        @in         = options.fetch(:in) { UndefinedSetting }
-        @modifier   = options.fetch(:modifier) { [] }
-        @validation = options.fetch(:validation) { UndefinedSetting }
-        @convert    = options.fetch(:convert) { UndefinedSetting }
+        # Option deprecation
+        if options[:validation]
+          warn "[DEPRECATION] The `:validation` option is deprecated. Use `:validate` instead."
+          options[:validate] = options[:validation]
+        end
+
+        @prompt       = prompt
+        @prefix       = options.fetch(:prefix) { @prompt.prefix }
+        @default      = options.fetch(:default) { UndefinedSetting }
+        @required     = options.fetch(:required) { false }
+        @echo         = options.fetch(:echo) { true }
+        @in           = options.fetch(:in) { UndefinedSetting }
+        @modifier     = options.fetch(:modifier) { [] }
+        @validation   = options.fetch(:validate) { UndefinedSetting }
+        @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 }
-        @value      = options.fetch(:value) { UndefinedSetting }
-        @messages   = Utils.deep_copy(options.fetch(:messages) { { } })
-        @done       = false
+        @help_color   = options.fetch(:help_color) { @prompt.help_color }
+        @error_color  = options.fetch(:error_color) { :red }
+        @value        = options.fetch(:value) { UndefinedSetting }
+        @quiet        = options.fetch(:quiet) { @prompt.quiet }
+        @messages     = Utils.deep_copy(options.fetch(:messages) { { } })
+        @done         = false
         @first_render = true
-        @input      = nil
+        @input        = nil
 
         @evaluator = Evaluator.new(self)
 
@@ -60,6 +67,7 @@ module TTY
         @evaluator << CheckRange
         @evaluator << CheckValidation
         @evaluator << CheckModifier
+        @evaluator << CheckConversion
       end
 
       # Stores all the error messages displayed to user
@@ -85,7 +93,7 @@ module TTY
         if template && !template.match(/\%\{/).nil?
           [template % tokens]
         else
-          [template || '']
+          [template || ""]
         end
       end
 
@@ -96,7 +104,7 @@ module TTY
       # @return [self]
       #
       # @api public
-      def call(message = '', &block)
+      def call(message = "", &block)
         @message = message
         block.call(self) if block
         @prompt.subscribe(self) do
@@ -122,8 +130,8 @@ module TTY
           total_lines = @prompt.count_screen_lines(input_line)
           @prompt.print(refresh(question.lines.count, total_lines))
         end
-        @prompt.print(render_question)
-        convert_result(result.value)
+        @prompt.print(render_question) unless @quiet
+        result.value
       end
 
       # Render question
@@ -141,7 +149,7 @@ module TTY
         elsif @done
           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.join
@@ -177,7 +185,7 @@ module TTY
       # @api private
       def render_error(errors)
         errors.reduce([]) do |acc, err|
-          acc << @prompt.decorate('>>', :red) + ' ' + err
+          acc << @prompt.decorate(">>", :red) + " " + err
           acc
         end.join("\n")
       end
@@ -211,8 +219,13 @@ module TTY
       #
       # @api private
       def convert_result(value)
-        if convert? & !Utils.blank?(value)
-          Converters.convert(@convert, value)
+        if convert? && !Utils.blank?(value)
+          case @convert
+          when Proc
+            @convert.call(value)
+          else
+            Converters.convert(@convert, value)
+          end
         else
           value
         end
@@ -221,8 +234,13 @@ module TTY
       # Specify answer conversion
       #
       # @api public
-      def convert(value)
-        @convert = value
+      def convert(value = (not_set = true), message = nil)
+        messages[:convert?] = message if message
+        if not_set
+          @convert
+        else
+          @convert = value
+        end
       end
 
       # Check if conversion is set
@@ -345,6 +363,13 @@ module TTY
         @in != UndefinedSetting
       end
 
+      # Set quiet mode.
+      #
+      # @api public
+      def quiet(value)
+        @quiet = value
+      end
+
       # @api public
       def to_s
         message.to_s

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "../const"
+
 module TTY
   class Prompt
     class Question
@@ -81,6 +83,22 @@ module TTY
             end
           end
         end
+
+        class CheckConversion
+          def self.call(question, value)
+            if question.convert? && !Utils.blank?(value)
+              result = question.convert_result(value)
+              if result == Const::Undefined
+                tokens = {value: value, type: question.convert}
+                [value, question.message_for(:convert?, tokens)]
+              else
+                [result]
+              end
+            else
+              [value]
+            end
+          end
+        end
       end # Checks
     end # Question
   end # Prompt

data/lib/tty/prompt/selected_choices.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+module TTY
+  class Prompt
+    # @api private
+    class SelectedChoices
+      include Enumerable
+
+      attr_reader :size
+
+      # Create selected choices
+      #
+      # @param [Array<Choice>] selected
+      # @param [Array<Integer>] indexes
+      #
+      # @api public
+      def initialize(selected = [], indexes = [])
+        @selected = selected
+        @indexes = indexes
+        @size = @selected.size
+      end
+
+      # Clear selected choices
+      #
+      # @api public
+      def clear
+        @indexes.clear
+        @selected.clear
+        @size = 0
+      end
+
+      # Iterate over selected choices
+      #
+      # @api public
+      def each(&block)
+        return to_enum unless block_given?
+        @selected.each(&block)
+      end
+
+      # Insert choice at index
+      #
+      # @param [Integer] index
+      # @param [Choice] choice
+      #
+      # @api public
+      def insert(index, choice)
+        insert_idx = find_index_by { |i| index < @indexes[i] }
+        insert_idx ||= -1
+        @indexes.insert(insert_idx, index)
+        @selected.insert(insert_idx, choice)
+        @size += 1
+        self
+      end
+
+      # Delete choice at index
+      #
+      # @return [Choice]
+      #   the deleted choice
+      #
+      # @api public
+      def delete_at(index)
+        delete_idx = @indexes.each_index.find { |i| index == @indexes[i] }
+        return nil unless delete_idx
+
+        @indexes.delete_at(delete_idx)
+        choice = @selected.delete_at(delete_idx)
+        @size -= 1
+        choice
+      end
+
+      def find_index_by(&search)
+        (0...@size).bsearch(&search)
+      end
+    end # SelectedChoices
+  end # Prompt
+end # TTY