Bug 979992 - Only respond to 'y', 'yes', 'n', and 'no'

Fix non-interactive stty behavior. Keep backwards compatibility of agree for anyone in non-interactive mode.  Also change "success" on app create to "done" to be consistent.

lib/rhc/commands/cartridge.rb

@@ -84,7 +84,7 @@ def add(cart_type)
       rest_app = rest_client.find_application(options.namespace, options.app, :include => :cartridges)
       rest_cartridge = rest_app.add_cartridge(cart)
 
-      success "Success"
+      success "done"
 
       paragraph{ display_cart(rest_cartridge) }
       paragraph{ rest_cartridge.messages.each { |msg| success msg } }

lib/rhc/helpers.rb

@@ -212,7 +212,7 @@ def certificate_file(file)
     #
 
     def interactive?
-      $stdout.tty? and not options.noprompt
+      $stdin.tty? and $stdout.tty? and not options.noprompt
     end
 
     def debug(*args)
@@ -242,9 +242,20 @@ def deprecated(msg,short = false)
       warn "Warning: #{msg}\n" % ['a warning','an error',1]
     end
 
+    #
+    # By default, agree should take a single character in interactive
+    #
+    def agree(*args, &block)
+      #args.push(interactive?.presence) if args.length == 1
+      block = lambda do |q| 
+        q.validate = /\A(?:y|yes|n|no)\Z/i
+      end unless block_given?
+      super *args, &block
+    end
+
     def confirm_action(question)
       return if options.confirm
-      return if !options.noprompt && paragraph{ agree("#{question} (yes|no): ") }
+      return if !options.noprompt && paragraph{ agree "#{question} (yes|no): " }
       raise RHC::ConfirmationError
     end
 

lib/rhc/highline_extensions.rb

@@ -15,6 +15,17 @@ class HighLineExtension < HighLine
     end
   end
 
+  if HighLine::CHARACTER_MODE == 'stty'
+    def raw_no_echo_mode
+      @state = `stty -g 2>/dev/null`
+      `stty raw -echo -icanon isig 2>&1`
+    end
+
+    def restore_mode
+      `stty #{@state} 2>&1`
+    end
+  end
+
   def debug(msg)
     $stderr.puts "DEBUG: #{msg}" if debug?
   end
@@ -37,7 +48,7 @@ def say(msg)
       statement = template.result(binding)
 
       if @wrap_at
-        statement = statement.textwrap_ansi(@wrap_at, false)
+        statement = statement.chomp.textwrap_ansi(@wrap_at, false)
         if @last_line_open && statement.length > 1
           @last_line_open = false
           @output.puts
@@ -52,7 +63,8 @@ def say(msg)
         if statement[-1, 1] == " " or statement[-1, 1] == "\t"
           @output.print(statement)
           @output.flush
-          statement.strip_ansi.length + (@last_line_open || 0)
+          #statement.strip_ansi.length + (@last_line_open || 0)
+          true
         else
           @output.puts(statement)
           false

spec/rhc/commands/cartridge_spec.rb

@@ -10,7 +10,7 @@ def exit_with_code_and_message(code, message = nil)
     run_output.should match(message) if message
   end
 
-  def succeed_with_message(message = "Success")
+  def succeed_with_message(message = "done")
     exit_with_code_and_message(0,message)
   end