buildr 1.3.2 → 1.3.3

data/spec/{java_compilers_spec.rb → java/compiler_spec.rb}

@@ -14,7 +14,7 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), 'spec_helpers')
+require File.join(File.dirname(__FILE__), '../spec_helpers')
 
 
 describe 'javac compiler' do

data/spec/java/java_spec.rb

@@ -0,0 +1,88 @@
+# 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')
+
+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
+      Config::CONFIG.should_receive(:[]).with('host_os').and_return('darwin0.9')
+    end
+
+    it 'should point to default JVM' do
+      load File.expand_path('../lib/buildr/java/rjb.rb')
+      ENV['JAVA_HOME'].should == '/System/Library/Frameworks/JavaVM.framework/Home'
+    end
+
+    it 'should use value of environment variable if specified' do
+      ENV['JAVA_HOME'] = '/System/Library/Frameworks/JavaVM.specified'
+      load File.expand_path('../lib/buildr/java/rjb.rb')
+      ENV['JAVA_HOME'].should == '/System/Library/Frameworks/JavaVM.specified'
+    end
+
+    after do
+      ENV['JAVA_HOME'] = @old_home
+      ENV_JAVA.replace @old_env_java
+    end
+  end
+end
+
+
+describe Java, '#tools_jar' do
+  before do
+    @old_home = ENV['JAVA_HOME']
+  end
+  
+  describe 'when JAVA_HOME points to a JDK' do
+    before do
+      Java.instance_eval { @tools_jar = nil }
+      write 'jdk/lib/tools.jar'
+      ENV['JAVA_HOME'] = File.expand_path('jdk')
+    end
+  
+    it 'should return the path to tools.jar' do
+      Java.tools_jar.should point_to_path('jdk/lib/tools.jar')
+    end
+  end
+  
+  describe 'when JAVA_HOME points to a JRE inside a JDK' do
+    before do
+      Java.instance_eval { @tools_jar = nil }
+      write 'jdk/lib/tools.jar'
+      ENV['JAVA_HOME'] = File.expand_path('jdk/jre')
+    end
+    
+    it 'should return the path to tools.jar' do
+      Java.tools_jar.should point_to_path('jdk/lib/tools.jar')
+    end
+  end
+  
+  describe 'when there is no tools.jar' do
+    before do
+      Java.instance_eval { @tools_jar = nil }
+      ENV['JAVA_HOME'] = File.expand_path('jdk')
+    end
+    
+    it 'should return nil' do
+      Java.tools_jar.should be_nil
+    end
+  end
+  
+  after do
+    ENV['JAVA_HOME'] = @old_home
+  end
+end

data/spec/{java_packaging_spec.rb → java/packaging_spec.rb}

@@ -14,8 +14,8 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), 'spec_helpers')
-require File.join(File.dirname(__FILE__), 'packaging_helper')
+require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.join(File.dirname(__FILE__), '../packaging/packaging_helper')
 
 
 describe Project, '#manifest' do
@@ -66,8 +66,8 @@ shared_examples_for 'package with manifest' do
     end
   end
 
-  def inspect_manifest
-    package = project('foo').package(@packaging)
+  def inspect_manifest(package = nil)
+    package ||= project('foo').package(@packaging)
     package.invoke
     yield Buildr::Packaging::Java::Manifest.from_zip(package)
   end
@@ -203,6 +203,67 @@ shared_examples_for 'package with manifest' do
       zip.entries.map(&:to_s).should include('META-INF/')
     end
   end
+
+  it 'should inherit manifest from parent project' do
+    packaging = @packaging
+    package = nil
+    define('foo', :version => '1.0') do
+      manifest['Foo'] = '1'
+      package(packaging)
+      define('bar', :version => '1.0') do 
+        manifest['bar'] = 'Bar'
+        package(:jar)
+        package = packages.first
+      end
+    end
+    inspect_manifest(package) do |manifest|
+      manifest.sections.size.should be(1)
+      manifest.main['Manifest-Version'].should eql('1.0')
+      manifest.main['Created-By'].should eql('Buildr')
+      manifest.main['Foo'].should eql('1')
+      manifest.main['bar'].should eql('Bar')
+    end
+  end
+
+  it 'should not modify manifest of parent project' do
+    packaging = @packaging
+    define('foo', :version => '1.0') do
+      manifest['Foo'] = '1'
+      package(packaging)
+      define('bar', :version => '1.0') do 
+        manifest['bar'] = 'Bar'
+        package(:jar)
+      end
+      define('baz', :version => '1.0') do 
+        manifest['baz'] = 'Baz'
+        package(:jar)
+      end
+    end
+    inspect_manifest(project('foo').packages.first) do |manifest|
+      manifest.sections.size.should be(1)
+      manifest.main['Manifest-Version'].should eql('1.0')
+      manifest.main['Created-By'].should eql('Buildr')
+      manifest.main['Foo'].should eql('1')
+      manifest.main['bar'].should be_nil
+      manifest.main['baz'].should be_nil
+    end
+    inspect_manifest(project('foo:bar').packages.first) do |manifest|
+      manifest.sections.size.should be(1)
+      manifest.main['Manifest-Version'].should eql('1.0')
+      manifest.main['Created-By'].should eql('Buildr')
+      manifest.main['Foo'].should eql('1')
+      manifest.main['bar'].should eql('Bar')
+      manifest.main['baz'].should be_nil
+    end
+    inspect_manifest(project('foo:baz').packages.first) do |manifest|
+      manifest.sections.size.should be(1)
+      manifest.main['Manifest-Version'].should eql('1.0')
+      manifest.main['Created-By'].should eql('Buildr')
+      manifest.main['Foo'].should eql('1')
+      manifest.main['baz'].should eql('Baz')
+      manifest.main['bar'].should be_nil
+    end
+  end
 end
 
 

data/spec/{java_test_frameworks_spec.rb → java/tests_spec.rb}

@@ -14,7 +14,7 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), 'spec_helpers')
+require File.join(File.dirname(__FILE__), '../spec_helpers')
 
 
 describe Buildr::JUnit do
@@ -36,16 +36,31 @@ describe Buildr::JUnit do
 
   it 'should include JUnit dependencies' do
     define('foo') { test.using(:junit) }
-    project('foo').test.compile.dependencies.should include(*artifacts(JUnit::REQUIRES))
-    project('foo').test.dependencies.should include(*artifacts(JUnit::REQUIRES))
+    project('foo').test.compile.dependencies.should include(artifact("junit:junit:jar:#{JUnit.version}"))
+    project('foo').test.dependencies.should include(artifact("junit:junit:jar:#{JUnit.version}"))
   end
-
+  
+  it 'should pick JUnit version from junit build settings' do
+    Buildr::JUnit.instance_eval { @dependencies = nil }
+    write 'build.yaml', 'junit: 1.2.3'
+    define('foo') { test.using(:junit) }
+    project('foo').test.compile.dependencies.should include(artifact("junit:junit:jar:1.2.3"))
+  end
+  
   it 'should include JMock dependencies' do
     define('foo') { test.using(:junit) }
-    project('foo').test.compile.dependencies.should include(*artifacts(JMock::REQUIRES))
-    project('foo').test.dependencies.should include(*artifacts(JMock::REQUIRES))
+    project('foo').test.compile.dependencies.should include(artifact("jmock:jmock:jar:#{JMock.version}"))
+    project('foo').test.dependencies.should include(artifact("jmock:jmock:jar:#{JMock.version}"))
   end
 
+  it 'should pick JUnit version from junit build settings' do
+    Buildr::JUnit.instance_eval { @dependencies = nil } # JUnit caches JMock dependencies
+    Buildr::JMock.instance_eval { @dependencies = nil }
+    write 'build.yaml', 'jmock: 1.2.3'
+    define('foo') { test.using(:junit) }
+    project('foo').test.compile.dependencies.should include(artifact("jmock:jmock:jar:1.2.3"))
+  end
+  
   it 'should include public classes extending junit.framework.TestCase' do
     write 'src/test/java/com/example/FirstTest.java', <<-JAVA
       package com.example;
@@ -266,6 +281,12 @@ describe Buildr::JUnit do
     fork_tests :each
     project('foo').test.failed_tests.should be_empty
   end
+  
+  after do
+    # Yes, this is ugly.  Better solution?
+    Buildr::JUnit.instance_eval { @dependencies = nil }
+    Buildr::JMock.instance_eval { @dependencies = nil }
+  end
 end
 
 
@@ -341,14 +362,14 @@ describe Buildr::TestNG do
 
   it 'should include TestNG dependencies' do
     define('foo') { test.using :testng }
-    project('foo').test.compile.dependencies.should include(*artifacts(TestNG::REQUIRES))
-    project('foo').test.dependencies.should include(*artifacts(TestNG::REQUIRES))
+    project('foo').test.compile.dependencies.should include(artifact("org.testng:testng:jar:jdk15:#{TestNG.version}"))
+    project('foo').test.dependencies.should include(artifact("org.testng:testng:jar:jdk15:#{TestNG.version}"))
   end
 
   it 'should include TestNG dependencies' do
     define('foo') { test.using :testng }
-    project('foo').test.compile.dependencies.should include(*artifacts(JMock::REQUIRES))
-    project('foo').test.dependencies.should include(*artifacts(JMock::REQUIRES))
+    project('foo').test.compile.dependencies.should include(artifact("jmock:jmock:jar:#{JMock.version}"))
+    project('foo').test.dependencies.should include(artifact("jmock:jmock:jar:#{JMock.version}"))
   end
 
   it 'should include classes using TestNG annotations' do

data/spec/{archive_spec.rb → packaging/archive_spec.rb}

@@ -14,7 +14,7 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), 'spec_helpers')
+require File.join(File.dirname(__FILE__), '../spec_helpers')
 
 
 describe 'ArchiveTask', :shared=>true do
@@ -464,7 +464,7 @@ describe Unzip do
       FileList[File.join(@target, 'path/*')].size.should be(2)
     end
   end
-
+  
   it 'should exclude with relative path' do
     with_zip @files, :path=>'test' do
       except = File.basename(@files.first)
@@ -474,6 +474,16 @@ describe Unzip do
     end
   end
 
+  it "should handle relative paths without any includes or excludes" do
+    lib_files = %w{Test3.so Test4.rb}.
+      map { |file| File.join(@dir, file) }.
+      each { |file| write file, content_for(file) }
+    zip(@zip).include(@files, :path => 'src').include(lib_files, :path => 'lib').invoke
+
+    unzip(@target=>@zip).tap { |unzip| unzip.from_path('lib') }.target.invoke
+    FileList[File.join(@target, '**/*')].should have(2).files
+  end
+
   it 'should return itself from root method' do
     task = unzip(@target=>@zip)
     task.root.should be(task)

data/spec/{artifact_spec.rb → packaging/artifact_spec.rb}

@@ -14,7 +14,7 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), 'spec_helpers')
+require File.join(File.dirname(__FILE__), '../spec_helpers')
 
 
 describe Artifact do
@@ -430,7 +430,7 @@ describe Buildr, '#artifact' do
       artifacts: 
         j2ee: geronimo-spec:geronimo-spec-j2ee:jar:1.4-rc4
     YAML
-    Buildr.application.load_artifacts
+    Buildr.application.send :load_artifacts
     artifact(:j2ee).to_s.pathmap('%f').should == 'geronimo-spec-j2ee-1.4-rc4.jar'
   end
 end
@@ -503,10 +503,17 @@ 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
+  
 end
 
-
-describe Builder, '#install' do
+describe Buildr, '#install' do
   before do
     @spec = 'group:id:jar:1.0'
     write @file = 'test.jar'
@@ -535,7 +542,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'

data/spec/{packaging_spec.rb → packaging/packaging_spec.rb}

@@ -14,7 +14,7 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), 'spec_helpers')
+require File.join(File.dirname(__FILE__), '../spec_helpers')
 require File.join(File.dirname(__FILE__), 'packaging_helper')
 
 

data/spec/sandbox.rb

@@ -21,11 +21,12 @@ Buildr.application.instance_eval { @rakefile = File.expand_path('buildfile') }
 repositories.remote << 'http://repo1.maven.org/maven2'
 repositories.remote << 'http://scala-tools.org/repo-releases'
 
-require 'buildr/java/groovyc'
+require 'buildr/groovy'
+require 'buildr/scala'
+
 Java.load # Anything added to the classpath.
 task('buildr:scala:download').invoke
-Buildr::ScalaTest::ENABLED = true
-artifacts(TestFramework.frameworks.map(&:dependencies).flatten).each { |a| file(a).invoke }
+artifacts(TestFramework.frameworks.map(&:dependencies).flatten, JUnit.ant_taskdef).each { |a| file(a).invoke }
 
 ENV['HOME'] = File.expand_path('tmp/home')
 
@@ -40,6 +41,16 @@ module Sandbox
       spec.before(:each) { 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
+      begin
+        require addon_require_path
+      ensure
+        Project.class_eval { @callbacks = project_callbacks_without_addon }
+      end
+    end
   end
 
   @tasks = Buildr.application.tasks.collect do |original|
@@ -55,14 +66,16 @@ module Sandbox
   @rules = Buildr.application.instance_variable_get(:@rules)
 
   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.
+    @_sandbox[:original_dir] = Dir.pwd
     temp = File.join(File.dirname(__FILE__), '../tmp')
     FileUtils.mkpath temp
     Dir.chdir temp
 
-    @_sandbox = {}
     Buildr.application = Buildr::Application.new
     Sandbox.tasks.each { |block| block.call }
     Buildr.application.instance_variable_set :@rules, Sandbox.rules.clone
@@ -73,6 +86,7 @@ module Sandbox
     
     # 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[:layout] = Layout.default.clone
 
     # Create a local repository we can play with. However, our local repository will be void
@@ -94,7 +108,6 @@ module Sandbox
     # Don't output crap to the console.
     trace false
     verbose false
-    #task('buildr:initialize').invoke
   end
 
   # Call this from teardown.
@@ -103,6 +116,8 @@ module Sandbox
     Project.clear
     on_define = @_sandbox[:on_define]
     Project.class_eval { @on_define = on_define }
+    callbacks = @_sandbox[:callbacks]
+    Project.class_eval { @callbacks = callbacks }
     Layout.default = @_sandbox[:layout].clone
 
     $LOAD_PATH.replace @_sandbox[:load_path]
@@ -115,6 +130,8 @@ module Sandbox
     # Restore options.
     Buildr.options.test = nil
     (ENV.keys - @_sandbox[:env_keys]).each { |key| ENV.delete key }
+
+    Dir.chdir @_sandbox[:original_dir]
   end
 
 end

data/spec/{scala_compilers_spec.rb → scala/compiler_spec.rb}

@@ -14,7 +14,7 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), 'spec_helpers')
+require File.join(File.dirname(__FILE__), '../spec_helpers')
 
 
 describe 'scalac compiler' do