buildr 1.4.6-java → 1.4.7-java

data/lib/buildr/java/ant.rb

@@ -17,15 +17,12 @@
 gem 'atoulme-Antwrap'
 autoload :Antwrap, 'antwrap'
 autoload :Logger, 'logger'
-require 'buildr/core/project'
-require 'buildr/core/help'
-
 
 module Buildr
   module Ant
 
     # Which version of Ant we're using by default.
-    VERSION = '1.8.0'
+    VERSION = '1.8.3'
 
     class << self
       # Current version of Ant being used.
@@ -37,8 +34,7 @@ module Buildr
       def dependencies
         # Ant-Trax required for running the JUnitReport task, and there's no other place
         # to put it but the root classpath.
-        @dependencies ||= ["org.apache.ant:ant:jar:#{version}", "org.apache.ant:ant-launcher:jar:#{version}",
-          "org.apache.ant:ant-trax:jar:#{version}"]
+        @dependencies ||= ["org.apache.ant:ant:jar:#{version}", "org.apache.ant:ant-launcher:jar:#{version}"]
       end
 
     private

data/lib/buildr/java/bdd.rb

@@ -13,10 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-require 'buildr/java/tests'
-require 'buildr/java/test_result'
-
 module Buildr
 
   # Mixin for test frameworks using src/spec/{lang}
@@ -47,7 +43,7 @@ module Buildr
   module TestFramework::JRubyBased
     extend self
 
-    VERSION = '1.5.4' # Note: JtestR 0.6.0 only works up to 1.5.4
+    VERSION = '1.6.2'
 
     class << self
       def version
@@ -119,7 +115,7 @@ module Buildr
     end
 
     def jruby_home
-      @jruby_home ||= RUBY_PLATFORM =~ /java/ ? Config::CONFIG['prefix'] :
+      @jruby_home ||= RUBY_PLATFORM =~ /java/ ? RbConfig::CONFIG['prefix'] :
         ( ENV['JRUBY_HOME'] || File.expand_path('~/.jruby') )
     end
 
@@ -170,7 +166,7 @@ module Buildr
        require 'jruby'
        def JRuby.gem(name, version = '>0', *args)
           require 'rbconfig'
-          jruby_home = Config::CONFIG['prefix']
+          jruby_home = RbConfig::CONFIG['prefix']
           expected_version = '#{TestFramework::JRubyBased.version}'
           unless JRUBY_VERSION >= expected_version
             fail "Expected JRuby version \#{expected_version} installed at \#{jruby_home} but got \#{JRUBY_VERSION}"
@@ -198,7 +194,7 @@ module Buildr
       runner.requires ||= []
       runner.requires.unshift File.join(File.dirname(__FILE__), 'test_result')
       runner.gems ||= {}
-      runner.rspec ||= ['--format', 'progress', '--format', "html:#{runner.html_report}"]
+      runner.rspec ||= ['--format', 'progress', '--format', 'documentation']
       runner.format.each { |format| runner.rspec << '--format' << format } if runner.format
       runner.rspec.push '--format', "Buildr::TestFramework::TestResult::YamlFormatter"
       runner.rspec.push '-o', runner.result
@@ -244,7 +240,7 @@ module Buildr
 
     def runner_config
       runner = super
-      runner.gems.update 'rspec' => '~> 2.1.0'
+      runner.gems.update 'rspec' => '~> 2.9.0'
       runner.requires.unshift 'rspec'
       runner
     end
@@ -276,119 +272,6 @@ module Buildr
 
   end
 
-  # <a href="http://jtestr.codehaus.org/">JtestR</a> is a framework for BDD and TDD using JRuby and ruby tools.
-  # To test your project with JtestR use:
-  #   test.using :jtestr
-  #
-  #
-  # Support the following options:
-  # * :config     -- path to JtestR config file. defaults to @spec/ruby/jtestr_config.rb@
-  # * :gems       -- A hash of gems to install before running the tests.
-  #                  The keys of this hash are the gem name, the value must be the required version.
-  # * :requires   -- A list of ruby files to require before running the specs
-  #                  Mainly used if an rspec format needs to require some file.
-  # * :format     -- A list of valid Rspec --format option values. (defaults to 'progress')
-  # * :output     -- File path to output dump. @false@ to supress output
-  # * :fork       -- Create a new JavaVM to run the tests on
-  # * :properties -- Hash of properties passed to the test suite.
-  # * :java_args  -- Arguments passed to the JVM.
-  class JtestR < TestFramework::JavaBDD
-    @lang = :ruby
-    @bdd_dir = :spec
-
-    include TestFramework::JRubyBased
-
-    VERSION = '0.6'
-
-    # pattern for rspec stories
-    STORY_PATTERN    = /_(steps|story)\.rb$/
-    # pattern for test_unit files
-    TESTUNIT_PATTERN = /(_test|Test)\.rb$|(tc|ts)[^\\\/]+\.rb$/
-    # pattern for test files using http://expectations.rubyforge.org/
-    EXPECT_PATTERN   = /_expect\.rb$/
-
-    TESTS_PATTERN = [STORY_PATTERN, TESTUNIT_PATTERN, EXPECT_PATTERN] + RSpec::TESTS_PATTERN
-
-    class << self
-
-      def version
-        Buildr.settings.build['jtestr'] || VERSION
-      end
-
-      def dependencies
-        unless @dependencies
-          super
-          @dependencies |= ["org.jtestr:jtestr:jar:#{version}"] +
-                           JUnit.dependencies + TestNG.dependencies
-        end
-        @dependencies
-      end
-
-      def applies_to?(project) #:nodoc:
-        File.exist?(project.path_to(:source, bdd_dir, lang, 'jtestr_config.rb')) ||
-          Dir[project.path_to(:source, bdd_dir, lang, '**/*.rb')].any? { |f| TESTS_PATTERN.any? { |r| r === f } } ||
-          JUnit.applies_to?(project) || TestNG.applies_to?(project)
-      end
-
-    private
-      def const_missing(const)
-        return super unless const == :REQUIRES # TODO: remove in 1.5
-        Buildr.application.deprecated 'Please use JtestR.dependencies/.version instead of JtestR::REQUIRES/VERSION'
-        dependencies
-      end
-
-    end
-
-    def initialize(task, options) #:nodoc:
-      super
-      [:test, :spec].each do |usage|
-        java_tests = task.project.path_to(:source, usage, :java)
-        task.compile.from java_tests if File.directory?(java_tests)
-        resources = task.project.path_to(:source, usage, :resources)
-        task.resources.from resources if File.directory?(resources)
-      end
-    end
-
-    def user_config
-      options[:config] || task.project.path_to(:source, bdd_dir, lang, 'jtestr_config.rb')
-    end
-
-    def tests(dependencies) #:nodoc:
-      dependencies |= [task.compile.target.to_s]
-      types = { :story => STORY_PATTERN, :rspec => RSpec::TESTS_PATTERN,
-                :testunit => TESTUNIT_PATTERN, :expect => EXPECT_PATTERN }
-      tests = types.keys.inject({}) { |h, k| h[k] = []; h }
-      tests[:junit] = JUnit.new(task, {}).tests(dependencies)
-      tests[:testng] = TestNG.new(task, {}).tests(dependencies)
-      Dir[task.project.path_to(:source, bdd_dir, lang, '**/*.rb')].each do |rb|
-        type = types.find { |k, v| Array(v).any? { |r| r === rb } }
-        tests[type.first] << rb if type
-      end
-      @jtestr_tests = tests
-      tests.values.flatten
-    end
-
-    def runner_config
-      runner = super
-      # JtestR 0.6.0 comes with rspec 1.3.0 (and any other jtestr dependency) included,
-      # so the rspec version used depends on the jtestr jar.
-      runner.gems.update 'rspec' => '=1.3.0'
-      runner.requires.clear
-      runner.requires.unshift 'jtestr'
-      runner.requires.unshift 'spec'
-      runner.requires.unshift File.join(File.dirname(__FILE__), 'jtestr_result')
-      runner.rspec = ['--format', 'progress', '--format', "html:#{runner.html_report}"]
-      runner.format.each { |format| runner.rspec << '--format' << format } if runner.format
-      runner.rspec.push '--format', "Buildr::JtestR::YamlFormatter:#{runner.result}"
-      runner
-    end
-
-    def runner_content(binding)
-      runner_erb = File.join(File.dirname(__FILE__), 'jtestr_runner.rb.erb')
-      Filter::Mapper.new(:erb, binding).transform(File.read(runner_erb), runner_erb)
-    end
-  end
-
   # JBehave is a Java BDD framework. To use in your project:
   #   test.using :jbehave
   #
@@ -458,6 +341,5 @@ module Buildr
 end
 
 Buildr::TestFramework << Buildr::RSpec
-Buildr::TestFramework << Buildr::JtestR
 Buildr::TestFramework << Buildr::JBehave
 

data/lib/buildr/java/cobertura.rb

@@ -13,14 +13,10 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-require 'buildr/java'
-
-
 module Buildr
 
   # Provides the <code>cobertura:html</code>, <code>cobertura:xml</code> and <code>cobertura:check</code> tasks.
-  # Require explicitly using <code>require "buildr/cobertura"</code>.
+  # Require explicitly using <code>require "buildr/java/cobertura"</code>.
   #
   # You can generate cobertura reports for a single project
   # using the project name as prefix:
@@ -38,6 +34,10 @@ module Buildr
   #      cobertura.exclude /*.Const(ants)?/i
   #   end
   #
+  # You can also specify the top level directory to which the top level cobertura tasks
+  # will generate reports by setting the value of the <code>Buildr::Cobertura.report_dir</code>
+  # configuration parameter.
+  #
   module Cobertura
 
     VERSION = '1.9.4.1'
@@ -65,12 +65,18 @@ module Buildr
         REQUIRES.artifacts
       end
 
+      attr_writer :report_dir
+
+      def report_dir
+        @report_dir || "reports/cobertura"
+      end
+
       def report_to(file = nil)
-        File.expand_path(File.join(*["reports/cobertura", file.to_s].compact))
+        File.expand_path(File.join(*[report_dir, file.to_s].compact))
       end
 
-      def data_file()
-        File.expand_path("reports/cobertura.ser")
+      def data_file
+        File.expand_path("#{report_dir}.ser")
       end
 
     end
@@ -266,9 +272,9 @@ module Buildr
       end
 
       [:xml, :html].each do |format|
-        report_target = report_to(format)
-        desc "Run the test cases and produce code coverage reports in #{report_target}"
+        desc "Run the test cases and produce code coverage reports"
         task format => ["instrument", "test"] do
+          report_target = report_to(format)
           if Buildr.projects.detect { |project| !project.compile.sources.empty? }
             info "Creating test coverage reports in #{report_target}"
             Buildr.ant "cobertura" do |ant|

data/lib/buildr/java/commands.rb

@@ -13,7 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
 # Base module for all things Java.
 module Java
 
@@ -56,12 +55,39 @@ module Java
         options[:properties].each { |k, v| cmd_args << "-D#{k}=#{v}" } if options[:properties]
         cmd_args += (options[:java_args] || (ENV['JAVA_OPTS'] || ENV['JAVA_OPTIONS']).to_s.split).flatten
         cmd_args += args.flatten.compact
-        unless Buildr.application.options.dryrun
-          info "Running #{name}" if name && options[:verbose]
-          block = lambda { |ok, res| fail "Failed to execute #{name}, see errors above" unless ok } unless block
-          cmd_args = cmd_args.map(&:inspect).join(' ') if Util.win_os?
-          sh(*cmd_args) do |ok, ps|
-            block.call ok, ps
+
+        tmp = nil
+        begin
+            # Windows can't handle cmd lines greater than 2048/8192 chars.
+            # If our cmd line is longer, we create a batch file and execute it instead.
+          if Util.win_os? &&  cmd_args.map(&:inspect).join(' ').size > 2048
+            # remove '-classpath' and the classpath itself from the cmd line.
+            cp_i = cmd_args.index{|x| x.starts_with('-classpath')}
+            2.times do
+              cmd_args.delete_at cp_i unless cp_i.nil?
+            end
+            # create tmp batch file.
+            tmp = Tempfile.new(['starter', '.bat'])
+            tmp.write "@echo off\n"
+            tmp.write "SET CLASSPATH=#{cp.join(File::PATH_SEPARATOR).gsub(%r{/}, '\\')}\n"
+            tmp.write cmd_args.map(&:inspect).join(' ')
+            tmp.close
+            # set new cmd line.
+            cmd_args = [tmp.path]
+          end
+          
+          unless Buildr.application.options.dryrun
+            info "Running #{name}" if name && options[:verbose]
+            block = lambda { |ok, res| fail "Failed to execute #{name}, see errors above" unless ok } unless block
+            cmd_args = cmd_args.map(&:inspect).join(' ') if Util.win_os?
+            sh(*cmd_args) do |ok, ps|
+              block.call ok, ps
+            end
+          end
+        ensure
+          unless tmp.nil?
+            tmp.close 
+            tmp.unlink
           end
         end
       end

data/lib/buildr/java/compiler.rb

@@ -13,13 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-require 'buildr/core/project'
-require 'buildr/core/common'
-require 'buildr/core/compile'
-require 'buildr/packaging'
-
-
 module Buildr
   module Compiler
 

data/lib/buildr/java/deprecated.rb

@@ -13,10 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-require 'buildr/core/project'
-
-
 module Java
 
   # *Deprecated:* In earlier versions, Java.wrapper served as a wrapper around RJB/JRuby.

data/lib/buildr/java/doc.rb

@@ -13,8 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-require 'buildr/core/doc'
-
 module Buildr
   module Doc
 

data/lib/buildr/java/emma.rb

@@ -13,10 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-require 'buildr/java'
-
-
 module Buildr
 
   # Provides the <code>emma:html</code> and <code>emma:xml</code> tasks.

data/lib/buildr/java/jruby.rb

@@ -13,11 +13,9 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
 require 'java'
 require 'jruby'
 
-
 # Buildr runs along side a JVM, using either RJB or JRuby.  The Java module allows
 # you to access Java classes and create Java objects.
 #

data/lib/buildr/java/packaging.rb

@@ -13,10 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-require 'buildr/packaging'
-
-
 module Buildr
   module Packaging #:nodoc:
 

data/lib/buildr/java/pom.rb

@@ -13,7 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
 module Buildr
   class POM
 
@@ -76,36 +75,44 @@ module Buildr
 
     # :call-seq:
     #   dependencies(scopes?) => artifacts
+    #   dependencies(:scopes = [:runtime, :test, ...], :optional = true) => artifacts
     #
     # Returns list of required dependencies as specified by the POM. You can specify which scopes
     # to use (e.g. "compile", "runtime"); use +nil+ for dependencies with unspecified scope.
-    # The default scopes are +nil+, "compile" and "runtime" (aka SCOPES_WE_USE).
-    def dependencies(scopes = SCOPES_WE_USE)
-      #try to cache dependencies also
+    # The default scopes are +nil+, "compile" and "runtime" (aka SCOPES_WE_USE) and no optional dependencies.
+    # Specifying optional = true will return all optional dependencies matching the given scopes.
+    def dependencies(options = {})
+      # backward compatibility
+      options = { :scopes => options } if Array === options
+
+      # support symbols, but don't fidget with nil
+      options[:scopes] = (options[:scopes] || SCOPES_WE_USE).map { |s| s.to_s if s }
+
+      # try to cache dependencies also
       @depends_for_scopes ||= {}
-      unless depends = @depends_for_scopes[scopes]
+      unless depends = @depends_for_scopes[options]
         declared = project["dependencies"].first["dependency"] rescue nil
-        depends = (declared || []).reject { |dep| value_of(dep["optional"]) =~ /true/ }.
-          map { |dep|
+        depends = (declared || [])
+        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)
             spec = apply.merge(spec) if apply
 
-            #calculate transitive dependencies
-            if scopes.include?(spec[:scope])
+            # calculate transitive dependencies
+            if options[:scopes].include?(spec[:scope])
               spec.delete(:scope)
 
-              exclusions = dep["exclusions"]["exclusion"] rescue nil
-              transitive_deps = POM.load(spec).dependencies(SCOPES_TRANSITIVE)
+              exclusions = dep["exclusions"].first["exclusion"] rescue nil
+              transitive_deps = POM.load(spec).dependencies(options[:scopes_transitive] || SCOPES_TRANSITIVE)
               transitive_deps = transitive_deps.reject{|dep|
-                exclusions.find {|ex| dep.index("#{dep['groupdId'].first}:#{dep['artifactId'].first}:") == 0}
+                exclusions.find {|ex| dep.index("#{ex['groupId'].first}:#{ex['artifactId'].first}:") == 0}
               } if exclusions
 
               [Artifact.to_spec(spec)] + transitive_deps
             end
           }.flatten.compact #.uniq_by{|spec| art = spec.split(':'); "#{art[0]}:#{art[1]}"}
-
-        @depends_for_scopes[scopes] = depends
+        @depends_for_scopes[options] = depends
       end
       depends
     end
@@ -123,7 +130,7 @@ module Buildr
           hash
         }
         props = project["properties"].first rescue {}
-        props = props.inject({}) { |mapped, pair| mapped[pair.first] = value_of(pair.last, pom) ; mapped }
+        props = props.inject({}) { |mapped, pair| mapped[pair.first] = value_of(pair.last, props) ; mapped }
         (parent ? parent.properties.merge(props) : props).merge(pom)
       end
     end
@@ -157,7 +164,8 @@ module Buildr
     # property substitution.
     def value_of(element, substitute = nil)
       value = element.to_a.join.strip
-      substitute ? value.gsub(/\$\{([^}]+)\}/) { |key| substitute[$1] } : value
+      value = value.gsub(/\$\{([^}]+)\}/) { |key| Array(substitute[$1]).join.strip } if substitute
+      value
     end
 
     # :call-seq: