select-option demo: Use prompt_for_yes_or_no

Author: mbland

libexec/demo-core.d/select-option

@@ -17,33 +17,25 @@
 select_option_demo() {
   local options=("$@")
   local selected
-  local finish
 
   if [[ "${#options[@]}" -eq '0' ]]; then
     options=('Hello, World!' 'Goodbye, World!')
   fi
 
-  while [[ -z "$finish" ]]; do
+  while true; do
     @go.printf 'Please select one of the following options:\n'
 
-    if @go.select_option 'selected' "${options[@]}"; then
-      @go.printf 'You selected: "%s"\n\n' "$selected"
+    if ! @go.select_option 'selected' "${options[@]}"; then
+      @go.printf 'You declined to select an option. Exiting...\n\n'
+      return 1
     else
-      @go.printf 'You declined to select an option.\n\n'
+      @go.printf 'You selected: "%s"\n\n' "$selected"
     fi
 
-    @go.printf 'Would you like to select another option?\n'
-
-    if @go.select_option 'selected' 'Yes' 'No'; then
-      if  [[ "$selected" == 'No' ]]; then
-        @go.printf 'Exiting...\n'
-        finish='true'
-      else
-        printf '\n'
-      fi
-    else
-      @go.printf 'You declined to select an option. Exiting...\n'
-      finish='true'
+    if ! @go.prompt_for_yes_or_no 'Would you like to select another option?' \
+      'yes'; then
+      @go.printf 'Exiting...\n'
+      return 0
     fi
   done
 }

tests/demo-core/select-option.bats

@@ -12,31 +12,28 @@ teardown() {
 }
 
 @test "$SUITE: use default selection options" {
-  run "$_GO_SCRIPT" demo-core select-option <<<$'1\n1\n2\n2\n'
+  run "$_GO_SCRIPT" demo-core select-option <<<$'1\nYes\n2\nNo'
   assert_success
   split_bats_output_into_lines
+
+  local select_affirmative='Would you like to select another option? [Y/n] '
+  select_affirmative+='Please select one of the following options:'
+
   assert_lines_equal 'Please select one of the following options:' \
     '1) Hello, World!' \
     '2) Goodbye, World!' \
     "${PS3}You selected: \"Hello, World!\"" \
     '' \
-    'Would you like to select another option?' \
-    '1) Yes' \
-    '2) No' \
-    "${PS3}" \
-    'Please select one of the following options:' \
+    "${select_affirmative}" \
     '1) Hello, World!' \
     '2) Goodbye, World!' \
     "${PS3}You selected: \"Goodbye, World!\"" \
     '' \
-    'Would you like to select another option?' \
-    '1) Yes' \
-    '2) No' \
-    "${PS3}Exiting..."
+    'Would you like to select another option? [Y/n] Exiting...'
 }
 
 @test "$SUITE: use user-provided selection options" {
-  run "$_GO_SCRIPT" demo-core select-option foo bar baz <<<$'2\n2\n'
+  run "$_GO_SCRIPT" demo-core select-option foo bar baz <<<$'2\nNo'
   assert_success
   split_bats_output_into_lines
   assert_lines_equal 'Please select one of the following options:' \
@@ -45,30 +42,21 @@ teardown() {
     '3) baz' \
     "${PS3}You selected: \"bar\"" \
     '' \
-    'Would you like to select another option?' \
-    '1) Yes' \
-    '2) No' \
-    "${PS3}Exiting..."
+    'Would you like to select another option? [Y/n] Exiting...'
 }
 
-@test "$SUITE: exit both prompts on empty input" {
+@test "$SUITE: exit prompt and program on empty input terminated by EOF" {
   mkdir "$TEST_GO_ROOTDIR"
   printf '' >"$TEST_GO_ROOTDIR/input.txt"
   run "$_GO_SCRIPT" demo-core select-option foo bar baz \
     <"$TEST_GO_ROOTDIR/input.txt"
 
-  assert_success
+  assert_failure
   split_bats_output_into_lines
   assert_lines_equal 'Please select one of the following options:' \
     '1) foo' \
     '2) bar' \
     '3) baz' \
     "${PS3}" \
-    'You declined to select an option.' \
-    '' \
-    'Would you like to select another option?' \
-    '1) Yes' \
-    '2) No' \
-    "${PS3}" \
     'You declined to select an option. Exiting...'
 }