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

data/spec/java/test_coverage_helper.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 TestCoverageHelper

data/spec/java/tests_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::JUnit do

data/spec/packaging/archive_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 'ArchiveTask', :shared=>true do
@@ -205,6 +205,13 @@ describe 'ArchiveTask', :shared=>true do
     archive(@archive).include(@dir, :as=>'.').invoke
     inspect_archive { |archive| archive.keys.should_not include(".") }
   end
+  
+  it 'should archive directories into specified alias, even if it has the same name' do
+    archive(@archive).include(@dir, :as=>File.basename(@dir)).invoke
+    inspect_archive { |archive| 
+      archive.keys.should_not include "#{File.basename(@dir)}"
+    }
+  end
 
   it 'should archive file into specified name/path' do
     archive(@archive).include(@files.first, :as=>'test/sample', :path=>'path').invoke
@@ -578,6 +585,10 @@ describe Unzip do
       Rake::Task.clear ; rm_rf @target
       unzip(@target=>@zip).include('test/**/*').target.invoke
       FileList[File.join(@target, 'test/path/*')].size.should be(2)
+      
+      Rake::Task.clear ; rm_rf @target
+      unzip(@target=>@zip).include('test/*').target.invoke
+      FileList[File.join(@target, 'test/path/*')].size.should be(2)
     end
   end
 

data/spec/packaging/artifact_namespace_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::ArtifactNamespace do
 

data/spec/packaging/artifact_spec.rb

@@ -13,9 +13,8 @@
 # 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'))
+require 'fileutils'
 
 describe Artifact do
   before do
@@ -25,6 +24,7 @@ describe Artifact do
     @snapshot = artifact(@spec.merge({ :version=>'2.1-SNAPSHOT' }))
   end
 
+
   it 'should act as one' do
     @artifact.should respond_to(:to_spec)
   end
@@ -79,6 +79,10 @@ describe Artifact do
     @artifact.sources_artifact.to_hash.should == @artifact.to_hash.merge(:classifier=>'sources')
   end
 
+  it 'should have associated javadoc artifact' do
+    @artifact.javadoc_artifact.to_hash.should == @artifact.to_hash.merge(:classifier=>'javadoc')
+  end
+
   it 'should download file if file does not exist' do
     lambda { @artifact.invoke }.should raise_error(Exception, /No remote repositories/)
     lambda { @classified.invoke }.should raise_error(Exception, /No remote repositories/)
@@ -129,6 +133,14 @@ describe Artifact do
     Artifact.list.should include(@classified.to_spec)
     Artifact.list.should include('foo:foo:jar:1.0')
   end
+
+  it 'should accept user-defined string content' do
+    a = artifact(@spec)
+    a.content 'foo'
+    install a
+    lambda { install.invoke }.should change { File.exist?(a.to_s) && File.exist?(repositories.locate(a)) }.to(true)
+    read(repositories.locate(a)).should eql('foo')
+  end
 end
 
 
@@ -282,11 +294,63 @@ describe Repositories, 'remote' do
       and_return { fail URI::NotFoundError }
     URI.should_receive(:download).twice.with(uri(/2.1-SNAPSHOT\/maven-metadata.xml$/), duck_type(:write)).
       and_return { |uri, target, options| target.write(metadata) }
-    URI.should_receive(:download).twice.with(uri(/2.1-SNAPSHOT\/library-2.1-20071012.190008-8.(jar|pom)$/), /2.1-SNAPSHOT\/library-2.1-SNAPSHOT.(jar|pom)$/).
+    URI.should_receive(:download).twice.with(uri(/2.1-SNAPSHOT\/library-2.1-20071012.190008-8.(jar|pom)$/), /2.1-SNAPSHOT\/library-2.1-SNAPSHOT.(jar|pom).(\d){1,}$/).
       and_return { |uri, target, options| write target }
     lambda { artifact('com.example:library:jar:2.1-SNAPSHOT').invoke }.
       should change { File.exist?(File.join(repositories.local, 'com/example/library/2.1-SNAPSHOT/library-2.1-SNAPSHOT.jar')) }.to(true)
   end
+  
+  it 'should fail resolving m2-style deployed snapshots if a timestamp is missing' do
+    metadata = <<-XML
+    <?xml version='1.0' encoding='UTF-8'?>
+    <metadata>
+      <groupId>com.example</groupId>
+      <artifactId>library</artifactId>
+      <version>2.1-SNAPSHOT</version>
+      <versioning>
+        <snapshot>
+          <buildNumber>8</buildNumber>
+        </snapshot>
+        <lastUpdated>20071012190008</lastUpdated>
+      </versioning>
+    </metadata>
+    XML
+    repositories.remote = 'http://example.com'
+    URI.should_receive(:download).once.with(uri(/2.1-SNAPSHOT\/library-2.1-SNAPSHOT.(jar|pom)$/), anything()).
+      and_return { fail URI::NotFoundError }
+    URI.should_receive(:download).once.with(uri(/2.1-SNAPSHOT\/maven-metadata.xml$/), duck_type(:write)).
+      and_return { |uri, target, options| target.write(metadata) }
+    lambda {
+      lambda { artifact('com.example:library:jar:2.1-SNAPSHOT').invoke }.should raise_error(RuntimeError, /Failed to download/)
+    }.should show_error "No timestamp provided for the snapshot com.example:library:jar:2.1-SNAPSHOT"
+    File.exist?(File.join(repositories.local, 'com/example/library/2.1-SNAPSHOT/library-2.1-SNAPSHOT.jar')).should be_false
+  end
+  
+  it 'should fail resolving m2-style deployed snapshots if a build number is missing' do
+    metadata = <<-XML
+    <?xml version='1.0' encoding='UTF-8'?>
+    <metadata>
+      <groupId>com.example</groupId>
+      <artifactId>library</artifactId>
+      <version>2.1-SNAPSHOT</version>
+      <versioning>
+        <snapshot>
+          <timestamp>20071012.190008</timestamp>
+        </snapshot>
+        <lastUpdated>20071012190008</lastUpdated>
+      </versioning>
+    </metadata>
+    XML
+    repositories.remote = 'http://example.com'
+    URI.should_receive(:download).once.with(uri(/2.1-SNAPSHOT\/library-2.1-SNAPSHOT.(jar|pom)$/), anything()).
+      and_return { fail URI::NotFoundError }
+    URI.should_receive(:download).once.with(uri(/2.1-SNAPSHOT\/maven-metadata.xml$/), duck_type(:write)).
+      and_return { |uri, target, options| target.write(metadata) }
+    lambda {
+      lambda { artifact('com.example:library:jar:2.1-SNAPSHOT').invoke }.should raise_error(RuntimeError, /Failed to download/)
+    }.should show_error "No build number provided for the snapshot com.example:library:jar:2.1-SNAPSHOT"
+    File.exist?(File.join(repositories.local, 'com/example/library/2.1-SNAPSHOT/library-2.1-SNAPSHOT.jar')).should be_false
+  end
 
   it 'should handle missing maven metadata by reporting the artifact unavailable' do
     repositories.remote = 'http://example.com'
@@ -401,7 +465,11 @@ end
 
 
 describe Buildr, '#artifact' do
-  before { @spec = { :group=>'com.example', :id=>'library', :type=>'jar', :version=>'2.0' } }
+  before do 
+    @spec = { :group=>'com.example', :id=>'library', :type=>'jar', :version=>'2.0' }
+    @snapshot_spec = 'group:id:jar:1.0-SNAPSHOT'
+    write @file = 'testartifact.jar' 
+  end
 
   it 'should accept hash specification' do
     artifact(:group=>'com.example', :id=>'library', :type=>'jar', :version=>'2.0').should respond_to(:invoke)
@@ -488,6 +556,57 @@ describe Buildr, '#artifact' do
     Buildr.application.send(:load_artifact_ns)
     artifact(:j2ee).to_s.pathmap('%f').should == 'geronimo-spec-j2ee-1.4-rc4.jar'
   end
+  
+  it 'should try to download snapshot artifact' do
+    run_with_repo
+    snapshot = artifact(@snapshot_spec)
+    
+    URI.should_receive(:download).at_least(:twice).and_return { |uri, target, options| write target }
+    FileUtils.should_receive(:mv).at_least(:twice)
+    snapshot.invoke
+  end
+
+  it 'should not try to update snapshot in offline mode if it exists' do
+    run_with_repo
+    snapshot = artifact(@snapshot_spec)
+    write snapshot.to_s
+    Buildr.application.options.work_offline = true
+    URI.should_receive(:download).exactly(0).times
+    snapshot.invoke
+  end
+  
+  it 'should download snapshot even in offline mode if it doesn''t exist' do
+    run_with_repo
+    snapshot = artifact(@snapshot_spec)
+    Buildr.application.options.work_offline = true
+    URI.should_receive(:download).exactly(2).times
+    snapshot.invoke
+  end
+  
+  it 'should update snapshots if --update-snapshots' do
+    run_with_repo
+    snapshot = artifact(@snapshot_spec)
+    Buildr.application.options.update_snapshots = true
+    
+    URI.should_receive(:download).at_least(:twice).and_return { |uri, target, options| write target }
+    FileUtils.should_receive(:mv).at_least(:twice)
+    snapshot.invoke
+  end
+  
+  it 'should update snapshot if it''s older than 24 hours' do
+    run_with_repo
+    snapshot = artifact(@snapshot_spec)
+    write snapshot.to_s
+    time = Time.at((Time.now - (60 * 60 * 24) - 10 ).to_i)
+    File.utime(time, time, snapshot.to_s)
+    URI.should_receive(:download).at_least(:once).and_return { |uri, target, options| write target }
+    snapshot.invoke
+  end
+  
+  def run_with_repo
+    repositories.remote = 'http://example.com'
+  end
+  
 end
 
 
@@ -578,6 +697,7 @@ describe Buildr, '#install' do
   before do
     @spec = 'group:id:jar:1.0'
     write @file = 'test.jar'
+    @snapshot_spec = 'group:id:jar:1.0-SNAPSHOT'
   end
 
   it 'should return the install task' do
@@ -600,13 +720,44 @@ describe Buildr, '#install' do
     write artifact(@spec).to_s # install a version of the artifact
     old_mtime = File.mtime(artifact(@spec).to_s)
     sleep 1; write @file       # make sure the "from" file has newer modification time
-    lambda { install.invoke }.should change { File.exist?(artifact(@spec).to_s) and old_mtime < File.mtime(artifact(@spec).to_s) }.to(true)
+    lambda { install.invoke }.should change { modified?(old_mtime, @spec) }.to(true)
+  end
+
+  it 'should re-install snapshot artifact when "from" is newer' do
+    install artifact(@snapshot_spec).from(@file)
+    write artifact(@snapshot_spec).to_s # install a version of the artifact
+    old_mtime = File.mtime(artifact(@snapshot_spec).to_s)
+    sleep 1; write @file       # make sure the "from" file has newer modification time
+    lambda { install.invoke }.should change { modified?(old_mtime, @snapshot_spec) }.to(true)
+  end
+  
+  it 'should download snapshot to temporary location' do
+    repositories.remote = 'http://example.com'
+    snapshot = artifact(@snapshot_spec)
+    same_time = Time.new
+    download_file = "#{Dir.tmpdir}/#{File.basename(snapshot.name)}#{same_time.to_i}"
+    
+    Time.should_receive(:new).twice.and_return(same_time)
+    URI.should_receive(:download).at_least(:twice).and_return { |uri, target, options| write target }
+    FileUtils.should_receive(:mv).at_least(:twice)
+    snapshot.invoke
   end
 
   it 'should install POM alongside artifact' do
+    pom = artifact(@spec).pom
+    write @file
+    install artifact(@spec).from(@file)
+    lambda { install.invoke }.should change { File.exist?(repositories.locate(pom)) }.to(true)
+  end
+
+  it 'should reinstall POM alongside artifact' do
+    pom = artifact(@spec).pom
     write @file
+    write repositories.locate(pom)
+    sleep 1
+
     install artifact(@spec).from(@file)
-    lambda { install.invoke }.should change { File.exist?(artifact(@spec).pom.to_s) }.to(true)
+    lambda { install.invoke }.should change { File.mtime(repositories.locate(pom)) }
   end
 end
 
@@ -743,6 +894,41 @@ describe Rake::Task, ' artifacts:sources' do
   end
 end
 
+describe Rake::Task, ' artifacts:javadoc' do
+
+  before do
+    task('artifacts:javadoc').clear
+    repositories.remote = 'http://example.com'
+  end
+
+  it 'should download javadoc for all specified artifacts' do
+    artifact 'group:id:jar:1.0'
+    URI.should_receive(:download).any_number_of_times.and_return { |uri, target| write target }
+    lambda { task('artifacts:javadoc').invoke }.should change { File.exist?('home/.m2/repository/group/id/1.0/id-1.0-javadoc.jar') }.to(true)
+  end
+
+  it "should not try to download javadoc for the project's artifacts" do
+    define('foo', :version=>'1.0') { package(:jar) }
+    URI.should_not_receive(:download)
+    task('artifacts:javadoc').invoke
+  end
+
+  describe 'when the javadoc artifact does not exist' do
+
+    before do
+      artifact 'group:id:jar:1.0'
+      URI.should_receive(:download).any_number_of_times.and_raise(URI::NotFoundError)
+    end
+
+    it 'should not fail' do
+      lambda { task('artifacts:javadoc').invoke }.should_not raise_error
+    end
+
+    it 'should inform the user' do
+      lambda { task('artifacts:javadoc').invoke }.should show_info('Failed to download group:id:jar:javadoc:1.0. Skipping it.')
+    end
+  end
+end
 
 describe Buildr, '#transitive' do
   before do
@@ -858,3 +1044,7 @@ XML
     transitive(@transitive).should eql(artifacts(@transitive, @complex, @simple - [@provided]))
   end
 end
+
+def modified?(old_mtime, spec)
+  File.exist?(artifact(spec).to_s) && old_mtime < File.mtime(artifact(spec).to_s)
+end

data/spec/packaging/packaging_spec.rb

@@ -14,8 +14,8 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), '../spec_helpers')
-require File.join(File.dirname(__FILE__), 'packaging_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
+require File.expand_path(File.join(File.dirname(__FILE__), 'packaging_helper'))
 
 
 describe Project, '#group' do
@@ -263,7 +263,7 @@ describe Project, '#package' do
     end
     project('foo').packages.uniq.size.should be(5)
   end
-  
+
   it 'should create different tasks for package with different ids' do
     define 'foo', :version=>'1.0' do
       package(:jar, :id=>'bar')
@@ -271,7 +271,7 @@ describe Project, '#package' do
     end
     project('foo').packages.uniq.size.should be(2)
   end
-    
+
   it 'should create different tasks for package with classifier' do
     define 'foo', :version=>'1.0' do
       package(:jar)
@@ -347,10 +347,10 @@ describe Project, '#package' do
     end
   end
 
-  it 'should create a POM artifact in local repository' do
+  it 'should create a POM artifact in target directory' do
     define 'foo', :version=>'1.0' do
       package.pom.should be(artifact('foo:foo:pom:1.0'))
-      repositories.locate('foo:foo:pom:1.0').should eql(package.pom.to_s)
+      package.pom.to_s.should point_to_path('target/foo-1.0.pom')
     end
   end
 
@@ -662,15 +662,15 @@ describe Rake::Task, ' upload' do
       read(upload).should eql(read(package))
     end
   end
-  
+
   it 'should not upload twice the pom when artifacts are uploaded from a project' do
     write 'src/main/java/Foo.java', 'public class Foo {}'
     repositories.release_to = 'sftp://example.com/base'
-    define 'foo' do 
-      project.group = "attached" 
-      project.version = "1.0" 
-      package(:jar) 
-      package(:sources) 
+    define 'foo' do
+      project.group = "attached"
+      project.version = "1.0"
+      package(:jar)
+      package(:sources)
     end
      URI.should_receive(:upload).exactly(:once).
          with(URI.parse('sftp://example.com/base/attached/foo/1.0/foo-1.0-sources.jar'), project("foo").package(:sources).to_s, anything)

data/spec/sandbox.rb

@@ -21,15 +21,20 @@ Buildr.application.instance_eval { @rakefile = File.expand_path('buildfile') }
 repositories.remote << 'http://repo1.maven.org/maven2'
 repositories.remote << 'http://scala-tools.org/repo-releases'
 
-# Force Scala 2.7.7 for specs; don't want to rely on SCALA_HOME
-Buildr.settings.build['scala.version'] = "2.7.7"
+# Force Scala 2.8.0 for specs; don't want to rely on SCALA_HOME
+Buildr.settings.build['scala.version'] = "2.8.0"
 
 # Add a 'require' here only for optional extensions, not for extensions that should be loaded by default.
 require 'buildr/groovy'
 require 'buildr/scala'
 
 Java.load # Anything added to the classpath.
-artifacts(TestFramework.frameworks.map(&:dependencies).flatten, JUnit.ant_taskdef, Buildr::Groovy::Groovyc.dependencies).each do |path|
+artifacts(
+  TestFramework.frameworks.map(&:dependencies).flatten,
+  JUnit.ant_taskdef,
+  Buildr::Groovy::Groovyc.dependencies,
+  Buildr::Scala::Specs.dependencies
+).each do |path|
   file(path).invoke
 end
 

data/spec/scala/bdd_spec.rb

@@ -14,13 +14,13 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
 describe Buildr::Scala::Specs do
   
   before(:each) do
-    # Force Scala 2.7.7 for specs; don't want to rely on SCALA_HOME
-    Buildr.settings.build['scala.version'] = "2.7.7"
+    # Force Scala 2.8.0 for specs; don't want to rely on SCALA_HOME
+    Buildr.settings.build['scala.version'] = "2.8.0"
   end
     
   it 'should be the default when tests in src/spec/scala' do