vagrantup 0.9.99.1 → 0.9.99.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e96062b6fdca98e03dead5bc15cb7bee039c360
-  data.tar.gz: d22414b06f0fa20c534f940c7749420a458ac736
+  metadata.gz: 47114b7b4c12b0c9ef207c4c034e12c4ef7b3ec2
+  data.tar.gz: 8f5cd01bcb271539e179b0881163c4a22903ec19
 SHA512:
-  metadata.gz: 205eb4b0eb766e9ca4487bbe2e1ef1bdf7ff86e74e780244b94a057b512aba5061023e689bf43e1fdbb72a4e2a8f62d66bc37052a882a33621c67d32159b1d8e
-  data.tar.gz: 5316a1d824364e938bd798d082de4d3bd42c97afe66518d1957580f2f511f58f4df7f9235f9fb6488e618ad4f60b45f353c3d369bed913a92e12776219a4b348
+  metadata.gz: 9260b2fa40ee1037f5af1a2c19842484d0eb650fb020463585501e675d6d376b8318edb0ee3e9624097517eef7ff5b771cf82419d80e9afe1774abe2de0cfc7a
+  data.tar.gz: a57b9dc7b1c66954755f99863da37e1ac5bd91317b8c4f4fc6114801dd50bd1b7d5e4352a39a0978c0b3ccd792085f59403ce834959fa31936732ae3719fa6ba

data/CHANGELOG.md

@@ -17,6 +17,16 @@
   - Unix-style line endings are used properly for guest OS. [GH-727]
   - Retry certain VirtualBox operations, since they intermittently fail.
     [GH-726]
+  - Fix issue where Vagrant would sometimes "lose" a VM if an exception
+    occurred. [GH-725]
+  - `vagrant destroy` destroys virtual machines in reverse order. [GH-739]
+  - Add an `fsid` option to Linux NFS exports. [GH-736]
+  - Fix edge case where an exception could be raised in networking code. [GH-742]
+  - Add missing translation for the "guru meditation" state. [GH-745]
+  - Check that VirtualBox exists before certain commands. [GH-746]
+  - NIC type can be defined for host-only network adapters. [GH-750]
+  - Fix issue where re-running chef-client would sometimes cause
+    problems due to file permissions. [GH-748]
 
 ## 0.9.7 (February 9, 2012)
 

data/lib/vagrant/action.rb

@@ -20,6 +20,7 @@ module Vagrant
     end
 
     module General
+      autoload :CheckVirtualbox, 'vagrant/action/general/check_virtualbox'
       autoload :Package,  'vagrant/action/general/package'
       autoload :Validate, 'vagrant/action/general/validate'
     end

data/lib/vagrant/action/builtin.rb

@@ -20,6 +20,7 @@ module Vagrant
         # provision - Provisions a running VM
         register(:provision) do
           Builder.new do
+            use General::CheckVirtualbox
             use General::Validate
             use VM::CheckAccessible
             use VM::Provision
@@ -30,6 +31,7 @@ module Vagrant
         # environment.
         register(:start) do
           Builder.new do
+            use General::CheckVirtualbox
             use General::Validate
             use VM::CheckAccessible
             use VM::CleanMachineFolder
@@ -53,6 +55,7 @@ module Vagrant
         # a restart if fails.
         register(:halt) do
           Builder.new do
+            use General::CheckVirtualbox
             use General::Validate
             use VM::CheckAccessible
             use VM::DiscardState
@@ -63,6 +66,7 @@ module Vagrant
         # suspend - Suspends the VM
         register(:suspend) do
           Builder.new do
+            use General::CheckVirtualbox
             use General::Validate
             use VM::CheckAccessible
             use VM::Suspend
@@ -72,6 +76,7 @@ module Vagrant
         # resume - Resume a VM
         register(:resume) do
           Builder.new do
+            use General::CheckVirtualbox
             use General::Validate
             use VM::CheckAccessible
             use VM::CheckPortCollisions
@@ -82,6 +87,7 @@ module Vagrant
         # reload - Halts then restarts the VM
         register(:reload) do
           Builder.new do
+            use General::CheckVirtualbox
             use General::Validate
             use VM::CheckAccessible
             use registry.get(:halt)
@@ -92,6 +98,7 @@ module Vagrant
         # up - Imports, prepares, then starts a fresh VM.
         register(:up) do
           Builder.new do
+            use General::CheckVirtualbox
             use General::Validate
             use VM::CheckAccessible
             use VM::CheckBox
@@ -106,6 +113,7 @@ module Vagrant
         # destroy - Halts, cleans up, and destroys an existing VM
         register(:destroy) do
           Builder.new do
+            use General::CheckVirtualbox
             use General::Validate
             use VM::CheckAccessible
             use registry.get(:halt), :force => true
@@ -120,6 +128,7 @@ module Vagrant
         # package - Export and package the VM
         register(:package) do
           Builder.new do
+            use General::CheckVirtualbox
             use General::Validate
             use VM::SetupPackageFiles
             use VM::CheckAccessible
@@ -135,6 +144,7 @@ module Vagrant
         # box_add - Download and add a box.
         register(:box_add) do
           Builder.new do
+            use General::CheckVirtualbox
             use Box::Download
             use Box::Unpackage
             use Box::Verify

data/lib/vagrant/action/general/check_virtualbox.rb

@@ -0,0 +1,28 @@
+module Vagrant
+  module Action
+    module General
+      # Checks that virtualbox is installed and ready to be used.
+      class CheckVirtualbox
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          # Certain actions may not actually have a VM, and thus no
+          # driver, so we have to be clever about obtaining an instance
+          # of the driver.
+          driver = nil
+          driver = env[:vm].driver if env[:vm]
+          driver = Driver::VirtualBox.new(nil) if !driver
+
+          # Verify that it is ready to go! This will raise an exception
+          # if anything goes wrong.
+          driver.verify!
+
+          # Carry on.
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/action/general/validate.rb

@@ -6,12 +6,11 @@ module Vagrant
       class Validate
         def initialize(app, env)
           @app = app
-          @env = env
         end
 
         def call(env)
-          @env[:vm].config.validate!(@env[:vm].env) if !@env.has_key?("validate") || @env["validate"]
-          @app.call(@env)
+          env[:vm].config.validate!(env[:vm].env) if !env.has_key?("validate") || env["validate"]
+          @app.call(env)
         end
       end
     end

data/lib/vagrant/action/vm/network.rb

@@ -37,12 +37,9 @@ module Vagrant
             adapters << adapter
 
             # Get the network configuration
-            if config[:auto_config]
-              network = send("#{type}_network_config", config)
-              networks << network
-            else
-              @logger.info("Auto config disabled, not configuring: #{type}")
-            end
+            network = send("#{type}_network_config", config)
+            network[:_auto_config] = true if config[:auto_config]
+            networks << network
           end
 
           if !adapters.empty?
@@ -68,9 +65,11 @@ module Vagrant
             # Determine the interface numbers for the guest.
             assign_interface_numbers(networks, adapters)
 
-            # Configure all the network interfaces on the guest.
+            # Configure all the network interfaces on the guest. We only
+            # want to configure the networks that have `auto_config` setup.
+            networks_to_configure = networks.select { |n| n[:_auto_config] }
             env[:ui].info I18n.t("vagrant.actions.vm.network.configuring")
-            env[:vm].guest.configure_networks(networks)
+            env[:vm].guest.configure_networks(networks_to_configure)
           end
         end
 
@@ -253,7 +252,8 @@ module Vagrant
             :adapter     => config[:adapter],
             :type        => :hostonly,
             :hostonly    => interface[:name],
-            :mac_address => config[:mac]
+            :mac_address => config[:mac],
+            :nic_type    => config[:nic_type]
           }
         end
 
@@ -309,6 +309,7 @@ module Vagrant
 
         def bridged_config(args)
           options = args[0] || {}
+          options = {} if !options.is_a?(Hash)
 
           return {
             :adapter => nil,

data/lib/vagrant/action/vm/nfs.rb

@@ -1,3 +1,4 @@
+require 'digest/md5'
 require 'fileutils'
 require 'pathname'
 
@@ -93,6 +94,12 @@ module Vagrant
             opts[:map_gid] = prepare_permission(:gid, opts)
             opts[:nfs_version] ||= 3
 
+            # The poor man's UUID. An MD5 hash here is sufficient since
+            # we need a 32 character "uuid" to represent the filesystem
+            # of an export. Hashing the host path is safe because two of
+            # the same host path will hash to the same fsid.
+            opts[:uuid]    = Digest::MD5.hexdigest(opts[:hostpath])
+
             acc[key] = opts
             acc
           end

data/lib/vagrant/command/base.rb

@@ -60,10 +60,13 @@ module Vagrant
       # @param [String] name The name of the VM. Nil if every VM.
       # @param [Boolean] single_target If true, then an exception will be
       #   raised if more than one target is found.
-      def with_target_vms(name=nil, single_target=false)
+      def with_target_vms(name=nil, options=nil)
         # Using VMs requires a Vagrant environment to be properly setup
         raise Errors::NoEnvironmentError if !@env.root_path
 
+        # Setup the options hash
+        options ||= {}
+
         # First determine the proper array of VMs.
         vms = []
         if name
@@ -89,7 +92,10 @@ module Vagrant
         end
 
         # Make sure we're only working with one VM if single target
-        raise Errors::MultiVMTargetRequired if single_target && vms.length != 1
+        raise Errors::MultiVMTargetRequired if options[:single_target] && vms.length != 1
+
+        # If we asked for reversed ordering, then reverse it
+        vms.reverse! if options[:reverse]
 
         # Go through each VM and yield it!
         vms.each do |old_vm|

data/lib/vagrant/command/destroy.rb

@@ -20,7 +20,7 @@ module Vagrant
         return if !argv
 
         @logger.debug("'Destroy' each target VM...")
-        with_target_vms(argv[0]) do |vm|
+        with_target_vms(argv[0], :reverse => true) do |vm|
           if vm.created?
             # Boolean whether we should actually go through with the destroy
             # or not. This is true only if the "--force" flag is set or if the

data/lib/vagrant/command/package.rb

@@ -51,7 +51,7 @@ module Vagrant
       end
 
       def package_target(name, options)
-        with_target_vms(name, true) do |vm|
+        with_target_vms(name, :single_target => true) do |vm|
           raise Errors::VMNotCreatedError if !vm.created?
           @logger.debug("Packaging VM: #{vm.name}")
           package_vm(vm, options)

data/lib/vagrant/command/ssh.rb

@@ -36,7 +36,7 @@ module Vagrant
         argv = [] if argv == ssh_args
 
         # Execute the actual SSH
-        with_target_vms(argv[0], true) do |vm|
+        with_target_vms(argv[0], :single_target => true) do |vm|
           # Basic checks that are required for proper SSH
           raise Errors::VMNotCreatedError if !vm.created?
           raise Errors::VMInaccessible if !vm.state == :inaccessible

data/lib/vagrant/command/ssh_config.rb

@@ -19,7 +19,7 @@ module Vagrant
         argv = parse_options(opts)
         return if !argv
 
-        with_target_vms(argv[0], true) do |vm|
+        with_target_vms(argv[0], :single_target => true) do |vm|
           raise Errors::VMNotCreatedError if !vm.created?
           raise Errors::VMInaccessible if !vm.state == :inaccessible
 

data/lib/vagrant/config/loader.rb

@@ -82,6 +82,8 @@ module Vagrant
               current = Top.new
               proc.call(current)
               @config_cache[proc] = current
+            else
+              @logger.debug("Loading from: #{key} (cache)")
             end
 
             # Merge in the results of this proc's configuration

data/lib/vagrant/driver/virtualbox.rb

@@ -99,6 +99,7 @@ module Vagrant
                                :ssh_port,
                                :start,
                                :suspend,
+                               :verify!,
                                :verify_image,
                                :vm_exists?
 

data/lib/vagrant/driver/virtualbox_4_0.rb

@@ -440,6 +440,12 @@ module Vagrant
         execute("controlvm", @uuid, "savestate")
       end
 
+      def verify!
+        # This command sometimes fails if kernel drivers aren't properly loaded
+        # so we just run the command and verify that it succeeded.
+        execute("list", "hostonlyifs")
+      end
+
       def verify_image(path)
         r = raw("import", path.to_s, "--dry-run")
         return r.exit_code == 0

data/lib/vagrant/driver/virtualbox_4_1.rb

@@ -440,6 +440,12 @@ module Vagrant
         execute("controlvm", @uuid, "savestate")
       end
 
+      def verify!
+        # This command sometimes fails if kernel drivers aren't properly loaded
+        # so we just run the command and verify that it succeeded.
+        execute("list", "hostonlyifs")
+      end
+
       def verify_image(path)
         r = raw("import", path.to_s, "--dry-run")
         return r.exit_code == 0

data/lib/vagrant/driver/virtualbox_base.rb

@@ -234,6 +234,12 @@ module Vagrant
       def suspend
       end
 
+      # Verifies that the driver is ready to accept work.
+      #
+      # This should raise a VagrantError if things are not ready.
+      def verify!
+      end
+
       # Verifies that an image can be imported properly.
       #
       # @param [String] path Path to an OVF file.

data/lib/vagrant/provisioners/chef.rb

@@ -57,7 +57,9 @@ module Vagrant
         temp.write(config_file)
         temp.close
 
-        env[:vm].channel.upload(temp.path, File.join(config.provisioning_path, filename))
+        remote_file = File.join(config.provisioning_path, filename)
+        env[:vm].channel.sudo("rm #{remote_file}", :error_check => false)
+        env[:vm].channel.upload(temp.path, remote_file)
       end
 
       def setup_json

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.9.99.1"
+  VERSION = "0.9.99.2"
 end

data/lib/vagrant/vm.rb

@@ -131,7 +131,7 @@ module Vagrant
         # 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
+        @uuid = nil
       end
     end
 

data/templates/locales/en.yml

@@ -255,6 +255,11 @@ en:
           stopped without properly closing the session. Run `vagrant up`
           to resume this virtual machine. If any problems persist, you may
           have to destroy and restart the virtual machine.
+        gurumeditation: |-
+          The VM is in the "guru meditation" state. This is a rare case which means
+          that an internal error in VitualBox caused the VM to fail. This is always
+          the sign of a bug in VirtualBox. You can try to bring your VM back online
+          with a `vagrant up`.
         inaccessible: |-
           The VM is inaccessible! This is a rare case which means that VirtualBox
           can't find your VM configuration. This usually happens when upgrading

data/templates/nfs/exports_linux.erb

@@ -1,5 +1,5 @@
 # VAGRANT-BEGIN: <%= uuid %>
 <% folders.each do |name, opts| %>
-"<%= opts[:hostpath] %>" <%= ip %>(rw,no_subtree_check,all_squash<% if opts[:map_uid] %>,anonuid=<%= opts[:map_uid] %><% end %><% if opts[:map_gid] %>,anongid=<%= opts[:map_gid] %><% end %>)
+"<%= opts[:hostpath] %>" <%= ip %>(rw,no_subtree_check,all_squash<% if opts[:map_uid] %>,anonuid=<%= opts[:map_uid] %><% end %><% if opts[:map_gid] %>,anongid=<%= opts[:map_gid] %><% end %>,fsid=<%= opts[:uuid] %>)
 <% end %>
 # VAGRANT-END: <%= uuid %>

data/vagrant.gemspec

@@ -17,11 +17,11 @@ Gem::Specification.new do |s|
   s.add_dependency "archive-tar-minitar", "= 0.5.2"
   s.add_dependency "childprocess", "~> 0.3.1"
   s.add_dependency "erubis", "~> 2.7.0"
+  s.add_dependency "i18n", "~> 0.6.0"
   s.add_dependency "json", "~> 1.5.1"
   s.add_dependency "log4r", "~> 1.1.9"
   s.add_dependency "net-ssh", "~> 2.2.2"
   s.add_dependency "net-scp", "~> 1.0.4"
-  s.add_dependency "i18n", "~> 0.6.0"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "contest", ">= 0.1.2"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrantup
 version: !ruby/object:Gem::Version
-  version: 0.9.99.1
+  version: 0.9.99.2
 platform: ruby
 authors:
 - Mitchell Hashimoto
@@ -53,6 +53,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.7.0
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -109,20 +123,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.4
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -257,6 +257,7 @@ files:
 - lib/vagrant/action/builtin.rb
 - lib/vagrant/action/env/set.rb
 - lib/vagrant/action/environment.rb
+- lib/vagrant/action/general/check_virtualbox.rb
 - lib/vagrant/action/general/package.rb
 - lib/vagrant/action/general/validate.rb
 - lib/vagrant/action/runner.rb