tty-prompt 0.10.1 → 0.11.0

data/lib/tty/prompt/version.rb

@@ -2,6 +2,6 @@
 
 module TTY
   class Prompt
-    VERSION = "0.10.1"
+    VERSION = "0.11.0"
   end # Prompt
 end # TTY

data/lib/tty/{prompt/test.rb → test_prompt.rb}

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require 'tty/prompt'
+require_relative 'prompt'
 
 module TTY
   # Used for initializing test cases
@@ -11,6 +11,7 @@ module TTY
       options.merge!({
         input: @input,
         output: @output,
+        env: { "TTY_TEST" => true },
         enable_color: options.fetch(:enable_color) { true }
       })
       super(options)

data/spec/unit/ask_spec.rb

@@ -8,8 +8,7 @@ RSpec.describe TTY::Prompt, '#ask' do
     prompt.ask('What is your name?')
     expect(prompt.output.string).to eq([
       "What is your name? ",
-      "\e[1000D\e[K\e[1A",
-      "\e[1000D\e[K",
+      "\e[1A\e[2K\e[1G",
       "What is your name? \n"
     ].join)
   end
@@ -35,8 +34,7 @@ RSpec.describe TTY::Prompt, '#ask' do
     expect(answer).to eq(nil)
     expect(prompt.output.string).to eq([
       "[?] Are you Polish? ",
-      "\e[1000D\e[K\e[1A",
-      "\e[1000D\e[K",
+      "\e[1A\e[2K\e[1G",
       "[?] Are you Polish? \n"
     ].join)
   end
@@ -50,8 +48,7 @@ RSpec.describe TTY::Prompt, '#ask' do
     expect(answer).to eq('Piotr')
     expect(prompt.output.string).to eq([
       "What is your name? \e[90m(Piotr)\e[0m ",
-      "\e[1000D\e[K\e[1A",
-      "\e[1000D\e[K",
+      "\e[1A\e[2K\e[1G",
       "What is your name? \e[32mPiotr\e[0m\n"
     ].join)
   end
@@ -64,8 +61,7 @@ RSpec.describe TTY::Prompt, '#ask' do
     expect(answer).to eq('Piotr')
     expect(prompt.output.string).to eq([
       "What is your name? \e[31m(Piotr)\e[0m ",
-      "\e[1000D\e[K\e[1A",
-      "\e[1000D\e[K",
+      "\e[1A\e[2K\e[1G",
       "What is your name? \e[36mPiotr\e[0m\n"
     ].join)
   end
@@ -78,8 +74,7 @@ RSpec.describe TTY::Prompt, '#ask' do
     expect(answer).to eq('')
     expect(prompt.output.string).to eq([
       "What is your name? ",
-      "\e[1000D\e[K\e[1A",
-      "\e[1000D\e[K",
+      "\e[1A\e[2K\e[1G",
       "What is your name? \n"
     ].join)
   end
@@ -92,8 +87,7 @@ RSpec.describe TTY::Prompt, '#ask' do
     expect(answer).to eq(nil)
     expect(prompt.output.string).to eq([
       "What is your name? ",
-      "\e[1000D\e[K\e[1A",
-      "\e[1000D\e[K",
+      "\e[1A\e[2K\e[1G",
       "What is your name? \n"
     ].join)
   end
@@ -113,12 +107,10 @@ RSpec.describe TTY::Prompt, '#ask' do
 
     expect(prompt.output.string).to eq([
       "[?] What is your name? ",
-      "\e[1000D\e[K\e[1A",
-      "\e[1000D\e[K",
+      "\e[1A\e[2K\e[1G",
       "[?] What is your name? \e[36mPiotr\e[0m\n",
       ":-) What is your name? ",
-      "\e[1000D\e[K\e[1A",
-      "\e[1000D\e[K",
+      "\e[1A\e[2K\e[1G",
       ":-) What is your name? \e[34mPiotr\e[0m\n"
     ].join)
   end

data/spec/unit/converters/convert_bool_spec.rb

@@ -19,8 +19,7 @@ RSpec.describe TTY::Prompt::Question, 'convert bool' do
     expect(response).to eql(true)
     expect(prompt.output.string).to eq([
       "Do you read books? \e[90m(true)\e[0m ",
-      "\e[1000D\e[K\e[1A",
-      "\e[1000D\e[K",
+      "\e[1A\e[2K\e[1G",
       "Do you read books? \e[32mtrue\e[0m\n"
     ].join)
   end

data/spec/unit/converters/on_error_spec.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+
+RSpec.describe TTY::Prompt::Converters do
+  it "enforces block argument" do
+    expect {
+      TTY::Prompt::Converters.on_error
+    }.to raise_error(ArgumentError, 'You need to provide a block argument.')
+  end
+end

data/spec/unit/enum_paginator_spec.rb

@@ -1,6 +1,22 @@
 # encoding: utf-8
 
 RSpec.describe TTY::Prompt::EnumPaginator, '#paginate' do
+  it "ignores per_page when equal items " do
+    list = %w(a b c d)
+    paginator = described_class.new({per_page: 4})
+
+    expect(paginator.paginate(list, 1).to_a).to eq([
+      ['a',0],['b',1],['c',2],['d',3]])
+  end
+
+  it "ignores per_page when less items " do
+    list = %w(a b c d)
+    paginator = described_class.new({per_page: 5})
+
+    expect(paginator.paginate(list, 1).to_a).to eq([
+      ['a',0],['b',1],['c',2],['d',3]])
+  end
+
   it "paginates items matching per_page count" do
     list = %w(a b c d e f)
     paginator = described_class.new({per_page: 3})

data/spec/unit/enum_select_spec.rb

@@ -1,8 +1,6 @@
 # encoding: utf-8
 
 RSpec.describe TTY::Prompt do
-  let(:page_help) {
-  }
   it "selects default option when return pressed immediately" do
     prompt = TTY::TestPrompt.new
     choices = %w(/bin/nano /usr/bin/vim.basic /usr/bin/vim.tiny)
@@ -16,7 +14,8 @@ RSpec.describe TTY::Prompt do
       "  2) /usr/bin/vim.basic\n",
       "  3) /usr/bin/vim.tiny\n",
       "  Choose 1-3 [1]: ",
-      "\e[1000D\e[K\e[1A" * 4 + "\e[1000D\e[K\e[J",
+      "\e[2K\e[1G\e[1A" * 4,
+      "\e[2K\e[1G\e[J",
       "Select an editor? \e[32m/bin/nano\e[0m\n"
     ].join)
   end
@@ -34,20 +33,22 @@ RSpec.describe TTY::Prompt do
       "\e[32m  2) /usr/bin/vim.basic\e[0m\n",
       "  3) /usr/bin/vim.tiny\n",
       "  Choose 1-3 [2]: ",
-      "\e[1000D\e[K\e[1A" * 4 + "\e[1000D\e[K\e[J",
+      "\e[2K\e[1G\e[1A" * 4,
+      "\e[2K\e[1G\e[J",
       "Select an editor? \n",
       "  1) /bin/nano\n",
       "  2) /usr/bin/vim.basic\n",
       "\e[32m  3) /usr/bin/vim.tiny\e[0m\n",
       "  Choose 1-3 [2]: 3",
-      "\e[1000D\e[K\e[1A" * 4 + "\e[1000D\e[K\e[J",
+      "\e[2K\e[1G\e[1A" * 4,
+      "\e[2K\e[1G\e[J",
       "Select an editor? \e[32m/usr/bin/vim.tiny\e[0m\n"
     ].join)
   end
 
   it "selects option through DSL" do
     prompt = TTY::TestPrompt.new
-    prompt.input << "\n"
+    prompt.input << "1\n"
     prompt.input.rewind
     value = prompt.enum_select("Select an editor?") do |menu|
       menu.default 2
@@ -58,15 +59,23 @@ RSpec.describe TTY::Prompt do
       menu.choice "/usr/bin/vim.tiny"
     end
 
-    expect(value).to eq('/usr/bin/vim.basic')
+    expect(value).to eq('/bin/nano')
     expect(prompt.output.string).to eq([
       "Select an editor? \n",
       "  1. /bin/nano\n",
       "\e[32m  2. /usr/bin/vim.basic\e[0m\n",
       "  3. /usr/bin/vim.tiny\n",
       "  Choose 1-3 [2]: ",
-      "\e[1000D\e[K\e[1A\e[1000D\e[K\e[1A\e[1000D\e[K\e[1A\e[1000D\e[K\e[1A\e[1000D\e[K\e[J",
-      "Select an editor? \e[32m/usr/bin/vim.basic\e[0m\n"
+      "\e[2K\e[1G\e[1A" * 4,
+      "\e[2K\e[1G\e[J",
+      "Select an editor? \n",
+      "\e[32m  1. /bin/nano\e[0m\n",
+      "  2. /usr/bin/vim.basic\n",
+      "  3. /usr/bin/vim.tiny\n",
+      "  Choose 1-3 [2]: 1",
+      "\e[2K\e[1G\e[1A" * 4,
+      "\e[2K\e[1G\e[J",
+      "Select an editor? \e[32m/bin/nano\e[0m\n"
     ].join)
   end
 
@@ -89,7 +98,8 @@ RSpec.describe TTY::Prompt do
       "\e[32m  2) vim\e[0m\n",
       "  3) emacs\n",
       "  Choose 1-3 [2]: ",
-      "\e[1000D\e[K\e[1A\e[1000D\e[K\e[1A\e[1000D\e[K\e[1A\e[1000D\e[K\e[1A\e[1000D\e[K\e[J",
+      "\e[2K\e[1G\e[1A" * 4,
+      "\e[2K\e[1G\e[J",
       "Select an editor? \e[32mvim\e[0m\n"
     ].join)
   end
@@ -107,8 +117,8 @@ RSpec.describe TTY::Prompt do
       "  2) /usr/bin/vim.basic\n",
       "  3) /usr/bin/vim.tiny\n",
       "  Choose 1-3 [1]: ",
-      "\e[1000D\e[K\e[1A" * 4,
-      "\e[1000D\e[K\e[J",
+      "\e[2K\e[1G\e[1A" * 4,
+      "\e[2K\e[1G\e[J",
       "Select an editor? \e[31m/bin/nano\e[0m\n"
     ].join)
   end
@@ -126,19 +136,22 @@ RSpec.describe TTY::Prompt do
       "  2) /usr/bin/vim.basic\n",
       "  3) /usr/bin/vim.tiny\n",
       "  Choose 1-3 [1]: ",
-      "\e[1000D\e[K\e[1A" * 4 + "\e[1000D\e[K\e[J",
+      "\e[2K\e[1G\e[1A" * 4,
+      "\e[2K\e[1G\e[J",
       "Select an editor? \n",
       "\e[32m  1) /bin/nano\e[0m\n",
       "  2) /usr/bin/vim.basic\n",
       "  3) /usr/bin/vim.tiny\n",
       "  Choose 1-3 [1]: 1",
-      "\e[1000D\e[K\e[1A" * 4 + "\e[1000D\e[K\e[J",
+      "\e[2K\e[1G\e[1A" * 4,
+      "\e[2K\e[1G\e[J",
       "Select an editor? \n",
       "\e[32m  1) /bin/nano\e[0m\n",
       "  2) /usr/bin/vim.basic\n",
       "  3) /usr/bin/vim.tiny\n",
       "  Choose 1-3 [1]: 11",
-      "\e[1000D\e[K\e[1A" * 4 + "\e[1000D\e[K\e[J",
+      "\e[2K\e[1G\e[1A" * 4,
+      "\e[2K\e[1G\e[J",
       "Select an editor? \n",
       "\e[32m  1) /bin/nano\e[0m\n",
       "  2) /usr/bin/vim.basic\n",
@@ -146,7 +159,8 @@ RSpec.describe TTY::Prompt do
       "  Choose 1-3 [1]: \n",
       "\e[31m>>\e[0m Please enter a valid number",
       "\e[A\e[1G\e[18C",
-      "\e[1000D\e[K\e[1A" * 4 + "\e[1000D\e[K\e[J",
+      "\e[2K\e[1G\e[1A" * 4,
+      "\e[2K\e[1G\e[J",
       "Select an editor? \n",
       "  1) /bin/nano\n",
       "\e[32m  2) /usr/bin/vim.basic\e[0m\n",
@@ -154,7 +168,8 @@ RSpec.describe TTY::Prompt do
       "  Choose 1-3 [1]: 2\n",
       "\e[31m>>\e[0m Please enter a valid number",
       "\e[A\e[1G\e[19C",
-      "\e[1000D\e[K\e[1A" * 4 + "\e[1000D\e[K\e[J",
+      "\e[2K\e[1G\e[1A" * 4,
+      "\e[2K\e[1G\e[J",
       "Select an editor? \e[32m/usr/bin/vim.basic\e[0m\n"
     ].join)
   end
@@ -174,11 +189,33 @@ RSpec.describe TTY::Prompt do
       "  Choose 1-8 [4]: ",
       "\n\e[90m(Press tab/right or left to reveal more choices)\e[0m",
       "\e[A\e[1G\e[18C",
-      "\e[1000D\e[K\e[1A" * 4 + "\e[1000D\e[K\e[J",
+      "\e[2K\e[1G\e[1A" * 4,
+      "\e[2K\e[1G\e[J",
       "What letter? \e[32mD\e[0m\n"
     ].join)
   end
 
+  it "doesn't paginate short selections" do
+    prompt = TTY::TestPrompt.new
+    choices = %w(A B C D)
+    prompt.input << "\r"
+    prompt.input.rewind
+    value = prompt.enum_select("What letter?", choices, per_page: 4, default: 1)
+    expect(value).to eq('A')
+
+    expect(prompt.output.string).to eq([
+      "What letter? \n",
+      "\e[32m  1) A\e[0m\n",
+      "  2) B\n",
+      "  3) C\n",
+      "  4) D\n",
+      "  Choose 1-4 [1]: ",
+      "\e[2K\e[1G\e[1A" * 5,
+      "\e[2K\e[1G\e[J",
+      "What letter? \e[32mA\e[0m\n"
+    ].join)
+  end
+
   it "shows pages matching input" do
     prompt = TTY::TestPrompt.new
     choices = %w(A B C D E F G H)
@@ -194,7 +231,8 @@ RSpec.describe TTY::Prompt do
       "  Choose 1-8 [1]: ",
       "\n\e[90m(Press tab/right or left to reveal more choices)\e[0m",
       "\e[A\e[1G\e[18C",
-      "\e[1000D\e[K\e[1A" * 4 + "\e[1000D\e[K\e[J",
+      "\e[2K\e[1G\e[1A" * 4,
+      "\e[2K\e[1G\e[J",
       "What letter? \n",
       "\e[32m  1) A\e[0m\n",
       "  2) B\n",
@@ -202,7 +240,8 @@ RSpec.describe TTY::Prompt do
       "  Choose 1-8 [1]: 1",
       "\n\e[90m(Press tab/right or left to reveal more choices)\e[0m",
       "\e[A\e[1G\e[19C",
-      "\e[1000D\e[K\e[1A" * 4 + "\e[1000D\e[K\e[J",
+      "\e[2K\e[1G\e[1A" * 4,
+      "\e[2K\e[1G\e[J",
       "What letter? \n",
       "\e[32m  1) A\e[0m\n",
       "  2) B\n",
@@ -210,7 +249,8 @@ RSpec.describe TTY::Prompt do
       "  Choose 1-8 [1]: 11",
       "\n\e[90m(Press tab/right or left to reveal more choices)\e[0m",
       "\e[A\e[1G\e[20C",
-      "\e[1000D\e[K\e[1A" * 4 + "\e[1000D\e[K\e[J",
+      "\e[2K\e[1G\e[1A" * 4,
+      "\e[2K\e[1G\e[J",
       "What letter? \n",
       "\e[32m  1) A\e[0m\n",
       "  2) B\n",
@@ -219,7 +259,8 @@ RSpec.describe TTY::Prompt do
       "\e[31m>>\e[0m Please enter a valid number",
       "\n\e[90m(Press tab/right or left to reveal more choices)\e[0m",
       "\e[A\e[1G\e[A\e[1G\e[18C",
-      "\e[1000D\e[K\e[1A" * 4 + "\e[1000D\e[K\e[J",
+      "\e[2K\e[1G\e[1A" * 4,
+      "\e[2K\e[1G\e[J",
       "What letter? \n",
       "\e[32m  1) A\e[0m\n",
       "  2) B\n",
@@ -228,7 +269,8 @@ RSpec.describe TTY::Prompt do
       "\e[31m>>\e[0m Please enter a valid number",
       "\n\e[90m(Press tab/right or left to reveal more choices)\e[0m",
       "\e[A\e[1G\e[A\e[1G\e[18C",
-      "\e[1000D\e[K\e[1A" * 4 + "\e[1000D\e[K\e[J",
+      "\e[2K\e[1G\e[1A" * 4,
+      "\e[2K\e[1G\e[J",
       "What letter? \e[32mA\e[0m\n"
     ].join)
   end
@@ -252,14 +294,16 @@ RSpec.describe TTY::Prompt do
       "  Choose 1-8 [4]: ",
       "\n\e[90m(Press tab/right or left to reveal more choices)\e[0m",
       "\e[A\e[1G\e[18C",
-      "\e[1000D\e[K\e[1A" * 4 + "\e[1000D\e[K\e[J",
+      "\e[2K\e[1G\e[1A" * 4,
+      "\e[2K\e[1G\e[J",
       "What letter? \n",
       "  7) G\n",
       "  8) H\n",
       "  Choose 1-8 [4]: ",
       "\n\e[90m(Press tab/right or left to reveal more choices)\e[0m",
       "\e[A\e[1G\e[18C",
-      "\e[1000D\e[K\e[1A" * 3 + "\e[1000D\e[K\e[J",
+      "\e[2K\e[1G\e[1A" * 3,
+      "\e[2K\e[1G\e[J",
       "What letter? \e[32mD\e[0m\n"
     ].join)
   end

data/spec/unit/expand_spec.rb

@@ -37,7 +37,7 @@ RSpec.describe TTY::Prompt, '#expand' do
 
     expect(prompt.output.string).to eq([
       "Overwrite Gemfile? (enter \"h\" for help) [\e[32my\e[0m,n,a,d,q,h] ",
-      "\e[1000D\e[K",
+      "\e[2K\e[1G",
       "Overwrite Gemfile? \e[32mOverwrite\e[0m\n"
     ].join)
   end
@@ -51,7 +51,7 @@ RSpec.describe TTY::Prompt, '#expand' do
 
     expect(prompt.output.string).to eq([
       "Overwrite Gemfile? (enter \"h\" for help) [y,n,\e[32ma\e[0m,d,q,h] ",
-      "\e[1000D\e[K",
+      "\e[2K\e[1G",
       "Overwrite Gemfile? \e[32mOverwrite all\e[0m\n"
     ].join)
   end
@@ -65,14 +65,14 @@ RSpec.describe TTY::Prompt, '#expand' do
 
     expect(prompt.output.string).to eq([
       "Overwrite Gemfile? (enter \"h\" for help) [\e[32my\e[0m,n,a,d,q,h] ",
-      "\e[1000D\e[K",
+      "\e[2K\e[1G",
       "Overwrite Gemfile? (enter \"h\" for help) [y,n,\e[32ma\e[0m,d,q,h] ",
       "a\n",
       "\e[32m>> \e[0mOverwrite all",
       "\e[A\e[1G\e[55C",
-      "\e[1000D\e[K",
+      "\e[2K\e[1G",
       "\e[1B",
-      "\e[1000D\e[K",
+      "\e[2K\e[1G",
       "\e[A\e[1G",
       "Overwrite Gemfile? \e[32mOverwrite all\e[0m\n"
     ].join)
@@ -87,13 +87,13 @@ RSpec.describe TTY::Prompt, '#expand' do
 
     expect(prompt.output.string).to eq([
       "Overwrite Gemfile? (enter \"h\" for help) [\e[32my\e[0m,n,a,d,q,h] ",
-      "\e[1000D\e[K",
+      "\e[2K\e[1G",
       "Overwrite Gemfile? (enter \"h\" for help) [y,n,a,d,q,\e[32mh\e[0m] h\n",
       "\e[32m>> \e[0mprint help",
       "\e[A\e[1G\e[55C",
-      "\e[1000D\e[K",
+      "\e[2K\e[1G",
       "\e[1B",
-      "\e[1000D\e[K",
+      "\e[2K\e[1G",
       "\e[A\e[1G",
       "Overwrite Gemfile? \n",
       "  y - Overwrite\n",
@@ -103,8 +103,8 @@ RSpec.describe TTY::Prompt, '#expand' do
       "  q - Quit\n",
       "  h - print help\n",
       "  Choice [y]: ",
-      "\e[1000D\e[K\e[1A" * 7,
-      "\e[1000D\e[K",
+      "\e[2K\e[1G\e[1A" * 7,
+      "\e[2K\e[1G",
       "Overwrite Gemfile? \n",
       "  y - Overwrite\n",
       "  n - Skip\n",
@@ -113,8 +113,8 @@ RSpec.describe TTY::Prompt, '#expand' do
       "  q - Quit\n",
       "  h - print help\n",
       "  Choice [y]: d",
-      "\e[1000D\e[K\e[1A" * 7,
-      "\e[1000D\e[K",
+      "\e[2K\e[1G\e[1A" * 7,
+      "\e[2K\e[1G",
       "Overwrite Gemfile? \e[32mShow diff\e[0m\n",
     ].join)
   end
@@ -137,7 +137,7 @@ RSpec.describe TTY::Prompt, '#expand' do
 
     expect(prompt.output.string).to eq([
       "Overwrite Gemfile? (enter \"h\" for help) [y,n,a,\e[32md\e[0m,q,h] ",
-      "\e[1000D\e[K",
+      "\e[2K\e[1G",
       "Overwrite Gemfile? \e[32mShow diff\e[0m\n"
     ].join)
   end
@@ -158,7 +158,7 @@ RSpec.describe TTY::Prompt, '#expand' do
 
     expect(prompt.output.string).to eq([
       "Overwrite Gemfile? (enter \"h\" for help) [\e[32my\e[0m,n,a,d,q,h] ",
-      "\e[1000D\e[K",
+      "\e[2K\e[1G",
       "Overwrite Gemfile? \e[32mOverwrite\e[0m\n"
     ].join)
   end