vagrant-parallels 1.4.2 → 1.4.3

data/lib/vagrant-parallels/action/import.rb

@@ -38,8 +38,8 @@ module VagrantPlugins
           unregister_template(tpl_name)
 
           if @machine.state.id != :not_created
-            return if env["vagrant.error"].is_a?(Vagrant::Errors::VagrantError)
-            return if env["vagrant_parallels.error"].is_a?(Errors::VagrantParallelsError)
+            return if env['vagrant.error'].is_a?(Vagrant::Errors::VagrantError)
+            return if env['vagrant_parallels.error'].is_a?(Errors::VagrantParallelsError)
 
             # If we're not supposed to destroy on error then just return
             return if !env[:destroy_on_error]
@@ -79,24 +79,48 @@ module VagrantPlugins
         end
 
         def import(env, tpl_name)
-          # Generate virtual machine name
-          vm_name = "#{tpl_name}_#{(Time.now.to_f * 1000.0).to_i}_#{rand(100000)}"
-          opts = {}
-
           # Linked clones are supported only for PD 11 and higher
-          if @machine.provider_config.use_linked_clone &&
-            @machine.provider.pd_version_satisfies?('>= 11')
+          if @machine.provider_config.use_linked_clone \
+            && @machine.provider.pd_version_satisfies?('>= 11')
 
             env[:ui].info I18n.t('vagrant_parallels.actions.vm.import.importing_linked',
                                  :name => @machine.box.name)
-            opts[:snapshot_id] = snapshot_id(tpl_name)
-            opts[:linked] = true
+            opts = {
+              snapshot_id: snapshot_id(tpl_name),
+              linked: true
+            }
+            # Linked clone creation should not be concurrent [GH-206]
+            begin
+              @machine.env.lock("parallels_linked_clone") do
+                clone(env, tpl_name, opts)
+              end
+            rescue Vagrant::Errors::EnvironmentLockedError
+              sleep 1
+              retry
+            end
           else
-            env[:ui].info I18n.t("vagrant.actions.vm.import.importing",
+            env[:ui].info I18n.t('vagrant.actions.vm.import.importing',
                                  :name => @machine.box.name)
+            clone(env, tpl_name)
+          end
+
+          if @machine.provider_config.regen_src_uuid
+            @logger.info('Regenerate SourceVmUuid')
+            @machine.provider.driver.regenerate_src_uuid
           end
 
-          # Import the virtual machine
+          # Remove 'Icon\r' file from VM home (bug in PD 11.0.0)
+          if @machine.provider.pd_version_satisfies?('= 11.0.0')
+            vm_home = @machine.provider.driver.read_settings.fetch('Home')
+            broken_icns = Dir[File.join(vm_home, 'Icon*')]
+            FileUtils.rm(broken_icns, :force => true)
+          end
+        end
+
+        def clone(env, tpl_name, opts={})
+          # Generate virtual machine name
+          vm_name = "#{tpl_name}_#{(Time.now.to_f * 1000.0).to_i}_#{rand(100000)}"
+
           @machine.id = @machine.provider.driver.clone_vm(tpl_name, vm_name, opts) do |progress|
             env[:ui].clear_line
             env[:ui].report_progress(progress, 100, false)
@@ -109,18 +133,6 @@ module VagrantPlugins
           # Clear the line one last time since the progress meter doesn't disappear
           # immediately.
           env[:ui].clear_line
-
-          if @machine.provider_config.regen_src_uuid
-            @logger.info("Regenerate SourceVmUuid")
-            @machine.provider.driver.regenerate_src_uuid
-          end
-
-          # Remove 'Icon\r' file from VM home (bug in PD 11.0.0)
-          if @machine.provider.pd_version_satisfies?('= 11.0.0')
-            vm_home = @machine.provider.driver.read_settings.fetch('Home')
-            broken_icns = Dir[File.join(vm_home, 'Icon*')]
-            FileUtils.rm(broken_icns, :force => true)
-          end
         end
 
         def snapshot_id(tpl_name)

data/lib/vagrant-parallels/action/network.rb

@@ -1,9 +1,9 @@
-require "set"
+require 'set'
 
-require "log4r"
+require 'log4r'
 
-require "vagrant/util/network_ip"
-require "vagrant/util/scoped_hash_override"
+require 'vagrant/util/network_ip'
+require 'vagrant/util/scoped_hash_override'
 
 module VagrantPlugins
   module Parallels
@@ -36,7 +36,7 @@ module VagrantPlugins
           end
 
           @logger.debug("Available slots for high-level adapters: #{available_slots.inspect}")
-          @logger.info("Determining network adapters required for high-level configuration...")
+          @logger.info('Determining network adapters required for high-level configuration...')
           available_slots = available_slots.to_a.sort
           env[:machine].config.vm.networks.each do |type, options|
             # We only handle private and public networks
@@ -69,7 +69,7 @@ module VagrantPlugins
             network_adapters_config[slot] = data
           end
 
-          @logger.info("Determining adapters and compiling network configuration...")
+          @logger.info('Determining adapters and compiling network configuration...')
           adapters = []
           networks = []
           network_adapters_config.each do |slot, data|
@@ -107,14 +107,14 @@ module VagrantPlugins
 
           if !adapters.empty?
             # Enable the adapters
-            @logger.info("Enabling adapters...")
-            env[:ui].output(I18n.t("vagrant.actions.vm.network.preparing"))
+            @logger.info('Enabling adapters...')
+            env[:ui].output(I18n.t('vagrant.actions.vm.network.preparing'))
             adapters.each do |adapter|
               env[:ui].detail(I18n.t(
-                "vagrant_parallels.parallels.network_adapter",
+                'vagrant_parallels.parallels.network_adapter',
                 adapter: adapter[:adapter].to_s,
                 type: adapter[:type].to_s,
-                extra: "",
+                extra: '',
               ))
             end
 
@@ -132,14 +132,14 @@ module VagrantPlugins
             # Only configure the networks the user requested us to configure
             networks_to_configure = networks.select { |n| n[:auto_config] }
             if !networks_to_configure.empty?
-              env[:ui].info I18n.t("vagrant.actions.vm.network.configuring")
+              env[:ui].info I18n.t('vagrant.actions.vm.network.configuring')
               env[:machine].guest.capability(:configure_networks, networks_to_configure)
             end
           end
         end
 
         def bridged_config(options)
-          return {
+          {
             auto_config:                     true,
             bridge:                          nil,
             mac:                             nil,
@@ -151,7 +151,7 @@ module VagrantPlugins
         def bridged_adapter(config)
           # Find the bridged interfaces that are available
           bridgedifs = @env[:machine].provider.driver.read_bridged_interfaces
-          bridgedifs.delete_if { |interface| interface[:status] == "Down" }
+          bridgedifs.delete_if { |interface| interface[:status] == 'Down' }
 
           # The name of the chosen bridge interface will be assigned to this
           # variable.
@@ -163,7 +163,7 @@ module VagrantPlugins
             # Search for a matching bridged interface
             bridgedifs.each do |interface|
               if interface[:name].downcase == config[:bridge].downcase
-                @logger.debug("Specific bridge found as configured in the Vagrantfile. Using it.")
+                @logger.debug('Specific bridge found as configured in the Vagrantfile. Using it.')
                 chosen_bridge = interface[:name]
                 break
               end
@@ -171,7 +171,7 @@ module VagrantPlugins
 
             # If one wasn't found, then we notify the user here.
             if !chosen_bridge
-              @env[:ui].info I18n.t("vagrant.actions.vm.bridged_networking.specific_not_found",
+              @env[:ui].info I18n.t('vagrant.actions.vm.bridged_networking.specific_not_found',
                                     :bridge => config[:bridge])
             end
           end
@@ -184,18 +184,18 @@ module VagrantPlugins
             if bridgedifs.length == 1
               # One bridgable interface? Just use it.
               chosen_bridge = bridgedifs[0][:name]
-              @logger.debug("Only one bridged interface available. Using it by default.")
+              @logger.debug('Only one bridged interface available. Using it by default.')
             else
               # More than one bridgable interface requires a user decision, so
               # show options to choose from.
-              @env[:ui].info I18n.t("vagrant.actions.vm.bridged_networking.available",
+              @env[:ui].info I18n.t('vagrant.actions.vm.bridged_networking.available',
                                     :prefix => false)
               bridgedifs.each_index do |index|
                 interface = bridgedifs[index]
                 @env[:ui].info("#{index + 1}) #{interface[:name]}", :prefix => false)
               end
               @env[:ui].info(I18n.t(
-                "vagrant.actions.vm.bridged_networking.choice_help")+"\n")
+                               'vagrant.actions.vm.bridged_networking.choice_help')+"\n")
 
               # The range of valid choices
               valid = Range.new(1, bridgedifs.length)
@@ -215,7 +215,7 @@ module VagrantPlugins
           @logger.info("Bridging adapter #{config[:adapter]} to #{chosen_bridge}")
 
           # Given the choice we can now define the adapter we're using
-          return {
+          {
             adapter:     config[:adapter],
             type:        :bridged,
             bridge:      chosen_bridge,
@@ -229,14 +229,14 @@ module VagrantPlugins
             options = {
               auto_config: true,
               mac:         nil,
-              netmask:     "255.255.255.0",
+              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]
           }
@@ -248,7 +248,7 @@ module VagrantPlugins
             mac:         nil,
             name:        nil,
             nic_type:    nil,
-            netmask:     "255.255.255.0",
+            netmask:     '255.255.255.0',
             type:        :static
           }.merge(options)
 
@@ -256,7 +256,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] = "10.37.129.1" if options[:type] == :dhcp && !options[:ip]
+          options[:ip] = '10.37.129.1' if options[:type] == :dhcp && !options[:ip]
 
           # Calculate our network address for the given IP/netmask
           netaddr  = network_address(options[:ip], options[:netmask])
@@ -271,17 +271,17 @@ module VagrantPlugins
           @env[:machine].provider.driver.read_bridged_interfaces.each do |interface|
             that_netaddr = network_address(interface[:ip], interface[:netmask])
             raise Vagrant::Errors::NetworkCollision if \
-              netaddr == that_netaddr && interface[:status] != "Down"
+              netaddr == that_netaddr && interface[:status] != 'Down'
           end
 
           # Split the IP address into its components
-          ip_parts = netaddr.split(".").map { |i| i.to_i }
+          ip_parts = netaddr.split('.').map { |i| i.to_i }
 
           # Calculate the adapter IP, which we assume is the IP ".1" at
           # the end usually.
           adapter_ip    = ip_parts.dup
           adapter_ip[3] += 1
-          options[:adapter_ip] ||= adapter_ip.join(".")
+          options[:adapter_ip] ||= adapter_ip.join('.')
 
           dhcp_options = {}
           if options[:type] == :dhcp
@@ -289,19 +289,19 @@ module VagrantPlugins
             # with the final octet + 1. So "172.28.0.0" turns into "172.28.0.1"
             dhcp_ip    = ip_parts.dup
             dhcp_ip[3] += 1
-            dhcp_options[:dhcp_ip] = options[:dhcp_ip] || dhcp_ip.join(".")
+            dhcp_options[:dhcp_ip] = options[:dhcp_ip] || dhcp_ip.join('.')
 
             # Calculate the lower and upper bound for the DHCP server
             dhcp_lower    = ip_parts.dup
             dhcp_lower[3] += 2
-            dhcp_options[:dhcp_lower] = options[:dhcp_lower] || dhcp_lower.join(".")
+            dhcp_options[:dhcp_lower] = options[:dhcp_lower] || dhcp_lower.join('.')
 
             dhcp_upper    = ip_parts.dup
             dhcp_upper[3] = 254
-            dhcp_options[:dhcp_upper] = options[:dhcp_upper] || dhcp_upper.join(".")
+            dhcp_options[:dhcp_upper] = options[:dhcp_upper] || dhcp_upper.join('.')
           end
 
-          return {
+          {
             adapter_ip:  options[:adapter_ip],
             auto_config: options[:auto_config],
             ip:          options[:ip],
@@ -318,14 +318,14 @@ module VagrantPlugins
           interface = hostonly_find_matching_network(config)
 
           if !interface
-            @logger.info("Network not found. Creating if we can.")
+            @logger.info('Network not found. Creating if we can.')
 
             # Create a new network
             interface = hostonly_create_network(config)
             @logger.info("Created network: #{interface[:name]}")
           end
 
-          return {
+          {
             adapter:     config[:adapter],
             hostonly:    interface[:name],
             mac_address: config[:mac],
@@ -335,7 +335,7 @@ module VagrantPlugins
         end
 
         def hostonly_network_config(config)
-          return {
+          {
             type:       config[:type],
             adapter_ip: config[:adapter_ip],
             ip:         config[:ip],
@@ -345,20 +345,20 @@ module VagrantPlugins
 
 
         def shared_config(options)
-          return {
+          {
             auto_config: false
           }
         end
 
         def shared_adapter(config)
-          return {
+          {
             adapter: config[:adapter],
             type:    :shared
           }
         end
 
         def shared_network_config(config)
-          return {}
+          {}
         end
 
         #-----------------------------------------------------------------
@@ -408,7 +408,7 @@ module VagrantPlugins
           end
 
           if net_nums.empty?
-            "vagrant-vnet0"
+            'vagrant-vnet0'
           else
             net_nums.sort! if net_nums
             free_names = Array(0..net_nums.last.next) - net_nums

data/lib/vagrant-parallels/action/package.rb

@@ -12,13 +12,13 @@ module VagrantPlugins
         def call(env)
           # Setup the temporary directory
           @temp_dir = env[:tmp_path].join(Time.now.to_i.to_s)
-          env["export.temp_dir"] = @temp_dir
-          FileUtils.mkpath(env["export.temp_dir"])
+          env['export.temp_dir'] = @temp_dir
+          FileUtils.mkpath(env['export.temp_dir'])
 
           # Just match up a couple environmental variables so that
           # the superclass will do the right thing. Then, call the
           # superclass
-          env["package.directory"] = env["export.temp_dir"]
+          env['package.directory'] = env['export.temp_dir']
 
           general_call(env)
 

data/lib/vagrant-parallels/action/package_config_files.rb

@@ -18,12 +18,13 @@ module VagrantPlugins
         end
 
         def create_metadata
-          File.open(File.join(@env["export.temp_dir"], "metadata.json"), "w") do |f|
+          File.open(File.join(@env['export.temp_dir'], 'metadata.json'), 'w') do |f|
             f.write(template_metadatafile)
           end
         end
 
-      private
+        private
+
         def template_metadatafile
           %Q({"provider": "parallels"}\n)
         end

data/lib/vagrant-parallels/action/prepare_nfs_settings.rb

@@ -1,5 +1,5 @@
 require 'ipaddr'
-require "vagrant/action/builtin/mixin_synced_folders"
+require 'vagrant/action/builtin/mixin_synced_folders'
 
 module VagrantPlugins
   module Parallels
@@ -25,7 +25,7 @@ module VagrantPlugins
           folders = synced_folders(env[:machine], **opts)
 
           if folders.has_key?(:nfs)
-            @logger.info("Using NFS, preparing NFS settings by reading host IP and machine IP")
+            @logger.info('Using NFS, preparing NFS settings by reading host IP and machine IP')
             add_ips_to_env!(env)
           end
         end

data/lib/vagrant-parallels/action/resume.rb

@@ -10,7 +10,7 @@ module VagrantPlugins
           current_state = env[:machine].state.id
 
           if current_state == :suspended
-            env[:ui].info I18n.t("vagrant.actions.vm.resume.resuming")
+            env[:ui].info I18n.t('vagrant.actions.vm.resume.resuming')
             env[:machine].provider.driver.resume
           end
 

data/lib/vagrant-parallels/action/sane_defaults.rb

@@ -48,7 +48,6 @@ module VagrantPlugins
             @env[:machine].provider.driver.set_power_consumption_mode(new_val)
           end
         end
-
       end
     end
   end

data/lib/vagrant-parallels/action/set_name.rb

@@ -1,4 +1,4 @@
-require "log4r"
+require 'log4r'
 
 module VagrantPlugins
   module Parallels
@@ -13,16 +13,16 @@ module VagrantPlugins
           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")
+          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.")
+            @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}_#{env[:machine].name}"
-            prefix.gsub!(/[^-a-z0-9_]/i, "")
+            prefix.gsub!(/[^-a-z0-9_]/i, '')
             # milliseconds + random number suffix to allow for simultaneous `vagrant up` of the same box in different dirs
             name = prefix + "_#{(Time.now.to_f * 1000.0).to_i}_#{rand(100000)}"
           end
@@ -33,15 +33,15 @@ module VagrantPlugins
             vms_names.has_key?(name) && vms_names[name] != env[:machine].id
 
           if vms_names.has_key?(name)
-            @logger.info("Not setting the name because our name is already set.")
+            @logger.info('Not setting the name because our name is already set.')
           else
             env[:ui].info(I18n.t(
-                            "vagrant.actions.vm.set_name.setting_name", name: name))
+                            'vagrant.actions.vm.set_name.setting_name', name: name))
             env[:machine].provider.driver.set_name(name)
           end
 
           # Create the sentinel
-          sentinel.open("w") do |f|
+          sentinel.open('w') do |f|
             f.write(Time.now.to_i.to_s)
           end