buildr 1.4.25 → 1.5.0.dev2

data/spec/java/java_spec.rb

@@ -51,6 +51,12 @@ else
   end
 end
 
+describe 'Java.classpath' do
+  it 'should issue a warning if the classpath is modified after Java is loaded' do
+    lambda { Java.classpath << 'foo:bar:1.0' }.should show_warning(/Java is already loaded/)
+  end
+end
+
 
 describe 'Java.tools_jar' do
   before do
@@ -121,12 +127,4 @@ describe 'Java#java' do
   after do
     ENV['JAVA_HOME'] = @old_home
   end
-end
-
-
-describe Java::JavaWrapper do
-  it 'should be removed in version 1.5 since it was deprecated in version 1.3' do
-    Buildr::VERSION.should < '1.5'
-    lambda { Java::JavaWrapper }.should_not raise_error
-  end
-end
+end

data/spec/java/packaging_spec.rb

@@ -91,13 +91,13 @@ shared_examples_for 'package with manifest' do
   it 'should not exist when manifest=false' do
     package_with_manifest false
     @project.package(@packaging).invoke
-    Zip::ZipFile.open(@project.package(@packaging).to_s) do |zip|
-      zip.file.exist?('META-INF/MANIFEST.MF').should be_false
+    Zip::File.open(@project.package(@packaging).to_s) do |zip|
+      zip.exist?('META-INF/MANIFEST.MF').should be_false
     end
   end
 
   it 'should generate a new manifest for a file that does not have one' do
-    Zip::ZipOutputStream.open 'tmp.zip' do |zip|
+    Zip::OutputStream.open 'tmp.zip' do |zip|
       zip.put_next_entry 'empty.txt'
     end
     begin
@@ -135,7 +135,7 @@ shared_examples_for 'package with manifest' do
     package_with_manifest 'Foo'=>1, :bar=>'Bar'
     package = project('foo').package(@packaging)
     package.invoke
-    Zip::ZipFile.open(package.to_s) { |zip| zip.file.read('META-INF/MANIFEST.MF').should =~ /#{Buildr::Packaging::Java::Manifest::LINE_SEPARATOR}$/ }
+    Zip::File.open(package.to_s) { |zip| zip.read('META-INF/MANIFEST.MF').should =~ /#{Buildr::Packaging::Java::Manifest::LINE_SEPARATOR}$/ }
   end
 
   it 'should break hash manifest lines longer than 72 characters using continuations' do
@@ -160,7 +160,7 @@ shared_examples_for 'package with manifest' do
     package_with_manifest [ { :foo=>'first' }, { :bar=>'second' } ]
     package = project('foo').package(@packaging)
     package.invoke
-    Zip::ZipFile.open(package.to_s) { |zip| zip.file.read('META-INF/MANIFEST.MF')[-1].should == ?\n }
+    Zip::File.open(package.to_s) { |zip| zip.read('META-INF/MANIFEST.MF')[-1].should == ?\n }
   end
 
   it 'should break array manifest lines longer than 72 characters using continuations' do
@@ -202,8 +202,8 @@ shared_examples_for 'package with 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)
+    Zip::File.open(package.to_s) do |zip|
+      permissions = format("%o", zip.find_entry('META-INF/MANIFEST.MF').unix_perms)
       expected_mode = Buildr::Util.win_os? ? /666$/ : /644$/
       permissions.should match expected_mode
     end
@@ -214,7 +214,7 @@ shared_examples_for 'package with manifest' do
     package_with_manifest 'MANIFEST.MF'
     package ||= project('foo').package(@packaging)
     package.invoke
-    Zip::ZipFile.open(package.to_s) do |zip|
+    Zip::File.open(package.to_s) do |zip|
       zip.read('META-INF/MANIFEST.MF').scan(/(Manifest-Version)/m).size.should == 1
     end
   end
@@ -251,7 +251,7 @@ shared_examples_for 'package with manifest' do
     packaging = @packaging
     package = define('foo', :version=>'1.0') { package(packaging) }.packages.first
     package.invoke
-    Zip::ZipFile.open(package.to_s) do |zip|
+    Zip::File.open(package.to_s) do |zip|
       zip.entries.map(&:to_s).should include('META-INF/')
     end
   end
@@ -361,7 +361,7 @@ shared_examples_for 'package with meta_inf' do
     package = project('foo').package(@packaging)
     package.invoke
     assumed = Array(@meta_inf_ignore)
-    Zip::ZipFile.open(package.to_s) do |zip|
+    Zip::File.open(package.to_s) do |zip|
       entries = zip.entries.map(&:name).select { |f| File.dirname(f) == 'META-INF' }.map { |f| File.basename(f) }
       assumed.each { |f| entries.should include(f) }
       yield entries - assumed if block_given?
@@ -435,7 +435,7 @@ describe Packaging, 'jar' 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|
+    Zip::File.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
@@ -446,7 +446,7 @@ describe Packaging, 'jar' 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|
+    Zip::File.open(project('foo').package(:jar).to_s) do |jar|
       jar.entries.map(&:to_s).sort.should include('META-INF/MANIFEST.MF', 'Test.class')
     end
   end
@@ -455,7 +455,7 @@ describe Packaging, 'jar' do
     write 'src/main/resources/test/important.properties'
     define('foo', :version=>'1.0') { package(:jar) }
     project('foo').package(:jar).invoke
-    Zip::ZipFile.open(project('foo').package(:jar).to_s) do |jar|
+    Zip::File.open(project('foo').package(:jar).to_s) do |jar|
       jar.entries.map(&:to_s).sort.should include('test/important.properties')
     end
   end
@@ -464,7 +464,7 @@ describe Packaging, 'jar' do
     write 'src/main/java/code/Test.java', 'package code ; 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|
+    Zip::File.open(project('foo').package(:jar).to_s) do |jar|
       jar.entries.map(&:to_s).sort.should include('code/')
     end
   end
@@ -473,7 +473,7 @@ describe Packaging, 'jar' do
     write 'src/main/resources/test/.config'
     define('foo', :version=>'1.0') { package(:jar) }
     project('foo').package(:jar).invoke
-    Zip::ZipFile.open(project('foo').package(:jar).to_s) do |jar|
+    Zip::File.open(project('foo').package(:jar).to_s) do |jar|
       jar.entries.map(&:to_s).sort.should include('test/.config')
     end
   end
@@ -482,7 +482,7 @@ describe Packaging, 'jar' do
     mkpath 'src/main/resources/empty'
     define('foo', :version=>'1.0') { package(:jar) }
     project('foo').package(:jar).invoke
-    Zip::ZipFile.open(project('foo').package(:jar).to_s) do |jar|
+    Zip::File.open(project('foo').package(:jar).to_s) do |jar|
       jar.entries.map(&:to_s).sort.should include('empty/')
     end
   end
@@ -497,7 +497,7 @@ describe Packaging, 'jar' 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|
+    Zip::File.open(foo.package(:jar).to_s) do |jar|
       jar.entries.map(&:to_s).sort.should_not include('foo.xml')
     end
   end
@@ -519,7 +519,7 @@ describe Packaging, 'war' do
 
   def inspect_war
     project('foo').package(:war).invoke
-    Zip::ZipFile.open(project('foo').package(:war).to_s) do |war|
+    Zip::File.open(project('foo').package(:war).to_s) do |war|
       yield war.entries.map(&:to_s).sort
     end
   end
@@ -678,7 +678,7 @@ describe Packaging, 'aar' do
 
   def inspect_aar
     project('foo').package(:aar).invoke
-    Zip::ZipFile.open(project('foo').package(:aar).to_s) do |aar|
+    Zip::File.open(project('foo').package(:aar).to_s) do |aar|
       yield aar.entries.map(&:to_s).sort
     end
   end
@@ -752,23 +752,23 @@ describe Packaging, 'ear' do
 
   def inspect_ear
     project('foo').package(:ear).invoke
-    Zip::ZipFile.open(project('foo').package(:ear).to_s) do |ear|
+    Zip::File.open(project('foo').package(:ear).to_s) do |ear|
       yield ear.entries.map(&:to_s).sort
     end
   end
 
   def inspect_application_xml
     project('foo').package(:ear).invoke
-    Zip::ZipFile.open(project('foo').package(:ear).to_s) do |ear|
+    Zip::File.open(project('foo').package(:ear).to_s) do |ear|
       yield REXML::Document.new(ear.read('META-INF/application.xml')).root
     end
   end
 
   def inspect_classpath(package)
     project('foo').package(:ear).invoke
-    Zip::ZipFile.open(project('foo').package(:ear).to_s) do |ear|
+    Zip::File.open(project('foo').package(:ear).to_s) do |ear|
       File.open('tmp.zip', 'wb') do |tmp|
-        tmp.write ear.file.read(package)
+        tmp.write ear.read(package)
       end
       manifest = Buildr::Packaging::Java::Manifest.from_zip('tmp.zip')
       yield manifest.main['Class-Path'].split(' ')

data/spec/java/pom_spec.rb

@@ -123,3 +123,40 @@ XML
     pom.properties.should eql(specs)
   end
 end
+
+describe Buildr::POM do
+  before do
+    repositories.remote = 'http://buildr.apache.org/repository/noexist'
+    @parent = 'group:app-parent:jar:1.1.1'
+    write artifact(@parent).pom.to_s, <<-XML
+<project>
+  <artifactId>app-parent</artifactId>
+  <groupId>group</groupId>
+  <version>1.1.1</version>
+</project>
+XML
+    @app = 'group:app:jar:1.0'
+    write artifact(@app).pom.to_s, <<-XML
+<project>
+  <artifactId>app</artifactId>
+  <groupId>group</groupId>
+  <parent>
+    <groupId>group</groupId>
+    <artifactId>app-parent</artifactId>
+    <version>1.1.1</version>
+  </parent>
+  <dependencies>
+    <dependency>
+      <artifactId>library</artifactId>
+      <groupId>org.example</groupId>
+      <version>${project.parent.version}</version>
+    </dependency>
+  </dependencies>
+</project>
+XML
+  end
+  it "should manage to resolve the version from the parent version" do
+    pom = POM.load(artifact(@app).pom)
+    pom.dependencies.should include('org.example:library:jar:1.1.1')
+  end
+end

data/spec/java/tests_spec.rb

@@ -40,11 +40,6 @@ describe Buildr::JUnit do
     project('foo').test.dependencies.should include(artifact("junit:junit:jar:#{JUnit.version}"))
   end
 
-  it 'should have REQUIRES up to version 1.5 since it was deprecated in 1.3.3' do
-    Buildr::VERSION.should < '1.5'
-    lambda { JUnit::REQUIRES }.should_not raise_error
-  end
-
   it 'should pick JUnit version from junit build settings' do
     Buildr::JUnit.instance_eval { @dependencies = nil }
     write 'build.yaml', 'junit: 1.2.3'

data/spec/packaging/archive_spec.rb

@@ -524,7 +524,7 @@ describe "ZipTask" do
 
   def inspect_archive
     entries = {}
-    Zip::ZipFile.open @archive do |zip|
+    Zip::File.open @archive do |zip|
       zip.entries.each do |entry|
         if entry.directory?
           # Ignore the / directory created for empty ZIPs when using java.util.zip.

data/spec/packaging/artifact_spec.rb

@@ -209,6 +209,100 @@ describe Repositories, 'local' do
   end
 end
 
+describe Repositories, 'remote_uri' do
+  before do
+    Buildr.repositories.instance_eval do
+      @local = @remote = @release_to = nil
+    end
+
+    @repos = [ 'https://oss.sonatype.org/', 'http://www.ibiblio.org/maven2', { :url => 'http://repo1.maven.org/maven2', :username => 'user', :password => 'password' } ]
+  end
+  
+  it 'should convert remote to array of uri' do
+      uri = URI.parse( 'http://repo1.maven.org/maven2' )
+      uri.user = 'user' 
+      uri.password = 'password'
+    
+      uris = [ URI.parse( 'https://oss.sonatype.org/'), URI.parse( 'http://www.ibiblio.org/maven2' ), uri ]
+      
+      repositories.remote = @repos
+      repositories.remote_uri.should eql(uris)
+  end
+end
+
+describe Repositories, 'mirrors' do
+  before do
+    Buildr.repositories.instance_eval do
+      @local = @remote = @release_to = @mirrors = nil
+    end
+    
+    @repos = [ 'http://www.ibiblio.org/maven2', 'http://repo1.maven.org/maven2' ]
+  end
+  
+  it 'should be empty initially' do
+    repositories.mirrors.should be_empty
+  end
+
+  it 'should be settable' do
+    repositories.mirrors = @repos.first
+    repositories.mirrors.should eql([@repos.first])
+  end
+  
+  it 'should be settable from array' do
+    repositories.mirrors = @repos
+    repositories.mirrors.should eql(@repos)
+  end
+
+  it 'should add and return repositories in order' do
+    @repos.each { |url| repositories.mirrors << url }
+    repositories.mirrors.should eql(@repos)
+  end
+  
+  it 'should log that it is overridding the remote repositories with the mirrors' do
+    @repos.each { |url| repositories.mirrors << url }
+    lambda { repositories.remote }.should show_info /Remote repositories overridden by mirrors /
+  end
+  
+  it 'should load with all repositories specified in settings file' do
+    write 'home/.buildr/settings.yaml', <<-YAML
+    repositories:
+      mirrors:
+      - http://example.com/repository/noexist
+      remote:
+      - http://foobar.com
+    YAML
+    repositories.mirrors.should include('http://example.com/repository/noexist')
+  end
+
+  it 'should load with all repositories specified in build.yaml file' do
+    write 'build.yaml', <<-YAML
+    repositories:
+      mirrors:
+      - http://example.com/repository/noexist
+      remote:
+      - http://foobar.com
+    YAML
+    repositories.mirrors.should include('http://example.com/repository/noexist')
+  end
+
+  it 'should load with all repositories specified in settings and build.yaml files' do
+    write 'home/.buildr/settings.yaml', <<-YAML
+    repositories:
+      mirrors:
+      - http://example.com/repository/noexist
+      remote:
+      - http://foobar.com
+    YAML
+    write 'build.yaml', <<-YAML
+    repositories:
+      mirrors:
+      - http://example.com/repo2
+      remote:
+      - http://foobar.com
+    YAML
+    repositories.mirrors.should include('http://example.com/repository/noexist', 'http://example.com/repo2')
+  end
+end
 
 describe Repositories, 'remote' do
   before do
@@ -581,6 +675,10 @@ describe Buildr, '#artifact' do
     artifact(@spec.merge(:type=>nil)).should respond_to(:invoke)
   end
 
+  it 'should use JAR type if type is set to bundle' do
+    artifact(@spec.merge(:type=>:bundle)).to_s.should match('\.jar$')
+  end
+
   it 'should accept string specification' do
     artifact('com.example:library:jar:2.0').should respond_to(:invoke)
   end
@@ -855,7 +953,6 @@ describe Buildr, '#install' do
     @spec = 'group:id:jar:all:1.0'
     pom = artifact(@spec).pom
     write @file
-    p method(:install)
     install artifact(@spec).from(@file)
     lambda { install.invoke }.should_not change { File.exist?(repositories.locate(pom)) }.to(true)
   end
@@ -901,6 +998,7 @@ end
 
 
 describe ActsAsArtifact, '#upload' do
+  
   it 'should be used to upload artifact' do
     artifact = artifact('com.example:library:jar:2.0')
     # Prevent artifact from downloading anything.
@@ -929,6 +1027,24 @@ describe ActsAsArtifact, '#upload' do
     write repositories.locate(artifact.pom)
     lambda { artifact.upload }.should raise_error(Exception, /where to upload/)
   end
+  
+  it 'should upload SNAPSHOT with timestamped unique version and maven metadata' do
+    artifact = artifact('com.example:library:jar:2.0-SNAPSHOT')
+    # Prevent artifact from downloading anything.
+    write repositories.locate(artifact)
+    write repositories.locate(artifact.pom)
+
+    time = Time.gm(2011,"mar",11,14,02,36,123)
+    Time.stub(:now).and_return(time)
+
+    URI.should_receive(:upload).once.
+    with(URI.parse('sftp://example.com/base/com/example/library/2.0-SNAPSHOT/library-2.0-20110311.140236-1.pom'), artifact.pom.to_s, anything)
+    URI.should_receive(:upload).once.
+    with(URI.parse('sftp://example.com/base/com/example/library/2.0-SNAPSHOT/library-2.0-20110311.140236-1.jar'), artifact.to_s, anything)
+    URI.should_receive(:write).once.
+    with(URI.parse('sftp://example.com/base/com/example/library/2.0-SNAPSHOT/maven_metadata.xml'), anything, anything)
+    verbose(false) { artifact.upload(:url=>'sftp://example.com/base') }
+  end
 
   it 'should accept repositories.release_to setting' do
     artifact = artifact('com.example:library:jar:2.0')
@@ -942,28 +1058,36 @@ describe ActsAsArtifact, '#upload' do
   end
 
   it 'should use repositories.release_to setting even for snapshots when snapshot_to is not set' do
+    time = Time.gm(2016,"nov",11,14,02,36,123)
+    Time.stub(:now).and_return(time)
     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)
+      with(URI.parse('sftp://buildr.apache.org/repository/noexist/base/com/example/library/2.0-SNAPSHOT/library-2.0-20161111.140236-1.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)
+      with(URI.parse('sftp://buildr.apache.org/repository/noexist/base/com/example/library/2.0-SNAPSHOT/library-2.0-20161111.140236-1.jar'), artifact.to_s, anything)
+    URI.should_receive(:write).once.
+      with(URI.parse('sftp://buildr.apache.org/repository/noexist/base/com/example/library/2.0-SNAPSHOT/maven_metadata.xml'), anything, 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
+    time = Time.gm(2016,"nov",11,14,02,36,123)
+    Time.stub(:now).and_return(time)
     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)
+      with(URI.parse('sftp://buildr.apache.org/repository/noexist/snapshot/com/example/library/2.0-SNAPSHOT/library-2.0-20161111.140236-1.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)
+      with(URI.parse('sftp://buildr.apache.org/repository/noexist/snapshot/com/example/library/2.0-SNAPSHOT/library-2.0-20161111.140236-1.jar'), artifact.to_s, anything)
+      URI.should_receive(:write).once.
+        with(URI.parse('sftp://buildr.apache.org/repository/noexist/snapshot/com/example/library/2.0-SNAPSHOT/maven_metadata.xml'), anything, anything)
     repositories.release_to = 'sftp://buildr.apache.org/repository/noexist/base'
     repositories.snapshot_to = 'sftp://buildr.apache.org/repository/noexist/snapshot'
     artifact.upload
@@ -978,8 +1102,6 @@ describe ActsAsArtifact, '#upload' do
     repositories.snapshot_to = 'sftp://buildr.apache.org/repository/noexist/snapshot'
     lambda { artifact.upload }.should raise_error(Exception, /where to upload/)
   end
-
-
 end