vagrant-parallels 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6d2cb09c1eb05e861300f0f67bf9ee48208f0b6
-  data.tar.gz: e97e4b391dc745ed707a871eb06e4270aabd5d39
+  metadata.gz: 47a0c9bab9f20db1b5f572e99fb5781577958b65
+  data.tar.gz: 1ac985219b5ce4429d1b94751c1d521d0836d8b6
 SHA512:
-  metadata.gz: e33d983b27fa7dc45fd26378450071d9dcdc742e5b06c8b559eced686252f2a3bdef9c415251d341b089eec964d1458089306de34f9eb590ff54d9e8746c35bc
-  data.tar.gz: bd997e302d742b32829491138e52deb9ff2d8e24369d354112a6e172ebb786d905c986a0586e5d0551b96609628b638823cffd197d8da58308ec0fa826cbc005
+  metadata.gz: 8b96578a97fc88c7152ed77a52773f8244487e2a5544aaf10d36e5a4eb8ba4a27c73165667688260e7a8b9814f491ce5805e4ccf71feff41dea1607b45e384a5
+  data.tar.gz: 71e2fc360d0925e131ac7377b57f2793e65e295eac419c67c705b45c0498ea719c66f0698e11bd39b19235a76cea9589f61cb14734179fa2ce1a1fb4425e7474

data/README.md

@@ -7,23 +7,22 @@ This is a plugin for [Vagrant](http://www.vagrantup.com),
 allowing to power [Parallels Desktop for Mac](http://www.parallels.com/products/desktop/)
 based virtual machines.
 
-If you're just getting started with Vagrant, it is highly recommended that you
-read the official [Vagrant documentation](http://docs.vagrantup.com/v2/) first.
-
 ### Requirements 
 - [Vagrant v1.5](http://www.vagrantup.com) or higher
 - [Parallels Desktop 8 for Mac](http://www.parallels.com/products/desktop/) or higher
 
-**Attention for Parallels Desktop 11 users!** 
-
-This plugin is compatible only with *Pro* and *Business* editions of Parallels 
-Desktop 11. Standard edition doesn't have a command line functionality and can 
-not be used with Vagrant. 
+*Note:* In [**Parallels Desktop 11 for Mac**](http://www.parallels.com/products/desktop/), 
+only **Pro** and **Business** editions are compatible with this Vagrant provider. 
+Standard edition doesn't have a command line functionality and can not be used 
+with Vagrant.
 
 ## Features
 The Parallels provider supports all basic Vagrant features, including shared folders,
 private and public networks, forwarded ports and so on. 
 
+If you're just getting started with Vagrant, it is highly recommended that you
+read the official [Vagrant documentation](http://docs.vagrantup.com/v2/) first.
+
 ## Installation
 First, make sure that you have [Parallels Desktop for Mac](http://www.parallels.com/products/desktop/)
 and [Vagrant](http://www.vagrantup.com/downloads) properly installed.

data/Rakefile

@@ -13,9 +13,9 @@ $stderr.sync = true
 # allows us to nicely separate rake tasks into individual files
 # based on their role, which makes development and debugging easier
 # than one monolithic file.
-task_dir = File.expand_path("../tasks", __FILE__)
+task_dir = File.expand_path('../tasks', __FILE__)
 Dir["#{task_dir}/**/*.rake"].each do |task_file|
   load task_file
 end
 
-task :default => "test:unit"
+task :default => 'test:unit'

data/lib/vagrant-parallels.rb

@@ -1,56 +1,19 @@
-require "pathname"
+require 'pathname'
 
-require "vagrant-parallels/plugin"
-require "vagrant-parallels/version"
+require 'vagrant-parallels/plugin'
+require 'vagrant-parallels/version'
 
 module VagrantPlugins
   module Parallels
-    lib_path = Pathname.new(File.expand_path("../vagrant-parallels", __FILE__))
-    autoload :Action, lib_path.join("action")
-    autoload :Errors, lib_path.join("errors")
+    lib_path = Pathname.new(File.expand_path('../vagrant-parallels', __FILE__))
+    autoload :Action, lib_path.join('action')
+    autoload :Errors, lib_path.join('errors')
 
     # This returns the path to the source of this plugin.
     #
     # @return [Pathname]
     def self.source_root
-      @source_root ||= Pathname.new(File.expand_path("../../", __FILE__))
+      @source_root ||= Pathname.new(File.expand_path('../../', __FILE__))
     end
-
-    # This initializes the internationalization strings.
-    def self.setup_i18n
-      I18n.load_path << File.expand_path("locales/en.yml", Parallels.source_root)
-      I18n.reload!
-    end
-
-    # This sets up our log level to be whatever VAGRANT_LOG is.
-    def self.setup_logging
-      require "log4r"
-
-      level = nil
-      begin
-        level = Log4r.const_get(ENV["VAGRANT_LOG"].upcase)
-      rescue NameError
-        # This means that the logging constant wasn't found,
-        # which is fine. We just keep `level` as `nil`. But
-        # we tell the user.
-        level = nil
-      end
-
-      # Some constants, such as "true" resolve to booleans, so the
-      # above error checking doesn't catch it. This will check to make
-      # sure that the log level is an integer, as Log4r requires.
-      level = nil if !level.is_a?(Integer)
-
-      # Set the logging level on all "vagrant" namespaced
-      # logs as long as we have a valid level.
-      if level
-        logger = Log4r::Logger.new("vagrant_parallels")
-        logger.outputters = Log4r::Outputter.stderr
-        logger.level = level
-        logger = nil
-      end
-    end
-    Parallels.setup_logging
-    Parallels.setup_i18n
   end
 end

data/lib/vagrant-parallels/action.rb

@@ -1,4 +1,4 @@
-require "vagrant/action/builder"
+require 'vagrant/action/builder'
 
 module VagrantPlugins
   module Parallels
@@ -25,11 +25,11 @@ module VagrantPlugins
           b.use ForwardPorts
           b.use SetHostname
           b.use SaneDefaults
-          b.use Customize, "pre-boot"
+          b.use Customize, 'pre-boot'
           b.use Boot
-          b.use Customize, "post-boot"
+          b.use Customize, 'post-boot'
           b.use WaitForCommunicator, [:starting, :running]
-          b.use Customize, "post-comm"
+          b.use Customize, 'post-comm'
           b.use HandleGuestTools
         end
       end
@@ -41,13 +41,13 @@ module VagrantPlugins
           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")
+              b1.use Message, I18n.t('vagrant.commands.common.vm_not_created')
               next
             end
 
             b1.use Call, DestroyConfirm do |env2, b2|
               if !env2[:result]
-                b2.use Message, I18n.t("vagrant.commands.destroy.will_not_destroy",
+                b2.use Message, I18n.t('vagrant.commands.destroy.will_not_destroy',
                                        :name => env2[:machine].name)
                 next
               end
@@ -71,7 +71,7 @@ module VagrantPlugins
           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")
+              b1.use Message, I18n.t('vagrant.commands.common.vm_not_created')
               next
             end
 
@@ -98,7 +98,7 @@ module VagrantPlugins
           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")
+              b1.use Message, I18n.t('vagrant.commands.common.vm_not_created')
               next
             end
 
@@ -119,13 +119,13 @@ module VagrantPlugins
           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")
+              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")
+                b2.use Message, I18n.t('vagrant.commands.common.vm_not_running')
                 next
               end
 
@@ -143,7 +143,7 @@ module VagrantPlugins
           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")
+              b1.use Message, I18n.t('vagrant.commands.common.vm_not_created')
               next
             end
 
@@ -160,7 +160,7 @@ module VagrantPlugins
           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")
+              b1.use Message, I18n.t('vagrant.commands.common.vm_not_created')
               next
             end
 
@@ -179,7 +179,7 @@ module VagrantPlugins
           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")
+              b1.use Message, I18n.t('vagrant.commands.common.vm_not_created')
               next
             end
 
@@ -200,7 +200,7 @@ module VagrantPlugins
           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")
+              b1.use Message, I18n.t('vagrant.commands.common.vm_not_created')
               next
             end
 
@@ -223,7 +223,7 @@ module VagrantPlugins
           b.use Call, IsState, :running do |env1, b1|
             # If the VM is running, then our work here is done, exit
             if env1[:result]
-              b1.use Message, I18n.t("vagrant_parallels.commands.common.vm_already_running")
+              b1.use Message, I18n.t('vagrant_parallels.commands.common.vm_already_running')
               next
             end
 
@@ -249,7 +249,7 @@ module VagrantPlugins
           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")
+              b1.use Message, I18n.t('vagrant.commands.common.vm_not_created')
               next
             end
 
@@ -276,7 +276,7 @@ module VagrantPlugins
           b.use Call, IsState, :not_created do |env1, b1|
             # If the VM is NOT created yet, then do the setup steps
             if env1[:result]
-              b1.use Customize, "pre-import"
+              b1.use Customize, 'pre-import'
               b1.use Import
               b1.use Customize, 'post-import'
             end
@@ -295,11 +295,11 @@ module VagrantPlugins
             end
           end
 
-          b.use Customize, "pre-boot"
+          b.use Customize, 'pre-boot'
           b.use Boot
-          b.use Customize, "post-boot"
+          b.use Customize, 'post-boot'
           b.use WaitForCommunicator, [:starting, :running]
-          b.use Customize, "post-comm"
+          b.use Customize, 'post-comm'
         end
       end
 
@@ -311,13 +311,13 @@ module VagrantPlugins
           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")
+              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")
+                b2.use Message, I18n.t('vagrant.commands.common.vm_not_running')
                 next
               end
               b2.use PrepareNFSValidIds
@@ -329,29 +329,29 @@ module VagrantPlugins
       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__)
-      autoload :ClearNetworkInterfaces, File.expand_path("../action/clear_network_interfaces", __FILE__)
-      autoload :ClearForwardedPorts, File.expand_path("../action/clear_forwarded_ports", __FILE__)
-      autoload :Customize, File.expand_path("../action/customize", __FILE__)
-      autoload :Destroy, File.expand_path("../action/destroy", __FILE__)
-      autoload :DestroyUnusedNetworkInterfaces, File.expand_path("../action/destroy_unused_network_interfaces", __FILE__)
-      autoload :Export, File.expand_path("../action/export", __FILE__)
-      autoload :ForcedHalt, File.expand_path("../action/forced_halt", __FILE__)
-      autoload :ForwardPorts, File.expand_path("../action/forward_ports", __FILE__)
-      autoload :Import, File.expand_path("../action/import", __FILE__)
-      autoload :Network, File.expand_path("../action/network", __FILE__)
-      autoload :Package, File.expand_path("../action/package", __FILE__)
-      autoload :PackageConfigFiles, File.expand_path("../action/package_config_files", __FILE__)
-      autoload :PrepareForwardedPortCollisionParams, File.expand_path("../action/prepare_forwarded_port_collision_params", __FILE__)
-      autoload :PrepareNFSSettings, File.expand_path("../action/prepare_nfs_settings", __FILE__)
-      autoload :PrepareNFSValidIds, File.expand_path("../action/prepare_nfs_valid_ids", __FILE__)
-      autoload :Resume, File.expand_path("../action/resume", __FILE__)
-      autoload :SaneDefaults, File.expand_path("../action/sane_defaults",__FILE__)
-      autoload :SetupPackageFiles, File.expand_path("../action/setup_package_files", __FILE__)
-      autoload :SetName, File.expand_path("../action/set_name", __FILE__)
-      autoload :Suspend, File.expand_path("../action/suspend", __FILE__)
+      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__)
+      autoload :ClearNetworkInterfaces, File.expand_path('../action/clear_network_interfaces', __FILE__)
+      autoload :ClearForwardedPorts, File.expand_path('../action/clear_forwarded_ports', __FILE__)
+      autoload :Customize, File.expand_path('../action/customize', __FILE__)
+      autoload :Destroy, File.expand_path('../action/destroy', __FILE__)
+      autoload :DestroyUnusedNetworkInterfaces, File.expand_path('../action/destroy_unused_network_interfaces', __FILE__)
+      autoload :Export, File.expand_path('../action/export', __FILE__)
+      autoload :ForcedHalt, File.expand_path('../action/forced_halt', __FILE__)
+      autoload :ForwardPorts, File.expand_path('../action/forward_ports', __FILE__)
+      autoload :Import, File.expand_path('../action/import', __FILE__)
+      autoload :Network, File.expand_path('../action/network', __FILE__)
+      autoload :Package, File.expand_path('../action/package', __FILE__)
+      autoload :PackageConfigFiles, File.expand_path('../action/package_config_files', __FILE__)
+      autoload :PrepareForwardedPortCollisionParams, File.expand_path('../action/prepare_forwarded_port_collision_params', __FILE__)
+      autoload :PrepareNFSSettings, File.expand_path('../action/prepare_nfs_settings', __FILE__)
+      autoload :PrepareNFSValidIds, File.expand_path('../action/prepare_nfs_valid_ids', __FILE__)
+      autoload :Resume, File.expand_path('../action/resume', __FILE__)
+      autoload :SaneDefaults, File.expand_path('../action/sane_defaults',__FILE__)
+      autoload :SetupPackageFiles, File.expand_path('../action/setup_package_files', __FILE__)
+      autoload :SetName, File.expand_path('../action/set_name', __FILE__)
+      autoload :Suspend, File.expand_path('../action/suspend', __FILE__)
     end
   end
 end

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

@@ -9,12 +9,11 @@ module VagrantPlugins
         def call(env)
           @env = env
 
-          env[:ui].info I18n.t("vagrant.actions.vm.boot.booting")
+          env[:ui].info I18n.t('vagrant.actions.vm.boot.booting')
           env[:machine].provider.driver.start
 
           @app.call(env)
         end
-
       end
     end
   end

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

@@ -8,7 +8,7 @@ module VagrantPlugins
 
         def call(env)
           # Delete all disabled network adapters
-          env[:ui].info I18n.t("vagrant.actions.vm.clear_network_interfaces.deleting")
+          env[:ui].info I18n.t('vagrant.actions.vm.clear_network_interfaces.deleting')
           env[:machine].provider.driver.delete_disabled_adapters
 
           @app.call(env)

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

@@ -16,7 +16,7 @@ module VagrantPlugins
           end
 
           if !customizations.empty?
-            env[:ui].info I18n.t("vagrant.actions.vm.customize.running", event: @event)
+            env[:ui].info I18n.t('vagrant.actions.vm.customize.running', event: @event)
 
             # Execute each customization command.
             customizations.each do |command|

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

@@ -7,7 +7,7 @@ module VagrantPlugins
         end
 
         def call(env)
-          env[:ui].info I18n.t("vagrant.actions.vm.destroy.destroying")
+          env[:ui].info I18n.t('vagrant.actions.vm.destroy.destroying')
           env[:machine].provider.driver.delete
           env[:machine].id = nil
 

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

@@ -1,4 +1,4 @@
-require "log4r"
+require 'log4r'
 
 module VagrantPlugins
   module Parallels
@@ -10,7 +10,7 @@ module VagrantPlugins
 
         def call(env)
           if env[:machine].provider_config.destroy_unused_network_interfaces
-            env[:ui].info I18n.t("vagrant.actions.vm.destroy_network.destroying")
+            env[:ui].info I18n.t('vagrant.actions.vm.destroy_network.destroying')
             env[:machine].provider.driver.delete_unused_host_only_networks
           end
 

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

@@ -9,7 +9,7 @@ module VagrantPlugins
         def call(env)
           current_state = env[:machine].state.id
           if current_state == :running
-            env[:ui].info I18n.t("vagrant.actions.vm.halt.force")
+            env[:ui].info I18n.t('vagrant.actions.vm.halt.force')
             env[:machine].provider.driver.halt(:force)
           end
           @app.call(env)

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

@@ -2,7 +2,7 @@ module VagrantPlugins
   module Parallels
     module Action
       class ForwardPorts
-        include Util::CompileForwardedPorts
+        include VagrantPlugins::Parallels::Util::CompileForwardedPorts
 
         def initialize(app, env)
           @app = app
@@ -40,7 +40,7 @@ module VagrantPlugins
             # because the VM is using Shared networking. Host-only and
             # bridged networking don't require port-forwarding and establishing
             # forwarded ports on these attachment types has uncertain behaviour.
-            @env[:ui].detail(I18n.t("vagrant_parallels.actions.vm.forward_ports.forwarding_entry",
+            @env[:ui].detail(I18n.t('vagrant_parallels.actions.vm.forward_ports.forwarding_entry',
                                     message_attributes))
 
             # Add the options to the ports array to send to the driver later

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

@@ -11,39 +11,39 @@ module VagrantPlugins
           @machine = env[:machine]
 
           if !@machine.provider_config.check_guest_tools
-            @logger.info("Not checking Parallels Tools because of configuration")
+            @logger.info('Not checking Parallels Tools because of configuration')
             return @app.call(env)
           end
 
-          env[:ui].output(I18n.t("vagrant_parallels.actions.vm.handle_guest_tools.checking"))
+          env[:ui].output(I18n.t('vagrant_parallels.actions.vm.handle_guest_tools.checking'))
 
           tools_state = parallels_tools_state
 
           if tools_state == :installed
-            @logger.info("The proper version of Parallels Tools is already installed")
+            @logger.info('The proper version of Parallels Tools is already installed')
             return @app.call(env)
           elsif tools_state == :outdated
-            env[:ui].warn(I18n.t("vagrant_parallels.actions.vm.handle_guest_tools.outdated"))
+            env[:ui].warn(I18n.t('vagrant_parallels.actions.vm.handle_guest_tools.outdated'))
           else
-            env[:ui].warn(I18n.t("vagrant_parallels.actions.vm.handle_guest_tools.not_detected"))
+            env[:ui].warn(I18n.t('vagrant_parallels.actions.vm.handle_guest_tools.not_detected'))
           end
 
           if !@machine.provider_config.update_guest_tools
-            @logger.info("Not updating Parallels Tools because of configuration")
+            @logger.info('Not updating Parallels Tools because of configuration')
             return @app.call(env)
           end
 
           # Update/Install Parallels Tools
           if @machine.guest.capability?(:install_parallels_tools)
-            env[:ui].output(I18n.t("vagrant_parallels.actions.vm.handle_guest_tools.installing"))
+            env[:ui].output(I18n.t('vagrant_parallels.actions.vm.handle_guest_tools.installing'))
             @machine.guest.capability(:install_parallels_tools)
 
             # The VM should be rebooted to enable kernel modules
             # bundled with Parallels Tools.
-            env[:ui].output(I18n.t("vagrant_parallels.actions.vm.handle_guest_tools.rebooting"))
+            env[:ui].output(I18n.t('vagrant_parallels.actions.vm.handle_guest_tools.rebooting'))
             @machine.action(:simple_reboot)
           else
-            env[:ui].warn(I18n.t("vagrant_parallels.actions.vm.handle_guest_tools.cant_install"))
+            env[:ui].warn(I18n.t('vagrant_parallels.actions.vm.handle_guest_tools.cant_install'))
           end
 
           # Continue
@@ -67,7 +67,6 @@ module VagrantPlugins
 
           @machine.provider.driver.read_guest_tools_state
         end
-
       end
     end
   end