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

Clean up system loading quite a bit

This commit is contained in:
Mitchell Hashimoto 2011-12-12 00:03:28 -08:00
parent c66d846cb7
commit ee33588d10
2 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/vagrant.rb
View File

@ -43,20 +43,45 @@ module Vagrant
@source_root ||= Pathname.new(File.expand_path('../../', __FILE__))
end
# Global registry of available host classes and shortcut symbols
# associated with them.
#
# This registry is used to look up the shorcuts for `config.vagrant.host`,
# or to query all hosts for automatically detecting the host system.
# The registry is global to all of Vagrant.
def self.hosts
@hosts ||= Registry.new
end
# Global registry of available guest classes and shortcut symbols
# associated with them.
#
# This registry is used to look up the shortcuts for `config.vm.guest`.
def self.guests
@guests ||= Registry.new
end
end
# # Default I18n to load the en locale
I18n.load_path << File.expand_path("templates/locales/en.yml", Vagrant.source_root)
# Register the built-in hosts
Vagrant.hosts.register(:arch) { Vagrant::Hosts::Arch }
Vagrant.hosts.register(:arch) { Vagrant::Hosts::Arch }
Vagrant.hosts.register(:freebsd) { Vagrant::Hosts::FreeBSD }
Vagrant.hosts.register(:fedora) { Vagrant::Hosts::Fedora }
Vagrant.hosts.register(:linux) { Vagrant::Hosts::Linux }
Vagrant.hosts.register(:bsd) { Vagrant::Hosts::BSD }
Vagrant.hosts.register(:fedora) { Vagrant::Hosts::Fedora }
Vagrant.hosts.register(:linux) { Vagrant::Hosts::Linux }
Vagrant.hosts.register(:bsd) { Vagrant::Hosts::BSD }
# Register the built-in guests
Vagrant.guests.register(:arch) { Vagrant::Systems::Arch }
Vagrant.guests.register(:debian) { Vagrant::Systems::Debian }
Vagrant.guests.register(:freebsd) { Vagrant::Systems::FreeBSD }
Vagrant.guests.register(:gentoo) { Vagrant::Systems::Gentoo }
Vagrant.guests.register(:linux) { Vagrant::Systems::Linux }
Vagrant.guests.register(:redhat) { Vagrant::Systems::Redhat }
Vagrant.guests.register(:solaris) { Vagrant::Systems::Solaris }
Vagrant.guests.register(:suse) { Vagrant::Systems::Suse }
Vagrant.guests.register(:ubuntu) { Vagrant::Systems::Ubuntu }
# Load the things which must be loaded before anything else.
require 'vagrant/command'

18
lib/vagrant/vm.rb
View File

@ -38,21 +38,9 @@ module Vagrant
raise Errors::VMSystemError, :_key => :invalid_class, :system => system.to_s if !(system <= Systems::Base)
@system = system.new(self)
elsif system.is_a?(Symbol)
# Hard-coded internal systems
mapping = {
:debian => Systems::Debian,
:ubuntu => Systems::Ubuntu,
:freebsd => Systems::FreeBSD,
:gentoo => Systems::Gentoo,
:redhat => Systems::Redhat,
:suse => Systems::Suse,
:linux => Systems::Linux,
:solaris => Systems::Solaris,
:arch => Systems::Arch
}
raise Errors::VMSystemError, :_key => :unknown_type, :system => system.to_s if !mapping.has_key?(system)
@system = mapping[system].new(self)
system_klass = Vagrant.guests.get(system)
raise Errors::VMSystemError, :_key => :unknown_type, :system => system.to_s if !system_klass
@system = system_klass.new(self)
else
raise Errors::VMSystemError, :unspecified
end