buildr 1.3.3 → 1.3.4

data/doc/{pages/testing.textile → testing.textile}

@@ -1,9 +1,13 @@
-h1. Testing
+---
+layout: default
+title: Testing
+---
+
 
 Untested code is broken code, so we take testing seriously.  Off the bat you get to use either JUnit or TestNG for writing unit tests and integration tests. And you can also add your own framework, or even script tests using Ruby.  But= first, let's start with the basics.
 
 
-h2. Writing Tests
+h2(#writing). Writing Tests
 
 Each project has a @TestTask@ that you can access using the @test@ method. @TestTask@ reflects on the fact that each project has one task responsible for getting the tests to run and acting on the results.  But in fact there are several tasks that do all the work, and a @test@ task coordinates all of that.
 
@@ -18,86 +22,106 @@ Once compiled, the @test@ task runs all the tests.
 Different languages use different test frameworks.  You can find out more about available test frameworks in the "Languages":languages.html section.
 
 
-h2. Excluding Tests and Ignoring Failures
+h2(#ignoring). Excluding Tests and Ignoring Failures
 
 If you have a lot of tests that are failing or just hanging there collecting dusts, you can tell Buildr to ignore them.  You can either tell Buildr to only run specific tests, for example:
 
-{{{!ruby
+<notextile>
+{% highlight ruby %}
 test.include 'com.acme.tests.passing.*'
-}}}
+{% endhighlight %}
+</notextile>
 
 Or tell it to exclude specific tests, for example:
 
-{{{!ruby
+<notextile>
+{% highlight ruby %}
 test.exclude '*FailingTest', '*FailingWorseTest'
-}}}
+{% endhighlight %}
+</notextile>
 
 Note that we're always using the package qualified class name, and you can use star (@*@) to substitute for any set of characters.
 
 When tests fail, Buildr fails the @test@ task.  This is usually a good thing, but you can also tell Buildr to ignore failures by resetting the @:fail_on_failure@ option:
 
-{{{!ruby
+<notextile>
+{% highlight ruby %}
 test.using :fail_on_failure=>false
-}}}
+{% endhighlight %}
+</notextile>
 
 Besides giving you a free pass to ignore failures, you can use it for other causes, for example, to be somewhat forgiving:
 
-{{{!ruby
+<notextile>
+{% highlight ruby %}
 test do
   fail 'More than 3 tests failed!' if test.failed_tests.size > 3
 end
-}}}
+{% endhighlight %}
+</notextile>
 
 The @failed_tests@ collection holds the names of all classes with failed tests. And there's @classes@, which holds the names of all test classes.  Ruby arithmetic allows you to get the name of all passed test classes with a simple @test.classes – test.failed_tests@.  We'll let you imagine creative use for these two.
 
 
-h2. Running Tests
+h2(#running). Running Tests
 
 It's a good idea to run tests every time you change the source code, so we wired the @build@ task to run the @test@ task at the end of the build.  And conveniently enough, the @build@ task is the default task, so another way to build changes in your code and run your tests:
 
-{{{!sh
+<notextile>
+{% highlight sh %}
 $ buildr
-}}}
+{% endhighlight %}
+</notextile>
 
 That only works with the local @build@ task and any local task that depends on it, like @package@, @install@ and @upload@.  Each project also has its own @build@ task that does not invoke the @test@ task, so @buildr build@ will run the tests cases, but @buildr foo:build@ will not.
 
 While it's a good idea to always run your tests, it's not always possible. There are two ways you can get @build@ to not run the @test@ task.  You can set the environment variable @test@ to @no@ (but @skip@ and @off@ will also work). You can do that when running Buildr:
 
-{{{!sh
+<notextile>
+{% highlight sh %}
 $ buildr test=no
-}}}
+{% endhighlight %}
+</notextile>
 
 Or set it once in your environment:
 
-{{{!sh
+<notextile>
+{% highlight sh %}
 $ export TEST=no
 $ buildr
-}}}
+{% endhighlight %}
+</notextile>
 
 If you're feeling really adventurous, you can also disable tests from your Buildfile or @buildr.rb@ file, by setting @options.test = false@. We didn't say it's a good idea, we're just giving you the option.
 
 The @test@ task is just smart enough to run all the tests it finds, but will accept include/exclude patterns.  Often enough you're only working on one broken test and you only want to run that one test.  Better than changing your Buildfile, you can run the @test@ task with a pattern.  For example:
 
-{{{!sh
+<notextile>
+{% highlight sh %}
 $ buildr test:KillerAppTest
-}}}
+{% endhighlight %}
+</notextile>
 
 Buildr will then run only tests that match the pattern @KillerAppTest@.  It uses pattern matching, so @test:Foo@ will run @com.acme.FooTest@ and @com.acme.FooBarTest@.  With Java, you can use this to pick a class name, or a package name to run all tests in that package, or any such combination.  In fact, you can specify several patterns separated with commas.  For example:
 
-{{{!sh
+<notextile>
+{% highlight sh %}
 $ buildr test:FooTest,BarTest
-}}}
+{% endhighlight %}
+</notextile>
 
 As you probably noticed, Buildr will stop your build at the first test that fails.  We think it's a good idea, except when it's not.  If you're using a continuous build system, you'll want a report of all the failed tests without stopping at the first failure.  To make that happen, set the environment variable @test@ to "all", or the Buildr @options.test@ option to @:all@.  For example:
 
-{{{!sh
+<notextile>
+{% highlight sh %}
 $ buildr package test=all
-}}}
+{% endhighlight %}
+</notextile>
 
 We're using @package@ and not @build@ above.  When using a continuous build system, you want to make sure that packages are created, contain the right files, and also run the integration tests.
 
 
-h2. Integration Tests
+h2(#integration). Integration Tests
 
 So far we talked about unit tests.  Unit tests are run in isolation on the specific project they test, in an isolated environment, generally with minimal setup and teardown.  You get a sense of that when we told you tests run after the @build@ task, and include JMock in the dependency list.
 
@@ -105,44 +129,52 @@ In contrast, integration tests are run with a number of components, in an enviro
 
 You write integration tests much the same way as you write unit tests, using @test.compile@ and @test.resources@.  However, you need to tell Buildr that your tests will execute during integration test.  To do so, add the following line in your project definition:
 
-{{{!ruby
+<notextile>
+{% highlight ruby %}
 test.using :integration
-}}}
+{% endhighlight %}
+</notextile>
 
 Typically you'll use unit tests in projects that create internal modules, such as JARs, and integration tests in projects that create components, such as WARs and EARs.  You only need to use the @:integration@ option with the later.
 
 To run integration tests on the current project:
 
-{{{!sh
+<notextile>
+{% highlight sh %}
 $ buildr integration
-}}}
+{% endhighlight %}
+</notextile>
 
 You can also run specific tests cases, for example:
 
-{{{!sh
+<notextile>
+{% highlight sh %}
 $ buildr integration:ClientTest
-}}}
+{% endhighlight %}
+</notextile>
 
 If you run the @package@ task (or any task that depends on it, like @install@ and @upload@), Buildr will first run the @build@ task and all its unit tests, and then create the packages and run the integration tests.  That gives you full coverage for your tests and ready to release packages.  As with unit tests, you can set the environment variable @test@ to "no" to skip integration tests, or "all" to ignore failures.
 
 
-h2. Using Setup and Teardown
+h2(#setup_teardown). Using Setup and Teardown
 
 Some tests need you to setup an environment before they run, and tear it down afterwards.  The test frameworks (JUnit, TestNG) allow you to do that for each test.  Buildr provides two additional mechanisms for dealing with more complicated setup and teardown procedures.
 
 Integration tests run a setup task before the tests, and a teardown task afterwards.  You can use this task to setup a Web server for testing your Web components, or a database server for testing persistence.  You can access either task by calling @integration.setup@ and @integration.teardown@.  For example:
 
-{{{!ruby
+<notextile>
+{% highlight ruby %}
 integration.setup { server.start ; server.deploy }
 integration.teardown { server.stop }
-}}}
+{% endhighlight %}
+</notextile>
 
 Depending on your build, you may want to enhance the setup/teardown tasks from within a project, for example, to populate the database with data used by that project's test, or from outside the project definition, for example, to start and stop the Web server.
 
 Likewise, each project has its own setup and teardown tasks that are run before and after tests for that specific project.  You can access these tasks using @test.setup@ and @test.teardown@.
 
 
-h2. Testing Your Build
+h2(#checks). Testing Your Build
 
 So you got the build running and all the tests pass, binaries are shipping when you find out some glaring omissions.  The license file is empty, the localized messages for Japanese are missing, the CSS files are not where you expect them to be.  The fact is, some errors slip by unit and integration tests.  So how do we make sure the same mistake doesn't happen again?
 
@@ -150,7 +182,8 @@ Each project has a @check@ task that runs just after packaging.  You can use thi
 
 You use the @check@ method to express and expectation.  Buildr will then run all these expectations against your project, and fail at the first expectation that doesn't match.  An expectation says three things.  Let's look at a few examples:
 
-{{{!ruby
+<notextile>
+{% highlight ruby %}
 check package(:war), 'should exist' do
   it.should exist
 end
@@ -172,17 +205,20 @@ end
 check file('target/classes/killerapp/Code.class'), 'should exist' do
   it.should exist
 end
-}}}
+{% endhighlight %}
+</notextile>
 
 The first argument is the subject, or the project if you skip the first argument.  The second argument is the description, optional, but we recommend using it.  The method @it@ returns the subject.
 
 You can also write the first expectation like this:
 
-{{{!ruby
+<notextile>
+{% highlight ruby %}
 check do
   package(:jar).should exist
 end
-}}}
+{% endhighlight %}
+</notextile>
 
 We recommend using the subject and description, they make your build easier to read and maintain, and produce better error messages.
 
@@ -195,14 +231,14 @@ Buildr provides the following matchers:
 | @empty@   | Given a file task checks that the file (or directory) is empty. |
 | @contain@ | Given a file task referencing a file, checks its contents, using string or regular expression.  For a file task referencing a directory, checks that it contains the specified files; global patterns using @*@ and @**@ are allowed. |
 
-All these matchers operate against a file task.  If you run them against a ZipTask (including JAR, WAR, etc) they can also check the contents of the ZIP file.  And as you can see in the examples above, you can also run them against a path in a ZIP file, checking its contents as if it was a directory, or against an entry in a ZIP file, checking the content of that file.
+All these matchers operate against a file task.  If you run them against a ZipTask (including JAR, WAR, etc) or a TarTask, they can also check the contents of the archive.  And as you can see in the examples above, you can also run them against a path in an archive, checking its contents as if it was a directory, or against an entry in an archive, checking the content of that file.
 
 p(note). The @package@ method returns a package task based on packaging type, identifier, group, version and classifier.  The last four are inferred, but if you create a package with different specifications (for example, you specify a classifier) your checks must call @package@ with the same qualifying arguments to return the very same package task.
 
 Buildr expectations are based on RSpec.  "RSpec":http://rspec.info/ is the behavior-driven development framework we use to test Buildr itself.  Check the RSpec documentation if want to see all the supported matchers, or want to write your own.
 
 
-h2. Behaviour-Driven Development
+h2(#bdd). Behaviour-Driven Development
 
 Buildr supports several Behaviour-Driven Development(BDD) frameworks for testing your projects.  Buildr follows each framework naming conventions, searching for files under the @src/spec/{lang}@ directory.
 

data/lib/buildr.rb

@@ -14,7 +14,7 @@
 # the License.
 
 module Buildr
-  VERSION = '1.3.3'.freeze
+  VERSION = '1.3.4'.freeze
 end
 
 require 'buildr/core'
@@ -28,8 +28,8 @@ module Buildr ; extend self ; end
 # The Buildfile object (self) has access to all the Buildr methods and constants.
 class << self ; include Buildr ; end
 class Object #:nodoc:
-  Buildr.constants.each { |c| const_set c, Buildr.const_get(c) unless const_defined?(c) }
+  Buildr.constants.each do |name|
+    const = Buildr.const_get(name)
+    const_set name, const if const.is_a?(Module)
+  end
 end
-
-# Prevent RSpec runner from running at_exit.
-require 'spec'

data/lib/buildr/core.rb

@@ -24,4 +24,6 @@ require 'buildr/core/filter'
 require 'buildr/core/compile'
 require 'buildr/core/test'
 require 'buildr/core/checks'
+require 'buildr/core/transports'
 require 'buildr/core/generate'
+require 'buildr/core/osx' if RUBY_PLATFORM =~ /darwin/

data/lib/buildr/core/application.rb

@@ -13,6 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+
 # Portion of this file derived from Rake.
 # Copyright (c) 2003, 2004 Jim Weirich
 #
@@ -35,15 +36,15 @@
 # SOFTWARE.
 
 
-require 'highline/import'
 require 'rake'
+require 'highline/import'
 require 'rubygems/source_info_cache'
-require 'buildr/core/application_cli'
 require 'buildr/core/util'
+Gem.autoload :SourceInfoCache, 'rubygems/source_info_cache'
 
 
 # Gem::user_home is nice, but ENV['HOME'] lets you override from the environment.
-ENV["HOME"] ||= File.expand_path(Gem::user_home)
+ENV['HOME'] ||= File.expand_path(Gem::user_home)
 ENV['BUILDR_ENV'] ||= 'development'
 
 
@@ -68,19 +69,22 @@ module Buildr
 
     def initialize(application) #:nodoc:
       @application = application
-      @user = load_from('settings', @application.home_dir)
-      @build = load_from('build')
-      @profiles = load_from('profiles')
     end
 
     # User settings loaded from setting.yaml file in user's home directory.
-    attr_reader :user
+    def user
+      @user ||= load_from('settings', @application.home_dir)
+    end
 
     # Build settings loaded from build.yaml file in build directory.
-    attr_reader :build
+    def build
+      @build ||= load_from('build')
+    end
 
     # Profiles loaded from profiles.yaml file in build directory.
-    attr_reader :profiles
+    def profiles
+      @profiles ||= load_from('profiles')
+    end
 
     # :call-seq:
     #    profile => hash
@@ -92,9 +96,12 @@ module Buildr
 
   private
 
-    def load_from(base_name, dir = nil)
-      base_name = File.expand_path(base_name, dir) if dir
-      file_name = ['yaml', 'yml'].map { |ext| "#{base_name}.#{ext}" }.find { |fn| File.exist?(fn) }
+    def load_from(name, path = nil)
+      unless path
+        fail "Internal error: attempting to access local setting before buildfile located" unless @application.rakefile
+        path = File.dirname(@application.rakefile)
+      end
+      file_name = ['yaml', 'yml'].map { |ext| File.join(path, "#{name}.#{ext}") }.find { |fn| File.exist?(fn) }
       return {} unless file_name
       yaml = YAML.load(File.read(file_name)) || {}
       fail "Expecting #{file_name} to be a map (name: value)!" unless Hash === yaml
@@ -107,28 +114,41 @@ module Buildr
 
   class Application < Rake::Application #:nodoc:
 
+    # Deprecated: rakefile/Rakefile, removed in 1.5
     DEFAULT_BUILDFILES = ['buildfile', 'Buildfile'] + DEFAULT_RAKEFILES
     
-    include CommandLineInterface
-
     attr_reader :rakefiles, :requires
     private :rakefiles, :requires
 
     def initialize
       super
-      @rakefiles = DEFAULT_BUILDFILES
-      @name = 'Buildr'
-      @requires = []
+      @rakefiles = DEFAULT_BUILDFILES.dup
       @top_level_tasks = []
-      parse_options
-      collect_tasks
       @home_dir = File.expand_path('.buildr', ENV['HOME'])
-      mkpath @home_dir, :verbose=>false unless File.exist?(@home_dir)
-      @environment = ENV['BUILDR_ENV'] ||= 'development'
+      mkpath @home_dir unless File.exist?(@home_dir)
+      @settings = Settings.new(self)
       @on_completion = []
       @on_failure = []
     end
 
+    def run
+      standard_exception_handling do
+        init 'Buildr'
+        load_buildfile
+        top_level
+      end
+    end
+
+    # Not for external consumption.
+    def switch_to_namespace(names) #:nodoc:
+      current, @scope = @scope, names
+      begin
+        yield
+      ensure
+        @scope = current
+      end
+    end
+
     # Returns list of Gems associated with this buildfile, as listed in build.yaml.
     # Each entry is of type Gem::Specification.
     attr_reader :gems
@@ -137,13 +157,12 @@ module Buildr
     attr_reader :home_dir
 
     # Copied from BUILD_ENV.
-    attr_reader :environment
+    def environment
+      ENV['BUILDR_ENV']
+    end
 
     # Returns the Settings associated with this build.
-    def settings
-      fail "Internal error: Called Buildr.settings before buildfile located" unless rakefile
-      @settings ||= Settings.new(self)
-    end
+    attr_reader :settings
 
     # :call-seq:
     #   buildfile
@@ -151,28 +170,13 @@ module Buildr
     def buildfile
       @buildfile_task ||= BuildfileTask.define_task(File.expand_path(rakefile))
     end
-    
+
     # Files that complement the buildfile itself
     def build_files #:nodoc:
+      deprecated 'Please call buildfile.prerequisites instead' 
       buildfile.prerequisites
     end
 
-    def run
-      standard_exception_handling do
-        find_buildfile
-        load_gems
-        load_artifacts
-        load_tasks
-        load_requires
-        load_buildfile
-        load_imports
-        task('buildr:initialize').invoke
-        top_level
-      end
-      title, message = 'Your build has completed', "#{Dir.pwd}\nbuildr #{@top_level_tasks.join(' ')}"
-      @on_completion.each { |block| block.call(title, message) rescue nil }
-    end
-
     # Yields to block on successful completion. Primarily used for notifications.
     def on_completion(&block)
       @on_completion << block
@@ -183,16 +187,6 @@ module Buildr
       @on_failure << block
     end
 
-    # Not for external consumption.
-    def switch_to_namespace(names) #:nodoc:
-      current, @scope = @scope, names
-      begin
-        yield
-      ensure
-        @scope = current
-      end
-    end
-
     # :call-seq:
     #   deprecated(message)
     #
@@ -213,30 +207,204 @@ module Buildr
       end
     end
 
-  private
+  protected
+    
+    def load_buildfile # replaces load_rakefile
+      standard_exception_handling do
+        find_buildfile
+        load_gems
+        load_artifact_ns
+        load_tasks
+        raw_load_buildfile
+      end
+    end
 
-    # Returns Gem::Specification for every listed and installed Gem, Gem::Dependency
-    # for listed and uninstalled Gem, which is the installed before loading the buildfile.
-    def listed_gems #:nodoc:
-      Array(settings.build['gems']).map do |dep|
-        name, trail = dep.scan(/^\s*(\S*)\s*(.*)\s*$/).first
-        versions = trail.scan(/[=><~!]{0,2}\s*[\d\.]+/)
-        versions = ['>= 0'] if versions.empty?
-        dep = Gem::Dependency.new(name, versions)
-        Gem::SourceIndex.from_installed_gems.search(dep).last || dep
+    def top_level # adds on_completion hook
+      standard_exception_handling do
+        if options.show_tasks
+          display_tasks_and_comments
+        elsif options.show_prereqs
+          display_prerequisites
+        elsif options.execute
+          eval options.execute
+        else
+          @start = Time.now
+          top_level_tasks.each { |task_name| invoke_task(task_name) }
+          if verbose
+            elapsed = Time.now - @start
+            real = []
+            real << ('%ih' % (elapsed / 3600)) if elapsed >= 3600
+            real << ('%im' % ((elapsed / 60) % 60)) if elapsed >= 60
+            real << ('%.3fs' % (elapsed % 60))
+            puts $terminal.color("Completed in #{real.join}", :green)
+          end
+          # On OS X this will load Cocoa and Growl which takes half a second we
+          # don't want to measure, so put this after the console message.
+          title, message = "Your build has completed", "#{Dir.pwd}\nbuildr #{@top_level_tasks.join(' ')}"
+          @on_completion.each do |block|
+            block.call(title, message) rescue nil
+          end
+        end
       end
     end
 
-    # Load artifact specs from the build.yaml file, making them available 
-    # by name ( ruby symbols ).
-    def load_artifacts #:nodoc:
-      hash = settings.build['artifacts']
-      return unless hash
-      raise "Expected 'artifacts' element to be a hash" unless Hash === hash
-      # Currently we only use one artifact namespace to rule them all. (the root NS)
-      Buildr::ArtifactNamespace.load(:root => hash)
+    def handle_options
+      options.rakelib = ['tasks']
+
+      OptionParser.new do |opts|
+        opts.banner = "buildr [-f rakefile] {options} targets..."
+        opts.separator ""
+        opts.separator "Options are ..."
+        
+        opts.on_tail("-h", "--help", "-H", "Display this help message.") do
+          puts opts
+          exit
+        end
+        standard_buildr_options.each { |args| opts.on(*args) }
+      end.parse!
+    end
+
+    def standard_buildr_options # replaces standard_rake_options
+      [
+        ['--describe', '-D [PATTERN]', "Describe the tasks (matching optional PATTERN), then exit.",
+          lambda { |value|
+            options.show_tasks = true
+            options.full_description = true
+            options.show_task_pattern = Regexp.new(value || '')
+          }
+        ],
+        ['--execute',  '-E CODE',
+          "Execute some Ruby code after loading the buildfile",
+          lambda { |value| options.execute = value }            
+        ],
+        ['--environment',  '-e ENV',
+          "Environment name (e.g. development, test, production).",
+          lambda { |value| ENV['BUILDR_ENV'] = value }            
+        ],
+        ['--generate [PATH]',
+         "Generate buildfile from either pom.xml file or directory path.",
+          lambda { |value|
+            value ||= File.exist?('pom.xml') ? 'pom.xml' : Dir.pwd
+            raw_generate_buildfile value
+            exit
+          }
+        ],
+        ['--libdir', '-I LIBDIR', "Include LIBDIR in the search path for required modules.",
+          lambda { |value| $:.push(value) }
+        ],
+        ['--prereqs', '-P [PATTERN]', "Display the tasks and dependencies (matching optional PATTERN), then exit.",
+          lambda { |value|
+            options.show_prereqs = true
+            options.show_task_pattern = Regexp.new(value || '')
+          }
+        ],
+        ['--quiet', '-q', "Do not log messages to standard output.",
+          lambda { |value| verbose(false) }
+        ],
+        ['--buildfile', '-f FILE', "Use FILE as the buildfile.",
+          lambda { |value| 
+            @rakefiles.clear 
+            @rakefiles << value
+          }
+        ],
+        ['--rakelibdir', '--rakelib', '-R PATH',
+          "Auto-import any .rake files in PATH. (default is 'tasks')",
+          lambda { |value| options.rakelib = value.split(':') }
+        ],
+        ['--require', '-r MODULE', "Require MODULE before executing rakefile.",
+          lambda { |value|
+            begin
+              require value
+            rescue LoadError => ex
+              begin
+                rake_require value
+              rescue LoadError => ex2
+                raise ex
+              end
+            end
+          }
+        ],
+        ['--rules', "Trace the rules resolution.",
+          lambda { |value| options.trace_rules = true }
+        ],
+        ['--no-search', '--nosearch', '-N', "Do not search parent directories for the Rakefile.",
+          lambda { |value| options.nosearch = true }
+        ],
+        ['--silent', '-s', "Like --quiet, but also suppresses the 'in directory' announcement.",
+          lambda { |value|
+            verbose(false)
+            options.silent = true
+          }
+        ],
+        ['--tasks', '-T [PATTERN]', "Display the tasks (matching optional PATTERN) with descriptions, then exit.",
+          lambda { |value|
+            options.show_tasks = true
+            options.show_task_pattern = Regexp.new(value || '')
+            options.full_description = false
+          }
+        ],
+        ['--trace', '-t', "Turn on invoke/execute tracing, enable full backtrace.",
+          lambda { |value|
+            options.trace = true
+            verbose(true)
+          }
+        ],
+        ['--verbose', '-v', "Log message to standard output (default).",
+          lambda { |value| verbose(true) }
+        ],
+        ['--version', '-V', "Display the program version.",
+          lambda { |value|
+            puts "Buildr #{Buildr::VERSION} #{RUBY_PLATFORM[/java/] && '(JRuby '+JRUBY_VERSION+')'}"
+            exit
+          }
+        ]
+      ]
+    end
+
+    def find_buildfile
+      buildfile, location = find_rakefile_location || (tty_output? && ask_generate_buildfile)
+      fail "No Buildfile found (looking for: #{@rakefiles.join(', ')})" if buildfile.nil?
+      @rakefile = buildfile
+      Dir.chdir(location)
+    end
+
+    def ask_generate_buildfile
+      source = choose do |menu|
+        menu.header = "To use Buildr you need a buildfile. Do you want me to create one?"
+        menu.choice("From Maven2 POM file") { 'pom.xml' } if File.exist?('pom.xml')
+        menu.choice("From directory structure") { Dir.pwd }
+        menu.choice("Cancel") { }
+      end
+      if source
+        buildfile = raw_generate_buildfile(source)
+        [buildfile, File.dirname(buildfile)]
+      end
+    end
+
+    def raw_generate_buildfile(source)
+      # 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?'))
+      script = File.directory?(source) ? Generate.from_directory(source) : Generate.from_maven2_pom(source)
+      File.open @rakefile, 'w' do |file|
+        file.puts script
+      end
+      puts "Created #{@rakefile}" if verbose
+      @rakefile
     end
-      
+
+    def raw_load_buildfile # replaces raw_load_rakefile
+      puts "(in #{Dir.pwd}, #{environment})" unless options.silent
+      load File.expand_path(@rakefile) if @rakefile && @rakefile != ''
+      options.rakelib.each do |rlib|
+        glob("#{rlib}/*.rake") do |name|
+          add_import name
+        end
+      end
+      load_imports
+      Buildr.projects
+    end
+
     # Load/install all Gems specified in build.yaml file.
     def load_gems #:nodoc:
       missing_deps, installed = listed_gems.partition { |gem| gem.is_a?(Gem::Dependency) }
@@ -259,42 +427,35 @@ module Buildr
       @gems = installed
     end
 
-    def find_buildfile #:nodoc:
-      here = original_dir
-      Dir.chdir(here) unless Dir.pwd == here
-      while ! have_rakefile
-        Dir.chdir('..')
-        if Dir.pwd == here || options.nosearch
-          error = "No Buildfile found (looking for: #{@rakefiles.join(', ')})"
-          if STDIN.isatty
-            chdir(original_dir) { task('generate').invoke }
-            exit 1
-          else
-            raise error
-          end
-        end
-        here = Dir.pwd
+    # Returns Gem::Specification for every listed and installed Gem, Gem::Dependency
+    # for listed and uninstalled Gem, which is the installed before loading the buildfile.
+    def listed_gems #:nodoc:
+      Array(settings.build['gems']).map do |dep|
+        name, trail = dep.scan(/^\s*(\S*)\s*(.*)\s*$/).first
+        versions = trail.scan(/[=><~!]{0,2}\s*[\d\.]+/)
+        versions = ['>= 0'] if versions.empty?
+        dep = Gem::Dependency.new(name, versions)
+        Gem::SourceIndex.from_installed_gems.search(dep).last || dep
       end
     end
 
-    def load_buildfile #:nodoc:
-      info "(in #{Dir.pwd}, #{environment})"
-      load File.expand_path(@rakefile) if @rakefile != ''
-      buildfile.enhance @requires.select { |f| File.file?(f) }.map{ |f| File.expand_path(f) }
-    end
-
-    def load_requires #:nodoc:
-      @requires.each { |name| require name }
+    # Load artifact specs from the build.yaml file, making them available 
+    # by name ( ruby symbols ).
+    def load_artifact_ns #:nodoc:
+      hash = settings.build['artifacts']
+      return unless hash
+      raise "Expected 'artifacts' element to be a hash" unless Hash === hash
+      # Currently we only use one artifact namespace to rule them all. (the root NS)
+      Buildr::ArtifactNamespace.load(:root => hash)
     end
-
+    
     # Loads buildr.rb files from users home directory and project directory.
     # Loads custom tasks from .rake files in tasks directory.
     def load_tasks #:nodoc:
+      # TODO: this might need to be split up, look for deprecated features, better method name.
       files = [ File.expand_path('buildr.rb', ENV['HOME']), 'buildr.rb' ].select { |file| File.exist?(file) }
       files += [ File.expand_path('buildr.rake', ENV['HOME']), File.expand_path('buildr.rake') ].
         select { |file| File.exist?(file) }.each { |file| warn "Please use '#{file.ext('rb')}' instead of '#{file}'" }
-      #Load local tasks that can be used in the Buildfile.
-      files += Dir[File.expand_path('tasks/*.rake')]
       files.each do |file|
         unless $LOADED_FEATURES.include?(file)
           load file
@@ -305,49 +466,68 @@ module Buildr
       true
     end
 
-    def display_prerequisites
-      invoke_task('buildr:initialize')
-      tasks.each do |task|
-        if task.name =~ options.show_task_pattern
-          puts "buildr #{task.name}"
-          task.prerequisites.each { |prereq| puts "    #{prereq}" }
+    def display_tasks_and_comments
+      displayable_tasks = tasks.select { |t| t.comment && t.name =~ options.show_task_pattern }
+      if options.full_description
+        displayable_tasks.each do |t|
+          puts "buildr #{t.name_with_args}"
+          t.full_comment.split("\n").each do |line|
+            puts "    #{line}"
+          end
+          puts
+        end
+      else
+        width = displayable_tasks.collect { |t| t.name_with_args.length }.max || 10
+        max_column = truncate_output? ? terminal_width - name.size - width - 7 : nil
+        displayable_tasks.each do |t|
+          printf "#{name} %-#{width}s  # %s\n",
+            t.name_with_args, max_column ? truncate(t.comment, max_column) : t.comment
         end
       end
     end
-    
-    # Provide standard execption handling for the given block.
-    def standard_exception_handling
+
+    def display_prerequisites
+      displayable_tasks = tasks.select { |t| t.name =~ options.show_task_pattern }
+      displayable_tasks.each do |t|
+        puts "buildr #{t.name}"
+        t.prerequisites.each { |pre| puts "    #{pre}" }
+      end
+    end
+
+    def standard_exception_handling # adds on_failure hook
       begin
         yield
       rescue SystemExit => ex
         # Exit silently with current status
         exit(ex.status)
-      rescue SystemExit, GetoptLong::InvalidOption => ex
-        # Exit silently
+      rescue OptionParser::ParseError => ex
+        $stderr.puts $terminal.color(ex.message, :red)
         exit(1)
       rescue Exception => ex
-        title, message = 'Your build failed with an error', "#{Dir.pwd}:\n#{ex.message}"
-        @on_failure.each { |block| block.call(title, message, ex) rescue nil }
+        title, message = "Your build failed with an error", "#{Dir.pwd}:\n#{ex.message}"
+        @on_failure.each do |block|
+          block.call(title, message, ex) rescue nil
+        end
         # Exit with error message
-        $stderr.puts "buildr aborted!"
+        $stderr.puts "Buildr aborted!"
         $stderr.puts $terminal.color(ex.message, :red)
         if options.trace
           $stderr.puts ex.backtrace.join("\n")
         else
-          $stderr.puts ex.backtrace.select { |str| str =~ /#{buildfile}/ }.map { |line| $terminal.color(line, :red) }.join("\n")
+          $stderr.puts ex.backtrace.select { |str| str =~ /#{rakefile}/ }.map { |line| $terminal.color(line, :red) }.join("\n") if rakefile
           $stderr.puts "(See full trace by running task with --trace)"
         end
         exit(1)
       end
     end
-    
+
   end
   
   
   # This task stands for the buildfile and all its associated helper files (e.g., buildr.rb, build.yaml).
   # By using this task as a prerequisite for other tasks, you can ensure these tasks will be needed
   # whenever the buildfile changes.
-  class BuildfileTask < Rake::FileTask
+  class BuildfileTask < Rake::FileTask #:nodoc:
     
     def timestamp
       ([name] + prerequisites).map { |f| File.stat(f).mtime }.max rescue Time.now
@@ -357,10 +537,6 @@ module Buildr
 
   class << self
 
-    task 'buildr:initialize' do
-      Buildr.load_tasks_and_local_files
-    end
-
     # Returns the Buildr::Application object.
     def application
       Rake.application
@@ -399,38 +575,6 @@ else
 end
 
 
-# Let's see if we can use Growl.  We do this at the very end, loading Ruby Cocoa
-# could slow the build down, so later is better.  We only do this when running 
-# from the console in verbose mode.
-if $stdout.isatty && verbose && RUBY_PLATFORM =~ /darwin/
-  begin
-    require 'osx/cocoa'
-    icon = OSX::NSApplication.sharedApplication.applicationIconImage
-    icon = OSX::NSImage.alloc.initWithContentsOfFile(File.join(File.dirname(__FILE__), '../resources/buildr.icns'))
-
-    # Register with Growl, that way you can turn notifications on/off from system preferences.
-    OSX::NSDistributedNotificationCenter.defaultCenter.
-      postNotificationName_object_userInfo_deliverImmediately(:GrowlApplicationRegistrationNotification, nil,
-        { :ApplicationName=>'Buildr', :AllNotifications=>['Completed', 'Failed'], 
-          :ApplicationIcon=>icon.TIFFRepresentation }, true)
-    
-    notify = lambda do |type, title, message|
-      OSX::NSDistributedNotificationCenter.defaultCenter.
-        postNotificationName_object_userInfo_deliverImmediately(:GrowlNotification, nil,
-          { :ApplicationName=>'Buildr', :NotificationName=>type,
-            :NotificationTitle=>title, :NotificationDescription=>message }, true)
-    end
-    Buildr.application.on_completion { |title, message| notify['Completed', title, message] }
-    Buildr.application.on_failure { |title, message, ex| notify['Failed', title, message] }
-  rescue Exception # No growl
-  end
-elsif $stdout.isatty && verbose
-  notify = lambda { |type, title, message| $stdout.puts "[#{type}] #{title}: #{message}" }
-  Buildr.application.on_completion { |title, message| notify['Completed', title, message] }
-  Buildr.application.on_failure { |title, message, ex| notify['Failed', title, message] }
-end
-
-
 alias :warn_without_color :warn
 
 # Show warning message.
@@ -457,6 +601,13 @@ end
 
 
 module Rake #:nodoc
+  # Rake's circular dependency checks (InvocationChain) only applies to task prerequisites,
+  # all other cases result in the non too-descriptive thread sleeping error. This change can
+  # deal with circular dependencies that occur from direct task invocation, e.g:
+  #   task 'foo'=>'bar'
+  #   task 'bar' do
+  #     task('foo').invoke
+  #   end
   class Task #:nodoc:
     def invoke(*args)
       task_args = TaskArguments.new(arg_names, args)
@@ -487,3 +638,22 @@ module Rake #:nodoc
     end
   end
 end
+
+
+module RakeFileUtils #:nodoc:
+  FileUtils::OPT_TABLE.each do |name, opts|
+    default_options = []
+    if opts.include?(:verbose) || opts.include?("verbose")
+      default_options << ':verbose => RakeFileUtils.verbose_flag == true'
+    end
+    next if default_options.empty?
+    module_eval(<<-EOS, __FILE__, __LINE__ + 1)
+    def #{name}( *args, &block )
+      super(
+        *rake_merge_option(args,
+          #{default_options.join(', ')}
+          ), &block)
+    end
+    EOS
+  end
+end