buildr 1.4.25 → 1.5.0.dev2

data/lib/buildr/java/ecj.rb

@@ -17,6 +17,20 @@ module Buildr #:nodoc:
   module Compiler #:nodoc:
 
     class Ecj < Javac
+      
+      VERSION = "4.5.1"
+      
+      class << self
+        # Current version of ECJ being used.
+        def version
+          Buildr.settings.build['ecj'] || VERSION
+        end
+
+        # ECJ classpath dependencies.
+        def dependencies
+          @dependencies ||= ["org.eclipse.jdt.core.compiler:ecj:jar:#{version}"]
+        end
+      end
 
       OPTIONS = Buildr::Compiler::Javac::OPTIONS
 
@@ -64,6 +78,5 @@ module Buildr #:nodoc:
   end
 end
 
-Java.classpath << "org.eclipse.jdt.core.compiler:ecj:jar:3.5.1"
-# Adding ecj before javac
-Buildr::Compiler.compilers.unshift Buildr::Compiler::Ecj
+Java.classpath << lambda { Buildr::Compiler::Ecj.dependencies }
+Buildr::Compiler.compilers << Buildr::Compiler::Ecj

data/lib/buildr/java/jruby.rb

@@ -72,7 +72,25 @@ module Java
     # For example, Ant is loaded as follows:
     #   Java.classpath << 'org.apache.ant:ant:jar:1.7.0'
     def classpath
-      @classpath ||= []
+      @classpath ||= begin
+        classpath = []
+        class << classpath
+          
+          def new_add(*args)
+            warn 'Java is already loaded' if Java.loaded?
+            send(:old_add, *args)
+          end
+          
+          alias_method :old_add, :<<
+          alias_method :<<, :new_add
+        end
+        classpath
+      end
+    end
+    
+    # Returns true if the JVM is loaded with all the libraries loaded on the classpath.
+    def loaded?
+      @loaded
     end
 
     # Most platforms requires tools.jar to be on the classpath, tools.jar contains the

data/lib/buildr/java/packaging.rb

@@ -52,12 +52,8 @@ module Buildr #:nodoc:
           #
           # Parse the MANIFEST.MF entry of a ZIP (or JAR) file and return a new Manifest.
           def from_zip(file)
-            Zip::ZipInputStream::open(file.to_s) do |zip|
-              while (entry = zip.get_next_entry)
-                if entry.name == 'META-INF/MANIFEST.MF'
-                  return Manifest.parse zip.read
-                end
-              end
+            Zip::File.open(file.to_s) do |zip|
+              return Manifest.parse zip.read('META-INF/MANIFEST.MF') if zip.find_entry('META-INF/MANIFEST.MF')
             end
             Manifest.new
           end
@@ -71,7 +67,7 @@ module Buildr #:nodoc:
           def update_manifest(file)
             manifest = from_zip(file)
             result = yield manifest
-            Zip::ZipFile.open(file.to_s) do |zip|
+            Zip::File.open(file.to_s) do |zip|
               zip.get_output_stream('META-INF/MANIFEST.MF') do |out|
                 out.write manifest.to_s
                 out.write "\n"
@@ -469,7 +465,7 @@ module Buildr #:nodoc:
             Manifest.update_manifest(task) do |manifest|
               class_path = manifest.main['Class-Path'].to_s.split
               included_libs = class_path.map { |fn| fn.pathmap('%f') }
-              Zip::ZipFile.foreach(task.to_s) do |entry|
+              Zip::File.foreach(task.to_s) do |entry|
                 included_libs << entry.name.pathmap('%f') if entry.file? && entry.name =~ /^WEB-INF\/lib\/[^\/]+$/
               end
               # Include all other libraries in the classpath.

data/lib/buildr/java/pom.rb

@@ -17,10 +17,10 @@
 module Buildr
   class POM
 
-    POM_TO_SPEC_MAP = { :group=>"groupId", :id=>"artifactId", :type=>"type",
-      :version=>"version", :classifier=>"classifier", :scope=>"scope" }
-    SCOPES_TRANSITIVE = [nil, "compile", "runtime"]
-    SCOPES_WE_USE = SCOPES_TRANSITIVE + ["provided"]
+    POM_TO_SPEC_MAP = { :group=> 'groupId', :id=> 'artifactId', :type=> 'type',
+      :version=> 'version', :classifier=> 'classifier', :scope=> 'scope'}
+    SCOPES_TRANSITIVE = [nil, 'compile', 'runtime']
+    SCOPES_WE_USE = SCOPES_TRANSITIVE + ['provided']
 
     # POM project as Hash (using XmlSimple).
     attr_reader :project
@@ -57,7 +57,7 @@ module Buildr
           end
           pom
         else
-          raise ArgumentError, "Expecting Hash spec, Artifact, file name or file task"
+          raise ArgumentError, 'Expecting Hash spec, Artifact, file name or file task'
         end
       end
 
@@ -92,9 +92,9 @@ module Buildr
       # try to cache dependencies also
       @depends_for_scopes ||= {}
       unless depends = @depends_for_scopes[options]
-        declared = project["dependencies"].first["dependency"] rescue nil
+        declared = project['dependencies'].first['dependency'] rescue nil
         depends = (declared || [])
-        depends = depends.reject { |dep| value_of(dep["optional"]) =~ /true/ } unless options[:optional]
+        depends = depends.reject { |dep| value_of(dep['optional']) =~ /true/ } unless options[:optional]
         depends = depends.map { |dep|
             spec = pom_to_hash(dep, properties)
             apply = managed(spec)
@@ -106,7 +106,7 @@ module Buildr
             if options[:scopes].include?(spec[:scope])
               spec.delete(:scope)
 
-              exclusions = dep["exclusions"].first["exclusion"] rescue nil
+              exclusions = dep['exclusions'].first['exclusion'] rescue nil
               transitive_deps = POM.load(spec).dependencies(:exclusions => exclusions, :scopes => (options[:scopes_transitive] || SCOPES_TRANSITIVE) ) rescue []
 
               [Artifact.to_spec(spec)] + transitive_deps
@@ -124,12 +124,17 @@ module Buildr
     # properties for groupId, artifactId, version and packaging.
     def properties()
       @properties ||= begin
-        pom = ["groupId", "artifactId", "version", "packaging"].inject({}) { |hash, key|
+        pom = %w(groupId artifactId version packaging).inject({}) { |hash, key|
           value = project[key] || (parent ? parent.project[key] : nil)
           hash[key] = hash["pom.#{key}"] = hash["project.#{key}"] = value_of(value) if value
           hash
         }
-        props = project["properties"].first rescue {}
+        pom = %w(groupId artifactId version).inject(pom) { |hash, key|
+          value = parent.project[key]
+          hash[key] = hash["pom.parent.#{key}"] = hash["project.parent.#{key}"] = value_of(value) if value
+          hash
+        } if parent
+        props = project['properties'].first rescue {}
         props = props.inject({}) { |mapped, pair| mapped[pair.first] = value_of(pair.last, props) ; mapped }
         (parent ? parent.properties.merge(props) : props).merge(pom)
       end
@@ -148,7 +153,7 @@ module Buildr
           (parent ? parent.managed(spec) : nil)
       else
         @managed ||= begin
-          managed = project["dependencyManagement"].first["dependencies"].first["dependency"] rescue nil
+          managed = project['dependencyManagement'].first['dependencies'].first['dependency'] rescue nil
           managed ? managed.map { |dep| pom_to_hash(dep, properties) } : []
         end
       end
@@ -179,7 +184,7 @@ module Buildr
         spec[pair.first] = value_of(element[pair.last], substitute) if element[pair.last]
         spec
       }
-      {:scope => "compile", :type => "jar"}.merge(hash)
+      {:scope => 'compile', :type => 'jar'}.merge(hash)
     end
 
   end

data/lib/buildr/java/rjb.rb

@@ -65,7 +65,7 @@ ENV_JAVA = {}
 #    with a partial classpath, or before all remote repositories are listed.
 # 4. Check on a clean build with empty local repository.
 module Java
-
+  
   module Package #:nodoc:
 
     def method_missing(sym, *args, &block)
@@ -78,7 +78,7 @@ module Java
   end
 
   class << self
-
+    
     # Returns the classpath, an array listing directories, JAR files and
     # artifacts.  Use when loading the extension to add any additional
     # libraries used by that extension.
@@ -86,7 +86,25 @@ module Java
     # For example, Ant is loaded as follows:
     #   Java.classpath << 'org.apache.ant:ant:jar:1.7.0'
     def classpath
-      @classpath ||= []
+      @classpath ||= begin
+        classpath = []
+        class << classpath
+          
+          def new_add(*args)
+            warn 'Java is already loaded' if Java.loaded?
+            send(:old_add, *args)
+          end
+          
+          alias_method :old_add, :<<
+          alias_method :<<, :new_add
+        end
+        classpath
+      end
+    end
+    
+    # Returns true if the JVM is loaded with all the libraries loaded on the classpath.
+    def loaded?
+      @loaded
     end
 
     # Most platforms requires tools.jar to be on the classpath, tools.jar contains the

data/lib/buildr/java/tests.rb

@@ -108,13 +108,6 @@ module Buildr #:nodoc:
         end
         @dependencies
       end
-
-    private
-      def const_missing(const)
-        return super unless const == :REQUIRES # TODO: remove in 1.5
-        Buildr.application.deprecated 'Please use JMock.dependencies/.version instead of JMock::REQUIRES/VERSION'
-        dependencies
-      end
     end
   end
 
@@ -205,13 +198,6 @@ module Buildr #:nodoc:
       def ant_taskdef #:nodoc:
         "org.apache.ant:ant-junit:jar:#{Ant.version}"
       end
-
-    private
-      def const_missing(const)
-        return super unless const == :REQUIRES # TODO: remove in 1.5
-        Buildr.application.deprecated 'Please use JUnit.dependencies/.version instead of JUnit::REQUIRES/VERSION'
-        dependencies
-      end
     end
 
     def tests(dependencies) #:nodoc:
@@ -308,13 +294,6 @@ module Buildr #:nodoc:
         return ["org.testng:testng:jar:jdk15:#{version}"] + JMock.dependencies if version < "6.0"
         ["org.testng:testng:jar:#{version}",'com.beust:jcommander:jar:1.27'] + JMock.dependencies
       end
-
-    private
-      def const_missing(const)
-        return super unless const == :REQUIRES # TODO: remove in 1.5
-        Buildr.application.deprecated 'Please use TestNG.dependencies/.version instead of TestNG::REQUIRES/VERSION'
-        dependencies
-      end
     end
 
     def tests(dependencies) #:nodoc:

data/lib/buildr/packaging/archive.rb

@@ -292,7 +292,7 @@ module Buildr #:nodoc:
 
       def expand(file_map, path)
         @includes = ['*'] if @includes.empty?
-        Zip::ZipFile.open(@zip_file) do |source|
+        Zip::File.open(@zip_file) do |source|
           source.entries.reject { |entry| entry.directory? }.each do |entry|
             if @includes.any? { |pattern| File.fnmatch(pattern, entry.name) } &&
                !@excludes.any? { |pattern| File.fnmatch(pattern, entry.name) }

data/lib/buildr/packaging/artifact.rb

@@ -35,6 +35,7 @@ module Buildr #:nodoc:
   module ActsAsArtifact
 
     ARTIFACT_ATTRIBUTES = [:group, :id, :type, :classifier, :version]
+    MAVEN_METADATA = "maven_metadata.xml"
 
     class << self
     private
@@ -75,6 +76,11 @@ module Buildr #:nodoc:
     def snapshot?
       version =~ /-SNAPSHOT$/
     end
+    
+    def final_version
+      return version unless snapshot?
+      Time.now.strftime("%Y%m%d.%H%M%S")
+    end
 
     # :call-seq:
     #   to_spec_hash => Hash
@@ -151,6 +157,27 @@ module Buildr #:nodoc:
         end
       end
     end
+    
+    # :call-seq:
+    #   maven_metadata_xml => string
+    #
+    # Creates Maven Metadata XML content for this artifact.
+    def maven_metadata_xml
+      xml = Builder::XmlMarkup.new(:indent=>2)
+      xml.instruct!
+      xml.metadata do
+        xml.groupId       group
+        xml.artifactId    id
+        xml.version       version
+        xml.versioning do
+          xml.snapshot do
+            xml.timestamp final_version
+            xml.buildNumber 1
+          end
+          xml.lastupdated Time.now.strftime("%Y%m%d%H%M%S")
+        end
+      end
+    end
 
     def install
       invoke
@@ -201,7 +228,7 @@ module Buildr #:nodoc:
       uri.user = upload_to[:username] if upload_to[:username]
       uri.password = upload_to[:password] if upload_to[:password]
 
-      path = group.gsub('.', '/') + "/#{id}/#{version}/#{File.basename(name)}"
+      path = group.gsub('.', '/') + "/#{id}/#{version}/#{upload_name}"
 
       unless task = Buildr.application.lookup(uri+path)
         deps = [self]
@@ -212,6 +239,10 @@ module Buildr #:nodoc:
           options = upload_to[:options] || {:permissions => upload_to[:permissions]}
           info "Deploying #{to_spec}"
           URI.upload uri + path, name, options
+          if snapshot? && pom != self
+             maven_metadata = group.gsub('.', '/') + "/#{id}/#{version}/#{MAVEN_METADATA}"
+             URI.write uri + maven_metadata, maven_metadata_xml, :permissions => upload_to[:permissions]
+          end
         end
       end
       task
@@ -229,6 +260,16 @@ module Buildr #:nodoc:
     def group_path
       group.gsub('.', '/')
     end
+    
+    def upload_name
+      return File.basename(name) unless snapshot?
+      return File.basename(name).gsub(/SNAPSHOT/, "#{final_version}-1")
+    end
+    
+    def extract_type(type)
+      return :jar if type == :bundle
+      type
+    end
 
   end
 
@@ -335,7 +376,7 @@ module Buildr #:nodoc:
       def hash_to_file_name(hash)
         version = "-#{hash[:version]}" if hash[:version]
         classifier = "-#{hash[:classifier]}" if hash[:classifier]
-        "#{hash[:id]}#{version}#{classifier}.#{hash[:type] || DEFAULT_TYPE}"
+        "#{hash[:id]}#{version}#{classifier}.#{extract_type(hash[:type]) || DEFAULT_TYPE}"
       end
 
     end
@@ -426,7 +467,7 @@ module Buildr #:nodoc:
     # which they are returned from #remote, until successful.
     def download
       trace "Downloading #{to_spec}"
-      remote = Buildr.repositories.remote.map { |repo_url| URI === repo_url ? repo_url : URI.parse(repo_url) }
+      remote = Buildr.repositories.remote_uri
       remote = remote.each { |repo_url| repo_url.path += '/' unless repo_url.path[-1] == '/' }
       fail "Unable to download #{to_spec}. No remote repositories defined." if remote.empty?
       exact_success = remote.find do |repo_url|
@@ -623,6 +664,44 @@ module Buildr #:nodoc:
       spec = Artifact.to_hash(spec)
       File.join(local, spec[:group].split('.'), spec[:id], spec[:version], Artifact.hash_to_file_name(spec))
     end
+    
+    # :call-seq:
+    #   mirrors => Array
+    #
+    # Returns an array of all the mirror repository URLs.
+    #
+    # Mirrors override remote repositories defined in the project.
+    # The best way is to add repositories to the user settings file under '$HOME/.buildr/settings.yaml'.
+    # For example:
+    #   repositories:
+    #     mirrors:
+    #     - http://example.com/repository
+    def mirrors
+      unless @mirrors
+        @mirrors = [Buildr.settings.user, Buildr.settings.build].inject([]) { |repos, hash|
+          repos | Array(hash['repositories'] && hash['repositories']['mirrors'])
+        }
+      end
+      @mirrors
+    end
+    
+    # :call-seq:
+    #   remote = Array
+    #   remote = url
+    #   remote = nil
+    #
+    # With a String argument, clears the array and set it to that single URL.
+    #
+    # With an Array argument, clears the array and set it to these specific URLs.
+    #
+    # With nil, clears the array.
+    def mirrors=(urls)
+      case urls
+      when nil then @mirrors = nil
+      when Array then @mirrors = urls.dup
+      else @mirrors = [urls.to_s]
+      end
+    end
 
     # :call-seq:
     #   remote => Array
@@ -643,6 +722,10 @@ module Buildr #:nodoc:
     #     - http://example.com/repo
     #     - http://elsewhere.com/repo
     def remote
+      unless mirrors.empty?
+        info "Remote repositories overridden by mirrors #{mirrors.map(&:to_s).join(", ")}"
+        mirrors
+      end
       unless @remote
         @remote = [Buildr.settings.user, Buildr.settings.build].inject([]) { |repos, hash|
           repos | Array(hash['repositories'] && hash['repositories']['remote'])
@@ -650,6 +733,52 @@ module Buildr #:nodoc:
       end
       @remote
     end
+    
+    # :call-seq:
+    #   remote_uri => Array
+    #
+    # Returns an array of all the remote repositories as instances of URI
+    #
+    # Supports 
+    #  * String urls: "http://example.com/repo"
+    #  * URI: URI.parse( "http://example.com/repo" )
+    #  * Hash: { :url => "http://example.com/repo", :user => "user", :pass => "pass" }
+    #
+    def remote_uri
+      remote
+      
+      uris = []
+      @remote.each do |repo|
+        case repo
+        when nil then
+          # ignore nil
+        when URI then
+          uris << repo
+        when Hash then
+          url = (repo[:url] || repo['url'] )
+          if url
+            uri = URI.parse(url)
+            if ( username = (repo[:username] || repo['username'] || repo[:user] || repo['user']) )
+              uri.user = username
+            end
+            
+            if ( password = (repo[:password] || repo['password'] || repo[:pass] || repo['pass']) )
+              uri.password = password
+            end
+            uris << uri
+          else
+            fail( "Repository Hash format missing url: #{repo}" )
+          end
+          
+        when String then 
+          uris << URI.parse(repo)
+        else 
+          fail( "Unsupported Repository format: #{repo}" )
+        end
+      end
+      
+      uris
+    end
 
     # :call-seq:
     #   remote = Array