vagrantup 1.0.7 → 1.1.0

data/plugins/kernel_v2/config/vm_subvm.rb

@@ -0,0 +1,30 @@
+require "vagrant/util/stacked_proc_runner"
+
+module VagrantPlugins
+  module Kernel_V2
+    # Represents a single sub-VM in a multi-VM environment.
+    class VagrantConfigSubVM
+      include Vagrant::Util::StackedProcRunner
+
+      # Returns an array of the configuration procs in [version, proc]
+      # format.
+      #
+      # @return [Array]
+      attr_reader :config_procs
+
+      attr_reader :options
+
+      def initialize
+        @config_procs = []
+        @options      = {}
+      end
+
+      def initialize_copy(other)
+        super
+
+        @config_procs = other.config_procs.clone
+        @options      = other.options.clone
+      end
+    end
+  end
+end

data/plugins/kernel_v2/plugin.rb

@@ -0,0 +1,44 @@
+require "vagrant"
+
+module VagrantPlugins
+  module Kernel_V2
+    # This is the "kernel" of Vagrant and contains the configuration classes
+    # that make up the core of Vagrant for V2.
+    class Plugin < Vagrant.plugin("2")
+      name "kernel"
+      description <<-DESC
+      The kernel of Vagrant. This plugin contains required items for even
+      basic functionality of Vagrant version 2.
+      DESC
+
+      # Core configuration keys provided by the kernel. Note that unlike
+      # "kernel_v1", none of these configuration classes are upgradable.
+      # This is by design, since we can't be sure if they're upgradable
+      # until another version is available.
+      config("ssh") do
+        require File.expand_path("../config/ssh", __FILE__)
+        SSHConfig
+      end
+
+      config("nfs") do
+        require File.expand_path("../config/nfs", __FILE__)
+        NFSConfig
+      end
+
+      config("package") do
+        require File.expand_path("../config/package", __FILE__)
+        PackageConfig
+      end
+
+      config("vagrant") do
+        require File.expand_path("../config/vagrant", __FILE__)
+        VagrantConfig
+      end
+
+      config("vm") do
+        require File.expand_path("../config/vm", __FILE__)
+        VMConfig
+      end
+    end
+  end
+end

data/plugins/providers/virtualbox/action.rb

@@ -0,0 +1,308 @@
+require "vagrant/action/builder"
+
+module VagrantPlugins
+  module ProviderVirtualBox
+    module Action
+      autoload :Boot, File.expand_path("../action/boot", __FILE__)
+      autoload :CheckAccessible, File.expand_path("../action/check_accessible", __FILE__)
+      autoload :CheckCreated, File.expand_path("../action/check_created", __FILE__)
+      autoload :CheckGuestAdditions, File.expand_path("../action/check_guest_additions", __FILE__)
+      autoload :CheckRunning, File.expand_path("../action/check_running", __FILE__)
+      autoload :CheckVirtualbox, File.expand_path("../action/check_virtualbox", __FILE__)
+      autoload :CleanMachineFolder, File.expand_path("../action/clean_machine_folder", __FILE__)
+      autoload :ClearForwardedPorts, File.expand_path("../action/clear_forwarded_ports", __FILE__)
+      autoload :ClearNetworkInterfaces, File.expand_path("../action/clear_network_interfaces", __FILE__)
+      autoload :ClearSharedFolders, File.expand_path("../action/clear_shared_folders", __FILE__)
+      autoload :Created, File.expand_path("../action/created", __FILE__)
+      autoload :Customize, File.expand_path("../action/customize", __FILE__)
+      autoload :Destroy, File.expand_path("../action/destroy", __FILE__)
+      autoload :DestroyConfirm, File.expand_path("../action/destroy_confirm", __FILE__)
+      autoload :DestroyUnusedNetworkInterfaces, File.expand_path("../action/destroy_unused_network_interfaces", __FILE__)
+      autoload :DiscardState, File.expand_path("../action/discard_state", __FILE__)
+      autoload :Export, File.expand_path("../action/export", __FILE__)
+      autoload :ForcedHalt, File.expand_path("../action/forced_halt", __FILE__)
+      autoload :ForwardPorts, File.expand_path("../action/forward_ports", __FILE__)
+      autoload :Import, File.expand_path("../action/import", __FILE__)
+      autoload :IsPaused, File.expand_path("../action/is_paused", __FILE__)
+      autoload :IsRunning, File.expand_path("../action/is_running", __FILE__)
+      autoload :IsSaved, File.expand_path("../action/is_saved", __FILE__)
+      autoload :MatchMACAddress, File.expand_path("../action/match_mac_address", __FILE__)
+      autoload :MessageNotCreated, File.expand_path("../action/message_not_created", __FILE__)
+      autoload :MessageNotRunning, File.expand_path("../action/message_not_running", __FILE__)
+      autoload :MessageWillNotDestroy, File.expand_path("../action/message_will_not_destroy", __FILE__)
+      autoload :Network, File.expand_path("../action/network", __FILE__)
+      autoload :Package, File.expand_path("../action/package", __FILE__)
+      autoload :PackageVagrantfile, File.expand_path("../action/package_vagrantfile", __FILE__)
+      autoload :PrepareNFSSettings, File.expand_path("../action/prepare_nfs_settings", __FILE__)
+      autoload :PrepareForwardedPortCollisionParams, File.expand_path("../action/prepare_forwarded_port_collision_params", __FILE__)
+      autoload :PruneNFSExports, File.expand_path("../action/prune_nfs_exports", __FILE__)
+      autoload :Resume, File.expand_path("../action/resume", __FILE__)
+      autoload :SaneDefaults, File.expand_path("../action/sane_defaults", __FILE__)
+      autoload :SetName, File.expand_path("../action/set_name", __FILE__)
+      autoload :SetupPackageFiles, File.expand_path("../action/setup_package_files", __FILE__)
+      autoload :ShareFolders, File.expand_path("../action/share_folders", __FILE__)
+      autoload :Suspend, File.expand_path("../action/suspend", __FILE__)
+
+      # Include the built-in modules so that we can use them as top-level
+      # things.
+      include Vagrant::Action::Builtin
+
+      # This action boots the VM, assuming the VM is in a state that requires
+      # a bootup (i.e. not saved).
+      def self.action_boot
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use CheckAccessible
+          b.use CleanMachineFolder
+          b.use SetName
+          b.use ClearForwardedPorts
+          b.use Provision
+          b.use EnvSet, :port_collision_repair => true
+          b.use PrepareForwardedPortCollisionParams
+          b.use HandleForwardedPortCollisions
+          b.use PruneNFSExports
+          b.use NFS
+          b.use PrepareNFSSettings
+          b.use ClearSharedFolders
+          b.use ShareFolders
+          b.use ClearNetworkInterfaces
+          b.use Network
+          b.use ForwardPorts
+          b.use SetHostname
+          b.use SaneDefaults
+          b.use Customize
+          b.use Boot
+        end
+      end
+
+      # This is the action that is primarily responsible for completely
+      # freeing the resources of the underlying virtual machine.
+      def self.action_destroy
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use CheckVirtualbox
+          b.use Call, Created do |env1, b2|
+            if !env1[:result]
+              b2.use MessageNotCreated
+              next
+            end
+
+            b2.use Call, DestroyConfirm do |env2, b3|
+              if env2[:result]
+                b3.use ConfigValidate
+                b3.use CheckAccessible
+                b3.use EnvSet, :force_halt => true
+                b3.use action_halt
+                b3.use PruneNFSExports
+                b3.use Destroy
+                b3.use CleanMachineFolder
+                b3.use DestroyUnusedNetworkInterfaces
+              else
+                b3.use MessageWillNotDestroy
+              end
+            end
+          end
+        end
+      end
+
+      # This is the action that is primarily responsible for halting
+      # the virtual machine, gracefully or by force.
+      def self.action_halt
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use CheckVirtualbox
+          b.use Call, Created do |env, b2|
+            if env[:result]
+              b2.use CheckAccessible
+              b2.use DiscardState
+
+              b2.use Call, IsPaused do |env2, b3|
+                next if !env2[:result]
+                b3.use Resume
+              end
+
+              b2.use Call, GracefulHalt, :poweroff, :running do |env2, b3|
+                if !env2[:result]
+                  b3.use ForcedHalt
+                end
+              end
+            else
+              b2.use MessageNotCreated
+            end
+          end
+        end
+      end
+
+      # This action packages the virtual machine into a single box file.
+      def self.action_package
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use CheckVirtualbox
+          b.use Call, Created do |env1, b2|
+            if !env1[:result]
+              b2.use MessageNotCreated
+              next
+            end
+
+            b2.use SetupPackageFiles
+            b2.use CheckAccessible
+            b2.use action_halt
+            b2.use ClearForwardedPorts
+            b2.use ClearSharedFolders
+            b2.use Export
+            b2.use PackageVagrantfile
+            b2.use Package
+          end
+        end
+      end
+
+      # This action just runs the provisioners on the machine.
+      def self.action_provision
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use CheckVirtualbox
+          b.use ConfigValidate
+          b.use Call, Created do |env1, b2|
+            if !env1[:result]
+              b2.use MessageNotCreated
+              next
+            end
+
+            b2.use Call, IsRunning do |env2, b3|
+              if !env2[:result]
+                b3.use MessageNotRunning
+                next
+              end
+
+              b3.use CheckAccessible
+              b3.use Provision
+            end
+          end
+        end
+      end
+
+      # This action is responsible for reloading the machine, which
+      # brings it down, sucks in new configuration, and brings the
+      # machine back up with the new configuration.
+      def self.action_reload
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use CheckVirtualbox
+          b.use Call, Created do |env1, b2|
+            if !env1[:result]
+              b2.use MessageNotCreated
+              next
+            end
+
+            b2.use ConfigValidate
+            b2.use action_halt
+            b2.use action_start
+          end
+        end
+      end
+
+      # This is the action that is primarily responsible for resuming
+      # suspended machines.
+      def self.action_resume
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use CheckVirtualbox
+          b.use Call, Created do |env, b2|
+            if env[:result]
+              b2.use CheckAccessible
+              b2.use EnvSet, :port_collision_repair => false
+              b2.use PrepareForwardedPortCollisionParams
+              b2.use HandleForwardedPortCollisions
+              b2.use Resume
+            else
+              b2.use MessageNotCreated
+            end
+          end
+        end
+      end
+
+      # This is the action that will exec into an SSH shell.
+      def self.action_ssh
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use CheckVirtualbox
+          b.use CheckCreated
+          b.use CheckAccessible
+          b.use CheckRunning
+          b.use SSHExec
+        end
+      end
+
+      # This is the action that will run a single SSH command.
+      def self.action_ssh_run
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use CheckVirtualbox
+          b.use CheckCreated
+          b.use CheckAccessible
+          b.use CheckRunning
+          b.use SSHRun
+        end
+      end
+
+      # This action starts a VM, assuming it is already imported and exists.
+      # A precondition of this action is that the VM exists.
+      def self.action_start
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use CheckVirtualbox
+          b.use ConfigValidate
+          b.use Call, IsRunning do |env, b2|
+            # If the VM is running, then our work here is done, exit
+            next if env[:result]
+
+            b2.use Call, IsSaved do |env2, b3|
+              if env2[:result]
+                # The VM is saved, so just resume it
+                b3.use action_resume
+                next
+              end
+
+              b3.use Call, IsPaused do |env3, b4|
+                if env3[:result]
+                  b4.use Resume
+                  next
+                end
+
+                # The VM is not saved, so we must have to boot it up
+                # like normal. Boot!
+                b4.use action_boot
+              end
+            end
+          end
+        end
+      end
+
+      # This is the action that is primarily responsible for suspending
+      # the virtual machine.
+      def self.action_suspend
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use CheckVirtualbox
+          b.use Call, Created do |env, b2|
+            if env[:result]
+              b2.use CheckAccessible
+              b2.use Suspend
+            else
+              b2.use MessageNotCreated
+            end
+          end
+        end
+      end
+
+      # This action brings the machine up from nothing, including importing
+      # the box, configuring metadata, and booting.
+      def self.action_up
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use CheckVirtualbox
+          b.use ConfigValidate
+          b.use Call, Created do |env, b2|
+            # If the VM is NOT created yet, then do the setup steps
+            if !env[:result]
+              b2.use CheckAccessible
+              b2.use HandleBoxUrl
+              b2.use Import
+              b2.use CheckGuestAdditions
+              b2.use MatchMACAddress
+            end
+          end
+          b.use action_start
+        end
+      end
+    end
+  end
+end

data/{lib/vagrant/action/vm → plugins/providers/virtualbox/action}/boot.rb

@@ -1,32 +1,29 @@
-module Vagrant
-  module Action
-    module VM
+module VagrantPlugins
+  module ProviderVirtualBox
+    module Action
       class Boot
         def initialize(app, env)
           @app = app
-          @env = env
         end
 
         def call(env)
           @env = env
 
+          boot_mode = @env[:machine].provider_config.gui ? "gui" : "headless"
+
           # Start up the VM and wait for it to boot.
-          boot
-          raise Errors::VMFailedToBoot if !wait_for_boot
+          env[:ui].info I18n.t("vagrant.actions.vm.boot.booting")
+          env[:machine].provider.driver.start(boot_mode)
+          raise Vagrant::Errors::VMFailedToBoot if !wait_for_boot
 
           @app.call(env)
         end
 
-        def boot
-          @env[:ui].info I18n.t("vagrant.actions.vm.boot.booting")
-          @env[:vm].driver.start(@env[:vm].config.vm.boot_mode)
-        end
-
         def wait_for_boot
           @env[:ui].info I18n.t("vagrant.actions.vm.boot.waiting")
 
-          @env[:vm].config.ssh.max_tries.to_i.times do |i|
-            if @env[:vm].channel.ready?
+          @env[:machine].config.ssh.max_tries.to_i.times do |i|
+            if @env[:machine].communicate.ready?
               @env[:ui].info I18n.t("vagrant.actions.vm.boot.ready")
               return true
             end
@@ -37,8 +34,8 @@ module Vagrant
 
             # If the VM is not starting or running, something went wrong
             # and we need to show a useful error.
-            state = @env[:vm].state
-            raise Errors::VMFailedToRun if state != :starting && state != :running
+            state = @env[:machine].provider.state.id
+            raise Vagrant::Errors::VMFailedToRun if state != :starting && state != :running
 
             sleep 2 if !@env["vagrant.test"]
           end
@@ -50,4 +47,3 @@ module Vagrant
     end
   end
 end
-

data/{lib/vagrant/action/vm → plugins/providers/virtualbox/action}/check_accessible.rb

@@ -1,18 +1,18 @@
-module Vagrant
-  module Action
-    module VM
+module VagrantPlugins
+  module ProviderVirtualBox
+    module Action
       class CheckAccessible
         def initialize(app, env)
           @app = app
         end
 
         def call(env)
-          if env[:vm].state == :inaccessible
+          if env[:machine].state.id == :inaccessible
             # The VM we are attempting to manipulate is inaccessible. This
             # is a very bad situation and can only be fixed by the user. It
             # also prohibits us from actually doing anything with the virtual
             # machine, so we raise an error.
-            raise Errors::VMInaccessible
+            raise Vagrant::Errors::VMInaccessible
           end
 
           @app.call(env)