tty-prompt 0.4.0 → 0.5.0

data/spec/unit/multi_select_spec.rb

@@ -83,7 +83,7 @@ RSpec.describe TTY::Prompt do
             end
     expect(value).to eq([{score: 1}])
     expect(prompt.output.string).to eq([
-      "\e[?25lSelect drinks? \e[90m(Use arrow or number (0-9) keys, press Space to select and Enter to finish)\e[0m\n",
+      "\e[?25lSelect drinks? \e[90m(Use arrow or number (1-5) keys, press Space to select and Enter to finish)\e[0m\n",
       "‣ ⬡ 1) vodka\n",
       "  ⬡ 2) beer\n",
       "  ⬡ 3) wine\n",
@@ -116,7 +116,7 @@ RSpec.describe TTY::Prompt do
             end
     expect(value).to match_array([{score: 20}, {score: 50}])
     expect(prompt.output.string).to eq([
-      "\e[?25lSelect drinks? beer, bourbon\n",
+      "\e[?25lSelect drinks? beer, bourbon \e[90m(Use arrow keys, press Space to select and Enter to finish)\e[0m\n",
       "  ⬡ vodka\n",
       "  \e[32m⬢\e[0m beer\n",
       "  ⬡ wine\n",
@@ -174,4 +174,41 @@ RSpec.describe TTY::Prompt do
       "[?] Select drinks? \n\e[?25h"
     ].join)
   end
+
+  it "changes selected item color & marker" do
+    prompt = TTY::TestPrompt.new
+    choices = %w(vodka beer wine whisky bourbon)
+    prompt.input << "\r"
+    prompt.input.rewind
+    options = {default: [1], active_color: :blue, marker: '>'}
+    expect(prompt.multi_select("Select drinks?", choices, options)). to eq(['vodka'])
+    expect(prompt.output.string).to eq([
+      "\e[?25lSelect drinks? vodka \e[90m(Use arrow keys, press Space to select and Enter to finish)\e[0m\n",
+      "> \e[34m⬢\e[0m vodka\n",
+      "  ⬡ beer\n",
+      "  ⬡ wine\n",
+      "  ⬡ whisky\n",
+      "  ⬡ bourbon",
+      "\e[1000D\e[K\e[1A" * 5, "\e[1000D\e[K",
+      "Select drinks? \e[34mvodka\e[0m\n\e[?25h"
+    ].join)
+  end
+
+  it "changes help text" do
+    prompt = TTY::TestPrompt.new
+    choices = %w(vodka beer wine whisky bourbon)
+    prompt.input << "\r"
+    prompt.input.rewind
+    expect(prompt.multi_select("Select drinks?", choices, help: '(Bash keyboard)')). to eq([])
+    expect(prompt.output.string).to eq([
+      "\e[?25lSelect drinks? \e[90m(Bash keyboard)\e[0m\n",
+      "‣ ⬡ vodka\n",
+      "  ⬡ beer\n",
+      "  ⬡ wine\n",
+      "  ⬡ whisky\n",
+      "  ⬡ bourbon",
+      "\e[1000D\e[K\e[1A" * 5, "\e[1000D\e[K",
+      "Select drinks? \n\e[?25h"
+    ].join)
+  end
 end

data/spec/unit/select_spec.rb

@@ -103,7 +103,7 @@ RSpec.describe TTY::Prompt, '#select' do
             end
     expect(value).to eq(2)
     expect(prompt.output.string).to eq([
-      "\e[?25lWhat size? \e[90m(Use arrow or number (0-9) keys, press Enter to select)\e[0m\n",
+      "\e[?25lWhat size? \e[90m(Use arrow or number (1-3) keys, press Enter to select)\e[0m\n",
       "  1. large\n",
       "\e[32m‣ 2. medium\e[0m\n",
       "  3. small",
@@ -122,7 +122,7 @@ RSpec.describe TTY::Prompt, '#select' do
             end
     expect(value).to eq('Good choice!')
     expect(prompt.output.string).to eq([
-      "\e[?25lWhat size? \e[90m(Use arrow or number (0-9) keys, press Enter to select)\e[0m\n",
+      "\e[?25lWhat size? \e[90m(Use arrow or number (1-3) keys, press Enter to select)\e[0m\n",
       "  1) large\n",
       "\e[32m‣ 2) medium\e[0m\n",
       "  3) small",
@@ -137,7 +137,7 @@ RSpec.describe TTY::Prompt, '#select' do
     prompt.input.rewind
     expect(prompt.select('What size?', choices, default: 2, enum: '.')).to eq('Medium')
     expect(prompt.output.string).to eq([
-      "\e[?25lWhat size? \e[90m(Use arrow or number (0-9) keys, press Enter to select)\e[0m\n",
+      "\e[?25lWhat size? \e[90m(Use arrow or number (1-3) keys, press Enter to select)\e[0m\n",
       "  1. Large\n",
       "\e[32m‣ 2. Medium\e[0m\n",
       "  3. Small",
@@ -150,10 +150,11 @@ RSpec.describe TTY::Prompt, '#select' do
     choices = %w(Large Medium Small)
     prompt.input << " "
     prompt.input.rewind
-    value = prompt.select('What size?', choices, color: :blue, marker: '>')
+    options = {active_color: :blue, help_color: :red, marker: '>'}
+    value = prompt.select('What size?', choices, options)
     expect(value).to eq('Large')
     expect(prompt.output.string).to eq([
-      "\e[?25lWhat size? \e[90m(Use arrow keys, press Enter to select)\e[0m\n",
+      "\e[?25lWhat size? \e[31m(Use arrow keys, press Enter to select)\e[0m\n",
       "\e[34m> Large\e[0m\n",
       "  Medium\n",
       "  Small",
@@ -193,4 +194,26 @@ RSpec.describe TTY::Prompt, '#select' do
       "[?] What size? \e[32mLarge\e[0m\n\e[?25h"
     ].join)
   end
+
+  it "verifies default index format" do
+    prompt = TTY::TestPrompt.new
+    choices = %w(Large Medium Small)
+    prompt.input << "\r"
+    prompt.input.rewind
+
+    expect {
+      prompt.select('What size?', choices, default: '')
+    }.to raise_error(TTY::Prompt::ConfigurationError, /in range \(1 - 3\)/)
+  end
+
+  it "verifies default index range" do
+    prompt = TTY::TestPrompt.new
+    choices = %w(Large Medium Small)
+    prompt.input << "\r"
+    prompt.input.rewind
+
+    expect {
+      prompt.select('What size?', choices, default: 10)
+    }.to raise_error(TTY::Prompt::ConfigurationError, /`10` out of range \(1 - 3\)/)
+  end
 end

data/spec/unit/slider_spec.rb

@@ -51,4 +51,19 @@ RSpec.describe TTY::Prompt, '#slider' do
       "What size? \e[32m6\e[0m\n\e[?25h"
     ].join)
   end
+
+  it "changes display colors" do
+    prompt.input << "\r"
+    prompt.input.rewind
+    options = {active_color: :red, help_color: :cyan}
+    expect(prompt.slider('What size?', options)).to eq(5)
+    expect(prompt.output.string).to eq([
+      "\e[?25lWhat size? \e[36m(Use arrow keys, press Enter to select)\e[0m\n",
+      "|-----",
+      "\e[31mO\e[0m",
+      "-----| 5",
+      "\e[1000D\e[K\e[1A\e[1000D\e[K",
+      "What size? \e[31m5\e[0m\n\e[?25h"
+    ].join)
+  end
 end

data/spec/unit/yes_no_spec.rb

@@ -1,11 +1,11 @@
 # encoding: utf-8
 
-RSpec.describe TTY::Prompt, '#yes?' do
+RSpec.describe TTY::Prompt, 'confirmation' do
 
   subject(:prompt) { TTY::TestPrompt.new }
 
-  context 'yes?' do
-    it 'agrees' do
+  context '#yes?' do
+    it 'agrees with question' do
       prompt.input << 'yes'
       prompt.input.rewind
       expect(prompt.yes?("Are you a human?")).to eq(true)
@@ -13,11 +13,11 @@ RSpec.describe TTY::Prompt, '#yes?' do
         "Are you a human? \e[90m(Y/n)\e[0m ",
         "\e[1000D\e[K\e[1A",
         "\e[1000D\e[K",
-        "Are you a human? \e[32myes\e[0m\n"
+        "Are you a human? \e[32mYes\e[0m\n"
       ].join)
     end
 
-    it 'disagrees' do
+    it 'disagrees with question' do
       prompt.input << 'no'
       prompt.input.rewind
       expect(prompt.yes?("Are you a human?")).to eq(false)
@@ -32,38 +32,173 @@ RSpec.describe TTY::Prompt, '#yes?' do
     it 'assumes default true' do
       prompt.input << "\r"
       prompt.input.rewind
-      expect(prompt.yes?("Are you a human?", default: true)).to eq(true)
+      expect(prompt.yes?("Are you a human?")).to eq(true)
+      expect(prompt.output.string).to eq([
+        "Are you a human? \e[90m(Y/n)\e[0m ",
+        "\e[1000D\e[K\e[1A",
+        "\e[1000D\e[K",
+        "Are you a human? \e[32mYes\e[0m\n"
+      ].join)
+    end
+
+    it 'changes default' do
+      prompt.input << "\n"
+      prompt.input.rewind
+      expect(prompt.yes?("Are you a human?", default: false)).to eq(false)
       expect(prompt.output.string).to eq([
         "Are you a human? \e[90m(Y/n)\e[0m ",
         "\e[1000D\e[K\e[1A",
         "\e[1000D\e[K",
-        "Are you a human? \e[32mtrue\e[0m\n"
+        "Are you a human? \e[32mno\e[0m\n"
+      ].join)
+    end
+
+    it "defaults suffix and converter" do
+      prompt.input << "Nope\n"
+      prompt.input.rewind
+      result = prompt.yes?("Are you a human?") do |q|
+        q.positive 'Yup'
+        q.negative 'nope'
+      end
+      expect(result).to eq(false)
+      expect(prompt.output.string).to eq([
+        "Are you a human? \e[90m(Yup/nope)\e[0m ",
+        "\e[1000D\e[K\e[1A",
+        "\e[1000D\e[K",
+        "Are you a human? \e[32mnope\e[0m\n"
+      ].join)
+    end
+
+    it "defaults positive and negative" do
+      prompt.input << "Nope\n"
+      prompt.input.rewind
+      result = prompt.yes?("Are you a human?") do |q|
+        q.suffix 'Yup/nope'
+      end
+      expect(result).to eq(false)
+      expect(prompt.output.string).to eq([
+        "Are you a human? \e[90m(Yup/nope)\e[0m ",
+        "\e[1000D\e[K\e[1A",
+        "\e[1000D\e[K",
+        "Are you a human? \e[32mnope\e[0m\n"
+      ].join)
+    end
+
+    it "customizes question through options" do
+      prompt.input << "\r"
+      prompt.input.rewind
+      result = prompt.yes?("Are you a human?", suffix: 'Agree/Disagree',
+                            positive: 'Agree', negative: 'Disagree')
+      expect(result).to eq(true)
+      expect(prompt.output.string).to eq([
+        "Are you a human? \e[90m(Agree/Disagree)\e[0m ",
+        "\e[1000D\e[K\e[1A",
+        "\e[1000D\e[K",
+        "Are you a human? \e[32mAgree\e[0m\n"
+      ].join)
+    end
+
+    it "customizes question through DSL" do
+      prompt.input << "disagree\r"
+      prompt.input.rewind
+      conversion = proc { |input| !input.match(/^agree$/i).nil? }
+      result = prompt.yes?("Are you a human?") do |q|
+                 q.suffix 'Agree/Disagree'
+                 q.positive 'Agree'
+                 q.negative 'Disagree'
+                 q.convert conversion
+               end
+      expect(result).to eq(false)
+      expect(prompt.output.string).to eq([
+        "Are you a human? \e[90m(Agree/Disagree)\e[0m ",
+        "\e[1000D\e[K\e[1A",
+        "\e[1000D\e[K",
+        "Are you a human? \e[32mDisagree\e[0m\n"
       ].join)
     end
   end
 
-  context 'no?' do
-    it 'disagrees' do
+  context '#no?' do
+    it 'agrees with question' do
       prompt.input << 'no'
       prompt.input.rewind
       expect(prompt.no?("Are you a human?")).to eq(true)
       expect(prompt.output.string).to eq([
-        "Are you a human? \e[90m(Y/n)\e[0m ",
+        "Are you a human? \e[90m(y/N)\e[0m ",
         "\e[1000D\e[K\e[1A",
         "\e[1000D\e[K",
-        "Are you a human? \e[32mno\e[0m\n"
+        "Are you a human? \e[32mNo\e[0m\n"
       ].join)
     end
 
-    it 'agrees' do
+    it 'disagrees with question' do
       prompt.input << 'yes'
       prompt.input.rewind
       expect(prompt.no?("Are you a human?")).to eq(false)
       expect(prompt.output.string).to eq([
-        "Are you a human? \e[90m(Y/n)\e[0m ",
+        "Are you a human? \e[90m(y/N)\e[0m ",
+        "\e[1000D\e[K\e[1A",
+        "\e[1000D\e[K",
+        "Are you a human? \e[32mYes\e[0m\n"
+      ].join)
+    end
+
+    it 'assumes default false' do
+      prompt.input << "\r"
+      prompt.input.rewind
+      expect(prompt.no?("Are you a human?")).to eq(true)
+      expect(prompt.output.string).to eq([
+        "Are you a human? \e[90m(y/N)\e[0m ",
+        "\e[1000D\e[K\e[1A",
+        "\e[1000D\e[K",
+        "Are you a human? \e[32mNo\e[0m\n"
+      ].join)
+    end
+
+    it 'changes default' do
+      prompt.input << "\r"
+      prompt.input.rewind
+      expect(prompt.no?("Are you a human?", default: true)).to eq(false)
+      expect(prompt.output.string).to eq([
+        "Are you a human? \e[90m(y/N)\e[0m ",
+        "\e[1000D\e[K\e[1A",
+        "\e[1000D\e[K",
+        "Are you a human? \e[32mYes\e[0m\n"
+      ].join)
+    end
+
+    it "defaults suffix and converter" do
+      prompt.input << "Yup\n"
+      prompt.input.rewind
+      result = prompt.no?("Are you a human?") do |q|
+        q.positive 'yup'
+        q.negative 'Nope'
+      end
+      expect(result).to eq(false)
+      expect(prompt.output.string).to eq([
+        "Are you a human? \e[90m(yup/Nope)\e[0m ",
+        "\e[1000D\e[K\e[1A",
+        "\e[1000D\e[K",
+        "Are you a human? \e[32myup\e[0m\n"
+      ].join)
+    end
+
+    it "customizes question through DSL" do
+      prompt.input << "agree\r"
+      prompt.input.rewind
+      conversion = proc { |input| !input.match(/^agree$/i).nil? }
+      result = prompt.no?("Are you a human?") do |q|
+                 q.suffix 'Agree/Disagree'
+                 q.positive 'Agree'
+                 q.negative 'Disagree'
+                 q.convert conversion
+               end
+      expect(result).to eq(false)
+      expect(prompt.output.string).to eq([
+        "Are you a human? \e[90m(Agree/Disagree)\e[0m ",
         "\e[1000D\e[K\e[1A",
         "\e[1000D\e[K",
-        "Are you a human? \e[32myes\e[0m\n"
+        "Are you a human? \e[32mAgree\e[0m\n"
       ].join)
     end
   end

data/tty-prompt.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = [""]
   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      = "http://peter-murach.github.io/tty"
+  spec.homepage      = "https://piotrmurach.github.io/tty"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -25,6 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'wisper',       '~> 1.6.1'
 
   spec.add_development_dependency 'bundler', '>= 1.5.0', '< 2.0'
-  spec.add_development_dependency 'rspec', '~> 3.4.0'
   spec.add_development_dependency 'rake'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tty-prompt
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Piotr Murach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2016-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: necromancer
@@ -100,20 +100,6 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.4.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -144,10 +130,13 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- benchmarks/speed.rb
 - examples/ask.rb
+- examples/collect.rb
 - examples/echo.rb
 - examples/enum.rb
 - examples/enum_select.rb
+- examples/expand.rb
 - examples/in.rb
 - examples/mask.rb
 - examples/multi_select.rb
@@ -157,14 +146,17 @@ files:
 - examples/yes_no.rb
 - lib/tty-prompt.rb
 - lib/tty/prompt.rb
+- lib/tty/prompt/answers_collector.rb
 - lib/tty/prompt/choice.rb
 - lib/tty/prompt/choices.rb
+- lib/tty/prompt/confirm_question.rb
 - lib/tty/prompt/converter_dsl.rb
 - lib/tty/prompt/converter_registry.rb
 - lib/tty/prompt/converters.rb
 - lib/tty/prompt/distance.rb
 - lib/tty/prompt/enum_list.rb
 - lib/tty/prompt/evaluator.rb
+- lib/tty/prompt/expander.rb
 - lib/tty/prompt/history.rb
 - lib/tty/prompt/list.rb
 - lib/tty/prompt/mask_question.rb
@@ -193,8 +185,10 @@ files:
 - spec/unit/choice/from_spec.rb
 - spec/unit/choices/add_spec.rb
 - spec/unit/choices/each_spec.rb
+- spec/unit/choices/find_by_spec.rb
 - spec/unit/choices/new_spec.rb
 - spec/unit/choices/pluck_spec.rb
+- spec/unit/collect_spec.rb
 - spec/unit/converters/convert_bool_spec.rb
 - spec/unit/converters/convert_char_spec.rb
 - spec/unit/converters/convert_custom_spec.rb
@@ -209,6 +203,7 @@ files:
 - spec/unit/enum_select_spec.rb
 - spec/unit/error_spec.rb
 - spec/unit/evaluator_spec.rb
+- spec/unit/expand_spec.rb
 - spec/unit/keypress_spec.rb
 - spec/unit/mask_spec.rb
 - spec/unit/multi_select_spec.rb
@@ -245,7 +240,7 @@ files:
 - tasks/coverage.rake
 - tasks/spec.rake
 - tty-prompt.gemspec
-homepage: http://peter-murach.github.io/tty
+homepage: https://piotrmurach.github.io/tty
 licenses:
 - MIT
 metadata: {}
@@ -276,8 +271,10 @@ test_files:
 - spec/unit/choice/from_spec.rb
 - spec/unit/choices/add_spec.rb
 - spec/unit/choices/each_spec.rb
+- spec/unit/choices/find_by_spec.rb
 - spec/unit/choices/new_spec.rb
 - spec/unit/choices/pluck_spec.rb
+- spec/unit/collect_spec.rb
 - spec/unit/converters/convert_bool_spec.rb
 - spec/unit/converters/convert_char_spec.rb
 - spec/unit/converters/convert_custom_spec.rb
@@ -292,6 +289,7 @@ test_files:
 - spec/unit/enum_select_spec.rb
 - spec/unit/error_spec.rb
 - spec/unit/evaluator_spec.rb
+- spec/unit/expand_spec.rb
 - spec/unit/keypress_spec.rb
 - spec/unit/mask_spec.rb
 - spec/unit/multi_select_spec.rb