buildr 1.3.5 → 1.4.0

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
 

data/spec/core/generate_spec.rb

@@ -18,13 +18,13 @@ 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')}

data/spec/core/project_spec.rb

@@ -45,7 +45,7 @@ describe Project do
     foo.should be(project('foo'))
     bar.should be(project('bar'))
   end
-    
+
   it 'should show up in projects list if defined' do
     define('foo')
     projects.map(&:name).should include('foo')
@@ -206,7 +206,7 @@ describe Layout do
     @layout.expand(:foo, nil, :bar).should eql('none')
     @layout.expand(nil, :foo).should eql('foo')
   end
-  
+
   it 'should return nil if path not mapped' do
     @layout[:foo].should be_nil
   end
@@ -368,7 +368,7 @@ 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
@@ -418,7 +418,7 @@ describe 'Sub-project' do
       define 'foo' do
         define 'bar'
         define 'bar'
-      end 
+      end
     end.should raise_error
   end
 
@@ -456,7 +456,7 @@ describe 'Sub-project' do
       ordered << self.name
       define('bar') { ordered << self.name }
       define('baz') { ordered << self.name }
-    end 
+    end
     ordered.should eql(['foo', 'foo:bar', 'foo:baz'])
   end
 
@@ -466,7 +466,7 @@ describe 'Sub-project' do
       ordered << self.name
       define('bar') { project('foo:baz') ; ordered << self.name }
       define('baz') { ordered << self.name }
-    end 
+    end
     ordered.should eql(['foo', 'foo:baz', 'foo:bar'])
   end
 
@@ -475,7 +475,7 @@ describe 'Sub-project' do
       define 'foo' do
         define('bar') { project('foo:baz') }
         define('baz') { project('foo:bar') }
-      end 
+      end
     end.should raise_error(RuntimeError, /Circular dependency/)
   end
 end
@@ -645,7 +645,7 @@ describe Project, '#task' do
   it 'should create a regular task' do
     define('foo') { task('bar') }
     Buildr.application.lookup('foo:bar').should_not be_nil
-  end 
+  end
 
   it 'should return a task defined in the project' do
     define('foo') { task('bar') }
@@ -661,7 +661,7 @@ describe Project, '#task' do
     define('foo') { task('bar') }
     project('foo').task('bar').name.should eql('foo:bar')
   end
-  
+
   it 'should ignore namespace if starting with color' do
     define 'foo' do
       task(':bar').name.should == 'bar'
@@ -744,7 +744,7 @@ end
 
 
 =begin
-describe Buildr::Generate do 
+describe Buildr::Generate do
   it 'should be able to create buildfile from directory structure' do
     write 'src/main/java/Foo.java', ''
     write 'one/two/src/main/java/Foo.java', ''