vagrant-parallels 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c730a520f86bd6a644552153dc93e37bb88e2101
-  data.tar.gz: e7a1c78c9bc2632dde5215ff010926beb7168a3d
+  metadata.gz: 5608c204b87b50e5b244203de68ed4a756b12439
+  data.tar.gz: e0b2110f1fb2c2c7da44f96653419cd6f6fd3c86
 SHA512:
-  metadata.gz: 7e9eff6c30ec5fb09d20b8b6422c92e0bd3d2869c56a89ab31e27938a62c4e9b0b97b634beb97ac35c00af25c0fb9fe9291a7af2d576d635aaf16bf90ed654d4
-  data.tar.gz: ac7b0e602a129cfc0075fbb68cc1e71f4f718d0bca81bdb3d14a45ac4d32019fa88955ef12a10a330a73510c469a5519bfa09464f396cd192a42ab858e56ba46
+  metadata.gz: a35ae225981d552e39c133c649f5e7feb9a81acea54ebee5c0d6454a51036315ae25ddf742e6ace0e55c78a2cbb79122a7b04c1df9e76cbf08653d1749f90728
+  data.tar.gz: 1abc3b1bd8851aae1c6a154a1911bb00e4605328a80a16948ad5a76ae27d15eb52fcd63547a29f25d218eb6b1f78da41ab4427bff2849d6eb79b463efaeb5e48

data/lib/vagrant-parallels.rb

@@ -1,6 +1,7 @@
 require "pathname"
 
 require "vagrant-parallels/plugin"
+require "vagrant-parallels/version"
 
 module VagrantPlugins
   module Parallels

data/lib/vagrant-parallels/action.rb

@@ -12,6 +12,7 @@ module VagrantPlugins
       def self.action_boot
         Vagrant::Action::Builder.new.tap do |b|
           b.use CheckAccessible
+          b.use SetPowerConsumption
           b.use SetName
           # b.use ClearForwardedPorts
           b.use Provision
@@ -298,6 +299,7 @@ module VagrantPlugins
       autoload :Resume, File.expand_path("../action/resume", __FILE__)
       autoload :SetupPackageFiles, File.expand_path("../action/setup_package_files", __FILE__)
       autoload :SetName, File.expand_path("../action/set_name", __FILE__)
+      autoload :SetPowerConsumption, File.expand_path("../action/set_power_consumption", __FILE__)
       autoload :Suspend, File.expand_path("../action/suspend", __FILE__)
     end
   end

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

@@ -20,7 +20,7 @@ module VagrantPlugins
             env[:ui].warn I18n.t("vagrant_parallels.actions.vm.check_guest_tools.not_detected")
           else
             pd_version = env[:machine].provider.driver.version
-            unless pd_version.start_with? tools_version
+            if Gem::Version.new(pd_version) != Gem::Version.new(tools_version)
               env[:ui].warn(I18n.t("vagrant_parallels.actions.vm.check_guest_tools.version_mismatch",
                                    :tools_version => tools_version,
                                    :parallels_version => pd_version))

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

@@ -48,7 +48,9 @@ module VagrantPlugins
         def register_template
           if !@env[:machine].provider.driver.read_vms_paths.has_key?(@template_path)
             @logger.info("Register the box template: '#{@template_path}'")
-            @env[:machine].provider.driver.register(@template_path)
+            # We should also regenerate 'SourceVmUuid' to make sure that
+            # SMBIOS UUID is unique [GH-113]
+            @env[:machine].provider.driver.register(@template_path, regen_src_uuid=true)
           end
 
           # Return the uuid of registered template

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

@@ -0,0 +1,38 @@
+module VagrantPlugins
+  module Parallels
+    module Action
+      class SetPowerConsumption
+        def initialize(app, env)
+          @logger = Log4r::Logger.new("vagrant::plugins::parallels::power_consumption")
+          @app = app
+        end
+
+        def call(env)
+          pd_version = env[:machine].provider.driver.version
+          if Gem::Version.new(pd_version) < Gem::Version.new("9")
+            @logger.info("Power consumption management is available only for Parallels Desktop >= 9")
+            return @app.call(env)
+          end
+
+          # Optimization of power consumption is defined by "Longer Battery Life" state.
+          vm_settings = env[:machine].provider.driver.read_settings
+
+          old_val = vm_settings.fetch("Longer battery life") == "on" ? true : false
+          new_val = env[:machine].provider_config.optimize_power_consumption
+
+          if old_val == new_val
+            @logger.info("Skipping power consumption method because it is already set")
+            return @app.call(env)
+          end
+
+          mode = new_val ? "Longer battery life" : "Better Performance"
+          env[:ui].info I18n.t("vagrant_parallels.parallels.power_consumption.set_mode",
+                               mode: mode)
+          env[:machine].provider.driver.set_power_consumption_mode(new_val)
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-parallels/config.rb

@@ -2,20 +2,23 @@ module VagrantPlugins
   module Parallels
     class Config < Vagrant.plugin("2", :config)
       attr_accessor :check_guest_tools
-      attr_reader :customizations
+      attr_reader   :customizations
       attr_accessor :destroy_unused_network_interfaces
-      attr_reader :network_adapters
+      attr_accessor :optimize_power_consumption
       attr_accessor :name
+      attr_reader   :network_adapters
+
 
       # Compatibility with virtualbox provider's syntax
       alias :check_guest_additions= :check_guest_tools=
 
       def initialize
         @check_guest_tools = UNSET_VALUE
-        @customizations   = []
+        @customizations    = []
         @destroy_unused_network_interfaces = UNSET_VALUE
         @network_adapters  = {}
-        @name             = UNSET_VALUE
+        @name              = UNSET_VALUE
+        @optimize_power_consumption = UNSET_VALUE
 
         network_adapter(0, :shared)
       end
@@ -48,6 +51,10 @@ module VagrantPlugins
           @destroy_unused_network_interfaces = true
         end
 
+        if @optimize_power_consumption == UNSET_VALUE
+          @optimize_power_consumption = true
+        end
+
         @name = nil if @name == UNSET_VALUE
       end
 

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

@@ -182,7 +182,11 @@ module VagrantPlugins
         end
 
         # Registers the virtual machine
-        def register(pvm_file)
+        #
+        # @param [String] pvm_file Path to the machine image (*.pvm)
+        # @param [Boolean] regen_src_uuid Regenerate SourceVmUuid to avoid
+        # SMBIOS UUID collision
+        def register(pvm_file, regen_src_uuid)
         end
 
         # Resumes the virtual machine.
@@ -202,6 +206,13 @@ module VagrantPlugins
         def set_name(name)
         end
 
+        # Sets Power Consumption method.
+        #
+        # @param [Boolean] optimized Use "Longer Battery Life"
+        # instead "Better Performance"
+        def set_power_consumption_mode(optimized)
+        end
+
         # Share a set of folders on this VM.
         #
         # @param [Array<Hash>] folders

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

@@ -42,7 +42,6 @@ module VagrantPlugins
           # Instantiate the proper version driver for VirtualBox
           @logger.debug("Finding driver for Parallels Desktop version: #{@version}")
           driver_map   = {
-            #TODO: Use customized class for each version
             "8" => PD_8,
             "9" => PD_9,
             "10" => PD_9
@@ -57,9 +56,14 @@ module VagrantPlugins
           end
 
           if !driver_klass
-            supported_versions = driver_map.keys.sort.join(", ")
+            supported_versions = driver_map.keys.sort
+
+            # TODO: Remove this after PD 10 release
+            # Don't show unreleased version in the error message
+            supported_versions.delete("10")
+
             raise VagrantPlugins::Parallels::Errors::ParallelsInvalidVersion,
-                  supported_versions: supported_versions
+                  supported_versions: supported_versions.join(", ")
           end
 
           @logger.info("Using Parallels driver: #{driver_klass}")
@@ -103,6 +107,7 @@ module VagrantPlugins
                        :register,
                        :registered?,
                        :resume,
+                       :set_power_consumption_mode,
                        :set_mac_address,
                        :set_name,
                        :share_folders,
@@ -121,11 +126,14 @@ module VagrantPlugins
         def read_version
           # The version string is usually in one of the following formats:
           #
-          # * 8.0.12345.123456
-          # * 9.0.12345.123456
+          # * prlctl version 8.0.12345.123456
+          # * prlctl version 9.0.12345.123456
+          # * prlctl version 10.0.0 (12345) rev 123456
+          #
+          # But we need exactly the first 3 numbers: "x.x.x"
 
-          if execute('--version', retryable: true) =~ /prlctl version ([\d\.]+)/
-            return $1.downcase
+          if execute('--version', retryable: true) =~ /prlctl version (\d+\.\d+.\d+)/
+            return $1
           else
             return nil
           end

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

@@ -235,7 +235,8 @@ module VagrantPlugins
         end
 
         def read_guest_tools_version
-          read_settings.fetch('GuestTools', {}).fetch('version', nil)
+          tools_version = read_settings.fetch('GuestTools', {}).fetch('version', '')
+          tools_version[/(^\d+\.\d+.\d+)/]
         end
 
         def read_host_info
@@ -392,8 +393,10 @@ module VagrantPlugins
           list
         end
 
-        def register(pvm_file)
-          execute("register", pvm_file)
+        def register(pvm_file, regen_src_uuid=false)
+          args = ['register', pvm_file]
+          args << '--regenerate-src-uuid' if regen_src_uuid
+          execute(*args)
         end
 
         def registered?(uuid)
@@ -436,15 +439,7 @@ module VagrantPlugins
         end
 
         def verify!
-          version
-        end
-
-        def version
-          if execute('--version', retryable: true) =~ /prlctl version ([\d\.]+)/
-            $1.downcase
-          else
-            raise VagrantPlugins::Parallels::Errors::ParallelsInstallIncomplete
-          end
+          execute('--version', retryable: true)
         end
 
         def vm_exists?(uuid)

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

@@ -52,6 +52,11 @@ module VagrantPlugins
           end
           vms_arr | templates_arr
         end
+
+        def set_power_consumption_mode(optimized)
+          state = optimized ? 'on' : 'off'
+          execute('set', @uuid, '--longer-battery-life', state)
+        end
       end
     end
   end

data/lib/vagrant-parallels/errors.rb

@@ -11,6 +11,10 @@ module VagrantPlugins
         error_key(:dhcp_leases_file_not_accessible)
       end
 
+      class MacOSXRequired < VagrantParallelsError
+        error_key(:mac_os_x_required)
+      end
+
       class PrlCtlError < VagrantParallelsError
         error_key(:prlctl_error)
       end
@@ -35,8 +39,8 @@ module VagrantPlugins
         error_key(:vm_inaccessible)
       end
 
-      class MacOSXRequired < VagrantParallelsError
-        error_key(:mac_os_x_required)
+      class VMNameExists < VagrantParallelsError
+        error_key(:vm_name_exists)
       end
     end
   end

data/lib/vagrant-parallels/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Parallels
-    VERSION = "1.0.6"
+    VERSION = "1.0.7"
   end
 end

data/locales/en.yml

@@ -3,6 +3,9 @@ en:
     parallels:
       checking_guest_tools: |-
         Checking for Parallels Tools installed on the VM...
+      power_consumption:
+        set_mode: |-
+          Setting power consumption mode: "%{mode}"
       network_adapter: |-
         Adapter %{adapter}: %{type}%{extra}
 #-------------------------------------------------------------------------------

data/rel_1.0.7_commit.txt

@@ -0,0 +1,9 @@
+driver: removed unnecessary 'version' method.
+action/import: Regenerate 'SourceVmUuid' while template registration [GH-113]
+driver: added 'regen_src_uuid' argument to the 'register' method
+tests/unit: added tests for 'set_power_consumption_mode' driver method
+Added 'SetPowerConsumption' action. [GH-110]
+gemspec: added 'minitest' dependency as a aorkaround for rspec warning about 'minitest/autorun'
+driver/meta: Don't show unreleased PD 10 version in the error message.
+Convert Parallels Desktop version to semantic-like format (x.y.z)
+errors: 'vm_name_exists' error key added

data/test/unit/config_test.rb

@@ -9,6 +9,7 @@ describe VagrantPlugins::Parallels::Config do
 
     its(:check_guest_tools) { should be_true }
     its(:name) { should be_nil }
+    its(:optimize_power_consumption) { should be_true }
 
     it "should have one Shared adapter" do
       expect(subject.network_adapters).to eql({

data/test/unit/driver/pd_8_test.rb

@@ -9,6 +9,8 @@ describe VagrantPlugins::Parallels::Driver::PD_8 do
   let(:tpl_uuid) {'1234-some-template-uuid-5678'}
   let(:tpl_name) {'Some_Template_Name'}
 
+  let(:tools_version) {'8.0.18615.123456'}
+
   let(:hostonly_iface) {'vnic10'}
 
   let(:vnic_options) do {
@@ -73,7 +75,7 @@ INFO[
     "State": "stopped",
     "Home": "/path/to/#{vm_name}.pvm/",
     "GuestTools": {
-      "version": "8.0.18615"
+      "version": "#{tools_version}"
     },
     "Hardware": {
       "cpu": {
@@ -133,7 +135,7 @@ INFO[
     "State": "stopped",
     "Home": "/path/to/#{tpl_name}.pvm/",
     "GuestTools": {
-      "version": "8.0.18615"
+      "version": "#{tools_version}"
     },
     "Hardware": {
       "cpu": {

data/test/unit/driver/pd_9_test.rb

@@ -9,6 +9,8 @@ describe VagrantPlugins::Parallels::Driver::PD_9 do
   let(:tpl_uuid) {'1234-some-template-uuid-5678'}
   let(:tpl_name) {'Some_Template_Name'}
 
+  let(:tools_version) {'9.0.23062.123456'}
+
   let(:hostonly_iface) {'vnic10'}
 
   let(:vnic_options) do {
@@ -73,7 +75,7 @@ describe VagrantPlugins::Parallels::Driver::PD_9 do
     "State": "stopped",
     "Home": "/path/to/#{vm_name}.pvm/",
     "GuestTools": {
-      "version": "9.0.23062"
+      "version": "#{tools_version}"
     },
     "Hardware": {
       "cpu": {
@@ -133,7 +135,7 @@ describe VagrantPlugins::Parallels::Driver::PD_9 do
     "State": "stopped",
     "Home": "/path/to/#{tpl_name}.pvm/",
     "GuestTools": {
-      "version": "9.0.24172"
+      "version": "#{tools_version}"
     },
     "Hardware": {
       "cpu": {
@@ -193,4 +195,24 @@ describe VagrantPlugins::Parallels::Driver::PD_9 do
     end
 
   end
+
+  describe "set_power_consumption_mode" do
+    it "turns 'longer-battery-life' on" do
+      subprocess.should_receive(:execute).
+        with("prlctl", "set", uuid, "--longer-battery-life", "on",
+             an_instance_of(Hash)).
+        and_return(subprocess_result(exit_code: 0))
+
+      subject.set_power_consumption_mode(true)
+    end
+
+    it "turns 'longer-battery-life' off" do
+      subprocess.should_receive(:execute).
+        with("prlctl", "set", uuid, "--longer-battery-life", "off",
+             an_instance_of(Hash)).
+        and_return(subprocess_result(exit_code: 0))
+
+      subject.set_power_consumption_mode(false)
+    end
+  end
 end

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

@@ -20,7 +20,7 @@ shared_context "parallels" do
     # Parallels Desktop version, so wire this stub in automatically
     subprocess.stub(:execute).
       with("prlctl", "--version", an_instance_of(Hash)).
-      and_return(subprocess_result(stdout: "prlctl version #{parallels_version}.23456.987654"))
+      and_return(subprocess_result(stdout: "prlctl version #{parallels_version}.0.98765"))
 
     # drivers also call vm_exists? during init;
     subprocess.stub(:execute).

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

@@ -146,6 +146,21 @@ shared_examples "parallels desktop driver" do |options|
     end
   end
 
+  describe "read_guest_tools_version" do
+    let(:tools_version) {'9.0.23062.123456-something-else'}
+
+    it "returns Guest Tools version in semantic format: 'x.y.z'" do
+      subject.read_guest_tools_version.should match(/^\d+.\d+\.\d+$/)
+      subject.read_guest_tools_version.should == "9.0.23062"
+    end
+
+    it "returns nil if Guest Tools version is invalid" do
+      settings = {"GuestTools" => {"vesion" => "something_wrong"}}
+      driver.should_receive(:read_settings).and_return(settings)
+      subject.read_guest_tools_version.should be_nil
+    end
+  end
+
   describe "read_guest_ip" do
     let(:content) {'10.200.0.99="1394547632,1800,001c420000ff,01001c420000ff"'}
 
@@ -194,6 +209,25 @@ shared_examples "parallels desktop driver" do |options|
     end
   end
 
+  describe "register" do
+    it "registers specified virtual machine or template" do
+      subprocess.should_receive(:execute).
+        with("prlctl", "register", an_instance_of(String), an_instance_of(Hash)).
+        and_return(subprocess_result(exit_code: 0))
+
+      subject.register("/path/to/vm_image.pvm")
+    end
+
+    it "registers specified virtual machine or template and regen src uuid" do
+      subprocess.should_receive(:execute).
+        with("prlctl", "register", an_instance_of(String),
+             "--regenerate-src-uuid", an_instance_of(Hash)).
+        and_return(subprocess_result(exit_code: 0))
+
+      subject.register("/path/to/vm_image.pvm", regen_src_uuid=true)
+    end
+  end
+
   describe "set_mac_address" do
     it "sets base MAC address to the Shared network adapter" do
       subprocess.should_receive(:execute).exactly(2).times.
@@ -247,13 +281,13 @@ shared_examples "parallels desktop driver" do |options|
 
   describe "version" do
     it "parses the version from output" do
-      subject.version.should match(/(#{parallels_version}[\d\.]+)/)
+      subject.version.should match(/^#{parallels_version}.\d+\.\d+$/)
     end
 
-    it "rises ParallelsInvalidVersion exception when output is invalid" do
+    it "rises ParallelsInvalidVersion exception for unsupported version" do
       subprocess.should_receive(:execute).
         with("prlctl", "--version", an_instance_of(Hash)).
-        and_return(subprocess_result(exit_code: 0))
+        and_return(subprocess_result(stdout: "prlctl version 7.0.12345"))
       expect { subject.version }.
         to raise_error(VagrantPlugins::Parallels::Errors::ParallelsInvalidVersion)
     end

data/vagrant-parallels.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.5.2"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "minitest"
   spec.add_development_dependency "rspec", "~> 2.14.0"
   spec.add_development_dependency "i18n-tasks", "~> 0.3.9"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Mikhail Zholobov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,6 +39,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -105,6 +119,7 @@ files:
 - lib/vagrant-parallels/action/prepare_nfs_valid_ids.rb
 - lib/vagrant-parallels/action/resume.rb
 - lib/vagrant-parallels/action/set_name.rb
+- lib/vagrant-parallels/action/set_power_consumption.rb
 - lib/vagrant-parallels/action/setup_package_files.rb
 - lib/vagrant-parallels/action/suspend.rb
 - lib/vagrant-parallels/action.rb
@@ -127,6 +142,7 @@ files:
 - locales/en.yml
 - Rakefile
 - README.md
+- rel_1.0.7_commit.txt
 - tasks/bundler.rake
 - tasks/test.rake
 - test/unit/base.rb