tty-prompt 0.18.1 → 0.19.0

data/spec/unit/slider_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe TTY::Prompt, '#slider' do
     expect(prompt.output.string).to eq([
       "\e[?25lWhat size? ",
       symbols[:line] * 6,
-      "\e[32m#{symbols[:handle]}\e[0m",
+      "\e[32m#{symbols[:bullet]}\e[0m",
       "#{symbols[:line] * 5} 44",
       "\n\e[90m(Use arrow keys, press Enter to select)\e[0m",
       "\e[2K\e[1G\e[1A\e[2K\e[1G",
@@ -28,7 +28,7 @@ RSpec.describe TTY::Prompt, '#slider' do
     expect(prompt.output.string).to eq([
       "\e[?25lWhat size? ",
       symbols[:line] * 3,
-      "\e[32m#{symbols[:handle]}\e[0m",
+      "\e[32m#{symbols[:bullet]}\e[0m",
       "#{symbols[:line] * 8} 38",
       "\n\e[90m(Use arrow keys, press Enter to select)\e[0m",
       "\e[2K\e[1G\e[1A\e[2K\e[1G",
@@ -50,7 +50,7 @@ RSpec.describe TTY::Prompt, '#slider' do
     expect(prompt.output.string).to eq([
       "\e[?25lWhat size? ",
       symbols[:pipe] + symbols[:line] * 3,
-      "\e[32m#{symbols[:handle]}\e[0m",
+      "\e[32m#{symbols[:bullet]}\e[0m",
       "#{symbols[:line] * 7 + symbols[:pipe]} 6%",
       "\n\e[90m(Use arrow keys, press Enter to select)\e[0m",
       "\e[2K\e[1G\e[1A\e[2K\e[1G",
@@ -66,7 +66,7 @@ RSpec.describe TTY::Prompt, '#slider' do
     expect(prompt.output.string).to eq([
       "\e[?25lWhat size? ",
       symbols[:line] * 5,
-      "\e[31m#{symbols[:handle]}\e[0m",
+      "\e[31m#{symbols[:bullet]}\e[0m",
       "#{symbols[:line] * 5} 5",
       "\n\e[36m(Use arrow keys, press Enter to select)\e[0m",
       "\e[2K\e[1G\e[1A\e[2K\e[1G",
@@ -87,14 +87,56 @@ RSpec.describe TTY::Prompt, '#slider' do
     expect(prompt.output.string).to eq([
       "\e[?25lWhat size? ",
       symbols[:line] * 10,
-      "\e[32m#{symbols[:handle]}\e[0m 10",
+      "\e[32m#{symbols[:bullet]}\e[0m 10",
       "\n\e[90m(Use arrow keys, press Enter to select)\e[0m",
       "\e[2K\e[1G\e[1A\e[2K\e[1G",
       "What size? ",
       symbols[:line] * 10,
-      "\e[32m#{symbols[:handle]}\e[0m 10",
+      "\e[32m#{symbols[:bullet]}\e[0m 10",
       "\e[2K\e[1G",
       "What size? \e[32m10\e[0m\n\e[?25h"
     ].join)
   end
+
+  it "changes all display symbols" do
+    prompt = TTY::TestPrompt.new(symbols: {
+      bullet: 'x',
+      line: '_'
+    })
+    prompt.input << "\r"
+    prompt.input.rewind
+
+    expect(prompt.slider('What size?', min: 32, max: 54, step: 2)).to eq(44)
+
+    expect(prompt.output.string).to eq([
+      "\e[?25lWhat size? ",
+      '_' * 6,
+      "\e[32mx\e[0m",
+      "#{'_' * 5} 44",
+      "\n\e[90m(Use arrow keys, press Enter to select)\e[0m",
+      "\e[2K\e[1G\e[1A\e[2K\e[1G",
+      "What size? \e[32m44\e[0m\n\e[?25h"
+    ].join)
+  end
+
+  it "changes all display symbols per instance" do
+    prompt = TTY::TestPrompt.new
+    prompt.input << "\r"
+    prompt.input.rewind
+
+    answer = prompt.slider('What size?', min: 32, max: 54, step: 2) do |range|
+      range.symbols bullet: 'x', line: '_'
+    end
+
+    expect(answer).to eq(44)
+    expect(prompt.output.string).to eq([
+      "\e[?25lWhat size? ",
+      '_' * 6,
+      "\e[32mx\e[0m",
+      "#{'_' * 5} 44",
+      "\n\e[90m(Use arrow keys, press Enter to select)\e[0m",
+      "\e[2K\e[1G\e[1A\e[2K\e[1G",
+      "What size? \e[32m44\e[0m\n\e[?25h"
+    ].join)
+  end
 end

data/spec/unit/timer_spec.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+RSpec.describe TTY::Prompt::Timer do
+  it "times out loop execution" do
+    timer = TTY::Prompt::Timer.new(0.03, 0.01)
+    yielded = []
+
+    timer.while_remaining do |remaining|
+      expect(remaining).to be_within(0.1).of(timer.duration - yielded.size * 0.01)
+      yielded << remaining
+      sleep(0.01)
+    end
+  end
+
+  it "registers a tick event" do
+    timer = TTY::Prompt::Timer.new(0.03, 0.01)
+    yielded = []
+
+    timer.on_tick do |time|
+      yielded << time
+    end
+
+    timer.while_remaining do
+      # busy work
+    end
+
+    expect(yielded.size).to be >= 2
+  end
+end

data/tty-prompt.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |spec|
   spec.name          = "tty-prompt"
   spec.version       = TTY::Prompt::VERSION
   spec.authors       = ["Piotr Murach"]
-  spec.email         = [""]
+  spec.email         = ["me@piotrmurach.com"]
   spec.summary       = %q{A beautiful and powerful interactive command line prompt.}
   spec.description   = %q{A beautiful and powerful interactive command line prompt with a robust API for getting and validating complex inputs.}
   spec.homepage      = "https://piotrmurach.github.io/tty"
@@ -21,13 +21,11 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.0.0'
 
-  spec.add_dependency 'necromancer',  '~> 0.4.0'
+  spec.add_dependency 'necromancer',  '~> 0.5.0'
   spec.add_dependency 'pastel',       '~> 0.7.0'
-  spec.add_dependency 'timers',       '~> 4.0'
-  spec.add_dependency 'tty-cursor',   '~> 0.6.0'
-  spec.add_dependency 'tty-reader',   '~> 0.5.0'
+  spec.add_dependency 'tty-reader',   '~> 0.6.0'
 
-  spec.add_development_dependency 'bundler', '>= 1.5.0', '< 2.0'
+  spec.add_development_dependency 'bundler', '>= 1.5.0'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tty-prompt
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.19.0
 platform: ruby
 authors:
 - Piotr Murach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-29 00:00:00.000000000 Z
+date: 2019-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: necromancer
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: pastel
   requirement: !ruby/object:Gem::Requirement
@@ -39,21 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.7.0
 - !ruby/object:Gem::Dependency
-  name: timers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: tty-cursor
+  name: tty-reader
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -66,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: tty-reader
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -87,9 +59,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -97,9 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -131,7 +97,7 @@ dependencies:
 description: A beautiful and powerful interactive command line prompt with a robust
   API for getting and validating complex inputs.
 email:
-- ''
+- me@piotrmurach.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -141,6 +107,7 @@ files:
 - README.md
 - Rakefile
 - examples/ask.rb
+- examples/ask_blank.rb
 - examples/ask_valid.rb
 - examples/collect.rb
 - examples/echo.rb
@@ -149,6 +116,7 @@ files:
 - examples/enum_select_paged.rb
 - examples/enum_select_wrapped.rb
 - examples/expand.rb
+- examples/expand_auto.rb
 - examples/in.rb
 - examples/inputs.rb
 - examples/key_events.rb
@@ -156,12 +124,14 @@ files:
 - examples/mask.rb
 - examples/multi_select.rb
 - examples/multi_select_disabled.rb
+- examples/multi_select_disabled_paged.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_disabled_paged.rb
 - examples/select_enum.rb
 - examples/select_filtered.rb
 - examples/select_paginated.rb
@@ -172,6 +142,7 @@ files:
 - lib/tty-prompt.rb
 - lib/tty/prompt.rb
 - lib/tty/prompt/answers_collector.rb
+- lib/tty/prompt/block_paginator.rb
 - lib/tty/prompt/choice.rb
 - lib/tty/prompt/choices.rb
 - lib/tty/prompt/confirm_question.rb
@@ -180,7 +151,6 @@ files:
 - lib/tty/prompt/converters.rb
 - lib/tty/prompt/distance.rb
 - lib/tty/prompt/enum_list.rb
-- lib/tty/prompt/enum_paginator.rb
 - lib/tty/prompt/evaluator.rb
 - lib/tty/prompt/expander.rb
 - lib/tty/prompt/keypress.rb
@@ -199,12 +169,13 @@ files:
 - lib/tty/prompt/statement.rb
 - lib/tty/prompt/suggestion.rb
 - lib/tty/prompt/symbols.rb
-- lib/tty/prompt/timeout.rb
+- lib/tty/prompt/timer.rb
 - lib/tty/prompt/utils.rb
 - lib/tty/prompt/version.rb
 - lib/tty/test_prompt.rb
 - spec/spec_helper.rb
 - spec/unit/ask_spec.rb
+- spec/unit/block_paginator_spec.rb
 - spec/unit/choice/eql_spec.rb
 - spec/unit/choice/from_spec.rb
 - spec/unit/choices/add_spec.rb
@@ -225,7 +196,6 @@ files:
 - spec/unit/converters/convert_string_spec.rb
 - spec/unit/converters/on_error_spec.rb
 - spec/unit/distance/distance_spec.rb
-- spec/unit/enum_paginator_spec.rb
 - spec/unit/enum_select_spec.rb
 - spec/unit/error_spec.rb
 - spec/unit/evaluator_spec.rb
@@ -257,6 +227,7 @@ files:
 - spec/unit/statement/initialize_spec.rb
 - spec/unit/subscribe_spec.rb
 - spec/unit/suggest_spec.rb
+- spec/unit/timer_spec.rb
 - spec/unit/warn_spec.rb
 - spec/unit/yes_no_spec.rb
 - tasks/console.rake
@@ -282,14 +253,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A beautiful and powerful interactive command line prompt.
 test_files:
 - spec/spec_helper.rb
 - spec/unit/ask_spec.rb
+- spec/unit/block_paginator_spec.rb
 - spec/unit/choice/eql_spec.rb
 - spec/unit/choice/from_spec.rb
 - spec/unit/choices/add_spec.rb
@@ -310,7 +281,6 @@ test_files:
 - spec/unit/converters/convert_string_spec.rb
 - spec/unit/converters/on_error_spec.rb
 - spec/unit/distance/distance_spec.rb
-- spec/unit/enum_paginator_spec.rb
 - spec/unit/enum_select_spec.rb
 - spec/unit/error_spec.rb
 - spec/unit/evaluator_spec.rb
@@ -342,5 +312,6 @@ test_files:
 - spec/unit/statement/initialize_spec.rb
 - spec/unit/subscribe_spec.rb
 - spec/unit/suggest_spec.rb
+- spec/unit/timer_spec.rb
 - spec/unit/warn_spec.rb
 - spec/unit/yes_no_spec.rb

data/lib/tty/prompt/timeout.rb

@@ -1,78 +0,0 @@
-# frozen_string_literal: true
-
-require 'timers'
-
-module TTY
-  class Prompt
-    class Timeout
-      # A class responsible for measuring interval
-      #
-      # @api private
-      def initialize(options = {})
-        @interval_handler = options.fetch(:interval_handler) { proc {} }
-        @lock    = Mutex.new
-        @running = true
-        @timers  = Timers::Group.new
-      end
-
-      def self.timeout(time, interval, &block)
-        (@scheduler ||= new).timeout(time, interval, &block)
-      end
-
-      # Evalute block and time it
-      #
-      # @param [Float] time
-      #   the time by which to stop
-      # @param [Float] interval
-      #   the interval time for each tick
-      #
-      # @api public
-      def timeout(time, interval, &job)
-        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
-
-      # 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
-
-          interval_timer = @timers.every(interval) do
-            runtime = Time.now - start
-            delta = time - runtime
-            if delta.round >= 0
-              @interval_handler.(delta.round)
-            end
-          end
-
-          while @running
-            @lock.synchronize {
-              @timers.wait
-              runtime = Time.now - start
-              delta = time - runtime
-
-              if delta <= 0.0
-                @running = false
-              end
-            }
-          end
-
-          input_thread.terminate
-          interval_timer.cancel
-        end
-      end
-    end # Scheduler
-  end # Prompt
-end # TTY