buildr 1.4.25 → 1.5.0.dev2

data/lib/buildr/scala/doc.rb

@@ -80,7 +80,6 @@ module Buildr #:nodoc:
 
     class VScaladoc < Base
       VERSION = '1.2-m1'
-      Buildr.repositories.remote << 'https://oss.sonatype.org/content/groups/scala-tools'
 
       class << self
         def dependencies

data/lib/buildr/scala/org/apache/buildr/Specs2Runner.java

@@ -24,9 +24,10 @@ public class Specs2Runner {
   public static void main(String[] args) {
       try {
           ClassLoader loader = Thread.currentThread().getContextClassLoader();
-          Class clazz = loader.loadClass("org.specs2.runner.ClassRunner");
-          Object instance = clazz.newInstance();
-          Method main = clazz.getMethod("main", String[].class);
+          Class clazz = loader.loadClass("org.specs2.runner.ClassRunner$");
+          Field singleton = clazz.getField("MODULE$");
+          Object instance = singleton.get(null);
+          Method main = clazz.getMethod("run", String[].class);
           main.invoke(instance, new Object[] { args });
       } catch (Exception e) {
           throw new RuntimeException(e);

data/lib/buildr/scala/org/apache/buildr/ZincRunner.java

@@ -0,0 +1,37 @@
+/* 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
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.buildr;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+public class ZincRunner {
+
+  public static void main(String[] args) {
+      try {
+          ClassLoader loader = Thread.currentThread().getContextClassLoader();
+          Class clazz = loader.loadClass("com.typesafe.zinc.Main$");
+          Field singleton = clazz.getField("MODULE$");
+          Object instance = singleton.get(null);
+          Method main = clazz.getMethod("main", String[].class);
+          main.invoke(instance, new Object[] { args });
+      } catch (Exception e) {
+          throw new RuntimeException(e);
+      }
+  }
+
+}

data/lib/buildr/scala/tests.rb

@@ -39,8 +39,10 @@ module Buildr::Scala#:nodoc:
         '1.7'
       when Buildr::Scala.version?("2.8.1")
         '1.8'
-      else
+      when Buildr::Scala.version < "2.11"
         '1.10.0'
+      else
+        '1.12.5'
     end
 
     class << self
@@ -53,7 +55,14 @@ module Buildr::Scala#:nodoc:
       end
 
       def artifact
-        Buildr.settings.build['scala.check.artifact'] || "scalacheck_#{Buildr::Scala.version_without_build}"
+        custom = Buildr.settings.build['scala.check.artifact']
+        return custom if !!custom
+        case
+        when Buildr::Scala.version < "2.11"
+          "scalacheck_#{Buildr::Scala.version_without_build}"
+        else
+          "scalacheck_#{Buildr::Scala.version_major_minor}"
+        end
       end
 
       def dependencies
@@ -70,13 +79,6 @@ module Buildr::Scala#:nodoc:
           ["#{group}:#{artifact}:jar:#{version}"]
         end
       end
-
-    private
-      def const_missing(const)
-        return super unless const == :REQUIRES # TODO: remove in 1.5
-        Buildr.application.deprecated "Please use Scala::Check.dependencies/.version instead of ScalaCheck::REQUIRES/VERSION"
-        dependencies
-      end
     end
   end
 
@@ -92,8 +94,10 @@ module Buildr::Scala#:nodoc:
     VERSION = case
       when Buildr::Scala.version?(2.7)
         '1.3'
-      else
+      when Buildr::Scala.version < "2.11"
         '1.8'
+      else
+        '2.2.6'
     end
 
     class << self
@@ -107,25 +111,20 @@ module Buildr::Scala#:nodoc:
         return custom if (custom =~ /:/)
         if Buildr::Scala.version?(2.7, 2.8)
           "org.scalatest:scalatest:jar:#{version}"
-        else
+        elsif Buildr::Scala.version < "2.11"
           "org.scalatest:scalatest_#{Buildr::Scala.version_without_build}:jar:#{version}"
+        else 
+          "org.scalatest:scalatest_#{Buildr::Scala.version_major_minor}:jar:#{version}"
         end
       end
 
       def dependencies
-        [specs] + Check.dependencies + JMock.dependencies + JUnit.dependencies + Mockito.dependencies
+        [specs] + Check.dependencies + JMock.dependencies + JUnit.dependencies + Mockito.dependencies + ["org.scala-lang.modules:scala-xml_2.11:jar:1.0.5"]
       end
 
       def applies_to?(project) #:nodoc:
         !Dir[project.path_to(:source, :test, :scala, '**/*.scala')].empty?
       end
-
-    private
-      def const_missing(const)
-        return super unless const == :REQUIRES # TODO: remove in 1.5
-        Buildr.application.deprecated "Please use Scala::Test.dependencies/.version instead of ScalaTest::REQUIRES/VERSION"
-        dependencies
-      end
     end
 
     # annotation-based group inclusion
@@ -210,11 +209,4 @@ module Buildr::Scala#:nodoc:
 
 end
 
-
-# Backwards compatibility stuff.  Remove in 1.5.
-module Buildr#:nodoc:
-  ScalaCheck = Scala::Check
-  ScalaTest = Scala::ScalaTest
-end
-
 Buildr::TestFramework << Buildr::Scala::ScalaTest

data/lib/buildr/version.rb

@@ -14,5 +14,5 @@
 # the License.
 
 module Buildr #:nodoc:
-  VERSION = '1.4.25'.freeze
+  VERSION = '1.5.0.dev2'.freeze
 end

data/spec/addon/bnd_spec.rb

@@ -20,7 +20,7 @@ Sandbox.require_optional_extension 'buildr/bnd'
 def open_zip_file(file = 'target/foo-2.1.3.jar')
   jar_filename = @foo._(file)
   File.should be_exist(jar_filename)
-  Zip::ZipFile.open(jar_filename) do |zip|
+  Zip::File.open(jar_filename) do |zip|
     yield zip
   end
 end
@@ -33,7 +33,7 @@ end
 
 describe Buildr::Bnd do
   before do
-    repositories.remote << Buildr::Bnd.remote_repository
+    repositories.remote << "http://central.maven.org/maven2"
   end
 
   describe "project.bnd version (assure backward compatibility)" do
@@ -130,13 +130,13 @@ SRC
 
       it "produces a .jar containing correct .class files for root project" do
         open_zip_file do |zip|
-          zip.file.exist?('com/biz/Foo.class').should be_true
+          zip.exist?('com/biz/Foo.class').should be_true
         end
       end
 
       it "produces a .jar containing resoruces from resource directory root project" do
         open_zip_file do |zip|
-          zip.file.exist?('IRIS-INF/iris.config').should be_true
+          zip.exist?('IRIS-INF/iris.config').should be_true
         end
       end
 
@@ -167,7 +167,7 @@ SRC
 
       it "produces a .jar containing correct .class files for subproject project" do
         open_zip_file('bar/target/foo-bar-2.2.jar') do |zip|
-          zip.file.exist?('com/biz/bar/Bar.class').should be_true
+          zip.exist?('com/biz/bar/Bar.class').should be_true
         end
       end
 

data/spec/addon/custom_pom_spec.rb

@@ -21,7 +21,11 @@ if false
 require File.expand_path('../spec_helpers', File.dirname(__FILE__))
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'xpath_matchers'))
 
-Sandbox.require_optional_extension 'buildr/custom_pom'
+# Next line should work but does not
+#Sandbox.require_optional_extension 'buildr/custom_pom'
+
+# Next line should not be used but is required
+require 'buildr/custom_pom'
 
 describe Buildr::CustomPom do
 
@@ -63,19 +67,21 @@ describe Buildr::CustomPom do
     verify_dependency_version(pom_xml, artifact_id, version)
     verify_dependency_scope(pom_xml, artifact_id, scope)
     verify_dependency_optional(pom_xml, artifact_id, optional)
+    pom_xml.should match_xpath("#{dependency_xpath(artifact_id)}/exclusions/exclusion/groupId", '*')
+    pom_xml.should match_xpath("#{dependency_xpath(artifact_id)}/exclusions/exclusion/artifactId", '*')
   end
 
-  describe "with explicitly specified pom details" do
+  describe 'with explicitly specified pom details' do
     before do
-      ['id-provided', 'id-optional', 'id-runtime', 'id-test'].each do |artifact_id|
+      %w(id-provided id-optional id-runtime id-test).each do |artifact_id|
         artifact("group:#{artifact_id}:jar:1.0") do |t|
           mkdir_p File.dirname(t.to_s)
-          Zip::ZipOutputStream.open t.to_s do |zip|
+          Zip::OutputStream.open t.to_s do |zip|
             zip.put_next_entry 'empty.txt'
           end
         end
       end
-      write 'src/main/java/Example.java', "public class Example {}"
+      write 'src/main/java/Example.java', 'public class Example {}'
 
       @foo = define 'foo' do
         project.group = 'org.myproject'
@@ -103,47 +109,47 @@ describe Buildr::CustomPom do
       #$stderr.puts @pom_xml.to_s
     end
 
-    it "has correct static metadata" do
-      @pom_xml.should match_xpath("/project/modelVersion", '4.0.0')
-      @pom_xml.should match_xpath("/project/parent/groupId", 'org.sonatype.oss')
-      @pom_xml.should match_xpath("/project/parent/artifactId", 'oss-parent')
-      @pom_xml.should match_xpath("/project/parent/version", '7')
+    it 'has correct static metadata' do
+      @pom_xml.should match_xpath('/project/modelVersion', '4.0.0')
+      @pom_xml.should match_xpath('/project/parent/groupId', 'org.sonatype.oss')
+      @pom_xml.should match_xpath('/project/parent/artifactId', 'oss-parent')
+      @pom_xml.should match_xpath('/project/parent/version', '7')
     end
 
-    it "has correct project level metadata" do
-      @pom_xml.should match_xpath("/project/groupId", 'org.myproject')
-      @pom_xml.should match_xpath("/project/artifactId", 'foo')
-      @pom_xml.should match_xpath("/project/version", '1.0')
-      @pom_xml.should match_xpath("/project/packaging", 'jar')
-      @pom_xml.should match_xpath("/project/name", 'foo')
-      @pom_xml.should match_xpath("/project/description", 'foo')
-      @pom_xml.should match_xpath("/project/url", 'https://github.com/jbloggs/myproject')
+    it 'has correct project level metadata' do
+      @pom_xml.should match_xpath('/project/groupId', 'org.myproject')
+      @pom_xml.should match_xpath('/project/artifactId', 'foo')
+      @pom_xml.should match_xpath('/project/version', '1.0')
+      @pom_xml.should match_xpath('/project/packaging', 'jar')
+      @pom_xml.should match_xpath('/project/name', 'foo')
+      @pom_xml.should match_xpath('/project/description', 'foo')
+      @pom_xml.should match_xpath('/project/url', 'https://github.com/jbloggs/myproject')
     end
 
-    it "has correct scm details" do
-      @pom_xml.should match_xpath("/project/scm/connection", 'scm:git:git@github.com:jbloggs/myproject')
-      @pom_xml.should match_xpath("/project/scm/developerConnection", 'scm:git:git@github.com:jbloggs/myproject')
-      @pom_xml.should match_xpath("/project/scm/url", 'git@github.com:jbloggs/myproject')
+    it 'has correct scm details' do
+      @pom_xml.should match_xpath('/project/scm/connection', 'scm:git:git@github.com:jbloggs/myproject')
+      @pom_xml.should match_xpath('/project/scm/developerConnection', 'scm:git:git@github.com:jbloggs/myproject')
+      @pom_xml.should match_xpath('/project/scm/url', 'git@github.com:jbloggs/myproject')
     end
 
-    it "has correct issueManagement details" do
-      @pom_xml.should match_xpath("/project/issueManagement/url", 'https://github.com/jbloggs/myproject/issues')
-      @pom_xml.should match_xpath("/project/issueManagement/system", 'GitHub Issues')
+    it 'has correct issueManagement details' do
+      @pom_xml.should match_xpath('/project/issueManagement/url', 'https://github.com/jbloggs/myproject/issues')
+      @pom_xml.should match_xpath('/project/issueManagement/system', 'GitHub Issues')
     end
 
-    it "has correct developers details" do
-      @pom_xml.should match_xpath("/project/developers/developer/id", 'jbloggs')
-      @pom_xml.should match_xpath("/project/developers/developer/name", 'Joe Bloggs')
-      @pom_xml.should match_xpath("/project/developers/developer/email", 'jbloggs@example.com')
-      @pom_xml.should match_xpath("/project/developers/developer/roles/role", 'Project Lead')
+    it 'has correct developers details' do
+      @pom_xml.should match_xpath('/project/developers/developer/id', 'jbloggs')
+      @pom_xml.should match_xpath('/project/developers/developer/name', 'Joe Bloggs')
+      @pom_xml.should match_xpath('/project/developers/developer/email', 'jbloggs@example.com')
+      @pom_xml.should match_xpath('/project/developers/developer/roles/role', 'Project Lead')
     end
 
-    it "has correct license details" do
+    it 'has correct license details' do
       verify_license(@pom_xml, 'The Apache Software License, Version 2.0', 'http://www.apache.org/licenses/LICENSE-2.0.txt')
       verify_license(@pom_xml, 'GNU General Public License (GPL) version 3.0', 'http://www.gnu.org/licenses/gpl-3.0.html')
     end
 
-    it "has correct dependency details" do
+    it 'has correct dependency details' do
       verify_dependency(@pom_xml, 'id-runtime', 'group', '1.0', nil, nil)
       verify_dependency(@pom_xml, 'id-optional', 'group', '1.0', nil, 'true')
       verify_dependency(@pom_xml, 'id-provided', 'group', '1.0', 'provided', nil)

data/spec/addon/jaxb_xjc_spec.rb

@@ -15,7 +15,6 @@
 
 require File.expand_path('../spec_helpers', File.dirname(__FILE__))
 
-if Java.java.lang.System.getProperty("java.runtime.version") >= "1.6"
 Sandbox.require_optional_extension 'buildr/jaxb_xjc'
 
 XSD_CONTENT = <<XSD
@@ -125,6 +124,3 @@ describe Buildr::JaxbXjc 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/core/application_spec.rb

@@ -30,6 +30,10 @@ describe Buildr::Application do
   end
 
   describe '#run' do
+    before(:each) do
+      FileUtils.touch 'Buildfile'
+    end
+    
     it 'should execute *_load methods in order' do
       order = [:load_gems, :load_artifact_ns, :load_tasks, :raw_load_buildfile]
       order.each { |method| Buildr.application.should_receive(method).ordered }
@@ -149,11 +153,6 @@ describe Buildr::Application do
       Buildr.application.gems.size.should be(2)
     end
 
-    it 'should return a Gem::Specification for each installed gem' do
-      load_with_yaml
-      Buildr.application.gems.each { |gem| gem.should be_kind_of(Gem::Specification) }
-    end
-
     it 'should parse Gem name correctly' do
       load_with_yaml
       Buildr.application.gems.map(&:name).should include('rspec', 'rake')

data/spec/core/build_spec.rb

@@ -149,57 +149,6 @@ describe Project, '#clean' do
   end
 end
 
-
-describe Project, '#target' do
-  before :each do
-    @project = define('foo', :layout=>Layout.new)
-  end
-
-  it 'should default to target' do
-    @project.target.should eql('target')
-  end
-
-  it 'should set layout :target' do
-    @project.target = 'bar'
-    @project.layout.expand(:target).should point_to_path('bar')
-  end
-
-  it 'should come from layout :target' do
-    @project.layout[:target] = 'baz'
-    @project.target.should eql('baz')
-  end
-
-  it 'should be removed in version 1.5 since it was deprecated in version 1.3' do
-    Buildr::VERSION.should < '1.5'
-  end
-end
-
-
-describe Project, '#reports' do
-  before :each do
-    @project = define('foo', :layout=>Layout.new)
-  end
-
-  it 'should default to reports' do
-    @project.reports.should eql('reports')
-  end
-
-  it 'should set layout :reports' do
-    @project.reports = 'bar'
-    @project.layout.expand(:reports).should point_to_path('bar')
-  end
-
-  it 'should come from layout :reports' do
-    @project.layout[:reports] = 'baz'
-    @project.reports.should eql('baz')
-  end
-
-  it 'should be removed in version 1.5 since it was deprecated in version 1.3' do
-    Buildr::VERSION.should < '1.5'
-  end
-end
-
-
 describe Hg do
   describe '#current_branch' do
     it 'should return the correct branch' do
@@ -678,6 +627,16 @@ shared_examples_for 'a release process' do
       write 'buildfile', 'define foo'
       lambda { @release.extract_version }.should raise_error('Looking for THIS_VERSION = "..." in your Buildfile, none found')
     end
+
+    it 'should use version.rb instead of buildfile, if present' do
+      write 'version.rb', "VERSION_NUMBER = '1.0.0-SNAPSHOT'"
+      @release.extract_version.should == '1.0.0-SNAPSHOT'
+    end
+
+    it 'should complain if there is a version.rb file, but it contains no version number' do
+      write 'version.rb', "#SOMETHING SOMETHING"
+      lambda { @release.extract_version }.should raise_error('Looking for THIS_VERSION = "..." in your Buildfile, none found')
+    end
   end
 
   describe '#with_release_candidate_version' do

data/spec/core/common_spec.rb

@@ -401,6 +401,13 @@ describe Buildr::Filter do
       read(file).should eql("#{File.basename(file)} with value1 and value2")
     end
   end
+  
+  it 'should not apply filters to binary files' do
+    ["jpg", "jpeg", "gif", "png"].each { |ext| write "images/file.#{ext}", 'something' }
+    filter = @filter.from('images').into('target').using('key1'=>'value1', 'key2'=>'value2')
+    filter.instance_variable_get("@mapper").should_not_receive(:maven_transform)
+    filter.run
+  end
 
   it 'should apply hash mapping using Ant style' do
     1.upto(4) { |i| write "src/file#{i}", "file#{i} with @key1@ and @key2@" }