buildr 1.4.4 → 1.4.5

data/spec/java/bdd_spec.rb

@@ -29,7 +29,7 @@ describe Buildr::RSpec do
 
   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
@@ -41,7 +41,7 @@ describe Buildr::RSpec do
     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)
@@ -234,7 +234,7 @@ describe Buildr::JtestR do
     failure = File.expand_path('src/spec/ruby/failure_expect.rb')
     write(failure, 'Expectations { expect(true) { false } }')
     error = File.expand_path('src/spec/ruby/error_expect.rb')
-    write(error, 'Expectations { expect(nil) { lambda; } }')
+    write(error, 'Expectations { expect(nil) { lambda {}; } }')
     foo do
       lambda { test.invoke }.should raise_error(/Tests failed/)
       test.tests.should include(success, failure, error)

data/spec/java/emma_spec.rb

@@ -20,6 +20,8 @@ artifacts(Buildr::Emma::dependencies).map(&:invoke)
 
 
 describe Buildr::Emma do
+  include TestCoverageHelper
+
   before do
     # Reloading the extension because the sandbox removes all its actions
     Buildr.module_eval { remove_const :Emma }

data/spec/java/packaging_spec.rb

@@ -346,7 +346,7 @@ describe Project, '#meta_inf' do
 end
 
 
-describe 'package with meta_inf', :shared=>true do
+shared_examples_for 'package with meta_inf' do
 
   def package_with_meta_inf(meta_inf = nil)
     packaging = @packaging
@@ -778,6 +778,39 @@ describe Packaging, 'ear' do
     inspect_application_xml { |xml| xml.get_text('/application/display-name').should == 'bar' }
   end
 
+  it 'should set description in application.xml to project comment if not specified' do
+    desc "MyDescription"
+    define 'foo', :version=>'1.0' do
+      package(:ear)
+    end
+    inspect_application_xml { |xml| xml.get_text('/application/description').should == 'MyDescription' }
+  end
+
+  it 'should not set description in application.xml if not specified and no project comment' do
+    define 'foo', :version=>'1.0' do
+      package(:ear)
+    end
+    inspect_application_xml { |xml| xml.get_text('/application/description').should be_nil }
+  end
+
+  it 'should set description in application.xml if specified' do
+    define 'foo', :version=>'1.0' do
+      package(:ear).description = "MyDescription"
+    end
+    inspect_application_xml { |xml| xml.get_text('/application/description').should == 'MyDescription' }
+  end
+
+  it 'should add security-roles to application.xml if given' do
+    define 'foo', :version=>'1.0' do
+	  package(:ear).security_roles << {:id=>'sr1',
+		:description=>'System Administrator', :name=>'systemadministrator'}
+	end
+	inspect_application_xml do |xml|
+		xml.get_text("/application/security-role[@id='sr1']/description").to_s.should eql('System Administrator')
+		xml.get_text("/application/security-role[@id='sr1']/role-name").to_s.should eql('systemadministrator')
+	end
+  end
+
   it 'should map WARs to /war directory' do
     define 'foo', :version=>'1.0' do
       package(:ear) << package(:war)
@@ -1136,16 +1169,15 @@ describe Packaging, 'sources' do
   end
 end
 
-
 describe Packaging, 'javadoc' do
   it_should_behave_like 'packaging'
-  before { @packaging, @package_type = :javadoc, :zip }
+  before { @packaging, @package_type = :javadoc, :jar }
 
   it 'should create package of type :zip and classifier \'javadoc\'' do
     define 'foo', :version=>'1.0' do
-      package(:javadoc).type.should eql(:zip)
+      package(:javadoc).type.should eql(:jar)
       package(:javadoc).classifier.should eql('javadoc')
-      package(:javadoc).name.pathmap('%f').should eql('foo-1.0-javadoc.zip')
+      package(:javadoc).name.pathmap('%f').should eql('foo-1.0-javadoc.jar')
     end
   end
 
@@ -1171,7 +1203,6 @@ describe Packaging, 'javadoc' do
   end
 end
 
-
 shared_examples_for 'package_with_' do
 
   def prepare(options = {})
@@ -1190,9 +1221,7 @@ shared_examples_for 'package_with_' do
 
   it 'should create package of the right packaging with classifier' do
     prepare
-    ext = "zip"
-    ext = "jar" if @packaging == :sources
-    project('foo').packages.first.to_s.should =~ /foo-1.0-#{@packaging}.#{ext}/
+    project('foo').packages.first.to_s.should =~ /foo-1.0-#{@packaging}.#{@ext}/
   end
 
   it 'should create package for projects that have source files' do
@@ -1228,10 +1257,10 @@ end
 
 describe 'package_with_sources' do
   it_should_behave_like 'package_with_'
-  before { @packaging = :sources }
+  before { @packaging, @ext = :sources, 'jar' }
 end
 
 describe 'package_with_javadoc' do
   it_should_behave_like 'package_with_'
-  before { @packaging = :javadoc }
+  before { @packaging, @ext = :javadoc, 'jar' }
 end

data/spec/java/test_coverage_helper.rb

@@ -53,7 +53,7 @@ module TestCoverageHelper
   end
 end
 
-describe 'test coverage tool', :shared=>true do
+shared_examples_for 'test coverage tool' do
   include TestCoverageHelper
 
   def toolname

data/spec/packaging/archive_spec.rb

@@ -17,25 +17,26 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
 
-describe 'ArchiveTask', :shared=>true do
-  before do
-    @dir = File.expand_path('test')
-    @files = %w{Test1.txt Text2.html}.map { |file| File.expand_path(file, @dir) }.
-      each { |file| write file, content_for(file) }
-    @empty_dirs = %w{EmptyDir1 EmptyDir2}.map { |file| File.expand_path(file, @dir) }.
-      each { |file| mkdir file }
-  end
-
+module ArchiveTaskHelpers
   # Not too smart, we just create some content based on file name to make sure you read what you write.
   def content_for(file)
     "Content for #{File.basename(file)}"
   end
 
+  # Qualify a filename
+  #
+  # e.g. qualify("file.zip", "src") => "file-src.zip"
+  def qualify(filename, qualifier)
+    ext = (filename =~ /\.$/) ? "." : File.extname(filename)
+    base = filename[0..0-ext.size-1]
+    base + "-" + qualifier + ext
+  end
+
   # Create an archive not using the archive task, this way we do have a file in existence, but we don't
   # have an already invoked task.  Yield an archive task to the block which can use it to include files,
   # set options, etc.
   def create_without_task
-    archive(@archive + '.tmp').tap do |task|
+    archive(qualify(@archive, "tmp")).tap do |task|
       yield task if block_given?
       task.invoke
       mv task.name, @archive
@@ -43,11 +44,29 @@ describe 'ArchiveTask', :shared=>true do
   end
 
   def create_for_merge
-    zip(@archive + '.src').include(@files).tap do |task|
+    zip(qualify(@archive, "src")).include(@files).tap do |task|
       yield task
     end
   end
 
+  def init_dir
+    unless @dir
+      @dir = File.expand_path('test')
+      @files = %w{Test1.txt Text2.html}.map { |file| File.expand_path(file, @dir) }.
+        each { |file| write file, content_for(file) }
+      @empty_dirs = %w{EmptyDir1 EmptyDir2}.map { |file| File.expand_path(file, @dir) }.
+        each { |file| mkdir file }
+    end
+  end
+end
+
+shared_examples_for 'ArchiveTask' do
+  include ArchiveTaskHelpers
+
+  before(:each) do
+    init_dir
+  end
+
   it 'should point to archive file' do
     archive(@archive).name.should eql(@archive)
   end
@@ -281,7 +300,7 @@ describe 'ArchiveTask', :shared=>true do
   it 'should expand another archive file with nested exclude pattern' do
     @files = %w{Test1.txt Text2.html}.map { |file| File.join(@dir, "foo", file) }.
       each { |file| write file, content_for(file) }
-    zip(@archive + '.src').include(@dir).tap do |task|
+    zip(qualify(@archive, "src")).include(@dir).tap do |task|
       archive(@archive).merge(task).exclude('test/*')
       archive(@archive).invoke
       inspect_archive.should be_empty
@@ -329,6 +348,22 @@ describe 'ArchiveTask', :shared=>true do
     File.stat(@archive).mtime.should be_close(Time.now, 10)
   end
 
+  it 'should update if a file in a subdir is more recent' do
+    subdir = File.expand_path("subdir", @dir)
+    test3 = File.expand_path("test3.css", subdir)
+
+    mkdir_p subdir
+    write test3, '/* Original */'
+
+    create_without_task { |archive| archive.include(:from => @dir) }
+    inspect_archive { |archive| archive["subdir/test3.css"].should eql('/* Original */') }
+
+    write test3, '/* Refreshed */'
+    File.utime(Time.now + 100, Time.now + 100, test3)
+    archive(@archive).include(:from => @dir).invoke
+    inspect_archive { |archive| archive["subdir/test3.css"].should eql('/* Refreshed */') }
+   end
+
   it 'should do nothing if all files are uptodate' do
     create_without_task { |archive| archive.include(@files) }
     # By touching all files in the past, there's nothing new to update.
@@ -359,10 +394,13 @@ describe 'ArchiveTask', :shared=>true do
   end
 end
 
-
 describe TarTask do
   it_should_behave_like 'ArchiveTask'
-  before { @archive = File.expand_path('test.tar') }
+
+  before(:each) do
+    @archive = File.expand_path('test.tar')
+  end
+
   define_method(:archive) { |file| tar(file) }
 
   def inspect_archive
@@ -378,7 +416,11 @@ end
 
 describe TarTask, ' gzipped' do
   it_should_behave_like 'ArchiveTask'
-  before { @archive = File.expand_path('test.tgz') }
+
+  before(:each) do
+    @archive = File.expand_path('test.tgz')
+  end
+
   define_method(:archive) { |file| tar(file) }
 
   def inspect_archive
@@ -393,24 +435,38 @@ describe TarTask, ' gzipped' do
   end
 end
 
+describe "ZipTask" do
+  include ArchiveTaskHelpers
 
-describe ZipTask do
   it_should_behave_like 'ArchiveTask'
-  before { @archive = File.expand_path('test.zip') }
+
+  before(:each) do
+    init_dir
+    @archive = File.expand_path('test.zip')
+  end
+
   define_method(:archive) { |file| zip(file) }
 
-  after do
+  after(:each) do
     checkZip(@archive)
   end
 
-  # Check for possible corruption usign Java's ZipInputStream since it's stricter than rubyzip
+  # Check for possible corruption using Java's ZipInputStream and Java's "jar" command since
+  # they are stricter than rubyzip
   def checkZip(file)
     return unless File.exist?(file)
     zip = Java.java.util.zip.ZipInputStream.new(Java.java.io.FileInputStream.new(file))
+    zip_entry_count = 0
     while entry = zip.getNextEntry do
       # just iterate over all entries
+      zip_entry_count = zip_entry_count + 1
     end
     zip.close()
+
+    # jar tool fails with "ZipException: error in opening zip file" if empty
+    if zip_entry_count > 0
+      sh "#{File.join(ENV['JAVA_HOME'], 'bin', 'jar')} tvf #{file}"
+    end
   end
 
   def inspect_archive
@@ -473,9 +529,8 @@ describe ZipTask do
 
 end
 
-
 describe Unzip do
-  before do
+  before(:each) do
     @zip = File.expand_path('test.zip')
     @dir = File.expand_path('test')
     @files = %w{Test1.txt Text2.html}.map { |file| File.join(@dir, file) }.

data/spec/packaging/artifact_namespace_spec.rb

@@ -661,7 +661,7 @@ describe "Extension using ArtifactNamespace" do
           end
         end
 
-        include Spec::Matchers # for assertions
+        include RSpec::Matchers # for assertions
 
         # Called with the ArtifactRequirement that has just been selected
         # by a user. This allows extension author to selectively perform

data/spec/packaging/artifact_spec.rb

@@ -252,7 +252,7 @@ describe Repositories, 'remote' do
 
   it 'should support artifact classifier' do
     repositories.remote = 'http://example.com'
-    URI.should_receive(:download).twice.and_return { |uri, target, options| write target }
+    URI.should_receive(:download).once.and_return { |uri, target, options| write target }
     lambda { artifact('com.example:library:jar:all:2.0').invoke }.
       should change { File.exist?(File.join(repositories.local, 'com/example/library/2.0/library-2.0-all.jar')) }.to(true)
   end
@@ -752,13 +752,22 @@ describe Buildr, '#install' do
     snapshot.invoke
   end
 
-  it 'should install POM alongside artifact' do
+  it 'should install POM alongside artifact (if artifact has no classifier)' 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 not install POM alongside artifact if artifact has classifier' 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
+
   it 'should reinstall POM alongside artifact' do
     pom = artifact(@spec).pom
     write @file
@@ -812,14 +821,11 @@ describe ActsAsArtifact, '#upload' do
     verbose(false) { artifact.upload(:url=>'sftp://example.com/base') }
   end
 
-  it 'should support artifact classifier' do
+  it 'should support artifact classifier and should not upload pom if artifact has classifier' do
     artifact = artifact('com.example:library:jar:all:2.0')
     # Prevent artifact from downloading anything.
     write repositories.locate(artifact)
-    write repositories.locate(artifact.pom)
-    URI.should_receive(:upload).at_least(:once).
-      with(URI.parse('sftp://example.com/base/com/example/library/2.0/library-2.0.pom'), artifact.pom.to_s, anything)
-    URI.should_receive(:upload).at_least(:once).
+    URI.should_receive(:upload).exactly(:once).
       with(URI.parse('sftp://example.com/base/com/example/library/2.0/library-2.0-all.jar'), artifact.to_s, anything)
     verbose(false) { artifact.upload(:url=>'sftp://example.com/base') }
   end
@@ -842,6 +848,7 @@ describe ActsAsArtifact, '#upload' do
     artifact.upload
     lambda { artifact.upload }.should_not raise_error
   end
+
 end
 
 

data/spec/sandbox.rb

@@ -21,19 +21,26 @@ 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.8.0 for specs; don't want to rely on SCALA_HOME
-Buildr.settings.build['scala.version'] = "2.8.0"
+# Force Scala 2.8.1 for specs; don't want to rely on SCALA_HOME
+Buildr.settings.build['scala.version'] = "2.8.1"
 
 # Add a 'require' here only for optional extensions, not for extensions that should be loaded by default.
+require 'buildr/clojure'
 require 'buildr/groovy'
 require 'buildr/scala'
+require 'buildr/bnd'
+require 'buildr/jaxb_xjc'
 
 Java.load # Anything added to the classpath.
 artifacts(
   TestFramework.frameworks.map(&:dependencies).flatten,
   JUnit.ant_taskdef,
-  Buildr::Groovy::Groovyc.dependencies,
-  Buildr::Scala::Specs.dependencies
+  Buildr::Groovy.dependencies,
+  Buildr::JaxbXjc.dependencies,
+  Buildr::Bnd.dependencies,
+  Buildr::Scala::Specs.dependencies,
+  Buildr::Shell::BeanShell.artifact,
+  Buildr::Clojure.dependencies
 ).each do |path|
   file(path).invoke
 end

data/spec/scala/bdd_spec.rb

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

data/spec/scala/compiler_spec.rb

@@ -20,8 +20,8 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers')
 share_as :ScalacCompiler do
 
   before(:each) do
-    # Force Scala 2.8.0 for specs; don't want to rely on SCALA_HOME
-    Buildr.settings.build['scala.version'] = "2.8.0"
+    # Force Scala 2.8.1 for specs; don't want to rely on SCALA_HOME
+    Buildr.settings.build['scala.version'] = "2.8.1"
   end
 
   it 'should identify itself from source directories' do

data/spec/scala/doc_spec.rb

@@ -19,8 +19,8 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers')
 describe "Scaladoc" do
 
   before(:each) do
-    # Force Scala 2.8.0 for specs; don't want to rely on SCALA_HOME
-    Buildr.settings.build['scala.version'] = "2.8.0"
+    # Force Scala 2.8.1 for specs; don't want to rely on SCALA_HOME
+    Buildr.settings.build['scala.version'] = "2.8.1"
   end
 
   it 'should pick -doc-title from project name by default' do
@@ -52,17 +52,37 @@ describe "Scaladoc" do
     project('foo').doc.options[:"doc-title"].should eql('explicit')
   end
 
-  it 'should convert :windowtitle to -doc-title for Scala 2.8.0' do
+  it 'should convert :windowtitle to -doc-title for Scala 2.8.1' do
     write 'src/main/scala/com/example/Test.scala', 'package com.example; class Test { val i = 1 }'
     define('foo') do
       doc.using :windowtitle => "foo"
     end
-    Java.scala.tools.nsc.ScalaDoc.should_receive(:main) do |args|
+    Java.scala.tools.nsc.ScalaDoc.should_receive(:process) do |args|
       # Convert Java Strings to Ruby Strings, if needed.
       args.map { |a| a.is_a?(String) ? a : a.toString }.should include("-doc-title")
       0 # normal return
     end
     project('foo').doc.invoke
   end
+end
+
+describe "package(:scaladoc)" do
+  it "should generate target/project-version-scaladoc.jar" do
+    write 'src/main/scala/Foo.scala', 'class Foo'
+    define 'foo', :version=>'1.0' do
+      package(:scaladoc)
+    end
+
+    scaladoc = project('foo').package(:scaladoc)
+    scaladoc.should point_to_path('target/foo-1.0-scaladoc.jar')
 
+    lambda {
+      project('foo').task('package').invoke
+    }.should change { File.exist?('target/foo-1.0-scaladoc.jar') }.to(true)
+
+    scaladoc.should exist
+    scaladoc.should contain('index.html')
+    scaladoc.should contain('Foo.html')
+  end
 end
+