buildr 1.4.5-java → 1.4.6-java

data/lib/buildr/java/bdd.rb

@@ -47,7 +47,7 @@ module Buildr
   module TestFramework::JRubyBased
     extend self
 
-    VERSION = '1.5.6'
+    VERSION = '1.5.4' # Note: JtestR 0.6.0 only works up to 1.5.4
 
     class << self
       def version
@@ -75,7 +75,7 @@ module Buildr
       def dependencies
         unless @dependencies
           super
-          unless RUBY_PLATFORM[/java/] && TestFramework::JRubyBased.jruby_installed?
+          if !RUBY_PLATFORM[/java/] && !TestFramework::JRubyBased.jruby_installed?
             @dependencies |= TestFramework::JRubyBased.dependencies
           end
         end
@@ -146,11 +146,13 @@ module Buildr
       cmd_options = java_args.last
       project = cmd_options.delete(:project)
       cmd_options[:classpath] ||= []
-      Dir.glob(File.join(jruby_home, 'lib', '*.jar')) { |jar| cmd_options[:classpath] << jar }
+      if jruby_home && jruby_home != ''
+        Dir.glob(File.join(jruby_home, 'lib', '*.jar')) { |jar| cmd_options[:classpath] << jar }
+        cmd_options[:properties]['jruby.home'] = jruby_home
+      end
       cmd_options[:java_args] ||= []
       cmd_options[:java_args] << '-Xmx512m' unless cmd_options[:java_args].detect {|a| a =~ /^-Xmx/}
       cmd_options[:properties] ||= {}
-      cmd_options[:properties]['jruby.home'] = jruby_home
       Java::Commands.java(*java_args)
     end
 
@@ -370,8 +372,9 @@ module Buildr
       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.requires.unshift 'jtestr'
       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}"]

data/lib/buildr/java/jtestr_result.rb

@@ -19,6 +19,42 @@ require 'fileutils'
 
 module Buildr #:nodoc:
 
+  module TestFramework
+
+    # A class used by buildr for jruby based frameworks, so that buildr can know
+    # which tests succeeded/failed.
+    class TestResult
+
+      class Error < ::Exception
+        attr_reader :message, :backtrace
+        def initialize(message, backtrace)
+          @message = message
+          @backtrace = backtrace
+          set_backtrace backtrace
+        end
+
+        def self.dump_yaml(file, e)
+          FileUtils.mkdir_p File.dirname(file)
+          File.open(file, 'w') { |f| f.puts(YAML.dump(Error.new(e.message, e.backtrace))) }
+        end
+
+        def self.guard(file)
+          begin
+            yield
+          rescue => e
+            dump_yaml(file, e)
+          end
+        end
+      end
+
+      attr_accessor :failed, :succeeded
+
+      def initialize
+        @failed, @succeeded = [], []
+      end
+    end
+  end
+
   module JtestR
 
     # An Rspec formatter used by JtestR

data/lib/buildr/java/tests.rb

@@ -184,7 +184,7 @@ module Buildr
     end
 
     # JUnit version number.
-    VERSION = '4.7'
+    VERSION = '4.8.2'
 
     class << self
       # :call-seq:
@@ -227,7 +227,7 @@ module Buildr
                        :class_annotations => %w{org.junit.runner.RunWith},
                        :method_annotations => %w{org.junit.Test})
       end
-      
+
     end
 
     def run(tests, dependencies) #:nodoc:
@@ -330,10 +330,10 @@ module Buildr
       cmd_args << '-d' << task.report_to.to_s
       # run all tests in the same suite
       cmd_args << '-testclass' << tests
-      
+
       cmd_options = { :properties=>options[:properties], :java_args=>options[:java_args],
         :classpath=>dependencies, :name => "TestNG in #{task.send(:project).name}" }
-      
+
       tmp = nil
       begin
         tmp = Tempfile.open("testNG")

data/lib/buildr/packaging/artifact.rb

@@ -212,8 +212,9 @@ module Buildr
 
         task = Rake::Task.define_task uri + path => deps do
           # Upload artifact relative to base URL, need to create path before uploading.
+          options = upload_to[:options] || {:permissions => upload_to[:permissions]}
           info "Deploying #{to_spec}"
-          URI.upload uri + path, name, :permissions=>upload_to[:permissions]
+          URI.upload uri + path, name, options
         end
       end
       task
@@ -477,7 +478,8 @@ module Buildr
         error "No build number provided for the snapshot #{to_spec}" if build_number.nil?
         return nil if timestamp.nil? || build_number.nil?
         snapshot_of = version[0, version.size - 9]
-        repo_url + "#{group_path}/#{id}/#{version}/#{id}-#{snapshot_of}-#{timestamp.text}-#{build_number.text}.#{type}"
+        classifier_snippet = (classifier != nil) ? "-#{classifier}" : ""
+        repo_url + "#{group_path}/#{id}/#{version}/#{id}-#{snapshot_of}-#{timestamp.text}-#{build_number.text}#{classifier_snippet}.#{type}"
       rescue URI::NotFoundError
         nil
       end

data/lib/buildr/packaging/tar.rb

@@ -98,7 +98,7 @@ module Buildr
           elsif content.nil?
           elsif File.directory?(content.to_s)
             stat = File.stat(content.to_s)
-            tar.mkdir(path, options.merge(:mode=>stat.mode, :mtime=>stat.mtime))
+            tar.mkdir(path, options.merge(:mode=>stat.mode, :mtime=>stat.mtime, :uid=>stat.uid, :gid=>stat.gid))
           else
             File.open content.to_s, 'rb' do |is|
               tar.add_file path, options.merge(:mode=>is.stat.mode, :mtime=>is.stat.mtime, :uid=>is.stat.uid, :gid=>is.stat.gid) do |os, opts|

data/lib/buildr/packaging/zip.rb

@@ -175,4 +175,10 @@ module Zip #:nodoc:
 
     end
   end
+
+  class ZipEntrySet
+    def <<(entry)
+      @entrySet[entry.to_s] = entry if entry != nil
+    end
+  end
 end

data/lib/buildr/scala/bdd.rb

@@ -32,21 +32,34 @@ module Buildr::Scala
     @lang = :scala
     @bdd_dir = :spec
 
-    VERSION = '1.6.6'
+    VERSION = case
+      when Buildr::Scala.version?("2.8.0")
+        '1.6.5'
+      when Buildr::Scala.version?("2.8.1")
+        '1.6.8'
+      else
+        '1.6.8'
+    end
+
 
     class << self
       def version
-        Buildr.settings.build['scala.specs'] || VERSION
+        custom = Buildr.settings.build['scala.specs']
+        (custom =~ /:/) ? Buildr.artifact(custom).version : VERSION
+      end
+
+      def specs
+        custom = Buildr.settings.build['scala.specs']
+        [ (custom =~ /:/) ? custom : "org.scala-tools.testing:#{artifact}:jar:#{version}" ]
       end
 
       def artifact
-        Buildr.settings.build['scala.specs.artifact'] || "specs_#{Buildr::Scala.version}"
+        Buildr.settings.build['scala.specs.artifact'] || "specs_#{Buildr::Scala.version_without_build}"
       end
 
       def dependencies
         unless @dependencies
           super
-          specs = (version =~ /:/) ? [version] : ["org.scala-tools.testing:#{artifact}:jar:#{version}"]
           # Add utility classes (e.g. SpecsSingletonRunner) and other dependencies
           @dependencies |= [ File.join(File.dirname(__FILE__)) ] + specs +
                            Check.dependencies + JUnit.dependencies + Scalac.dependencies

data/lib/buildr/scala/compiler.rb

@@ -19,7 +19,7 @@ require 'buildr/core/compile'
 require 'buildr/packaging'
 
 module Buildr::Scala
-  DEFAULT_VERSION = '2.8.1'
+  DEFAULT_VERSION = '2.9.0-1'
 
   class << self
 
@@ -59,13 +59,15 @@ module Buildr::Scala
       Buildr.settings.build['scala.version'] || installed_version || DEFAULT_VERSION
     end
 
-    def compatible_28?
-      major, minor = version.match(/^(\d)\.(\d)/).to_a[1,2]
-      if major && minor
-        (major.to_i == 2 && minor.to_i >= 8) || (major.to_i > 2)
-      else
-        false
-      end
+    # check if version matches any of the given prefixes
+    def version?(*v)
+      v.any? { |v| version.index(v.to_s) == 0 }
+    end
+
+    # returns Scala version without build number.
+    # e.g.  "2.9.0-1" => "2.9.0"
+    def version_without_build
+      version.split('-')[0]
     end
   end
 
@@ -156,17 +158,17 @@ module Buildr::Scala
       options[:warnings] = verbose if options[:warnings].nil?
       options[:deprecation] ||= false
       options[:optimise] ||= false
-      options[:make] ||= :transitivenocp if Scala.compatible_28?
+      options[:make] ||= :transitivenocp if Scala.version? 2.8
       options[:javac] ||= {}
 
       @java = Javac.new(project, options[:javac])
     end
 
     def compile(sources, target, dependencies) #:nodoc:
-      check_options(options, OPTIONS + (Scala.compatible_28? ? [:make] : []))
+      check_options(options, OPTIONS + (Scala.version?(2.8) ? [:make] : []))
 
       java_sources = java_sources(sources)
-      enable_dep_tracing = Scala.compatible_28? && java_sources.empty?
+      enable_dep_tracing = Scala.version?(2.8) && java_sources.empty?
 
       dependencies.unshift target if enable_dep_tracing
 
@@ -226,7 +228,11 @@ module Buildr::Scala
       args = []
       args << "-nowarn" unless options[:warnings]
       args << "-verbose" if trace?(:scalac)
-      args << "-g" if options[:debug]
+      if options[:debug] == true
+        args << (Scala.version?(2.7, 2.8) ? "-g" : "-g:vars")
+      elsif options[:debug]
+        args << "-g:#{options[:debug]}"
+      end
       args << "-deprecation" if options[:deprecation]
       args << "-optimise" if options[:optimise]
       args << "-target:jvm-" + options[:target].to_s if options[:target]

data/lib/buildr/scala/doc.rb

@@ -26,7 +26,7 @@ module Buildr
       after_define(:scaladoc => :doc) do |project|
         if project.doc.engine? Scaladoc
           options = project.doc.options
-          key = Scala.compatible_28? ? "doc-title".to_sym : :windowtitle
+          key = Scala.version?(2.7) ? :windowtitle : "doc-title".to_sym
           options[key] = (project.comment || project.name) unless options[key]
         end
       end

data/lib/buildr/scala/tests.rb

@@ -23,7 +23,16 @@ require 'buildr/java/tests'
 module Buildr::Scala
   # Scala::Check is available when using Scala::Test or Scala::Specs
   module Check
-    VERSION = '1.8'
+    VERSION = case
+      when Buildr::Scala.version?("2.7")
+        '1.6'
+      when Buildr::Scala.version?("2.8.0")
+        '1.7'
+      when Buildr::Scala.version?("2.8.1")
+        '1.8'
+      else
+        '1.9'
+    end
 
     class << self
       def version
@@ -31,15 +40,20 @@ module Buildr::Scala
       end
 
       def classifier
-        Buildr.settings.build['scala.check.classifier'] || ""
+        Buildr.settings.build['scala.check.classifier']
       end
 
       def artifact
-        Buildr.settings.build['scala.check.artifact'] || "scalacheck_#{Buildr::Scala.version}"
+        Buildr.settings.build['scala.check.artifact'] || "scalacheck_#{Buildr::Scala.version_without_build}"
       end
 
       def dependencies
-        (version =~ /:/) ? [version] : ["org.scala-tools.testing:#{artifact}:jar:#{classifier}:#{version}"]
+        return [version] if (version =~ /:/)
+        if classifier
+          ["org.scala-tools.testing:#{artifact}:jar:#{classifier}:#{version}"]
+        else
+          ["org.scala-tools.testing:#{artifact}:jar:#{version}"]
+        end
       end
 
     private
@@ -60,16 +74,26 @@ module Buildr::Scala
   # * :java_args   -- Arguments passed as is to the JVM.
   class ScalaTest < Buildr::TestFramework::Java
 
-    VERSION = '1.3'
+    VERSION = Buildr::Scala.version?(2.7, 2.8) ? '1.3' : '1.6.1'
 
     class << self
       def version
-        Buildr.settings.build['scala.test'] || VERSION
+        custom = Buildr.settings.build['scala.test']
+        (custom =~ /:/) ? Buildr.artifact(custom).version : VERSION
+      end
+
+      def specs
+        custom = Buildr.settings.build['scala.test']
+        return custom if (custom =~ /:/)
+        if Buildr::Scala.version?(2.7, 2.8)
+          "org.scalatest:scalatest:jar:#{version}"
+        else
+          "org.scalatest:scalatest_#{Buildr::Scala.version_without_build}:jar:#{version}"
+        end
       end
 
       def dependencies
-        ["org.scalatest:scalatest:jar:#{version}"] + Check.dependencies +
-          JMock.dependencies + JUnit.dependencies
+        [specs] + Check.dependencies + JMock.dependencies + JUnit.dependencies
       end
 
       def applies_to?(project) #:nodoc:
@@ -104,7 +128,12 @@ module Buildr::Scala
       mkpath task.report_to.to_s
       success = []
 
-      reporter_options = 'TFGBSAR' # testSucceeded, testFailed, testIgnored, suiteAborted, runStopped, runAborted, runCompleted
+      reporter_options = if (ScalaTest.version =~ /^0\./)
+        'TFGBSAR' # testSucceeded, testFailed, testIgnored, suiteAborted, runStopped, runAborted, runCompleted
+      else
+        ''
+      end
+
       scalatest.each do |suite|
         info "ScalaTest #{suite.inspect}"
         # Use Ant to execute the ScalaTest task, gives us performance and reporting.
@@ -113,9 +142,9 @@ module Buildr::Scala
         taskdef = Buildr.artifacts(self.class.dependencies).each(&:invoke).map(&:to_s)
         Buildr.ant('scalatest') do |ant|
           # ScalaTestTask was deprecated in 1.2, in favor of ScalaTestAntTask
-          classname = (ScalaTest.version =~ /1\.[01]/) ? \
+          classname = (ScalaTest.version =~ /^1\.[01]/) ? \
             'org.scalatest.tools.ScalaTestTask' : 'org.scalatest.tools.ScalaTestAntTask'
-          ant.taskdef :name=>'scalatest', :classname=>'org.scalatest.tools.ScalaTestTask',
+          ant.taskdef :name=>'scalatest', :classname=>classname,
             :classpath=>taskdef.join(File::PATH_SEPARATOR)
           ant.scalatest :runpath=>dependencies.join(File::PATH_SEPARATOR) do
             ant.suite    :classname=>suite

data/lib/buildr/version.rb

@@ -14,5 +14,5 @@
 # the License.
 
 module Buildr
-  VERSION = '1.4.5'.freeze
+  VERSION = '1.4.6'.freeze
 end

data/rakelib/checks.rake

@@ -15,11 +15,10 @@
 
 
 desc "Check that source files contain the Apache license"
-task :license=>FileList["lib/**/*.{rb,rake,java,gemspec,buildfile}", 'Rakefile'] do |task|
+task :license=>FileList["**/*.{rb,rake,java,gemspec,buildfile}", 'Rakefile'] do |task|
   puts "Checking that files contain the Apache license ... "
   required = task.prerequisites.select { |fn| File.file?(fn) }
   missing = required.reject { |fn|
-    p fn
     comments = File.read(fn).scan(/(\/\*(.*?)\*\/)|^#\s+(.*?)$|^-#\s+(.*?)$|<!--(.*?)-->/m).
       map { |match| match.compact }.flatten.join("\n")
     comments =~ /Licensed to the Apache Software Foundation/ && comments =~ /http:\/\/www.apache.org\/licenses\/LICENSE-2.0/
@@ -31,13 +30,14 @@ end
 
 desc "Look for new dependencies, check transitive dependencies"
 task :dependency do
+=begin
   puts "Checking that all dependencies are up to date ..."
   # Find if anything has a more recent dependency.  These are not errors, just reports.
-  #spec.dependencies.each do |dep|
-  #  current = Gem::SourceInfoCache.search(dep).last
-  #  latest = Gem::SourceInfoCache.search(Gem::Dependency.new(dep.name, '>0')).last
-  #  puts "A new version of #{dep.name} is available, #{latest.version} replaces #{current.version}" if (current && latest && latest.version > current.version)
-  #end
+  spec.dependencies.each do |dep|
+    current = Gem::SourceInfoCache.search(dep).last
+    latest = Gem::SourceInfoCache.search(Gem::Dependency.new(dep.name, '>0')).last
+    puts "A new version of #{dep.name} is available, #{latest.version} replaces #{current.version}" if (current && latest && latest.version > current.version)
+  end
 
   # Returns orderd list of transitive dependencies for the given dependency.
   transitive = lambda { |depend|
@@ -49,11 +49,11 @@ task :dependency do
   spec.dependencies.select {|dep| dep.type == :runtime }.each_with_index do |dep, index|
     puts "checking #{dep.name}"
     transitive[dep].each do |trans|
-      p "find #{trans.inspect}"
-      matching = spec.dependencies.find { |existing| p existing.inspect; trans =~ existing }
+      matching = spec.dependencies.find { |existing| trans =~ existing }
       fail "#{trans} required by #{dep} and missing from spec" unless matching
       fail "#{trans} must come before #{dep} in dependency list" unless spec.dependencies.index(matching) < index
     end
   end
   puts "[X] Checked all dependencies are up to date and transitive dependencies are correctly ordered"
+=end
 end

data/rakelib/doc.rake

@@ -74,7 +74,7 @@ begin
 rescue LoadError
   puts "Buildr uses the jekyll gem to generate the Web site. You can install it by running rake doc:setup"
   task 'doc:setup' do
-    install_gem 'jekyll', :version=>'0.6.2'
+    install_gem 'jekyll', :version=>'0.10.0'
     install_gem 'jekylltask', :version=>'1.0.2'
     if `pygmentize -V`.empty?
       args = %w{easy_install Pygments}

data/rakelib/package.rake

@@ -14,18 +14,18 @@
 # the License.
 
 
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 
 
-package = Rake::GemPackageTask.new(spec) do |pkg|
+package = Gem::PackageTask.new(spec) do |pkg|
   pkg.need_tar = true
   pkg.need_zip = true
 end
 
 desc "Install Buildr from source"
-task :install=>["#{package.package_dir}/#{package.gem_file}"] do |task|
+task :install=>["#{package.package_dir}/#{package.gem_spec.file_name}"] do |task|
   print "Installing #{spec.name} ... "
-  args = Config::CONFIG['ruby_install_name'], '-S', 'gem', 'install', "#{package.package_dir}/#{package.gem_file}"
+  args = Config::CONFIG['ruby_install_name'], '-S', 'gem', 'install', "#{package.package_dir}/#{package.gem_spec.file_name}"
   args.unshift('sudo') if sudo_needed?
   sh *args
   puts "[x] Installed Buildr #{spec.version}"
@@ -48,13 +48,13 @@ task :compile do
   args << '--trace' if Rake.application.options.trace
   sh *args
 end
-file Rake::GemPackageTask.new(spec).package_dir=>:compile
-file Rake::GemPackageTask.new(spec).package_dir_path=>:compile
+file Gem::PackageTask.new(spec).package_dir => :compile
+file Gem::PackageTask.new(spec).package_dir_path => :compile
 
 # We also need the other packages (JRuby if building on Ruby, and vice versa)
 # Must call new with block, even if block does nothing, otherwise bad things happen.
 @specs.values.each do |s|
-  Rake::GemPackageTask.new(s) { |task| }
+  Gem::PackageTask.new(s) { |task| }
 end