vic-buildr 1.3.3 → 1.3.4

data/bin/buildr

@@ -14,15 +14,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-start = Time.now
 require 'rubygems'
 require 'buildr'
 Buildr.application.run
-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

data/buildr.gemspec

@@ -16,11 +16,11 @@
 
 Gem::Specification.new do |spec|
   spec.name           = 'buildr'
-  spec.version        = '1.3.3'
+  spec.version        = '1.3.4'
   spec.author         = 'Apache Buildr'
   spec.email          = "buildr-user@incubator.apache.org"
   spec.homepage       = "http://incubator.apache.org/buildr"
-  spec.summary        = 'A build system that doesn\'t suck'
+  spec.summary        = "A build system that doesn't suck"
   spec.rubyforge_project  = 'buildr'
 
   # Rakefile needs to create spec for both platforms (ruby and java), using the
@@ -41,17 +41,17 @@ Gem::Specification.new do |spec|
                            '--webcvs' << 'http://svn.apache.org/repos/asf/incubator/buildr/trunk/'
 
   # Tested against these dependencies.
-  spec.add_dependency 'rake',                 '0.8.1'
+  spec.add_dependency 'rake',                 '0.8.3'
   spec.add_dependency 'builder',              '2.1.2'
   spec.add_dependency 'net-ssh',              '2.0.4'
   spec.add_dependency 'net-sftp',             '2.0.1'
   spec.add_dependency 'rubyzip',              '0.9.1'
   spec.add_dependency 'highline',             '1.4.0'
-  spec.add_dependency 'rubyforge',            '1.0.0'
-  spec.add_dependency 'hoe',                  '1.7.0'
+  spec.add_dependency 'rubyforge',            '1.0.1'
+  spec.add_dependency 'hoe',                  '1.8.1'
   spec.add_dependency 'rjb',                  '1.1.6' if spec.platform.to_s == 'ruby' 
   spec.add_dependency 'Antwrap',              '0.7.0'
-  spec.add_dependency 'rspec',                '1.1.5'
+  spec.add_dependency 'rspec',                '1.1.11'
   spec.add_dependency 'xml-simple',           '1.0.11'
   spec.add_dependency 'archive-tar-minitar',  '0.5.2'
   spec.add_dependency 'jruby-openssl',        '0.2'   if spec.platform.to_s == 'java'

data/doc/pages/contributing.textile

@@ -86,7 +86,7 @@ If you want to learn more about Git, you can start by watching Scott Chacon’s
 
 And keep this "Git cheat sheet":http://ktown.kde.org/~zrusin/git/git-cheat-sheet-medium.png close at hand. Very useful.
 
-*Note:* The GitHub repository is maintained by contributors to this project, but is *not* an official Apache repository.  To obtain Buildr from the official Apache repository, consider using @giv-svn@ instead.
+*Note:* The GitHub repository is maintained by contributors to this project, but is *not* an official Apache repository.  To obtain Buildr from the official Apache repository, consider using @git-svn@ instead.
 
 h3. Working with Source Code
 
@@ -116,7 +116,7 @@ h3. Using development build
 Occasionally we'll make development builds from the current code in trunk/head. We appreciate if you can take the time to test those out and report any bugs. To install development builds, use the Gem repository at @people.apache.org/~assaf/buildr/snapshot@:
 
 {{{!sh
-gem source --add http://people.apache.org/~assaf/buildr/snapshot
+gem source --add http://people.apache.org/~assaf/buildr/snapshot/
 }}}
 
 Since Ruby Gems uses version numbers to detect new releases, if you installed Buildr from a snapshot and want to upgrade to a newer snapshot or the latest official release, you need to use @gem install buildr@ rather than @gem upgrade@.
@@ -124,7 +124,7 @@ Since Ruby Gems uses version numbers to detect new releases, if you installed Bu
 If you want to go back to using the RubyForge releases:
 
 {{{!sh
-gem source --remove http://people.apache.org/~assaf/buildr/snapshot
+gem source --remove http://people.apache.org/~assaf/buildr/snapshot/
 gem install buildr
 }}}
 
@@ -173,7 +173,7 @@ Yes, we do make typos, spelling errors and sometimes we write things that don't
 
 For simple typos and quick fixes, just send a message to the mailing list or log an issue in JIRA.
 
-If you end up rewriting a significant piece of text, or add new documentation (your rock!), send a patch.  Making documentation patches is fairly easy.  All the documentation is generated from text files in the @doc/pages@ directory, so all you need to do is check it out from SVN, edit, and @svn diff@ to create a patch.
+If you end up rewriting a significant piece of text, or add new documentation (you rock!), send a patch.  Making documentation patches is fairly easy.  All the documentation is generated from text files in the @doc/pages@ directory, so all you need to do is check it out from SVN, edit, and @svn diff@ to create a patch.
 
 We use "Textile":http://www.textism.com/tools/textile/ as the markup language, it takes all of a few minutes to learn, it's intuitive to use, and produces clean HTML.  You can learn it all in a few minutes from the "Textile Reference Manual":http://redcloth.org/textile.  Also check out the "Textile Quick Reference":http://hobix.com/textile/quick.html.
 
@@ -195,6 +195,8 @@ Here is the list of people who are actively working and committing on Buildr:
 
 *Alex Boisvert*
 
+Came to Buildr as a refuge from the Maven Uncertainty Principle.  Alex has been working mostly on the Scala integration and believes Ruby scripting is a great complement to statically typed languages. 
+
 *"Matthieu Riou":http://offthelip.org*
 
 *Victor Hugo Borja* (vborja at apache.org)

data/doc/pages/download.textile

@@ -14,6 +14,17 @@ The source code is included in both source and binary distribution, the Gem dist
 
 h2.  Binaries and Source Code
 
+h3. buildr 1.3.3-incubating (2008-10-08)
+
+|_. Package |_. MD5 Checksum |_. PGP |
+| "buildr-1.3.3-incubating.gem":http://www.apache.org/dist/incubator/buildr/1.3.3-incubating/buildr-1.3.3-incubating.gem | "7192dad45441630cbf07b85af5f9069a":http://www.apache.org/dist/incubator/buildr/1.3.3-incubating/buildr-1.3.3-incubating.gem.md5 | "Sig":http://www.apache.org/dist/incubator/buildr/1.3.3-incubating/buildr-1.3.3-incubating.gem.asc |
+| "buildr-1.3.3-java-incubating.gem":http://www.apache.org/dist/incubator/buildr/1.3.3-incubating/buildr-1.3.3-java-incubating.gem | "71ad4f0f8bfa951fa129db67a06b608a":http://www.apache.org/dist/incubator/buildr/1.3.3-incubating/buildr-1.3.3-java-incubating.gem.md5 | "Sig":http://www.apache.org/dist/incubator/buildr/1.3.3-incubating/buildr-1.3.3-java-incubating.gem.asc |
+| "buildr-1.3.3-incubating.tgz":http://www.apache.org/dist/incubator/buildr/1.3.3-incubating/buildr-1.3.3-incubating.tgz | "e5ee6fe5b86386520c91a9633d02814b":http://www.apache.org/dist/incubator/buildr/1.3.3-incubating/buildr-1.3.3-incubating.tgz.md5 | "Sig":http://www.apache.org/dist/incubator/buildr/1.3.3-incubating/buildr-1.3.3-incubating.tgz.asc |
+| "buildr-1.3.3-incubating.zip":http://www.apache.org/dist/incubator/buildr/1.3.3-incubating/buildr-1.3.3-incubating.zip | "baab601fd46a877ee8e408891d68c842":http://www.apache.org/dist/incubator/buildr/1.3.3-incubating/buildr-1.3.3-incubating.zip.md5 | "Sig":http://www.apache.org/dist/incubator/buildr/1.3.3-incubating/buildr-1.3.3-incubating.zip.asc |
+
+p>. ("Release signing keys":http://www.apache.org/dist/incubator/buildr/1.3.3-incubating/KEYS)
+
+
 h3. buildr 1.3.2-incubating (2008-07-18)
 
 |_. Package |_. MD5 Checksum |_. PGP |

data/doc/pages/extending.textile

@@ -21,7 +21,7 @@ file('derby.sql') do
       :classpath=>REQUIRES.join(File::PATH_SEPARATOR)
     ant.mapping :schemaAction=>'build', :sqlFile=>task.name,
       :ignoreErrors=>true do
-        ant.config :propertiesFile=>_(:source, :main, :sql, 'derby.xml')
+        ant.config :propertiesFile=>_('src/main/sql/derby.xml')
         ant.classpath :path=>projects('store', 'utils' ).
           flatten.map(&:to_s).join(File::PATH_SEPARATOR)
     end
@@ -34,7 +34,7 @@ To this:
 {{{!ruby
 file('derby.sql') do
   mapping_tool :action=>'build', :sql=>task.name,
-    :properties=>_(:source, :main, :sql, 'derby.xml'),
+    :properties=>_('src/main/sql/derby.xml'),
     :classpath=>projects('store', 'utils')
 end
 }}}

data/doc/pages/getting_started.textile

@@ -46,7 +46,7 @@ To upgrade to a new version or install a specific version:
 
 {{{!sh
 $ sudo env JAVA_HOME=$JAVA_HOME gem update buildr
-$ sudo env JAVA_HOME=$JAVA_HOME gem install buildr -v 1.3.0
+$ sudo env JAVA_HOME=$JAVA_HOME gem install buildr -v 1.3.4
 }}}
 
 You can also use this script "to install Buildr on Linux":scripts/install-linux.sh.  This script will install Buildr or if already installed, upgrade to a more recent version.  It will also install Ruby 1.8.6 if not already installed (using @yum@ or @apt-get@) and upgrage RubyGems to 1.0.1.
@@ -78,7 +78,7 @@ To upgrade to a new version or install a specific version:
 
 {{{!sh
 $ sudo env JAVA_HOME=$JAVA_HOME gem update buildr
-$ sudo env JAVA_HOME=$JAVA_HOME gem install buildr -v 1.3.0
+$ sudo env JAVA_HOME=$JAVA_HOME gem install buildr -v 1.3.4
 }}}
 
 You can also use this script "to install Buildr on OS X":scripts/install-osx.sh.  This script will install Buildr or if already installed, upgrade to a more recent version.  It will also install Ruby 1.8.6 if not already installed (using MacPorts) and upgrage RubyGems to 1.0.1.
@@ -106,7 +106,7 @@ To upgrade to a new version or install a specific version:
 
 {{{!sh
 > gem update buildr
-> gem install buildr -v 1.3.0
+> gem install buildr -v 1.3.4
 }}}
 
 
@@ -134,7 +134,7 @@ To upgrade to a new version or install a specific version:
 
 {{{!sh
 $ jruby -S gem update buildr
-$ jruby -S gem install buildr -v 1.3.0
+$ jruby -S gem install buildr -v 1.3.4
 }}}
 
 You can also use this script "to install Buildr on JRuby":scripts/install-jruby.sh.  This script will install Buildr or if already installed, upgrade to a more recent version.  If necessary, it will also install JRuby 1.1 in @/opt/jruby@ and update the @PATH@ variable in @~/.bash_profile@ or @~/.profile@.

data/doc/pages/index.textile

@@ -22,17 +22,14 @@ So let's get started.  You can "read the documentation online":getting_started.h
 
 h2.  News
 
-Check out "all that's new in Buildr 1.3.2":whats_new.html.
-
-* Buildr 1.3 now runs on JRuby 1.1
-* Support for building Scala projects
-* Support for building Groovy projects
-* EAR packages
-* Behaviour-Driven Development frameworks
-* Profiles
-* New API for accessing Java libraries
-* Alternative source layouts
-* More documentation
+Check out "all that's new in Buildr 1.3.3":whats_new.html.
+
+* Buildr 1.3 now runs on JRuby 1.1 and Ruby 1.8.6.
+* Support for building Scala and Groovy projects.
+* Behavior-Driven Development frameworks (RSpec, JBehave, etc).
+* Profiles and build.yml settings file.
+* New API for accessing Java libraries.
+* More documentation.
 * Other features and bug fixes.
 
 

data/doc/pages/more_stuff.textile

@@ -82,37 +82,59 @@ When building an extension, make sure to follow these rules:
 # Check on a clean build with empty local repository.
 
 
-h2. Nailgun
+h2. BuildrServer
 
-"Nailgun":http://www.martiansoftware.com/nailgun/index.html is a client, protocol, and server for running Java programs from the command line without  incurring the JVM startup overhead.  Nailgun integration is available only when running Buildr within JRuby.
+Buildr provides an addon that allows you start a "dRuby":http://www.ruby-doc.org/stdlib/libdoc/drb/rdoc/index.html server hosting a buildfile, so that you can later invoke tasks on it without having to load the complete buildr runtime again.
 
-Buildr provides a custom nailgun server, allowing you to start a single JVM and let buildr create a queue of runtimes. These JRuby runtimes can be cached (indexed by buildfile path) and are  automatically reloaded when the buildfile has been modified. Runtime caching allows you to execute tasks without spending time creating  the buildr environment. 
+Usage:
 
-Start the BuildrServer by executing
+{{{!sh
+buildr -r buildr/drb drb:start
+}}}
+
+To stop the BuildrServer simply use Ctrl+C or kill the process.
+
+Once the server has been started you can invoke tasks using a simple script:
 
 {{{!ruby
-$ jruby -S buildr -rbuildr/nailgun nailgun:start
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'buildr/drb'
+Buildr::DRbApplication.run
 }}}
 
-Server output will display a message when it becomes ready, you will also see messages when the JRuby runtimes are being created, or when a new buildr environment is being loaded on them. After the runtime queues have been populated, you can start calling buildr as you normally do, by invoking the $NAILGUN_HOME/ng binary:
+Save this script as @dbuildr@, make it executable and use it to invoke tasks.
+  
+{{{!sh
+$ dbuildr clean compile
+}}}
+
+@dbuildr@ will start the BuildrServer if there isn't one already running.
+Subsequent calls to dbuildr will act as the client and invoke the tasks you
+provide to the server.
+If the buildfile has been modified it will be reloaded on the BuildrServer.
+
+h3. Nailgun
+
+"Nailgun":http://www.martiansoftware.com/nailgun/index.html is a client, protocol, and server for running Java programs from the command line without incurring the JVM startup overhead.  Nailgun integration is available only when running Buildr within JRuby.
+
+JRuby users need not to create the @dbuildr@ script listed on the previous section, as they can benefit from
+using a nailgun client to invoke tasks without having to wait for JVM+JRuby to load.
+
+Start the BuildrServer by executing
 
 {{{!sh
-# on another terminal, change directory to a project.
-# if this project is the same nailgun:start was invoked on, it's 
-# runtime has been cached, so no loading is performed unless 
-# the buildfile has been modified. otherwise the buildfile 
-# will be loaded on a previously loaded fresh-buildr runtime
-# and it will be cached.
-cd /some/buildr/project
-ng nailgun:help                      # display nailgun help
-ng nailgun:tasks                     # display overview of ng tasks
-ng clean compile                # just invoke those two tasks
+$ jruby -S buildr -rbuildr/nailgun nailgun:start
 }}}
 
-Some nailgun tasks have been provided to manage the cached runtimes,  to get an overview of them execute the @nailgun:tasks@ task.
+To stop the BuildrServer simply use Ctrl+C or kill the process.
 
-Be sure to read the nailgun help by executing the @nailgun:help@ task.
+Once the server has been started you can invoke tasks using the nailgun client
+installed on @$JRUBY_HOME/tool/nailgun/ng@
 
+{{{!sh
+$ ng clean compile
+}}}
 
 h2. Growl, Qube
 
@@ -158,6 +180,12 @@ The @eclipse@ task will generate a @.classpath@ and @.project@ file for each of
 
 If you add a new project, change the dependencies, or make any other change to your Buildfile, just run the @eclipse@ task again to re-generate the Eclipse project files.
 
+To have your libraries' source code available in Eclipse, run:
+ 
+{{{!sh
+$ buildr artifacts:sources
+}}}
+
 If you prefer IntelliJ IDEA, you can always:
 
 {{{!sh
@@ -213,8 +241,8 @@ The other two tasks are @jdepend:text@ and @jdepend:xml@.
 We want Buildr to load fast, and not everyone cares for these tasks, so we don't include them by default.  If you want to use one of them, you need to require it explicitly.  The proper way to do it in Ruby:
 
 {{{!ruby
-require 'buildr/cobertura'
-require 'buildr/emma'
+require 'buildr/java/cobertura'
+require 'buildr/java/emma'
 require 'buildr/jdepend'
 }}}
 
@@ -224,7 +252,7 @@ Another option is to require it from the command line (@--require@ or @-r@), for
 
 {{{!sh
 $ buildr --require buildr/jdepend jdepend:swing
-$ buildr -rbuildr/cobertura cobertura:html
+$ buildr -rbuildr/java/cobertura cobertura:html
 }}}
 
 
@@ -250,7 +278,7 @@ You can use functions to keep your code simple.  For example, in the ODE project
 def distro(project, id)
   project.package(:zip, :id=>id).path("#{id}-#{version}").tap do |zip|
     zip.include meta_inf + ['RELEASE_NOTES', 'README'].map { |f| path_to(f) }
-    zip.path('examples').include project.path_to(:source, :examples), :as=>'.'
+    zip.path('examples').include project.path_to('src/examples'), :as=>'.'
     zip.merge project('ode:tools-bin').package(:zip)
     zip.path('lib').include artifacts(COMMONS.logging, COMMONS.codec,
       COMMONS.httpclient, COMMONS.pool, COMMONS.collections, JAXEN, SAXON,

data/doc/pages/packaging.textile

@@ -384,7 +384,7 @@ If you need to upload other files, you can always extend the @upload@ task and u
 
 {{{!ruby
 # We'll let some other task decide how to create 'docs'
-task 'deploy'=>'docs' do
+task 'upload'=>'docs' do
   uri = URI("sftp://#{username}:#{password}@var/www/docs")
   uri.upload file('docs')
 end

data/doc/pages/projects.textile

@@ -17,7 +17,7 @@ AXIS2 = 'org.apache.axis2:axis2:jar:1.2'
 AXIOM  = group('axiom-api', 'axiom-impl', 'axiom-dom',
   :under=>'org.apache.ws.commons.axiom', :version=>'1.2.4')
 AXIS_OF_WS = [AXIOM, AXIS2]
-OPENJPA = ['org.apache.openjpa:openjpa-all:jar:0.9.7',
+OPENJPA = ['org.apache.openjpa:openjpa:jar:1.2.0',
   'net.sourceforge.serp:serp:jar:1.12.0']
  
 repositories.remote << 'http://www.ibiblio.org/maven2/'
@@ -44,7 +44,7 @@ define 'killer-app' do
 
   desc 'What our users see'
   define 'la-web' do
-    test.using AXIS_OF_WS
+    test.with AXIS_OF_WS
     package(:war).with :libs=>projects('teh-api', 'teh-impl')
   end
 

data/doc/pages/settings_profiles.textile

@@ -201,7 +201,7 @@ Here's a simple example for handling different environments within the Buildfile
 {{{!ruby
 project 'db-module' do
   db = (environment == 'production' ? 'oracle' : 'hsql')
-  resources.from(_(:source, :main, db))
+  resources.from(_("src/main/#{db}"))
 end
 }}}
 
@@ -244,7 +244,7 @@ Here's a simple example for a buildfile that uses the profile information:
 project 'db-module' do
   # Copy SQL files specific for the database we're using,
   # for example, everything under src/main/hsql.
-  resources.from(_(:source, :main, profile['db']))
+  resources.from(_("src/main/#{Buildr.settings.profile['db']}"))
   # Set the JDBC URL in copied resource files (config.xml needs this).
   resources.filter :jdbc=>profile['jdbc']
 end

data/doc/pages/testing.textile

@@ -195,7 +195,7 @@ 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.
 

data/doc/pages/whats_new.textile

@@ -1,5 +1,16 @@
 h1.  What's New
 
+h2.  Buildr 1.3.3
+
+* Support for "JtestR":http://jtestr.codehaus.org/ test framework.
+* Support for "Emma":http://emma.sourceforge.net/ code coverage tool.
+* Growl notifications (OS X only).
+* Starting with this release you can use the @build.yml@ file to control versions of various 3rd party libraries, e.g. Ant, JUnit, ScalaCheck.
+* The _release_ task now supports alternative SVN repository layouts. Releases are tagged in SVN using the version number, but you can customize the tag name (see @Releases.tag_name@). The @NEXT_VERSION@ constant is no longer used during the release process.
+* This release is tested against JRuby 1.1.3 and JRuby 1.1.4. There are also some improvements towards Ruby 1.9 support.
+* 27 other bug fixes and minor changes, see the "CHANGELOG":changelog.html for full details.
+
+
 h2.  Buildr 1.3.2
 
 * New @--prereqs@ command line argument lists all the tasks and their dependencies. You can also filter specific tasks by following with a regular expression, for example, @--prereqs foo@.
@@ -13,6 +24,7 @@ h2.  Buildr 1.3.2
 * Fixed: BUILDR-100 Directory structure documentation needs updating.
 * Fixed: Installation instructions updated for RubyGems 1.2.0.
 
+
 h2.  Buildr 1.3.1
 
 * Fixed to specific Gem dependencies, so should install cleanly on Windows.

data/doc/site.haml

@@ -25,6 +25,7 @@
       @import 'css/print.css';
       \#header { display: none } 
     %meta{ :name=>'subject', :content=>'Official Buildr documentation from the people in the know' }
+    %link{ :rel=>'shortcut icon', :href=>'images/favicon.png'}
   %body
     #wrap
       #header

data/lib/buildr.rb

@@ -14,12 +14,13 @@
 # the License.
 
 module Buildr
-  VERSION = '1.3.3'.freeze
+  VERSION = '1.3.4'.freeze
 end
 
 require 'buildr/core'
 require 'buildr/packaging'
 require 'buildr/java'
+require 'buildr/scala'
 require 'buildr/ide'
 
 # Methods defined in Buildr are both instance methods (e.g. when included in Project)
@@ -30,6 +31,3 @@ class << self ; include Buildr ; end
 class Object #:nodoc:
   Buildr.constants.each { |c| const_set c, Buildr.const_get(c) unless const_defined?(c) }
 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'
+      @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,206 @@ module Buildr
       end
     end
 
-  private
-
-    # 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
+  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
 
-    # 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 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
+
+    def handle_options
+      options.rakelib = ['tasks']
+
+      opts = OptionParser.new
+      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) }
+      parsed_argv = opts.parse(ARGV)
+      parsed_argv
+    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 +429,37 @@ 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', original_dir)]
+      files += Dir[File.expand_path('tasks/*.rake')]
       files.each do |file|
         unless $LOADED_FEATURES.include?(file)
           load file
@@ -305,42 +470,61 @@ 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
   
   
@@ -357,10 +541,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 +579,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 +605,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)
@@ -486,4 +641,4 @@ module Rake #:nodoc
       end
     end
   end
-end
+end