Get rid of autoload in hosts plugins

videlalvaro · May 23, 2012 · 096e61b · 096e61b
1 parent 459d826
commit 096e61b
Show file tree

Hide file tree

Showing 16 changed files with 54 additions and 24 deletions.
diff --git 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
@@ -2,13 +2,14 @@
 
 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
@@ -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
@@ -2,13 +2,14 @@
 
 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
@@ -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
@@ -2,13 +2,14 @@
 
 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
@@ -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
@@ -2,13 +2,14 @@
 
 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
@@ -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
@@ -2,13 +2,14 @@
 
 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
@@ -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
@@ -2,13 +2,14 @@
 
 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
@@ -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
@@ -2,13 +2,14 @@
 
 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
@@ -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
@@ -2,13 +2,14 @@
 
 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