svn commit: r1530571 - in /buildr/trunk/lib/buildr/core: application.rb console.rb

[do...@apache.org]

Author: donaldp
Date: Wed Oct  9 11:27:38 2013
New Revision: 1530571

URL: http://svn.apache.org/r1530571
Log:
Move another usage of highline into the Buildr::Console facade

Modified:
    buildr/trunk/lib/buildr/core/application.rb
    buildr/trunk/lib/buildr/core/console.rb

Modified: buildr/trunk/lib/buildr/core/application.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/application.rb?rev=1530571&r1=1530570&r2=1530571&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/application.rb (original)
+++ buildr/trunk/lib/buildr/core/application.rb Wed Oct  9 11:27:38 2013
@@ -403,7 +403,7 @@ module Buildr
     def raw_generate_buildfile(source, from_eclipse=Generate.has_eclipse_project?)
       # We need rakefile to be known, for settings.build to be accessible.
       @rakefile = File.expand_path(DEFAULT_BUILDFILES.first)
-      fail "Buildfile already exists" if File.exist?(@rakefile) && !(tty_output? && agree('Buildfile exists, overwrite?'))
+      fail "Buildfile already exists" if File.exist?(@rakefile) && !(tty_output? && Buildr::Console.agree?('Buildfile exists, overwrite?'))
       script = nil
       if from_eclipse
         script = Generate.from_eclipse(source)

Modified: buildr/trunk/lib/buildr/core/console.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/console.rb?rev=1530571&r1=1530570&r2=1530571&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/console.rb (original)
+++ buildr/trunk/lib/buildr/core/console.rb Wed Oct  9 11:27:38 2013
@@ -67,6 +67,10 @@ module Buildr #nodoc
         d ? d[0] : nil
       end
 
+      def agree?(message)
+        agree(message)
+      end
+
       def ask_password(prompt)
         ask(prompt) { |q| q.echo = '*' }
       end