Improved y/n prompt for TTY

Author: ttscoff

bin/doing

@@ -516,17 +516,19 @@ command :tag do |c|
       count = options[:c].to_i
 
       if count == 0
+        section_q = section == 'All' ? "" : " in section #{section}"
+
         if options[:a]
-          print "Are you sure you want to autotag all records? (y/N) "
+          question = "Are you sure you want to autotag all records#{section_q}"
         elsif options[:r]
-          print "Are you sure you want to remove #{tags.join(" and ")} from all records? (y/N) "
+          question = "Are you sure you want to remove #{tags.join(" and ")} from all records#{section_q}"
         else
-          print "Are you sure you want to add #{tags.join(" and ")} to all records? (y/N) "
+          question = "Are you sure you want to add #{tags.join(" and ")} to all records#{section_q}"
         end
 
-        res = STDIN.gets
+        res = wwid.yn(question,false)
 
-        unless res.strip =~ /^y(es)?$/i
+        unless res
           raise "Cancelled"
         end
       end

lib/doing/wwid.rb

@@ -426,6 +426,7 @@ def sections
   ##
   def add_section(title)
     @content[title.cap_first] = {'original' => "#{title}:", 'items' => []}
+    @results.push(%Q{Added section "#{title.cap_first}"})
   end
 
   ##
@@ -451,9 +452,9 @@ def guess_section(frag,guessed=false)
       if alt
         raise "Did you mean `doing view #{alt}`?"
       else
-        print "Create a new section called #{frag.cap_first} (y/N)?"
-        input = STDIN.gets
-        if input =~ /^y/i
+        res = yn("Section #{frag} not found, create it",false)
+
+        if res
           add_section(frag.cap_first)
           write(@doing_file)
           return frag.cap_first
@@ -464,6 +465,57 @@ def guess_section(frag,guessed=false)
     section ? section.cap_first : guessed
   end
 
+  ##
+  ## @brief      Ask a yes or no question in the terminal
+  ##
+  ## @param      question     (String) The question to ask
+  ## @param      default      (Bool)   default response if no input
+  ##
+  ## @return     (Bool) yes or no
+  ##
+  def yn(question, default_response=false)
+    if default_response
+      default = 'y'
+    else
+      default = 'n'
+    end
+    # if this isn't an interactive shell, answer default
+    unless $stdout.isatty
+      if default.downcase == 'y'
+        return true
+      else
+        return false
+      end
+    end
+    # clear the buffer
+    if ARGV.length
+      ARGV.length.times do
+        ARGV.shift
+      end
+    end
+    system 'stty cbreak'
+    if default
+      if default =~ /y/i
+        options = "#{colors['white']}[#{colors['boldgreen']}Y#{colors['white']}/#{colors['boldwhite']}n#{colors['white']}]#{colors['default']}"
+      else
+        options = "#{colors['white']}[#{colors['boldwhite']}y#{colors['white']}/#{colors['boldgreen']}N#{colors['white']}]#{colors['default']}"
+      end
+    else
+      options = "#{colors['white']}[#{colors['boldwhite']}y#{colors['white']}/#{colors['boldwhite']}n#{colors['white']}]#{colors['default']}"
+    end
+    $stdout.syswrite "#{colors['boldwhite']}#{question.sub(/\?$/,'')} #{options}#{colors['boldwhite']}?#{colors['default']} "
+    res = $stdin.sysread 1
+    puts
+    system 'stty cooked'
+
+    res.chomp!
+    res.downcase!
+
+    res = default.downcase if res == ""
+
+    return res =~ /y/i
+  end
+
   ##
   ## @brief      Attempt to match a string with an existing view
   ##