vagrant 0.8.10 → 0.9.0

data/lib/vagrant/version.rb

@@ -2,5 +2,5 @@ module Vagrant
   # This will always be up to date with the current version of Vagrant,
   # since it is used to generate the gemspec and is also the source of
   # the version for `vagrant -v`
-  VERSION = "0.8.10"
+  VERSION = "0.9.0"
 end

data/lib/vagrant/vm.rb

@@ -1,100 +1,98 @@
+require 'log4r'
+
 module Vagrant
   class VM
     include Vagrant::Util
 
+    attr_reader :uuid
     attr_reader :env
     attr_reader :name
     attr_reader :vm
-
-    class << self
-      # Finds a virtual machine by a given UUID and either returns
-      # a Vagrant::VM object or returns nil.
-      def find(uuid, env=nil, name=nil)
-        vm = VirtualBox::VM.find(uuid)
-        new(:vm => vm, :env => env, :name => name)
+    attr_reader :box
+    attr_reader :config
+    attr_reader :driver
+
+    def initialize(name, env, config, opts=nil)
+      @logger = Log4r::Logger.new("vagrant::vm")
+
+      @name   = name
+      @vm     = nil
+      @env    = env
+      @config = config
+      @box    = env.boxes.find(config.vm.box)
+
+      opts ||= {}
+      if opts[:base]
+        # The name is the ID we use.
+        @uuid = name
+      else
+        # Load the UUID if its saved.
+        active = env.local_data[:active] || {}
+        @uuid = active[@name.to_s]
       end
-    end
-
-    def initialize(opts=nil)
-      defaults = {
-        :vm => nil,
-        :env => nil,
-        :name => nil
-      }
 
-      opts = defaults.merge(opts || {})
+      # Reload ourselves to get the state
+      reload!
 
-      @vm = opts[:vm]
-      @name = opts[:name]
-
-      if !opts[:env].nil?
-        # We have an environment, so we create a new child environment
-        # specifically for this VM. This step will load any custom
-        # config and such.
-        @env = Vagrant::Environment.new({
-          :cwd => opts[:env].cwd,
-          :parent => opts[:env],
-          :vm => self
-        }).load!
-
-        # Load the associated system.
-        load_system!
-      end
-
-      @loaded_system_distro = false
+      # Load the associated guest.
+      load_guest!
+      @loaded_guest_distro = false
     end
 
-    # Loads the system associated with the VM. The system class is
+    # Loads the guest associated with the VM. The guest class is
     # responsible for OS-specific functionality. More information
-    # can be found by reading the documentation on {Vagrant::Systems::Base}.
+    # can be found by reading the documentation on {Vagrant::Guest::Base}.
     #
     # **This method should never be called manually.**
-    def load_system!(system=nil)
-      system ||= env.config.vm.system
-      env.logger.info("vm: #{name}") { "Loading system: #{system}" }
-
-      if system.is_a?(Class)
-        raise Errors::VMSystemError, :_key => :invalid_class, :system => system.to_s if !(system <= Systems::Base)
-        @system = system.new(self)
-      elsif system.is_a?(Symbol)
-        # Hard-coded internal systems
-        mapping = {
-          :debian  => Systems::Debian,
-          :ubuntu  => Systems::Ubuntu,
-          :freebsd => Systems::FreeBSD,
-          :gentoo  => Systems::Gentoo,
-          :redhat  => Systems::Redhat,
-          :suse    => Systems::Suse,
-          :linux   => Systems::Linux,
-          :solaris => Systems::Solaris,
-          :arch    => Systems::Arch
-        }
-
-        raise Errors::VMSystemError, :_key => :unknown_type, :system => system.to_s if !mapping.has_key?(system)
-        @system = mapping[system].new(self)
+    def load_guest!(guest=nil)
+      guest ||= config.vm.guest
+      @logger.info("Loading guest: #{guest}")
+
+      if guest.is_a?(Class)
+        raise Errors::VMGuestError, :_key => :invalid_class, :system => guest.to_s if !(guest <= Systems::Base)
+        @guest = guest.new(self)
+      elsif guest.is_a?(Symbol)
+        guest_klass = Vagrant.guests.get(guest)
+        raise Errors::VMGuestError, :_key => :unknown_type, :system => guest.to_s if !guest_klass
+        @guest = guest_klass.new(self)
       else
-        raise Errors::VMSystemError, :unspecified
+        raise Errors::VMGuestError, :unspecified
       end
     end
 
-    # Returns the system for this VM, loading the distro of the system if
+    # Returns a channel object to communicate with the virtual
+    # machine.
+    def channel
+      @channel ||= Communication::SSH.new(self)
+    end
+
+    # Returns the guest for this VM, loading the distro of the system if
     # we can.
-    def system
-      if !@loaded_system_distro && created? && vm.running?
-        # Load the system distro for the first time
-        result = @system.distro_dispatch
-        load_system!(result)
-        @loaded_system_distro = true
+    def guest
+      if !@loaded_guest_distro && state == :running
+        # Load the guest distro for the first time
+        result = @guest.distro_dispatch
+        load_guest!(result)
+        @loaded_guest_distro = true
       end
 
-      @system
+      @guest
     end
 
-    # Access the {Vagrant::SSH} object associated with this VM.
-    # On the initial call, this will initialize the object. On
-    # subsequent calls it will reuse the existing object.
+    # Access the {Vagrant::SSH} object associated with this VM, which
+    # is used to get SSH credentials with the virtual machine.
     def ssh
-      @ssh ||= SSH.new(env)
+      @ssh ||= SSH.new(self)
+    end
+
+    # Returns the state of the VM as a symbol.
+    #
+    # @return [Symbol]
+    def state
+      return :not_created if !@uuid
+      state = @driver.read_state
+      return :not_created if !state
+      return state
     end
 
     # Returns a boolean true if the VM has been created, otherwise
@@ -102,19 +100,17 @@ module Vagrant
     #
     # @return [Boolean]
     def created?
-      !vm.nil?
+      state != :not_created
     end
 
     # Sets the currently active VM for this VM. If the VM is a valid,
     # created virtual machine, then it will also update the local data
     # to persist the VM. Otherwise, it will remove itself from the
     # local data (if it exists).
-    def vm=(value)
-      @vm = value
+    def uuid=(value)
       env.local_data[:active] ||= {}
-
-      if value && value.uuid
-        env.local_data[:active][name.to_s] = value.uuid
+      if value
+        env.local_data[:active][name.to_s] = value
       else
         env.local_data[:active].delete(name.to_s)
       end
@@ -122,60 +118,78 @@ module Vagrant
       # Commit the local data so that the next time vagrant is initialized,
       # it realizes the VM exists
       env.local_data.commit
-    end
 
-    def uuid
-      vm ? vm.uuid : nil
+      # Store the uuid and reload the instance
+      @uuid = value
+      reload!
     end
 
     def reload!
-      @vm = VirtualBox::VM.find(@vm.uuid)
+      begin
+        @driver = Driver::VirtualBox.new(@uuid)
+      rescue Driver::VirtualBox::VMNotFound
+        # Clear the UUID since this VM doesn't exist. Note that this calls
+        # back into `reload!` but shouldn't ever result in infinite
+        # recursion since `@uuid` will be nil.
+        self.uuid = nil
+      end
     end
 
     def package(options=nil)
-      env.actions.run(:package, { "validate" => false }.merge(options || {}))
+      run_action(:package, { "validate" => false }.merge(options || {}))
     end
 
     def up(options=nil)
-      env.actions.run(:up, options)
+      run_action(:up, options)
     end
 
     def start(options=nil)
-      raise Errors::VMInaccessible if !@vm.accessible?
-      return if @vm.running?
-      return resume if @vm.saved?
+      return if state == :running
+      return resume if state == :saved
 
-      env.actions.run(:start, options)
+      run_action(:start, options)
     end
 
     def halt(options=nil)
-      env.actions.run(:halt, options)
+      run_action(:halt, options)
     end
 
     def reload
-      env.actions.run(:reload)
+      run_action(:reload)
     end
 
     def provision
-      env.actions.run(:provision)
+      run_action(:provision)
     end
 
     def destroy
-      env.actions.run(:destroy)
+      run_action(:destroy)
     end
 
     def suspend
-      env.actions.run(:suspend)
+      run_action(:suspend)
     end
 
     def resume
-      env.actions.run(:resume)
+      run_action(:resume)
     end
 
-    def saved?
-      @vm.saved?
+    def ui
+      return @_ui if defined?(@_ui)
+      @_ui = @env.ui.dup
+      @_ui.resource = @name
+      @_ui
     end
 
-    def powered_off?; @vm.powered_off? end
+    protected
+
+    def run_action(name, options=nil)
+      options = {
+        :vm => self,
+        :ui => ui
+      }.merge(options || {})
+
+      env.action_runner.run(name, options)
+    end
   end
 end

data/tasks/acceptance.rake

@@ -12,7 +12,7 @@ namespace :acceptance do
   desc "Downloads the boxes required for running the acceptance tests."
   task :boxes, :directory do |t, args|
     # Create the directory where the boxes will be downloaded
-    box_dir = Pathname.new(args[:directory] || File.expand_path("../../test/tmp/boxes", __FILE__))
+    box_dir = Pathname.new(args[:directory] || File.expand_path("../../boxes", __FILE__))
     box_dir.mkpath
     puts "Boxes will be placed in: #{box_dir}"
 
@@ -73,10 +73,10 @@ namespace :acceptance do
   desc "Generates the configuration for acceptance tests from current source."
   task :config, :box_dir do |t, args|
     require File.expand_path("../../lib/vagrant/version", __FILE__)
-    require File.expand_path('../../test/acceptance/support/tempdir', __FILE__)
+    require File.expand_path('../../test/support/tempdir', __FILE__)
 
     # Get the directory for the boxes
-    box_dir = Pathname.new(args[:box_dir] || File.expand_path("../../test/tmp/boxes", __FILE__))
+    box_dir = Pathname.new(args[:box_dir] || File.expand_path("../../boxes", __FILE__))
 
     # Generate the binstubs for the Vagrant binary
     tempdir = Tempdir.new

data/tasks/test.rake

@@ -2,12 +2,17 @@ require 'rake/testtask'
 require 'rspec/core/rake_task'
 
 namespace :test do
-  Rake::TestTask.new do |t|
+  RSpec::Core::RakeTask.new do |t|
     t.name = "unit"
-    t.libs << "test/unit"
     t.pattern = "test/unit/**/*_test.rb"
   end
 
+  Rake::TestTask.new do |t|
+    t.name = "unit_old"
+    t.libs << "test/unit_legacy"
+    t.pattern = "test/unit_legacy/**/*_test.rb"
+  end
+
   RSpec::Core::RakeTask.new do |t|
     t.name = "acceptance"
     t.pattern = "test/acceptance/**/*_test.rb"

data/templates/commands/init/Vagrantfile.erb

@@ -16,13 +16,20 @@ Vagrant::Config.run do |config|
   # Boot with a GUI so you can see the screen. (Default is headless)
   # config.vm.boot_mode = :gui
 
-  # Assign this VM to a host only network IP, allowing you to access it
-  # via the IP.
-  # config.vm.network "33.33.33.10"
+  # Assign this VM to a host-only network IP, allowing you to access it
+  # via the IP. Host-only networks can talk to the host machine as well as
+  # any other machines on the same network, but cannot be accessed (through this
+  # network interface) by any external networks.
+  # config.vm.network :hostonly, "33.33.33.10"
+
+  # Assign this VM to a bridged network, allowing you to connect directly to a
+  # network using the host's network device. This makes the VM appear as another
+  # physical device on your network.
+  # config.vm.network :bridged
 
   # Forward a port from the guest to the host, which allows for outside
   # computers to access the VM, whereas host only networking does not.
-  # config.vm.forward_port "http", 80, 8080
+  # config.vm.forward_port 80, 8080
 
   # Share an additional folder to the guest VM. The first argument is
   # an identifier, the second is the path on the guest to mount the

data/templates/guests/arch/network_dhcp.erb

@@ -0,0 +1,7 @@
+#VAGRANT-BEGIN
+# The contents below are automatically generated by Vagrant. Do not modify.
+interface=eth<%= options[:interface] %>
+address=
+netmask=
+gateway=
+#VAGRANT-END

data/templates/guests/arch/network_static.erb

@@ -0,0 +1,7 @@
+#VAGRANT-BEGIN
+# The contents below are automatically generated by Vagrant. Do not modify.
+interface=eth<%= options[:interface] %>
+address=<%= options[:ip]%>
+netmask=<%= options[:netmask] %>
+gateway=
+#VAGRANT-END

data/templates/guests/debian/network_dhcp.erb

@@ -0,0 +1,6 @@
+#VAGRANT-BEGIN
+# The contents below are automatically generated by Vagrant. Do not modify.
+auto eth<%= options[:interface] %>
+iface eth<%= options[:interface] %> inet dhcp
+    post-up route del default dev $IFACE
+#VAGRANT-END

data/templates/guests/debian/network_static.erb

@@ -0,0 +1,7 @@
+#VAGRANT-BEGIN
+# The contents below are automatically generated by Vagrant. Do not modify.
+auto eth<%= options[:interface] %>
+iface eth<%= options[:interface] %> inet static
+      address <%= options[:ip] %>
+      netmask <%= options[:netmask] %>
+#VAGRANT-END

data/templates/guests/gentoo/network_dhcp.erb

@@ -0,0 +1,4 @@
+#VAGRANT-BEGIN
+# The contents below are automatically generated by Vagrant. Do not modify.
+config_eth<%= options[:interface] %>="dhcp"
+#VAGRANT-END

data/templates/guests/gentoo/network_static.erb

@@ -0,0 +1,4 @@
+#VAGRANT-BEGIN
+# The contents below are automatically generated by Vagrant. Do not modify.
+config_eth<%= options[:interface] %>=("<%= options[:ip] %> netmask <%= options[:netmask] %>")
+#VAGRANT-END

data/templates/guests/redhat/network_dhcp.erb

@@ -0,0 +1,6 @@
+#VAGRANT-BEGIN
+# The contents below are automatically generated by Vagrant. Do not modify.
+BOOTPROTO=dhcp
+ONBOOT=yes
+DEVICE=eth<%= options[:interface] %>
+#VAGRANT-END

data/templates/guests/redhat/network_static.erb

@@ -0,0 +1,7 @@
+#VAGRANT-BEGIN
+# The contents below are automatically generated by Vagrant. Do not modify.
+BOOTPROTO=static
+IPADDR=<%= options[:ip] %>
+NETMASK=<%= options[:netmask] %>
+DEVICE=eth<%= options[:interface] %>
+#VAGRANT-END

data/templates/locales/en.yml

@@ -1,7 +1,6 @@
 en:
   vagrant:
     general:
-      creating_home_dir: "Creating home directory since it doesn't exist: %{directory}"
       moving_home_dir: "Moving old Vagrant home directory to new location: %{directory}"
       home_dir_migration_failed: |-
         Both an old and new Vagrant home directory exist. Only the new one will
@@ -27,12 +26,21 @@ en:
       puppetd_not_detected: |-
         The `puppetd` binary was not found on the VM is required for Puppet Server provisioning.
         Please verify that Puppet is installed and that the binary is available on the PATH.
-      cli_missing_env: This command requires that a Vagrant environment be properly passed in as the last parameter.
+      cli_invalid_options: |-
+        An invalid option was specified. The help for this command
+        is available below.
+
+        %{help}
       config_validation: |-
         There was a problem with the configuration of Vagrant. The error message(s)
         are printed below:
 
         %{messages}
+      deprecation: |-
+        You are using a feature that has been removed in this version. Explanation:
+
+        %{message}
+        Note that this error message will not appear in the next version of Vagrant.
       dotfile_is_directory: |-
         The local file Vagrant uses to store data ".vagrant" already exists
         and is a directory! If you are in your home directory, then please run
@@ -44,10 +52,49 @@ en:
         may run at any given time to avoid problems with VirtualBox inconsistencies
         occurring. Please wait for the other instance of Vagrant to end and then
         try again.
-      interrupted: "Vagrant exited after cleanup due to external interrupt."
-      multi_vm_required: "A multi-vm environment is required for name specification to this command."
-      multi_vm_target_required: "`vagrant %{command}` requires a specific VM name to target in a multi-VM environment."
-      no_env: "No Vagrant environment detected. Run `vagrant init` to set one up."
+      guest:
+        invalid_class: |-
+          The specified guest class does not inherit from `Vagrant::Guest::Base`.
+          The specified guest class must inherit from this class.
+
+          The specified guest class was: %{guest}
+        unknown_type: |-
+          The specified guest type is unknown: %{guest}. Please change this
+          to a proper value.
+        unspecified: |-
+          A VM guest type must be specified! This is done via the `config.vm.guest`
+          configuration value. Please read the documentation online for more information.
+      home_dir_not_accessible: |-
+        The home directory you specified is not accessible. The home
+        directory that Vagrant uses must be both readable and writable.
+
+        You specified: %{home_path}
+      interrupted: |-
+        Vagrant exited after cleanup due to external interrupt.
+      multi_vm_required: |-
+        A multi-vm environment is required for name specification to this command.
+      multi_vm_target_required: |-
+        This command requires a specific VM name to target in a multi-VM environment.
+      no_env: |-
+        A Vagrant environment is required to run this command. Run `vagrant init`
+        to set one up.
+      port_collision_resume: |-
+        This VM cannot be resumed, because the forwarded ports would collide with
+        another running virtual machine. Normally, Vagrant will attempt to fix this
+        for you but VirtualBox only allows forwarded ports to change if the VM is
+        powered off. Therefore, please reload your VM or halt the other running
+        VMs to continue.
+      scp_unavailable: |-
+        SSH server on the guest doesn't support SCP. Please install the necessary
+        software to enable SCP on your guest operating system.
+      shared_folder_create_failed: |-
+        Failed to create the following shared folder on the host system. This is
+        usually because Vagrant does not have sufficient permissions to create
+        the folder.
+
+        %{path}
+
+        Please create the folder manually or specify another path to share.
       ssh_authentication_failed: |-
         SSH authentication failed! This is typically caused by the public/private
         keypair for the SSH user not being properly set on the guest VM. Please
@@ -58,10 +105,6 @@ en:
         Vagrant assumes that this means the command failed!
 
         %{command}
-
-        The output of the command prior to failing is outputted below:
-
-        %{output}
       ssh_connection_refused: |-
         SSH connection was refused! This usually happens if the VM failed to
         boot properly. Some steps to try to fix this: First, try reloading your
@@ -77,80 +120,66 @@ en:
 
         %{key_path}
       ssh_port_not_detected: |-
-        Vagrant couldn't determine the SSH port for your VM! This is a rare,
-        exceptional event, and a bug should be filed. Please try recreating your
-        VM (vagrant destroy, then vagrant up). Sorry!
-      ssh_unavailable: "`ssh` binary could not be found. Is an SSH client installed?"
-      ssh_unavailable_windows: |-
-        `vagrant ssh` isn't available on the Windows platform. The
-        vagrant.ppk file for use with Putty is available at:
-
-          %{key_path}.ppk
+        Vagrant couldn't determine the SSH port for your VM! Vagrant attempts to
+        automatically find a forwarded port that matches your `config.ssh.guest_port`
+        (default: 22) value and uses this for SSH. Alternatively, if `config.ssh.port`
+        is set, it will use this.
 
-        To use this create a new Putty session for `vagrant@localhost`
-        on port `%{ssh_port}`, in the Connection>SSH>Auth
-        configuration section navigate to the vagrant.ppk file,
-        select it, save the session for later use, and connect.
+        However, in this case Vagrant was unable to find a forwarded port that matches
+        the guest port and `config.ssh.port` is not set!
 
-        For a more detailed guide please consult:
-
-          http://vagrantup.com/docs/getting-started/setup/windows.html
-
-      system:
-        invalid_class: |-
-          The specified system does not inherit from `Vagrant::Systems::Base`. The
-          specified system class must inherit from this class.
-
-          The specified system class was: %{system}
-        unknown_type: |-
-          The specified system type is unknown: %{system}. Please change this
-          to a proper value.
-        unspecified: |-
-          A VM system type must be specified! This is done via the `config.vm.system`
-          configuration value. Please read the documentation online for more information.
+        Please make sure that you have a forwarded port that goes to the configured
+        guest port value, or specify an explicit SSH port with `config.ssh.port`.
+      ssh_unavailable: "`ssh` binary could not be found. Is an SSH client installed?"
+      ssh_unavailable_windows: |-
+        `vagrant ssh` isn't available on the Windows platform. You are still able
+        to SSH into the virtual machine if you get a Windows SSH client (such as
+        PuTTY). The authentication information is shown below:
+
+        Host: %{host}
+        Port: %{port}
+        Username: %{username}
+        Private key: %{key_path}
+      vagrantfile_exists: |-
+        `Vagrantfile` already exists in this directory. Remove it before
+        running `vagrant init`.
       vagrantfile_syntax_error: |-
         There is a syntax error in the following Vagrantfile. The syntax error
         message is reproduced below for convenience:
 
         %{file}
-      virtualbox_invalid_version: |-
-        Vagrant has detected that you have VirtualBox version %{version} installed!
-        Vagrant requires that you use at least VirtualBox version 4.1. Please install
-        a more recent version of VirtualBox to continue.
+      vboxmanage_error: |-
+        There was an error executing the following command with VBoxManage:
+
+        %{command}
 
-        Early versions of Vagrant support earlier versions of VirtualBox. Specifically,
-        the 0.7.x series supports VirtualBox 4.0.x and the 0.6.x series supports VirtualBox
-        3.2.x. Please use the version you need.
+        For more information on the failure, enable detailed logging with
+        VAGRANT_LOG.
+      virtualbox_invalid_version: |-
+        Vagrant has detected that you have a version of VirtualBox installed
+        that is not supported. Please install one of the supported versions
+        listed below to use Vagrant:
 
-        Any newer versions may not be supported yet. Please check the mailing list
-        for any announcements of newer versions.
+        %{supported_versions}
       virtualbox_not_detected: |-
         Vagrant could not detect VirtualBox! Make sure VirtualBox is properly installed.
-        If VirtualBox is installed, it may be an incorrect version. Vagrant currently
-        requires VirtualBox 4.1.x. Please install the proper version to continue.
-
-        If you have an older or newer version of VirtualBox, please make sure you're
-        using the proper version of Vagrant. Ask the mailing list if you have questions.
-      virtualbox_not_detected_win64: |-
-        Vagrant could not detect VirtualBox! Make sure VirtualBox is properly installed
-        with version 4.0.0 or higher.
-
-        Additionally, it appears you're on 64-bit Windows. If this is the case, and
-        VirtualBox is properly installed with the correct version, then please make
-        sure you're running Vagrant via JRuby on a 64-bit Java runtime. For more
-        information on how to set this up and how to verify it is properly setup,
-        please view the guide online at:
-
-          http://vagrantup.com/docs/getting-started/setup/windows_x64.html
-
-      vm_creation_required: "VM must be created before running this command. Run `vagrant up` first."
+        Vagrant uses the `VBoxManage` binary that ships with VirtualBox, and requires
+        this to be available on the PATH. If VirtualBox is installed, please find the
+        `VBoxManage` binary and add it to the PATH environmental variable.
+      vm_creation_required: |-
+        VM must be created before running this command. Run `vagrant up` first.
       vm_inaccessible: |-
         Your VM has become "inaccessible." Unfortunately, this is a critical error
         with VirtualBox that Vagrant can not cleanly recover from. Please open VirtualBox
         and clear out your inaccessible virtual machines or find a way to fix
         them.
-      vm_not_found: "A VM by the name of %{name} was not found."
-      vm_not_running: "VM must be running to open SSH connection."
+      vm_no_match: |-
+        No virtual machines matched the regular expression given.
+      vm_not_found: |-
+        A VM by the name of %{name} was not found.
+      vm_not_running: |-
+        VM must be running to open SSH connection. Run `vagrant up`
+        to start the virtual machine.
 
 #-------------------------------------------------------------------------------
 # Translations for config validation errors
@@ -167,17 +196,22 @@ en:
         private_key_missing: "`private_key_path` file must exist: %{path}"
       vm:
         base_mac_invalid: "Base MAC address for eth0/NAT must be set. Contact box maintainer for more information."
-        boot_mode_invalid: "Boot mode must be one of: vrdp or gui"
+        boot_mode_invalid: "Boot mode must be one of: headless or gui"
         box_missing: "A box must be specified."
         box_not_found: "The box '%{name}' could not be found."
-        network_ip_invalid: "The host only network IP '%{ip}' is invalid."
+        network_invalid: |-
+          The network type '%{type}' is not valid. Please use
+          'hostonly' or 'bridged'.
+        network_ip_required: |-
+          Host only networks require an IP as an argument.
+        network_ip_invalid: |-
+          The host only network IP '%{ip}' is invalid.
         network_ip_ends_one: |-
           The host only network IP '%{ip}' must not end in a 1, as this
           is reserved for the host machine.
         shared_folder_hostpath_missing: "Shared folder host path for '%{name}' doesn't exist: %{path}"
         shared_folder_nfs_owner_group: |-
           Shared folder '%{name}': NFS does not support the owner/group settings.
-        provisioner_chef_server_changed: "The provisioner 'chef_server' is now 'chef_client'"
         provisioner_not_found: "The provisioner '%{shortcut}' doesn't exist."
         provisioner_invalid_class: "The provisioner '%{shortcut}' must inherit from `Vagrant::Provisioners::Base`."
 
@@ -190,6 +224,12 @@ en:
         vm_not_running: "VM is not currently running. Please bring it up to run this command."
       box:
         no_installed_boxes: "There are no installed boxes! Use `vagrant box add` to add some."
+      init:
+        success: |-
+          A `Vagrantfile` has been placed in this directory. You are now
+          ready to `vagrant up` your first virtual environment! Please read
+          the comments in the Vagrantfile as well as documentation on
+          `vagrantup.com` for more information on using Vagrant.
       status:
         aborted: |-
           The VM is in an aborted state. This means that it was abruptly
@@ -210,13 +250,15 @@ en:
         not_created: |-
           The environment has not yet been created. Run `vagrant up` to
           create the environment.
-        powered_off: The VM is powered off. To restart the VM, simply run `vagrant up`
+        poweroff: |-
+          The VM is powered off. To restart the VM, simply run `vagrant up`
         running: |-
           The VM is running. To stop this VM, you can run `vagrant halt` to
           shut it down forcefully, or you can run `vagrant suspend` to simply
           suspend the virtual machine. In either case, to restart it again,
           simply run `vagrant up`.
-        saved: To resume this VM, simply run `vagrant up`.
+        saved: |-
+          To resume this VM, simply run `vagrant up`.
         stuck: |-
           The VM is "stuck!" This is a very rare state which means that
           VirtualBox is unable to recover the current state of the VM.
@@ -228,18 +270,6 @@ en:
           VM, run `vagrant status NAME`.
       up:
         vm_created: "VM already created. Booting if it's not already running..."
-      upgrade_to_060:
-        already_done: "Environment appears to already be upgraded to 0.6.0. Doing nothing!"
-        ask: "Are you sure you want to execute this command?"
-        backing_up: "Backing up previous .vagrant file..."
-        complete: "Environment upgraded to 0.6.0 successfully."
-        info: |-
-          This command will upgrade the current environment from a pre-0.6.0
-          environment to a 0.6.x compatible environment. Running this command
-          multiple times should be okay. This command will make a backup file
-          prior to making any changes. Therefore, if anything goes wrong, then
-          restore that file to ".vagrant" in the same directory as the Vagrantfile.
-        quit: "Not executing this command by user request. Quitting..."
       version:
         output: "Vagrant version %{version}"
 
@@ -259,6 +289,15 @@ en:
           failed_to_boot: |-
             Failed to connect to VM via SSH. Please verify the VM successfully booted
             by looking at the VirtualBox GUI.
+        bridged_networking:
+          available: |-
+            Available bridged network interfaces:
+          bridging: |-
+            Bridging adapter #%{adapter} to '%{bridge}'
+          enabling: |-
+            Enabling bridged network...
+          preparing: |-
+            Preparing bridged networking...
         check_box:
           not_found: Box %{name} was not found. Fetching box from specified URL...
           not_specified: |-
@@ -290,9 +329,21 @@ en:
             VirtualBox Version: %{virtualbox_version}
         clear_forward_ports:
           deleting: Clearing any previously set forwarded ports...
+        clear_network_interfaces:
+          deleting: Clearing any previously set network interfaces...
         clear_shared_folders:
           deleting: Cleaning previously set shared folders...
         customize:
+          failure: |-
+            A customization command failed:
+
+            %{command}
+
+            The following error was experienced:
+
+            %{error}
+
+            Please fix this customization and try again.
           running: Running any VM customizations...
         destroy:
           destroying: Destroying VM and associated drives...
@@ -313,24 +364,25 @@ en:
             auto-correction range are all also used.
 
             VM: %{vm_name}
-            Forwarded port: %{name} (%{guest_port} => %{host_port})
+            Forwarded port: %{guest_port} => %{host_port}
           collision_error: |-
             Vagrant cannot forward the specified ports on this VM, since they
             would collide with another VirtualBox virtual machine's forwarded
-            ports! The '%{name}' forwarded port (%{host_port}) is already in use on the host
+            ports! The forwarded port to %{host_port} is already in use on the host
             machine.
 
             To fix this, modify your current projects Vagrantfile to use another
             port. Example, where '1234' would be replaced by a unique host port:
 
-              config.vm.forward_port("%{name}", %{guest_port}, 1234)
+              config.vm.forward_port %{guest_port}, 1234
 
-          fixed_collision: Fixed port collision '%{name}'. Now on port %{new_port}.
+          fixed_collision: |-
+            Fixed port collision for %{guest_port} => %{host_port}. Now on port %{new_port}.
           forwarding: Forwarding ports...
-          forwarding_entry: "-- %{name}: %{guest_port} => %{host_port} (adapter %{adapter})"
+          forwarding_entry: |-
+            -- %{guest_port} => %{host_port} (adapter %{adapter})
           non_nat: |-
-            VirtualBox adapter #%{adapter} not configured as "NAT"
-            Skipping port forwarding '%{name}'.
+            VirtualBox adapter #%{adapter} not configured as "NAT". Skipping: '%{name}'.
           privileged_ports: |-
             You are trying to forward to privileged ports (ports <= 1024). Most
             operating systems restrict this to only privileged process (typically
@@ -338,7 +390,10 @@ en:
             the port forwarding doesn't work. If any problems occur, please try a
             port higher than 1024.
         halt:
-          force: Forcing shutdown of VM...
+          force: |-
+            Forcing shutdown of VM...
+          graceful: |-
+            Attempting graceful shutdown of VM...
         host_name:
           setting: "Setting host name..."
         import:
@@ -354,6 +409,28 @@ en:
             MAC address is typically up to the box and box maintiner. Please contact
             the relevant person to solve this issue.
         network:
+          adapter_collision: |-
+            More than one network have been assigned to the same adapter. Please
+            make sure your networks you've configured in your Vagrantfile do not
+            overlap.
+          configuring: |-
+            Configuring and enabling network interfaces...
+          dhcp_already_attached: |-
+            A host only network interface you're attempting to configure via DHCP
+            already has a conflicting host only adapter with DHCP enabled. The
+            DHCP on this adapter is incompatible with the DHCP settings. Two
+            host only network interfaces are not allowed to overlap, and each
+            host only network interface can have only one DHCP server. Please
+            reconfigure your host only network or remove the virtual machine
+            using the other host only network.
+          no_adapters: |-
+            No available adapters on the virtual machine were found to accomodate
+            for all configured networks. VirtualBox virtual machines have 8
+            network interfaces available usually, so please lower the number of
+            networks to below 8.
+          preparing: |-
+            Preparing network interfaces based on configuration...
+        host_only_network:
           collides: |-
             The specified host network collides with a non-hostonly network!
             This will cause your specified IP to be inaccessible. Please change
@@ -367,19 +444,15 @@ en:
             host only network for you. Alternatively, please create the
             specified network manually.
           preparing: "Preparing host only network..."
-          windows_not_implemented: |-
-            Host only networking is currently broken on Windows due to a bug
-            in jruby-win32ole. When the bug is fixed, a patch release for Vagrant
-            will be released to remove this error. Until then, please just use
-            forwarded ports.
         nfs:
           host_required: |-
             A host class is required for NFS shared folders. By default, these
             are auto-detected, but can be overridden with `config.vagrant.host`.
-            There is currently not host class loaded.
+            There is currently no host class loaded.
           no_host_network: |-
-            NFS shared folders requires that host only networking is enabled.
-            Please enable host only networking via `config.vm.network`.
+            NFS shared folders requires that host only networking is enabled
+            with a static IP. Please enable host only network and assign a
+            static IP via `config.vm.network`.
           not_supported: |-
             The host class is reporting that NFS is not supported by this host,
             or `nfsd` may not be installed. Please verify that `nfsd` is installed
@@ -425,6 +498,10 @@ en:
             A box already exists under the name of '%{name}'. This may or may
             not be the same box you are trying to add. Please use another name
             or remove the previous box then try to add it again.
+          untar_failure: |-
+            Failed to untar the box file. This is usually because you're
+            attempting to add a box that isn't a valid box file. Please
+            double check that the box file is properly packaged.
         verify:
           verifying: "Verifying box..."
           failed: |-
@@ -464,12 +541,15 @@ en:
 
     hosts:
       bsd:
-        nfs_export:
-          prepare: "Preparing to edit /etc/exports. Administrator privileges will be required..."
+        nfs_export: |-
+          Preparing to edit /etc/exports. Administrator privileges will be required...
+        nfs_prune: |-
+          Pruning invalid NFS exports. Administrator privileges will be required...
       linux:
-        nfs_export:
-          prepare: "Preparing to edit /etc/exports. Administrator privileges will be required..."
-
+        nfs_export: |-
+          Preparing to edit /etc/exports. Administrator privileges will be required...
+        nfs_prune: |-
+          Pruning invalid NFS exports. Administrator privileges will be required...
       arch:
         nfs_export:
           prepare: "Preparing to edit /etc/exports. Administrator privileges will be required..."
@@ -481,8 +561,20 @@ en:
         upload_validation_key: "Uploading chef client validation key..."
         upload_encrypted_data_bag_secret_key: "Uploading chef encrypted data bag secret key..."
         running_client: "Running chef-client..."
+        running_client_again: "Running chef-client again (failed to converge)..."
         running_solo: "Running chef-solo..."
-        invalid_provisioner: "Vagrant::Provisioners::Chef is not a valid provisioner! Use ChefSolo or ChefClient instead."
+        running_solo_again: "Running chef-solo again (failed to converge)..."
+        invalid_provisioner: |-
+          Vagrant::Provisioners::Chef is not a valid provisioner! Use
+          ChefSolo or ChefClient instead.
+        missing_shared_folders: |-
+          Shared folders that Chef requires are missing on the virtual machine.
+          This is usually due to configuration changing after already booting the
+          machine. The fix is to run a `vagrant reload` so that the proper shared
+          folders will prepared and mounted on the VM.
+        no_convergence: |-
+          Chef never successfully completed! Any errors should be visible in the
+          output above. Please fix your recipes so that they properly complete.
         not_detected: |-
           The `%{binary}` binary appears to not be in the PATH of the guest. This
           could be because the PATH is not properly setup or perhaps chef is not
@@ -507,8 +599,17 @@ en:
           installed on this guest. Puppet provisioning can not continue without
           Puppet properly installed.
         running_puppet: "Running Puppet with %{manifest}..."
-        manifest_missing: "The Puppet %{manifest} manifest is missing. You cannot configure this box."
+        manifest_missing: |-
+          The configured Puppet manifest is missing. Please specify a path to an
+          existing manifest:
+
+          %{manifest}
         manifests_path_missing: "The manifests path specified for Puppet does not exist: %{path}"
+        missing_shared_folders: |-
+          Shared folders that Puppet requires are missing on the virtual machine.
+          This is usually due to configuration changing after already booting the
+          machine. The fix is to run a `vagrant reload` so that the proper shared
+          folders will prepared and mounted on the VM.
         module_path_missing: "The configured module path doesn't exist: %{path}"
 
       puppet_server:
@@ -526,22 +627,46 @@ en:
         path_invalid: "`path` for shell provisioner does not exist on the host system: %{path}"
         upload_path_not_set: "`upload_path` must be set for the shell provisioner."
 
-    systems:
+    guest:
       base:
-        unsupported_host_only: |-
-          Host only networking is very distro-specific. Vagrant has support for many
-          distros built-in: Debian, Ubuntu, Gentoo, and RedHat. The distro of your VM
-          couldn't be detected, or isn't supported for host only networking.
+        unsupported_configure_networks: |-
+          Networking features require support that is dependent on the operating
+          system running within the guest virtual machine. Vagrant has built-in support
+          for many operating systems: Debian, Ubuntu, Gentoo, and RedHat. The distro
+          of your VM couldn't be detected or doesn't support networking features.
 
           Most of the time this is simply due to the fact that no one has contributed
-          back the SSH commands necessary to set this up. Please report a bug and this
-          will be fixed for your distro.
+          back the logic necessary to set this up. Please report a bug as well as the
+          box you're using.
         unsupported_host_name: |-
           Setting host name is currently only supported on Debian, Ubuntu and RedHat.
           If you'd like your guest OS to be supported, please open a ticket on the
           project.
+        unsupported_nfs: |-
+          Vagrant doesn't support mounting NFS shared folders for your specific
+          guest operating system yet, or possibly couldn't properly detect the
+          operating system on the VM.
+
+          Most of the time this is simply due to the fact that no one has contributed
+          back the logic necessary to set this up. Please report a bug as well as the
+          box you're using.
+        unsupported_halt: |-
+          Vagrant doesn't support graceful shutdowns for your specific
+          guest operating system yet, or possibly couldn't properly detect the
+          operating system on the VM.
+
+          Most of the time this is simply due to the fact that no one has contributed
+          back the logic necessary to set this up. Please report a bug as well as the
+          box you're using.
+        unsupported_shared_folder: |-
+          Vagrant doesn't support mounting shared folders for your specific
+          guest operating system yet, or possibly couldn't properly detect the
+          operating system on the VM.
+
+          Most of the time this is simply due to the fact that no one has contributed
+          back the logic necessary to set this up. Please report a bug as well as the
+          box you're using.
       linux:
-        attempting_halt: "Attempting graceful shutdown of linux..."
         mount_fail: "Failed to mount shared folders. `vboxsf` was not available."
         mount_nfs_fail: |-
           Mounting NFS shared folders failed. This is most often caused by the NFS
@@ -549,9 +674,3 @@ en:
           that the NFS client software is properly installed, and consult any resources
           specific to the linux distro you're using for more information on how to
           do this.
-
-      solaris:
-        attempting_halt: "Attempting graceful shutdown of solaris..."
-
-      freebsd:
-        attempting_halt: "Attempting graceful shutdown of FreeBSD..."