vagrant-parallels 1.4.1 → 1.4.2

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

@@ -114,6 +114,13 @@ module VagrantPlugins
             @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/driver/meta.rb

@@ -33,26 +33,23 @@ module VagrantPlugins
 
           # Instantiate the proper version driver for Parallels Desktop
           @logger.debug("Finding driver for Parallels Desktop version: #{@version}")
-          driver_map   = {
-            '8' => PD_8,
-            '9' => PD_9,
-            '10' => PD_10,
-            '11' => PD_11
-          }
-
-          driver_klass = nil
-          driver_map.each do |key, klass|
-            if @version.start_with?(key)
-              driver_klass = klass
-              break
-            end
-          end
 
-          if !driver_klass
-            supported_versions = driver_map.keys.sort
+          driver_klass =
+            case @version.split('.').first
+              when '8' then PD_8
+              when '9' then PD_9
+              when '10' then PD_10
+              when '11' then PD_11
+              else raise Errors::ParallelsUnsupportedVersion
+            end
 
-            raise VagrantPlugins::Parallels::Errors::ParallelsInvalidVersion,
-                  supported_versions: supported_versions.join(", ")
+          # Starting since PD 11 only Pro and Business editions have CLI
+          # functionality and can be used with Vagrant.
+          if @version.split('.').first.to_i >= 11
+            edition = read_edition
+            if !edition || !%w(any pro business).include?(edition)
+              raise Errors::ParallelsUnsupportedEdition
+            end
           end
 
           @logger.info("Using Parallels driver: #{driver_klass}")
@@ -114,6 +111,18 @@ module VagrantPlugins
 
         protected
 
+        # Returns the edition of Parallels Desktop that is running. It makes
+        # sense only for Parallels Desktop 11 and later. For older versions
+        # it returns nil.
+        #
+        # @return [String]
+        def read_edition
+          lic_info = json({}) do
+            execute(@prlsrvctl_path, 'info', '--license', '--json')
+          end
+          lic_info['edition']
+        end
+
         # This returns the version of Parallels Desktop that is running.
         #
         # @return [String]
@@ -125,12 +134,13 @@ module VagrantPlugins
           # * prlctl version 10.0.0 (12345) rev 123456
           #
           # But we need exactly the first 3 numbers: "x.x.x"
+          output = execute(@prlctl_path, '--version')
 
-          if execute(@prlctl_path, '--version') =~ /prlctl version (\d+\.\d+.\d+)/
-            return $1
+          if output =~ /prlctl version (\d+\.\d+.\d+)/
+            Regexp.last_match(1)
+          else
+            raise Errors::ParallelsInvalidVersion, output: output
           end
-
-          nil
         end
       end
     end

data/lib/vagrant-parallels/errors.rb

@@ -55,6 +55,14 @@ module VagrantPlugins
         error_key(:parallels_vm_option_not_found)
       end
 
+      class ParallelsUnsupportedEdition < VagrantParallelsError
+        error_key(:parallels_unsupported_edition)
+      end
+
+      class ParallelsUnsupportedVersion < VagrantParallelsError
+        error_key(:parallels_unsupported_version)
+      end
+
       class SharedAdapterNotFound < VagrantParallelsError
         error_key(:shared_adapter_not_found)
       end

data/lib/vagrant-parallels/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Parallels
-    VERSION = '1.4.1'
+    VERSION = '1.4.2'
   end
 end

data/locales/en.yml

@@ -42,11 +42,10 @@ en:
         Parallels Desktop is complaining that the installation is incomplete.
         Try to reinstall Parallels Desktop or contact Parallels support.
       parallels_invalid_version: |-
-        Vagrant has detected that you have a version of Parallels Desktop installed
-        that is not supported. Please install or upgrade to one of the supported
-        versions listed below to use Vagrant:
+        Vagrant could not fetch Parallels Desktop version from output:
+          %{output}
 
-        %{supported_versions}
+        This is an internal error that should be reported as a bug.
       parallels_no_room_for_high_level_network: |-
         There is no available slots on the Parallels Desktop VM for the configured
         high-level network interfaces. "private_network" and "public_network"
@@ -75,6 +74,22 @@ en:
         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.
+      parallels_unsupported_edition: |-
+        Vagrant has detected that you have an edition of Parallels Desktop for Mac
+        installed that is not supported. Vagrant Parallels provider is compatible
+        only with Pro and Business editions of Parallels Desktop. Other editions
+        do not have command line functionality and can not be used with Vagrant.
+
+        Please upgrade your installation: http://parallels.com/desktop
+      parallels_unsupported_version: |-
+        Vagrant has detected that you have a version of Parallels Desktop for Mac
+        installed that is not supported. Vagrant Parallels provider is compatible
+        only with Parallels Desktop 8 or later.
+        Please upgrade your installation: http://parallels.com/desktop
+
+        Note: Starting since Parallels Desktop 11 for Mac, Vagrant Parallels
+        provider can be only used with Pro or Business edition of Parallels
+        Desktop for Mac. Please, be aware while choosing the edition to upgrade to.
       snapshot_id_not_detected: |-
         ID of the newly created shapshod could not be detected. This is an
         internal error that users should never see. Please report a bug.

data/tasks/acceptance.rake

@@ -8,6 +8,7 @@ namespace :acceptance do
   task :run do
     components = %w(
       basic
+      linked_clone
       network/forwarded_port
       network/private_network
       synced_folder

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

@@ -323,10 +323,18 @@ shared_examples "parallels desktop driver" do |options|
       subject.version.should match(/^#{parallels_version}.\d+\.\d+$/)
     end
 
-    it "raises ParallelsInvalidVersion exception for unsupported version" do
+    it "raises an 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"))
+      expect { subject.version }.
+        to raise_error(VagrantPlugins::Parallels::Errors::ParallelsUnsupportedVersion)
+    end
+
+    it "raises an exception for invalid version output" do
+      subprocess.should_receive(:execute).
+        with("prlctl", "--version", an_instance_of(Hash)).
+        and_return(subprocess_result(stdout: "prlctl version 1.2.foo.bar"))
       expect { subject.version }.
         to raise_error(VagrantPlugins::Parallels::Errors::ParallelsInvalidVersion)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Mikhail Zholobov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-27 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,6 +112,7 @@ files:
 - Rakefile
 - Vagrantfile
 - config/i18n-tasks.yml.erb
+- debug.log
 - lib/vagrant-parallels.rb
 - lib/vagrant-parallels/action.rb
 - lib/vagrant-parallels/action/boot.rb
@@ -165,11 +166,8 @@ files:
 - tasks/test.rake
 - test/acceptance/base.rb
 - test/acceptance/provider/linked_clone_spec.rb
-- test/acceptance/provider/synced_folder_spec.rb
 - test/acceptance/shared/context_parallels.rb
 - test/acceptance/skeletons/linked_clone/Vagrantfile
-- test/acceptance/skeletons/synced_folder/Vagrantfile
-- test/acceptance/skeletons/synced_folder/foo
 - test/unit/base.rb
 - test/unit/config_test.rb
 - test/unit/driver/pd_10_test.rb

data/test/acceptance/provider/synced_folder_spec.rb

@@ -1,26 +0,0 @@
-# This tests that synced folders work with a given provider.
-shared_examples "provider/synced_folder" do |provider, options|
-  if !options[:box]
-    raise ArgumentError,
-      "box option must be specified for provider: #{provider}"
-  end
-
-  include_context "acceptance"
-
-  before do
-    environment.skeleton("synced_folder")
-    assert_execute("vagrant", "box", "add", "basic", options[:box])
-    assert_execute("vagrant", "up", "--provider=#{provider}")
-  end
-
-  after do
-    assert_execute("vagrant", "destroy", "--force")
-  end
-
-  it "properly configures synced folder types" do
-    status("Test: mounts the default /vagrant synced folder")
-    result = execute("vagrant", "ssh", "-c", "cat /vagrant/foo")
-    expect(result.exit_code).to eql(0)
-    expect(result.stdout).to match(/hello$/)
-  end
-end

data/test/acceptance/skeletons/synced_folder/Vagrantfile

@@ -1,3 +0,0 @@
-Vagrant.configure("2") do |config|
-  config.vm.box = "basic"
-end

data/test/acceptance/skeletons/synced_folder/foo

@@ -1 +0,0 @@
-hello