buildr 1.0.0 → 1.1.0

data/CHANGELOG

@@ -1,3 +1,20 @@
+1.1.0 (5/13/2007)
+* Added: Proxy setting for downloading from remote repositories (use repositories.proxy = ...).
+* Added: projects task to list all the projects you can build.
+* Added: Project attribute target to specify the target directory.
+* Changed: The project and projects methods now accepts relative names when called on a project. For example, project("foo").project("bar") finds the sub-project "bar" in "foo".
+* Changed: The project method now returns self if called on a method with no name.
+* Changed: The -warning flag (javac) is now set to true only when verbose.
+* Changed: OpenJPA mapping now using Ant task instead of spawning another Java instance.
+* Changed: The test:name pattern translates to *name* so you can run tests by package name, but only if you don't use * in the pattern.
+* Changed: All projects are not evaluated when referenced (i.e. calling project/projects) or before running any task. Project tasks do not exist until a projet is evaluated.
+* Removed: The projects method no longer accepts the :in argument, call projects on a project instead.
+* Fixed: Local directory tasks now work from any directory in the project.
+* Fixed: Artifacts no longer created with timestamp from server.
+* Fixed: Buildr no longer fails when run without tools.jar or JAVA_HOME (OS/X). (Credit Lyle Johnson)
+* Fixed: Manifest gets EOL to keep EOF company. (Credit Tommy Knowlton)
+* Fixed: Compile tasks clean after themselves when target directory changed. (Credit Lyle Johnson)
+
 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.

data/LICENSE

@@ -0,0 +1,202 @@
+                                 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/README

@@ -11,7 +11,7 @@ http://buildr.rubyforge.org
 
 === RTFM:
 
-* Buildr documentation: http://buildr.rubyforge.org/rdoc
+* Buildr documentation: http://buildr.rubyforge.org
 * More about Rake: http://docs.rubyrake.org
 * Antwrap documentation: http://antwrap.rubyforge.org
 
@@ -52,7 +52,7 @@ To install:
 == Living On the Edge
 
 You can check the latest sources from SVN:
-  svn co svn://www.intalio.org/usr/local/svn/repos/buildr/trunk buildr
+  svn co http://www.intalio.org/buildr/trunk/ buildr
 Or browse the SVN repository online: http://blog.intalio.org/viewrep/Buildr
 
 To install Buildr locally from source, do:

data/lib/buildr.rb

@@ -19,6 +19,8 @@ require "facet/array/head"
 require "facet/string/starts_with"
 require "facet/openobject"
 require "facets/core/kernel/tap"
+# A different kind of buildr, one we use to create XML.
+require "builder"
 
 
 module Kernel #:nodoc:
@@ -30,7 +32,7 @@ end
 
 
 module Buildr
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end
 
 $LOAD_PATH.unshift __DIR__
@@ -49,10 +51,6 @@ class Object ; Buildr.constants.each { |c| const_set c, Buildr.const_get(c) unle
 class Project ; include Buildr ; end
 
 
-# The greate method_missing/Object extend bug requires us to load
-# XMLBuilder after we're done enhancing Object.
-require "builder"
-
 module Buildr
   @loaded_features_to_ignore = $LOADED_FEATURES
 end
@@ -73,3 +71,5 @@ Dir["#{Dir.pwd}/tasks/*.rake"].each do |file|
     $LOADED_FEATURES << file
   end
 end
+
+

data/lib/buildr/javacc.rb

@@ -5,9 +5,7 @@ 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
+    Java.rjb.classpath << REQUIRES
 
     class << self
 
@@ -45,7 +43,7 @@ module Buildr
       else
         in_package = []
       end
-      file(path_to("target/generated/javacc")=>args.flatten) do |task|
+      file(path_to(:target, "generated/javacc")=>args.flatten) do |task|
         JavaCC.javacc task.prerequisites, :output=>File.join(task.name, in_package)
       end         
     end
@@ -58,7 +56,7 @@ module Buildr
       else
         in_package = []
       end
-      file(path_to("target/generated/jjtree")=>args.flatten) do |task|
+      file(path_to(:target, "generated/jjtree")=>args.flatten) do |task|
         JavaCC.jjtree task.prerequisites, :output=>File.join(task.name, in_package), :build_node_files=>build_node_files
       end         
     end

data/lib/buildr/jetty.rb

@@ -43,10 +43,7 @@ module Buildr
                  "org.mortbay.jetty:servlet-api-2.5:jar:6.1.1", "log4j:log4j:jar:1.2.13",
                  "commons-logging:commons-logging:jar:1.1" ]
 
-    Java.rjb.onload do
-      Java.rjb.classpath << REQUIRES
-      Java.rjb.classpath << File.join(__DIR__, "jetty")
-    end
+    Java.rjb.classpath << REQUIRES << File.join(__DIR__, "jetty")
 
     # Default URL for Jetty.
     URL = "http://localhost:8080"

data/lib/buildr/openjpa.rb

@@ -15,6 +15,8 @@ module Buildr
       "org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec:jar:1.0",
       "net.sourceforge.serp:serp:jar:1.11.0" ]
 
+    Java.rjb.classpath << REQUIRES
+
     class << self
 
       def enhance(options)
@@ -34,11 +36,7 @@ module Buildr
 
       def mapping_tool(options)
         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"
-        # Hopefully this will work in a future release.
-=begin
-        artifacts = Buildr.artifacts(options[:classpath]).each{ |a| a.invoke }.map(&:to_s) + requires
+        artifacts = Buildr.artifacts(options[:classpath]).each{ |a| a.invoke }.map(&:to_s)
         properties = file(options[:properties].to_s).tap { |task| task.invoke }.to_s
 
         Ant.executable("openjpa") do |ant|
@@ -49,13 +47,12 @@ module Buildr
             classpath :path=>artifacts.join(File::PATH_SEPARATOR)
           end
         end
-=end
       end
 
     private
 
       def requires()
-        @required ||= Buildr.artifacts(REQUIRES).each { |artifact| artifact.invoke }.map(&:to_s)
+        @requires ||= Buildr.artifacts(REQUIRES).each { |artifact| artifact.invoke }.map(&:to_s)
       end
 
     end

data/lib/buildr/xmlbeans.rb

@@ -35,7 +35,7 @@ module Buildr
 
     def compile_xml_beans(*args)
       # Generate sources and add them to the compile task.
-      generated = file(path_to("target/generated/xmlbeans")=>FileList[args.flatten]) do |task|
+      generated = file(path_to(:target, "generated/xmlbeans")=>FileList[args.flatten]) do |task|
         XMLBeans.compile task.prerequisites, :output=>task.name,
           :javasource=>compile.options.source, :xsb=>compile.target
       end

data/lib/core/build.rb

@@ -52,6 +52,17 @@ module Buildr
 
   class Project
 
+    # The target directory. By default, it's the target directory inside the project. Various tasks
+    # use it to determine where to place files, e.g. when compiling or packaging. The clean task
+    # nukes it.
+    def target()
+      @target ||= _("target")
+    end
+
+    def target=(dir)
+      @target = _(dir)
+    end
+
     # :call-seq:
     #    build(*prereqs) => task
     #    build { |task| .. } => task
@@ -72,6 +83,10 @@ module Buildr
 
   end
 
+  Project.on_define do |project|
+    project.clean { verbose(false) { rm_rf project.path_to(:target) } }
+  end
+
   desc "The default task it build"
   task "default"=>"build"
 

data/lib/core/common.rb

@@ -273,5 +273,5 @@ module Buildr
   def filter(source)
     Filter.new.from(source)
   end
-
+  
 end

data/lib/core/project.rb

@@ -90,12 +90,11 @@ module Buildr
   #   |  |__classes        <-- Generated when compiling
   #   |  |__test-classes   <-- Generated when compiling tests
   #
-  # You can only define a project once using #define. Afterwards, you
-  # can obtain the project definition using #project. However, when
-  # working with sub-projects, one project may reference another ahead
-  # of its definition: the sub-project definitions are then evaluated
-  # based on their dependencies with each other. Circular dependencies
-  # are not allowed.
+  # You can only define a project once using #define. Afterwards, you can obtain the project
+  # definition using #project. The order in which you define projects is not important,
+  # project definitions are evaluated when you ask for them. Circular dependencies will not
+  # work. Rake tasks are only created after the project is evaluated, so if you need to access
+  # a task (e.g. compile) use <code>project("foo").compile</code> instead of <code>task("foo:compile")</code>.
   #
   # For example:
   #   define "myapp", :version=>"1.1" do
@@ -121,6 +120,9 @@ module Buildr
 
     class << self
 
+      # :call-seq:
+      #   define(name, properties?) { |project| ... } => project
+      #
       # See Buildr#define.
       def define(name, properties, &block) #:nodoc:
         # Make sure a sub-project is only defined within the parent project,
@@ -145,34 +147,62 @@ module Buildr
           # Top-level project? Invoke the project definition. Sub-project? We don't invoke
           # the project definiton yet (allow project() calls to establish order of evaluation),
           # but must do so before the parent project's definition is done. 
-          if project.parent
-            project.parent.enhance { project.invoke }
-          else
-            project.invoke
-          end
+          project.parent.enhance { project.invoke } if project.parent
         end
       end
 
+      # :call-seq:
+      #   project(name) => project
+      #
       # See Buildr#project.
-      def project(name) #:nodoc:
-        @projects && @projects[name] or raise "No such project #{name}"
-        @projects[name].tap { |project| project.invoke }
+      def project(*args) #:nodoc:
+        options = args.pop if Hash === args.last
+        rake_check_options options, :scope if options
+        raise ArgumentError, "Only one project name at a time" unless args.size == 1
+        @projects ||= {}
+        name = args.first
+        if options && options[:scope]
+          # We assume parent project is evaluated.
+          project = options[:scope].split(":").inject([[]]) { |scopes, scope| scopes << (scopes.last + [scope]) }.
+            map { |scope| @projects[(scope + [name]).join(":")] }.
+            select { |project| project }.last
+        end
+        unless project
+          # Parent project not evaluated.
+          name.split(":").tap { |parts| @projects[parts.first].invoke if parts.size > 1 }
+          project = @projects[name]
+        end
+        raise "No such project #{name}" unless project
+        project.invoke
+        project
       end
 
+      # :call-seq:
+      #   projects(*names) => projects
+      #
       # See Buildr#projects.
       def projects(*names) #:nodoc:
         options = names.pop if Hash === names.last
-        rake_check_options options, :in if options
+        rake_check_options options, :scope if options
         @projects ||= {}
-        names = @projects.keys if names.empty?
-        if options && options[:in]
-          parent = @projects[options[:in].to_s] or raise "No such project #{options[:in].to_s}"
-          names.uniq.map { |name| @projects[name] or raise "No such project #{name}" }.
-            select { |project| project.parent == parent }.
-            each { |project| project.invoke }.sort_by(&:name)
+        if options && options[:scope]
+          # We assume parent project is evaluated.
+          if names.empty?
+            parent = @projects[options[:scope]] or raise "No such project #{options[:scope]}"
+            @projects.values.select { |project| project.parent == parent }.      
+              each { |project| project.invoke }.sort_by(&:name)
+          else
+            names.uniq.map { |name| project(name, :scope=>options[:scope]) }
+          end
+        elsif names.empty?
+          # Parent project(s) not evaluated so we don't know all the projects yet.
+          @projects.values.each(&:invoke)
+          @projects.keys.map { |name| project(name) or raise "No such project #{name}" }.sort_by(&:name)
         else
+          # Parent project(s) not evaluated, for the sub-projects we may need to find.
+          names.map { |name| name.split(":") }.select { |name| name.size > 1 }.map(&:first).uniq.each { |name| project(name) }
           names.uniq.map { |name| project(name) or raise "No such project #{name}" }.sort_by(&:name)
-        end  
+        end
       end
 
       # :call-seq:
@@ -207,7 +237,7 @@ module Buildr
       # and returns a message that, for example "Building project #{name}".
       def local_task(args, &block)
         task args do |task|
-          projects = Project.projects.select { |project| project.base_dir == Rake.application.original_dir }
+          projects = local_projects
           if projects.empty?
             warn "No projects defined for directory #{Rake.application.original_dir}" if verbose
           else
@@ -237,22 +267,20 @@ module Buildr
         (@on_define ||= []) << block if block
       end
 
-      def warnings() #:nodoc:
-        [].tap do |msgs|
-          msgs << "There are no project definitions in your Rakefile" if @projects.nil? || @projects.empty?
-          # Find all projects that:
-          # * Are referenced but never defined. This is probably a typo.
-          # * Do not have a base directory.
-          (@projects || {}).each do |name, project|
-            msgs << "Project #{name} refers to the directory #{project.base_dir}, which does not exist" unless File.exist?(project.base_dir)
-          end
-        end
-      end
-
       def scope_name(scope, task_name) #:nodoc:
         task_name
       end
 
+      def local_projects(dir = Rake.application.original_dir) #:nodoc:
+        dir = File.expand_path(dir)
+        projects = Project.projects.select { |project| project.base_dir == dir }
+        if projects.empty? && dir != Dir.pwd && File.dirname(dir) != dir
+          local_projects(File.dirname(dir))
+        else
+          projects
+        end
+      end
+
     end
 
     include InheritedAttributes
@@ -297,9 +325,7 @@ module Buildr
         if @parent
           # For sub-project, a good default is a directory in the parent's base_dir,
           # using the same name as the project.
-          sub_dir = File.join(@parent.base_dir, name.split(":").last)
-          @base_dir = File.exist?(sub_dir) ? sub_dir : @parent.base_dir
-          @base_dir = sub_dir
+          @base_dir = File.join(@parent.base_dir, name.split(":").last)
         else
           # For top-level project, a good default is the directory where we found the Rakefile.
           @base_dir = Dir.pwd
@@ -356,18 +382,41 @@ module Buildr
 
     # :call-seq:
     #   project(name) => project
+    #   project => self
+    #
+    # Same as Buildr#project. This method is called on a project, so a relative name is
+    # sufficient to find a sub-project.
     #
-    # Same as Buildr#project.
-    def project(name)
-      Project.project(name)
+    # When called on a project without a name, returns the project itself. You can use that when
+    # setting project properties, for example:
+    #   define "foo" do
+    #     project.version = "1.0"
+    #   end
+    def project(*args)
+      if Hash === args.last
+        options = args.pop
+      else
+        options = {}
+      end
+      if args.empty?
+        self
+      else
+        Project.project *(args + [{ :scope=>self.name }.merge(options)])
+      end
     end
 
     # :call-seq:
     #   projects(*names) => projects
     #
-    # Same as Buildr#projects.
-    def projects(*names)
-      Project.projects(*names)
+    # Same as Buildr#projects. This method is called on a project, so relative names are
+    # sufficient to find sub-projects.
+    def projects(*args)
+      if Hash === args.last
+        options = args.pop
+      else
+        options = {}
+      end
+      Project.projects *(args + [{ :scope=>self.name }.merge(options)])
     end
 
     # :call-seq:
@@ -459,6 +508,10 @@ module Buildr
       Rake.application.in_namespace(":#{name}") { super }
     end
 
+    def inspect() #:nodoc:
+      %Q{project(#{name.inspect})}
+    end
+
   end
 
   # :call-seq:
@@ -504,6 +557,11 @@ module Buildr
   #
   # Returns a project definition.
   #
+  # When called from outside a project definition, must reference the project by its
+  # full name, e.g. "foo:bar" to access the sub-project "bar" in "foo". When called
+  # from inside a project, relative names are sufficient, e.g. <code>project("foo").project("bar")</code>
+  # will find the sub-project "bar" in "foo".
+  #
   # You cannot reference a project before the project is defined. When working with
   # sub-projects, the project definition is stored by calling #define, and evaluated
   # before a call to the parent project's #define method returns.
@@ -519,7 +577,7 @@ module Buildr
   #
   #     define "webapp" do
   #       # webapp is defined first, but beans is evaluated first
-  #       compile.with project("myapp:beans")
+  #       compile.with project("beans")
   #       package :war
   #     end
   #
@@ -527,34 +585,46 @@ module Buildr
   #       package :jar
   #     end
   #   end
-  def project(name)
-    Project.project(name)
+  #
+  #   puts project("myapp:beans").version
+  def project(*args)
+    Project.project *args
   end
 
   # :call-seq:
   #   projects(*names) => projects
-  #   projects(:in=>parent) => projects
   #
-  # With no arguments, returns a list of all projects defined so far. With arguments,
-  # returns a list of these projects, fails on undefined projects.
+  # With no arguments, returns a list of all projects defined so far. When called on a project,
+  # returns all its sub-projects (direct descendants).
+  #
+  # With arguments, returns a list of named projects, fails on any name that does not exist.
+  # As with #project, you can use relative names when calling this method on a project.
   #
   # Like #project, this method evaluates the definition of each project before returning it.
   # Be advised of circular dependencies.
   #
-  # Use the :in option if you only want the sub-projects of a given parent project.
-  #
   # For example:
   #   files = projects.map { |prj| FileList[prj.path_to("src/**/*.java") }.flatten
   #   puts "There are #{files.size} source files in #{projects.size} projects"
   #
   #   puts projects("myapp:beans", "myapp:webapp").map(&:name)
   # Same as:
-  #   puts projects(:in=>"mayapp").map(&:name)
-  def projects(*names)
-    Project.projects *names
+  #   puts project("myapp").projects.map(&:name)
+  def projects(*args)
+    Project.projects *args
+  end
+
+  desc "List all projects defined by this Rakefile"
+  task "projects" do
+    wide = projects.map(&:name).map(&:size).max
+    projects.each do |project|
+      puts project.comment.blank? ? project.name : ("%-#{wide}s  #%s" % [project.name, project.comment])
+    end
   end
 
-  # Add project definition tests.
-  task("check") { |task| task.note *Project.warnings }
+  # Forces all the projects to be evaluated before executing any other task.
+  # If we don't do that, we don't get to have tasks available when running Rake.
+  task("buildr:projects") { projects }
+  Rake.application.top_level_tasks.unshift "buildr:projects"
 
 end

data/lib/core/transports.rb

@@ -36,6 +36,10 @@ module Buildr
   # The HTTP transport is used for all URLs with the scheme http or https. You can only
   # use the HTTP transport to download artifacts.
   #
+  # The HTTP transport supports the following options:
+  # * :proxy -- Proxy server to use. A hash with the values host, port, user and password.
+  #   You can also pass a URL (string or URI object).
+  #
   # The SFTP transport is used for all URLs with the schema sftp. You can only use the
   # SFTP transport to upload artifacts.
   #
@@ -269,15 +273,28 @@ module Buildr
 
       def initialize(url, options)
         super
-        rake_check_options options, :digests if options
-        @http = Net::HTTP.start(@uri.host, @uri.port)
+        if options
+          rake_check_options options, :proxy, :digests
+          proxy = options[:proxy]
+        end
+
+        case proxy
+        when Hash
+          @http = Net::HTTP.start(@uri.host, @uri.port, proxy[:host], proxy[:port], proxy[:user], proxy[:password])
+        when URI, String
+          proxy = URI.parse(proxy.to_s)
+          @http = Net::HTTP.start(@uri.host, @uri.port, proxy.host, proxy.port, proxy.user, proxy.password)
+        else
+          @http = Net::HTTP.start(@uri.host, @uri.port)
+        end
       end
 
       def download(path, target = nil, &block)
         puts "Requesting #{@uri}/#{path} " if Rake.application.options.trace
-        last_modified = File.stat(target).mtime.utc if target && File.exist?(target)
-        headers = {}
-        headers["If-Modified-Since"] = CGI.rfc1123_date(last_modified) if last_modified
+        if target && File.exist?(target)
+          last_modified = File.stat(target).mtime.utc 
+          headers = { "If-Modified-Since" => CGI.rfc1123_date(last_modified) }
+        end
         @http.request_get(@base_path + path, headers) do |response|
           case response
           when Net::HTTPNotModified
@@ -323,7 +340,6 @@ module Buildr
                   download[ proc { |chunk| temp.write chunk } ]
                   temp.close
                   File.move temp.path, target
-                  File.utime last_modified, last_modified, target
                 else
                   download[ block ]
                 end
@@ -331,7 +347,7 @@ module Buildr
               end
             end
           when Net::HTTPNotFound
-            raise NotFound
+            raise NotFound, "Looking for #{@uri}/#{path} and all I got was a 404!"
           else
             fail "Failed to download #{@uri}/#{path}: #{response.message}"
           end

data/lib/java/ant.rb

@@ -8,10 +8,8 @@ module Buildr
     REQUIRES = [ "ant:ant:jar:1.6.5", "ant:ant-launcher:jar:1.6.5", "xerces:xercesImpl:jar:2.6.2" ]
 
     # Make sure Ant and friends show on the classpath. Antwrap must only be loaded after RJB.
-    Java.rjb.onload do
-      Java.rjb.classpath += REQUIRES
-      Java.rjb.onload { require "antwrap" }
-    end
+    Java.rjb.classpath << REQUIRES
+    Java.rjb.onload { require "antwrap" }
 
     class << self
 

data/lib/java/artifact.rb

@@ -319,6 +319,44 @@ module Buildr
       end
     end
 
+    # :call-seq:
+    #   proxy() => Hash
+    #
+    # Returns the proxy settings used when downloading from remote repositories.
+    def proxy()
+      @proxy ||= {}
+    end
+
+    # :call-seq:
+    #   proxy = Hash
+    #   proxy = String
+    #   proxy = URI
+    #   proxy = nil
+    #
+    # Sets the proxy settings used when downloading from remote repositories.
+    # You can specify proxy settings using a Hash with values for :host, :port,
+    # :user and :password.
+    #
+    # You can also pass a URL as a string or URI object. The settings are converted
+    # to a hash.
+    #
+    # For example:
+    #   repositories.proxy = { :host=>"proxy.acme.com", :port=>8080 }
+    #   repositories.proxy = "proxy.acme.com:8080"
+    def proxy=(proxy)
+      case proxy
+      when Hash, nil
+        @proxy = proxy || {}
+      when String
+        proxy = "http://#{proxy}" unless proxy =~ /^http(s?)/i
+        proxy = URI.parse(proxy)
+        @proxy = { :host=>proxy.host, :port=>proxy.port, :user=>proxy.user, :password=>proxy.password }
+      when URI
+        @proxy = { :host=>proxy.host, :port=>proxy.port, :user=>proxy.user, :password=>proxy.password }
+      else
+        fail "Expecting a Hash, String or URI."
+      end
+    end
    
     # :call-seq:
     #   download(spec) => boolean
@@ -340,7 +378,7 @@ module Buildr
         begin
           rel_path = spec[:group].gsub(".", "/") +
             "/#{spec[:id]}/#{spec[:version]}/#{Artifact.hash_to_file_name(spec)}"
-          Transports.perform URI.parse(repo_url.to_s) do |http|
+          Transports.perform URI.parse(repo_url.to_s), :proxy=>proxy do |http|
             mkpath File.dirname(path), :verbose=>false
             http.download(rel_path, path)
             begin
@@ -467,10 +505,8 @@ module Buildr
   #   artifact project("my-app")               # All packages
   #   artifact project("mu-app").package(:war) # Only the WAR
   def artifacts(*specs)
-    specs.inject([]) do |set, spec|
+    specs.flatten.inject([]) do |set, spec|
       case spec
-      when Array
-        set |= artifacts(*spec)
       when Hash
         set |= [artifact(spec)]
       when /([^:]+:){2,4}/ # A spec as opposed to a file name.
@@ -512,23 +548,22 @@ module Buildr
   # specify the deployment repository. Otherwise, obtains the deployment repository by calling
   # Repositories#deploy_to.
   #
+  # When deploying files, you can specify a path relative to the deployment URL. Artifacts are
+  # always deployed to a path that combined the group identifier, artifact identifier and
+  # version number.
+  #
   # For example:
   #   deploy(foo.packages, :url=>"sftp://example.com/var/www/repo")
+  #   deploy(file("LICENSE"), :path=>group.tr(".", "/"))
   def deploy(*args)
     # Where do we release to?
-    if Hash === args.last
-      options = args.pop
-    else
-      options = repositories.deploy_to.clone
-      options = { :url=>options.to_s } unless Hash === options
-    end
-    # Strip all options since the transport requires them separately from the URL.
-    url = options[:url]
-    options = options.reject { |k,v| k === :url }
-    fail "Don't know where to deploy, perhaps you forgot to set repositories.deploy_to" if url.blank?
+    options = Hash === args.last ? args.pop : {}
+    deploy_to = options[:url] ? options : repositories.deploy_to
+    fail "Don't know where to deploy, perhaps you forgot to set repositories.deploy_to" if deploy_to[:url].blank?
 
     args.flatten.each { |arg| arg.invoke if arg.respond_to?(:invoke) }
-    Transports.perform url, options do |session|
+    # Strip :url and :path, in case the transport checks for valid options.
+    Transports.perform deploy_to[:url], deploy_to.reject{ |k,v| k == :url || k == :path } do |session|
       args.flatten.each do |artifact|
         if artifact.respond_to?(:to_spec)
           # Upload artifact relative to base URL, need to create path before uploading.
@@ -540,7 +575,7 @@ module Buildr
         else
           # Upload artifact to URL.
           puts "Deploying #{artifact}" if verbose
-          session.upload artifact.to_s, File.basename(artifact.to_s)
+          session.upload artifact.to_s, File.join(*(options[:path].to_a + [File.basename(artifact.to_s)]).compact)
         end
       end
     end

data/lib/java/compile.rb

@@ -49,7 +49,7 @@ module Buildr
 
         # Generate warnings (opposite of -nowarn).
         attr_accessor :warnings
-        inherited_attr :warnings, false
+        inherited_attr(:warnings) { verbose }
         # Output source locations where deprecated APIs are used.
         attr_accessor :deprecation
         inherited_attr :deprecation, false
@@ -88,7 +88,7 @@ module Buildr
         # Returns Javac command line arguments from the set of options.
         def javac_args()
           args = []  
-          args << "-nowarn" unless warnings && verbose
+          args << "-nowarn" unless warnings
           args << "-verbose" if Rake.application.options.trace
           args << "-g" if debug
           args << "-deprecation" if deprecation
@@ -540,20 +540,20 @@ module Buildr
     # Compile task requires prepare and performs resources, if anything compiled.
     compile = Java::CompileTask.define_task("compile"=>[prepare, resources])
     project.path_to("src/main/java").tap { |dir| compile.from dir if File.exist?(dir) }
-    compile.into project.path_to("target/classes")
+    compile.into project.path_to(:target, "classes")
     resources.filter.into project.compile.target
     Java::JavadocTask.define_task("javadoc"=>prepare).tap do |javadoc|
-      javadoc.into project.path_to("target/javadoc")
+      javadoc.into project.path_to(:target, "javadoc")
       javadoc.using :windowtitle=>project.comment || project.name
     end
     project.recursive_task("compile")
-    project.clean { verbose(false) { rm_rf project.path_to("target") } }
 
     project.enhance do |project|
       # This comes last because the target path may change.
       project.build project.compile.target
       # This comes last so we can determine all the source paths and classpath dependencies.
       project.javadoc.from project
+      project.clean { verbose(false) { rm_rf project.compile.target.to_s } }
     end
   end
 
@@ -569,8 +569,11 @@ module Buildr
     # The release tasks runs a build with <tt>DEBUG=no</tt>.
     attr_accessor :debug
 
-  end
+    def debug()
+      @debug = (ENV["DEBUG"] || ENV["debug"]) !~ /(no|off|false)/ if @debug.nil?
+      @debug
+    end
 
-  options.debug = (ENV["DEBUG"] || ENV["debug"]) !~ /(no|off|false)/
+  end
 
 end

data/lib/java/eclipse.rb

@@ -113,7 +113,7 @@ module Buildr
           File.open(task.name, "w") do |file|
             xml = Builder::XmlMarkup.new(:target=>file, :indent=>2)
             xml.projectDescription do
-              xml.name project.name
+              xml.name project.name.tr(":", "-")
               xml.projects
               xml.buildSpec do
                 xml.buildCommand do

data/lib/java/java.rb

@@ -26,7 +26,7 @@ module Buildr
       include Singleton
 
       def initialize() #:nodoc:
-        @classpath = [Java.tools_jar]
+        @classpath = [Java.tools_jar].compact
         @onload = []
         onload do
           onload do
@@ -40,7 +40,7 @@ module Buildr
       attr_accessor :classpath
 
       # :call-seq:
-      #   onload { ... }
+      #   onload { |rjb| ... }
       #
       # Adds a block to call when loading RJB and returns self.
       #
@@ -56,7 +56,7 @@ module Buildr
       #
       # Loads RJB. You can also call Java#ejb with a block to get the same effect.
       def load()
-        @onload.each(&:call)
+        @onload.each { |block| block.call self }
         @onload.clear
       end
 
@@ -82,21 +82,20 @@ module Buildr
       # :call-seq:
       #   tools_jar() => path
       #
-      # Returns a path to tools.jar.
+      # Returns a path to tools.jar. Returns nil if tools.jar not found, which may be a problem,
+      # unless you're running OS/X.
       def tools_jar()
-        unless @tools
-          tools = File.join(home, "lib/tools.jar")
-          @tools = tools if File.exist?(tools)
-        end
-        @tools
+        return nil if darwin?
+        @tools ||= File.join(home, "lib/tools.jar") or raise "I need tools.jar to compile, can't find it in #{home}/lib"
       end
   
       # :call-seq:
       #   home() => path
       #
-      # Returns JAVA_HOME.
+      # Returns JAVA_HOME, fails if JAVA_HOME not set. Returns nil for OS/X, we just assume Java is in the path.
       def home()
-        @home ||= ENV["JAVA_HOME"] or fail "Are we forgetting something? JAVA_HOME not set?"
+        return nil if darwin?
+        @home ||= ENV["JAVA_HOME"] or fail "Are we forgetting something? JAVA_HOME not set."
       end
 
       # :call-seq:
@@ -302,9 +301,8 @@ module Buildr
       # With a block, loads RJB and yields to the block, returning its result.
       #
       # For example:
-      #   Java.rjb.classpath += REQUIRES
+      #   Java.rjb.classpath << REQUIRES
       #   Java.rjb.onload { require "antwrap" }
-      #   . . .
       #
       #  def execute(name, options)
       #    options = options.merge(:name=>name, :base_dir=>Dir.pwd, :declarative=>true)
@@ -325,7 +323,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")
-        File.join(home, "bin", name)
+        home ? File.join(home, "bin", name) : File.join("bin", name)
       end
 
   protected
@@ -348,6 +346,10 @@ module Buildr
         @junit_artifacts ||= Buildr.artifacts(JUNIT_REQUIRES).each { |task| task.invoke }.map(&:to_s)
       end
 
+      def darwin?() #:nodoc:
+        RUBY_PLATFORM =~ /darwin/i
+      end
+
     end
 
     # See Java#java.
@@ -366,7 +368,7 @@ module Buildr
     #
     def apt(*sources)
       sources = compile.sources if sources.empty?
-      file(path_to("target/generated/apt")=>sources) do |task|
+      file(path_to(:target, "generated/apt")=>sources) do |task|
         Java.apt(sources.map(&:to_s) - [task.name], :output=>task.name,
           :classpath=>compile.classpath, :source=>compile.options.source)
       end

data/lib/java/packaging.rb

@@ -73,11 +73,11 @@ module Buildr
               if manifest
                 case manifest
                 when Hash
-                  output << manifest.map { |pair| pair.map(&:to_s).join(": ") }.sort.join("\n")
+                  output << manifest.map { |pair| pair.map(&:to_s).join(": ") }.sort.join("\n") << "\n"
                 when Array
                   output << manifest.reject { |section| section.empty? }.map { |section|
                       section.map { |pair| pair.join(": ") }.sort.join("\n").concat("\n")
-                    }.join("\n")
+                    }.join("\n") << "\n"
                 when Proc, Method
                   output << manifest.call 
                 when String, Task
@@ -233,7 +233,7 @@ module Buildr
       options[:group] ||= self.group
       options[:version] ||= self.version
       options[:type] = type
-      file_name = path_to("target", Artifact.hash_to_file_name(options))
+      file_name = path_to(:target, Artifact.hash_to_file_name(options))
 
       packager = method("package_as_#{type}") rescue
         fail("Don't know how to create a package of type #{type}")
@@ -378,5 +378,4 @@ module Buildr
 
   end
 
-
 end

data/lib/java/test.rb

@@ -289,7 +289,7 @@ module Buildr
     # Similar to the regular compile task but using different paths.
     compile = Java::CompileTask.define_task("test:compile"=>[project.compile, project.test.prepare, project.test.resources])
     project.path_to("src/test/java").tap { |dir| compile.from dir if File.exist?(dir) }
-    compile.into project.path_to("target/test-classes")
+    compile.into project.path_to(:target, "test-classes")
     resources.filter.into compile.target
     # Define the JUnit task here, otherwise we get a normal task.
     Java::JUnitTask.define_task("test:junit")
@@ -309,6 +309,7 @@ module Buildr
         options[:properties] ||= {}
         options[:properties]["baseDir"] ||= project.test.compile.target.to_s
       end
+      project.clean { verbose(false) { rm_rf project.test.compile.target.to_s } }
     end
   end
 
@@ -317,9 +318,9 @@ module Buildr
   # will run the test case class com.example.MyTest, if found in the current project.
   rule /^test:.*$/ do |task|
     test = task.name.scan(/test:(.*)/)[0][0]
-    Project.projects.select { |project| project.base_dir == Rake.application.original_dir }.
-      map { |project| project.test }.each { |task| task.junit.instance_eval { @include = ["*#{test}"] ; @exclude.clear } }.
-      each(&:invoke)
+    test = "*#{test}*" unless test =~ /\*/
+    Project.local_projects.map { |project| project.test }.
+      each { |task| task.junit.instance_eval { @include = [test] ; @exclude.clear } }.each(&:invoke)
   end
 
 

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.3
 specification_version: 1
 name: buildr
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2007-05-04 00:00:00 -07:00
+  version: 1.1.0
+date: 2007-05-13 00:00:00 -07:00
 summary: A build system that doesn't suck
 require_paths: 
 - lib