vagrant-parallels 1.4.3 → 1.5.0

data/lib/vagrant-parallels/action.rb

@@ -24,7 +24,6 @@ module VagrantPlugins
           b.use ClearNetworkInterfaces
           b.use ForwardPorts
           b.use SetHostname
-          b.use SaneDefaults
           b.use Customize, 'pre-boot'
           b.use Boot
           b.use Customize, 'post-boot'
@@ -278,6 +277,7 @@ module VagrantPlugins
             if env1[:result]
               b1.use Customize, 'pre-import'
               b1.use Import
+              b1.use SaneDefaults
               b1.use Customize, 'post-import'
             end
           end

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

@@ -4,9 +4,17 @@ module VagrantPlugins
       class Destroy
         def initialize(app, env)
           @app = app
+          @logger = Log4r::Logger.new('vagrant_parallels::action::destroy')
         end
 
         def call(env)
+          # Disable requiring password for delete action [GH-67].
+          # It is available only since PD 10.
+          if env[:machine].provider.pd_version_satisfies?('>= 10')
+            @logger.info('Disabling password restrictions: remove-vm')
+            env[:machine].provider.driver.disable_password_restrictions(['remove-vm'])
+          end
+
           env[:ui].info I18n.t('vagrant.actions.vm.destroy.destroying')
           env[:machine].provider.driver.delete
           env[:machine].id = nil

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

@@ -12,6 +12,14 @@ module VagrantPlugins
         def call(env)
           @machine = env[:machine]
 
+          # Disable requiring password for register and clone actions [GH-67].
+          # It is available only since PD 10.
+          if env[:machine].provider.pd_version_satisfies?('>= 10')
+            acts = ['clone-vm']
+            @logger.info("Disabling password restrictions: #{acts.join(', ')}")
+            env[:machine].provider.driver.disable_password_restrictions(acts)
+          end
+
           # Register template to be able to clone it further
           register_template(template_path.to_s)
 

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

@@ -14,17 +14,14 @@ module VagrantPlugins
           # helpers.
           @env = env
 
-          # Disable requiring password on such operations as creating, adding,
-          # removing or coning the virtual machine. [GH-67]
-          # It is available only since PD 10.
-          if env[:machine].provider.pd_version_satisfies?('>= 10')
-            @logger.info('Disabling any password restrictions...')
-            env[:machine].provider.driver.disable_password_restrictions
-          end
+          settings = default_settings
+
+          @app.call(env) if settings.empty?
+          @env[:ui].info I18n.t('vagrant_parallels.actions.vm.sane_defaults.setting')
 
-          if env[:machine].provider.pd_version_satisfies?('>= 9')
-            @logger.info('Setting the power consumption mode...')
-            set_power_consumption
+          default_settings.each do |setting, value|
+            @env[:machine].provider.driver.execute_prlctl(
+              'set', @env[:machine].id, "--#{setting.to_s.gsub('_','-')}", value)
           end
 
           @app.call(env)
@@ -32,21 +29,42 @@ module VagrantPlugins
 
         private
 
-        def set_power_consumption
-          # Optimization of power consumption is defined by "Longer Battery Life" state.
-          vm_settings = @env[:machine].provider.driver.read_settings
+        def default_settings
+          settings = {}
 
-          old_val = vm_settings.fetch('Longer battery life') == 'on' ? true : false
-          new_val = @env[:machine].provider_config.optimize_power_consumption
+          return settings if @env[:machine].provider.pd_version_satisfies?('< 9')
+          settings.merge!(
+            startup_view: 'same',
+            on_shutdown: 'close',
+            on_window_close: 'keep-running',
+            auto_share_camera: 'off',
+            smart_guard: 'off',
+            longer_battery_life: 'on'
+          )
 
-          if old_val == new_val
-            @logger.info('Skipping power consumption method because it is already set')
-          else
-            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)
+          # Check the legacy option
+          if !@env[:machine].provider_config.optimize_power_consumption
+            settings[:longer_battery_life] = 'off'
           end
+
+          return settings  if @env[:machine].provider.pd_version_satisfies?('< 10.1.2')
+          settings.merge!(
+            shared_cloud: 'off',
+            shared_profile: 'off',
+            smart_mount: 'off',
+            sh_app_guest_to_host: 'off',
+            sh_app_host_to_guest: 'off',
+            time_sync: 'off'
+          )
+
+          return settings if @env[:machine].provider.pd_version_satisfies?('< 11')
+          settings.merge!(
+            startup_view: 'headless',
+            time_sync: 'on',
+            disable_timezone_sync: 'on'
+          )
+
+          settings
         end
       end
     end

data/lib/vagrant-parallels/config.rb

@@ -77,10 +77,6 @@ module VagrantPlugins
           @functional_psf = true
         end
 
-        if @optimize_power_consumption == UNSET_VALUE
-          @optimize_power_consumption = true
-        end
-
         @use_linked_clone = false if @use_linked_clone == UNSET_VALUE
 
         @name = nil if @name == UNSET_VALUE
@@ -108,6 +104,10 @@ module VagrantPlugins
           end
         end
 
+        if @optimize_power_consumption != UNSET_VALUE
+          machine.env.ui.warn I18n.t('vagrant_parallels.config.deprecate_power_consumption')
+        end
+
         { 'Parallels Provider' => errors }
       end
     end

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

@@ -156,7 +156,9 @@ module VagrantPlugins
         # Disables requiring password on such operations as creating, adding,
         # removing or cloning the virtual machine.
         #
-        def disable_password_restrictions
+        # @param [Array<String>] acts List of actions. Available values:
+        # ['create-vm', 'add-vm', 'remove-vm', 'clone-vm']
+        def disable_password_restrictions(acts)
           raise NotImplementedError
         end
 
@@ -670,7 +672,13 @@ module VagrantPlugins
         # Parses given block (JSON string) to object
         def json(default=nil)
           data = yield
-          JSON.parse(data) rescue default
+          begin
+            JSON.parse(data)
+          rescue JSON::ParserError
+            # Try to cleanup the data and parse it again [GH-204]
+            data = data[/(\{.*\}|\[.*\])/m]
+            JSON.parse(data) rescue default
+          end
         end
 
         # Executes a command and returns the raw result object.

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

@@ -49,10 +49,10 @@ module VagrantPlugins
           end
         end
 
-        def disable_password_restrictions
+        def disable_password_restrictions(acts)
           server_info = json { execute_prlsrvctl('info', '--json') }
           server_info.fetch('Require password to',[]).each do |act|
-            execute_prlsrvctl('set', '--require-pwd', "#{act}:off")
+            execute_prlsrvctl('set', '--require-pwd', "#{act}:off") if acts.include? act
           end
         end
 

data/lib/vagrant-parallels/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Parallels
-    VERSION = '1.4.3'
+    VERSION = '1.5.0'
   end
 end

data/locales/en.yml

@@ -1,9 +1,6 @@
 en:
   vagrant_parallels:
     parallels:
-      power_consumption:
-        set_mode: |-
-          Setting power consumption mode: "%{mode}"
       network_adapter: |-
         Adapter %{adapter}: %{type}%{extra}
 #-------------------------------------------------------------------------------
@@ -117,6 +114,17 @@ en:
       invalid_event: |-
         %{event} is not a valid event for customization. Valid events
         are: %{valid_events}
+      deprecate_power_consumption: |-
+        Setting "optimize_power_consumption" has been deprecated in the Parallels
+        provider and will be removed in the future releases. Power consumption
+        is enabled by default. If you want to keep it enabled, then just remove
+        this setting from your Vagrantfile. Otherwise, please replace it with
+        this block in order to disable the power consumption:
+
+          config.vm.provider "parallels" do |prl|
+            prl.customize ["set", :id, "--longer-battery-life", "off"]
+          end
+
 #-------------------------------------------------------------------------------
 # Translations for commands. e.g. `vagrant x`
 #-------------------------------------------------------------------------------
@@ -186,3 +194,5 @@ en:
             %{guest_port} => %{host_port}
         import:
           importing_linked: Importing base box '%{name}' as a linked clone...
+        sane_defaults:
+          setting: Setting the default configuration for VM...

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.5.0
 platform: ruby
 authors:
 - Mikhail Zholobov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler