From 5a33b7ee54828a40f2bd3e1055b0725b2597c20a Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 6 Nov 2012 21:20:22 -0800 Subject: [PATCH] Hosts to V2 --- lib/vagrant/environment.rb | 4 ++-- plugins/hosts/arch/plugin.rb | 2 +- plugins/hosts/bsd/host.rb | 2 +- plugins/hosts/bsd/plugin.rb | 2 +- plugins/hosts/fedora/plugin.rb | 2 +- plugins/hosts/freebsd/plugin.rb | 2 +- plugins/hosts/gentoo/plugin.rb | 2 +- plugins/hosts/linux/host.rb | 2 +- plugins/hosts/linux/plugin.rb | 2 +- plugins/hosts/opensuse/plugin.rb | 2 +- plugins/hosts/windows/host.rb | 2 +- plugins/hosts/windows/plugin.rb | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/vagrant/environment.rb b/lib/vagrant/environment.rb index cbdb33f67..4bf3caaed 100644 --- a/lib/vagrant/environment.rb +++ b/lib/vagrant/environment.rb @@ -191,14 +191,14 @@ module Vagrant # will return nil, and we don't want to trigger a detect load. host_klass = config.global.vagrant.host if host_klass.nil? || host_klass == :detect - hosts = Vagrant.plugin("1").manager.hosts + hosts = Vagrant.plugin("2").manager.hosts # Get the flattened list of available hosts host_klass = Hosts.detect(hosts) end # If no host class is detected, we use the base class. - host_klass ||= Vagrant.plugin("1", :host) + host_klass ||= Vagrant.plugin("2", :host) @host ||= host_klass.new(@ui) end diff --git a/plugins/hosts/arch/plugin.rb b/plugins/hosts/arch/plugin.rb index e477694b1..8fe8ca299 100644 --- a/plugins/hosts/arch/plugin.rb +++ b/plugins/hosts/arch/plugin.rb @@ -2,7 +2,7 @@ require "vagrant" module VagrantPlugins module HostArch - class Plugin < Vagrant.plugin("1") + class Plugin < Vagrant.plugin("2") name "Arch host" description "Arch host support." diff --git a/plugins/hosts/bsd/host.rb b/plugins/hosts/bsd/host.rb index 28c9a62f3..5921901c4 100644 --- a/plugins/hosts/bsd/host.rb +++ b/plugins/hosts/bsd/host.rb @@ -6,7 +6,7 @@ require 'vagrant/util/platform' module VagrantPlugins module HostBSD # Represents a BSD host, such as FreeBSD and Darwin (Mac OS X). - class Host < Vagrant.plugin("1", :host) + class Host < Vagrant.plugin("2", :host) include Vagrant::Util include Vagrant::Util::Retryable diff --git a/plugins/hosts/bsd/plugin.rb b/plugins/hosts/bsd/plugin.rb index 60a74663f..781493af2 100644 --- a/plugins/hosts/bsd/plugin.rb +++ b/plugins/hosts/bsd/plugin.rb @@ -2,7 +2,7 @@ require "vagrant" module VagrantPlugins module HostBSD - class Plugin < Vagrant.plugin("1") + class Plugin < Vagrant.plugin("2") name "BSD host" description "BSD host support." diff --git a/plugins/hosts/fedora/plugin.rb b/plugins/hosts/fedora/plugin.rb index 7f063afb8..430b13708 100644 --- a/plugins/hosts/fedora/plugin.rb +++ b/plugins/hosts/fedora/plugin.rb @@ -2,7 +2,7 @@ require "vagrant" module VagrantPlugins module HostFedora - class Plugin < Vagrant.plugin("1") + class Plugin < Vagrant.plugin("2") name "Fedora host" description "Fedora host support." diff --git a/plugins/hosts/freebsd/plugin.rb b/plugins/hosts/freebsd/plugin.rb index 369f30126..c58cd5f90 100644 --- a/plugins/hosts/freebsd/plugin.rb +++ b/plugins/hosts/freebsd/plugin.rb @@ -2,7 +2,7 @@ require "vagrant" module VagrantPlugins module HostFreeBSD - class Plugin < Vagrant.plugin("1") + class Plugin < Vagrant.plugin("2") name "FreeBSD host" description "FreeBSD host support." diff --git a/plugins/hosts/gentoo/plugin.rb b/plugins/hosts/gentoo/plugin.rb index 4dd04a769..c976081c5 100644 --- a/plugins/hosts/gentoo/plugin.rb +++ b/plugins/hosts/gentoo/plugin.rb @@ -2,7 +2,7 @@ require "vagrant" module VagrantPlugins module HostGentoo - class Plugin < Vagrant.plugin("1") + class Plugin < Vagrant.plugin("2") name "Gentoo host" description "Gentoo host support." diff --git a/plugins/hosts/linux/host.rb b/plugins/hosts/linux/host.rb index b846d7a9b..265992389 100644 --- a/plugins/hosts/linux/host.rb +++ b/plugins/hosts/linux/host.rb @@ -6,7 +6,7 @@ require 'vagrant/util/platform' module VagrantPlugins module HostLinux # Represents a Linux based host, such as Ubuntu. - class Host < Vagrant.plugin("1", :host) + class Host < Vagrant.plugin("2", :host) include Vagrant::Util include Vagrant::Util::Retryable diff --git a/plugins/hosts/linux/plugin.rb b/plugins/hosts/linux/plugin.rb index 1137f8b5f..bd262733f 100644 --- a/plugins/hosts/linux/plugin.rb +++ b/plugins/hosts/linux/plugin.rb @@ -2,7 +2,7 @@ require "vagrant" module VagrantPlugins module HostLinux - class Plugin < Vagrant.plugin("1") + class Plugin < Vagrant.plugin("2") name "Linux host" description "Linux host support." diff --git a/plugins/hosts/opensuse/plugin.rb b/plugins/hosts/opensuse/plugin.rb index 701aaecb4..4b0204ced 100644 --- a/plugins/hosts/opensuse/plugin.rb +++ b/plugins/hosts/opensuse/plugin.rb @@ -2,7 +2,7 @@ require "vagrant" module VagrantPlugins module HostOpenSUSE - class Plugin < Vagrant.plugin("1") + class Plugin < Vagrant.plugin("2") name "OpenSUSE host" description "OpenSUSE host support." diff --git a/plugins/hosts/windows/host.rb b/plugins/hosts/windows/host.rb index 9f5ed6c44..69af51359 100644 --- a/plugins/hosts/windows/host.rb +++ b/plugins/hosts/windows/host.rb @@ -3,7 +3,7 @@ require 'vagrant/util/platform' module VagrantPlugins module HostWindows - class Host < Vagrant.plugin("1", :host) + class Host < Vagrant.plugin("2", :host) def self.match? Vagrant::Util::Platform.windows? end diff --git a/plugins/hosts/windows/plugin.rb b/plugins/hosts/windows/plugin.rb index 0018c3928..e2dec517b 100644 --- a/plugins/hosts/windows/plugin.rb +++ b/plugins/hosts/windows/plugin.rb @@ -2,7 +2,7 @@ require "vagrant" module VagrantPlugins module HostWindows - class Plugin < Vagrant.plugin("1") + class Plugin < Vagrant.plugin("2") name "Windows host" description "Windows host support."