vic-buildr 1.3.3 → 1.3.4

data/spec/core/common_spec.rb

@@ -242,7 +242,9 @@ end
 describe Buildr::Filter do
   before do
     @filter = Filter.new
-    1.upto(4) { |i| write "src/file#{i}", "file#{i} raw" } # with ${key1} and ${key2}" }
+    1.upto(4) do |i|
+      write "src/file#{i}", "file#{i} raw"
+    end
     @early = Time.now - 1000
   end
 
@@ -456,7 +458,9 @@ describe Buildr::Filter do
     File.mtime('target').should be_close(@early, 10)
   end
 
-  it 'should run only one new files' do
+  it 'should run only on new files' do
+    # Make source files older so they're not copied twice.
+    Dir['src/**/*'].each { |file| File.utime(@early, @early, file) }
     @filter.from('src').into('target').run
     @filter.from('src').into('target').using { |file, content| file.should eql('file2') }.run
   end
@@ -466,6 +470,8 @@ describe Buildr::Filter do
   end
 
   it 'should return false when run does not copy any files' do
+    # Make source files older so they're not copied twice.
+    Dir['src/**/*'].each { |file| File.utime(@early, @early, file) }
     @filter.from('src').into('target').run
     @filter.from('src').into('target').run.should be(false)
   end

data/spec/core/compile_spec.rb

@@ -112,6 +112,15 @@ describe Buildr::CompileTask, '#compiler' do
       compile.from('sources').compiler
     end
   end
+
+  it 'should allow supressing compilation' do
+    write 'src/main/java/package/Test.java', 'class Test {}'
+    define 'foo' do
+      compile.sources.clear
+    end
+    project('foo').compile.invoke
+    Dir['target/classes/*'].should be_empty
+  end
 end
 
 
@@ -197,7 +206,8 @@ describe Buildr::CompileTask, '#dependencies' do
     compile_task.dependencies.should == project('bar').packages
   end
 
-  it 'should be accessible as classpath' do
+  it 'should be accessible as classpath up to version 1.5 since it was deprecated in version 1.3' do
+    Buildr::VERSION.should < '1.5'
     lambda { compile_task.classpath = jars }.should change(compile_task, :dependencies).to(jars)
     lambda { compile_task.dependencies = [] }.should change(compile_task, :classpath).to([])
   end
@@ -545,6 +555,12 @@ describe Project, '#resources' do
     file('target/resources').should_not exist
   end
 
+  it 'should run from target/resources' do
+    write 'src/main/resources/test'
+    define('foo')
+    lambda { project('foo').resources.target.invoke }.should change { File.exist?('target/resources/test') }.to(true)
+  end
+
   it 'should not be recursive' do
     define('foo') { define 'bar' }
     lambda { project('foo').resources.invoke }.should_not run_task('foo:bar:resources')

data/spec/core/generate_spec.rb

@@ -0,0 +1,33 @@
+# 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')
+
+
+describe Buildr::Generate do
+  
+  describe 'Generated buildfile' do
+    it 'should be a legal buildfile' do
+      File.open('buildfile', 'w') { |file| file.write Generate.from_directory(Dir.pwd).join("\n") }
+      lambda { Buildr.application.run }.should_not raise_error
+    end
+    
+    it 'should not contain NEXT_VERSION because it was removed in buildr 1.3.3' do
+      buildfile = Generate.from_directory(Dir.pwd)
+      buildfile.each { |line| line.should_not include('NEXT_VERSION')}
+    end
+  end
+end

data/spec/core/project_spec.rb

@@ -368,13 +368,17 @@ describe Project, '#on_define' do
     define('foo') { define 'bar' }
     scopes.should eql([['foo'], ['foo', 'bar']])
   end
+  
+  it 'should be removed in version 1.5 since it was deprecated in version 1.3' do
+    Buildr::VERSION.should < '1.5'
+  end
 end
 
 
 describe Rake::Task, ' recursive' do
   before do
     @order = []
-    Project.on_define do |project|
+    Project.on_define do |project| # TODO on_define is deprecated
       project.recursive_task('doda') { @order << project.name }
     end
     define('foo') { define('bar') { define('baz') } }
@@ -428,6 +432,19 @@ describe 'Sub-project' do
     project('foo').projects.map(&:name).should include('foo:bar')
   end
 
+  it 'should be findable during project definition' do
+    define 'foo' do
+      bar = define 'bar' do
+        baz = define 'baz'
+        project('baz').should eql(baz)
+      end
+      # Note: evaluating bar:baz first unearthed a bug that doesn't happen
+      # if we evaluate bar, then bar:baz.
+      project('bar:baz').should be(bar.project('baz'))
+      project('bar').should be(bar)
+    end
+  end
+
   it 'should be findable only if exists' do
     define('foo') { define 'bar' }
     lambda { project('foo').project('baz') }.should raise_error(RuntimeError, /No such project/)
@@ -743,12 +760,3 @@ describe Buildr::Generate do
   end
 end
 =end
-
-
-describe Rake::Task, 'buildr:initialize' do
-  it 'should evaluate all project definitions' do
-    defined = false
-    Buildr.define('foo') { defined = true }
-    lambda { task('buildr:initialize').invoke }.should change { defined }.to(true)
-  end
-end

data/spec/core/test_spec.rb

@@ -115,7 +115,7 @@ describe Buildr::TestTask do
     test_task.dependencies.should include(File.expand_path('test.jar'))
     test_task.dependencies.should include(artifact('acme:example:jar:1.0'))
   end
-
+  
   it 'should response to :options and return test framework options' do
     test_task.using :foo=>'bar'
     test_task.options[:foo].should eql('bar')
@@ -131,6 +131,13 @@ describe Buildr::TestTask do
     test_task.options[:bar].should eql('BAR')
   end
 
+  it 'should respond to :using with deprecated parameter style and set value options to true, up to version 1.5 since this usage was deprecated in version 1.3' do
+    Buildr::VERSION.should < '1.5'
+    test_task.using('foo', 'bar')
+    test_task.options[:foo].should eql(true)
+    test_task.options[:bar].should eql(true)
+  end
+
   it 'should start without pre-selected test framework' do
     test_task.framework.should be_nil
   end
@@ -470,6 +477,22 @@ describe Buildr::Project, '#test' do
     end
   end
   
+  it 'should accept to set a test property in the top project' do
+    define 'foo' do
+        test.options[:properties][:foo] = 'bar'
+    end
+    project('foo').test.options[:properties][:foo].should == 'bar'
+  end
+  
+  it 'should accept to set a test property in a subproject' do
+    define 'foo' do
+      define 'bar' do
+        test.options[:properties][:bar] = 'baz'
+      end
+    end
+    project('foo:bar').test.options[:properties][:bar].should == 'baz'
+  end
+  
   it 'should not change options of unrelated projects when using #options' do
     define 'foo' do
       test.options[:properties][:foo] = 'bar'

data/spec/ide/eclipse_spec.rb

@@ -41,6 +41,13 @@ module EclipseHelper
     default_output[0]
   end
   
+  # <classpathentry path="PATH" sourcepath="RETURNED_VALUE" kind="var"/>
+  def sourcepath_for_path path
+    classpath_xml_elements.collect("classpathentry[@kind='var',@path='#{path}']") do |n|
+      n.attributes['sourcepath'] || 'no source artifact'
+    end
+  end
+  
   def project_xml_elements
     task('eclipse').invoke
     REXML::Document.new(File.open('.project')).root.elements
@@ -52,22 +59,57 @@ describe Buildr::Eclipse do
   include EclipseHelper
   
   describe "eclipse's .project file" do
+
+    JAVA_CONTAINER  = 'org.eclipse.jdt.launching.JRE_CONTAINER'
+    SCALA_CONTAINER = 'ch.epfl.lamp.sdt.launching.SCALA_CONTAINER'
+
+    SCALA_NATURE = 'ch.epfl.lamp.sdt.core.scalanature'
+    JAVA_NATURE  = 'org.eclipse.jdt.core.javanature'
     
-    describe 'scala project' do
-      
-      SCALA_NATURE = 'ch.epfl.lamp.sdt.core.scalanature'
-      JAVA_NATURE  = 'org.eclipse.jdt.core.javanature'
+    SCALA_BUILDER = 'ch.epfl.lamp.sdt.core.scalabuilder'
+    JAVA_BUILDER  = 'org.eclipse.jdt.core.javabuilder'
+
+    def project_natures
+      project_xml_elements.collect("natures/nature") { |n| n.text }
+    end
+    
+    def build_commands
+      project_xml_elements.collect("buildSpec/buildCommand/name") { |n| n.text }
+    end
+    
+    describe 'java project' do
+      before do
+        write 'buildfile'
+        write 'src/main/java/Main.java'
+      end
       
-      SCALA_BUILDER = 'ch.epfl.lamp.sdt.core.scalabuilder'
-      JAVA_BUILDER  = 'org.eclipse.jdt.core.javabuilder'
+      it 'should have Java nature' do
+        define('foo')
+        project_natures.should include(JAVA_NATURE)
+      end
       
-      def project_natures
-        project_xml_elements.collect("natures/nature") { |n| n.text }
+      it 'should have Java build command' do
+        define('foo')
+        build_commands.should include(JAVA_BUILDER)
       end
+    end
+    
+    describe 'nested java project' do
       
-      def build_commands
-        project_xml_elements.collect("buildSpec/buildCommand/name") { |n| n.text }
+      it 'should have name corresponding to its project definition' do
+        mkdir 'foo'
+        define('myproject') {
+          project.version = '1.0'
+          define('foo') { compile.using(:javac); package :jar }
+        }
+        task('eclipse').invoke
+        REXML::Document.new(File.open(File.join('foo', '.project'))).root.
+          elements.collect("name") { |e| e.text }.should == ['myproject-foo']
       end
+
+    end
+    
+    describe 'scala project' do
       
       before do
         write 'buildfile'
@@ -92,10 +134,7 @@ describe Buildr::Eclipse do
   describe "eclipse's .classpath file" do
     
     describe 'scala project' do
-      
-      SCALA_CONTAINER = 'ch.epfl.lamp.sdt.launching.SCALA_CONTAINER'
-      JAVA_CONTAINER  = 'org.eclipse.jdt.launching.JRE_CONTAINER'
-      
+
       def classpath_containers attribute='path'
         classpath_xml_elements.collect("classpathentry[@kind='con']") { |n| n.attributes[attribute] }
       end
@@ -105,7 +144,7 @@ describe Buildr::Eclipse do
         write 'src/main/scala/Main.scala'
       end
       
-      it 'should have SCALA_CONTAINER before JRE_CONTAINER' do
+      it 'should have SCALA_CONTAINER before JAVA_CONTAINER' do
         define('foo')
         classpath_containers.should include(SCALA_CONTAINER)
         classpath_containers.should include(JAVA_CONTAINER)
@@ -174,6 +213,12 @@ describe Buildr::Eclipse do
           define('foo')
           classpath_specific_output('src/test/java').should == 'target/test/classes'
         end
+        
+        it 'should accept to be the only code in the project' do
+          rm 'src/main/java/Main.java'
+          define('foo')
+          classpath_sources.should include('src/test/java')
+        end
       end
       
       describe 'main resources' do
@@ -223,21 +268,44 @@ describe Buildr::Eclipse do
           classpath_specific_output('src/test/resources').should == 'target/test/resources'
         end
       end
+    end
       
-      describe 'project depending on another project' do
-        
-        it 'should have the underlying project in its classpath' do
-          mkdir 'bar'
-          define('myproject') {
-            project.version = '1.0'
-            define('foo') { package :jar }
-            define('bar') { compile.using(:javac).with project('foo'); }
-          }
-          task('eclipse').invoke
-          REXML::Document.new(File.open(File.join('bar', '.classpath'))).root.
-            elements.collect("classpathentry[@kind='src']") { |n| n.attributes['path'] }.should include('/myproject-foo')
-        end
+    describe 'project depending on another project' do
+      it 'should have the underlying project in its classpath' do
+        mkdir 'foo'
+        mkdir 'bar'
+        define('myproject') {
+          project.version = '1.0'
+          define('foo') { package :jar }
+          define('bar') { compile.using(:javac).with project('foo'); }
+        }
+        task('eclipse').invoke
+        REXML::Document.new(File.open(File.join('bar', '.classpath'))).root.
+          elements.collect("classpathentry[@kind='src']") { |n| n.attributes['path'] }.should include('/myproject-foo')
       end
     end
   end
+  
+  describe 'maven2 artifact dependency' do
+    before do
+      define('foo') { compile.using(:javac).with('com.example:library:jar:2.0') }
+      artifact('com.example:library:jar:2.0') { |task| write task.name }
+      task('eclipse').invoke
+    end
+    
+    it 'should have a reference in the .classpath file relative to the local M2 repo' do
+      classpath_xml_elements.collect("classpathentry[@kind='var']") { |n| n.attributes['path'] }.
+        should include('M2_REPO/com/example/library/2.0/library-2.0.jar')
+    end
+    
+    it 'should be downloaded' do
+      file(artifact('com.example:library:jar:2.0').name).should exist
+    end
+    
+    it 'should have a source artifact reference in the .classpath file' do
+      sourcepath_for_path('M2_REPO/com/example/library/2.0/library-2.0.jar').
+        should == ['M2_REPO/com/example/library/2.0/library-2.0-sources.jar']
+    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

@@ -38,7 +38,7 @@ describe Buildr::RSpec do
     failure = File.expand_path('src/spec/ruby/failure_spec.rb')
     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") { eval("lambda") } }')
+    write(error, 'describe("error") { it("raises") { lambda; } }')
     foo do
       lambda { test.invoke }.should raise_error(/Tests failed/)
       test.tests.should include(success, failure, error)
@@ -208,7 +208,7 @@ describe Buildr::JtestR do
       require 'test/unit'
       class TC_Error < Test::Unit::TestCase
         def test_error
-          eval('lambda')
+          lambda;
         end
       end
     TESTUNIT
@@ -226,7 +226,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) { eval("lambda") } }')
+    write(error, 'Expectations { expect(nil) { lambda; } }')
     foo do
       lambda { test.invoke }.should raise_error(/Tests failed/)
       test.tests.should include(success, failure, error)
@@ -241,7 +241,7 @@ describe Buildr::JtestR do
     failure = File.expand_path('src/spec/ruby/failure_spec.rb')
     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") { eval("lambda") } }')
+    write(error, 'describe("error") { it("raises") { lambda; } }')
     pending =  File.expand_path('src/spec/ruby/pending_spec.rb')
     write(pending, 'describe("peding") { it "is not implemented" }')
     foo do

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'
+Sandbox.require_optional_extension 'buildr/java/cobertura'
 
 Buildr::Cobertura::requires
 
 
 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
+    load File.expand_path('../lib/buildr/java/cobertura.rb')
     @tool_module = Buildr::Cobertura 
   end
   

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

@@ -15,7 +15,7 @@
 
 
 require File.join(File.dirname(__FILE__), 'test_coverage_spec')
-Sandbox.require_addon 'buildr/emma'
+Sandbox.require_optional_extension 'buildr/java/emma'
 
 
 Buildr::Emma::requires
@@ -23,8 +23,8 @@ Buildr::Emma::requires
 
 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
+    load File.expand_path('../lib/buildr/java/emma.rb')
     @tool_module = Buildr::Emma
   end