buildr 0.21.0 → 0.22.0

data/lib/core/project.rb

@@ -161,12 +161,17 @@ module Buildr
 
       # See Buildr#projects.
       def projects(*names) #:nodoc:
+        options = names.pop if Hash === names.last
         @projects ||= {}
-        if names.empty?
-          @projects.keys.map { |name| project(name) }.sort_by(&:name)
+        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)
         else
-          names.map { |name| project(name) or raise "No such project #{name}" }.uniq.sort_by(&:name)
-        end
+          names.uniq.map { |name| project(name) or raise "No such project #{name}" }.sort_by(&:name)
+        end  
       end
 
       # :call-seq:
@@ -325,18 +330,20 @@ module Buildr
     # Essentially, joins all the supplied names and expands the path relative to #base_dir.
     # Symbol arguments are converted to paths by calling the attribute accessor on the project.
     #
-    # For example:
+    # Keep in mind that all tasks are defined and executed relative to the Rakefile directory,
+    # so you want to use #path_to to get the actual path within the project as a matter of practice.
     #
     # For example:
     #   path_to("foo", "bar")
     #   => /home/project1/foo/bar
     #   path_to("/tmp")
     #   => /tmp
-    #   path_to(:base_dir, "foo")
+    #   path_to(:base_dir, "foo") # same as path_to("foo")
     #   => /home/project1/foo
     def path_to(*names)
       File.expand_path(File.join(names.map { |name| Symbol === name ? send(name) : name.to_s }), base_dir)
     end
+    alias :_ :path_to
 
     # :call-seq:
     #   define(name, properties?) { |project| ... } => project
@@ -382,12 +389,8 @@ module Buildr
     #   => "/home/foo/bar/src"
     def file(args, &block)
       task_name, deps = Rake.application.resolve_args(args)
-      unless task = Rake.application.lookup(task_name, [])
-        task = Rake::FileTask.define_task(File.expand_path(task_name, base_dir))
-        task.base_dir = base_dir
-      end
       deps = [deps] unless deps.respond_to?(:to_ary)
-      task.enhance deps, &block
+      Rake::FileTask.define_task(path_to(task_name)=>deps, &block)
     end
 
     # :call-seq:
@@ -445,21 +448,14 @@ module Buildr
     def recursive_task(args, &block)
       task_name, deps = Rake.application.resolve_args(args)
       deps = [deps] unless deps.respond_to?(:to_ary)
-      task(task_name=>deps).tap do |task|
-        if parent
-          Rake.application.lookup(task_name, parent.name.split(":")).enhance [task]
-          #Rake::Task["^#{name}"].enhance([ task ])
-        end
-        task.enhance &block
-      end
+      task = ENV["PARALLEL"] =~ /(yes|on|true)/ ? multitask(task_name) : task(task_name)
+      Rake.application.lookup(task_name, parent.name.split(":")).enhance [task] if parent
+      task.enhance deps, &block
     end
 
     def execute() #:nodoc:
       # Reset the namespace, so all tasks are automatically defined in the project's namespace.
-      Rake.application.in_namespace ":#{name}" do
-        # Everything we do inside the project is relative to its working directory.
-        Dir.chdir(base_dir) { super }
-      end
+      Rake.application.in_namespace(":#{name}") { super }
     end
 
   end
@@ -536,6 +532,7 @@ module Buildr
 
   # :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.
@@ -543,11 +540,15 @@ module Buildr
   # 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("project1", "project2").map(&:base_dir)
+  #   puts projects("myapp:beans", "myapp:webapp").map(&:name)
+  # Same as:
+  #   puts projects(:in=>"mayapp").map(&:name)
   def projects(*names)
     Project.projects *names
   end

data/lib/core/rake_ext.rb

@@ -1,17 +1,6 @@
 module Rake #:nodoc:
   class Task
 
-    # Access the base directory. The base directory is set when the class
-    # is defined from the current directory. The current directory is set
-    # to the base directory when the class is executed.
-    attr_accessor :base_dir
-
-    def initialize_with_base_dir(*args) #:nodoc:
-      @base_dir = Dir.pwd
-      initialize_without_base_dir *args
-    end
-    alias_method_chain :initialize, :base_dir
-
     def invoke #:nodoc:
       tasks = (Thread.current[:tasks] || [])
       if tasks.include?(name)
@@ -25,10 +14,8 @@ module Rake #:nodoc:
         begin
           Thread.current[:tasks] = tasks + [name]
           @already_invoked = true
-          Dir.chdir(@base_dir || Dir.pwd) do
-            invoke_prerequisites
-            execute if needed?
-          end
+          invoke_prerequisites
+          execute if needed?
         ensure
           Thread.current[:tasks] = tasks
         end

data/lib/core/transports.rb

@@ -1,3 +1,4 @@
+require "cgi"
 require "net/http"
 require "net/ssh"
 require "net/sftp"
@@ -114,9 +115,9 @@ module Buildr
         @options = options || {}
       end
 
-      # Downloads a file from the specified path, relative to the
-      # server URI. Downloads to either the target file, or by
-      # calling the block with each chunk of the file.
+      # Downloads a file from the specified path, relative to the server URI.
+      # Downloads to either the target file, or by calling the block with each
+      # chunk of the file. Returns the file's modified timestamp, or now.
       #
       # For example:
       #   Transports.perform("http://server/libs") do |http|
@@ -272,16 +273,24 @@ module Buildr
       end
 
       def download(path, target = nil, &block)
-        puts "Requesting #{path} from #{@uri}" if Rake.application.options.trace
-        @http.request_get(@base_path + path) do |response|
+        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
+        @http.request_get(@base_path + path, headers) do |response|
           case response
+          when Net::HTTPNotModified
+            # No modification, nothing to do.
+            puts "Not modified since last download" if Rake.application.options.trace
+
           when Net::HTTPRedirection
             # Try to download from the new URI, handle relative redirects.
-            puts "Redirected" if Rake.application.options.trace
-            Transports.download(@uri + URI.parse(response["location"]), target, @options)
+            puts "Redirected to #{response['Location']}" if Rake.application.options.trace
+            last_modified = Transports.download(@uri + URI.parse(response["location"]), target, @options)
 
           when Net::HTTPOK
             puts "Downloading #{@uri}/#{path}" if verbose
+            last_modified = Time.parse(response["Last-Modified"] || "")
             with_progress_bar path.split("/").last, response.content_length do |progress|
               with_digests(@options[:digests]) do |digester|
 
@@ -311,7 +320,8 @@ module Buildr
                   temp = Tempfile.new(File.basename(target))
                   download[ proc { |chunk| temp.write chunk } ]
                   temp.close
-                  File.move temp.path, target if target
+                  File.move temp.path, target
+                  File.utime last_modified, last_modified, target
                 else
                   download[ block ]
                 end
@@ -324,6 +334,7 @@ module Buildr
             fail "Failed to download #{@uri}/#{path}: #{response.message}"
           end
         end
+        last_modified
       end
 
       def close()

data/lib/java/ant.rb

@@ -2,77 +2,76 @@ require "core/project"
 require "java/java"
 
 module Buildr
-  module Java
-    module Ant
+  module Ant
 
-      # Libraries used by #ant.
-      REQUIRES = [ "ant:ant:jar:1.6.5", "ant:ant-launcher:jar:1.6.5", "xerces:xercesImpl:jar:2.6.2" ]
+    # Libraries used by #ant.
+    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.
+    # 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
 
-      class << self
-
-        # :call-seq:
-        #   declarative(name, options?) => AntProject
-        #   declarative(name, options?) { |AntProject| ... } => AntProject
-        #
-        # Returns a declarative AntProject with the specified name. Ant tasks created in this project
-        # are not executed until you tell them to.
-        #
-        # See #ant for more information about options and the block.
-        def declarative(name, options = nil, &block)
-          options ||= {}
-          options = (options || {}).merge(:name=>name, :base_dir=>Dir.pwd, :declarative=>false)
-          Java.rjb { AntProject.new(options).tap { |project| yield project if block_given? } }
-        end
+    class << self
 
-        # :call-seq:
-        #   executable(name, options?) => AntProject
-        #   executable(name, options?) { |AntProject| ... } => AntProject
-        #
-        # Returns an executable AntProject with the specified name. Ant tasks created in this project
-        # are executed immediately.
-        #
-        # See #ant for more information about options and the block.
-        def executable(name, options = nil, &block)
-          options ||= {}
-          options = (options || {}).merge(:name=>name, :base_dir=>Dir.pwd, :declarative=>true)
-          Java.rjb { AntProject.new(options).tap { |project| yield project if block_given? } }
-        end
+      # :call-seq:
+      #   declarative(name, options?) => AntProject
+      #   declarative(name, options?) { |AntProject| ... } => AntProject
+      #
+      # Returns a declarative AntProject with the specified name. Ant tasks created in this project
+      # are not executed until you tell them to.
+      #
+      # See #ant for more information about options and the block.
+      def declarative(name, options = nil, &block)
+        options ||= {}
+        options = (options || {}).merge(:name=>name, :base_dir=>Dir.pwd, :declarative=>false)
+        Java.rjb { AntProject.new(options).tap { |project| yield project if block_given? } }
       end
 
       # :call-seq:
-      #   ant(name, options?) => AntProject
-      #   ant(name, options?) { |AntProject| ... } => AntProject
-      #
-      # Returns a new AntProject with the specified name. Ant tasks created in this project are
-      # executed immediately.
+      #   executable(name, options?) => AntProject
+      #   executable(name, options?) { |AntProject| ... } => AntProject
       #
-      # The options hash is passed to the Ant project definition, along with the current directory.
-      # When used in a Buildr project, the Ant project will have the same base directory.
-      # If you pass a block, yields to the block with the Ant project.
+      # Returns an executable AntProject with the specified name. Ant tasks created in this project
+      # are executed immediately.
       #
-      # For example:
-      #   ant("hibernatedoclet") do |doclet|
-      #     doclet.taskdef :name=>"hibernatedoclet",
-      #       :classname=>"xdoclet.modules.hibernate.HibernateDocletTask", :classpath=>DOCLET
-      #     doclet.hibernatedoclet :destdir=>dest_dir, :force=>"true" do
-      #       hibernate :version=>"3.0"
-      #       fileset :dir=>source, :includes=>"**/*.java"
-      #     end
-      #   end
-      def ant(name, options=nil, &block)
-        Java::Ant.executable(name, options, &block)
+      # See #ant for more information about options and the block.
+      def executable(name, options = nil, &block)
+        options ||= {}
+        options = (options || {}).merge(:name=>name, :base_dir=>Dir.pwd, :declarative=>true)
+        Java.rjb { AntProject.new(options).tap { |project| yield project if block_given? } }
       end
+    end
 
+    # :call-seq:
+    #   ant(name, options?) => AntProject
+    #   ant(name, options?) { |AntProject| ... } => AntProject
+    #
+    # Returns a new AntProject with the specified name. Ant tasks created in this project are
+    # executed immediately.
+    #
+    # The options hash is passed to the Ant project definition, along with the current directory.
+    # When used in a Buildr project, the Ant project will have the same base directory.
+    # If you pass a block, yields to the block with the Ant project.
+    #
+    # For example:
+    #   ant("hibernatedoclet") do |doclet|
+    #     doclet.taskdef :name=>"hibernatedoclet",
+    #       :classname=>"xdoclet.modules.hibernate.HibernateDocletTask", :classpath=>DOCLET
+    #     doclet.hibernatedoclet :destdir=>dest_dir, :force=>"true" do
+    #       hibernate :version=>"3.0"
+    #       fileset :dir=>source, :includes=>"**/*.java"
+    #     end
+    #   end
+    def ant(name, options=nil, &block)
+      Ant.executable(name, options, &block)
     end
 
   end
 
   class Project
-    include Java::Ant
+    include Ant
   end
 
 end

data/lib/java/artifact.rb

@@ -5,6 +5,7 @@ module Buildr
 
   desc "Download all artifacts"
   task "artifacts"
+  task "artifacts:refresh"
 
   # Mixin with a task to make it behave like an artifact. Implemented by the packaging tasks.
   #
@@ -69,7 +70,7 @@ module Buildr
     # Convenience method that returns a POM artifact.
     def pom()
       return self if type == :pom
-      artifact(:group=>group, :id=>id, :version=>version, :type=>:pom, :classifier=>classifier)
+      Buildr.artifact(:group=>group, :id=>id, :version=>version, :type=>:pom, :classifier=>classifier)
     end
 
   protected
@@ -101,6 +102,30 @@ module Buildr
 
     class << self
 
+      # :call-seq:
+      #    force_download() => boolean
+      #    force_download(value) => value
+      #    force.download(value) { ... }
+      #
+      # In the first form, returns the value of the force download flag. This flag is set
+      # to force downloading of artifacts, even if those artifacts already exist in the local
+      # repository. (Used by the artifacts task).
+      #
+      # In the second form sets the value of the force download flag. In the third form, sets
+      # the value of the flag, yields to the block, and resets the flag to its previous value.
+      def force_download(value = @force_download)
+        if block_given?
+          begin
+            old_value, @force_download = @force_download, value
+            yield
+          ensure
+            @force_download = old_value
+          end
+        else
+          @force_download = value
+        end
+      end
+
       # :call-seq:
       #   lookup(spec) => Artifact
       #
@@ -190,14 +215,27 @@ module Buildr
         # (e.g. download from a different location), so don't perform it
         # if the task found a different way to create the artifact.
         # For that, we need to be the last piece of code run by the task.
-        task.enhance do
-          unless Rake.application.options.dryrun || File.exist?(name)
-            repositories.download(to_spec)
+        if @actions.size == 1
+          task.enhance do
+            begin
+              puts "Downloading #{to_spec}" if verbose
+              Buildr.repositories.download(to_spec)
+            rescue Exception=>error
+              if File.exist?(name)
+                puts error
+              else
+                raise
+              end
+            end
           end
         end
       end
     end
 
+    def needed?()
+      Artifact.force_download || super
+    end
+
   end
 
 
@@ -310,12 +348,15 @@ module Buildr
             end
           end
           true
+        rescue Transports::NotFound
+          false
         rescue Exception=>error
-          warn error if Rake.application.options.trace
+          puts error if verbose
+          puts error.backtrace.join("\n") if Rake.application.options.trace
           false
         end
       end
-      fail "Failed to download #{Artifact.to_spec(spec)}, tried the following repositories:\n#{repositories.remote.join("\n")}"
+      fail "Failed to download #{Artifact.to_spec(spec)}, tried the following repositories:\n#{remote.join("\n")}"
     end
 
     # :call-seq:
@@ -356,7 +397,6 @@ module Buildr
 
   end
 
-
   # :call-seq:
   #    repositories() => Repositories
   #
@@ -396,7 +436,8 @@ module Buildr
     unless task = Artifact.lookup(spec)
       task = Artifact.define_task(repositories.locate(spec))
       task.send :apply_spec, spec
-      Rake::Task["rake:artifacts"].enhance [ task ]
+      Rake::Task["rake:artifacts"].enhance [task]
+      Rake::Task["rake:artifacts:refresh"].enhance { Artifact.force_download(true) { task.invoke } }
       Artifact.register(task)
     end
     task.enhance &block
@@ -440,7 +481,7 @@ module Buildr
       when Rake::Task
         set |= [spec]
       else
-        fail "Invalid artifact specification in: #{specs.inspect}"
+        fail "Invalid artifact specification in: #{specs.to_s}"
       end
     end
   end