tnargav 1.2.3 → 1.3.3

data/plugins/providers/virtualbox/action.rb

@@ -69,8 +69,10 @@ module VagrantPlugins
           b.use ForwardPorts
           b.use SetHostname
           b.use SaneDefaults
-          b.use Customize
+          b.use Customize, "pre-boot"
           b.use Boot
+          b.use Customize, "post-boot"
+          b.use WaitForCommunicator, [:starting, :running]
           b.use CheckGuestAdditions
         end
       end
@@ -96,6 +98,7 @@ module VagrantPlugins
                 b3.use Destroy
                 b3.use CleanMachineFolder
                 b3.use DestroyUnusedNetworkInterfaces
+                b3.use ProvisionerCleanup
               else
                 b3.use MessageWillNotDestroy
               end
@@ -293,12 +296,22 @@ module VagrantPlugins
       def self.action_up
         Vagrant::Action::Builder.new.tap do |b|
           b.use CheckVirtualbox
+
+          # Handle box_url downloading early so that if the Vagrantfile
+          # references any files in the box or something it all just
+          # works fine.
+          b.use Call, Created do |env, b2|
+            if !env[:result]
+              b2.use HandleBoxUrl
+            end
+          end
+
           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 Customize, "pre-import"
               b2.use Import
               b2.use MatchMACAddress
             end

data/plugins/providers/virtualbox/action/boot.rb

@@ -14,35 +14,9 @@ module VagrantPlugins
           # Start up the VM and wait for it to 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 wait_for_boot
-          @env[:ui].info I18n.t("vagrant.actions.vm.boot.waiting")
-
-          @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
-
-            # Return true so that the vm_failed_to_boot error doesn't
-            # get shown
-            return true if @env[:interrupted]
-
-            # If the VM is not starting or running, something went wrong
-            # and we need to show a useful error.
-            state = @env[:machine].provider.state.id
-            raise Vagrant::Errors::VMFailedToRun if state != :starting && state != :running
-
-            sleep 2 if !@env["vagrant.test"]
-          end
-
-          @env[:ui].error I18n.t("vagrant.actions.vm.boot.failed")
-          false
-        end
       end
     end
   end

data/plugins/providers/virtualbox/action/clear_network_interfaces.rb

@@ -12,7 +12,7 @@ module VagrantPlugins
           # excluding the NAT adapter on port 1 which Vagrant always
           # expects to exist.
           adapters = []
-          2.upto(8).each do |i|
+          2.upto(env[:machine].provider.driver.max_network_adapters).each do |i|
             adapters << {
               :adapter => i,
               :type    => :none

data/plugins/providers/virtualbox/action/customize.rb

@@ -2,14 +2,21 @@ module VagrantPlugins
   module ProviderVirtualBox
     module Action
       class Customize
-        def initialize(app, env)
+        def initialize(app, env, event)
           @app = app
+          @event = event
         end
 
         def call(env)
-          customizations = env[:machine].provider_config.customizations
+          customizations = []
+          env[:machine].provider_config.customizations.each do |event, command|
+            if event == @event
+              customizations << command
+            end
+          end
+
           if !customizations.empty?
-            env[:ui].info I18n.t("vagrant.actions.vm.customize.running")
+            env[:ui].info I18n.t("vagrant.actions.vm.customize.running", event: @event)
 
             # Execute each customization command.
             customizations.each do |command|

data/plugins/providers/virtualbox/action/destroy_unused_network_interfaces.rb

@@ -1,13 +1,20 @@
+require "log4r"
+
 module VagrantPlugins
   module ProviderVirtualBox
     module Action
       class DestroyUnusedNetworkInterfaces
         def initialize(app, env)
           @app = app
+          @logger = Log4r::Logger.new("vagrant::plugins::virtualbox::destroy_unused_netifs")
         end
 
         def call(env)
-          env[:machine].provider.driver.delete_unused_host_only_networks
+          if env[:machine].provider_config.destroy_unused_network_interfaces
+            @logger.info("Destroying unused network interfaces...")
+            env[:machine].provider.driver.delete_unused_host_only_networks
+          end
+
           @app.call(env)
         end
       end

data/plugins/providers/virtualbox/action/forward_ports.rb

@@ -69,6 +69,7 @@ module VagrantPlugins
             # Add the options to the ports array to send to the driver later
             ports << {
               :adapter   => fp.adapter,
+              :guestip   => fp.guest_ip,
               :guestport => fp.guest_port,
               :hostip    => fp.host_ip,
               :hostport  => fp.host_port,

data/plugins/providers/virtualbox/action/import.rb

@@ -36,6 +36,9 @@ module VagrantPlugins
           if env[:machine].provider.state.id != :not_created
             return if env["vagrant.error"].is_a?(Vagrant::Errors::VagrantError)
 
+            # If we're not supposed to destroy on error then just return
+            return if !env[:destroy_on_error]
+
             # Interrupted, destroy the VM. We note that we don't want to
             # validate the configuration here, and we don't want to confirm
             # we want to destroy.

data/plugins/providers/virtualbox/action/network.rb

@@ -202,6 +202,17 @@ module VagrantPlugins
         end
 
         def bridged_network_config(config)
+          if config[:ip]
+            options = {
+                :auto_config => true,
+                :mac         => nil,
+                :netmask     => "255.255.255.0",
+                :type        => :static
+            }.merge(config)
+            options[:type] = options[:type].to_sym
+            return options
+          end
+
           return {
             :type => :dhcp,
             :use_dhcp_assigned_default_route => config[:use_dhcp_assigned_default_route]
@@ -212,6 +223,7 @@ module VagrantPlugins
           options = {
             :auto_config => true,
             :mac         => nil,
+            :nic_type    => nil,
             :netmask     => "255.255.255.0",
             :type        => :static
           }.merge(options)
@@ -220,7 +232,7 @@ module VagrantPlugins
           options[:type] = options[:type].to_sym
 
           # Default IP is in the 20-bit private network block for DHCP based networks
-          options[:ip] = "172.28.128.1" if options[:type] == :dhcp
+          options[:ip] = "172.28.128.1" if options[:type] == :dhcp && !options[:ip]
 
           # Calculate our network address for the given IP/netmask
           netaddr  = network_address(options[:ip], options[:netmask])
@@ -271,7 +283,7 @@ module VagrantPlugins
             :ip          => options[:ip],
             :mac         => options[:mac],
             :netmask     => options[:netmask],
-            :nic_type    => nil,
+            :nic_type    => options[:nic_type],
             :type        => options[:type]
           }.merge(dhcp_options)
         end

data/plugins/providers/virtualbox/action/prepare_nfs_settings.rb

@@ -50,13 +50,18 @@ module VagrantPlugins
         #
         # @return [String]
         def read_machine_ip(machine)
+          ips = []
           machine.config.vm.networks.each do |type, options|
             if type == :private_network && options[:ip].is_a?(String)
-              return options[:ip]
+              ips << options[:ip]
             end
           end
 
-          nil
+          if ips.empty?
+            return nil
+          end
+
+          ips
         end
       end
     end

data/plugins/providers/virtualbox/action/set_name.rb

@@ -12,9 +12,16 @@ module VagrantPlugins
         def call(env)
           name = env[:machine].provider_config.name
 
+          # If we already set the name before, then don't do anything
+          sentinel = env[:machine].data_dir.join("action_set_name")
+          if !name && sentinel.file?
+            @logger.info("Default name was already set before, not doing it again.")
+            return @app.call(env)
+          end
+
           # If no name was manually set, then use a default
           if !name
-            prefix = env[:root_path].basename.to_s
+            prefix = "#{env[:root_path].basename.to_s}_#{env[:machine].name}"
             prefix.gsub!(/[^-a-z0-9_]/i, "")
             name = prefix + "_#{Time.now.to_i}"
           end
@@ -32,6 +39,11 @@ module VagrantPlugins
             env[:machine].provider.driver.set_name(name)
           end
 
+          # Create the sentinel
+          sentinel.open("w") do |f|
+            f.write(Time.now.to_i.to_s)
+          end
+
           @app.call(env)
         end
       end

data/plugins/providers/virtualbox/config.rb

@@ -13,6 +13,14 @@ module VagrantPlugins
       # @return [Array]
       attr_reader :customizations
 
+      # If true, unused network interfaces will automatically be deleted.
+      # This defaults to false because the detection does not work across
+      # multiple users, and because on Windows this operation requires
+      # administrative privileges.
+      #
+      # @return [Boolean]
+      attr_accessor :destroy_unused_network_interfaces
+
       # If set to `true`, then VirtualBox will be launched with a GUI.
       #
       # @return [Boolean]
@@ -32,6 +40,7 @@ module VagrantPlugins
       def initialize
         @auto_nat_dns_proxy = UNSET_VALUE
         @customizations   = []
+        @destroy_unused_network_interfaces = UNSET_VALUE
         @name             = UNSET_VALUE
         @network_adapters = {}
         @gui              = UNSET_VALUE
@@ -52,8 +61,10 @@ module VagrantPlugins
       #
       # @param [Array] command An array of arguments to pass to
       # VBoxManage.
-      def customize(command)
-        @customizations << command
+      def customize(*command)
+        event   = command.first.is_a?(String) ? command.shift : "pre-boot"
+        command = command[0]
+        @customizations << [event, command]
       end
 
       # This defines a network adapter that will be added to the VirtualBox
@@ -71,6 +82,10 @@ module VagrantPlugins
         # Default is to auto the DNS proxy
         @auto_nat_dns_proxy = true if @auto_nat_dns_proxy == UNSET_VALUE
 
+        if @destroy_unused_network_interfaces == UNSET_VALUE
+          @destroy_unused_network_interfaces = false
+        end
+
         # Default is to not show a GUI
         @gui = false if @gui == UNSET_VALUE
 
@@ -78,6 +93,28 @@ module VagrantPlugins
         @name = nil if @name == UNSET_VALUE
       end
 
+      def validate(machine)
+        errors = []
+
+        valid_events = ["pre-import", "pre-boot", "post-boot"]
+        @customizations.each do |event, _|
+          if !valid_events.include?(event)
+            errors << I18n.t(
+              "vagrant.virtualbox.config.invalid_event",
+              event: event.to_s,
+              valid_events: valid_events.join(", "))
+          end
+        end
+
+        @customizations.each do |event, command|
+          if event == "pre-import" && command.index(:id)
+            errors << I18n.t("vagrant.virtualbox.config.id_in_pre_import")
+          end
+        end
+
+        { "VirtualBox Provider" => errors }
+      end
+
       def to_s
         "VirtualBox"
       end

data/plugins/providers/virtualbox/driver/base.rb

@@ -153,6 +153,11 @@ module VagrantPlugins
         def import(ovf)
         end
 
+        # Returns the maximum number of network adapters.
+        def max_network_adapters
+          8
+        end
+
         # Returns a list of forwarded ports for a VM.
         #
         # @param [String] uuid UUID of the VM to read from, or `nil` if this

data/plugins/providers/virtualbox/driver/meta.rb

@@ -32,7 +32,8 @@ module VagrantPlugins
           # specific driver to instantiate.
           begin
             @version = read_version || ""
-          rescue Vagrant::Util::Subprocess::LaunchError
+          rescue Vagrant::Errors::CommandUnavailable,
+            Vagrant::Errors::CommandUnavailableWindows
             # This means that VirtualBox was not found, so we raise this
             # error here.
             raise Vagrant::Errors::VirtualBoxNotDetected
@@ -46,6 +47,11 @@ module VagrantPlugins
             "4.2" => Version_4_2
           }
 
+          if @version.start_with?("4.2.14")
+            # VirtualBox 4.2.14 just doesn't work with Vagrant, so show error
+            raise Vagrant::Errors::VirtualBoxBrokenVersion040214
+          end
+
           driver_klass = nil
           driver_map.each do |key, klass|
             if @version.start_with?(key)

data/plugins/providers/virtualbox/driver/version_4_0.rb

@@ -142,9 +142,9 @@ module VagrantPlugins
           ports.each do |options|
             pf_builder = [options[:name],
               options[:protocol] || "tcp",
-              "",
+              options[:hostip] || "",
               options[:hostport],
-              "",
+              options[:guestip] || "",
               options[:guestport]]
 
             args.concat(["--natpf#{options[:adapter] || 1}",

data/plugins/providers/virtualbox/driver/version_4_1.rb

@@ -142,9 +142,9 @@ module VagrantPlugins
           ports.each do |options|
             pf_builder = [options[:name],
               options[:protocol] || "tcp",
-              "",
+              options[:hostip] || "",
               options[:hostport],
-              "",
+              options[:guestip] || "",
               options[:guestport]]
 
             args.concat(["--natpf#{options[:adapter] || 1}",

data/plugins/providers/virtualbox/driver/version_4_2.rb

@@ -202,6 +202,10 @@ module VagrantPlugins
           nil
         end
 
+        def max_network_adapters
+          36
+        end
+
         def read_forwarded_ports(uuid=nil, active_only=false)
           uuid ||= @uuid
 
@@ -326,6 +330,19 @@ module VagrantPlugins
           nil
         end
 
+        def read_mac_addresses
+          macs = {}
+          info = execute("showvminfo", @uuid, "--machinereadable", :retryable => true)
+          info.split("\n").each do |line|
+            if matcher = /^macaddress(\d+)="(.+?)"$/.match(line)
+              adapter = matcher[1].to_i
+              mac = matcher[2].to_s
+              macs[adapter] = mac
+            end
+          end
+          macs
+        end
+
         def read_machine_folder
           execute("list", "systemproperties", :retryable => true).split("\n").each do |line|
             if line =~ /^Default machine folder:\s+(.+?)$/i

data/plugins/providers/virtualbox/model/forwarded_port.rb

@@ -24,6 +24,11 @@ module VagrantPlugins
         # @return [String]
         attr_reader :protocol
 
+        # The IP that the forwarded port will connect to on the guest machine.
+        #
+        # @return [String]
+        attr_reader :guest_ip
+
         # The port on the guest to be exposed on the host.
         #
         # @return [Integer]
@@ -45,9 +50,10 @@ module VagrantPlugins
           @host_port  = host_port
 
           options ||= {}
-          @auto_correct = true
+          @auto_correct = false
           @auto_correct = options[:auto_correct] if options.has_key?(:auto_correct)
           @adapter  = (options[:adapter] || 1).to_i
+          @guest_ip = options[:guest_ip] || nil
           @host_ip = options[:host_ip] || nil
           @protocol = options[:protocol] || "tcp"
         end