vic-buildr 1.3.3 → 1.3.4

data/spec/java/java_spec.rb

@@ -85,4 +85,12 @@ describe Java, '#tools_jar' do
   after do
     ENV['JAVA_HOME'] = @old_home
   end
-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

data/spec/java/packaging_spec.rb

@@ -170,11 +170,28 @@ shared_examples_for 'package with manifest' do
     package_with_manifest 'MANIFEST.MF'
     inspect_manifest do |manifest|
       manifest.sections.size.should be(1)
-      manifest.main['Manifest-Version'].should eql('1.0')
       manifest.main['Meta'].should eql('data')
     end
   end
 
+  it 'should not add manifest version twice' do
+    write 'MANIFEST.MF', 'Manifest-Version: 1.9'
+    package_with_manifest 'MANIFEST.MF'
+    package ||= project('foo').package(@packaging)
+    package.invoke
+    Zip::ZipFile.open(package.to_s) do |zip|
+      zip.read('META-INF/MANIFEST.MF').scan(/(Manifest-Version)/m).size.should == 1
+    end
+  end
+
+  it 'should give precedence to version specified in manifest file' do
+    write 'MANIFEST.MF', 'Manifest-Version: 1.9'
+    package_with_manifest 'MANIFEST.MF'
+    inspect_manifest do |manifest|
+      manifest.main['Manifest-Version'].should == '1.9'
+    end
+  end
+
   it 'should create manifest from task' do
     file 'MANIFEST.MF' do |task|
       write task.to_s, 'Meta: data'
@@ -709,7 +726,7 @@ describe Packaging, 'ear' do
     inspect_ear { |files| files.should include('ejb/foo-1.0.jar') }
   end
 
-  it 'should accept component and its type as type=>artiract' do
+  it 'should accept component and its type as type=>artifact' do
     define 'foo', :version=>'1.0' do
       package(:ear).add :ejb=>package(:jar)
     end

data/spec/{addon → java}/test_coverage_spec.rb

@@ -178,7 +178,7 @@ describe 'test coverage tool', :shared=>true do
         write 'src/main/java/Foo.java', 'public class Foo {}'
         write 'bar/src/main/java/Bar.java', 'public class Bar {}'
         write_test :for=>'Bar', :in=>'bar/src/test/java'
-        define('foo') { define('bar')}
+        define('foo') { define('bar') }
       end
 
       it 'should have a default target' do
@@ -206,6 +206,12 @@ describe 'test coverage tool', :shared=>true do
           htlm_report_contents = Dir[File.join(@tool_module.report_to(:html), '**/*.html')].map{|path|File.open(path).read}.join
           htlm_report_contents.should =~ /TOKEN/
         end
+        
+        it 'should handle gracefully a project with no source' do
+          define 'baz', :base_dir=>'baz'
+          task("#{toolname}:html").invoke
+          lambda { task("#{toolname}:html").invoke }.should_not raise_error
+        end
       end
     end
     

data/spec/java/tests_spec.rb

@@ -40,6 +40,11 @@ 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

@@ -80,7 +80,7 @@ describe 'ArchiveTask', :shared=>true do
   it 'should invoke and archive file tasks' do
     file = file('included') { write 'included' }
     lambda { archive(@archive).include(file).invoke }.should change { File.exist?(file.to_s) }.to(true)
-    inspect_archive.should include('included')
+    inspect_archive.keys.should include('included')
   end
 
   it 'should include entry for directory' do

data/spec/{core → packaging}/artifact_namespace_spec.rb

@@ -464,7 +464,7 @@ describe Buildr do
         artifact_ns.use 'some:other:jar:1.0'
         artifact_ns.use 'bat:man:jar:1.0'
         compile.with :cool, :other, :'bat:man:jar'
-        compile.classpath.map(&:to_spec).should include('cool:aid:jar:1.0', 'some:other:jar:1.0', 'bat:man:jar:1.0')
+        compile.dependencies.map(&:to_spec).should include('cool:aid:jar:1.0', 'some:other:jar:1.0', 'bat:man:jar:1.0')
       end
     end
     
@@ -472,7 +472,7 @@ describe Buildr do
       artifact_ns(:moo).muu = 'moo:muu:jar:1.0'
       define 'foo' do
         compile.with artifact_ns(:moo)
-        compile.classpath.map(&:to_spec).should include('moo:muu:jar:1.0')
+        compile.dependencies.map(&:to_spec).should include('moo:muu:jar:1.0')
       end
     end
   end

data/spec/packaging/artifact_spec.rb

@@ -71,10 +71,14 @@ describe Artifact do
     @artifact.pom.to_hash.should == @artifact.to_hash.merge(:type=>:pom)
   end
 
-  it 'should have one artifact for all classifiers' 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/)
@@ -430,7 +434,7 @@ describe Buildr, '#artifact' do
       artifacts: 
         j2ee: geronimo-spec:geronimo-spec-j2ee:jar:1.4-rc4
     YAML
-    Buildr.application.send :load_artifacts
+    Buildr.application.send(:load_artifact_ns)
     artifact(:j2ee).to_s.pathmap('%f').should == 'geronimo-spec-j2ee-1.4-rc4.jar'
   end
 end
@@ -513,7 +517,7 @@ describe Buildr, '#group' do
   
 end
 
-describe Builder, '#install' do
+describe Buildr, '#install' do
   before do
     @spec = 'group:id:jar:1.0'
     write @file = 'test.jar'
@@ -542,7 +546,7 @@ describe Builder, '#install' do
 end
 
 
-describe Builder, '#upload' do
+describe Buildr, '#upload' do
   before do
     @spec = 'group:id:jar:1.0'
     write @file = 'test.jar'
@@ -638,6 +642,43 @@ describe Rake::Task, ' artifacts' do
 end
 
 
+describe Rake::Task, ' artifacts:sources' do
+
+  before 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
+  end
+end
+
+
 describe Buildr, '#transitive' do
   before do
     repositories.remote = 'http://example.com'

data/spec/packaging/packaging_spec.rb

@@ -75,7 +75,7 @@ describe Project, '#package' do
     end
   end
 
-  it 'should default to composed it for nested projects' do
+  it 'should default to composed id for nested projects' do
     define('foo', :version=>'1.0') do
       define 'bar' do
         package(:jar).id.should eql('foo-bar')

data/spec/sandbox.rb

@@ -21,12 +21,13 @@ Buildr.application.instance_eval { @rakefile = File.expand_path('buildfile') }
 repositories.remote << 'http://repo1.maven.org/maven2'
 repositories.remote << 'http://scala-tools.org/repo-releases'
 
+# 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.
-task('buildr:scala:download').invoke
-artifacts(TestFramework.frameworks.map(&:dependencies).flatten, JUnit.ant_taskdef).each { |a| file(a).invoke }
+artifacts(TestFramework.frameworks.map(&:dependencies).flatten, JUnit.ant_taskdef).each do |path|
+  file(path).invoke
+end
 
 ENV['HOME'] = File.expand_path('tmp/home')
 
@@ -42,13 +43,13 @@ module Sandbox
       spec.after(:each) { reset }
     end
     
-    # Require an addon without letting its callbacks pollute the Project class.
-    def require_addon addon_require_path
-      project_callbacks_without_addon = Project.class_eval { @callbacks }.dup
+    # 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
       begin
-        require addon_require_path
+        require extension_require_path
       ensure
-        Project.class_eval { @callbacks = project_callbacks_without_addon }
+        Project.class_eval { @callbacks = project_callbacks_without_extension }
       end
     end
   end
@@ -72,17 +73,18 @@ module Sandbox
     # for projects, compilation. We need a place that does not depend
     # on the current directory.
     @_sandbox[:original_dir] = Dir.pwd
-    temp = File.join(File.dirname(__FILE__), '../tmp')
-    FileUtils.mkpath temp
-    Dir.chdir temp
+    @temp = File.join(File.dirname(__FILE__), '../tmp')
+    FileUtils.mkpath @temp
+    Dir.chdir @temp
 
+    ARGV.clear
     Buildr.application = Buildr::Application.new
     Sandbox.tasks.each { |block| block.call }
     Buildr.application.instance_variable_set :@rules, Sandbox.rules.clone
     Buildr.application.instance_eval { @rakefile = File.expand_path('buildfile') }
 
     @_sandbox[:load_path] = $LOAD_PATH.clone
-    @_sandbox[:loaded_features] = $LOADED_FEATURES.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 }
@@ -95,6 +97,7 @@ module Sandbox
     @_sandbox[:artifacts] = Artifact.class_eval { @artifacts }.clone
     Buildr.repositories.local = File.expand_path('repository')
     ENV['HOME'] = File.expand_path('home')
+    ENV['BUILDR_ENV'] = 'development'
 
     @_sandbox[:env_keys] = ENV.keys
     ['DEBUG', 'TEST', 'HTTP_PROXY', 'USER'].each { |k| ENV.delete(k) ; ENV.delete(k.downcase) }
@@ -121,8 +124,7 @@ module Sandbox
     Layout.default = @_sandbox[:layout].clone
 
     $LOAD_PATH.replace @_sandbox[:load_path]
-    $LOADED_FEATURES.replace @_sandbox[:loaded_features]
-    FileUtils.rm_rf Dir.pwd
+    FileUtils.rm_rf @temp
 
     # Get rid of all artifacts.
     @_sandbox[:artifacts].tap { |artifacts| Artifact.class_eval { @artifacts = artifacts } }

data/spec/spec_helpers.rb

@@ -19,7 +19,23 @@
 unless defined?(SpecHelpers)
 
   require 'rubygems'
-  $LOAD_PATH.unshift File.expand_path('../lib', File.dirname(__FILE__)), File.expand_path('../addon', File.dirname(__FILE__))
+
+  # For testing we use the gem requirements specified on the buildr.gemspec
+  spec = Gem::Specification.load(File.expand_path('../buildr.gemspec', File.dirname(__FILE__)))
+  spec.dependencies.each { |dep| gem dep.name, dep.version_requirements.to_s }
+
+  # Make sure to load from these paths first, we don't want to load any
+  # code from Gem library.
+  $LOAD_PATH.unshift File.expand_path('../lib', File.dirname(__FILE__)),
+                     File.expand_path('../addon', File.dirname(__FILE__))
+
+  # Buildr uses autoload extensively, but autoload when running specs creates
+  # a problem -- we sandbox $LOADED_FEATURES, so we endup autoloading the same
+  # module twice. This turns autoload into a require, which is not the right
+  # thing, but will do for now.
+  def autoload(symbol, path)
+    require path
+  end
   require 'buildr'
 
   require File.expand_path('sandbox', File.dirname(__FILE__))
@@ -28,7 +44,7 @@ unless defined?(SpecHelpers)
 
     include Checks::Matchers
 
-    [:info, :warn, :error].each do |severity|
+    [:info, :warn, :error, :puts].each do |severity|
       ::Object.class_eval do
         define_method severity do |message|
           $messages ||= {}
@@ -74,7 +90,7 @@ unless defined?(SpecHelpers)
       MessageWithSeverityMatcher.new :info, message
     end
 
-    # Tests if a warning was issued. You can use a string or regular expression.
+    # Test if a warning was shown. You can use a string or regular expression.
     #
     # For example:
     #   lambda { warn 'ze test' }.should show_warning(/ze test/)
@@ -90,6 +106,13 @@ unless defined?(SpecHelpers)
       MessageWithSeverityMatcher.new :error, message
     end
 
+    # Test if any message was shown (puts).  You can use a string or regular expression.
+    #
+    # For example:
+    #   lambda { puts 'ze test' }.should show(/ze test/)
+    def show(message)
+      MessageWithSeverityMatcher.new :puts, message
+    end
 
     class ::Rake::Task
       alias :execute_without_a_record :execute

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: vic-buildr
 version: !ruby/object:Gem::Version 
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors: 
 - Apache Buildr
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-13 00:00:00 -07:00
+date: 2008-10-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.8.1
+        version: 0.8.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: builder
@@ -73,7 +73,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.0.0
+        version: 1.0.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -82,7 +82,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.8.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: rjb
@@ -109,7 +109,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.1.5
+        version: 1.1.11
     version: 
 - !ruby/object:Gem::Dependency 
   name: xml-simple
@@ -156,7 +156,7 @@ files:
 - lib/buildr/core/filter.rb
 - lib/buildr/core/compile.rb
 - lib/buildr/core/test.rb
-- lib/buildr/core/application_cli.rb
+- lib/buildr/core/osx.rb
 - lib/buildr/core/help.rb
 - lib/buildr/core/project.rb
 - lib/buildr/core/checks.rb
@@ -172,10 +172,12 @@ files:
 - lib/buildr/java/org/apache/buildr/JavaTestFilter.class
 - lib/buildr/java/org/apache/buildr/JavaTestFilter.java
 - lib/buildr/java/packaging.rb
+- lib/buildr/java/cobertura.rb
 - lib/buildr/java/commands.rb
 - lib/buildr/java/jruby.rb
 - lib/buildr/java/jtestr_runner.rb.erb
 - lib/buildr/java/compiler.rb
+- lib/buildr/java/emma.rb
 - lib/buildr/java/version_requirement.rb
 - lib/buildr/java/tests.rb
 - lib/buildr/java/deprecated.rb
@@ -198,8 +200,11 @@ files:
 - lib/buildr/resources
 - lib/buildr/resources/buildr.icns
 - lib/buildr/packaging
+- lib/buildr/packaging/ziptask.rb
 - lib/buildr/packaging/artifact_search.rb
 - lib/buildr/packaging/artifact_namespace.rb
+- lib/buildr/packaging/version_requirement.rb
+- lib/buildr/packaging/archive.rb
 - lib/buildr/packaging/gems.rb
 - lib/buildr/packaging/tar.rb
 - lib/buildr/packaging/zip.rb
@@ -226,6 +231,7 @@ files:
 - addon/buildr/jetty.rb
 - addon/buildr/emma.rb
 - addon/buildr/xmlbeans.rb
+- addon/buildr/drb.rb
 - addon/buildr/openjpa.rb
 - addon/buildr/javacc.rb
 - addon/buildr/jdepend.rb
@@ -260,6 +266,7 @@ files:
 - doc/print.toc.yaml
 - doc/site.toc.yaml
 - doc/images
+- doc/images/favicon.png
 - doc/images/note.png
 - doc/images/apache-incubator-logo.png
 - doc/images/tip.png
@@ -273,8 +280,8 @@ files:
 - spec/ide
 - spec/ide/eclipse_spec.rb
 - spec/core
-- spec/core/artifact_namespace_spec.rb
 - spec/core/build_spec.rb
+- spec/core/generate_spec.rb
 - spec/core/test_spec.rb
 - spec/core/compile_spec.rb
 - spec/core/checks_spec.rb
@@ -284,15 +291,16 @@ files:
 - spec/core/project_spec.rb
 - spec/java
 - spec/java/compiler_spec.rb
+- spec/java/test_coverage_spec.rb
 - spec/java/tests_spec.rb
 - spec/java/packaging_spec.rb
 - spec/java/ant.rb
+- spec/java/emma_spec.rb
 - spec/java/java_spec.rb
+- spec/java/cobertura_spec.rb
 - spec/java/bdd_spec.rb
 - spec/addon
-- spec/addon/test_coverage_spec.rb
-- spec/addon/emma_spec.rb
-- spec/addon/cobertura_spec.rb
+- spec/addon/drb_spec.rb
 - spec/scala
 - spec/scala/compiler_spec.rb
 - spec/scala/tests_spec.rb
@@ -303,6 +311,7 @@ files:
 - spec/groovy/bdd_spec.rb
 - spec/version_requirement_spec.rb
 - spec/packaging
+- spec/packaging/artifact_namespace_spec.rb
 - spec/packaging/artifact_spec.rb
 - spec/packaging/packaging_spec.rb
 - spec/packaging/packaging_helper.rb