Author: vborja
Date: Wed Sep 24 20:58:56 2008
New Revision: 698806
URL: http://svn.apache.org/viewvc?rev=698806&view=rev
Log:
Fixed the order of load_requires to be the same as before (just before loadig
the buildfile).
Modified:
incubator/buildr/trunk/lib/buildr/core/application.rb
incubator/buildr/trunk/spec/core/application_spec.rb
Modified: incubator/buildr/trunk/lib/buildr/core/application.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/core/application.rb?rev=698806&r1=698805&r2=698806&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/core/application.rb (original)
+++ incubator/buildr/trunk/lib/buildr/core/application.rb Wed Sep 24 20:58:56
2008
@@ -159,11 +159,11 @@
def run
standard_exception_handling do
- load_requires
find_buildfile
load_gems
load_artifacts
load_tasks
+ load_requires
load_buildfile
load_imports
task('buildr:initialize').invoke
Modified: incubator/buildr/trunk/spec/core/application_spec.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/spec/core/application_spec.rb?rev=698806&r1=698805&r2=698806&view=diff
==============================================================================
--- incubator/buildr/trunk/spec/core/application_spec.rb (original)
+++ incubator/buildr/trunk/spec/core/application_spec.rb Wed Sep 24 20:58:56
2008
@@ -32,8 +32,8 @@
describe '#run' do
it 'should execute *_load methods in order' do
last = nil
- order = [:load_requires, :find_buildfile, :load_gems, :load_artifacts,
- :load_tasks, :load_buildfile, :load_imports, :top_level]
+ order = [:find_buildfile, :load_gems, :load_artifacts, :load_tasks,
+ :load_requires, :load_buildfile, :load_imports, :top_level]
order.each { |method| Buildr.application.should_receive(method).ordered }
Buildr.application.stub!(:exit) # With this, shows the correct error
instead of SystemExit.
Buildr.application.run
