vagrant-parallels 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 554c27b74a3e4f369b9b56289b2ad941109fdb57
-  data.tar.gz: 8cffa7aa2a2dff4b6d2234b65a6145f0b7df783b
+  metadata.gz: 3bb66fcb45443b929a94a608db1571c128d63391
+  data.tar.gz: ad196ab64285c216c5e7747cfd33b30475f56366
 SHA512:
-  metadata.gz: e0fa26a9ac70f1e82b0ea317d74e803529ace61c99d9a2b92d815a81444a71c01d0b2fe6fa4e355a0da3781e0d878005fae9a0d62245a8c9b540dbf85d52b7a9
-  data.tar.gz: 24365b17738e890b8cb6c8a990c1dc7a2711fc744d5d3ab4fd1afdb3c110575f91ef43953d2320b3a62138d6467bd7f7ddf6b51f53aefb0e89f68909f2b96770
+  metadata.gz: f5947a49b2946e6b389daed82507446b90e0b89d71a6008a010a232aa441bbd4eeb0a5dc1fc8eee65c658dab16aa12dd765cf5a465c4accf6e16d3e2a9787af8
+  data.tar.gz: 47f52fbd7b6014ba913e7a3d6865f49850348d6e5df7b072b12555b49bebcf10ea13870cd23b4adb65f5c15e2484acbb02f2d6eac63569e8877de784d065cd89

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

@@ -1,7 +1,13 @@
+require 'ipaddr'
+require "vagrant/action/builtin/mixin_synced_folders"
+
 module VagrantPlugins
   module Parallels
     module Action
       class PrepareNFSSettings
+        include Vagrant::Action::Builtin::MixinSyncedFolders
+        include Vagrant::Util::Retryable
+
         def initialize(app, env)
           @app = app
           @logger = Log4r::Logger.new('vagrant_parallels::action::nfs')
@@ -11,74 +17,35 @@ module VagrantPlugins
           @machine = env[:machine]
           @app.call(env)
 
-          if using_nfs?(@machine.config.vm) || using_nfs?(env[:synced_folders_config])
+          opts = {
+            cached: !!env[:synced_folders_cached],
+            config: env[:synced_folders_config],
+            disable_usable_check: !!env[:test],
+          }
+          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")
             add_ips_to_env!(env)
           end
         end
 
-        # 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?(env)
-          env && env.synced_folders.any? { |_, opts| opts[:type] == :nfs }
-        end
-
         # Extracts the proper host and guest IPs for NFS mounts and stores them
         # in the environment for the SyncedFolder action to use them in
         # mounting.
         #
         # The ! indicates that this method modifies its argument.
         def add_ips_to_env!(env)
-          host_ip    = find_host_only_adapter
-          machine_ip = read_machine_ip
+          host_ip  = @machine.provider.driver.read_shared_interface[:ip]
+          guest_ip = @machine.provider.driver.read_guest_ip
 
-          raise Vagrant::Errors::NFSNoHostonlyNetwork if !host_ip || !machine_ip
+          # If we couldn't determine either guest's or host's IP, then
+          # it is probably a bug. Display an appropriate error message.
+          raise Vagrant::Errors::NFSNoHostIP  if !host_ip
+          raise Vagrant::Errors::NFSNoGuestIP if !guest_ip
 
           env[:nfs_host_ip]    = host_ip
-          env[:nfs_machine_ip] = machine_ip
-        end
-
-        # Finds first host only network adapter and returns its IP address
-        #
-        # @return [String] ip address of found host-only adapter
-        def find_host_only_adapter
-          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
-
-          nil
-        end
-
-        # Returns the IP address of the guest by looking at the first
-        # enabled host only network.
-        #
-        # @return [String] ip address of adapter in guest
-        def read_machine_ip
-          ips = []
-          @machine.config.vm.networks.each do |type, options|
-            if type == :private_network && options[:ip].is_a?(String)
-              ips << options[:ip]
-            end
-          end
-
-          if ips.empty?
-            raise Vagrant::Errors::NFSNoGuestIP
-          end
-
-          ips
+          env[:nfs_machine_ip] = guest_ip
         end
       end
     end

data/lib/vagrant-parallels/action.rb

@@ -304,8 +304,9 @@ 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
+      # This is the action that is called to sync folders to a running machine
+      # without a reboot. 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
@@ -320,7 +321,7 @@ module VagrantPlugins
                 b2.use Message, I18n.t("vagrant.commands.common.vm_not_running")
                 next
               end
-
+              b2.use PrepareNFSValidIds
               b2.use SyncedFolders
               b2.use PrepareNFSSettings
             end

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

@@ -177,7 +177,8 @@ module VagrantPlugins
         def read_state
         end
 
-        # Returns a value of specified VM option
+        # Returns a value of specified VM option. Raises an exception if value
+        # is not available
         #
         # @param [String] option Name of option (See all: `prlctl list -L`)
         # @param [String] uuid Virtual machine UUID

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

@@ -32,8 +32,7 @@ module VagrantPlugins
           # specific driver to instantiate.
           begin
             @version = read_version || ""
-          rescue Vagrant::Errors::CommandUnavailable,
-            Vagrant::Errors::CommandUnavailableWindows
+          rescue Vagrant::Errors::CommandUnavailable
             # This means that Parallels Desktop was not found, so we raise this
             # error here.
             raise VagrantPlugins::Parallels::Errors::ParallelsNotDetected
@@ -89,6 +88,7 @@ module VagrantPlugins
                        :import,
                        :read_bridged_interfaces,
                        :read_forwarded_ports,
+                       :read_guest_ip,
                        :read_guest_tools_state,
                        :read_guest_tools_iso_path,
                        :read_host_only_interfaces,
@@ -101,6 +101,7 @@ module VagrantPlugins
                        :read_state,
                        :read_used_ports,
                        :read_virtual_networks,
+                       :read_vm_option,
                        :read_vms,
                        :read_vms_info,
                        :read_vms_paths,

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

@@ -392,7 +392,12 @@ module VagrantPlugins
         end
 
         def read_vm_option(option, uuid=@uuid)
-          execute_prlctl('list', uuid,'--no-header', '-o', option)
+          out = execute_prlctl('list', uuid,'--no-header', '-o', option).strip
+          if out.empty?
+            raise Errors::ParallelsVMOptionNotFound, vm_option: option
+          end
+
+          out
         end
 
         def read_vms

data/lib/vagrant-parallels/errors.rb

@@ -51,6 +51,10 @@ module VagrantPlugins
         error_key(:parallels_tpl_name_not_found)
       end
 
+      class ParallelsVMOptionNotFound < VagrantParallelsError
+        error_key(:parallels_vm_option_not_found)
+      end
+
       class VMImportFailure < VagrantParallelsError
         error_key(:vm_import_failure)
       end

data/lib/vagrant-parallels/provider.rb

@@ -15,10 +15,7 @@ module VagrantPlugins
         # version and all that, which checks for Parallels Desktop being present
         Driver::Meta.new
         true
-      rescue VagrantPlugins::Parallels::Errors::ParallelsInvalidVersion
-        raise if raise_error
-        return false
-      rescue VagrantPlugins::Parallels::Errors::ParallelsNotDetected
+      rescue Errors::VagrantParallelsError
         raise if raise_error
         return false
       end

data/lib/vagrant-parallels/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Parallels
-    VERSION = "1.3.3"
+    VERSION = "1.3.4"
   end
 end

data/locales/en.yml

@@ -70,6 +70,11 @@ en:
         the box you're using is not corrupted and try again.
 
         Template config path: "%{config_path}"
+
+      parallels_vm_option_not_found: |-
+        Could not find a required option of Parallels Desktop virtual machine:
+          %{vm_option}
+        This is an internal error that should be reported as a bug.
       vm_import_failure: |-
         The VM import failed! Please verify that the box you're using is not
         corrupted and try again.

data/test/unit/support/shared/pd_driver_examples.rb

@@ -201,6 +201,27 @@ shared_examples "parallels desktop driver" do |options|
     end
   end
 
+  describe 'read_vm_option' do
+    it 'returns stripped value' do
+      subprocess.stub(:execute).
+        with('prlctl', 'list', uuid, '--no-header', '-o', an_instance_of(String),
+             an_instance_of(Hash)).
+        and_return(subprocess_result(stdout: "opt_val \n"))
+
+      subject.read_vm_option('supported_option').should == 'opt_val'
+    end
+
+    it 'raises an exception in option is not available' do
+      subprocess.stub(:execute).
+        with('prlctl', 'list', uuid, '--no-header', '-o', an_instance_of(String),
+             an_instance_of(Hash)).
+        and_return(subprocess_result(stdout: " \n"))
+
+      expect { subject.read_vm_option('invalid_option') }.
+        to raise_error(VagrantPlugins::Parallels::Errors::ParallelsVMOptionNotFound)
+    end
+  end
+
   describe "read_vms" do
     it "returns the list of all registered VMs and templates" do
       subject.read_vms.should be_kind_of(Hash)
@@ -295,7 +316,7 @@ shared_examples "parallels desktop driver" do |options|
       subject.version.should match(/^#{parallels_version}.\d+\.\d+$/)
     end
 
-    it "rises ParallelsInvalidVersion exception for unsupported version" do
+    it "raises ParallelsInvalidVersion exception for unsupported version" do
       subprocess.should_receive(:execute).
         with("prlctl", "--version", an_instance_of(Hash)).
         and_return(subprocess_result(stdout: "prlctl version 7.0.12345"))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Mikhail Zholobov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-16 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler