buildr 1.4.6-java → 1.4.7-java

data/lib/buildr/java/rjb.rb

@@ -74,7 +74,7 @@ module Java
 
   # On OS X we know where the default JDK is. We can try to guess for other OS.
   # We set JAVA_HOME early so we can use it without calling Java.load first.
-  ENV['JAVA_HOME'] ||= '/System/Library/Frameworks/JavaVM.framework/Home' if Config::CONFIG['host_os'] =~ /darwin/i
+  ENV['JAVA_HOME'] ||= '/System/Library/Frameworks/JavaVM.framework/Home' if RbConfig::CONFIG['host_os'] =~ /darwin/i
 
   class << self
 

data/lib/buildr/java/test_result.rb

@@ -13,9 +13,8 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-# necessary to require YAML even if it is mentioned by autoload as it fails on some platforms.
+# It is necessary to require these files here as the bdd plugin directly includes this file
 require 'yaml'
-require 'fileutils'
 require 'rspec/core/formatters/base_formatter'
 
 module Buildr #:nodoc:

data/lib/buildr/java/tests.rb

@@ -1,3 +1,4 @@
+
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with this
 # work for additional information regarding copyright ownership.  The ASF
@@ -13,12 +14,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-require 'buildr/core/build'
-require 'buildr/core/compile'
-require 'buildr/java/ant'
-
-
 module Buildr
 
   class TestFramework::Java < TestFramework::Base
@@ -328,6 +323,14 @@ module Buildr
     def run(tests, dependencies) #:nodoc:
       cmd_args = ['-log', '2', '-sourcedir', task.compile.sources.join(';'), '-suitename', task.project.id ]
       cmd_args << '-d' << task.report_to.to_s
+      exclude_args = options[:excludegroups] || []
+      if !exclude_args.empty?
+        cmd_args << '-excludegroups' << exclude_args.join(",")
+      end
+      groups_args = options[:groups] || []
+      if !groups_args.empty?
+        cmd_args << '-groups' << groups_args.join(",")
+      end
       # run all tests in the same suite
       cmd_args << '-testclass' << tests
 
@@ -355,8 +358,67 @@ module Buildr
 
   end
 
+  # A composite test framework that runs multiple other test frameworks.
+  #
+  # e.g.,
+  #        test.using :multitest, :frameworks => [ Buildr::JUnit, Buildr::TestNG ], :options = {
+  #          :junit => { :fork => true },
+  #          :testng => { ... }
+  #        }
+  #
+  class MultiTest < Buildr::TestFramework::Java
+    # TODO: Support multiple test report locations, one per framework
+
+    class << self
+      def applies_to?(project)  #:nodoc:
+        false # no auto-detection, should be set explicitly
+      end
+    end
+
+    attr_accessor :frameworks
+
+    def initialize(task, options) #:nodoc:
+      super
+      fail "Missing :frameworks option" unless options[:frameworks]
+      @frameworks = options[:frameworks].map do |f|
+        framework_options = (options[:options] || {})[f.to_sym] || {}
+        f.new(task, options)
+      end
+    end
+
+    def dependencies #:nodoc:
+      unless @dependencies
+        @dependencies = TestFramework::Java.dependencies
+        @dependencies += @frameworks.map { |f| f.dependencies }.flatten
+      end
+      @dependencies
+    end
+
+
+    def tests(dependencies)
+      @frameworks.map { |f| f.tests(dependencies) }.flatten
+    end
+
+    def run(tests, dependencies)  #:nodoc:
+      framework_for_test = @frameworks.inject({}) do |hash, f|
+        f.tests(dependencies).each { |t| hash[t] = f }
+        hash
+      end
+
+      tests_by_framework = tests.group_by { |t| framework_for_test[t] }
+
+      passed = []
+      tests_by_framework.each do |f, tests|
+        passed += f.run(tests, dependencies)
+      end
+      passed
+    end
+  end # MultiTest
+
 end # Buildr
 
 
 Buildr::TestFramework << Buildr::JUnit
 Buildr::TestFramework << Buildr::TestNG
+Buildr::TestFramework << Buildr::MultiTest
+

data/lib/buildr/packaging/archive.rb

@@ -13,7 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
 module Buildr
 
   # Base class for ZipTask, TarTask and other archives.

data/lib/buildr/packaging/artifact.rb

@@ -13,13 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-require 'buildr/core/project'
-require 'buildr/core/transports'
-require 'buildr/packaging/artifact_namespace'
-require 'fileutils'
-
-
 module Buildr
 
   desc 'Download all artifacts'
@@ -809,28 +802,38 @@ module Buildr
       when Struct
         set |= artifacts(spec.values)
       else
-        fail "Invalid artifact specification in #{specs.inspect}"
+        if spec.respond_to? :to_spec
+          set |= artifacts(spec.to_spec)
+        else
+          fail "Invalid artifact specification in #{specs.inspect}"
+        end
       end
     end
   end
 
-  def transitive(*specs)
-    specs.flatten.inject([]) do |set, spec|
+  def transitive(*args)
+    options = Hash === args.last ? args.pop : {}
+    dep_opts = {
+      :scopes   => options[:scopes] || [nil, "compile", "runtime", "provided"],
+      :optional => options[:optional]
+    }
+    specs = args.flatten
+    specs.inject([]) do |set, spec|
       case spec
       when /([^:]+:){2,4}/ # A spec as opposed to a file name.
         artifact = artifact(spec)
         set |= [artifact] unless artifact.type == :pom
-        set |= POM.load(artifact.pom).dependencies.map { |spec| artifact(spec) }
+        set |= POM.load(artifact.pom).dependencies(dep_opts).map { |spec| artifact(spec) }
       when Hash
-        set |= [transitive(spec)]
+        set |= [transitive(spec, options)]
       when String # Must always expand path.
-        set |= transitive(file(File.expand_path(spec)))
+        set |= transitive(file(File.expand_path(spec)), options)
       when Project
-        set |= transitive(spec.packages)
+        set |= transitive(spec.packages, options)
       when Rake::Task
-        set |= spec.respond_to?(:to_spec) ? transitive(spec.to_spec) : [spec]
+        set |= spec.respond_to?(:to_spec) ? transitive(spec.to_spec, options) : [spec]
       when Struct
-        set |= transitive(spec.values)
+        set |= transitive(spec.values, options)
       else
         fail "Invalid artifact specification in: #{specs.to_s}"
       end

data/lib/buildr/packaging/artifact_namespace.rb

@@ -13,10 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-require 'buildr/packaging/version_requirement'
-
-
 module Buildr
 
   # An ArtifactNamespace is a hierarchical dictionary used to manage ArtifactRequirements.
@@ -224,6 +220,32 @@ module Buildr
         const_set(:ROOT, new('root'))
       end
 
+      # Differs from Artifact.to_hash in that 1) it does not choke when version isn't present
+      # and 2) it assumes that if an artifact spec ends with a colon, e.g. "org.example:library:jdk5:"
+      # it indicates the last segment ("jdk5") is a classifier.
+      def to_hash(spec)
+        if spec.respond_to?(:to_spec)
+          to_hash spec.to_spec
+        elsif Hash === spec
+          return spec
+        elsif String === spec || Symbol === spec
+          spec = spec.to_s
+          if spec[-1,1] == ':'
+            group, id, type, classifier, *rest = spec.split(':').map { |part| part.empty? ? nil : part }
+          else
+            group, id, type, version, *rest = spec.split(':').map { |part| part.empty? ? nil : part }
+            unless rest.empty?
+              # Optional classifier comes before version.
+              classifier, version = version, rest.shift
+            end
+          end
+          fail "Expecting <group:id:type:version> or <group:id:type:classifier:version>, found <#{spec}>" unless rest.empty?
+          { :group => group, :id => id, :type => type, :version => version, :classifier => classifier }.reject { |k,v| v == nil }
+        else
+          fail "Unexpected artifact spec: #{spec.inspect}"
+        end
+      end
+
       # Populate namespaces from a hash of hashes.
       # The following example uses the profiles yaml to achieve this.
       #
@@ -400,13 +422,19 @@ module Buildr
           copy_attrs(spec)
         else
           spec = requirement_hash(spec)
-          apply_spec(spec[:spec])
+          apply_spec_no_validation(spec[:spec])
           self.name = spec[:name]
           @requirement = spec[:requirement]
           @version = @requirement.default if VersionRequirement.requirement?(@version)
         end
       end
 
+      def apply_spec_no_validation(spec)
+        spec = ArtifactNamespace.to_hash(spec)
+        ActsAsArtifact::ARTIFACT_ATTRIBUTES.each { |key| instance_variable_set("@#{key}", spec[key]) }
+        self
+      end
+
       # Copy attributes from other to this object
       def copy_attrs(other)
         (ActsAsArtifact::ARTIFACT_ATTRIBUTES + [:name, :requirement]).each do |attr|
@@ -433,22 +461,22 @@ module Buildr
           parts = spec.split(/\s*->\s*/, 3).map(&:strip)
           case parts.size
           when 1
-            result[:spec] = Artifact.to_hash(parts.first)
+            result[:spec] = ArtifactNamespace.to_hash(parts.first)
           when 2
             if /^\w+$/ === parts.first
               result[:name] = parts.first
-              result[:spec] = Artifact.to_hash(parts.last)
+              result[:spec] = ArtifactNamespace.to_hash(parts.last)
             else
-              result[:spec] = Artifact.to_hash(parts.first)
+              result[:spec] = ArtifactNamespace.to_hash(parts.first)
               result[:requirement] = VersionRequirement.create(parts.last)
             end
           when 3
             result[:name] = parts.first
-            result[:spec] = Artifact.to_hash(parts[1])
+            result[:spec] = ArtifactNamespace.to_hash(parts[1])
             result[:requirement] = VersionRequirement.create(parts.last)
           end
         else
-          result[:spec] = Artifact.to_hash(spec)
+          result[:spec] = ArtifactNamespace.to_hash(spec)
         end
         result[:name] ||= result[:spec][:id].to_s.to_sym
         result[:requirement] ||= VersionRequirement.create(result[:spec][:version])
@@ -458,7 +486,7 @@ module Buildr
       # Test if this requirement is satisfied by an artifact spec.
       def satisfied_by?(spec)
         return false unless requirement
-        spec = Artifact.to_hash(spec)
+        spec = ArtifactNamespace.to_hash(spec)
         hash = to_spec_hash
         hash.delete(:version)
         version = spec.delete(:version)
@@ -499,24 +527,23 @@ module Buildr
 
       # Return an artifact spec without the version part.
       def unversioned_spec
-        str = to_spec
-        return nil if str =~ /^:+/
-        ary = str.split(':')
-        ary = ary[0...-1] if ary.size > 3
-        ary.join(':')
+        hash = to_spec_hash
+        return nil if hash.values.compact.length <= 1
+        if hash[:classifier]
+          "#{hash[:group]}:#{hash[:id]}:#{hash[:type]}:#{hash[:classifier]}:"
+        else
+          "#{hash[:group]}:#{hash[:id]}:#{hash[:type]}"
+        end
       end
 
       class << self
-        # Return an artifact spec without the version part.
         def unversioned_spec(spec)
-          str = spec.to_s
-          return nil if str =~ /^:+/
-          ary = str.split(':')
-          ary = ary[0...-1] if ary.size > 3
-          if ary.size > 2
-            ary.join(':')
+          hash = ArtifactNamespace.to_hash(spec)
+          return nil if hash.values.compact.length <= 1
+          if hash[:classifier]
+            "#{hash[:group]}:#{hash[:id]}:#{hash[:type]}:#{hash[:classifier]}:"
           else
-            new(spec).unversioned_spec
+            "#{hash[:group]}:#{hash[:id]}:#{hash[:type]}"
           end
         end
       end

data/lib/buildr/packaging/artifact_search.rb

@@ -14,8 +14,7 @@
 # the License.
 
 
-require 'hpricot'
-
+autoload :Hpricot, 'hpricot'
 
 module Buildr
 

data/lib/buildr/packaging/gems.rb

@@ -13,13 +13,9 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-require 'buildr/packaging/package'
-require 'buildr/packaging/archive'
-gem 'rubyforge' ; autoload :RubyForge, 'rubyforge'
+autoload :RubyForge, 'rubyforge'
 Gem.autoload :Package, 'rubygems/package'
 
-
 module Buildr
 
   class PackageGemTask < ArchiveTask
@@ -39,14 +35,6 @@ module Buildr
       @spec
     end
 
-    def install
-      Util::Gems.command 'install', name
-    end
-
-    def uninstall
-      Util::Gems.command 'uninstall', spec.name, '-v', spec.version.to_s
-    end
-
     def upload
       rubyforge = RubyForge.new
       rubyforge.login

data/lib/buildr/packaging/package.rb

@@ -13,12 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-require 'buildr/core/project'
-require 'buildr/core/compile'
-require 'buildr/packaging/artifact'
-
-
 module Buildr
   # Methods added to Project to support packaging and tasks for packaging,
   # installing and uploading packages.

data/lib/buildr/packaging/tar.rb

@@ -13,10 +13,8 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-require 'buildr/packaging/archive'
-gem 'minitar' ; autoload :Archive, 'archive/tar/minitar'
-
+autoload :Archive, 'archive/tar/minitar'
+autoload :Zlib, 'zlib'
 
 module Buildr
 

data/lib/buildr/packaging/version_requirement.rb

@@ -49,7 +49,7 @@ module Buildr
     class << self
       # is +str+ a version string?
       def version?(str)
-        /^\s*\d[#{VER_CHARS}]*\s*$/ === str
+        /^\s*r?\d[#{VER_CHARS}]*\s*$/ === str
       end
 
       # is +str+ a version requirement?

data/lib/buildr/packaging/zip.rb

@@ -13,7 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
 if RUBY_VERSION >= '1.9.0' # Required to properly load RubyZip under Ruby 1.9
   $LOADED_FEATURES.unshift 'ftools'
   require 'fileutils'
@@ -178,7 +177,7 @@ module Zip #:nodoc:
 
   class ZipEntrySet
     def <<(entry)
-      @entrySet[entry.to_s] = entry if entry != nil
+      @entrySet[entry.name.to_s] = entry if entry != nil
     end
   end
 end

data/lib/buildr/packaging/ziptask.rb

@@ -13,10 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-require 'buildr/packaging/archive'
-
-
 module Buildr
 
   # The ZipTask creates a new Zip file. You can include any number of files and and directories,

data/lib/buildr/run.rb

@@ -13,7 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
 module Buildr
   module Run
     include Extension
@@ -172,8 +171,9 @@ module Buildr
     end
 
     after_define(:run => :test) do |project|
-      project.run.with project.test.compile.dependencies
-      project.run.with project.test.compile.target if project.test.compile.target
+      project.run.with project.compile.dependencies
+      project.run.with project.resources.target if project.resources.target
+      project.run.with project.compile.target if project.compile.target
     end
 
     # :call-seq: