buildr 1.3.3-java → 1.3.4-java

data/spec/ide/idea7x_spec.rb

@@ -0,0 +1,84 @@
+# 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.join(File.dirname(__FILE__), '../spec_helpers')
+
+
+module Idea7xHelper
+  def ipr_xml_elements
+    task('idea7x').invoke
+    REXML::Document.new(File.read("#{@project_name}-7x.ipr")).root.elements
+  end
+  
+  def ipr_module_elements
+    ipr_xml_elements.to_a("//component[@name='ProjectModuleManager']/modules/module")
+  end
+  
+  def ipr_module_filepaths
+    ipr_module_elements.collect { |m| m.attributes['filepath'] }
+  end
+  
+  def ipr_module_fileurls
+    ipr_module_elements.collect { |m| m.attributes['fileurl'] }
+  end
+end
+
+
+describe Idea7x do
+  include Idea7xHelper
+  
+  describe "the project file" do
+    before do
+      @project_name = 'alphabet'
+    end
+    
+    it "includes a module for the root project" do
+      # Current behavior is to only generate IMLs for packaged projects
+      define(@project_name) { project.version = '0.0.0'; package(:jar) } 
+      ipr_module_elements.should have(1).element
+      ipr_module_filepaths.should == ["$PROJECT_DIR$/alphabet-7x.iml"]
+      ipr_module_fileurls.should  == ["file://$PROJECT_DIR$/alphabet-7x.iml"]
+    end
+    
+    it "includes an IML for a subproject" do
+      mkpath 'h'
+      define(@project_name) do
+        project.version = '0.0.0'; package(:jar)
+        define('h') do
+          package(:jar)
+        end
+      end
+      
+      ipr_module_elements.should have(2).elements
+      ipr_module_filepaths.should include("$PROJECT_DIR$/h/alphabet-h-7x.iml")
+      ipr_module_fileurls.should include("file://$PROJECT_DIR$/h/alphabet-h-7x.iml")
+    end
+    
+    it "pays attention to the base_dir for a subproject" do
+      mkpath 'aitch'
+      define(@project_name) do
+        project.version = '0.0.0'; package(:jar)
+        define('h', :base_dir => 'aitch') do
+          package(:jar)
+        end
+      end
+     
+      ipr_module_elements.should have(2).elements
+      ipr_module_filepaths.should include("$PROJECT_DIR$/aitch/alphabet-h-7x.iml")
+      ipr_module_fileurls.should include("file://$PROJECT_DIR$/aitch/alphabet-h-7x.iml")
+    end
+  end
+end

data/spec/java/ant.rb

@@ -24,5 +24,10 @@ describe Buildr::Ant do
     write 'build.yaml', 'ant: 1.2.3'
     Buildr::Ant.dependencies.should include("org.apache.ant:ant:jar:1.2.3")
   end
+  
+  it 'should have REQUIRES up to version 1.5 since it was deprecated in version 1.3.3' do
+    Buildr::VERSION.should < '1.5'
+    lambda { Ant::REQUIRES }.should_not raise_error
+  end
 
 end

data/spec/java/bdd_spec.rb

@@ -32,7 +32,16 @@ describe Buildr::RSpec do
     foo { test.framework.should eql(:rspec) }
   end
 
-  it 'should run rspecs' do
+  it 'should read passed specs from result yaml' do
+    success = File.expand_path('src/spec/ruby/success_spec.rb')
+    write(success, 'describe("success") { it("is true") { nil.should be_nil } }')
+    foo do
+      test.invoke
+      test.passed_tests.should eql([success])
+    end
+  end
+
+  it 'should read result yaml to obtain the list of failed specs' do
     success = File.expand_path('src/spec/ruby/success_spec.rb')
     write(success, 'describe("success") { it("is true") { nil.should be_nil } }')
     failure = File.expand_path('src/spec/ruby/failure_spec.rb')
@@ -42,8 +51,8 @@ describe Buildr::RSpec do
     foo do
       lambda { test.invoke }.should raise_error(/Tests failed/)
       test.tests.should include(success, failure, error)
-      test.failed_tests.should include(failure, error)
-      test.passed_tests.should include(success)
+      test.failed_tests.sort.should eql([failure, error].sort)
+      test.passed_tests.should eql([success])
     end
   end
 

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

@@ -15,15 +15,15 @@
 
 
 require File.join(File.dirname(__FILE__), 'test_coverage_spec')
-Sandbox.require_addon 'buildr/cobertura'
-
-Buildr::Cobertura::requires
+Sandbox.require_optional_extension 'buildr/java/cobertura'
+artifacts(Buildr::Cobertura::dependencies).map(&:invoke)
 
 
 describe Buildr::Cobertura do
   before do
-    # Reloading the addon because the sandbox removes all its actions
-    load File.expand_path('../addon/buildr/cobertura.rb')
+    # Reloading the extension because the sandbox removes all its actions
+    Buildr.module_eval { remove_const :Cobertura }
+    load File.expand_path('../lib/buildr/java/cobertura.rb')
     @tool_module = Buildr::Cobertura 
   end
   
@@ -74,4 +74,4 @@ describe Buildr::Cobertura do
       end
     end
   end
-end
+end

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

@@ -15,16 +15,15 @@
 
 
 require File.join(File.dirname(__FILE__), 'test_coverage_spec')
-Sandbox.require_addon 'buildr/emma'
-
-
-Buildr::Emma::requires
+Sandbox.require_optional_extension 'buildr/java/emma'
+artifacts(Buildr::Emma::dependencies).map(&:invoke)
 
 
 describe Buildr::Emma do
   before do
-    # Reloading the addon because the sandbox removes all its actions
-    load File.expand_path('../addon/buildr/emma.rb')
+    # Reloading the extension because the sandbox removes all its actions
+    Buildr.module_eval { remove_const :Emma }
+    load File.expand_path('../lib/buildr/java/emma.rb')
     @tool_module = Buildr::Emma
   end
 

data/spec/java/java_spec.rb

@@ -13,13 +13,15 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+
 require File.join(File.dirname(__FILE__), '../spec_helpers')
 
+
 unless RUBY_PLATFORM =~ /java/
   describe ENV, 'JAVA_HOME on OS X' do
     before do
       @old_home, ENV['JAVA_HOME'] = ENV['JAVA_HOME'], nil
-      @old_env_java = ENV_JAVA
+      @old_env_java = Object.module_eval { remove_const :ENV_JAVA }
       Config::CONFIG.should_receive(:[]).with('host_os').and_return('darwin0.9')
     end
 
@@ -85,4 +87,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

@@ -96,6 +96,18 @@ shared_examples_for 'package with manifest' do
     end
   end
 
+  it 'should generate a new manifest for a file that does not have one' do
+    Zip::ZipFile.open("tmp.zip", Zip::ZipFile::CREATE).close 
+    begin
+      manifest = Buildr::Packaging::Java::Manifest.from_zip('tmp.zip')
+      manifest.each do |key, val|
+        Buildr::Packaging::Java::Manifest::STANDARD_HEADER.should include(key)
+      end
+    ensure
+      rm 'tmp.zip'
+    end
+  end
+
   it 'should map manifest from hash' do
     package_with_manifest 'Foo'=>1, :bar=>'Bar'
     inspect_manifest do |manifest|
@@ -170,11 +182,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 +738,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

@@ -150,7 +150,7 @@ describe 'test coverage tool', :shared=>true do
 
       it 'should have the test coverage tools artifacts' do
         define('foo')
-        @tool_module.requires.each { |artifact| project('foo').test.dependencies.should include(artifact) }
+        artifacts(@tool_module.dependencies).each { |artifact| project('foo').test.dependencies.should include(artifact) }
       end
     end
 
@@ -249,7 +249,7 @@ describe 'test coverage tool', :shared=>true do
     
     it 'should not add the test coverage tools artifacts to the testing classpath' do
       define('foo')
-      @tool_module.requires.each { |artifact| project('foo').test.dependencies.should_not include(artifact) }
+      @tool_module.dependencies.each { |artifact| project('foo').test.dependencies.should_not include(artifact) }
     end
   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
@@ -237,6 +237,16 @@ describe 'ArchiveTask', :shared=>true do
     end
   end
 
+  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|
+      archive(@archive).merge(task).exclude('test/*')
+      archive(@archive).invoke
+      inspect_archive.should be_empty
+    end
+  end
+
   it 'should expand another archive file into path' do
     create_for_merge do |src|
       archive(@archive).path('test').merge(src)

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

@@ -281,6 +281,14 @@ describe Buildr::ArtifactNamespace do
       artifact_ns(:moo).foo_bar.should == artifact_ns(:foo).bar
     end
 
+    it 'should handle symbols with dashes and periods' do
+      [:'a-b', :'a.b'].each do |symbol|
+        artifact_ns.use symbol => 'a:b:c:1'
+        artifact_ns[symbol].version.should == '1'
+        artifact_ns[symbol].id.should == 'b'
+      end
+    end
+
   end
 
   describe '#values' do 
@@ -464,7 +472,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 +480,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
@@ -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,14 @@ 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 +44,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 +74,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,9 +98,10 @@ 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) }
+    ['DEBUG', 'TEST', 'HTTP_PROXY', 'HTTPS_PROXY', 'USER'].each { |k| ENV.delete(k) ; ENV.delete(k.downcase) }
 
     # Remove testing local repository, and reset all repository settings.
     Buildr.repositories.instance_eval do
@@ -121,8 +125,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 } }