buildr 1.4.2 → 1.4.3

data/spec/packaging/archive_spec.rb

@@ -200,15 +200,15 @@ describe 'ArchiveTask', :shared=>true do
     archive(@archive).include(@files.first, :as=>'test/sample').invoke
     inspect_archive { |archive| @files.each { |f| archive['test/sample'].should eql(content_for(@files.first)) } }
   end
-  
+
   it 'should archive directory into specified alias, without using "."' 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| 
+    inspect_archive { |archive|
       archive.keys.should_not include "#{File.basename(@dir)}"
     }
   end
@@ -399,6 +399,20 @@ describe ZipTask do
   before { @archive = File.expand_path('test.zip') }
   define_method(:archive) { |file| zip(file) }
 
+  after do
+    checkZip(@archive)
+  end
+
+  # Check for possible corruption usign Java's ZipInputStream since it's stricter than rubyzip
+  def checkZip(file)
+    return unless File.exist?(file)
+    zip = Java.java.util.zip.ZipInputStream.new(Java.java.io.FileInputStream.new(file))
+    while entry = zip.getNextEntry do
+      # just iterate over all entries
+    end
+    zip.close()
+  end
+
   def inspect_archive
     entries = {}
     Zip::ZipFile.open @archive do |zip|
@@ -432,7 +446,7 @@ describe ZipTask do
     archive(@archive).invoke
     inspect_archive { |archive| archive.keys.should include('code/') }
   end
-  
+
   it 'should have path object that includes empty dirs' do
     archive(@archive).path('code').include(Dir["#{@dir}/*"])
     archive(@archive).invoke
@@ -585,7 +599,7 @@ 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)
@@ -702,4 +716,5 @@ describe Unzip do
     task = unzip(@target=>@zip)
     task.from_path('foo').should be(task.path('foo'))
   end
+
 end

data/spec/packaging/artifact_spec.rb

@@ -299,7 +299,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 fail resolving m2-style deployed snapshots if a timestamp is missing' do
     metadata = <<-XML
     <?xml version='1.0' encoding='UTF-8'?>
@@ -325,7 +325,7 @@ describe Repositories, 'remote' do
     }.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'?>
@@ -451,6 +451,14 @@ describe Repositories, 'release_to' do
     repositories.release_to.should == { :url=>'http://john:secret@example.com' }
   end
 
+  it 'should load URL from build settings file' do
+    write 'build.yaml', <<-YAML
+    repositories:
+      release_to: http://john:secret@example.com
+    YAML
+    repositories.release_to.should == { :url=>'http://john:secret@example.com' }
+  end
+
   it 'should load URL, username and password from settings file' do
     write 'home/.buildr/settings.yaml', <<-YAML
     repositories:
@@ -465,10 +473,10 @@ end
 
 
 describe Buildr, '#artifact' do
-  before do 
+  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' 
+    write @file = 'testartifact.jar'
   end
 
   it 'should accept hash specification' do
@@ -556,11 +564,11 @@ 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
@@ -574,7 +582,7 @@ describe Buildr, '#artifact' do
     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)
@@ -582,17 +590,18 @@ describe Buildr, '#artifact' do
     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)
+    write snapshot.to_s
     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)
@@ -602,11 +611,11 @@ describe Buildr, '#artifact' do
     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
 
 
@@ -730,13 +739,13 @@ describe Buildr, '#install' do
     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)

data/spec/scala/doc_spec.rb

@@ -0,0 +1,68 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+
+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"
+  end
+
+  it 'should pick -doc-title from project name by default' do
+    define 'foo' do
+      compile.using(:scalac)
+
+      define 'bar' do
+        compile.using(:scalac)
+      end
+    end
+
+    project('foo').doc.options[:"doc-title"].should eql('foo')
+    project('foo:bar').doc.options[:"doc-title"].should eql('foo:bar')
+  end
+
+  it 'should pick -doc-title from project description by default, if available' do
+    desc 'My App'
+    define 'foo' do
+      compile.using(:scalac)
+    end
+    project('foo').doc.options[:"doc-title"].should eql('My App')
+  end
+
+  it 'should not override explicit "doc-title" option' do
+    define 'foo' do
+      compile.using(:scalac)
+      doc.using "doc-title" => 'explicit'
+    end
+    project('foo').doc.options[:"doc-title"].should eql('explicit')
+  end
+
+  it 'should convert :windowtitle to -doc-title for Scala 2.8.0' 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|
+      # 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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: buildr
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 1
   - 4
-  - 2
-  version: 1.4.2
+  - 3
+  version: 1.4.3
 platform: ruby
 authors: 
 - Apache Buildr
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-20 00:00:00 -07:00
+date: 2010-10-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -278,13 +278,14 @@ dependencies:
   requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 41
         segments: 
         - 0
-        - 8
-        version: "0.8"
+        - 9
+        - 9
+        version: 0.9.9
   type: :development
   version_requirements: *id017
 - !ruby/object:Gem::Dependency 
@@ -321,194 +322,201 @@ extra_rdoc_files:
 - LICENSE
 - NOTICE
 files: 
-- addon/buildr/antlr.rb
-- addon/buildr/cobertura.rb
+- addon/buildr/nailgun.rb
 - addon/buildr/drb.rb
-- addon/buildr/emma.rb
+- addon/buildr/antlr.rb
 - addon/buildr/hibernate.rb
 - addon/buildr/javacc.rb
 - addon/buildr/jdepend.rb
-- addon/buildr/jetty.rb
-- addon/buildr/jibx.rb
-- addon/buildr/nailgun.rb
-- addon/buildr/openjpa.rb
-- addon/buildr/org/apache/buildr/BuildrNail$Main.class
-- addon/buildr/org/apache/buildr/BuildrNail.class
 - addon/buildr/org/apache/buildr/BuildrNail.java
+- addon/buildr/org/apache/buildr/JettyWrapper.java
 - addon/buildr/org/apache/buildr/JettyWrapper$1.class
 - addon/buildr/org/apache/buildr/JettyWrapper$BuildrHandler.class
 - addon/buildr/org/apache/buildr/JettyWrapper.class
-- addon/buildr/org/apache/buildr/JettyWrapper.java
+- addon/buildr/org/apache/buildr/BuildrNail$Main.class
+- addon/buildr/org/apache/buildr/BuildrNail.class
+- addon/buildr/openjpa.rb
+- addon/buildr/jibx.rb
+- addon/buildr/cobertura.rb
 - addon/buildr/protobuf.rb
 - addon/buildr/xmlbeans.rb
+- addon/buildr/jetty.rb
+- addon/buildr/emma.rb
 - bin/buildr
+- doc/testing.textile
+- doc/preface.textile
+- doc/building.textile
+- doc/index.textile
+- doc/releasing.textile
 - doc/_config.yml
+- doc/extending.textile
+- doc/more_stuff.textile
+- doc/download.textile
+- doc/projects.textile
+- doc/css/default.css
+- doc/css/syntax.css
+- doc/css/print.css
+- doc/scripts/install-osx.sh
+- doc/scripts/gitflow.rb
+- doc/scripts/buildr-git.rb
+- doc/scripts/install-jruby.sh
+- doc/scripts/install-linux.sh
+- doc/packaging.textile
 - doc/_layouts/default.html
 - doc/_layouts/preface.html
+- doc/settings_profiles.textile
+- doc/quick_start.textile
 - doc/artifacts.textile
-- doc/building.textile
-- doc/contributing.textile
-- doc/css/default.css
-- doc/css/print.css
-- doc/css/syntax.css
-- doc/download.textile
-- doc/extending.textile
-- doc/images/1442160941-frontcover.jpg
-- doc/images/asf-logo.gif
-- doc/images/asf-logo.png
-- doc/images/buildr-hires.png
-- doc/images/buildr.png
 - doc/images/favicon.png
-- doc/images/growl-icon.tiff
-- doc/images/note.png
+- doc/images/buildr-hires.png
 - doc/images/project-structure.png
-- doc/images/tip.png
+- doc/images/asf-logo.gif
 - doc/images/zbuildr.png
 - doc/images/zbuildr.tif
-- doc/index.textile
-- doc/installing.textile
-- doc/languages.textile
+- doc/images/buildr.png
+- doc/images/note.png
+- doc/images/growl-icon.tiff
+- doc/images/tip.png
+- doc/images/1442160941-frontcover.jpg
+- doc/images/asf-logo.png
 - doc/mailing_lists.textile
-- doc/more_stuff.textile
-- doc/packaging.textile
-- doc/preface.textile
-- doc/projects.textile
-- doc/quick_start.textile
-- doc/releasing.textile
-- doc/scripts/buildr-git.rb
-- doc/scripts/gitflow.rb
-- doc/scripts/install-jruby.sh
-- doc/scripts/install-linux.sh
-- doc/scripts/install-osx.sh
-- doc/settings_profiles.textile
-- doc/testing.textile
+- doc/languages.textile
+- doc/installing.textile
+- doc/contributing.textile
 - etc/KEYS
-- lib/buildr/core/application.rb
-- lib/buildr/core/build.rb
-- lib/buildr/core/cc.rb
-- lib/buildr/core/checks.rb
-- lib/buildr/core/common.rb
-- lib/buildr/core/compile.rb
-- lib/buildr/core/doc.rb
-- lib/buildr/core/environment.rb
-- lib/buildr/core/filter.rb
-- lib/buildr/core/generate.rb
-- lib/buildr/core/help.rb
-- lib/buildr/core/osx.rb
-- lib/buildr/core/progressbar.rb
-- lib/buildr/core/project.rb
-- lib/buildr/core/shell.rb
-- lib/buildr/core/test.rb
-- lib/buildr/core/transports.rb
-- lib/buildr/core/util.rb
+- lib/buildr/scala.rb
+- lib/buildr/shell.rb
+- lib/buildr/ide.rb
 - lib/buildr/core.rb
-- lib/buildr/groovy/bdd.rb
-- lib/buildr/groovy/compiler.rb
-- lib/buildr/groovy/shell.rb
-- lib/buildr/groovy.rb
+- lib/buildr/packaging/artifact.rb
+- lib/buildr/packaging/ziptask.rb
+- lib/buildr/packaging/gems.rb
+- lib/buildr/packaging/artifact_namespace.rb
+- lib/buildr/packaging/archive.rb
+- lib/buildr/packaging/package.rb
+- lib/buildr/packaging/version_requirement.rb
+- lib/buildr/packaging/zip.rb
+- lib/buildr/packaging/artifact_search.rb
+- lib/buildr/packaging/tar.rb
+- lib/buildr/ide/idea.ipr.template
+- lib/buildr/ide/eclipse/scala.rb
 - lib/buildr/ide/eclipse/java.rb
 - lib/buildr/ide/eclipse/plugin.rb
-- lib/buildr/ide/eclipse/scala.rb
 - lib/buildr/ide/eclipse.rb
-- lib/buildr/ide/idea.ipr.template
 - lib/buildr/ide/idea.rb
-- lib/buildr/ide/idea7x.ipr.template
 - lib/buildr/ide/idea7x.rb
-- lib/buildr/ide.rb
-- lib/buildr/java/ant.rb
-- lib/buildr/java/bdd.rb
-- lib/buildr/java/cobertura.rb
-- lib/buildr/java/commands.rb
+- lib/buildr/ide/idea7x.ipr.template
+- lib/buildr/java.rb
+- lib/buildr/resources/buildr.icns
+- lib/buildr/packaging.rb
+- lib/buildr/groovy/compiler.rb
+- lib/buildr/groovy/shell.rb
+- lib/buildr/groovy/bdd.rb
 - lib/buildr/java/compiler.rb
+- lib/buildr/java/tests.rb
+- lib/buildr/java/org/apache/buildr/JavaTestFilter.java
+- lib/buildr/java/org/apache/buildr/JavaTestFilter.class
+- lib/buildr/java/bdd.rb
+- lib/buildr/java/rjb.rb
+- lib/buildr/java/jtestr_runner.rb.erb
+- lib/buildr/java/packaging.rb
 - lib/buildr/java/deprecated.rb
+- lib/buildr/java/version_requirement.rb
 - lib/buildr/java/doc.rb
-- lib/buildr/java/ecj.rb
-- lib/buildr/java/emma.rb
 - lib/buildr/java/external.rb
+- lib/buildr/java/cobertura.rb
+- lib/buildr/java/commands.rb
+- lib/buildr/java/ant.rb
+- lib/buildr/java/test_result.rb
+- lib/buildr/java/ecj.rb
 - lib/buildr/java/jruby.rb
-- lib/buildr/java/jtestr_runner.rb.erb
-- lib/buildr/java/org/apache/buildr/JavaTestFilter.class
-- lib/buildr/java/org/apache/buildr/JavaTestFilter.java
-- lib/buildr/java/packaging.rb
+- lib/buildr/java/emma.rb
 - lib/buildr/java/pom.rb
-- lib/buildr/java/rjb.rb
-- lib/buildr/java/test_result.rb
-- lib/buildr/java/tests.rb
-- lib/buildr/java/version_requirement.rb
-- lib/buildr/java.rb
-- lib/buildr/packaging/archive.rb
-- lib/buildr/packaging/artifact.rb
-- lib/buildr/packaging/artifact_namespace.rb
-- lib/buildr/packaging/artifact_search.rb
-- lib/buildr/packaging/gems.rb
-- lib/buildr/packaging/package.rb
-- lib/buildr/packaging/tar.rb
-- lib/buildr/packaging/version_requirement.rb
-- lib/buildr/packaging/zip.rb
-- lib/buildr/packaging/ziptask.rb
-- lib/buildr/packaging.rb
-- lib/buildr/resources/buildr.icns
-- lib/buildr/scala/bdd.rb
+- lib/buildr/groovy.rb
 - lib/buildr/scala/compiler.rb
-- lib/buildr/scala/doc.rb
-- lib/buildr/scala/org/apache/buildr/SpecsSingletonRunner.class
-- lib/buildr/scala/org/apache/buildr/SpecsSingletonRunner.java
 - lib/buildr/scala/shell.rb
 - lib/buildr/scala/tests.rb
-- lib/buildr/scala.rb
-- lib/buildr/shell.rb
+- lib/buildr/scala/org/apache/buildr/SpecsSingletonRunner.java
+- lib/buildr/scala/org/apache/buildr/SpecsSingletonRunner.class
+- lib/buildr/scala/bdd.rb
+- lib/buildr/scala/doc.rb
+- lib/buildr/core/common.rb
+- lib/buildr/core/test.rb
+- lib/buildr/core/environment.rb
+- lib/buildr/core/shell.rb
+- lib/buildr/core/osx.rb
+- lib/buildr/core/generate.rb
+- lib/buildr/core/transports.rb
+- lib/buildr/core/checks.rb
+- lib/buildr/core/application.rb
+- lib/buildr/core/filter.rb
+- lib/buildr/core/compile.rb
+- lib/buildr/core/doc.rb
+- lib/buildr/core/progressbar.rb
+- lib/buildr/core/build.rb
+- lib/buildr/core/project.rb
+- lib/buildr/core/help.rb
+- lib/buildr/core/util.rb
+- lib/buildr/core/cc.rb
+- lib/buildr/core/run.rb
 - lib/buildr/version.rb
+- lib/buildr/run.rb
 - lib/buildr.rb
 - rakelib/all-in-one.rake
 - rakelib/checks.rake
-- rakelib/doc.rake
-- rakelib/metrics.rake
-- rakelib/package.rake
-- rakelib/release.rake
 - rakelib/rspec.rake
 - rakelib/setup.rake
+- rakelib/metrics.rake
 - rakelib/stage.rake
+- rakelib/release.rake
+- rakelib/doc.rake
+- rakelib/package.rake
+- spec/spec_helpers.rb
+- spec/sandbox.rb
+- spec/packaging/artifact_namespace_spec.rb
+- spec/packaging/artifact_spec.rb
+- spec/packaging/packaging_spec.rb
+- spec/packaging/archive_spec.rb
+- spec/packaging/packaging_helper.rb
+- spec/ide/eclipse_spec.rb
+- spec/ide/idea7x_spec.rb
+- spec/version_requirement_spec.rb
 - spec/addon/drb_spec.rb
-- spec/core/application_spec.rb
-- spec/core/build_spec.rb
-- spec/core/cc_spec.rb
-- spec/core/checks_spec.rb
-- spec/core/common_spec.rb
-- spec/core/compile_spec.rb
-- spec/core/extension_spec.rb
-- spec/core/generate_spec.rb
-- spec/core/project_spec.rb
-- spec/core/test_spec.rb
-- spec/core/transport_spec.rb
-- spec/core/util_spec.rb
 - spec/groovy/bdd_spec.rb
 - spec/groovy/compiler_spec.rb
-- spec/ide/eclipse_spec.rb
-- spec/ide/idea7x_spec.rb
-- spec/java/ant_spec.rb
-- spec/java/bdd_spec.rb
-- spec/java/cobertura_spec.rb
-- spec/java/commands_spec.rb
-- spec/java/compiler_spec.rb
 - spec/java/ecj_spec.rb
-- spec/java/emma_spec.rb
 - spec/java/external_spec.rb
-- spec/java/java_spec.rb
+- spec/java/run_spec.rb
 - spec/java/packaging_spec.rb
+- spec/java/bdd_spec.rb
+- spec/java/emma_spec.rb
+- spec/java/doc_spec.rb
 - spec/java/test_coverage_helper.rb
+- spec/java/commands_spec.rb
+- spec/java/java_spec.rb
+- spec/java/cobertura_spec.rb
+- spec/java/ant_spec.rb
 - spec/java/tests_spec.rb
-- spec/packaging/archive_spec.rb
-- spec/packaging/artifact_namespace_spec.rb
-- spec/packaging/artifact_spec.rb
-- spec/packaging/packaging_helper.rb
-- spec/packaging/packaging_spec.rb
-- spec/sandbox.rb
-- spec/scala/bdd_spec.rb
-- spec/scala/compiler_spec.rb
+- spec/java/compiler_spec.rb
 - spec/scala/scala.rb
+- spec/scala/bdd_spec.rb
+- spec/scala/doc_spec.rb
 - spec/scala/tests_spec.rb
-- spec/spec_helpers.rb
-- spec/version_requirement_spec.rb
+- spec/scala/compiler_spec.rb
+- spec/core/application_spec.rb
+- spec/core/compile_spec.rb
+- spec/core/cc_spec.rb
+- spec/core/util_spec.rb
+- spec/core/generate_spec.rb
+- spec/core/run_spec.rb
+- spec/core/checks_spec.rb
+- spec/core/transport_spec.rb
+- spec/core/doc_spec.rb
+- spec/core/extension_spec.rb
+- spec/core/test_spec.rb
+- spec/core/project_spec.rb
+- spec/core/common_spec.rb
+- spec/core/build_spec.rb
 - buildr.gemspec
 - buildr.buildfile
 - LICENSE