buildr 1.3.5-x86-mswin32 → 1.4.0-x86-mswin32

data/spec/core/common_spec.rb

@@ -218,7 +218,7 @@ describe Buildr.method(:filter) do
   def source
     File.expand_path('src')
   end
-  
+
   it 'should return a Filter for the source' do
     filter(source).should be_kind_of(Filter)
   end
@@ -309,6 +309,21 @@ describe Buildr::Filter do
     Dir['target/*'].sort.should eql(['target/file2', 'target/file3'])
   end
 
+  it 'should respond to :include with regular expressions and use these inclusion patterns' do
+    @filter.from('src').into('target').include(/file[2|3]/).run
+    Dir['target/*'].sort.should eql(['target/file2', 'target/file3'])
+  end
+
+  it 'should respond to :include with a Proc and use these inclusion patterns' do
+    @filter.from('src').into('target').include(lambda {|file| file[-1, 1].to_i%2 == 0}).run
+    Dir['target/*'].sort.should eql(['target/file2', 'target/file4'])
+  end
+
+  it 'should respond to :include with a FileTask and use these inclusion patterns' do
+    @filter.from('src').into('target').include(file('target/file2'), file('target/file4')).run
+    Dir['target/*'].sort.should eql(['target/file2', 'target/file4'])
+  end
+
   it 'should respond to :exclude and return self' do
     @filter.exclude('file').should be(@filter)
   end
@@ -318,6 +333,31 @@ describe Buildr::Filter do
     Dir['target/*'].sort.should eql(['target/file1', 'target/file4'])
   end
 
+  it 'should respond to :exclude with regular expressions and use these exclusion patterns' do
+    @filter.from('src').into('target').exclude(/file[2|3]/).run
+    Dir['target/*'].sort.should eql(['target/file1', 'target/file4'])
+  end
+
+  it 'should respond to :exclude with a Proc and use these exclusion patterns' do
+    @filter.from('src').into('target').exclude(lambda {|file| file[-1, 1].to_i%2 == 0}).run
+    Dir['target/*'].sort.should eql(['target/file1', 'target/file3'])
+  end
+
+  it 'should respond to :exclude with a FileTask and use these exclusion patterns' do
+    @filter.from('src').into('target').exclude(file('target/file1'), file('target/file3')).run
+    Dir['target/*'].sort.should eql(['target/file2', 'target/file4'])
+  end
+
+  it 'should respond to :exclude with a FileTask, use these exclusion patterns and depend on those tasks' do
+    file1 = false
+    file2 = false
+    @filter.from('src').into('target').exclude(file('target/file1').enhance { file1 = true }, file('target/file3').enhance {file2 = true }).run
+    Dir['target/*'].sort.should eql(['target/file2', 'target/file4'])
+    @filter.target.invoke
+    file1.should be_true
+    file2.should be_true
+  end
+
   it 'should copy files over' do
     @filter.from('src').into('target').run
     Dir['target/*'].sort.each do |file|
@@ -419,6 +459,12 @@ describe Buildr::Filter do
     @filter.using('key1'=>'value1', 'key2'=>'value2').mapper.should eql(:maven)
   end
 
+  it 'should apply hash mapping with boolean values' do
+    write "src/file", "${key1} and ${key2}"
+    @filter.from('src').into('target').using(:key1=>true, :key2=>false).run
+    read("target/file").should eql("true and false")
+  end
+
   it 'should apply hash mapping using regular expression' do
     1.upto(4) { |i| write "src/file#{i}", "file#{i} with #key1# and #key2#" }
     @filter.from('src').into('target').using(/#(.*?)#/, 'key1'=>'value1', 'key2'=>'value2').run
@@ -495,14 +541,14 @@ describe Buildr::Filter do
   end
 end
 
-describe Filter::Mapper do 
-  
+describe Filter::Mapper do
+
   module MooMapper
     def moo_config(*args, &block)
       raise ArgumentError, "Expected moo block" unless block_given?
       { :moos => args, :callback => block }
     end
-    
+
     def moo_transform(content, path = nil)
       content.gsub(/moo+/i) do |str|
         moos = yield :moos # same than config[:moos]
@@ -645,7 +691,7 @@ name3=double\\\\hash
 PROPS
     hash.should == {'name1'=>"with\tand", 'name2'=>"with\nand\f", 'name3'=>'double\hash'}
   end
-  
+
   it 'should ignore whitespace' do
     hash = Hash.from_java_properties('name1 = value1')
     hash.should == {'name1'=>'value1'}

data/spec/core/compile_spec.rb

@@ -22,6 +22,14 @@ module CompilerHelper
     @compile_task ||= define('foo').compile.using(:javac)
   end
 
+  def compile_task_without_compiler
+    @compile_task ||= define('foo').compile
+  end
+
+  def file_task
+    @file_taks ||= define('bar').file('src')
+  end
+
   def sources
     @sources ||= ['Test1.java', 'Test2.java'].map { |f| File.join('src/main/java/thepackage', f) }.
       each { |src| write src, "package thepackage; class #{src.pathmap('%n')} {}" }
@@ -47,6 +55,10 @@ describe Buildr::CompileTask do
     compile_task.from(sources).should be(compile_task)
   end
 
+  it 'should respond to from() with FileTask having no compiler set and return self' do
+    compile_task_without_compiler.from(file_task).should be(compile_task)
+  end
+
   it 'should respond to from() and add sources' do
     compile_task.from sources, File.dirname(sources.first)
     compile_task.sources.should == sources + [File.dirname(sources.first)]
@@ -90,8 +102,17 @@ describe Buildr::CompileTask do
     lambda { define('foo') { compile.using(:unknown) } }.should raise_error(ArgumentError, /unknown compiler/i)
   end
 
-  it 'should only allow setting the compiler once' do
-    lambda { define('foo') { compile.using(:javac).using(:scalac) } }.should raise_error(RuntimeError, /already selected/i)
+  it 'should allow overriding the guessed compiler' do
+    write "src/main/java/com/example/Hello.java", ""
+    old_compiler = nil
+    new_compiler = nil
+    define('foo') { 
+      old_compiler = compile.compiler
+      compile.using(:scalac) 
+      new_compiler = compile.compiler
+    }
+    old_compiler.should == :javac
+    new_compiler.should == :scalac
   end
 end
 
@@ -100,7 +121,7 @@ describe Buildr::CompileTask, '#compiler' do
   it 'should be nil if no compiler identifier' do
     define('foo').compile.compiler.should be_nil
   end
-  
+
   it 'should return the selected compiler' do
     define('foo') { compile.using(:javac) }
     project('foo').compile.compiler.should eql(:javac)
@@ -128,7 +149,7 @@ describe Buildr::CompileTask, '#language' do
   it 'should be nil if no compiler identifier' do
     define('foo').compile.language.should be_nil
   end
-  
+
   it 'should return the appropriate language' do
     define('foo') { compile.using(:javac) }
     project('foo').compile.language.should eql(:java)
@@ -242,7 +263,7 @@ describe Buildr::CompileTask, '#options' do
     compile_task.options.foo = 'bar'
     compile_task.options.foo.should eql('bar')
   end
-  
+
   it 'should have bracket accessors' do
     compile_task.options[:foo] = 'bar'
     compile_task.options[:foo].should eql('bar')
@@ -337,6 +358,15 @@ describe Buildr::CompileTask, '#invoke' do
     lambda { compile_task.from(sources).invoke }.should_not run_task('foo:compile')
   end
 
+  it 'should not force compilation if dependencies older than compiled' do
+    jars; project('jars').task("package").invoke
+    time = Time.now
+    jars.each { |jar| File.utime(time - 1 , time - 1, jar) }
+    sources.map { |src| File.utime(time, time, src); src.pathmap("#{compile_task.target}/thepackage/%n.class") }.
+      each { |kls| write kls ; File.utime(time, time, kls) }
+    lambda { compile_task.from(sources).with(jars).invoke }.should_not run_task('foo:compile')
+  end
+
   it 'should force compilation if dependencies newer than compiled' do
     jars; project('jars').task("package").invoke
     # On my machine the times end up the same, so need to push dependencies in the past.
@@ -348,15 +378,6 @@ describe Buildr::CompileTask, '#invoke' do
     lambda { compile_task.from(sources).with(jars).invoke }.should run_task('foo:compile')
   end
 
-  it 'should not force compilation if dependencies older than compiled' do
-    jars; project('jars').task("package").invoke
-    time = Time.now
-    jars.each { |jar| File.utime(time - 1 , time - 1, jar) }
-    sources.map { |src| File.utime(time, time, src); src.pathmap("#{compile_task.target}/thepackage/%n.class") }.
-      each { |kls| write kls ; File.utime(time, time, kls) }
-    lambda { compile_task.from(sources).with(jars).invoke }.should_not run_task('foo:compile')
-  end
-
   it 'should timestamp target directory if specified' do
     time = Time.now - 10
     mkpath compile_task.target.to_s
@@ -551,6 +572,31 @@ describe Project, '#resources' do
     file('target/resources/foo').should contain('Foo')
   end
 
+  it 'should copy new resources to target directory' do
+    time = Time.now
+    mkdir_p 'target/resources'
+    File.utime(time-1, time-1, 'target/resources')
+
+    write 'src/main/resources/foo', 'Foo'
+
+    define('foo')
+    project('foo').file('target/resources').invoke
+    file('target/resources/foo').should exist
+  end
+
+  it 'should copy updated resources to target directory' do
+    time = Time.now
+    mkdir_p 'target/resources'
+    write 'target/resources/foo', 'Foo'
+    File.utime(time-1, time-1, 'target/resources')
+    File.utime(time-1, time-1, 'target/resources/foo')
+
+    write 'src/main/resources/foo', 'Foo2'
+    define('foo')
+    project('foo').file('target/resources').invoke
+    file('target/resources/foo').should contain('Foo2')
+  end
+
   it 'should not create target directory unless there are resources' do
     define('foo').compile.invoke
     file('target/resources').should_not exist
@@ -580,4 +626,33 @@ describe Project, '#resources' do
     define('foo').compile.invoke
     file('target/resources/foo').should contain('bar')
   end
+
+  it 'should use current profile as default for filtering' do
+    write 'profiles.yaml', <<-YAML
+      development:
+        filter:
+          foo: bar
+    YAML
+    write 'src/main/resources/foo', '${foo} ${baz}'
+    define('foo') do
+      resources.filter.using 'baz' => 'qux'
+    end
+    project('foo').compile.invoke
+    file('target/resources/foo').should contain('bar qux')
+  end
+
+  it 'should allow clearing default filter mapping' do
+    write 'profiles.yaml', <<-YAML
+      development:
+        filter:
+          foo: bar
+    YAML
+    write 'src/main/resources/foo', '${foo} ${baz}'
+    define('foo') do
+      resources.filter.mapping.clear
+      resources.filter.using 'baz' => 'qux'
+    end
+    project('foo').compile.invoke
+    file('target/resources/foo').should contain('${foo} qux')
+  end
 end

data/spec/core/extension_spec.rb

@@ -18,17 +18,31 @@ require File.join(File.dirname(__FILE__), '../spec_helpers')
 
 
 describe Extension do
-  
+
+  before do
+    @saved_modules   = Project.class_eval { @extension_modules }.dup
+    @saved_callbacks = Project.class_eval { @global_callbacks }.dup
+  end
+
+  after do
+    modules   = @saved_modules
+    callbacks = @saved_callbacks
+    Project.class_eval do
+      @global_callbacks  = callbacks
+      @extension_modules = modules
+    end
+  end
+
   it 'should call Extension.first_time during include' do
     TestExtension.should_receive(:first_time_called).once
     class Buildr::Project
       include TestExtension
     end
   end
-  
+
   it 'should call before_define and after_define in order when project is defined' do
     begin
-      TestExtension.initialized do |extension|
+      TestExtension.callback do |extension|
         extension.should_receive(:before_define_called).once.ordered
         extension.should_receive(:after_define_called).once.ordered
       end
@@ -37,14 +51,14 @@ describe Extension do
       end
       define('foo')
     ensure
-      TestExtension.initialized { |ignore| }
+      TestExtension.callback { |ignore| }
     end
   end
 
   it 'should call before_define and after_define for each project defined' do
     begin
       extensions = 0
-      TestExtension.initialized do |extension|
+      TestExtension.callback do |extension|
         extensions += 1
         extension.should_receive(:before_define_called).once.ordered
         extension.should_receive(:after_define_called).once.ordered
@@ -55,39 +69,133 @@ describe Extension do
       define('foo')
       define('bar')
       extensions.should equal(2)
-    ensure  
-      TestExtension.initialized { |ignore| }
+    ensure
+      TestExtension.callback { |ignore| }
+    end
+  end
+
+  it 'should call before_define callbacks in dependency order' do
+    class Buildr::Project
+      include ExtensionOneTwo
+      include ExtensionThreeFour
+    end
+    define('foo')
+    project('foo').before_order.should == [ :one, :two, :three, :four ]
+    project('foo').after_order.should  == [ :four, :three, :two, :one ]
+  end
+
+  it 'should call before_define callbacks when extending project' do
+    define('foo') do
+      extend ExtensionOneTwo
+      extend ExtensionThreeFour
     end
+    project('foo').before_order.should == [ :two, :one, :four, :three ]
+    project('foo').after_order.should  == [ :four, :three, :two, :one ]
+  end
+
+  it 'should raise error when including if callback dependencies cannot be satisfied' do
+    class Buildr::Project
+      include ExtensionOneTwo # missing ExtensionThreeFour
+    end
+    lambda { define('foo') }.should raise_error
+  end
+
+  it 'should raise error when extending if callback dependencies cannot be satisfied' do
+    lambda {
+      define('foo') do |project|
+        extend ExtensionOneTwo # missing ExtensionThreeFour
+      end
+    }.should raise_error
+  end
+
+  it 'should ignore dependencies when extending project' do
+    define('bar') do |project|
+      extend ExtensionThreeFour # missing ExtensionOneTwo
+    end
+    project('bar').before_order.should == [:four, :three]
+    project('bar').after_order.should == [:four, :three]
   end
 end
 
 module TestExtension
   include Extension
-  
+
   def initialize(*args)
-    # callback is used to obtain extension instance created by buildr
-    @@initialized.call(self) if @@initialized
     super
+    # callback is used to obtain extension instance created by buildr
+    @@callback.call(self) if @@callback
   end
-  
-  def TestExtension.initialized(&block)
-    @@initialized = block
+
+  def self.callback(&block)
+    @@callback = block
   end
-  
+
   first_time do
-    TestExtension.first_time_called()
+    self.first_time_called()
   end
-  
+
   before_define do |project|
     project.before_define_called()
   end
-  
+
   after_define do |project|
     project.after_define_called()
   end
 
-  def TestExtension.first_time_called()
+  def self.first_time_called()
+  end
+
+end
+
+module BeforeAfter
+  def before_order
+    @before_order ||= []
+  end
+
+  def after_order
+    @after_order ||= []
+  end
+end
+
+module ExtensionOneTwo
+  include Extension, BeforeAfter
+
+  before_define(:two => :one) do |project|
+    project.before_order << :two
+  end
+
+  before_define(:one) do |project|
+    project.before_order << :one
+  end
+
+  after_define(:one => :two) do |project|
+    project.after_order << :one
+  end
+
+  after_define(:two => :three) do |project|
+    project.after_order << :two
+  end
+end
+
+module ExtensionThreeFour
+  include Extension, BeforeAfter
+
+  before_define(:three => :two)
+
+  before_define(:four => :three) do |project|
+    project.before_order << :four
+  end
+
+  before_define(:three) do |project|
+    project.before_order << :three
+  end
+
+  after_define(:three => :four) do |project|
+    project.after_order << :three
+  end
+
+  after_define(:four) do |project|
+    project.after_order << :four
   end
-  
 end