buildr 0.22.0 → 1.0.0

data/CHANGELOG

@@ -1,3 +1,14 @@
+1.0.0 (5/4/2007)
+* Added: buildr:freeze and buildr:unfreeze task. These set the Rakefile to use a particular version of Buildr, freezing by setting to the current version of Buildr, unfreeze to use the latest Gem.
+* Added: Buildr.options, with three options to start with: test, debug and parallel.
+* Added: Buildr.option.debug or environment variable DEBUG to control the compiler debug option. Defaults to yes, except when doing a release.
+* Changed: Buildr now fails nicely if JAVA_HOME not set.
+* Changed: Migrated test cases to RSpec 0.9.
+* Changed: Extended circular dependency check to multitask.
+* Changed: JavaCC using RJB.
+* Changed: OpenJPA 0.9.7 no longer snapshoted.
+* Fixed: For Windows users: user's home directory, fu_check_options is now rake_check_options, java command works around funky system bbug.
+
 0.22 (4/26/2007)
 * Added: Calling projects(:in=>foo) returns only the sub-projects defined in foo.
 * Added: _() as shortcut for path_to().

data/LICENSE

@@ -1,202 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2006-2007, Intalio Inc.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-

data/lib/buildr.rb

@@ -30,7 +30,7 @@ end
 
 
 module Buildr
-  VERSION = "0.22.0"
+  VERSION = "1.0.0"
 end
 
 $LOAD_PATH.unshift __DIR__
@@ -54,13 +54,12 @@ class Project ; include Buildr ; end
 require "builder"
 
 module Buildr
-  @loaded_features_to_ignore = $LOADED_FEATURES +
-    [Pathname.new(File.expand_path(__FILE__)).relative_path_from(Pathname.new(Dir.pwd)).to_s]
+  @loaded_features_to_ignore = $LOADED_FEATURES
 end
 
 # Load the settings files.
-[ File.expand_path("buildr.rake", ENV["HOME"] || "~"), File.expand_path("buildr.rake") ].each { |file| load file if File.exist?(file) }
-[ File.expand_path("buildr.rb", ENV["HOME"] || "~"), File.expand_path("buildr.rb") ].each do |file|
+[ File.expand_path("buildr.rake", Gem::user_home), File.expand_path("buildr.rake") ].each { |file| load file if File.exist?(file) }
+[ File.expand_path("buildr.rb", Gem::user_home), File.expand_path("buildr.rb") ].each do |file|
   if File.exist?(file)
     warn "Please use #{file.ext('rake')} instead of #{file}"
     require file

data/lib/buildr/javacc.rb

@@ -5,33 +5,35 @@ module Buildr
 
     REQUIRES = [ "net.java.dev.javacc:javacc:jar:4.0", "net.java.dev.javacc:javacc:jar:4.0" ]
 
+    Java.rjb.onload do
+      Java.rjb.classpath << REQUIRES
+    end
+
     class << self
 
       def javacc(*args)
-        options = Hash === args.last ? args.pop.clone : {}
-        options[:verbose] ||= Rake.application.options.trace || false
-        fu_check_options options, *Java::JAVA_OPTIONS + [:output]
+        options = Hash === args.last ? args.pop : {}
+        rake_check_options options, :output
 
-        (options[:classpath] ||= []) << REQUIRES
-        java_args = ["javacc"]
-        java_args << "-OUTPUT_DIRECTORY=#{options[:output]}" if options[:output]
-        java_args += args.flatten.map(&:to_s).collect { |f| File.directory?(f) ? FileList[f + "/**/*.jj"] : f }.flatten
-        java_args << options.reject { |k, v| !Java::JAVA_OPTIONS.include?(k) }
-        Java.java(*java_args)
+        args = args.flatten.map(&:to_s).collect { |f| File.directory?(f) ? FileList[f + "/**/*.jj"] : f }.flatten
+        args.unshift "-OUTPUT_DIRECTORY=#{options[:output]}" if options[:output]
+        Java.rjb do |rjb|
+          rjb.import("org.javacc.parser.Main").mainProgram(args) == 0 or
+            fail "Failed to run JavaCC, see errors above."
+        end
       end
 
       def jjtree(*args)
-        options = Hash === args.last ? args.pop.clone : {}
-        options[:verbose] ||= Rake.application.options.trace || false
-        fu_check_options options, *Java::JAVA_OPTIONS + [:output, :build_node_files]
+        options = Hash === args.last ? args.pop : {}
+        rake_check_options options, :output, :build_node_files
 
-        (options[:classpath] ||= []) << REQUIRES
-        java_args = ["jjtree"]
-        java_args << "-OUTPUT_DIRECTORY=#{options[:output]}" if options[:output]
-        java_args << "-BUILD_NODE_FILES=#{options[:build_node_files] || false}"
-        java_args += args.flatten.map(&:to_s).collect { |f| File.directory?(f) ? FileList[f + "/**/*.jjt"] : f }.flatten
-        java_args << options.reject { |k, v| !Java::JAVA_OPTIONS.include?(k) }
-        Java.java(*java_args)
+        args = args.flatten.map(&:to_s).collect { |f| File.directory?(f) ? FileList[f + "**/*.jjt"] : f }.flatten
+        args.unshift "-OUTPUT_DIRECTORY=#{options[:output]}" if options[:output]
+        args.unshift "-BUILD_NODE_FILES=#{options[:build_node_files] || false}"
+        Java.rjb do |rjb|
+          rjb.import("org.javacc.jjtree.JJTree").new.main(args) == 0 or
+            fail "Failed to run JJTree, see errors above."
+        end
       end
 
     end

data/lib/buildr/jetty.rb

@@ -3,6 +3,7 @@ require "net/http"
 require "core/project"
 require "java/artifact"
 require "java/java"
+require "thread"
 
 module Buildr
 
@@ -69,16 +70,13 @@ module Buildr
     # Starts Jetty. This method does not return, it keeps the thread running until
     # Jetty is stopped. If you want to run Jetty parallel with other tasks in the build,
     # invoke the #use task instead.
-    def start(pipe = nil)
+    def start(sync = nil)
       begin
         Java.rjb do
           port = URI.parse(url).port
-          puts "Starting Jetty at http://localhost:#{port}"
+          puts "Starting Jetty at http://localhost:#{port}" if verbose
           jetty = Rjb::import("JettyWrapper").new(port)
-          if pipe
-            pipe.puts "Started"
-            pipe.close
-          end
+          sync << "Started" if sync
           sleep # Forever
         end
       rescue Interrupt # Stopped from console
@@ -118,7 +116,7 @@ module Buildr
           response = http.request_get("/buildr/")
           response.is_a?(Net::HTTPSuccess) && response.body =~ /Alive/
         end
-      rescue Errno::ECONNREFUSED
+      rescue Errno::ECONNREFUSED, Errno::EBADF 
         false
       end
     end
@@ -199,17 +197,12 @@ module Buildr
     # take jetty:start), it will use the existing instance without shutting it down.
     def fire()
       unless running?
-        reader, writer = IO.pipe
-        if pid = fork
-          # Wait for Jetty to fire up before doing anything else.
-          if reader.gets == "Started"
-            puts "Jetty started"
-            reader.close
-          end
-          at_exit { stop }
-        else
-          start writer
-        end
+        sync = Queue.new
+        Thread.new { start sync }
+        # Wait for Jetty to fire up before doing anything else.
+        sync.pop == "Started" or fail "Jetty not started"
+        puts "Jetty started" if verbose
+        at_exit { stop }
       end
       @setup.invoke
       at_exit { @teardown.invoke }

data/lib/buildr/openjpa.rb

@@ -3,7 +3,7 @@ require "java/java"
 module Buildr
   module OpenJPA
 
-    VERSION = "0.9.7-incubating-SNAPSHOT"
+    VERSION = "0.9.7-incubating"
 
     REQUIRES = [ "org.apache.openjpa:openjpa-all:jar:#{VERSION}",
       "commons-collections:commons-collections:jar:3.1",
@@ -18,8 +18,8 @@ module Buildr
     class << self
 
       def enhance(options)
-        fu_check_options options, :classpath, :properties, :output
-        artifacts = Buildr.artifacts(options[:classpath] || []).each { |a| a.invoke }.map(&:to_s) + [options[:output].to_s]
+        rake_check_options options, :classpath, :properties, :output
+        artifacts = Buildr.artifacts(options[:classpath]).each { |a| a.invoke }.map(&:to_s) + [options[:output].to_s]
         properties = file(options[:properties]).tap { |task| task.invoke }.to_s
 
         Ant.executable("openjpa") do |ant|
@@ -33,18 +33,18 @@ module Buildr
       end
 
       def mapping_tool(options)
-        fu_check_options options, :classpath, :properties, :sql, :action
+        rake_check_options options, :classpath, :properties, :sql, :action
         Java.java "org.apache.openjpa.jdbc.meta.MappingTool", "-p", options[:properties].to_s, "-sql", options[:sql],
           "-sa", options[:action], :classpath=>Buildr.artifacts(options[:classpath], requires), :name=>"Mapping Tool"
-=begin
         # Hopefully this will work in a future release.
-        artifacts = Buildr.artifacts(options[:classpath] || []).each{ |a| a.invoke }.map(&:to_s) + requires
-        properties = file(options[:properties]).tap { |task| task.invoke }.to_s
+=begin
+        artifacts = Buildr.artifacts(options[:classpath]).each{ |a| a.invoke }.map(&:to_s) + requires
+        properties = file(options[:properties].to_s).tap { |task| task.invoke }.to_s
 
         Ant.executable("openjpa") do |ant|
           ant.taskdef :name=>"mapping", :classname=>"org.apache.openjpa.jdbc.ant.MappingToolTask",
             :classpath=>requires.join(File::PATH_SEPARATOR)
-          ant.mapping :schemaAction=>options[:action], :sqlFile=>options[:sql].to_s do
+          ant.mapping :schemaAction=>options[:action], :sqlFile=>options[:sql].to_s, :ignoreErrors=>"true" do
             config :propertiesFile=>properties
             classpath :path=>artifacts.join(File::PATH_SEPARATOR)
           end

data/lib/buildr/xmlbeans.rb

@@ -11,7 +11,7 @@ module Buildr
       def compile(*args)
         options = Hash === args.last ? args.pop : {}
         options[:verbose] ||= Rake.application.options.trace || false
-        fu_check_options options, :verbose, :noop, :javasource, :jar, :compile, :output, :xsb
+        rake_check_options options, :verbose, :noop, :javasource, :jar, :compile, :output, :xsb
         puts "Running XMLBeans schema compiler" if verbose
         Ant.executable("xmlbeans") do |ant|
           ant.taskdef :name=>"xmlbeans", :classname=>"org.apache.xmlbeans.impl.tool.XMLBean",

data/lib/core/build.rb

@@ -1,4 +1,3 @@
-require "open3"
 require "core/project"
 
 module Buildr
@@ -20,6 +19,37 @@ module Buildr
     Project.on_define { |project| project.recursive_task name }
   end
 
+
+  # Collection of options for controlling Buildr. For example for running builds without running
+  # test cases, or running builds in parallel.
+  class Options
+
+    # Runs the build in parallel when true (defaults to false). You can force a parallel build by
+    # setting this option directly, or by running the parallel task ahead of the build task.
+    #
+    # This option only affects recurvise tasks. For example:
+    #   rake parallel package
+    # will run all package tasks (from the sub-projects) in parallel, but each sub-project's package
+    # task runs its child tasks (prepare, compile, resources, etc) in sequence.
+    attr_accessor :parallel
+
+  end
+
+  class << self
+
+    # :call-seq:
+    #   options() => Options
+    #
+    # Returns the Buildr options. See Options.
+    def options()
+      @options ||= Options.new
+    end
+
+  end
+
+  task("parallel") { Buildr.options.parallel = true }
+
+
   class Project
 
     # :call-seq:
@@ -59,7 +89,7 @@ module Buildr
       # Make a release.
       def make()
         check
-        version = with_next_version { |filename, version| sh "rake deploy --rakefile #{filename}" }
+        version = with_next_version { |filename, version| sh "rake clean deploy DEBUG=no --rakefile #{filename}" }
         tag version
         commit version + "-SNAPSHOT"
       end
@@ -176,4 +206,24 @@ module Buildr
   task "release" do |task|
     Release.make
   end
+
+
+  namespace "buildr" do
+
+    desc "Freezes the Rakefile so it always uses Buildr version #{Buildr::VERSION}"
+    task "freeze" do
+      gem = %Q{gem "buildr", "#{Buildr::VERSION}"}
+      rakefile = read(Rake.application.rakefile)
+      puts "Freezing the Rakefile so it always uses Buildr version #{Buildr::VERSION}"
+      write Rake.application.rakefile, rakefile =~ /gem\s*(["'])buildr\1/ ?
+        rakefile.sub(/gem\s*(["'])buildr\1\s*,\s*(["']).*\2/, gem) : gem + "\n" + rakefile
+    end
+
+    desc "Unfreezes the Rakefile to use the latest version of Buildr"
+    task "unfreeze" do
+      puts "Unfreezing the Rakefile to use the latest version of Buildr from your Gems repository"
+      write Rake.application.rakefile, read(Rake.application.rakefile).sub(/^\s*gem\s*(["'])buildr\1.*\n/, "")
+    end
+
+  end
 end

data/lib/core/common.rb

@@ -35,9 +35,9 @@ module Buildr
   # For example:
   #   write("README") { read("README").sub("${build}", Time.now) }
   def write(name, content = nil)
-    mkpath File.dirname(name)
+    mkpath File.dirname(name), :verbose=>false
     content = yield if block_given?
-    File.open(name.to_s, "w") { |file| file.write content.to_s }
+    File.open(name.to_s, "wb") { |file| file.write content.to_s }
     content.to_s
   end
 
@@ -52,10 +52,11 @@ module Buildr
   #   puts read("README")
   #   read("README") { |text| puts text }
   def read(name)
+    contents = File.open(name.to_s) { |f| f.read }
     if block_given?
-      yield File.read(name.to_s)
+      yield contents
     else
-      File.read(name.to_s)
+      contents
     end
   end
 

data/lib/core/project.rb

@@ -162,6 +162,7 @@ module Buildr
       # See Buildr#projects.
       def projects(*names) #:nodoc:
         options = names.pop if Hash === names.last
+        rake_check_options options, :in if options
         @projects ||= {}
         names = @projects.keys if names.empty?
         if options && options[:in]
@@ -448,7 +449,7 @@ module Buildr
     def recursive_task(args, &block)
       task_name, deps = Rake.application.resolve_args(args)
       deps = [deps] unless deps.respond_to?(:to_ary)
-      task = ENV["PARALLEL"] =~ /(yes|on|true)/ ? multitask(task_name) : task(task_name)
+      task = Buildr.options.parallel ? multitask(task_name) : task(task_name)
       Rake.application.lookup(task_name, parent.name.split(":")).enhance [task] if parent
       task.enhance deps, &block
     end

data/lib/core/rake_ext.rb

@@ -2,9 +2,8 @@ module Rake #:nodoc:
   class Task
 
     def invoke #:nodoc:
-      tasks = (Thread.current[:tasks] || [])
-      if tasks.include?(name)
-        fail "Circular dependency " + (tasks + [name]).join("=>")
+      if stack.include?(name)
+        fail "Circular dependency " + (stack + [name]).join("=>")
       end
       @lock.synchronize do
         if application.options.trace
@@ -12,12 +11,12 @@ module Rake #:nodoc:
         end
         return if @already_invoked
         begin
-          Thread.current[:tasks] = tasks + [name]
+          stack.push name
           @already_invoked = true
           invoke_prerequisites
           execute if needed?
         ensure
-          Thread.current[:tasks] = tasks
+          stack.pop
         end
       end
     end
@@ -26,6 +25,22 @@ module Rake #:nodoc:
       prerequisites.each { |n| application[n, @scope].invoke }
     end
 
+  protected
+
+    def stack()
+      Thread.current[:rake_stack] ||= []
+    end
+
+  end
+
+  class MultiTask
+    def invoke_prerequisites
+      threads = @prerequisites.collect do |p|
+        copy = stack.dup
+        Thread.new(p) { |r| stack.replace copy ; application[r].invoke }
+      end
+      threads.each { |t| t.join }
+    end
   end
 
   class Application #:nodoc:

data/lib/core/transports.rb

@@ -269,6 +269,7 @@ module Buildr
 
       def initialize(url, options)
         super
+        rake_check_options options, :digests if options
         @http = Net::HTTP.start(@uri.host, @uri.port)
       end
 
@@ -317,7 +318,8 @@ module Buildr
                   # If download breaks we end up with a partial file which is
                   # worse than not having a file at all, so download to temporary
                   # file and then move over.
-                  temp = Tempfile.new(File.basename(target))
+                  temp = Tempfile.open(File.basename(target))
+                  temp.binmode
                   download[ proc { |chunk| temp.write chunk } ]
                   temp.close
                   File.move temp.path, target
@@ -360,6 +362,7 @@ module Buildr
 
       def initialize(url, options)
         super
+        rake_check_options options, :digests, :permissions, :port, :uri, :username, :password
         @permissions = options.delete :permissions
         # SSH options are based on the username/password from the URI.
         ssh_options = { :port=>@uri.port, :username=>@uri.user }.merge(options || {})

data/lib/java/artifact.rb

@@ -162,6 +162,7 @@ module Buildr
         if spec.respond_to?(:to_spec)
           to_hash spec.to_spec
         elsif Hash === spec
+          rake_check_options spec, :id, :group, :type, :classifier, :version
           # Sanitize the hash and check it's valid.
           spec = ARTIFACT_ATTRIBUTES.inject({}) { |h, k| h[k] = spec[k].to_s if spec[k] ; h }
           fail "Missing group identifier for #{spec.inspect}" if spec[:group].blank?
@@ -256,7 +257,7 @@ module Buildr
     #
     # The default path is .m2/repository relative to the home directory.
     def local()
-      @local ||= ENV["local_repo"] || File.join(ENV["HOME"], ".m2/repository")
+      @local ||= ENV["local_repo"] || File.join(Gem::user_home, ".m2/repository")
     end
 
     # :call-seq:

data/lib/java/compile.rb

@@ -49,10 +49,10 @@ module Buildr
 
         # Generate warnings (opposite of -nowarn).
         attr_accessor :warnings
-        inherited_attr :warnings 
+        inherited_attr :warnings, false
         # Output source locations where deprecated APIs are used.
         attr_accessor :deprecation
-        inherited_attr :deprecation
+        inherited_attr :deprecation, false
         # Provide source compatibility with specified release.
         attr_accessor :source
         inherited_attr :source
@@ -62,10 +62,10 @@ module Buildr
         # Values to pass to Xlint: string or array. Use true to enable
         # Xlint with no values.
         attr_accessor :lint
-        inherited_attr :lint
+        inherited_attr :lint, false
         # Generate all debugging info.
         attr_accessor :debug
-        inherited_attr :debug
+        inherited_attr(:debug) { Buildr.options.debug }
         # Array of arguments passed to the Java compiler as is.
         attr_accessor :other
         inherited_attr :other
@@ -557,4 +557,20 @@ module Buildr
     end
   end
 
+
+  class Options
+
+    # Runs the compile in debugging mode when true (default).
+    #
+    # You can turn this option off directly, or by setting the environment variable
+    # DEBUG to "no". For example:
+    #   rake build DEBUG=no
+    #
+    # The release tasks runs a build with <tt>DEBUG=no</tt>.
+    attr_accessor :debug
+
+  end
+
+  options.debug = (ENV["DEBUG"] || ENV["debug"]) !~ /(no|off|false)/
+
 end

data/lib/java/java.rb

@@ -76,7 +76,7 @@ module Buildr
       #   puts Java.version
       #   => 1.5.0_10
       def version()
-        @version ||= `#{path_to_bin("java")} -version 2>&1`.scan(/java version "(.*)"/)[0][0]
+        @version ||= `"#{path_to_bin("java")}" -version 2>&1`.scan(/java version "(.*)"/)[0][0]
       end
 
       # :call-seq:
@@ -85,12 +85,19 @@ module Buildr
       # Returns a path to tools.jar.
       def tools_jar()
         unless @tools
-          home = ENV["JAVA_HOME"] || File.dirname(File.dirname(`which java`.split.first))
           tools = File.join(home, "lib/tools.jar")
           @tools = tools if File.exist?(tools)
         end
         @tools
       end
+  
+      # :call-seq:
+      #   home() => path
+      #
+      # Returns JAVA_HOME.
+      def home()
+        @home ||= ENV["JAVA_HOME"] or fail "Are we forgetting something? JAVA_HOME not set?"
+      end
 
       # :call-seq:
       #   java(class, *args, options?)
@@ -104,22 +111,25 @@ module Buildr
       # * :properties -- Hash of system properties (e.g. "path"=>base_dir).
       # * :name -- Shows this name, otherwise shows the first argument (the class name).
       # * :verbose -- If true, prints the command and all its argument.
-      def java(*args)
+      def java(*args, &block)
         options = Hash === args.last ? args.pop : {}
         options[:verbose] ||= Rake.application.options.trace || false
-        fu_check_options options, *JAVA_OPTIONS
+        rake_check_options options, *JAVA_OPTIONS
 
         name = options[:name] || "java #{args.first}"
-        cmd_args = []
+        cmd_args = [path_to_bin("java")]
         classpath = classpath_from(options)
         cmd_args << "-cp" << classpath.join(File::PATH_SEPARATOR) unless classpath.empty?
         options[:properties].each { |k, v| cmd_args << "-D#{k}=#{v}" } if options[:properties]
         cmd_args += options[:java_args].flatten if options[:java_args]
         cmd_args += args.flatten.compact
-        cmd_args << { :verbose=>options[:verbose] }
         unless Rake.application.options.dryrun
           puts "Running #{name}" if verbose
-          sh(path_to_bin("java"), *cmd_args) { |ok, res| fail "Failed to execute #{name}, see errors above" unless ok }
+          block = lambda { |ok, res| fail "Failed to execute #{name}, see errors above" unless ok } unless block
+          puts cmd_args.join(" ") if Rake.application.options.trace
+          system(cmd_args.map { |arg| %Q{"#{arg}"} }.join(" ")).tap do |ok|
+            block.call ok, $?
+          end
         end
       end
 
@@ -137,7 +147,7 @@ module Buildr
       #   These are all expanded into artifacts, and all tasks are invoked.
       def apt(*args)
         options = Hash === args.last ? args.pop : {}
-        fu_check_options options, :compile, :source, :output, :classpath
+        rake_check_options options, :compile, :source, :output, :classpath
 
         files = args.flatten.map(&:to_s).
           collect { |arg| File.directory?(arg) ? FileList["#{arg}/**/*.java"] : arg }.flatten
@@ -175,7 +185,7 @@ module Buildr
       # * :name -- Shows this name, otherwise shows the working directory.
       def javac(*args)
         options = Hash === args.last ? args.pop : {}
-        fu_check_options options, :classpath, :sourcepath, :output, :javac_args, :name
+        rake_check_options options, :classpath, :sourcepath, :output, :javac_args, :name
 
         files = args.flatten.each { |f| f.invoke if f.respond_to?(:invoke) }.map(&:to_s).
           collect { |arg| File.directory?(arg) ? FileList["#{arg}/**/*.java"] : arg }.flatten
@@ -267,7 +277,7 @@ module Buildr
       def junit(*args)
         options = Hash === args.last ? args.pop : {}
         options[:verbose] ||= Rake.application.options.trace || false
-        fu_check_options options, :verbose, :classpath, :properties
+        rake_check_options options, :verbose, :classpath, :properties
 
         classpath = classpath_from(options) + junit_artifacts
         tests = args.flatten
@@ -315,7 +325,7 @@ module Buildr
       # Returns the path to the specified Java command (with no argument to java itself).
       # Uses JAVA_HOME if set, otherwise assumes the command is accessible from the path.
       def path_to_bin(name = "java")
-        ENV["JAVA_HOME"] ? File.join(ENV["JAVA_HOME"], "bin", name) : name
+        File.join(home, "bin", name)
       end
 
   protected

data/lib/java/packaging.rb

@@ -240,7 +240,7 @@ module Buildr
       packager.call(file_name, options) do |package|
         # Make it an artifact using the specifications, and tell it how to create a POM.
         package.extend ActsAsArtifact
-        package.send :apply_spec, options
+        package.send :apply_spec, Hash[*Artifact::ARTIFACT_ATTRIBUTES.map { |k| [ k,options[k]] }.flatten]
         # Another task to create the POM file.
         pom_spec = package.to_spec_hash.merge(:type=>:pom)
         pom = file(Buildr.repositories.locate(pom_spec))
@@ -310,7 +310,7 @@ module Buildr
 
     def package_as_jar(file_name, options) #:nodoc:
       unless Rake::Task.task_defined?(file_name)
-        fu_check_options options, *PACKAGE_OPTIONS + [:manifest, :meta_inf, :include]
+        rake_check_options options, *PACKAGE_OPTIONS + [:manifest, :meta_inf, :include]
         Java::Packaging::JarTask.define_task(file_name).tap do |jar|
           jar.manifest = options.has_key?(:manifest) ? options[:manifest] : manifest
           jar.meta_inf = options[:meta_inf] || meta_inf
@@ -323,14 +323,14 @@ module Buildr
           yield jar
         end
       else
-        fu_check_options options, *PACKAGE_OPTIONS
+        rake_check_options options, *PACKAGE_OPTIONS
       end
       file(file_name)
     end
 
     def package_as_war(file_name, options) #:nodoc:
       unless Rake::Task.task_defined?(file_name)
-        fu_check_options options, *PACKAGE_OPTIONS + [:manifest, :meta_inf, :classes, :libs, :include]
+        rake_check_options options, *PACKAGE_OPTIONS + [:manifest, :meta_inf, :classes, :libs, :include]
         Java::Packaging::WarTask.define_task(file_name).tap do |war|
           war.manifest = options.has_key?(:manifest) ? options[:manifest] : manifest
           war.meta_inf = options[:meta_inf] || meta_inf
@@ -356,14 +356,14 @@ module Buildr
           yield war
         end
       else
-        fu_check_options options, *PACKAGE_OPTIONS
+        rake_check_options options, *PACKAGE_OPTIONS
       end
       file(file_name)
     end
 
     def package_as_zip(file_name, options) #:nodoc:
       unless Rake::Task.task_defined?(file_name)
-        fu_check_options options, *PACKAGE_OPTIONS + [:include]
+        rake_check_options options, *PACKAGE_OPTIONS + [:include]
         ZipTask.define_task(file_name).tap do |zip|
           if options[:include]
             zip.include options[:include]
@@ -371,7 +371,7 @@ module Buildr
           yield zip
         end
       else
-        fu_check_options options, *PACKAGE_OPTIONS
+        rake_check_options options, *PACKAGE_OPTIONS
       end
       file(file_name)
     end

data/lib/java/test.rb

@@ -322,10 +322,28 @@ module Buildr
       each(&:invoke)
   end
 
-  # Require tests after build unless TEST option is off.
-  # For example:
-  #   rake build
-  #   rake build TEST=off
-  task("build") { task("test").invoke } unless ENV["TEST"] =~ /(off|false|no)/
+
+  class Options
+
+    # Runs test cases after the build when true (default). This forces test cases to execute
+    # after the build, including when running build related tasks like install, deploy and release.
+    #
+    # You can skip test cases by turning this option off directly, or by setting the environment
+    # variable TEST to "no". For example:
+    #   rake build          # With tests
+    #   rake build TEST=no  # Without tests
+    attr_accessor :test
+
+  end
+
+  options.test = (ENV["TEST"] || ENV["test"]) !~ /(no|off|false)/
+
+  task("build") do |task|
+    # Make sure this happens as the last action on the build, so all other enhancements
+    # are made to run before starting the test cases.
+    task.enhance do
+      task("test").invoke if Buildr.options.test
+    end
+  end
 
 end

data/lib/tasks/concat.rb

@@ -14,7 +14,7 @@ module Buildr
           content << File.read(prereq.to_s) if File.exists?(prereq) && !File.directory?(prereq)
           content
         end
-        File.open(task.name, "w") { |file| file.write content }
+        File.open(task.name, "wb") { |file| file.write content }
       end
     end
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: buildr
 version: !ruby/object:Gem::Version 
-  version: 0.22.0
-date: 2007-04-26 00:00:00 -07:00
+  version: 1.0.0
+date: 2007-05-04 00:00:00 -07:00
 summary: A build system that doesn't suck
 require_paths: 
 - lib
@@ -94,34 +94,34 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
+        version: 1.8.54
     version: 
 - !ruby/object:Gem::Dependency 
   name: builder
   version_requirement: 
   version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 2.0.0
+        version: 2.1.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh
   version_requirement: 
   version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 1.0.0
+        version: 1.1.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: net-sftp
   version_requirement: 
   version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         version: 1.1.0
     version: 
@@ -130,16 +130,16 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.0
+        version: 0.9.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: highline
   version_requirement: 
   version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         version: 1.2.7
     version: 
@@ -148,7 +148,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         version: 1.0.3
     version: 
@@ -157,7 +157,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 0.5.0
+        version: 0.5.2
     version: