From 096e61b12222877d63a0ad6a559e71cc018b862a Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Wed, 23 May 2012 16:03:14 -0700 Subject: [PATCH] Get rid of autoload in hosts plugins --- plugins/hosts/arch/host.rb | 4 ++++ plugins/hosts/arch/plugin.rb | 7 ++++--- plugins/hosts/bsd/host.rb | 1 + plugins/hosts/bsd/plugin.rb | 7 ++++--- plugins/hosts/fedora/host.rb | 4 ++++ plugins/hosts/fedora/plugin.rb | 7 ++++--- plugins/hosts/freebsd/host.rb | 3 +++ plugins/hosts/freebsd/plugin.rb | 7 ++++--- plugins/hosts/gentoo/host.rb | 4 ++++ plugins/hosts/gentoo/plugin.rb | 7 ++++--- plugins/hosts/linux/host.rb | 1 + plugins/hosts/linux/plugin.rb | 7 ++++--- plugins/hosts/opensuse/host.rb | 4 ++++ plugins/hosts/opensuse/plugin.rb | 7 ++++--- plugins/hosts/windows/host.rb | 1 + plugins/hosts/windows/plugin.rb | 7 ++++--- 16 files changed, 54 insertions(+), 24 deletions(-) diff --git a/plugins/hosts/arch/host.rb b/plugins/hosts/arch/host.rb index 66034e5a0..d2ff0652b 100644 --- a/plugins/hosts/arch/host.rb +++ b/plugins/hosts/arch/host.rb @@ -1,3 +1,7 @@ +require "vagrant" + +require Vagrant.source_root.join("plugins/hosts/linux/host") + module VagrantPlugins module HostArch class Host < VagrantPlugins::HostLinux::Host diff --git a/plugins/hosts/arch/plugin.rb b/plugins/hosts/arch/plugin.rb index 204d89929..e477694b1 100644 --- a/plugins/hosts/arch/plugin.rb +++ b/plugins/hosts/arch/plugin.rb @@ -2,13 +2,14 @@ require "vagrant" module VagrantPlugins module HostArch - autoload :Host, File.expand_path("../host", __FILE__) - class Plugin < Vagrant.plugin("1") name "Arch host" description "Arch host support." - host("arch") { Host } + host("arch") do + require File.expand_path("../host", __FILE__) + Host + end end end end diff --git a/plugins/hosts/bsd/host.rb b/plugins/hosts/bsd/host.rb index 91b0a208b..aefd9defa 100644 --- a/plugins/hosts/bsd/host.rb +++ b/plugins/hosts/bsd/host.rb @@ -1,5 +1,6 @@ require 'log4r' +require "vagrant" require 'vagrant/util/platform' module VagrantPlugins diff --git a/plugins/hosts/bsd/plugin.rb b/plugins/hosts/bsd/plugin.rb index 4ba7a0ec9..60a74663f 100644 --- a/plugins/hosts/bsd/plugin.rb +++ b/plugins/hosts/bsd/plugin.rb @@ -2,13 +2,14 @@ require "vagrant" module VagrantPlugins module HostBSD - autoload :Host, File.expand_path("../host", __FILE__) - class Plugin < Vagrant.plugin("1") name "BSD host" description "BSD host support." - host("bsd") { Host } + host("bsd") do + require File.expand_path("../host", __FILE__) + Host + end end end end diff --git a/plugins/hosts/fedora/host.rb b/plugins/hosts/fedora/host.rb index 9929b87e1..c62d97716 100644 --- a/plugins/hosts/fedora/host.rb +++ b/plugins/hosts/fedora/host.rb @@ -1,5 +1,9 @@ require "pathname" +require "vagrant" + +require Vagrant.source_root.join("plugins/hosts/linux/host") + module VagrantPlugins module HostFedora class Host < VagrantPlugins::HostLinux::Host diff --git a/plugins/hosts/fedora/plugin.rb b/plugins/hosts/fedora/plugin.rb index 7ac2c2a42..7f063afb8 100644 --- a/plugins/hosts/fedora/plugin.rb +++ b/plugins/hosts/fedora/plugin.rb @@ -2,13 +2,14 @@ require "vagrant" module VagrantPlugins module HostFedora - autoload :Host, File.expand_path("../host", __FILE__) - class Plugin < Vagrant.plugin("1") name "Fedora host" description "Fedora host support." - host("fedora") { Host } + host("fedora") do + require File.expand_path("../host", __FILE__) + Host + end end end end diff --git a/plugins/hosts/freebsd/host.rb b/plugins/hosts/freebsd/host.rb index 0753b9121..d10d84d47 100644 --- a/plugins/hosts/freebsd/host.rb +++ b/plugins/hosts/freebsd/host.rb @@ -1,5 +1,8 @@ +require "vagrant" require 'vagrant/util/platform' +require Vagrant.source_root.join("plugins/hosts/bsd/host") + module VagrantPlugins module HostFreeBSD class Host < VagrantPlugins::HostBSD::Host diff --git a/plugins/hosts/freebsd/plugin.rb b/plugins/hosts/freebsd/plugin.rb index bbb501723..369f30126 100644 --- a/plugins/hosts/freebsd/plugin.rb +++ b/plugins/hosts/freebsd/plugin.rb @@ -2,13 +2,14 @@ require "vagrant" module VagrantPlugins module HostFreeBSD - autoload :Host, File.expand_path("../host", __FILE__) - class Plugin < Vagrant.plugin("1") name "FreeBSD host" description "FreeBSD host support." - host("freebsd") { Host } + host("freebsd") do + require File.expand_path("../host", __FILE__) + Host + end end end end diff --git a/plugins/hosts/gentoo/host.rb b/plugins/hosts/gentoo/host.rb index d5c994c64..becaaf847 100644 --- a/plugins/hosts/gentoo/host.rb +++ b/plugins/hosts/gentoo/host.rb @@ -1,3 +1,7 @@ +require "vagrant" + +require Vagrant.source_root.join("plugins/hosts/linux/host") + module VagrantPlugins module HostGentoo class Host < VagrantPlugins::HostLinux::Host diff --git a/plugins/hosts/gentoo/plugin.rb b/plugins/hosts/gentoo/plugin.rb index efdf5b29f..4dd04a769 100644 --- a/plugins/hosts/gentoo/plugin.rb +++ b/plugins/hosts/gentoo/plugin.rb @@ -2,13 +2,14 @@ require "vagrant" module VagrantPlugins module HostGentoo - autoload :Host, File.expand_path("../host", __FILE__) - class Plugin < Vagrant.plugin("1") name "Gentoo host" description "Gentoo host support." - host("gentoo") { Host } + host("gentoo") do + require File.expand_path("../host", __FILE__) + Host + end end end end diff --git a/plugins/hosts/linux/host.rb b/plugins/hosts/linux/host.rb index 210cced34..30cb025a0 100644 --- a/plugins/hosts/linux/host.rb +++ b/plugins/hosts/linux/host.rb @@ -1,5 +1,6 @@ require 'log4r' +require "vagrant" require 'vagrant/util/platform' module VagrantPlugins diff --git a/plugins/hosts/linux/plugin.rb b/plugins/hosts/linux/plugin.rb index 7e1029831..1137f8b5f 100644 --- a/plugins/hosts/linux/plugin.rb +++ b/plugins/hosts/linux/plugin.rb @@ -2,13 +2,14 @@ require "vagrant" module VagrantPlugins module HostLinux - autoload :Host, File.expand_path("../host", __FILE__) - class Plugin < Vagrant.plugin("1") name "Linux host" description "Linux host support." - host("linux") { Host } + host("linux") do + require File.expand_path("../host", __FILE__) + Host + end end end end diff --git a/plugins/hosts/opensuse/host.rb b/plugins/hosts/opensuse/host.rb index 59dddc165..b560a4944 100644 --- a/plugins/hosts/opensuse/host.rb +++ b/plugins/hosts/opensuse/host.rb @@ -1,5 +1,9 @@ require "pathname" +require "vagrant" + +require Vagrant.source_root.join("plugins/hosts/linux/host") + module VagrantPlugins module HostOpenSUSE class Host < VagrantPlugins::HostLinux::Host diff --git a/plugins/hosts/opensuse/plugin.rb b/plugins/hosts/opensuse/plugin.rb index 2e49a5f79..701aaecb4 100644 --- a/plugins/hosts/opensuse/plugin.rb +++ b/plugins/hosts/opensuse/plugin.rb @@ -2,13 +2,14 @@ require "vagrant" module VagrantPlugins module HostOpenSUSE - autoload :Host, File.expand_path("../host", __FILE__) - class Plugin < Vagrant.plugin("1") name "OpenSUSE host" description "OpenSUSE host support." - host("opensuse") { Host } + host("opensuse") do + require File.expand_path("../host", __FILE__) + Host + end end end end diff --git a/plugins/hosts/windows/host.rb b/plugins/hosts/windows/host.rb index e65a11d1e..1a5e05065 100644 --- a/plugins/hosts/windows/host.rb +++ b/plugins/hosts/windows/host.rb @@ -1,3 +1,4 @@ +require "vagrant" require 'vagrant/util/platform' module VagrantPlugins diff --git a/plugins/hosts/windows/plugin.rb b/plugins/hosts/windows/plugin.rb index 4c338e988..0018c3928 100644 --- a/plugins/hosts/windows/plugin.rb +++ b/plugins/hosts/windows/plugin.rb @@ -2,13 +2,14 @@ require "vagrant" module VagrantPlugins module HostWindows - autoload :Host, File.expand_path("../host", __FILE__) - class Plugin < Vagrant.plugin("1") name "Windows host" description "Windows host support." - host("windows") { Host } + host("windows") do + require File.expand_path("../host", __FILE__) + Host + end end end end