buildr 1.4.25-java → 1.5.0.dev2-java

data/spec/packaging/packaging_spec.rb

@@ -680,7 +680,7 @@ describe Packaging, 'zip' do
   it 'should not include META-INF directory' do
     define('foo', :version=>'1.0') { package(:zip) }
     project('foo').package(:zip).invoke
-    Zip::ZipFile.open(project('foo').package(:zip).to_s) do |zip|
+    Zip::File.open(project('foo').package(:zip).to_s) do |zip|
       zip.entries.map(&:to_s).should_not include('META-INF/')
     end
   end

data/spec/sandbox.rb

@@ -24,7 +24,7 @@ repositories.remote << 'https://oss.sonatype.org/content/groups/scala-tools'
 
 # Force Scala version for specs; don't want to rely on SCALA_HOME
 module Buildr::Scala
-  SCALA_VERSION_FOR_SPECS = ENV["SCALA_VERSION"] || "2.9.2"
+  SCALA_VERSION_FOR_SPECS = ENV["SCALA_VERSION"] || "2.11.8"
 end
 Buildr.settings.build['scala.version'] = Buildr::Scala::SCALA_VERSION_FOR_SPECS
 
@@ -193,7 +193,7 @@ module Sandbox
     Layout.default = @_sandbox[:layout].clone
 
     $LOAD_PATH.replace @_sandbox[:load_path]
-    ENV["RUBYOPT"] = @_sandbox[:ruby_opt]
+    ENV['RUBYOPT'] = @_sandbox[:ruby_opt]
 
     FileUtils.rm_rf @temp
     mkpath ENV['HOME']

data/spec/scala/bdd_spec.rb

@@ -15,104 +15,6 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
-if Java.java.lang.System.getProperty("java.runtime.version") >= "1.6"
-
-describe Buildr::Scala::Specs do
-
-  it 'should be the default when tests in src/spec/scala reference "org.specs"' do
-    write 'src/spec/scala/com/example/MySpecs.scala', <<-SCALA
-      package com.example
-      object MySpecs extends org.specs.Specification {
-        "it" should {
-          "add" in {
-            val sum = 1 + 1
-            sum mustEqual 2
-          }
-        }
-      }
-    SCALA
-    define 'foo'
-    project('foo').test.framework.should eql(:specs)
-  end
-
-  it 'should include Specs dependencies' do
-    define('foo') { test.using(:specs) }
-    project('foo').test.compile.dependencies.should include(*artifacts(Scala::Specs.dependencies))
-    project('foo').test.dependencies.should include(*artifacts(Scala::Specs.dependencies))
-  end
-
-  it 'should include ScalaCheck dependencies' do
-    define('foo') { test.using(:specs) }
-    project('foo').test.compile.dependencies.should include(*artifacts(Scala::Check.dependencies))
-    project('foo').test.dependencies.should include(*artifacts(Scala::Check.dependencies))
-  end
-
-  it 'should include public objects extending org.specs.Specification' do
-    write 'src/spec/scala/com/example/MySpecs.scala', <<-SCALA
-      package com.example
-      object MySpecs extends org.specs.Specification {
-        "it" should {
-          "add" in {
-            val sum = 1 + 1
-            sum mustEqual 2
-          }
-        }
-      }
-    SCALA
-    define('foo').test.invoke
-    project('foo').test.tests.should include('com.example.MySpecs')
-  end
-
-  it 'should include public objects extending org.specs.Specification even with companion classes' do
-    write 'src/spec/scala/com/example/MySpecs.scala', <<-SCALA
-      package com.example
-      object MySpecs extends org.specs.Specification {
-        "it" should {
-          "add" in {
-            val sum = 1 + 1
-            sum mustEqual 2
-          }
-        }
-      }
-      class MySpecs extends org.specs.runner.JUnit4(MySpecs)
-    SCALA
-    define('foo').test.invoke
-    project('foo').test.tests.should include('com.example.MySpecs')
-  end
-
-  it 'should pass when spec passes' do
-    write 'src/spec/scala/PassingSpecs.scala', <<-SCALA
-      object PassingSpecs extends org.specs.Specification {
-        "it" should {
-          "add" in {
-            val sum = 1 + 1
-            sum mustEqual 2
-          }
-        }
-      }
-    SCALA
-    lambda { define('foo').test.invoke }.should_not raise_error
-  end
-
-  it 'should fail when spec fails' do
-    write 'src/spec/scala/StringSpecs.scala', <<-SCALA
-      import org.specs._
-      import org.specs.runner._
-
-      object StringSpecs extends Specification {
-        "empty string" should {
-          "have a zero length" in {
-            ("".length) mustEqual(1)
-          }
-        }
-      }
-    SCALA
-    define('foo')
-    project('foo').test.invoke rescue
-    project('foo').test.failed_tests.should include('StringSpecs')
-  end
-end
-
 describe Buildr::Scala::Specs2 do
 
   it 'should be the default when tests in src/spec/scala reference "org.specs2"' do
@@ -217,6 +119,3 @@ describe Buildr::Scala::Specs2 do
   end
 end
 
-elsif Buildr::VERSION >= '1.5'
-  raise "JVM version guard in #{__FILE__} should be removed since it is assumed that Java 1.5 is no longer supported."
-end

data/spec/scala/compiler_spec.rb

@@ -76,8 +76,8 @@ share_as :ScalacCompiler do
     define_test1_project
     task('test1:package').invoke
     file('target/test1-1.0.jar').should exist
-    Zip::ZipFile.open(project('test1').package(:jar).to_s) do |zip|
-      zip.file.exist?('com/example/Test1.class').should be_true
+    Zip::File.open(project('test1').package(:jar).to_s) do |zip|
+      zip.exist?('com/example/Test1.class').should be_true
     end
   end
 
@@ -89,9 +89,9 @@ share_as :ScalacCompiler do
     end
     task('test1:package').invoke
     file('target/test1-1.0.jar').should exist
-    Zip::ZipFile.open(project('test1').package(:jar).to_s) do |zip|
-      zip.file.exist?('com/example/Foo.class').should be_true
-      zip.file.exist?('com/example/Bar.class').should be_true
+    Zip::File.open(project('test1').package(:jar).to_s) do |zip|
+      zip.exist?('com/example/Foo.class').should be_true
+      zip.exist?('com/example/Bar.class').should be_true
     end
   end
 
@@ -103,9 +103,9 @@ share_as :ScalacCompiler do
     end
     task('test1:package').invoke
     file('target/test1-1.0.jar').should exist
-    Zip::ZipFile.open(project('test1').package(:jar).to_s) do |zip|
-      zip.file.exist?('com/example/Foo.class').should be_true
-      zip.file.exist?('com/example/Bar.class').should be_true
+    Zip::File.open(project('test1').package(:jar).to_s) do |zip|
+      zip.exist?('com/example/Foo.class').should be_true
+      zip.exist?('com/example/Bar.class').should be_true
     end
   end
 end
@@ -155,6 +155,11 @@ share_as :ScalacCompiler_CommonOptions do
     compile_task.using(:warnings=>false)
     scalac_args.should include('-nowarn')
   end
+  
+  it 'should pass options to javac' do
+    compile_task.using(:warnings=>false)
+    javac_args.should include('-nowarn')
+  end
 
   it 'should not use -nowarn argument when warnings is true' do
     compile_task.using(:warnings=>true)
@@ -302,6 +307,10 @@ describe 'scala compiler 2.9 options' do
   def scalac_args
     compile_task.instance_eval { @compiler }.send(:scalac_args)
   end
+  
+  def javac_args
+    compile_task.instance_eval { @compiler }.instance_eval { @java }.send(:javac_args)
+  end
 
   # these specs fail. Somehow the compiler is still in version 2.8
   it 'should use -g:vars argument when debug option is true' do
@@ -321,8 +330,6 @@ describe 'scala compiler 2.9 options' do
 
 end if Buildr::Scala.version?(2.9)
 
-if Java.java.lang.System.getProperty("java.runtime.version") >= "1.6"
-
 describe 'zinc compiler (enabled through Buildr.settings)' do
   before :each do
     Buildr.settings.build['scalac.incremental'] = true
@@ -337,12 +344,13 @@ describe 'zinc compiler (enabled through Buildr.settings)' do
     compiler.should_receive(:compile_with_zinc).once
     compile_task.invoke
   end
+  
+  it_should_behave_like ScalacCompiler
 
   after :each do
     Buildr.settings.build['scalac.incremental'] = nil
   end
 
-  it_should_behave_like ScalacCompiler
 end
 
 describe 'zinc compiler (enabled through project.scala_options)' do
@@ -357,8 +365,4 @@ describe 'zinc compiler (enabled through project.scala_options)' do
     compiler.should_receive(:compile_with_zinc).once
     compile_task.invoke
   end
-end
-
-elsif Buildr::VERSION >= '1.5'
-  raise "JVM version guard in #{__FILE__} should be removed since it is assumed that Java 1.5 is no longer supported."
-end
+end

data/spec/scala/doc_spec.rb

@@ -47,8 +47,6 @@ describe "Scaladoc" do
     project('foo').doc.options[:"doc-title"].should eql('explicit')
   end
 
-if Java.java.lang.System.getProperty("java.runtime.version") >= "1.6"
-
   it 'should convert :windowtitle to -doc-title for Scala 2.8.1 and later' do
     write 'src/main/scala/com/example/Test.scala', 'package com.example; class Test { val i = 1 }'
     define('foo') do
@@ -69,14 +67,8 @@ if Java.java.lang.System.getProperty("java.runtime.version") >= "1.6"
     project('foo').doc.invoke
   end unless Buildr::Scala.version?(2.7, "2.8.0")
 
-elsif Buildr::VERSION >= '1.5'
-  raise "JVM version guard in #{__FILE__} should be removed since it is assumed that Java 1.5 is no longer supported."
-end
-
 end
 
-if Java.java.lang.System.getProperty("java.runtime.version") >= "1.6"
-
 describe "package(:scaladoc)" do
   it "should generate target/project-version-scaladoc.jar" do
     write 'src/main/scala/Foo.scala', 'class Foo'
@@ -97,6 +89,3 @@ describe "package(:scaladoc)" do
   end
 end
 
-elsif Buildr::VERSION >= '1.5'
-  raise "JVM version guard in #{__FILE__} should be removed since it is assumed that Java 1.5 is no longer supported."
-end

data/spec/scala/tests_spec.rb

@@ -15,8 +15,6 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
-if Java.java.lang.System.getProperty("java.runtime.version") >= "1.6"
-
 # TODO's
 #  -test passing System props
 #  -test passing ENV variables
@@ -208,18 +206,14 @@ describe Buildr::Scala::ScalaTest do
   it 'should pass properties to Suite' do
     write 'src/test/scala/PropertyTestSuite.scala', <<-SCALA
       import org.scalatest._
-      class PropertyTestSuite extends FunSuite {
-        var configMap = Map[String, Any]()
-        test("testProperty") {
+      import org.scalatest.fixture.FunSuite
+      import org.scalatest.fixture.ConfigMapFixture
+      
+      class PropertyTestSuite extends FunSuite with ConfigMapFixture {
+        
+        test("testProperty") { (configMap: Map[String, Any]) =>
           assert(configMap("name") === "value")
         }
-
-        protected override def runTests(testName: Option[String], reporter: Reporter, stopper: Stopper,
-                                        filter: Filter, configMap: Map[String, Any],
-                                        distributor: Option[Distributor], tracker: Tracker) {
-          this.configMap = configMap
-          super.runTests(testName, reporter, stopper, filter, configMap, distributor, tracker)
-        }
       }
     SCALA
     define('foo').test.using :properties=>{ 'name'=>'value' }
@@ -290,6 +284,3 @@ describe Buildr::Scala::ScalaTest do
 
 end
 
-elsif Buildr::VERSION >= '1.5'
-  raise "JVM version guard in #{__FILE__} should be removed since it is assumed that Java 1.5 is no longer supported."
-end

data/spec/spec_helpers.rb

@@ -302,7 +302,7 @@ unless defined?(SpecHelpers)
 
     def suppress_stdout
       stdout = $stdout
-      $stdout = StringIO.new
+      #$stdout = StringIO.new
       begin
         yield
       ensure

data/spec/xpath_matchers.rb

@@ -74,11 +74,12 @@ module RSpec
           ok = true
           return false unless @val == @actual_val
         end
+        return true if !ok && @val.nil?
         return ok
       end
 
       def failure_message
-        "The xpath #{@xpath} did not have the value '#{@val}' It was '#{@actual_val}'"
+        "The xpath #{@xpath} did not have the value #{@val.inspect} it was #{@actual_val.inspect}"
       end
 
       def description

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildr
 version: !ruby/object:Gem::Version
-  version: 1.4.25
+  version: 1.5.0.dev2
 platform: java
 authors:
 - Apache Buildr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: net-sftp
   requirement: !ruby/object:Gem::Requirement
@@ -86,42 +86,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.8.3
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.1
+        version: 3.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.1
+        version: 3.15.0
 - !ruby/object:Gem::Dependency
   name: atoulme-Antwrap
   requirement: !ruby/object:Gem::Requirement
@@ -142,28 +142,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 1.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 1.2.5
 - !ruby/object:Gem::Dependency
   name: xml-simple
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.1.5
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
@@ -290,6 +290,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.2.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
@@ -374,12 +388,10 @@ files:
 - addon/buildr/bnd.rb
 - addon/buildr/checkstyle-report.xsl
 - addon/buildr/checkstyle.rb
-- addon/buildr/cobertura.rb
 - addon/buildr/css_lint-report.xsl
 - addon/buildr/css_lint.rb
 - addon/buildr/custom_pom.rb
 - addon/buildr/drb.rb
-- addon/buildr/emma.rb
 - addon/buildr/findbugs.rb
 - addon/buildr/git_auto_version.rb
 - addon/buildr/gpg.rb
@@ -531,6 +543,8 @@ files:
 - lib/buildr/scala/org/apache/buildr/Specs2Runner.java
 - lib/buildr/scala/org/apache/buildr/SpecsSingletonRunner.class
 - lib/buildr/scala/org/apache/buildr/SpecsSingletonRunner.java
+- lib/buildr/scala/org/apache/buildr/ZincRunner.class
+- lib/buildr/scala/org/apache/buildr/ZincRunner.java
 - lib/buildr/scala/shell.rb
 - lib/buildr/scala/tests.rb
 - lib/buildr/shell.rb