buildr 1.3.5-x86-mswin32 → 1.4.0-x86-mswin32

data/lib/buildr/java/version_requirement.rb

@@ -15,11 +15,11 @@
 
 
 module Buildr
-  
+
   #
   # See ArtifactNamespace#need
   class VersionRequirement
-    
+
     CMP_PROCS = Gem::Requirement::OPS.dup
     CMP_REGEX = Gem::Requirement::OP_RE.dup
     CMP_CHARS = CMP_PROCS.keys.join
@@ -31,16 +31,16 @@ module Buildr
       def version?(str)
         /^\s*[#{VER_CHARS}]+\s*$/ === str
       end
-      
+
       # is +str+ a version requirement?
       def requirement?(str)
         /[#{BOOL_CHARS}#{CMP_CHARS}\(\)]/ === str
       end
-      
+
       # :call-seq:
       #    VersionRequirement.create(" >1 <2 !(1.5) ") -> requirement
       #
-      # parse the +str+ requirement 
+      # parse the +str+ requirement
       def create(str)
         instance_eval normalize(str)
       rescue StandardError => e
@@ -61,7 +61,7 @@ module Buildr
         vreq.negative = !vreq.negative
         vreq
       end
-      
+
       def normalize(str)
         str = str.strip
         if str[/[^\s\(\)#{BOOL_CHARS + VER_CHARS + CMP_CHARS}]/]
@@ -147,7 +147,7 @@ module Buildr
     def &(other)
       operation(:&, other)
     end
-    
+
     # return the parsed expression
     def to_s
       str = requirements.map(&:to_s).join(" " + @op.to_s + " ").to_s
@@ -160,7 +160,7 @@ module Buildr
     protected
     attr_reader :requirements, :op
     def operation(op, other)
-      @op ||= op 
+      @op ||= op
       if negative == other.negative && @op == op && other.requirements.size == 1
         @requirements << other.requirements.first
         self

data/lib/buildr/packaging/archive.rb

@@ -25,7 +25,7 @@ module Buildr
 
       # Returns the archive from this path.
       attr_reader :root
-      
+
       def initialize(root, path)
         @root = root
         @path = path.empty? ? path : "#{path}/"
@@ -41,10 +41,13 @@ module Buildr
               if File.directory?(path)
                 in_directory path do |file, rel_path|
                   dest = "#{@path}#{rel_path}"
-                  trace "Adding #{dest}"
-                  file_map[dest] = file
+                  unless excluded?(dest)
+                    trace "Adding #{dest}"
+                    file_map[dest] = file
+                  end
                 end
-              else
+              end
+              unless File.basename(path) == "."
                 trace "Adding #{@path}#{File.basename(path)}"
                 file_map["#{@path}#{File.basename(path)}"] = path
               end
@@ -61,7 +64,8 @@ module Buildr
       #   include(*files, :merge=>true) => self
       def include(*args)
         options = args.pop if Hash === args.last
-        files = args.flatten
+        files = to_artifacts(args)
+        raise 'AchiveTask.include() values should not include nil' if files.include? nil
 
         if options.nil? || options.empty?
           @includes.include *files.flatten
@@ -74,7 +78,8 @@ module Buildr
           include_as files.first.to_s, options[:as]
         elsif options[:from]
           raise 'You can only use the :from option in combination with the :path option' unless options.size == 1
-          raise 'You canont use the :from option with file names' unless files.empty?
+          raise 'You cannot use the :from option with file names' unless files.empty?
+          fail 'AchiveTask.include() :from value should not be nil' if [options[:from]].flatten.include? nil
           [options[:from]].flatten.each { |path| include_as path.to_s, '.' }
         elsif options[:merge]
           raise 'You can only use the :merge option in combination with the :path option' unless options.size == 1
@@ -90,7 +95,7 @@ module Buildr
       # :call-seq:
       #   exclude(*files) => self
       def exclude(*files)
-        files = files.flatten.map(&:to_s) 
+        files = to_artifacts(files)
         @excludes |= files
         @excludes |= files.reject { |f| f =~ /\*$/ }.map { |f| "#{f}/*" }
         self
@@ -101,7 +106,7 @@ module Buildr
       #   merge(*files, :path=>name) => Merge
       def merge(*args)
         options = Hash === args.last ? args.pop : {}
-        files = args.flatten
+        files = to_artifacts(args)
         rake_check_options options, :path
         raise ArgumentError, "Expected at least one file to merge" if files.empty?
         path = options[:path] || @path
@@ -172,7 +177,31 @@ module Buildr
 
     protected
 
-      def include_as(source, as)
+    # Convert objects to artifacts, where applicable
+    def to_artifacts(files)
+      files.flatten.inject([]) do |set, file|
+        case file
+        when ArtifactNamespace
+          set |= file.artifacts
+        when Symbol, Hash
+          set |= [artifact(file)]
+        when /([^:]+:){2,4}/ # A spec as opposed to a file name.
+          set |= [Buildr.artifact(file)]
+        when Project
+          set |= Buildr.artifacts(file.packages)
+        when Rake::Task
+          set |= [file]
+        when Struct
+          set |= Buildr.artifacts(file.values)
+        else
+          # non-artifacts passed as-is; in particular, String paths are
+          # unmodified since Rake FileTasks don't use absolute paths
+          set |= [file]
+        end
+      end
+    end
+
+    def include_as(source, as)
         @sources << proc { source }
         @actions << proc do |file_map|
           file = source.to_s
@@ -182,10 +211,13 @@ module Buildr
                 path = rel_path.split('/')[1..-1]
                 path.unshift as unless as == '.'
                 dest = "#{@path}#{path.join('/')}"
-                trace "Adding #{dest}"
-                file_map[dest] = file
+                unless excluded?(dest) 
+                  trace "Adding #{dest}"
+                  file_map[dest] = file
+                end
               end
-            else
+            end
+            unless as == "."
               trace "Adding #{@path}#{as}"
               file_map["#{@path}#{as}"] = file
             end
@@ -299,13 +331,13 @@ module Buildr
 
     # :call-seq:
     #   clean => self
-    # 
-    # Removes all previously added content from this archive. 
+    #
+    # Removes all previously added content from this archive.
     # Use this method if you want to remove default content from a package.
     # For example, package(:jar) by default includes compiled classes and resources,
     # using this method, you can create an empty jar and afterwards add the
     # desired content to it.
-    # 
+    #
     #    package(:jar).clean.include path_to('desired/content')
     def clean
       @paths = { '' => Path.new(self, '') }
@@ -346,20 +378,21 @@ module Buildr
     #   zip(..).include('foo.zip', :merge=>true).include('bar.zip')
     # You can also use the method #merge.
     def include(*files)
-      @paths[''].include *files
+      fail "AchiveTask.include() called with nil values" if files.include? nil
+      @paths[''].include *files if files.compact.size > 0
       self
-    end 
+    end
     alias :add :include
     alias :<< :include
-   
+
     # :call-seq:
     #   exclude(*files) => self
-    # 
+    #
     # Excludes files and returns self. Can be used in combination with include to prevent some files from being included.
     def exclude(*files)
       @paths[''].exclude *files
       self
-    end 
+    end
 
     # :call-seq:
     #   merge(*files) => Merge
@@ -372,7 +405,7 @@ module Buildr
     #   zip(..).merge('src.zip').include('module1/*')
     def merge(*files)
       @paths[''].merge *files
-    end 
+    end
 
     # :call-seq:
     #   path(name) => Path
@@ -433,7 +466,7 @@ module Buildr
       @prerequisites |= @paths.collect { |name, path| path.sources }.flatten
       super
     end
-    
+
     def needed? #:nodoc:
       return true unless File.exist?(name)
       # You can do something like:

data/lib/buildr/packaging/artifact.rb

@@ -41,9 +41,27 @@ module Buildr
 
     class << self
     private
+    
+      # :stopdoc:
       def included(mod)
         mod.extend self
       end
+
+      def extend_object(base)
+        base.instance_eval { alias :install_old :install     } if base.respond_to? :install
+        base.instance_eval { alias :uninstall_old :uninstall } if base.respond_to? :uninstall
+        base.instance_eval { alias :upload_old :upload       } if base.respond_to? :upload
+        super
+      end
+
+      def extended(base)
+        #We try to keep the previous instance methods defined on the base instance if there were ones.
+        base.instance_eval { alias :install :install_old     } if base.respond_to? :install_old
+        base.instance_eval { alias :uninstall :uninstall_old } if base.respond_to? :uninstall_old
+        base.instance_eval { alias :upload :upload_old       } if base.respond_to? :upload_old
+      end
+      
+      # :startdoc:
     end
 
     # The artifact identifier.
@@ -90,7 +108,7 @@ module Buildr
 
     # :call-seq:
     #   pom => Artifact
-    # 
+    #
     # Convenience method that returns a POM artifact.
     def pom
       return self if type == :pom
@@ -99,7 +117,7 @@ module Buildr
 
     # :call-seq:
     #   sources_artifact => Artifact
-    # 
+    #
     # Convenience method that returns a sources artifact.
     def sources_artifact
       sources_spec = to_spec_hash.merge(:classifier=>'sources')
@@ -123,7 +141,7 @@ module Buildr
         xml.classifier    classifier if classifier
       end
     end
-    
+
     def install
       pom.install if pom && pom != self
       invoke
@@ -137,7 +155,7 @@ module Buildr
 
     def uninstall
       installed = Buildr.repositories.locate(self)
-      rm installed if File.exist?(installed) 
+      rm installed if File.exist?(installed)
       pom.uninstall if pom && pom != self
     end
 
@@ -153,14 +171,13 @@ module Buildr
     # In the third form, uses a hash with the options :url, :username, :password,
     # and :permissions. All but :url are optional.
     def upload(upload_to = nil)
-      # Where do we release to?
+      upload_task(upload_to).invoke
+    end
+
+    def upload_task(upload_to = nil)
       upload_to ||= Buildr.repositories.release_to
       upload_to = { :url=>upload_to } unless Hash === upload_to
       raise ArgumentError, 'Don\'t know where to upload, perhaps you forgot to set repositories.release_to' unless upload_to[:url]
-      invoke # Make sure we exist.
-
-      # Upload POM ahead of package, so we don't fail and find POM-less package (the horror!)
-      pom.upload(upload_to) if pom && pom != self
 
       # Set the upload URI, including mandatory slash (we expect it to be the base directory).
       # Username/password may be part of URI, or separate entities.
@@ -169,10 +186,19 @@ module Buildr
       uri.user = upload_to[:username] if upload_to[:username]
       uri.password = upload_to[:password] if upload_to[:password]
 
-      # Upload artifact relative to base URL, need to create path before uploading.
-      info "Deploying #{to_spec}"
       path = group.gsub('.', '/') + "/#{id}/#{version}/#{File.basename(name)}"
-      URI.upload uri + path, name, :permissions=>upload_to[:permissions]
+
+      unless task = Buildr.application.lookup(uri+path)
+        deps = [self]
+        deps << pom.upload_task( upload_to ) if pom && pom != self
+
+        task = Rake::Task.define_task uri + path => deps do
+          # Upload artifact relative to base URL, need to create path before uploading.
+          info "Deploying #{to_spec}"
+          URI.upload uri + path, name, :permissions=>upload_to[:permissions]
+        end
+      end
+      task
     end
 
   protected
@@ -183,14 +209,14 @@ module Buildr
       ARTIFACT_ATTRIBUTES.each { |key| instance_variable_set("@#{key}", spec[key]) }
       self
     end
-    
+
     def group_path
       group.gsub('.', '/')
     end
 
   end
 
- 
+
   # A file task referencing an artifact in the local repository.
   #
   # This task includes all the artifact attributes (group, id, version, etc). It points
@@ -199,7 +225,7 @@ module Buildr
   #
   # Note: You can enhance this task to create the artifact yourself, e.g. download it from
   # a site that doesn't have a remote repository structure, copy it from a different disk, etc.
-  class Artifact < Rake::FileCreationTask
+  class Artifact < Rake::FileTask
 
     # The default artifact type.
     DEFAULT_TYPE = :jar
@@ -323,19 +349,25 @@ module Buildr
     #   install test
     # See also Buildr#install and Buildr#upload.
     def from(path)
-      path = File.expand_path(path.to_s)
-      enhance [path] do
-        mkpath File.dirname(name)
-        pom.invoke unless type == :pom
-        cp path, name
-        info "Installed #{path} as #{to_spec}"
+      path = path.is_a?(Rake::Task) ? path : File.expand_path(path.to_s)
+      unless exist?
+        enhance [path] do
+          path = File.expand_path(path.to_s)
+          mkpath File.dirname(name)
+          pom.invoke unless type == :pom
+
+          cp path, name
+          info "Installed #{path} as #{to_spec}"
+        end
       end
       unless type == :pom
         pom.enhance do
+          unless pom.exist?
           mkpath File.dirname(pom.name)
           File.open(pom.name, 'w') { |file| file.write pom.pom_xml }
         end
       end
+      end
       self
     end
 
@@ -343,7 +375,7 @@ module Buildr
 
     # :call-seq:
     #   download
-    # 
+    #
     # Downloads an artifact from one of the remote repositories, and stores it in the local
     # repository. Raises an exception if the artifact is not found.
     #
@@ -353,7 +385,7 @@ module Buildr
       trace "Downloading #{to_spec}"
       remote = Buildr.repositories.remote.map { |repo_url| URI === repo_url ? repo_url : URI.parse(repo_url) }
       remote = remote.each { |repo_url| repo_url.path += '/' unless repo_url.path[-1] == '/' }
-      fail 'No remote repositories defined!' if remote.empty?
+      fail "Unable to download #{to_spec}. No remote repositories defined." if remote.empty?
       exact_success = remote.find do |repo_url|
         begin
           path = "#{group_path}/#{id}/#{version}/#{File.basename(name)}"
@@ -411,21 +443,21 @@ module Buildr
       fail "Failed to download #{to_spec}, tried the following repositories:\n#{remote_uris.join("\n")}"
     end
   end
-  
-  
+
+
   # An artifact that is optional.
   # If downloading fails, the user will be informed but it will not raise an exception.
   class OptionalArtifact < Artifact
-    
+
     protected
-    
+
     # If downloading fails, the user will be informed but it will not raise an exception.
     def download
       super
-    rescue 
+    rescue
       info "Failed to download #{to_spec}. Skipping it."
     end
-    
+
   end
 
 
@@ -458,8 +490,9 @@ module Buildr
     # Sets the path to the local repository.
     #
     # The best place to set the local repository path is from a buildr.rb file
-    # located in your home directory. That way all your projects will share the same
-    # path, without affecting other developers collaborating on these projects.
+    # located in the .buildr directory under your home directory. That way all
+    # your projects will share the same path, without affecting other developers
+    # collaborating on these projects.
     def local=(dir)
       @local = dir ? File.expand_path(dir) : nil
     end
@@ -697,6 +730,7 @@ module Buildr
   # * :under -- The group identifier
   # * :version -- The version number
   # * :type -- The artifact type (optional)
+  # * :classifier -- The artifact classifier (optional)
   #
   # For example:
   #   group 'xbean', 'xbean_xpath', 'xmlpublic', :under=>'xmlbeans', :version=>'2.1.0'
@@ -704,8 +738,14 @@ module Buildr
   #   group %w{xbean xbean_xpath xmlpublic}, :under=>'xmlbeans', :version=>'2.1.0'
   def group(*args)
     hash = args.pop
-    args.flatten.map { |id| artifact :group=>hash[:under], :type=>hash[:type], :version=>hash[:version], :id=>id }
-  end 
+    args.flatten.map do |id|
+      artifact :group   => hash[:under],
+               :type    => hash[:type],
+               :version => hash[:version],
+               :classifier => hash[:classifier],
+               :id => id
+    end
+  end
 
   # :call-seq:
   #   install(artifacts)
@@ -738,11 +778,10 @@ module Buildr
   def upload(*args, &block)
     artifacts = artifacts(args)
     raise ArgumentError, 'This method can only upload artifacts' unless artifacts.all? { |f| f.respond_to?(:to_spec) }
+    upload_artifacts_tasks = artifacts.map { |artifact| artifact.upload_task }
     task('upload').tap do |task|
       task.enhance &block if block
-      task.enhance artifacts do
-        artifacts.each { |artifact| artifact.upload }
-      end
+      task.enhance upload_artifacts_tasks
     end
   end