vagrant-parallels 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f3bf1ad034ff3a2348dd22548ffb3d28659a88b
-  data.tar.gz: 87d833100c9d729fce001d72797e482a06702e1d
+  metadata.gz: f3e2eafea3e2e0ae509943e4ebb2cb4a130b3d56
+  data.tar.gz: 9b0786ae6319a6de87a44177dc6d71a38092a2bb
 SHA512:
-  metadata.gz: 4bddae6096c51c901b09c06b7cadc0e276de1ee1d7324bc1f74e8ebb28a4ce0fbd7eddf1e744594e7d62cf282240a6254e23613b10cbe47e275f0d88dbb16811
-  data.tar.gz: 3f830fd2bb2b74d2fa1ae312ae7c233f34aaf3e8e4b9328482d86e366a149f9be386f020157391c4b05fd6e6886bf3e9c6d3c50eecdcb435b188e1b62310f8b6
+  metadata.gz: c99c4916c89822602b2436c56be351cd4ac2d796f89fefee4d0a08caeb7eac55a30a18504a2c4f7b3f670d9d26e06a537c37e06798f279026aff921885ff0eb4
+  data.tar.gz: 87a0f541244f1cf52d8d74e52c86ee7c7b5dab6653a9d2c8c2a967e0319c2fa753cb3057fb01e8b6d2c951e656685af85f1c94d65de032fcf0c90b85d5e75681

data/.travis.yml

@@ -1,8 +1,6 @@
 language: ruby
 before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq -y bsdtar
-  - gem install bundler -v '1.5.2'
+  - gem install bundler -v '1.6.6'
 rvm:
   - 2.0.0
 script: rake test:unit

data/LICENSE.txt

@@ -1,4 +1,5 @@
 Copyright (c) 2013 Youssef Shahin
+Copyright (c) 2013-2014 Parallels IP Holdings GmbH.
 
 MIT License
 

data/lib/vagrant-parallels/action.rb

@@ -304,6 +304,31 @@ module VagrantPlugins
         end
       end
 
+      # This action sync folders on a running provider. It is used by the docker provider
+      # to link synced folders on the host machine as volumes into the docker containers
+      def self.action_sync_folders
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use Call, IsState, :not_created do |env1, b1|
+            if env1[:result]
+              b1.use Message, I18n.t("vagrant.commands.common.vm_not_created")
+              next
+            end
+
+            b1.use Call, IsState, :running do |env2, b2|
+              if !env2[:result]
+                b2.use Message, I18n.t("vagrant.commands.common.vm_not_running")
+                next
+              end
+
+              b2.use SyncedFolders
+              b2.use PrepareNFSSettings
+            end
+          end
+        end
+      end
+
+
       autoload :Boot, File.expand_path("../action/boot", __FILE__)
       autoload :HandleGuestTools, File.expand_path("../action/handle_guest_tools", __FILE__)
       autoload :HandleForwardedPortCollisions, File.expand_path("../action/handle_forwarded_port_collisions.rb", __FILE__)

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

@@ -13,17 +13,9 @@ module VagrantPlugins
             raise Vagrant::Errors::VMPowerOffToPackage
           end
 
-          name = "#{env[:root_path].basename.to_s}_#{env[:machine].name}"
-          name.gsub!(/[^-a-z0-9_]/i, "")
+          @tpl_name = gen_template_name
 
-          # Check the name is not in use
-          if @env[:machine].provider.driver.read_vms.has_key?(@template_name)
-            @template_name << rand(100000).to_s
-          end
-
-
-          @template_name = gen_template_name
-          @template_uuid = export
+          export
           compact_template
           unregister_template
 
@@ -42,21 +34,24 @@ module VagrantPlugins
           name = @env[:machine].provider_config.name
           if !name
             name = "#{@env[:root_path].basename.to_s}_#{@env[:machine].name}"
-            name.gsub!(/[^-a-z0-9_]/i, "")
+            name.gsub!(/[^-a-z0-9_]/i, '')
           end
+
           tpl_name = "#{name}_box"
 
           # Ensure that the name is not in use
-          if @env[:machine].provider.driver.read_vms.has_key?(tpl_name)
-            tpl_name << "_#{rand(1000)}"
+          ind = 0
+          while @env[:machine].provider.driver.read_vms.has_key?(tpl_name)
+            ind += 1
+            tpl_name = "#{name}_box_#{ind}"
           end
 
           tpl_name
         end
 
         def export
-          @env[:ui].info I18n.t("vagrant.actions.vm.export.exporting")
-          tpl_uuid = @env[:machine].provider.driver.export(@env["export.temp_dir"], @template_name) do |progress|
+          @env[:ui].info I18n.t('vagrant.actions.vm.export.exporting')
+          @env[:machine].provider.driver.export(@env['export.temp_dir'], @tpl_name) do |progress|
             @env[:ui].clear_line
             @env[:ui].report_progress(progress, 100, false)
 
@@ -68,13 +63,11 @@ module VagrantPlugins
           # Clear the line a final time so the next data can appear
           # alone on the line.
           @env[:ui].clear_line
-
-          tpl_uuid
         end
 
         def compact_template
-          @env[:ui].info I18n.t("vagrant_parallels.actions.vm.export.compacting")
-          @env[:machine].provider.driver.compact(@template_uuid) do |progress|
+          @env[:ui].info I18n.t('vagrant_parallels.actions.vm.export.compacting')
+          @env[:machine].provider.driver.compact(@tpl_name) do |progress|
             @env[:ui].clear_line
             @env[:ui].report_progress(progress, 100, false)
           end
@@ -85,10 +78,8 @@ module VagrantPlugins
         end
 
         def unregister_template
-          if @env[:machine].provider.driver.registered?(@template_uuid)
-            @logger.info("Unregister the box template: '#{@template_uuid}'")
-            @env[:machine].provider.driver.unregister(@template_uuid)
-          end
+          @logger.info("Unregister the box template: '#{@tpl_name}'")
+          @env[:machine].provider.driver.unregister(@tpl_name)
         end
       end
     end

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

@@ -13,7 +13,7 @@ module VagrantPlugins
           if env[:machine].provider.pd_version_satisfies?('>= 10')
             super
           else
-            # Just continue if port forwarding is not supporting
+            # Just continue if port forwarding is not supported
             @app.call(env)
           end
         end
@@ -22,7 +22,7 @@ module VagrantPlugins
           if env[:machine].provider.pd_version_satisfies?('>= 10')
             super
           end
-          # Do nothing if port forwarding is not supporting
+          # Do nothing if port forwarding is not supported
         end
       end
     end

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

@@ -1,3 +1,5 @@
+require 'nokogiri'
+
 module VagrantPlugins
   module Parallels
     module Action
@@ -8,27 +10,36 @@ module VagrantPlugins
         end
 
         def call(env)
-          @env = env
-          @template_path = File.realpath(Pathname.glob(env[:machine].box.directory.join('*.pvm')).first)
-          @template_uuid = register_template
-          import
-          unregister_template
+          @machine = env[:machine]
+
+          # Register template to be able to clone it further
+          register_template(template_path.to_s)
+
+          # Get template name. It might be changed during registration if name
+          # collision has been occurred
+          tpl_name = template_name(template_path)
+
+          # Import VM, e.q. clone it from registered template
+          import(env, tpl_name)
+
+          # Hide template since we dont need it anymore
+          unregister_template(tpl_name)
 
           # Flag as erroneous and return if import failed
-          raise VagrantPlugins::Parallels::Errors::VMImportFailure if !env[:machine].id
+          raise Errors::VMImportFailure if !@machine.id
 
           # Import completed successfully. Continue the chain
           @app.call(env)
         end
 
         def recover(env)
-          @env = env
           # We should to unregister template
-          unregister_template
+          tpl_name = template_name(template_path)
+          unregister_template(tpl_name)
 
-          if env[:machine].state.id != :not_created
+          if @machine.state.id != :not_created
             return if env["vagrant.error"].is_a?(Vagrant::Errors::VagrantError)
-            return if env["vagrant_parallels.error"].is_a?(VagrantPlugins::Parallels::Errors::VagrantParallelsError)
+            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]
@@ -45,42 +56,51 @@ module VagrantPlugins
 
         protected
 
-        def register_template
-          if !@env[:machine].provider.driver.read_vms_paths.has_key?(@template_path)
-            @logger.info("Register the box template: '#{@template_path}'")
-            regen_uuid = @env[:machine].provider_config.regen_box_uuid
+        def register_template(tpl_path_s)
+          @logger.info("Register the box template: '#{tpl_path_s}'")
+          regen_uuid = @machine.provider_config.regen_box_uuid
 
-            @env[:machine].provider.driver.register(@template_path, regen_uuid)
-          end
+          @machine.provider.driver.register(tpl_path_s, regen_uuid)
+        end
 
-          # Return the uuid of registered template
-          @env[:machine].provider.driver.read_vms_paths[@template_path]
+        def template_path
+          Pathname.glob(@machine.box.directory.join('*.pvm')).first
         end
 
-        def import
-          @env[:ui].info I18n.t("vagrant.actions.vm.import.importing",
-                               :name => @env[:machine].box.name)
+        def template_name(tpl_path)
+          # Get template name from XML-based configuration file
+          tpl_config = tpl_path.join('config.pvs')
+          xml = Nokogiri::XML(File.open(tpl_config))
+          name = xml.xpath('//ParallelsVirtualMachine/Identification/VmName').text
+
+          if !name
+            raise Errors::ParallelsTplNameNotFound, config_path: tpl_config
+          end
+
+          name
+        end
 
+        def import(env, tpl_name)
+          env[:ui].info I18n.t("vagrant.actions.vm.import.importing",
+                               :name => @machine.box.name)
           # Import the virtual machine
-          @env[:machine].id = @env[:machine].provider.driver.import(@template_uuid) do |progress|
-            @env[:ui].clear_line
-            @env[:ui].report_progress(progress, 100, false)
+          @machine.id = @machine.provider.driver.import(tpl_name) do |progress|
+            env[:ui].clear_line
+            env[:ui].report_progress(progress, 100, false)
 
             # # If we got interrupted, then the import could have been interrupted.
             # Just rise an exception and then 'recover' will be called to cleanup.
-            raise Vagrant::Errors::VagrantInterrupt if @env[:interrupted]
+            raise Vagrant::Errors::VagrantInterrupt if env[:interrupted]
           end
 
           # Clear the line one last time since the progress meter doesn't disappear
           # immediately.
-          @env[:ui].clear_line
+          env[:ui].clear_line
         end
 
-        def unregister_template
-          if @env[:machine].provider.driver.registered?(@template_uuid)
-            @logger.info("Unregister the box template: '#{@template_uuid}'")
-            @env[:machine].provider.driver.unregister(@template_uuid)
-          end
+        def unregister_template(tpl_name)
+          @logger.info("Unregister the box template: '#{tpl_name}'")
+          @machine.provider.driver.unregister(tpl_name)
         end
       end
     end

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

@@ -234,6 +234,7 @@ module VagrantPlugins
           options = {
             auto_config: true,
             mac:         nil,
+            name:        nil,
             nic_type:    nil,
             netmask:     "255.255.255.0",
             type:        :static
@@ -293,6 +294,7 @@ module VagrantPlugins
             auto_config: options[:auto_config],
             ip:          options[:ip],
             mac:         options[:mac],
+            name:        options[:name],
             netmask:     options[:netmask],
             nic_type:    options[:nic_type],
             type:        options[:type]
@@ -306,12 +308,6 @@ module VagrantPlugins
           if !interface
             @logger.info("Network not found. Creating if we can.")
 
-            # It is an error if a specific host only network name was specified
-            # but the network wasn't found.
-            if config[:name]
-              raise Vagrant::Errors::NetworkNotFound, :name => config[:name]
-            end
-
             # Create a new network
             interface = hostonly_create_network(config)
             @logger.info("Created network: #{interface[:name]}")
@@ -414,7 +410,7 @@ module VagrantPlugins
         # This creates a host only network for the given configuration.
         def hostonly_create_network(config)
           options = {
-            network_id: next_network_id,
+            network_id: config[:name] || next_network_id,
             adapter_ip: config[:adapter_ip],
             netmask:    config[:netmask],
           }
@@ -432,15 +428,20 @@ module VagrantPlugins
 
         # This finds a matching host only network for the given configuration.
         def hostonly_find_matching_network(config)
-          this_netaddr = network_address(config[:ip], config[:netmask])
+          existing = @env[:machine].provider.driver.read_host_only_interfaces
 
-          @env[:machine].provider.driver.read_host_only_interfaces.each do |interface|
-            return interface if config[:name] && config[:name] == interface[:name]
-            return interface if this_netaddr == \
-              network_address(interface[:ip], interface[:netmask])
+          if config[:name]
+            # Search networks strongly by specified name
+            matched_iface = existing.detect { |i| config[:name] == i[:name] }
+          else
+            # Name is not specified - search by network address
+            this_netaddr = network_address(config[:ip], config[:netmask])
+            matched_iface = existing.detect do |i|
+              this_netaddr == network_address(i[:ip], i[:netmask])
+            end
           end
 
-          nil
+          matched_iface || nil
         end
       end
     end

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

@@ -11,7 +11,7 @@ module VagrantPlugins
           @machine = env[:machine]
           @app.call(env)
 
-          if using_nfs?
+          if using_nfs?(@machine.config.vm) || using_nfs?(env[:synced_folders_config])
             @logger.info("Using NFS, preparing NFS settings by reading host IP and machine IP")
             add_ips_to_env!(env)
           end
@@ -20,8 +20,8 @@ module VagrantPlugins
         # We're using NFS if we have any synced folder with NFS configured. If
         # we are not using NFS we don't need to do the extra work to
         # populate these fields in the environment.
-        def using_nfs?
-          @machine.config.vm.synced_folders.any? { |_, opts| opts[:type] == :nfs }
+        def using_nfs?(env)
+          env && env.synced_folders.any? { |_, opts| opts[:type] == :nfs }
         end
 
         # Extracts the proper host and guest IPs for NFS mounts and stores them
@@ -30,9 +30,8 @@ module VagrantPlugins
         #
         # The ! indicates that this method modifies its argument.
         def add_ips_to_env!(env)
-          adapter, host_ip = find_host_only_adapter
-          machine_ip       = nil
-          machine_ip       = read_machine_ip if adapter
+          host_ip    = find_host_only_adapter
+          machine_ip = read_machine_ip
 
           raise Vagrant::Errors::NFSNoHostonlyNetwork if !host_ip || !machine_ip
 
@@ -40,18 +39,23 @@ module VagrantPlugins
           env[:nfs_machine_ip] = machine_ip
         end
 
-        # Finds first host only network adapter and returns its adapter number
-        # and IP address
+        # Finds first host only network adapter and returns its IP address
         #
-        # @return [Integer, String] adapter number, ip address of found host-only adapter
+        # @return [String] ip address of found host-only adapter
         def find_host_only_adapter
-          @machine.provider.driver.read_network_interfaces.each do |adapter, opts|
-            if opts[:type] == :hostonly
-              @machine.provider.driver.read_host_only_interfaces.each do |interface|
-                if interface[:name] == opts[:hostonly]
-                  return adapter, interface[:ip]
-                end
+          host_only_all = @machine.provider.driver.read_host_only_interfaces
+          host_only_used = @machine.provider.driver.read_network_interfaces.
+            select { |_, opts| opts[:type] == :hostonly }
+
+          host_only_used.each do |_, opts|
+            host_only_all.each do |interface|
+              if @machine.provider.pd_version_satisfies?('>= 10')
+                name_matched = interface[:name] == opts[:hostonly]
+              else
+                name_matched = interface[:bound_to] == opts[:hostonly]
               end
+
+              return interface[:ip] if name_matched
             end
           end
 

data/lib/vagrant-parallels/driver/base.rb

@@ -177,6 +177,14 @@ module VagrantPlugins
         def read_state
         end
 
+        # Returns a value of specified VM option
+        #
+        # @param [String] option Name of option (See all: `prlctl list -L`)
+        # @param [String] uuid Virtual machine UUID
+        # @return [String]
+        def read_vm_option(option, uuid=@uuid)
+        end
+
         # Returns a list of all registered
         # virtual machines and templates.
         #

data/lib/vagrant-parallels/driver/meta.rb

@@ -105,7 +105,6 @@ module VagrantPlugins
                        :read_vms_info,
                        :read_vms_paths,
                        :register,
-                       :registered?,
                        :resume,
                        :set_power_consumption_mode,
                        :set_mac_address,

data/lib/vagrant-parallels/driver/pd_10.rb

@@ -155,8 +155,8 @@ module VagrantPlugins
           net_list.each do |iface|
             info = {}
             net_info = json { execute_prlsrvctl('net', 'info', iface['Network ID'], '--json') }
-            # Really we need to work with bounded virtual interface
             info[:name]     = net_info['Network ID']
+            info[:bound_to] = net_info['Bound To']
             info[:ip]       = net_info['Parallels adapter']['IP address']
             info[:netmask]  = net_info['Parallels adapter']['Subnet mask']
             # Such interfaces are always in 'Up'
@@ -237,18 +237,6 @@ module VagrantPlugins
           info
         end
 
-        # Parse the JSON from *all* VMs and templates.
-        # Then return an array of objects (without duplicates)
-        def read_vms_info
-          vms_arr = json([]) do
-            execute_prlctl('list', '--all','--info', '--json')
-          end
-          templates_arr = json([]) do
-            execute_prlctl('list', '--all','--info', '--json', '--template')
-          end
-          vms_arr | templates_arr
-        end
-
         def read_used_ports
           # Ignore our own used ports
           read_forwarded_ports(true).reject { |r| r[:guest].include?(@uuid) }