buildr 1.4.14 → 1.4.15

data/spec/java/emma_spec.rb

@@ -121,4 +121,4 @@ describe Buildr::Emma do
   end
 end
 
-end
+end

data/spec/java/external_spec.rb

@@ -26,7 +26,8 @@ describe Buildr::Compiler::ExternalJavac do
     Buildr::Compiler.send :compilers=, COMPILERS_WITHOUT_JAVAC
   end
 
-  describe "should compile a Java project just in the same way javac does" do
+  # Fails sometimes under windows?
+  describe "should compile a Java project just in the same way javac does", :retry => 4 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", "externaljavac")

data/spec/java/java_spec.rb

@@ -22,7 +22,7 @@ unless RUBY_PLATFORM =~ /java/
     before do
       @old_home, ENV['JAVA_HOME'] = ENV['JAVA_HOME'], nil
       @old_env_java = Object.module_eval { remove_const :ENV_JAVA }
-      RbConfig::CONFIG.should_receive(:[]).with('host_os').and_return('darwin0.9')
+      RbConfig::CONFIG.should_receive(:[]).at_least(:once).with('host_os').and_return('darwin0.9')
     end
 
     it 'should point to default JVM' do

data/spec/java/packaging_spec.rb

@@ -550,8 +550,7 @@ describe Packaging, 'war' do
     inspect_war { |files| files.should include('test.html') }
   end
 
-  it 'should accept files from :classes option' do
-    write 'src/main/java/Test.java', 'class Test {}'
+  it 'should accept files from :classes option', :retry => (Buildr::Util.win_os? ? 4 : 1) do
     write 'classes/test'
     define('foo', :version=>'1.0') { package(:war).with(:classes=>'classes') }
     inspect_war { |files| files.should include('WEB-INF/classes/test') }
@@ -1228,11 +1227,11 @@ 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
+  it 'should create package of type :jar and classifier \'tests\'' 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$/)
+      package(:test_jar).classifier.should eql('tests')
+      package(:test_jar).name.should match(/foo-1.0-tests.jar$/)
     end
   end
 

data/spec/java/pom_spec.rb

@@ -122,4 +122,4 @@ XML
     specs = {"a.version"=>"1.1", "b.version"=>"1.1", "project.groupId"=>"group", "pom.groupId"=>"group", "groupId"=>"group", "project.artifactId"=>"app", "pom.artifactId"=>"app", "artifactId"=>"app"}
     pom.properties.should eql(specs)
   end
-end
+end

data/spec/java/test_coverage_helper.rb

@@ -128,7 +128,7 @@ shared_examples_for 'test coverage tool' do
         mkpath instrumented_dir.to_s
         File.utime(a_long_time_ago, a_long_time_ago, instrumented_dir.to_s)
         task("foo:#{toolname}:instrument").invoke
-        instrumented_dir.timestamp.should be_close(Time.now, 2)
+        instrumented_dir.timestamp.should be_within(2).of(Time.now)
       end
 
       it 'should not touch instrumented directory if nothing instrumented' do
@@ -137,7 +137,7 @@ shared_examples_for 'test coverage tool' do
         mkpath instrumented_dir.to_s
         [project('foo').compile.target, instrumented_dir].map(&:to_s).each { |dir| File.utime(a_long_time_ago, a_long_time_ago, dir) }
         task("foo:#{toolname}:instrument").invoke
-        instrumented_dir.timestamp.should be_close(a_long_time_ago, 2)
+        instrumented_dir.timestamp.should be_within(2).of(a_long_time_ago)
       end
     end
 

data/spec/packaging/archive_spec.rb

@@ -345,7 +345,7 @@ shared_examples_for 'ArchiveTask' do
     # all included files newer.
     File.utime Time.now - 100, Time.now - 100, @archive
     archive(@archive).include(@files).invoke
-    File.stat(@archive).mtime.should be_close(Time.now, 10)
+    File.stat(@archive).mtime.should be_within(10).of(Time.now)
   end
 
   it 'should update if a file in a subdir is more recent' do
@@ -369,7 +369,7 @@ shared_examples_for 'ArchiveTask' do
     # By touching all files in the past, there's nothing new to update.
     (@files + [@archive]).each { |f| File.utime Time.now - 100, Time.now - 100, f }
     archive(@archive).include(@files).invoke
-    File.stat(@archive).mtime.should be_close(Time.now - 100, 10)
+    File.stat(@archive).mtime.should be_within(10).of(Time.now - 100)
   end
 
   it 'should update if one of the files is recent' do
@@ -392,6 +392,25 @@ shared_examples_for 'ArchiveTask' do
     archive(@archive).include(@files)
     lambda { archive(@archive).with :option=>true }.should raise_error
   end
+
+  it 'should invoke paths supplied in from parameters' do
+    included_file = File.expand_path("somefile.myext")
+    write included_file, content_for(included_file)
+    archive2_filename = File.expand_path("somebug.zip")
+    a2 = zip(archive2_filename).
+      include(included_file, :as => 'folder1/somefile1.ext').
+      include(included_file, :as => 'folder2/somefile2.ext').
+      invoke
+    a = archive(@archive)
+    f1 = unzip('target/folder1' => archive2_filename).from_path("folder1/*").root
+    f2 = unzip('target/folder2' => archive2_filename).from_path("folder2/*").root
+    a.include(:from => f1)
+    a.include(:from => f2)
+    a.invoke
+    contents = inspect_archive
+    contents["folder1/somefile1.ext"].should_not be_nil
+    contents["folder2/somefile2.ext"].should_not be_nil
+  end
 end
 
 describe TarTask do
@@ -590,7 +609,7 @@ describe Unzip do
       File.utime(Time.now - 10, Time.now - 10, @target)
       unzip(@target=>@zip).target.invoke
     end
-    File.stat(@target).mtime.should be_close(Time.now, 2)
+    File.stat(@target).mtime.should be_within(2).of(Time.now)
   end
 
   it 'should expand files' do

data/spec/packaging/artifact_spec.rb

@@ -510,6 +510,51 @@ describe Repositories, 'release_to' do
   end
 end
 
+describe Repositories, 'snapshot_to' do
+  it 'should accept URL as first argument' do
+    repositories.snapshot_to = 'http://buildr.apache.org/repository/noexist'
+    repositories.snapshot_to.should == { :url=>'http://buildr.apache.org/repository/noexist' }
+  end
+
+  it 'should accept hash with options' do
+    repositories.snapshot_to = { :url=>'http://buildr.apache.org/repository/noexist', :username=>'john' }
+    repositories.snapshot_to.should == { :url=>'http://buildr.apache.org/repository/noexist', :username=>'john' }
+  end
+
+  it 'should allow the hash to be manipulated' do
+    repositories.snapshot_to = 'http://buildr.apache.org/repository/noexist'
+    repositories.snapshot_to.should == { :url=>'http://buildr.apache.org/repository/noexist' }
+    repositories.snapshot_to[:username] = 'john'
+    repositories.snapshot_to.should == { :url=>'http://buildr.apache.org/repository/noexist', :username=>'john' }
+  end
+
+  it 'should load URL from settings file' do
+    write 'home/.buildr/settings.yaml', <<-YAML
+    repositories:
+      snapshot_to: http://john:secret@buildr.apache.org/repository/noexist
+    YAML
+    repositories.snapshot_to.should == { :url=>'http://john:secret@buildr.apache.org/repository/noexist' }
+  end
+
+  it 'should load URL from build settings file' do
+    write 'build.yaml', <<-YAML
+    repositories:
+      snapshot_to: http://john:secret@buildr.apache.org/repository/noexist
+    YAML
+    repositories.snapshot_to.should == { :url=>'http://john:secret@buildr.apache.org/repository/noexist' }
+  end
+
+  it 'should load URL, username and password from settings file' do
+    write 'home/.buildr/settings.yaml', <<-YAML
+    repositories:
+      snapshot_to:
+        url: http://buildr.apache.org/repository/noexist
+        username: john
+        password: secret
+    YAML
+    repositories.snapshot_to.should == { :url=>'http://buildr.apache.org/repository/noexist', :username=>'john', :password=>'secret' }
+  end
+end
 
 describe Buildr, '#artifact' do
   before do
@@ -885,7 +930,7 @@ describe ActsAsArtifact, '#upload' do
     lambda { artifact.upload }.should raise_error(Exception, /where to upload/)
   end
 
-  it 'should accept repositories.upload setting' do
+  it 'should accept repositories.release_to setting' do
     artifact = artifact('com.example:library:jar:2.0')
     # Prevent artifact from downloading anything.
     write repositories.locate(artifact)
@@ -896,6 +941,45 @@ describe ActsAsArtifact, '#upload' do
     lambda { artifact.upload }.should_not raise_error
   end
 
+  it 'should use repositories.release_to setting even for snapshots when snapshot_to is not set' do
+    artifact = artifact('com.example:library:jar:2.0-SNAPSHOT')
+    # Prevent artifact from downloading anything.
+    write repositories.locate(artifact)
+    write repositories.locate(artifact.pom)
+    URI.should_receive(:upload).once.
+      with(URI.parse('sftp://buildr.apache.org/repository/noexist/base/com/example/library/2.0-SNAPSHOT/library-2.0-SNAPSHOT.pom'), artifact.pom.to_s, anything)
+    URI.should_receive(:upload).once.
+      with(URI.parse('sftp://buildr.apache.org/repository/noexist/base/com/example/library/2.0-SNAPSHOT/library-2.0-SNAPSHOT.jar'), artifact.to_s, anything)
+    repositories.release_to = 'sftp://buildr.apache.org/repository/noexist/base'
+    artifact.upload
+    lambda { artifact.upload }.should_not raise_error
+  end
+
+  it 'should use repositories.snapshot_to setting when snapshot_to is set' do
+    artifact = artifact('com.example:library:jar:2.0-SNAPSHOT')
+    # Prevent artifact from downloading anything.
+    write repositories.locate(artifact)
+    write repositories.locate(artifact.pom)
+    URI.should_receive(:upload).once.
+      with(URI.parse('sftp://buildr.apache.org/repository/noexist/snapshot/com/example/library/2.0-SNAPSHOT/library-2.0-SNAPSHOT.pom'), artifact.pom.to_s, anything)
+    URI.should_receive(:upload).once.
+      with(URI.parse('sftp://buildr.apache.org/repository/noexist/snapshot/com/example/library/2.0-SNAPSHOT/library-2.0-SNAPSHOT.jar'), artifact.to_s, anything)
+    repositories.release_to = 'sftp://buildr.apache.org/repository/noexist/base'
+    repositories.snapshot_to = 'sftp://buildr.apache.org/repository/noexist/snapshot'
+    artifact.upload
+    lambda { artifact.upload }.should_not raise_error
+  end
+
+  it 'should complain when only a snapshot repo is set but the artifact is not a snapshot' do
+    artifact = artifact('com.example:library:jar:2.0')
+    # Prevent artifact from downloading anything.
+    write repositories.locate(artifact)
+    write repositories.locate(artifact.pom)
+    repositories.snapshot_to = 'sftp://buildr.apache.org/repository/noexist/snapshot'
+    lambda { artifact.upload }.should raise_error(Exception, /where to upload/)
+  end
+
+
 end
 
 

data/spec/sandbox.rb

@@ -162,7 +162,7 @@ module Sandbox
     # since we don't want to remotely download artifacts into the sandbox over and over
     Buildr.repositories.instance_eval do
       @remote = ["file://" + @local]
-      @local = @release_to = nil
+      @local = @release_to = @snapshot_to = nil
     end
     Buildr.options.proxy.http = nil
 

data/spec/xpath_matchers.rb

@@ -118,4 +118,4 @@ module RSpec
     end
 
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildr
 version: !ruby/object:Gem::Version
-  version: 1.4.14
+  version: 1.4.15
 platform: ruby
 authors:
 - Apache Buildr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-10 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -282,14 +282,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 0.11.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 0.11.2
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement