vagrant 0.9.7 → 1.0.0

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/config/ssh.rb

@@ -13,26 +13,6 @@ module Vagrant
       attr_accessor :forward_x11
       attr_accessor :shell
 
-      def forwarded_port_key=(value)
-        raise Errors::DeprecationError, :message => <<-MESSAGE
-`config.ssh.forwarded_port_key` is now gone. You must now use
-`config.ssh.guest_port` which is expected to be the port on the
-guest that SSH is listening on. Vagrant will automatically scan
-the forwarded ports to look for a forwarded port from this port
-and use it.
-        MESSAGE
-      end
-
-      def forwarded_port_destination=(value)
-        raise Errors::DeprecationError, :message => <<-MESSAGE
-`config.ssh.forwarded_port_destination` is now gone. You must now use
-`config.ssh.guest_port` which is expected to be the port on the
-guest that SSH is listening on. Vagrant will automatically scan
-the forwarded ports to look for a forwarded port from this port
-and use it.
-        MESSAGE
-      end
-
       def validate(env, errors)
         [:username, :host, :max_tries, :timeout].each do |field|
           errors.add(I18n.t("vagrant.config.common.error_empty", :field => field)) if !instance_variable_get("@#{field}".to_sym)

data/lib/vagrant/config/vm.rb

@@ -39,28 +39,7 @@ module Vagrant
         result
       end
 
-      def system=(value)
-        raise Errors::DeprecationError, :message => <<-MESSAGE
-`config.vm.system` has changed to `config.vm.guest` in Vagrant 0.9,
-since this is more clear about the use of the configuration key.
-Please change all references of `config.vm.system` to `config.vm.guest`.
-        MESSAGE
-      end
-
       def forward_port(guestport, hostport, options=nil)
-        if !guestport.kind_of?(Integer)
-          raise Errors::DeprecationError, :message => <<-MESSAGE
-`config.vm.forward_port` changed in 0.9.0 where the required name
-argument is now removed. Vagrant will now automatically generate
-a unique name for your forwarded port. For example, to forward
-port 80 to port 8080 you now do the following:
-
-    config.vm.forward_port 80, 8080
-
-Please change your configurations to match this new syntax.
-          MESSAGE
-        end
-
         @forwarded_ports << {
           :name       => "#{guestport.to_s(32)}-#{hostport.to_s(32)}",
           :guestport  => guestport,
@@ -85,19 +64,6 @@ Please change your configurations to match this new syntax.
       end
 
       def network(type, *args)
-        if !type.kind_of?(Symbol)
-          raise Errors::DeprecationError, :message => <<-MESSAGE
-`config.vm.network` changed in 0.9.0 where the first argument is
-now the type of network and the remaining arguments are options for
-that type. For example, host only networks are now configured like
-so:
-
-    config.vm.network :hostonly, "172.24.24.24"
-
-Please change your configurations to match this new syntax.
-          MESSAGE
-        end
-
         @networks << [type, args]
       end
 
@@ -109,20 +75,6 @@ Please change your configurations to match this new syntax.
       # It is only defaulted to nil so that the deprecation error
       # can be properly shown.
       def customize(command=nil)
-        if block_given?
-          raise Errors::DeprecationError, :message => <<-MESSAGE
-`config.vm.customize` now takes an array of arguments to send to
-`VBoxManage` instead of having a block which gets a virtual machine
-object. Example of the new usage:
-
-    config.vm.customize ["modifyvm", :id, "--memory", "1024"]
-
-The above will run `VBoxManage modifyvm 1234 --memory 1024` where
-"1234" is the ID of your current virtual machine. Anything you could
-do before is certainly still possible with `VBoxManage` as well.
-          MESSAGE
-        end
-
         @customizations << command if command
       end
 

data/lib/vagrant/data_store.rb

@@ -21,25 +21,34 @@ module Vagrant
 
     def initialize(file_path)
       @logger    = Log4r::Logger.new("vagrant::datastore")
-      @logger.info("Created: #{file_path}")
 
-      @file_path = Pathname.new(file_path)
+      if file_path
+        @logger.info("Created: #{file_path}")
 
-      if @file_path.exist?
-        raise Errors::DotfileIsDirectory if @file_path.directory?
+        @file_path = Pathname.new(file_path)
+        if @file_path.exist?
+          raise Errors::DotfileIsDirectory if @file_path.directory?
 
-        begin
-          merge!(JSON.parse(@file_path.read))
-        rescue JSON::ParserError
-          # Ignore if the data is invalid in the file.
-          @logger.error("Data store contained invalid JSON. Ignoring.")
+          begin
+            merge!(JSON.parse(@file_path.read))
+          rescue JSON::ParserError
+            # Ignore if the data is invalid in the file.
+            @logger.error("Data store contained invalid JSON. Ignoring.")
+          end
         end
+      else
+        @logger.info("No file path. In-memory data store.")
+        @file_path = nil
       end
     end
 
     # Commits any changes to the data to disk. Even if the data
     # hasn't changed, it will be reserialized and written to disk.
     def commit
+      if !@file_path
+        raise StandardError, "In-memory data stores can't be committed."
+      end
+
       clean_nil_and_empties
 
       if empty?

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

@@ -23,7 +23,8 @@ module Vagrant
       end
 
       def clear_shared_folders
-        execute("showvminfo", @uuid, "--machinereadable").split("\n").each do |line|
+        info = execute("showvminfo", @uuid, "--machinereadable", :retryable => true)
+        info.split("\n").each do |line|
           if line =~ /^SharedFolderNameMachineMapping\d+="(.+?)"$/
             execute("sharedfolder", "remove", @uuid, "--name", $1.to_s)
           end
@@ -70,8 +71,9 @@ module Vagrant
 
         execute("list", "vms").split("\n").each do |line|
           if line =~ /^".+?"\s+\{(.+?)\}$/
-            execute("showvminfo", $1.to_s, "--machinereadable").split("\n").each do |info|
-              if info =~ /^hostonlyadapter\d+="(.+?)"$/
+            info = execute("showvminfo", $1.to_s, "--machinereadable", :retryable => true)
+            info.split("\n").each do |line|
+              if line =~ /^hostonlyadapter\d+="(.+?)"$/
                 networks.delete($1.to_s)
               end
             end
@@ -202,7 +204,8 @@ module Vagrant
 
         results = []
         current_nic = nil
-        execute("showvminfo", uuid, "--machinereadable").split("\n").each do |line|
+        info = execute("showvminfo", uuid, "--machinereadable", :retryable => true)
+        info.split("\n").each do |line|
           # This is how we find the nic that a FP is attached to,
           # since this comes first.
           current_nic = $1.to_i if line =~ /^nic(\d+)=".+?"$/
@@ -246,7 +249,8 @@ module Vagrant
       end
 
       def read_guest_additions_version
-        output = execute("guestproperty", "get", @uuid, "/VirtualBox/GuestAdd/Version")
+        output = execute("guestproperty", "get", @uuid, "/VirtualBox/GuestAdd/Version",
+                         :retryable => true)
         if output =~ /^Value: (.+?)$/
           # Split the version by _ since some distro versions modify it
           # to look like this: 4.1.2_ubuntu, and the distro part isn't
@@ -260,7 +264,7 @@ module Vagrant
 
       def read_host_only_interfaces
         dhcp = {}
-        execute("list", "dhcpservers").split("\n\n").each do |block|
+        execute("list", "dhcpservers", :retryable => true).split("\n\n").each do |block|
           info = {}
 
           block.split("\n").each do |line|
@@ -279,7 +283,7 @@ module Vagrant
           dhcp[info[:network]] = info
         end
 
-        execute("list", "hostonlyifs").split("\n\n").collect do |block|
+        execute("list", "hostonlyifs", :retryable => true).split("\n\n").collect do |block|
           info = {}
 
           block.split("\n").each do |line|
@@ -302,7 +306,8 @@ module Vagrant
       end
 
       def read_mac_address
-        execute("showvminfo", @uuid, "--machinereadable").split("\n").each do |line|
+        info = execute("showvminfo", @uuid, "--machinereadable", :retryable => true)
+        info.split("\n").each do |line|
           return $1.to_s if line =~ /^macaddress1="(.+?)"$/
         end
 
@@ -310,7 +315,7 @@ module Vagrant
       end
 
       def read_machine_folder
-        execute("list", "systemproperties").split("\n").each do |line|
+        execute("list", "systemproperties", :retryable => true).split("\n").each do |line|
           if line =~ /^Default machine folder:\s+(.+?)$/i
             return $1.to_s
           end
@@ -321,7 +326,8 @@ module Vagrant
 
       def read_network_interfaces
         nics = {}
-        execute("showvminfo", @uuid, "--machinereadable").split("\n").each do |line|
+        info = execute("showvminfo", @uuid, "--machinereadable", :retryable => true)
+        info.split("\n").each do |line|
           if line =~ /^nic(\d+)="(.+?)"$/
             adapter = $1.to_i
             type    = $2.to_sym
@@ -347,7 +353,7 @@ module Vagrant
       end
 
       def read_state
-        output = execute("showvminfo", @uuid, "--machinereadable")
+        output = execute("showvminfo", @uuid, "--machinereadable", :retryable => true)
         if output =~ /^name="<inaccessible>"$/
           return :inaccessible
         elsif output =~ /^VMState="(.+?)"$/
@@ -359,7 +365,7 @@ module Vagrant
 
       def read_used_ports
         ports = []
-        execute("list", "vms").split("\n").each do |line|
+        execute("list", "vms", :retryable => true).split("\n").each do |line|
           if line =~ /^".+?" \{(.+?)\}$/
             uuid = $1.to_s
 
@@ -377,7 +383,7 @@ module Vagrant
 
       def read_vms
         results = []
-        execute("list", "vms").split("\n").each do |line|
+        execute("list", "vms", :retryable => true).split("\n").each do |line|
           if line =~ /^".+?" \{(.+?)\}$/
             results << $1.to_s
           end
@@ -417,13 +423,29 @@ module Vagrant
       end
 
       def start(mode)
-        execute("startvm", @uuid, "--type", mode.to_s)
+        command = ["startvm", @uuid, "--type", mode.to_s]
+        r = raw(*command)
+
+        if r.exit_code == 0 || r.stdout =~ /VM ".+?" has been successfully started/
+          # Some systems return an exit code 1 for some reason. For that
+          # we depend on the output.
+          return true
+        end
+
+        # If we reached this point then it didn't work out.
+        raise Errors::VBoxManageError, :command => command.inspect
       end
 
       def suspend
         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

@@ -23,7 +23,8 @@ module Vagrant
       end
 
       def clear_shared_folders
-        execute("showvminfo", @uuid, "--machinereadable").split("\n").each do |line|
+        info = execute("showvminfo", @uuid, "--machinereadable", :retryable => true)
+        info.split("\n").each do |line|
           if line =~ /^SharedFolderNameMachineMapping\d+="(.+?)"$/
             execute("sharedfolder", "remove", @uuid, "--name", $1.to_s)
           end
@@ -70,8 +71,9 @@ module Vagrant
 
         execute("list", "vms").split("\n").each do |line|
           if line =~ /^".+?"\s+\{(.+?)\}$/
-            execute("showvminfo", $1.to_s, "--machinereadable").split("\n").each do |info|
-              if info =~ /^hostonlyadapter\d+="(.+?)"$/
+            info = execute("showvminfo", $1.to_s, "--machinereadable", :retryable => true)
+            info.split("\n").each do |line|
+              if line =~ /^hostonlyadapter\d+="(.+?)"$/
                 networks.delete($1.to_s)
               end
             end
@@ -202,7 +204,8 @@ module Vagrant
 
         results = []
         current_nic = nil
-        execute("showvminfo", uuid, "--machinereadable").split("\n").each do |line|
+        info = execute("showvminfo", uuid, "--machinereadable", :retryable => true)
+        info.split("\n").each do |line|
           # This is how we find the nic that a FP is attached to,
           # since this comes first.
           current_nic = $1.to_i if line =~ /^nic(\d+)=".+?"$/
@@ -246,7 +249,8 @@ module Vagrant
       end
 
       def read_guest_additions_version
-        output = execute("guestproperty", "get", @uuid, "/VirtualBox/GuestAdd/Version")
+        output = execute("guestproperty", "get", @uuid, "/VirtualBox/GuestAdd/Version",
+                         :retryable => true)
         if output =~ /^Value: (.+?)$/
           # Split the version by _ since some distro versions modify it
           # to look like this: 4.1.2_ubuntu, and the distro part isn't
@@ -260,7 +264,7 @@ module Vagrant
 
       def read_host_only_interfaces
         dhcp = {}
-        execute("list", "dhcpservers").split("\n\n").each do |block|
+        execute("list", "dhcpservers", :retryable => true).split("\n\n").each do |block|
           info = {}
 
           block.split("\n").each do |line|
@@ -279,7 +283,7 @@ module Vagrant
           dhcp[info[:network]] = info
         end
 
-        execute("list", "hostonlyifs").split("\n\n").collect do |block|
+        execute("list", "hostonlyifs", :retryable => true).split("\n\n").collect do |block|
           info = {}
 
           block.split("\n").each do |line|
@@ -302,7 +306,8 @@ module Vagrant
       end
 
       def read_mac_address
-        execute("showvminfo", @uuid, "--machinereadable").split("\n").each do |line|
+        info = execute("showvminfo", @uuid, "--machinereadable", :retryable => true)
+        info.split("\n").each do |line|
           return $1.to_s if line =~ /^macaddress1="(.+?)"$/
         end
 
@@ -310,7 +315,7 @@ module Vagrant
       end
 
       def read_machine_folder
-        execute("list", "systemproperties").split("\n").each do |line|
+        execute("list", "systemproperties", :retryable => true).split("\n").each do |line|
           if line =~ /^Default machine folder:\s+(.+?)$/i
             return $1.to_s
           end
@@ -321,7 +326,8 @@ module Vagrant
 
       def read_network_interfaces
         nics = {}
-        execute("showvminfo", @uuid, "--machinereadable").split("\n").each do |line|
+        info = execute("showvminfo", @uuid, "--machinereadable", :retryable => true)
+        info.split("\n").each do |line|
           if line =~ /^nic(\d+)="(.+?)"$/
             adapter = $1.to_i
             type    = $2.to_sym
@@ -347,7 +353,7 @@ module Vagrant
       end
 
       def read_state
-        output = execute("showvminfo", @uuid, "--machinereadable")
+        output = execute("showvminfo", @uuid, "--machinereadable", :retryable => true)
         if output =~ /^name="<inaccessible>"$/
           return :inaccessible
         elsif output =~ /^VMState="(.+?)"$/
@@ -359,7 +365,7 @@ module Vagrant
 
       def read_used_ports
         ports = []
-        execute("list", "vms").split("\n").each do |line|
+        execute("list", "vms", :retryable => true).split("\n").each do |line|
           if line =~ /^".+?" \{(.+?)\}$/
             uuid = $1.to_s
 
@@ -377,7 +383,7 @@ module Vagrant
 
       def read_vms
         results = []
-        execute("list", "vms").split("\n").each do |line|
+        execute("list", "vms", :retryable => true).split("\n").each do |line|
           if line =~ /^".+?" \{(.+?)\}$/
             results << $1.to_s
           end
@@ -417,13 +423,29 @@ module Vagrant
       end
 
       def start(mode)
-        execute("startvm", @uuid, "--type", mode.to_s)
+        command = ["startvm", @uuid, "--type", mode.to_s]
+        r = raw(*command)
+
+        if r.exit_code == 0 || r.stdout =~ /VM ".+?" has been successfully started/
+          # Some systems return an exit code 1 for some reason. For that
+          # we depend on the output.
+          return true
+        end
+
+        # If we reached this point then it didn't work out.
+        raise Errors::VBoxManageError, :command => command.inspect
       end
 
       def suspend
         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