vagrantup 1.0.7 → 1.1.0

data/plugins/hosts/bsd/plugin.rb

@@ -0,0 +1,15 @@
+require "vagrant"
+
+module VagrantPlugins
+  module HostBSD
+    class Plugin < Vagrant.plugin("2")
+      name "BSD host"
+      description "BSD host support."
+
+      host("bsd") do
+        require File.expand_path("../host", __FILE__)
+        Host
+      end
+    end
+  end
+end

data/{lib/vagrant/hosts/fedora.rb → plugins/hosts/fedora/host.rb}

@@ -1,8 +1,12 @@
-require 'pathname'
+require "pathname"
 
-module Vagrant
-  module Hosts
-    class Fedora < Linux
+require "vagrant"
+
+require Vagrant.source_root.join("plugins/hosts/linux/host")
+
+module VagrantPlugins
+  module HostFedora
+    class Host < VagrantPlugins::HostLinux::Host
       def self.match?
         release_file = Pathname.new("/etc/redhat-release")
 

data/plugins/hosts/fedora/plugin.rb

@@ -0,0 +1,15 @@
+require "vagrant"
+
+module VagrantPlugins
+  module HostFedora
+    class Plugin < Vagrant.plugin("2")
+      name "Fedora host"
+      description "Fedora host support."
+
+      host("fedora") do
+        require File.expand_path("../host", __FILE__)
+        Host
+      end
+    end
+  end
+end

data/{lib/vagrant/hosts/freebsd.rb → plugins/hosts/freebsd/host.rb}

@@ -1,18 +1,20 @@
+require "vagrant"
 require 'vagrant/util/platform'
 
-module Vagrant
-  module Hosts
-    # Represents a FreeBSD host
-    class FreeBSD < BSD
-      class FreeBSDHostError < Errors::VagrantError
+require Vagrant.source_root.join("plugins/hosts/bsd/host")
+
+module VagrantPlugins
+  module HostFreeBSD
+    class Host < VagrantPlugins::HostBSD::Host
+      class FreeBSDHostError < Vagrant::Errors::VagrantError
         error_namespace("vagrant.hosts.freebsd")
       end
 
-      include Util
-      include Util::Retryable
+      include Vagrant::Util
+      include Vagrant::Util::Retryable
 
       def self.match?
-        Util::Platform.freebsd?
+        Vagrant::Util::Platform.freebsd?
       end
 
       # Normal, mid-range precedence.

data/plugins/hosts/freebsd/plugin.rb

@@ -0,0 +1,15 @@
+require "vagrant"
+
+module VagrantPlugins
+  module HostFreeBSD
+    class Plugin < Vagrant.plugin("2")
+      name "FreeBSD host"
+      description "FreeBSD host support."
+
+      host("freebsd") do
+        require File.expand_path("../host", __FILE__)
+        Host
+      end
+    end
+  end
+end

data/{lib/vagrant/hosts/gentoo.rb → plugins/hosts/gentoo/host.rb}

@@ -1,6 +1,10 @@
-module Vagrant
-  module Hosts
-    class Gentoo < Linux
+require "vagrant"
+
+require Vagrant.source_root.join("plugins/hosts/linux/host")
+
+module VagrantPlugins
+  module HostGentoo
+    class Host < VagrantPlugins::HostLinux::Host
       def self.match?
         return File.exists?("/etc/gentoo-release")
       end

data/plugins/hosts/gentoo/plugin.rb

@@ -0,0 +1,15 @@
+require "vagrant"
+
+module VagrantPlugins
+  module HostGentoo
+    class Plugin < Vagrant.plugin("2")
+      name "Gentoo host"
+      description "Gentoo host support."
+
+      host("gentoo") do
+        require File.expand_path("../host", __FILE__)
+        Host
+      end
+    end
+  end
+end

data/{lib/vagrant/hosts/linux.rb → plugins/hosts/linux/host.rb}

@@ -1,16 +1,17 @@
 require 'log4r'
 
+require "vagrant"
 require 'vagrant/util/platform'
 
-module Vagrant
-  module Hosts
+module VagrantPlugins
+  module HostLinux
     # Represents a Linux based host, such as Ubuntu.
-    class Linux < Base
-      include Util
-      include Util::Retryable
+    class Host < Vagrant.plugin("2", :host)
+      include Vagrant::Util
+      include Vagrant::Util::Retryable
 
       def self.match?
-        Util::Platform.linux?
+        Vagrant::Util::Platform.linux?
       end
 
       def self.precedence
@@ -63,9 +64,9 @@ module Vagrant
         output = false
 
         File.read("/etc/exports").lines.each do |line|
-          if line =~ /^# VAGRANT-BEGIN: (.+?)$/
-            if valid_ids.include?($1.to_s)
-              @logger.debug("Valid ID: #{$1.to_s}")
+          if id = line[/^# VAGRANT-BEGIN: (.+?)$/, 1]
+            if valid_ids.include?(id)
+              @logger.debug("Valid ID: #{id}")
             else
               if !output
                 # We want to warn the user but we only want to output once
@@ -73,8 +74,8 @@ module Vagrant
                 output = true
               end
 
-              @logger.info("Invalid ID, pruning: #{$1.to_s}")
-              nfs_cleanup($1.to_s)
+              @logger.info("Invalid ID, pruning: #{id}")
+              nfs_cleanup(id)
             end
           end
         end

data/plugins/hosts/linux/plugin.rb

@@ -0,0 +1,15 @@
+require "vagrant"
+
+module VagrantPlugins
+  module HostLinux
+    class Plugin < Vagrant.plugin("2")
+      name "Linux host"
+      description "Linux host support."
+
+      host("linux") do
+        require File.expand_path("../host", __FILE__)
+        Host
+      end
+    end
+  end
+end

data/{lib/vagrant/hosts/opensuse.rb → plugins/hosts/opensuse/host.rb}

@@ -1,8 +1,12 @@
-require 'pathname'
+require "pathname"
 
-module Vagrant
-  module Hosts
-    class OpenSUSE < Linux
+require "vagrant"
+
+require Vagrant.source_root.join("plugins/hosts/linux/host")
+
+module VagrantPlugins
+  module HostOpenSUSE
+    class Host < VagrantPlugins::HostLinux::Host
       def self.match?
         release_file = Pathname.new("/etc/SuSE-release")
 

data/plugins/hosts/opensuse/plugin.rb

@@ -0,0 +1,15 @@
+require "vagrant"
+
+module VagrantPlugins
+  module HostOpenSUSE
+    class Plugin < Vagrant.plugin("2")
+      name "OpenSUSE host"
+      description "OpenSUSE host support."
+
+      host("opensuse") do
+        require File.expand_path("../host", __FILE__)
+        Host
+      end
+    end
+  end
+end

data/{lib/vagrant/hosts/windows.rb → plugins/hosts/windows/host.rb}

@@ -1,10 +1,11 @@
+require "vagrant"
 require 'vagrant/util/platform'
 
-module Vagrant
-  module Hosts
-    class Windows < Base
+module VagrantPlugins
+  module HostWindows
+    class Host < Vagrant.plugin("2", :host)
       def self.match?
-        Util::Platform.windows?
+        Vagrant::Util::Platform.windows?
       end
 
       # Windows does not support NFS

data/plugins/hosts/windows/plugin.rb

@@ -0,0 +1,15 @@
+require "vagrant"
+
+module VagrantPlugins
+  module HostWindows
+    class Plugin < Vagrant.plugin("2")
+      name "Windows host"
+      description "Windows host support."
+
+      host("windows") do
+        require File.expand_path("../host", __FILE__)
+        Host
+      end
+    end
+  end
+end

data/plugins/kernel_v1/config/nfs.rb

@@ -0,0 +1,20 @@
+require "vagrant"
+
+module VagrantPlugins
+  module Kernel_V1
+    class NFSConfig < Vagrant.plugin("1", :config)
+      attr_accessor :map_uid
+      attr_accessor :map_gid
+
+      def initialize
+        @map_uid = UNSET_VALUE
+        @map_gid = UNSET_VALUE
+      end
+
+      def upgrade(new)
+        new.nfs.map_uid = @map_uid if @map_uid != UNSET_VALUE
+        new.nfs.map_gid = @map_gid if @map_gid != UNSET_VALUE
+      end
+    end
+  end
+end

data/plugins/kernel_v1/config/package.rb

@@ -0,0 +1,17 @@
+require "vagrant"
+
+module VagrantPlugins
+  module Kernel_V1
+    class PackageConfig < Vagrant.plugin("1", :config)
+      attr_accessor :name
+
+      def initialize
+        @name = UNSET_VALUE
+      end
+
+      def upgrade(new)
+        new.package.name = @name if @name != UNSET_VALUE
+      end
+    end
+  end
+end

data/plugins/kernel_v1/config/ssh.rb

@@ -0,0 +1,46 @@
+require "vagrant"
+
+module VagrantPlugins
+  module Kernel_V1
+    class SSHConfig < Vagrant.plugin("1", :config)
+      attr_accessor :username
+      attr_accessor :password
+      attr_accessor :host
+      attr_accessor :port
+      attr_accessor :guest_port
+      attr_accessor :max_tries
+      attr_accessor :timeout
+      attr_accessor :private_key_path
+      attr_accessor :forward_agent
+      attr_accessor :forward_x11
+      attr_accessor :shell
+
+      def initialize
+        @username         = UNSET_VALUE
+        @password         = UNSET_VALUE
+        @host             = UNSET_VALUE
+        @port             = UNSET_VALUE
+        @guest_port       = UNSET_VALUE
+        @max_tries        = UNSET_VALUE
+        @timeout          = UNSET_VALUE
+        @private_key_path = UNSET_VALUE
+        @forward_agent    = UNSET_VALUE
+        @forward_x11      = UNSET_VALUE
+        @shell            = UNSET_VALUE
+      end
+
+      def upgrade(new)
+        new.ssh.username         = @username if @username != UNSET_VALUE
+        new.ssh.host             = @host if @host != UNSET_VALUE
+        new.ssh.port             = @port if @port != UNSET_VALUE
+        new.ssh.guest_port       = @guest_port if @guest_port != UNSET_VALUE
+        new.ssh.max_tries        = @max_tries if @max_tries != UNSET_VALUE
+        new.ssh.timeout          = @timeout if @timeout != UNSET_VALUE
+        new.ssh.private_key_path = @private_key_path if @private_key_path != UNSET_VALUE
+        new.ssh.forward_agent    = @forward_agent if @forward_agent != UNSET_VALUE
+        new.ssh.forward_x11      = @forward_x11 if @forward_x11 != UNSET_VALUE
+        new.ssh.shell            = @shell if @shell != UNSET_VALUE
+      end
+    end
+  end
+end

data/plugins/kernel_v1/config/vagrant.rb

@@ -0,0 +1,31 @@
+require "vagrant"
+
+module VagrantPlugins
+  module Kernel_V1
+    class VagrantConfig < Vagrant.plugin("1", :config)
+      attr_accessor :dotfile_name
+      attr_accessor :host
+
+      def initialize
+        @dotfile_name = UNSET_VALUE
+        @host         = UNSET_VALUE
+      end
+
+      def finalize!
+        @dotfile_name = nil if @dotfile_name == UNSET_VALUE
+        @host = nil if @host == UNSET_VALUE
+      end
+
+      def upgrade(new)
+        new.vagrant.host = @host if @host.nil?
+
+        warnings = []
+        if @dotfile_name
+          warnings << "`config.vm.dotfile_name` has no effect anymore."
+        end
+
+        [warnings, []]
+      end
+    end
+  end
+end

data/plugins/kernel_v1/config/vm.rb

@@ -0,0 +1,184 @@
+module VagrantPlugins
+  module Kernel_V1
+    # This is the Version 1.0.x Vagrant VM configuration. This is
+    # _outdated_ and exists purely to be upgraded over to the new V2
+    # format.
+    class VMConfig < Vagrant.plugin("1", :config)
+      DEFAULT_VM_NAME = :default
+
+      attr_accessor :name
+      attr_accessor :auto_port_range
+      attr_accessor :base_mac
+      attr_accessor :boot_mode
+      attr_accessor :box
+      attr_accessor :box_url
+      attr_accessor :guest
+      attr_accessor :host_name
+      attr_reader :customizations
+      attr_reader :networks
+      attr_reader :provisioners
+      attr_reader :shared_folders
+
+      def initialize
+        @shared_folders = {}
+        @networks = []
+        @provisioners = []
+        @customizations = []
+        @define_calls = []
+      end
+
+      def forward_port(guestport, hostport, options=nil)
+        options ||= {}
+
+        # Build up the network options for V2
+        network_options = {}
+        network_options[:virtualbox__adapter] = options[:adapter]
+        network_options[:virtualbox__protocol] = options[:protocol]
+
+        # Just append the forwarded port to the networks
+        @networks << [:forwarded_port, [guestport, hostport, network_options]]
+      end
+
+      def share_folder(name, guestpath, hostpath, opts=nil)
+        @shared_folders[name] = {
+          :guestpath => guestpath.to_s,
+          :hostpath => hostpath.to_s,
+          :create => false,
+          :owner => nil,
+          :group => nil,
+          :nfs   => false,
+          :transient => false,
+          :extra => nil
+        }.merge(opts || {})
+      end
+
+      def network(type, *args)
+        if type == :hostonly
+          @networks << [:private_network, args]
+        elsif type == :bridged
+          @networks << [:public_network, args]
+        else
+          @networks << [:unknown, type]
+        end
+      end
+
+      def provision(name, options=nil, &block)
+        @provisioners << [name, options, block]
+      end
+
+      # This argument is nil only because the old style was deprecated and
+      # we didn't want to break Vagrantfiles. This was never removed and
+      # since we've moved onto V2 configuration, we might as well keep this
+      # around forever.
+      def customize(command=nil)
+        @customizations << command if command
+      end
+
+      def define(name, options=nil, &block)
+        # Force the V1 config on these calls
+        options ||= {}
+        options[:config_version] = "1"
+
+        @define_calls << [name, options, block]
+      end
+
+      def finalize!
+        # If we haven't defined a single VM, then we need to define a
+        # default VM which just inherits the rest of the configuration.
+        define(DEFAULT_VM_NAME) if defined_vm_keys.empty?
+      end
+
+      # Upgrade to a V2 configuration
+      def upgrade(new)
+        warnings = []
+
+        new.vm.base_mac          = self.base_mac if self.base_mac
+        new.vm.box               = self.box if self.box
+        new.vm.box_url           = self.box_url if self.box_url
+        new.vm.guest             = self.guest if self.guest
+        new.vm.hostname          = self.host_name if self.host_name
+        new.vm.usable_port_range = self.auto_port_range if self.auto_port_range
+
+        if self.boot_mode
+          new.vm.provider :virtualbox do |vb|
+            # Enable the GUI if the boot mode is GUI.
+            vb.gui = (self.boot_mode.to_s == "gui")
+          end
+        end
+
+        # If we have VM customizations, then we enable them on the
+        # VirtualBox provider on the new VM.
+        if !self.customizations.empty?
+          warnings << "`config.vm.customize` calls are VirtualBox-specific. If you're\n" +
+            "using any other provider, you'll have to find provider-specific configuration\n" +
+            "to translate to manually in your Vagrantfile."
+
+          new.vm.provider :virtualbox do |vb|
+            self.customizations.each do |customization|
+              vb.customize(customization)
+            end
+          end
+        end
+
+        # Re-define all networks.
+        self.networks.each do |type, args|
+          if type == :unknown
+            warnings << "Unknown network type '#{args}' will be ignored."
+            next
+          end
+
+          options = {}
+          options = args.pop.dup if args.last.is_a?(Hash)
+
+          # Determine the extra options we need to set for each type
+          if type == :forwarded_port
+            options[:guest] = args[0]
+            options[:host]  = args[1]
+          elsif type == :private_network
+            options[:ip] = args[0]
+          end
+
+          new.vm.network(type, options)
+        end
+
+        # Provisioners
+        self.provisioners.each do |name, options, block|
+          new.vm.provision(name, options, &block)
+        end
+
+        # Shared folders
+        self.shared_folders.each do |name, sf|
+          options      = sf.dup
+          options[:id] = name
+          guestpath    = options.delete(:guestpath)
+          hostpath     = options.delete(:hostpath)
+
+          # This was the name of the old default /vagrant shared folder.
+          # We warn the use that this changed, but also silently change
+          # it to try to make things work properly.
+          if options[:id] == "v-root"
+            warnings << "The 'v-root' shared folders have been renamed to 'vagrant-root'.\n" +
+              "Assuming you meant 'vagrant-root'..."
+
+            options[:id] = "vagrant-root"
+          end
+
+          new.vm.synced_folder(hostpath, guestpath, options)
+        end
+
+        # Defined sub-VMs
+        @define_calls.each do |name, options, block|
+          new.vm.define(name, options, &block)
+        end
+
+        # If name is used, warn that it has no effect anymore
+        if @name
+          warnings << "`config.vm.name` has no effect anymore. Names are derived\n" +
+            "directly from any `config.vm.define` calls."
+        end
+
+        [warnings, []]
+      end
+    end
+  end
+end