buildr 1.3.5-x86-mswin32 → 1.4.0-x86-mswin32

data/spec/java/emma_spec.rb

@@ -28,18 +28,18 @@ describe Buildr::Emma do
   end
 
   it_should_behave_like 'test coverage tool'
-  
+
   describe 'project-specific' do
     describe 'metadata file' do
       it 'should have a default value' do
         define('foo').emma.metadata_file.should point_to_path('reports/emma/coverage.em')
       end
-      
+
       it 'should be overridable' do
         define('foo') { emma.metadata_file = path_to('target/metadata.emma') }
         project('foo').emma.metadata_file.should point_to_path('target/metadata.emma')
       end
-      
+
       it 'should be created during instrumentation' do
         write 'src/main/java/Foo.java', 'public class Foo {}'
         define('foo')
@@ -47,17 +47,17 @@ describe Buildr::Emma do
         file(project('foo').emma.metadata_file).should exist
       end
     end
-    
+
     describe 'coverage file' do
       it 'should have a default value' do
         define('foo').emma.coverage_file.should point_to_path('reports/emma/coverage.ec')
       end
-      
+
       it 'should be overridable' do
         define('foo') { emma.coverage_file = path_to('target/coverage.emma') }
         project('foo').emma.coverage_file.should point_to_path('target/coverage.emma')
       end
-      
+
       it 'should be created during test' do
         write 'src/main/java/Foo.java', 'public class Foo {}'
         write_test :for=>'Foo', :in=>'src/test/java'
@@ -83,7 +83,7 @@ describe Buildr::Emma do
         task("foo:emma:instrument").invoke
         Dir.chdir('target/instrumented/classes') { Dir.glob('*').sort.should == ['Bar.class'] }
       end
-      
+
       it 'should instrument classes that are included but not excluded' do
         write 'src/main/java/Baz.java', 'public class Baz {}'
         define('foo') { emma.include('Ba*').exclude('*ar') }
@@ -91,13 +91,13 @@ describe Buildr::Emma do
         Dir.chdir('target/instrumented/classes') { Dir.glob('*').sort.should == ['Baz.class'] }
       end
     end
-    
+
     describe 'reports' do
       before do
         write 'src/main/java/Foo.java', 'public class Foo {}'
         write_test :for=>'Foo', :in=>'src/test/java'
       end
-      
+
       describe 'in html' do
         it 'should inform the user if no coverage data' do
           rm 'src/test/java/FooTest.java'
@@ -106,14 +106,14 @@ describe Buildr::Emma do
             should show_info(/No test coverage report for foo. Missing: #{project('foo').emma.coverage_file}/)
         end
       end
-      
+
       describe 'in xml' do
         it 'should have an xml file' do
           define('foo')
           task('foo:emma:xml').invoke
           file(File.join(project('foo').emma.report_dir, 'coverage.xml')).should exist
         end
-      end      
+      end
     end
   end
 end

data/spec/java/java_spec.rb

@@ -48,42 +48,42 @@ describe Java, '#tools_jar' do
   before do
     @old_home = ENV['JAVA_HOME']
   end
-  
+
   describe 'when JAVA_HOME points to a JDK' do
     before do
       Java.instance_eval { @tools_jar = nil }
       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
   end
-  
+
   describe 'when JAVA_HOME points to a JRE inside a JDK' do
     before do
       Java.instance_eval { @tools_jar = nil }
       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
   end
-  
+
   describe 'when there is no tools.jar' do
     before 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
   end
-  
+
   after do
     ENV['JAVA_HOME'] = @old_home
   end
@@ -93,13 +93,13 @@ describe Java, '#java' do
   before do
     @old_home = ENV['JAVA_HOME']
   end
-  
+
   describe 'when JAVA_HOME points to an invalid JRE/JDK installation' do
     before do
       write 'jdk'
       ENV['JAVA_HOME'] = File.expand_path('jdk')
     end
-  
+
     it 'should fail with an error message mentioning JAVA_HOME' do
       begin
         Java.java ['-version']
@@ -109,7 +109,7 @@ describe Java, '#java' do
       end
     end
   end
-  
+
   after do
     ENV['JAVA_HOME'] = @old_home
   end

data/spec/java/packaging_spec.rb

@@ -120,6 +120,16 @@ 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)
+    package.invoke
+    module AccessManifestTMP
+      attr_reader :manifest_tmp
+    end
+    (package.dup.extend(AccessManifestTMP).manifest_tmp.closed?).should be_true
+  end
 
   it 'should end hash manifest with EOL' do
     package_with_manifest 'Foo'=>1, :bar=>'Bar'
@@ -187,6 +197,16 @@ 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)
+    package.invoke
+    Zip::ZipFile.open(package.to_s) do |zip|
+      permissions = format("%o", zip.file.stat('META-INF/MANIFEST.MF').mode)
+      permissions.should match /644$/
+    end
+  end
 
   it 'should not add manifest version twice' do
     write 'MANIFEST.MF', 'Manifest-Version: 1.9'
@@ -241,7 +261,7 @@ shared_examples_for 'package with manifest' do
     define('foo', :version => '1.0') do
       manifest['Foo'] = '1'
       package(packaging)
-      define('bar', :version => '1.0') do 
+      define('bar', :version => '1.0') do
         manifest['bar'] = 'Bar'
         package(:jar)
         package = packages.first
@@ -261,11 +281,11 @@ shared_examples_for 'package with manifest' do
     define('foo', :version => '1.0') do
       manifest['Foo'] = '1'
       package(packaging)
-      define('bar', :version => '1.0') do 
+      define('bar', :version => '1.0') do
         manifest['bar'] = 'Bar'
         package(:jar)
       end
-      define('baz', :version => '1.0') do 
+      define('baz', :version => '1.0') do
         manifest['baz'] = 'Baz'
         package(:jar)
       end
@@ -410,6 +430,17 @@ describe Packaging, 'jar' do
   it_should_behave_like 'package with meta_inf'
   before { @meta_inf_ignore = 'MANIFEST.MF' }
 
+  it 'should place the manifest as the first entry of the file' do
+    write 'src/main/java/Test.java', 'class Test {}'
+    define('foo', :version=>'1.0') { package(:jar) }
+    project('foo').package(:jar).invoke
+    Zip::ZipFile.open(project('foo').package(:jar).to_s) do |jar|
+      entries_to_s = jar.entries.map(&:to_s).delete_if {|entry| entry[-1,1] == "/"}
+      # Sometimes META-INF/ is counted as first entry, which is fair game.
+      (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) }
@@ -454,6 +485,22 @@ describe Packaging, 'jar' do
       jar.entries.map(&:to_s).sort.should include('empty/')
     end
   end
+
+  it 'should raise error when calling with() with nil value' do
+    lambda {
+      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')}
+    foo.package(:jar).invoke
+    Zip::ZipFile.open(foo.package(:jar).to_s) do |jar|
+      jar.entries.map(&:to_s).sort.should_not include('foo.xml')
+    end
+  end
+    
 end
 
 
@@ -701,31 +748,31 @@ describe Packaging, 'ear' do
   end
 
   it 'should not modify original artifact for its components' do
-    define 'one', :version => '1.0' do 
+    define 'one', :version => '1.0' do
       write 'src/main/resources/one.txt', '1'
       package(:jar)
     end
-    
-    define 'two', :version => '1.0' do 
+
+    define 'two', :version => '1.0' do
       write 'src/main/resources/two.txt', '2'
       package(:jar)
     end
-    
-    define 'foo', :version => '1.0' do 
+
+    define 'foo', :version => '1.0' do
       package(:ear).add project(:one).package(:jar)
       package(:ear).add :ejb => project(:two).package(:jar)
     end
 
     inspect_ear { |files| files.should include('lib/one-1.0.jar', 'ejb/two-1.0.jar') }
-    
+
     Buildr::Packaging::Java::Manifest.from_zip(project('one').package(:jar)).main['Class-Path'].should be_nil
     Buildr::Packaging::Java::Manifest.from_zip(project('two').package(:jar)).main['Class-Path'].should be_nil
-    
+
     inspect_classpath 'ejb/two-1.0.jar' do |classpath|
       classpath.should include('../lib/one-1.0.jar')
     end
   end
-  
+
   it 'should map JARs to /lib directory' do
     define 'foo', :version=>'1.0' do
       package(:ear) << package(:jar)
@@ -764,12 +811,12 @@ describe Packaging, 'ear' do
       package(:jar, :id => 'one')
       package(:jar, :id => 'two')
     end
-    define 'foo', :version => '1.0' do 
+    define 'foo', :version => '1.0' do
       package(:ear).add :lib => project('baz'),
                         :war => project('bar').package(:war),
                         :ejb => project('bar').package(:jar)
     end
-    inspect_ear do |files| 
+    inspect_ear do |files|
       files.should include(*%w{ lib/one-1.5.jar lib/two-1.5.jar war/bar-1.5.war ejb/bar-1.5.jar  })
       files.should_not satisfy { files.any? { |f| f =~ /\.zip$/ } }
     end
@@ -785,10 +832,10 @@ describe Packaging, 'ear' do
       package(:war)
       package(:jar)
     end
-    define 'foo', :version => '1.0' do 
+    define 'foo', :version => '1.0' do
       package(:ear).add projects(:bar, :baz)
     end
-    inspect_ear do |files| 
+    inspect_ear do |files|
       files.should include('war/bar-1.5.war', 'lib/bar-1.5.jar', 'lib/baz-1.5.jar', 'war/baz-1.5.war')
       files.should_not satisfy { files.any? { |f| f =~ /\.zip$/ } }
     end
@@ -969,7 +1016,7 @@ describe Packaging, 'ear' do
   end
 
 
-  it 'should generate relative classpaths for top level EJB' do 
+  it 'should generate relative classpaths for top level EJB' do
     define 'foo', :version => '1.0' do
       package(:ear).add package(:jar, :id => 'one'), :path => '.'
       package(:ear).add package(:jar, :id => 'two'), :path => 'dos'
@@ -981,7 +1028,7 @@ describe Packaging, 'ear' do
     end
   end
 
-  it 'should generate relative classpaths for second level EJB' do 
+  it 'should generate relative classpaths for second level EJB' do
     define 'foo', :version => '1.0' do
       package(:ear).add package(:jar, :id => 'one'), :path => '.'
       package(:ear).add package(:jar, :id => 'two'), :path => 'dos'
@@ -993,7 +1040,7 @@ describe Packaging, 'ear' do
     end
   end
 
-  it 'should generate relative classpaths for nested EJB' do 
+  it 'should generate relative classpaths for nested EJB' do
     define 'foo', :version => '1.0' do
       package(:ear).add package(:jar, :id => 'one'), :path => '.'
       package(:ear).add package(:jar, :id => 'two'), :path => 'dos'
@@ -1030,7 +1077,7 @@ describe Packaging, 'sources' do
 
   it 'should be a ZipTask' do
     define 'foo', :version=>'1.0' do
-      package(:javadoc).should be_kind_of(ZipTask)
+      package(:sources).should be_kind_of(ZipTask)
     end
   end
 end
@@ -1074,7 +1121,7 @@ end
 shared_examples_for 'package_with_' do
 
   def prepare(options = {})
-    packager = "package_with_#{@packaging}" 
+    packager = "package_with_#{@packaging}"
     write 'src/main/java/Source.java'
     write 'baz/src/main/java/Source.java'
     define 'foo', :version=>'1.0' do

data/spec/java/test_coverage_helper.rb

@@ -29,21 +29,21 @@ module TestCoverageHelper
       @expected_pattern = pattern
       @pattern_matcher = lambda { |filename| File.fnmatch? pattern, filename }
     end
-    
+
     def matches?(directory)
       @actual_filenames = Dir[File.join(directory,'*')]
       @actual_filenames.any? &@pattern_matcher
     end
-    
+
     def failure_message
       "Expected to find at least one element matching '#{@expected_pattern}' among #{@actual_filenames.inspect}, but found none"
     end
-    
+
     def negative_failure_message
       "Expected to find no element matching '#{@expected_pattern}' among #{@actual_filenames.inspect}, but found matching element(s) #{@actual_filenames.select(&@pattern_matcher).inspect}"
     end
   end
-  
+
   # Test if a directory contains at least one file matching a given glob pattern.
   #
   # For example, to check that a directory contains at least one HTML file:
@@ -63,7 +63,7 @@ describe 'test coverage tool', :shared=>true do
   def test_coverage_config
     project('foo').send(toolname)
   end
-  
+
   describe 'project-specific' do
 
     before do
@@ -73,20 +73,20 @@ describe 'test coverage tool', :shared=>true do
 
     describe 'clean' do
       before { define('foo') }
-      
+
       it 'should remove the instrumented directory' do
         mkdir_p test_coverage_config.instrumented_dir.to_s
         task('foo:clean').invoke
         file(test_coverage_config.instrumented_dir).should_not exist
       end
-      
+
       it 'should remove the reporting directory' do
         mkdir_p test_coverage_config.report_dir
         task('foo:clean').invoke
         file(test_coverage_config.report_dir).should_not exist
       end
     end
-    
+
     describe 'instrumented directory' do
       it 'should have a default value' do
         define('foo')
@@ -98,7 +98,7 @@ describe 'test coverage tool', :shared=>true do
         define('foo') { send(toolname).instrumented_dir = path_to('target/coverage/classes') }
         test_coverage_config.instrumented_dir.should point_to_path('target/coverage/classes')
       end
-      
+
       it 'should be created during instrumentation' do
         define('foo')
         task("foo:#{toolname}:instrument").invoke
@@ -160,7 +160,7 @@ describe 'test coverage tool', :shared=>true do
         task("foo:#{toolname}:html").invoke
         test_coverage_config.report_to(:html).should have_files_matching('*.html')
       end
-      
+
       it 'should contain full source code, including comments' do
         write 'src/main/java/Foo.java',
           'public class Foo { /* This comment is a TOKEN to check that test coverage reports include the source code */ }'
@@ -199,7 +199,7 @@ describe 'test coverage tool', :shared=>true do
           task("#{toolname}:html").invoke
           @tool_module.report_to(:html).should have_files_matching('*.html')
         end
-        
+
         it 'should contain full source code, including comments' do
           write 'bar/src/main/java/Bar.java',
             'public class Bar { /* This comment is a TOKEN to check that test coverage reports include the source code */ }'
@@ -208,7 +208,7 @@ describe 'test coverage tool', :shared=>true do
           html_report_contents.force_encoding('ascii-8bit') if RUBY_VERSION >= '1.9'
           html_report_contents.should =~ /TOKEN/
         end
-        
+
         it 'should handle gracefully a project with no source' do
           define 'baz', :base_dir=>'baz'
           task("#{toolname}:html").invoke
@@ -216,7 +216,7 @@ describe 'test coverage tool', :shared=>true do
         end
       end
     end
-    
+
     describe 'clean' do
       it 'should remove the report directory' do
         define('foo')
@@ -224,31 +224,31 @@ describe 'test coverage tool', :shared=>true do
         task("#{toolname}:clean").invoke
         file(@tool_module.report_to).should_not exist
       end
-      
+
       it 'should be called when calling global clean' do
         define('foo')
         lambda { task('clean').invoke }.should run_task("#{toolname}:clean")
       end
     end
   end
-  
+
   describe 'project with no source' do
     it 'should not define an html report task' do
       define 'foo'
       Rake::Task.task_defined?("foo:#{toolname}:html").should be(false)
     end
-    
+
     it 'should not raise an error when instrumenting' do
       define('foo')
       lambda { task("foo:#{toolname}:instrument").invoke }.should_not raise_error
     end
-    
+
     it 'should not add the instrumented directory to the testing classpath' do
       define 'foo'
       depends = project('foo').test.dependencies
       depends.should_not include(test_coverage_config.instrumented_dir)
     end
-    
+
     it 'should not add the test coverage tools artifacts to the testing classpath' do
       define('foo')
       @tool_module.dependencies.each { |artifact| project('foo').test.dependencies.should_not include(artifact) }