Author: vborja
Date: Tue Sep 2 13:52:01 2008
New Revision: 691377
URL: http://svn.apache.org/viewvc?rev=691377&view=rev
Log:
Use expanded paths for BuilfileTask and its dependencies.
Modified:
incubator/buildr/trunk/lib/buildr/core/application.rb
incubator/buildr/trunk/spec/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=691377&r1=691376&r2=691377&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/core/application.rb (original)
+++ incubator/buildr/trunk/lib/buildr/core/application.rb Tue Sep 2 13:52:01
2008
@@ -148,7 +148,7 @@
# buildfile
# Returns the buildfile as a task that you can use as a dependency.
def buildfile
- @buildfile_task ||= BuildfileTask.define_task(rakefile)
+ @buildfile_task ||= BuildfileTask.define_task(File.expand_path(rakefile))
end
# Files that complement the buildfile itself
@@ -276,6 +276,7 @@
info "(in #{Dir.pwd}, #{environment})"
load File.expand_path(@rakefile) if @rakefile != ''
load_imports
+ buildfile.enhance @requires.select { |f| File.file?(f) }.map{ |f|
File.expand_path(f) }
end
# Loads buildr.rb files from users home directory and project directory.
@@ -285,7 +286,7 @@
files += [ File.expand_path('buildr.rake', ENV['HOME']),
File.expand_path('buildr.rake') ].
select { |file| File.exist?(file) }.each { |file| warn "Please use
'#{file.ext('rb')}' instead of '#{file}'" }
#Load local tasks that can be used in the Buildfile.
- files += Dir['tasks/*.rake']
+ files += Dir[File.expand_path('tasks/*.rake', original_dir)]
files.each do |file|
unless $LOADED_FEATURES.include?(file)
load file
Modified: incubator/buildr/trunk/spec/application_spec.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/spec/application_spec.rb?rev=691377&r1=691376&r2=691377&view=diff
==============================================================================
--- incubator/buildr/trunk/spec/application_spec.rb (original)
+++ incubator/buildr/trunk/spec/application_spec.rb Tue Sep 2 13:52:01 2008
@@ -354,6 +354,15 @@
Buildr.application.send :load_tasks
Buildr.application.buildfile.timestamp.should be_close(@buildfile_time +
5, 1)
end
+
+ it 'should include explicitly required files as dependencies' do
+ write 'some/file.rb'; File.utime(@buildfile_time + 5, @buildfile_time +
5, 'some/file.rb')
+ Buildr.application.instance_variable_set(:@requires, ['rbconfig',
'some/file.rb'])
+ Buildr.application.send :load_buildfile
+ Buildr.application.buildfile.timestamp.should be_close(@buildfile_time +
5, 1)
+ Buildr.application.buildfile.prerequisites.should
include(File.expand_path('some/file.rb'))
+ Buildr.application.buildfile.prerequisites.should_not include('rbconfig')
+ end
end
end
