buildr 1.4.11-java → 1.4.12-java

data/spec/core/common_spec.rb

@@ -541,7 +541,6 @@ describe Buildr::Filter do
   end
 
   it 'should preserve mode bits except readable' do
-    # legacy: pending "Pending the release of the fix for JRUBY-4927" if RUBY_PLATFORM =~ /java/
     mode = 0o600
     Dir['src/*'].each { |file| File.chmod(mode, file) }
     @filter.from('src').into('target').run

data/spec/core/compile_spec.rb

@@ -16,6 +16,13 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
+# Return now at the resolution that the current filesystem supports
+# Avoids scenario where Time.now and Time.now + 1 have same value on filesystem
+def now_at_fs_resolution
+  test_filename = "#{Dir.pwd}/deleteme"
+  FileUtils.touch test_filename
+  File.atime(test_filename)
+end
 
 module CompilerHelper
   def compile_task
@@ -334,7 +341,7 @@ describe Buildr::CompileTask, '#invoke' do
   end
 
   it 'should force compilation if target empty' do
-    time = Time.now
+    time = now_at_fs_resolution
     mkpath compile_task.target.to_s
     File.utime(time - 1, time - 1, compile_task.target.to_s)
     lambda { compile_task.from(sources).invoke }.should run_task('foo:compile')
@@ -342,7 +349,7 @@ describe Buildr::CompileTask, '#invoke' do
 
   it 'should force compilation if sources newer than compiled' do
     # Simulate class files that are older than source files.
-    time = Time.now
+    time = now_at_fs_resolution
     sources.each { |src| File.utime(time + 1, time + 1, src) }
     sources.map { |src| src.pathmap("#{compile_task.target}/thepackage/%n.class") }.
       each { |kls| write kls ; File.utime(time, time, kls) }
@@ -352,15 +359,15 @@ describe Buildr::CompileTask, '#invoke' do
 
   it 'should not force compilation if sources older than compiled' do
     # When everything has the same timestamp, nothing is compiled again.
-    time = Time.now
-    sources.map { |src| src.pathmap("#{compile_task.target}/thepackage/%n.class") }.
+    time = now_at_fs_resolution
+    sources.map { |src| File.utime(time, time, src); src.pathmap("#{compile_task.target}/thepackage/%n.class") }.
       each { |kls| write kls ; File.utime(time, time, kls) }
     lambda { compile_task.from(sources).invoke }.should_not run_task('foo:compile')
   end
 
   it 'should not force compilation if dependencies older than compiled' do
     jars; project('jars').task("package").invoke
-    time = Time.now
+    time = now_at_fs_resolution
     jars.each { |jar| File.utime(time - 1 , time - 1, jar) }
     sources.map { |src| File.utime(time, time, src); src.pathmap("#{compile_task.target}/thepackage/%n.class") }.
       each { |kls| write kls ; File.utime(time, time, kls) }
@@ -370,7 +377,7 @@ describe Buildr::CompileTask, '#invoke' do
   it 'should force compilation if dependencies newer than compiled' do
     jars; project('jars').task("package").invoke
     # On my machine the times end up the same, so need to push dependencies in the past.
-    time = Time.now
+    time = now_at_fs_resolution
     sources.map { |src| src.pathmap("#{compile_task.target}/thepackage/%n.class") }.
       each { |kls| write kls ; File.utime(time - 1, time - 1, kls) }
     File.utime(time - 1, time - 1, project('foo').compile.target.to_s)
@@ -379,7 +386,7 @@ describe Buildr::CompileTask, '#invoke' do
   end
 
   it 'should timestamp target directory if specified' do
-    time = Time.now - 10
+    time = now_at_fs_resolution - 10
     mkpath compile_task.target.to_s
     File.utime(time, time, compile_task.target.to_s)
     compile_task.timestamp.should be_close(time, 1)
@@ -387,24 +394,24 @@ describe Buildr::CompileTask, '#invoke' do
 
   it 'should touch target if anything compiled' do
     mkpath compile_task.target.to_s
-    File.utime(Time.now - 10, Time.now - 10, compile_task.target.to_s)
+    File.utime(now_at_fs_resolution - 10, now_at_fs_resolution - 10, compile_task.target.to_s)
     compile_task.from(sources).invoke
-    File.stat(compile_task.target.to_s).mtime.should be_close(Time.now, 2)
+    File.stat(compile_task.target.to_s).mtime.should be_close(now_at_fs_resolution, 2)
   end
 
   it 'should not touch target if nothing compiled' do
     mkpath compile_task.target.to_s
-    File.utime(Time.now - 10, Time.now - 10, compile_task.target.to_s)
+    File.utime(now_at_fs_resolution - 10, now_at_fs_resolution - 10, compile_task.target.to_s)
     compile_task.invoke
-    File.stat(compile_task.target.to_s).mtime.should be_close(Time.now - 10, 2)
+    File.stat(compile_task.target.to_s).mtime.should be_close(now_at_fs_resolution - 10, 2)
   end
 
   it 'should not touch target if failed to compile' do
     mkpath compile_task.target.to_s
-    File.utime(Time.now - 10, Time.now - 10, compile_task.target.to_s)
+    File.utime(now_at_fs_resolution - 10, now_at_fs_resolution - 10, compile_task.target.to_s)
     write 'failed.java', 'not a class'
     suppress_stdout { compile_task.from('failed.java').invoke rescue nil }
-    File.stat(compile_task.target.to_s).mtime.should be_close(Time.now - 10, 2)
+    File.stat(compile_task.target.to_s).mtime.should be_close(now_at_fs_resolution - 10, 2)
   end
 
   it 'should complain if source directories and no compiler selected' do
@@ -420,9 +427,9 @@ describe Buildr::CompileTask, '#invoke' do
     compile_task.from FileList['src/other/**.java']
     mkpath 'target/classes/foo'
     touch 'target/classes/foo/Foo.class'
-    File.utime(Time.now - 10, Time.now - 10, compile_task.target.to_s)
+    File.utime(now_at_fs_resolution - 10, now_at_fs_resolution - 10, compile_task.target.to_s)
     compile_task.invoke
-    File.stat(compile_task.target.to_s).mtime.should be_close(Time.now - 10, 2)
+    File.stat(compile_task.target.to_s).mtime.should be_close(now_at_fs_resolution - 10, 2)
   end
 end
 
@@ -584,7 +591,7 @@ describe Project, '#resources' do
   end
 
   it 'should copy new resources to target directory' do
-    time = Time.now
+    time = now_at_fs_resolution
     mkdir_p 'target/resources'
     File.utime(time-10, time-10, 'target/resources')
 
@@ -596,7 +603,7 @@ describe Project, '#resources' do
   end
 
   it 'should copy updated resources to target directory' do
-    time = Time.now
+    time = now_at_fs_resolution
     mkdir_p 'target/resources'
     write 'target/resources/foo', 'Foo'
     File.utime(time-10, time-10, 'target/resources')

data/spec/java/bdd_spec.rb

@@ -27,34 +27,30 @@ describe Buildr::RSpec do
     project('foo').test.framework.should eql(:rspec)
   end
 
-  it 'should read passed specs from result yaml' do
-    # This test fails on the CI machine if the spec is run as part of a suite but not if run individually
-    # This seems to indicate that there is interaction with some other test but until that other test is
-    # identified the test has been marked as pending on the ci box
-    pending "Unable to determine why it fails on the CI machine so disabling" if ENV['JOB_NAME']
-    write('src/spec/ruby/success_spec.rb', 'describe("success") { it("is true") { nil.should be_nil } }')
-
-    project('foo').test.invoke
-    project('foo').test.passed_tests.should eql([File.expand_path('src/spec/ruby/success_spec.rb')])
-  end
-
-  it 'should read result yaml to obtain the list of failed specs' do
-    # This test fails on the CI machine if the spec is run as part of a suite but not if run individually
-    # This seems to indicate that there is interaction with some other test but until that other test is
-    # identified the test has been marked as pending on the ci box
-    pending "Unable to determine why it fails on the CI machine so disabling" if ENV['JOB_NAME']
-    success = File.expand_path('src/spec/ruby/success_spec.rb')
-    write(success, 'describe("success") { it("is true") { nil.should be_nil } }')
-    failure = File.expand_path('src/spec/ruby/failure_spec.rb')
-    write(failure, 'describe("failure") { it("is false") { true.should == false } }')
-    error = File.expand_path('src/spec/ruby/error_spec.rb')
-    write(error, 'describe("error") { it("raises") { lambda; } }')
-
-    lambda { project('foo').test.invoke }.should raise_error(/Tests failed/)
-    project('foo').test.tests.should include(success, failure, error)
-    project('foo').test.failed_tests.sort.should eql([failure, error].sort)
-    project('foo').test.passed_tests.should eql([success])
+  # These tests will fail because they expect that a version of rspec will be present in the local gem
+  # repository for the jruby that comes out of the maven repository but this is not the case. Disabling
+  # These across the board until someone wants to invest the time in refactoring them to work
+  if false
+    it 'should read passed specs from result yaml' do
+      write('src/spec/ruby/success_spec.rb', 'describe("success") { it("is true") { nil.should be_nil } }')
+
+      project('foo').test.invoke
+      project('foo').test.passed_tests.should eql([File.expand_path('src/spec/ruby/success_spec.rb')])
+    end
 
+    it 'should read result yaml to obtain the list of failed specs' do
+      success = File.expand_path('src/spec/ruby/success_spec.rb')
+      write(success, 'describe("success") { it("is true") { nil.should be_nil } }')
+      failure = File.expand_path('src/spec/ruby/failure_spec.rb')
+      write(failure, 'describe("failure") { it("is false") { true.should == false } }')
+      error = File.expand_path('src/spec/ruby/error_spec.rb')
+      write(error, 'describe("error") { it("raises") { lambda; } }')
+
+      lambda { project('foo').test.invoke }.should raise_error(/Tests failed/)
+      project('foo').test.tests.should include(success, failure, error)
+      project('foo').test.failed_tests.sort.should eql([failure, error].sort)
+      project('foo').test.passed_tests.should eql([success])
+    end
   end
 
 end if RUBY_PLATFORM =~ /java/ || ENV['JRUBY_HOME'] # RSpec

data/spec/java/packaging_spec.rb

@@ -1204,6 +1204,41 @@ describe Packaging, 'javadoc' do
   end
 end
 
+describe Packaging, 'test_jar' do
+  it_should_behave_like 'packaging'
+  before { @packaging, @package_type = :test_jar, :jar }
+
+  it 'should create package of type :jar and classifier \'test-jar\'' do
+    define 'foo', :version=>'1.0' do
+      package(:test_jar).type.should eql(:jar)
+      package(:test_jar).classifier.should eql('test-jar')
+      package(:test_jar).name.should match(/foo-1.0-test-jar.jar$/)
+    end
+  end
+
+  it 'should contain test source and resource files' do
+    write 'src/test/java/Test.java', 'public class Test {}'
+    write 'src/test/resources/test.properties', 'foo=bar'
+    define('foo', :version=>'1.0') { package(:test_jar) }
+    project('foo').task('package').invoke
+    project('foo').packages.first.should contain('Test.class')
+    project('foo').packages.first.should contain('test.properties')
+  end
+
+  it 'should create test jar if resources exists (but not sources)' do
+    write 'src/test/resources/test.properties', 'foo=bar'
+    define('foo', :version=>'1.0') { package(:test_jar) }
+    project('foo').package(:test_jar).invoke
+    project('foo').packages.first.should contain('test.properties')
+  end
+
+  it 'should be a ZipTask' do
+    define 'foo', :version=>'1.0' do
+      package(:test_jar).should be_kind_of(ZipTask)
+    end
+  end
+end
+
 shared_examples_for 'package_with_' do
 
   def prepare(options = {})

data/spec/scala/compiler_spec.rb

@@ -110,16 +110,18 @@ share_as :ScalacCompiler do
   end
 end
 
+# Only run this test if the test environment has SCALA_HOME specified.
+# Allows the Test Suite to run on TravisCI
+if ENV['SCALA_HOME']
+  describe 'scala compiler (installed in SCALA_HOME)' do
+    it 'requires present SCALA_HOME' do
+      ENV['SCALA_HOME'].should_not be_nil
+    end
 
-describe 'scala compiler (installed in SCALA_HOME)' do
-  it 'requires present SCALA_HOME' do
-    ENV['SCALA_HOME'].should_not be_nil
+    it_should_behave_like ScalacCompiler
   end
-
-  it_should_behave_like ScalacCompiler
 end
 
-
 describe 'scala compiler (downloaded from repository)' do
   old_home = ENV['SCALA_HOME']
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: buildr
 version: !ruby/object:Gem::Version
-  version: 1.4.11
+  version: 1.4.12
   prerelease: 
 platform: java
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -331,22 +331,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.7.2
-- !ruby/object:Gem::Dependency
-  name: ffi-ncurses
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: pygmentize
   requirement: !ruby/object:Gem::Requirement
@@ -550,6 +534,7 @@ files:
 - lib/buildr/packaging/gems.rb
 - lib/buildr/packaging/package.rb
 - lib/buildr/packaging/tar.rb
+- lib/buildr/packaging/test_jar.rb
 - lib/buildr/packaging/version_requirement.rb
 - lib/buildr/packaging/zip.rb
 - lib/buildr/packaging/ziptask.rb
@@ -660,6 +645,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -750290413766610913
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: