buildr 1.4.1-x86-mswin32 → 1.4.2-x86-mswin32

data/spec/ide/idea7x_spec.rb

@@ -14,7 +14,7 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
 
 module Idea7xHelper

data/spec/java/ant_spec.rb

@@ -14,7 +14,7 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
 
 describe Buildr::Ant do

data/spec/java/bdd_spec.rb

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
 describe Buildr::RSpec do
 

data/spec/java/cobertura_spec.rb

@@ -14,7 +14,7 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), 'test_coverage_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), 'test_coverage_helper'))
 Sandbox.require_optional_extension 'buildr/java/cobertura'
 artifacts(Buildr::Cobertura::dependencies).map(&:invoke)
 
@@ -53,6 +53,11 @@ describe Buildr::Cobertura do
         define('foo') { define('bar') }
         task('foo:bar:cobertura:instrument').invoke
       end
+      
+      it 'should not generate html if projects have no sources' do
+        define('foo') { define('bar') }
+        task('cobertura:html').invoke
+      end
     end
 
     describe 'instrumentation' do
@@ -80,6 +85,28 @@ describe Buildr::Cobertura do
       end
     end
 
-    # TODO add specs for cobertura:check...somehow
+    describe 'check' do
+      before do
+        write 'src/main/java/Foo.java', 'public class Foo { public static boolean returnTrue() {return true;}}'
+        write 'src/test/java/FooTest.java', <<-JAVA
+import static junit.framework.Assert.assertTrue;
+import org.junit.Test;
+
+public class FooTest { 
+  
+  @Test
+  public void testReturnTrue() { 
+    assertTrue(Foo.returnTrue());
+  }
+}
+JAVA
+      end
+      
+      it 'should not raise errors during execution' do
+        define('foo')  { cobertura.include 'Foo' }
+        lambda {task("foo:cobertura:check").invoke}.should_not raise_error
+      end
+      
+    end
   end
 end

data/spec/java/commands_spec.rb

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
 
 describe Java::Commands do
@@ -30,5 +30,64 @@ BUILD
     lambda { Java::Commands.java("org.apache.tools.ant.Main", :classpath => Buildr::Ant.dependencies) }.should_not show_info(/java/)
     lambda { Java::Commands.java("org.apache.tools.ant.Main", :classpath => Buildr::Ant.dependencies, :verbose => true) }.should show_info(/java/)
   end
-
+  
+  describe "Java::Commands.javac" do
+    
+    it "should compile java" do
+      write "Foo.java", "public class Foo {}"
+      lambda { Java::Commands.javac("Foo.java") }.should change {File.exist?("Foo.class")}.to(true)
+    end
+      
+    it 'should let the user specify an output directory' do
+      write "Foo.java", "public class Foo {}"
+      lambda { Java::Commands.javac("Foo.java", :output => "classes") }.should change {File.exist?("classes/Foo.class")}.to(true)
+    end
+    
+    it "should let the user specify a different name" do
+      write "Foo.java", "public class Foo {}"
+      lambda { Java::Commands.javac("Foo.java", :name => "bar") }.should show_info("Compiling 1 source files in bar")
+    end
+    
+    it "should let the user specify a source path" do
+      write "ext/org/Bar.java", "package org; public class Bar {}"
+      write "Foo.java", "import org.Bar;\n public class Foo {}"
+      lambda { Java::Commands.javac("Foo.java", :sourcepath => File.expand_path("ext")) }.should change {File.exist?("Foo.class")}.to(true)
+    end
+    
+    it "should let the user specify a classpath" do
+      write "ext/org/Bar.java", "package org; public class Bar {}"
+      Java::Commands.javac("ext/org/Bar.java", :output => "lib")
+      write "Foo.java", "import org.Bar;\n public class Foo {}"
+      lambda { Java::Commands.javac("Foo.java", :classpath => File.expand_path("lib")) }.should change {File.exist?("Foo.class")}.to(true)
+    end
+  end
+  
+  describe "Java::Commands.javadoc" do
+    
+    it "should fail if no output is defined" do
+      lambda { Java::Commands.javadoc("Foo.java") }.should raise_error(/No output defined for javadoc/)
+    end
+    
+    it "should create javadoc" do
+      write "Foo.java", "public class Foo {}"
+      lambda { Java::Commands.javadoc("Foo.java", :output => "doc") }.should change {File.exist?("doc/Foo.html")}.to(true)
+    end
+    
+    it "should accept file tasks as arguments" do
+      foo = file("Foo.java") do |file|
+        file.enhance do
+          write file.to_s, "public class Foo {}"
+        end
+      end
+      lambda { Java::Commands.javadoc(foo, :output => "doc") }.should change {File.exist?("doc/Foo.html")}.to(true)
+    end
+      
+    it "should accept projects as arguments" do
+      write "src/main/java/Foo.java", "public class Foo {}"
+      write "src/main/java/bar/Foobar.java", "package bar; public class Foobar {}"
+      define "foo" do
+      end
+      lambda { Java::Commands.javadoc(project("foo"), :output => "doc") }.should change {File.exist?("doc/Foo.html") && File.exist?("doc/bar/Foobar.html")}.to(true)
+    end
+  end
 end

data/spec/java/compiler_spec.rb

@@ -14,7 +14,7 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
 
 describe 'javac compiler' do
@@ -122,8 +122,8 @@ describe 'javac compiler options' do
     javac_args.should_not include('-verbose')
   end
 
-  it 'should use -verbose argument when running with --trace option' do
-    trace true
+  it 'should use -verbose argument when running with --trace=javac option' do
+    Buildr.application.options.trace_categories = [:javac]
     javac_args.should include('-verbose')
   end
 

data/spec/java/ecj_spec.rb

@@ -0,0 +1,115 @@
+# 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.
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
+
+
+
+describe Buildr::Compiler::Ecj do
+
+  before(:all) do
+    #Make ecj appear as a compiler that applies:
+    class Buildr::Compiler::Ecj
+      class << self
+
+        def applies_to?(project, task)
+          paths = task.sources + [sources].flatten.map { |src| Array(project.path_to(:source, task.usage, src.to_sym)) }
+          paths.flatten!
+          ext_glob = Array(source_ext).join(',')
+
+          paths.each { |path| 
+            Find.find(path) {|found|
+              if (!File.directory?(found)) && found.match(/.*\.#{Array(source_ext).join('|')}/)
+                return true
+              end
+              } if File.exist? path
+            }
+            false
+          end
+        end
+      end
+    end
+
+    it "should be the default Java compiler once loaded" do
+      write 'src/main/java/Foo.java', 'public class Foo {}'
+    foo = define('foo')
+    foo.compile.compiler.should == :ecj
+  end
+
+  describe "should compile a Java project just in the same way javac does" do  
+    javac_spec = File.read(File.join(File.dirname(__FILE__), "compiler_spec.rb"))
+    javac_spec = javac_spec.match(Regexp.escape("require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))\n")).post_match
+    javac_spec.gsub!("javac", "ecj")
+    javac_spec.gsub!("nowarn", "warn:none")
+    eval(javac_spec)
+  end
+
+  # Redirect the java error ouput, yielding so you can do something while it is
+  # and returning the content of the error buffer.
+  #
+  def redirect_java_err
+    pending "RJB doesn't support well instantiating a class that has several constructors" unless RUBY_PLATFORM =~ /java/
+    err = Java.java.io.ByteArrayOutputStream.new
+    original_err = Java.java.lang.System.err
+    begin
+      printStream = Java.java.io.PrintStream
+      print = printStream.new(err)
+      Java.java.lang.System.setErr(print)
+      yield
+    ensure
+      Java.java.lang.System.setErr(original_err)
+    end
+    err.toString
+  end
+
+  it "should not issue warnings for type casting when warnings are set to warn:none, by default" do
+    write "src/main/java/Main.java", "import java.util.List; public class Main {public List get() {return null;}}"
+    foo = define("foo") {
+      compile.options.source = "1.5"
+      compile.options.target = "1.5"
+    }
+    redirect_java_err { foo.compile.invoke }.should_not match(/WARNING/)
+  end
+
+  it "should issue warnings for type casting when warnings are set" do
+    write "src/main/java/Main.java", "import java.util.List; public class Main {public List get() {return null;}}"
+    foo = define("foo") {
+      compile.options.source = "1.5"
+      compile.options.target = "1.5"
+      compile.options.warnings = true
+    }
+    redirect_java_err { foo.compile.invoke }.should match(/WARNING/)
+  end
+
+  after(:all) do
+    #Make ecj appear as a compiler that doesn't apply:
+    module Buildr
+      module Compiler
+
+        class Ecj
+
+          class << self
+
+            def applies_to?(project, task)
+              false
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+

data/spec/java/emma_spec.rb

@@ -14,7 +14,7 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), 'test_coverage_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), 'test_coverage_helper'))
 Sandbox.require_optional_extension 'buildr/java/emma'
 artifacts(Buildr::Emma::dependencies).map(&:invoke)
 

data/spec/java/external_spec.rb

@@ -14,25 +14,27 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
 COMPILERS = Buildr::Compiler.compilers.dup
 COMPILERS_WITHOUT_JAVAC = COMPILERS.dup
 COMPILERS_WITHOUT_JAVAC.delete Buildr::Compiler::Javac
 
 describe Buildr::Compiler::ExternalJavac do
-  
+
   before(:all) do
     Buildr::Compiler.send :compilers=, COMPILERS_WITHOUT_JAVAC
   end
-  
-  describe "should compile a Java project just in the same way javac does" do  
+
+  describe "should compile a Java project just in the same way javac does" do
     javac_spec = File.read(File.join(File.dirname(__FILE__), "compiler_spec.rb"))
-    javac_spec = javac_spec.match(Regexp.escape("require File.join(File.dirname(__FILE__), '../spec_helpers')\n")).post_match
+    javac_spec = javac_spec.match(Regexp.escape("require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))\n")).post_match
     javac_spec.gsub!("javac", "externaljavac")
+    javac_spec.gsub!("--trace=externaljavac", "--trace=javac")
+    javac_spec.gsub!("trace_categories = [:externaljavac]", "trace_categories = [:javac]")
     eval(javac_spec)
   end
-  
+
   it "should accept a :jvm option as JAVA_HOME" do
     write 'src/main/java/Foo.java', 'public class Foo {}'
     define "foo" do
@@ -44,11 +46,11 @@ describe Buildr::Compiler::ExternalJavac do
     end
     trace false
   end
-  
+
   after :all do
     Buildr::Compiler.send :compilers=, COMPILERS
   end
-  
+
 end
 
 

data/spec/java/java_spec.rb

@@ -14,7 +14,7 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
 
 unless RUBY_PLATFORM =~ /java/
@@ -41,10 +41,18 @@ unless RUBY_PLATFORM =~ /java/
       ENV_JAVA.replace @old_env_java
     end
   end
+else
+  describe 'JRuby environment' do
+    it 'should enforce a minimum version of jruby' do
+      check =File.read(File.expand_path('../lib/buildr/java/jruby.rb')).match(/JRUBY_MIN_VERSION.*\n.*JRUBY_MIN_VERSION\n/).to_s
+      check.sub!('JRUBY_VERSION', "'0.0.0'")
+      lambda {  eval(check) }.should raise_error(/JRuby must be at least at version /)
+    end
+  end
 end
 
 
-describe Java, '#tools_jar' do
+describe 'Java.tools_jar' do
   before do
     @old_home = ENV['JAVA_HOME']
   end
@@ -55,7 +63,7 @@ describe Java, '#tools_jar' do
       write 'jdk/lib/tools.jar'
       ENV['JAVA_HOME'] = File.expand_path('jdk')
     end
-
+  
     it 'should return the path to tools.jar' do
       Java.tools_jar.should point_to_path('jdk/lib/tools.jar')
     end
@@ -67,7 +75,7 @@ describe Java, '#tools_jar' do
       write 'jdk/lib/tools.jar'
       ENV['JAVA_HOME'] = File.expand_path('jdk/jre')
     end
-
+  
     it 'should return the path to tools.jar' do
       Java.tools_jar.should point_to_path('jdk/lib/tools.jar')
     end
@@ -78,7 +86,7 @@ describe Java, '#tools_jar' do
       Java.instance_eval { @tools_jar = nil }
       ENV['JAVA_HOME'] = File.expand_path('jdk')
     end
-
+  
     it 'should return nil' do
       Java.tools_jar.should be_nil
     end
@@ -89,7 +97,7 @@ describe Java, '#tools_jar' do
   end
 end
 
-describe Java, '#java' do
+describe 'Java#java' do
   before do
     @old_home = ENV['JAVA_HOME']
   end

data/spec/java/packaging_spec.rb

@@ -14,8 +14,8 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), '../spec_helpers')
-require File.join(File.dirname(__FILE__), '../packaging/packaging_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'packaging', 'packaging_helper'))
 
 
 describe Project, '#manifest' do
@@ -120,7 +120,7 @@ shared_examples_for 'package with manifest' do
       manifest.main['bar'].should eql('Bar')
     end
   end
-  
+
   it 'should close the temporary file used for packaging the MANIFEST.MF file' do
     package_with_manifest 'Foo'=>1, :bar=>'Bar'
     package = project('foo').package(@packaging)
@@ -197,7 +197,7 @@ shared_examples_for 'package with manifest' do
       manifest.main['Meta'].should eql('data')
     end
   end
-  
+
   it 'should give 644 permissions to the manifest' do
     package_with_manifest  [ {}, { 'Name'=>'first', :Foo=>'first', :bar=>'second' } ]
     package ||= project('foo').package(@packaging)
@@ -440,7 +440,7 @@ describe Packaging, 'jar' do
       (entries_to_s.first == 'META-INF/MANIFEST.MF' || entries_to_s[1] == 'META-INF/MANIFEST.MF').should be_true
     end
   end
-  
+
   it 'should use files from compile directory if nothing included' do
     write 'src/main/java/Test.java', 'class Test {}'
     define('foo', :version=>'1.0') { package(:jar) }
@@ -491,7 +491,7 @@ describe Packaging, 'jar' do
       define('foo', :version=>'1.0') { package(:jar).with(nil) }
     }.should raise_error
   end
-  
+
   it 'should exclude resources when ordered to do so' do
     write 'src/main/resources/foo.xml', ''
     foo = define('foo', :version => '1.0') { package(:jar).exclude('foo.xml')}
@@ -500,7 +500,7 @@ describe Packaging, 'jar' do
       jar.entries.map(&:to_s).sort.should_not include('foo.xml')
     end
   end
-    
+
 end
 
 
@@ -583,20 +583,44 @@ describe Packaging, 'war' do
     define('foo', :version=>'1.0') { compile.with 'group:id:jar:1.0', 'group:id:jar:2.0' ; package(:war) }
     inspect_war { |files| files.should include('META-INF/MANIFEST.MF', 'WEB-INF/lib/id-1.0.jar', 'WEB-INF/lib/id-2.0.jar') }
   end
-  
+
   it 'should use artifacts from compile classpath if no libs specified, leaving the user specify which to exclude as files' do
     make_jars
     define('foo', :version=>'1.0') { compile.with 'group:id:jar:1.0', 'group:id:jar:2.0' ; package(:war).path('WEB-INF/lib').exclude('id-2.0.jar')  }
     inspect_war { |files| files.should include('META-INF/MANIFEST.MF', 'WEB-INF/lib/id-1.0.jar') }
   end
-  
+
   it 'should use artifacts from compile classpath if no libs specified, leaving the user specify which to exclude as files with glob expressions' do
     make_jars
     define('foo', :version=>'1.0') { compile.with 'group:id:jar:1.0', 'group:id:jar:2.0' ; package(:war).path('WEB-INF/lib').exclude('**/id-2.0.jar')   }
     inspect_war { |files| files.should include('META-INF/MANIFEST.MF', 'WEB-INF/lib/id-1.0.jar') }
   end
+
+  it 'should exclude files regardless of the path where they are included, using wildcards' do
+    make_jars
+    define('foo', :version=>'1.0') { compile.with 'group:id:jar:1.0', 'group:id:jar:2.0' ; package(:war).exclude('**/id-2.0.jar')   }
+    inspect_war { |files| files.should include('META-INF/MANIFEST.MF', 'WEB-INF/lib/id-1.0.jar') }
+  end
   
+  it 'should exclude files regardless of the path where they are included, specifying target path entirely' do
+     make_jars
+     define('foo', :version=>'1.0') { compile.with 'group:id:jar:1.0', 'group:id:jar:2.0' ; package(:war).exclude('WEB-INF/lib/id-2.0.jar')   }
+     inspect_war { |files| files.should include('META-INF/MANIFEST.MF', 'WEB-INF/lib/id-1.0.jar') }
+   end
   
+  it 'should exclude files regardless of the path where they are included for war files' do 
+     write 'src/main/java/com/example/included/Test.java', 'package com.example.included; class Test {}' 
+     write 'src/main/java/com/example/excluded/Test.java', 'package com.example.excluded; class Test {}' 
+     define('foo', :version=>'1.0') do 
+       package(:war).enhance do |war| 
+         war.exclude('WEB-INF/classes/com/example/excluded/**.class')
+       end
+     end 
+     inspect_war do |files| 
+       files.should include('WEB-INF/classes/com/example/included/Test.class') 
+       files.should_not include('WEB-INF/classes/com/example/excluded/Test.class') 
+     end 
+   end
 
   it 'should include only specified libraries' do
     define 'foo', :version=>'1.0' do
@@ -1072,13 +1096,13 @@ end
 
 describe Packaging, 'sources' do
   it_should_behave_like 'packaging'
-  before { @packaging, @package_type = :sources, :zip }
+  before { @packaging, @package_type = :sources, :jar }
 
-  it 'should create package of type :zip and classifier \'sources\'' do
+  it 'should create package of type :jar and classifier \'sources\'' do
     define 'foo', :version=>'1.0' do
-      package(:sources).type.should eql(:zip)
+      package(:sources).type.should eql(:jar)
       package(:sources).classifier.should eql('sources')
-      package(:sources).name.should match(/foo-1.0-sources.zip$/)
+      package(:sources).name.should match(/foo-1.0-sources.jar$/)
     end
   end
 
@@ -1148,9 +1172,11 @@ shared_examples_for 'package_with_' do
     projects.select { |project| project.packages.first }.map(&:name)
   end
 
-  it 'should create package of type zip with classifier' do
+  it 'should create package of the right packaging with classifier' do
     prepare
-    project('foo').packages.first.to_s.should =~ /foo-1.0-#{@packaging}.zip/
+    ext = "zip"
+    ext = "jar" if @packaging == :sources
+    project('foo').packages.first.to_s.should =~ /foo-1.0-#{@packaging}.#{ext}/
   end
 
   it 'should create package for projects that have source files' do