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

data/spec/packaging/artifact_spec.rb

@@ -74,11 +74,11 @@ describe Artifact do
   it 'should have one POM artifact for all classifiers' do
     @classified.pom.to_hash.should == @classified.to_hash.merge(:type=>:pom).except(:classifier)
   end
-  
+
   it 'should have associated sources artifact' do
     @artifact.sources_artifact.to_hash.should == @artifact.to_hash.merge(:classifier=>'sources')
   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/)
@@ -112,7 +112,7 @@ describe Artifact do
   end
 
   it 'should not download file if dry-run' do
-    dryrun do 
+    dryrun do
       lambda { @artifact.invoke }.should_not raise_error
       lambda { @classified.invoke }.should_not raise_error
     end
@@ -169,6 +169,23 @@ describe Repositories, 'local' do
     YAML
     repositories.local.should eql(File.expand_path('my_repo'))
   end
+
+  it 'should not override custom install methods defined when extending an object' do
+    class MyOwnInstallTask
+
+      attr_accessor :result
+
+      def install
+        result = true
+      end
+
+    end
+    task = MyOwnInstallTask.new
+    task.result = "maybe"
+    task.extend ActsAsArtifact
+    task.install
+    task.result.should be_true
+  end
 end
 
 
@@ -239,11 +256,11 @@ describe Repositories, 'remote' do
   it 'should deal well with repositories URL that have the last slash' do
     repositories.remote = 'http://example.com/base/'
     uri = nil
-    URI.should_receive(:download).twice.and_return { |_uri, args| p args ; uri = _uri }
+    URI.should_receive(:download).twice.and_return { |_uri, args| uri = _uri }
     artifact('group:id:jar:1.0').invoke
     uri.to_s.should eql('http://example.com/base/group/id/1.0/id-1.0.pom')
   end
-  
+
   it 'should resolve m2-style deployed snapshots' do
     metadata = <<-XML
     <?xml version='1.0' encoding='UTF-8'?>
@@ -270,7 +287,7 @@ describe Repositories, 'remote' do
     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 handle missing maven metadata by reporting the artifact unavailable' do
     repositories.remote = 'http://example.com'
     URI.should_receive(:download).with(uri(/2.1-SNAPSHOT\/library-2.1-SNAPSHOT.jar$/), anything()).
@@ -280,7 +297,7 @@ describe Repositories, 'remote' do
     lambda { artifact('com.example:library:jar:2.1-SNAPSHOT').invoke }.should raise_error(RuntimeError, /Failed to download/)
     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 m2 snapshots by reporting the artifact unavailable' do
     metadata = <<-XML
     <?xml version='1.0' encoding='UTF-8'?>
@@ -399,7 +416,7 @@ describe Buildr, '#artifact' do
   it 'should complain about invalid key' do
     lambda { artifact(@spec.merge(:error=>true)) }.should raise_error(ArgumentError, /no such option/i)
   end
-  
+
   it 'should use JAR type by default' do
     artifact(@spec.merge(:type=>nil)).should respond_to(:invoke)
   end
@@ -409,7 +426,7 @@ describe Buildr, '#artifact' do
   end
 
   it 'should reject partial string specifier' do
-    artifact('com.example:library::2.0') 
+    artifact('com.example:library::2.0')
     lambda { artifact('com.example:library:jar') }.should raise_error
     lambda { artifact('com.example:library:jar:') }.should raise_error
     lambda { artifact('com.example:library::2.0') }.should_not raise_error
@@ -429,9 +446,43 @@ describe Buildr, '#artifact' do
     lambda { artifact.invoke }.should change { File.exist?(artifact.to_s) }.to(true)
   end
 
+  it 'should use from method to install artifact from a file task' do
+    test_jar = file('test.jar')
+    test_jar.enhance do
+      #nothing...
+    end
+    write 'test.jar'
+    artifact = artifact('group:id:jar:1.0').from(test_jar)
+    lambda { artifact.invoke }.should change { File.exist?(artifact.to_s) }.to(true)
+  end
+
+  it 'should invoke the artifact associated file task if the file doesnt exist' do
+    test_jar = file('test.jar')
+    called = false
+    test_jar.enhance do
+      write 'test.jar'
+      called = true
+    end
+    artifact = artifact('group:id:jar:1.0').from(test_jar)
+    artifact.invoke
+    unless called
+      raise "The file task was not called."
+    end
+  end
+
+  it 'should not invoke the artifact associated file task if the file already exists' do
+    test_jar = file('test.jar')
+    test_jar.enhance do
+      raise 'the test.jar file is created again!'
+    end
+    write 'test.jar'
+    artifact = artifact('group:id:jar:1.0').from(test_jar)
+    artifact.invoke
+  end
+
   it 'should reference artifacts defined on build.yaml by using ruby symbols' do
     write 'build.yaml', <<-YAML
-      artifacts: 
+      artifacts:
         j2ee: geronimo-spec:geronimo-spec-j2ee:jar:1.4-rc4
     YAML
     Buildr.application.send(:load_artifact_ns)
@@ -507,14 +558,20 @@ describe Buildr, '#group' do
     list.should include(artifact('saxon:saxon-xpath:jar:8.4'))
     list.size.should be(3)
   end
-  
+
   it 'should accept a type' do
     list = group('struts-bean', 'struts-html', :under=>'struts', :type=>'tld', :version=>'1.1')
     list.should include(artifact('struts:struts-bean:tld:1.1'))
     list.should include(artifact('struts:struts-html:tld:1.1'))
     list.size.should be(2)
   end
-  
+
+  it 'should accept a classifier' do
+    list = group('camel-core', :under=>'org.apache.camel', :version=>'2.2.0', :classifier=>'spring3')
+    list.should include(artifact('org.apache.camel:camel-core:jar:spring3:2.2.0'))
+    list.size.should be(1)
+  end
+
 end
 
 describe Buildr, '#install' do
@@ -538,6 +595,14 @@ describe Buildr, '#install' do
     lambda { install.invoke }.should change { File.exist?(artifact(@spec).to_s) }.to(true)
   end
 
+  it 'should re-install artifact when "from" is newer' do
+    install artifact(@spec).from(@file)
+    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)
+  end
+
   it 'should install POM alongside artifact' do
     write @file
     install artifact(@spec).from(@file)
@@ -648,30 +713,30 @@ describe Rake::Task, ' artifacts:sources' do
     task('artifacts:sources').clear
     repositories.remote = 'http://example.com'
   end
-  
+
   it 'should download sources 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:sources').invoke }.should change { File.exist?('home/.m2/repository/group/id/1.0/id-1.0-sources.jar') }.to(true)
   end
-  
+
   it "should not try to download sources for the project's artifacts" do
     define('foo', :version=>'1.0') { package(:jar) }
     URI.should_not_receive(:download)
     task('artifacts:sources').invoke
   end
-  
+
   describe 'when the source 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:sources').invoke }.should_not raise_error
     end
-    
+
     it 'should inform the user' do
       lambda { task('artifacts:sources').invoke }.should show_info('Failed to download group:id:jar:sources:1.0. Skipping it.')
     end

data/spec/packaging/packaging_spec.rb

@@ -169,7 +169,7 @@ describe Project, '#package' do
   end
 
   it 'should call package_as_foo when using package(:foo)' do
-    class Buildr::Project  
+    class Buildr::Project
       def package_as_foo(file_name)
         file(file_name) do |t|
           mkdir_p File.dirname(t.to_s)
@@ -185,7 +185,7 @@ describe Project, '#package' do
   end
 
   it 'should allow to respec package(:sources) using package_as_sources_spec()' do
-    class Buildr::Project  
+    class Buildr::Project
       def package_as_sources_spec(spec)
         spec.merge({ :type=>:jar, :classifier=>'sources' })
       end
@@ -195,25 +195,25 @@ describe Project, '#package' do
       package(:sources).classifier.should eql('sources')
     end
   end
-  
+
   it 'should produce different packages for different specs' do
-    class Buildr::Project  
+    class Buildr::Project
       def package_as_foo(file_name)
-        file(file_name)  
+        file(file_name)
       end
-      
+
       def package_as_foo_spec(spec)
         spec.merge(:type => :zip)
       end
-      
+
       def package_as_bar(file_name)
         file(file_name)
       end
-      
+
       def package_as_bar_spec(spec)
         spec.merge(:type => :zip, :classifier => "foobar")
       end
-      
+
     end
     define('foo', :version => '1.0') do
       package(:foo).type.should eql(:zip)
@@ -244,7 +244,7 @@ describe Project, '#package' do
 
   it 'should return a file task' do
     define('foo', :version=>'1.0') { package(:jar) }
-    project('foo').package(:jar).should be_kind_of(Rake::FileTask) 
+    project('foo').package(:jar).should be_kind_of(Rake::FileTask)
   end
 
   it 'should return a task that acts as artifact' do
@@ -283,6 +283,15 @@ describe Project, '#package' do
     project('foo').packages.uniq.size.should be(3)
   end
 
+  it 'should create different tasks for specs with matching type' do
+    define 'foo', :version=>'1.0' do
+      javadoc("foo").into( "foo" )
+      package(:javadoc)
+      package(:zip)
+    end
+    project('foo').packages.uniq.size.should be(2)
+  end
+
   it 'should return the same task for subsequent calls' do
     define 'foo', :version=>'1.0' do
       package.should eql(package)
@@ -616,9 +625,9 @@ end
 
 describe Rake::Task, ' upload' do
   before do
-    repositories.release_to = "file://#{File.expand_path('remote')}"
+    repositories.release_to = URI.escape("file://#{File.expand_path('remote')}")
   end
-  
+
   it 'should be local task' do
     define 'foo', :version=>'1.0' do
       package
@@ -645,14 +654,32 @@ 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) 
+    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)
+     URI.should_receive(:upload).exactly(:once).
+         with(URI.parse('sftp://example.com/base/attached/foo/1.0/foo-1.0.jar'), project("foo").package(:jar).to_s, anything)
+     URI.should_receive(:upload).exactly(:once).
+        with(URI.parse('sftp://example.com/base/attached/foo/1.0/foo-1.0.pom'), project("foo").package(:jar).pom.to_s, anything)
+     verbose(false) { project("foo").upload.invoke }
+  end
 
   it 'should upload signatures for artifact and POM' do
     define('foo', :version=>'1.0') { package :jar }
     task('upload').invoke
     { 'remote/foo/foo/1.0/foo-1.0.jar'=>project('foo').package(:jar),
       'remote/foo/foo/1.0/foo-1.0.pom'=>project('foo').package(:jar).pom }.each do |upload, package|
-      read("#{upload}.md5").split.first.should eql(Digest::MD5.hexdigest(read(package)))
-      read("#{upload}.sha1").split.first.should eql(Digest::SHA1.hexdigest(read(package)))
+      read("#{upload}.md5").split.first.should eql(Digest::MD5.hexdigest(read(package, "rb")))
+      read("#{upload}.sha1").split.first.should eql(Digest::SHA1.hexdigest(read(package, "rb")))
     end
   end
 end

data/spec/sandbox.rb

@@ -21,18 +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"
+
 # 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).each do |path|
+artifacts(TestFramework.frameworks.map(&:dependencies).flatten, JUnit.ant_taskdef, Buildr::Groovy::Groovyc.dependencies).each do |path|
   file(path).invoke
 end
-# JtestR currently requires JUnit 4.4
-file(artifact("junit:junit:jar:4.4")).invoke
 
 ENV['HOME'] = File.expand_path(File.join(File.dirname(__FILE__), '..', 'tmp', 'home'))
+mkpath ENV['HOME']
 
 # We need to run all tests inside a _sandbox, tacking a snapshot of Buildr before the test,
 # and restoring everything to its previous state after the test. Damn state changes.
@@ -45,14 +47,14 @@ module Sandbox
       spec.before(:each) { sandbox }
       spec.after(:each) { reset }
     end
-    
+
     # Require an optional extension without letting its callbacks pollute the Project class.
     def require_optional_extension(extension_require_path)
-      project_callbacks_without_extension = Project.class_eval { @callbacks }.dup
+      project_callbacks_without_extension = Project.class_eval { @global_callbacks }.dup
       begin
         require extension_require_path
       ensure
-        Project.class_eval { @callbacks = project_callbacks_without_extension }
+        Project.class_eval { @global_callbacks = project_callbacks_without_extension }
       end
     end
   end
@@ -71,7 +73,7 @@ module Sandbox
 
   def sandbox
     @_sandbox = {}
-    
+
     # Create a temporary directory where we can create files, e.g,
     # for projects, compilation. We need a place that does not depend
     # on the current directory.
@@ -88,10 +90,11 @@ module Sandbox
 
     @_sandbox[:load_path] = $LOAD_PATH.clone
     #@_sandbox[:loaded_features] = $LOADED_FEATURES.clone
-    
+
     # Later on we'll want to lose all the on_define created during the test.
     @_sandbox[:on_define] = Project.class_eval { (@on_define || []).dup }
-    @_sandbox[:callbacks] = Project.class_eval { (@callbacks || []).dup }
+    @_sandbox[:extension_modules] = Project.class_eval { (@extension_modules || []).dup }
+    @_sandbox[:global_callbacks] = Project.class_eval { (@global_callbacks || []).dup }
     @_sandbox[:layout] = Layout.default.clone
 
     # Create a local repository we can play with. However, our local repository will be void
@@ -120,14 +123,22 @@ module Sandbox
   def reset
     # Get rid of all the projects and the on_define blocks we used.
     Project.clear
+
     on_define = @_sandbox[:on_define]
-    Project.class_eval { @on_define = on_define }
-    callbacks = @_sandbox[:callbacks]
-    Project.class_eval { @callbacks = callbacks }
+    extension_modules = @_sandbox[:extension_modules]
+    global_callbacks = @_sandbox[:global_callbacks]
+
+    Project.class_eval do
+      @on_define = on_define
+      @global_callbacks = global_callbacks
+      @extension_modules = extension_modules
+    end
+
     Layout.default = @_sandbox[:layout].clone
 
     $LOAD_PATH.replace @_sandbox[:load_path]
     FileUtils.rm_rf @temp
+    mkpath ENV['HOME']
 
     # Get rid of all artifacts.
     @_sandbox[:artifacts].tap { |artifacts| Artifact.class_eval { @artifacts = artifacts } }

data/spec/scala/bdd_spec.rb

@@ -15,9 +15,14 @@
 
 
 require File.join(File.dirname(__FILE__), '../spec_helpers')
-require 'buildr/scala'
 
 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"
+  end
+    
   it 'should be the default when tests in src/spec/scala' do
     write 'src/spec/scala/com/example/MySpecs.scala', <<-SCALA
       package com.example
@@ -33,13 +38,13 @@ describe Buildr::Scala::Specs do
     define 'foo'
     project('foo').test.framework.should eql(:specs)
   end
-  
+
   it 'should include Specs dependencies' do
     define('foo') { test.using(:specs) }
     project('foo').test.compile.dependencies.should include(*artifacts(Scala::Specs.dependencies))
     project('foo').test.dependencies.should include(*artifacts(Scala::Specs.dependencies))
   end
-  
+
   it 'should include ScalaCheck dependencies' do
     define('foo') { test.using(:specs) }
     project('foo').test.compile.dependencies.should include(*artifacts(Scala::Check.dependencies))
@@ -65,7 +70,7 @@ describe Buildr::Scala::Specs do
       }
     SCALA
     define('foo').test.invoke
-    project('foo').test.tests.should include('com.example.MySpecs$')
+    project('foo').test.tests.should include('com.example.MySpecs')
   end
 
   it 'should include public objects extending org.specs.Specification even with companion classes' do
@@ -82,7 +87,7 @@ describe Buildr::Scala::Specs do
       class MySpecs extends org.specs.runner.JUnit4(MySpecs)
     SCALA
     define('foo').test.invoke
-    project('foo').test.tests.should include('com.example.MySpecs$')
+    project('foo').test.tests.should include('com.example.MySpecs')
   end
 
   it 'should pass when spec passes' do
@@ -98,12 +103,12 @@ describe Buildr::Scala::Specs do
     SCALA
     lambda { define('foo').test.invoke }.should_not raise_error
   end
-  
+
   it 'should fail when spec fails' do
     write 'src/spec/scala/StringSpecs.scala', <<-SCALA
       import org.specs._
       import org.specs.runner._
-      
+
       object StringSpecs extends Specification {
         "empty string" should {
           "have a zero length" in {
@@ -114,6 +119,6 @@ describe Buildr::Scala::Specs do
     SCALA
     define('foo')
     project('foo').test.invoke rescue
-    project('foo').test.failed_tests.should include('StringSpecs$')
+    project('foo').test.failed_tests.should include('StringSpecs')
   end
 end