haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Expand paths properly for loading so that files already loaded aren't loaded twice

This commit is contained in:
Mitchell Hashimoto 2010-03-13 03:08:26 -08:00
parent 39a8a5fd94
commit 9da68bb129
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/vagrant.rb
View File

@ -4,12 +4,17 @@ PROJECT_ROOT = File.join(libdir, '..') unless defined?(PROJECT_ROOT)
# The libs which must be loaded prior to the rest # The libs which must be loaded prior to the rest
%w{tempfile open-uri json pathname logger uri net/http virtualbox net/ssh archive/tar/minitar %w{tempfile open-uri json pathname logger uri net/http virtualbox net/ssh archive/tar/minitar
net/scp fileutils vagrant/util vagrant/actions/base vagrant/downloaders/base vagrant/actions/runner net/scp fileutils}.each do |lib|
require lib
end
# The vagrant specific files which must be loaded prior to the rest
%w{vagrant/util vagrant/actions/base vagrant/downloaders/base vagrant/actions/runner
vagrant/config vagrant/provisioners/base vagrant/provisioners/chef}.each do |f| vagrant/config vagrant/provisioners/base vagrant/provisioners/chef}.each do |f|
require f require File.expand_path(f, libdir)
end end
# Glob require the rest # Glob require the rest
Dir[File.join(PROJECT_ROOT, "lib", "vagrant", "**", "*.rb")].each do |f| Dir[File.join(libdir, "vagrant", "**", "*.rb")].each do |f|
require f require File.expand_path(f, PROJECT_ROOT)
end end