vagrant-parallels 1.4.2 → 1.4.3

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

@@ -5,13 +5,13 @@ module VagrantPlugins
         def initialize(app, env)
           @app = app
 
-          env["package.include"] ||= []
-          env["package.vagrantfile"] ||= nil
+          env['package.include'] ||= []
+          env['package.vagrantfile'] ||= nil
         end
 
         def call(env)
           files = {}
-          env["package.include"].each do |file|
+          env['package.include'].each do |file|
             source = Pathname.new(file)
 
             # If the source is relative then we add the file as-is to the include
@@ -28,9 +28,9 @@ module VagrantPlugins
             files[file] = dest
           end
 
-          if env["package.vagrantfile"]
+          if env['package.vagrantfile']
             # Vagrantfiles are treated special and mapped to a specific file
-            files[env["package.vagrantfile"]] = "_Vagrantfile"
+            files[env['package.vagrantfile']] = '_Vagrantfile'
           end
 
           # Verify the mapping
@@ -40,7 +40,7 @@ module VagrantPlugins
           end
 
           # Save the mapping
-          env["package.files"] = files
+          env['package.files'] = files
 
           @app.call(env)
         end

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

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

data/lib/vagrant-parallels/config.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   module Parallels
-    class Config < Vagrant.plugin("2", :config)
+    class Config < Vagrant.plugin('2', :config)
       attr_accessor :check_guest_tools
       attr_reader   :customizations
       attr_accessor :destroy_unused_network_interfaces
@@ -34,7 +34,7 @@ module VagrantPlugins
       end
 
       def customize(*command)
-        event   = command.first.is_a?(String) ? command.shift : "pre-boot"
+        event   = command.first.is_a?(String) ? command.shift : 'pre-boot'
         command = command[0]
         @customizations << [event, command]
       end
@@ -45,11 +45,11 @@ module VagrantPlugins
 
       # @param size [Integer, String] the memory size in MB
       def memory=(size)
-        customize("pre-boot", ["set", :id, "--memsize", size.to_s])
+        customize('pre-boot', ['set', :id, '--memsize', size.to_s])
       end
 
       def cpus=(count)
-        customize("pre-boot", ["set", :id, "--cpus", count.to_i])
+        customize('pre-boot', ['set', :id, '--cpus', count.to_i])
       end
 
       def regen_box_uuid=(value)
@@ -97,21 +97,19 @@ module VagrantPlugins
         valid_events = ['pre-import', 'post-import', 'pre-boot', 'post-boot', 'post-comm']
         @customizations.each do |event, _|
           if !valid_events.include?(event)
-            errors << I18n.t("vagrant_parallels.config.invalid_event",
+            errors << I18n.t('vagrant_parallels.config.invalid_event',
                              event: event.to_s,
-                             valid_events: valid_events.join(", "))
+                             valid_events: valid_events.join(', '))
           end
         end
         @customizations.each do |event, command|
-          if event == "pre-import" && command.index(:id)
-            errors << I18n.t("vagrant_parallels.config.id_in_pre_import")
+          if event == 'pre-import' && command.index(:id)
+            errors << I18n.t('vagrant_parallels.config.id_in_pre_import')
           end
         end
 
-        { "Parallels Provider" => errors }
-
+        { 'Parallels Provider' => errors }
       end
-
     end
   end
 end

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

@@ -1,7 +1,7 @@
 require 'forwardable'
 require 'log4r'
 
-require File.expand_path('../base', __FILE__)
+require_relative 'base'
 
 module VagrantPlugins
   module Parallels

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

@@ -2,7 +2,7 @@ require 'log4r'
 
 require 'vagrant/util/platform'
 
-require File.expand_path('../pd_9', __FILE__)
+require_relative 'pd_9'
 
 module VagrantPlugins
   module Parallels

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

@@ -2,7 +2,7 @@ require 'log4r'
 
 require 'vagrant/util/platform'
 
-require File.expand_path('../pd_10', __FILE__)
+require_relative 'pd_10'
 
 module VagrantPlugins
   module Parallels

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

@@ -4,7 +4,7 @@ require 'securerandom'
 
 require 'vagrant/util/platform'
 
-require File.expand_path("../base", __FILE__)
+require_relative 'base'
 
 module VagrantPlugins
   module Parallels
@@ -23,7 +23,7 @@ module VagrantPlugins
           # 'Shared'(vnic0) and 'Host-Only'(vnic1) are default in Parallels Desktop
           # They should not be deleted anyway.
           networks.keep_if do |net|
-            net['Type'] == "host-only" &&
+            net['Type'] == 'host-only' &&
               net['Bound To'].match(/^(?>vnic|Parallels Host-Only #)(\d+)$/)[1].to_i >= 2
           end
 
@@ -58,9 +58,9 @@ module VagrantPlugins
           adapters.each do |adapter|
             args = []
             if existing_adapters.include? "net#{adapter[:adapter]}"
-              args.concat(["--device-set","net#{adapter[:adapter]}", "--enable"])
+              args.concat(['--device-set',"net#{adapter[:adapter]}", '--enable'])
             else
-              args.concat(["--device-add", "net"])
+              args.concat(['--device-add', 'net'])
             end
 
             if adapter[:type] == :hostonly
@@ -73,28 +73,28 @@ module VagrantPlugins
               # The only difference is the destination interface:
               # - in host-only (private) network it will be bridged to the 'vnicX' device
               # - in real bridge (public) network it will be bridged to the assigned device
-              args.concat(["--type", "bridged", "--iface", net_info['Bound To']])
+              args.concat(['--type', 'bridged', '--iface', net_info['Bound To']])
             elsif adapter[:type] == :bridged
-              args.concat(["--type", "bridged", "--iface", adapter[:bridge]])
+              args.concat(['--type', 'bridged', '--iface', adapter[:bridge]])
             elsif adapter[:type] == :shared
-              args.concat(["--type", "shared"])
+              args.concat(['--type', 'shared'])
             end
 
             if adapter[:mac_address]
-              args.concat(["--mac", adapter[:mac_address]])
+              args.concat(['--mac', adapter[:mac_address]])
             end
 
             if adapter[:nic_type]
-              args.concat(["--adapter-type", adapter[:nic_type].to_s])
+              args.concat(['--adapter-type', adapter[:nic_type].to_s])
             end
 
-            execute_prlctl("set", @uuid, *args)
+            execute_prlctl('set', @uuid, *args)
           end
         end
 
         def read_host_only_interfaces
           net_list = read_virtual_networks
-          net_list.keep_if { |net| net['Type'] == "host-only" }
+          net_list.keep_if { |net| net['Type'] == 'host-only' }
 
           hostonly_ifaces = []
           net_list.each do |iface|
@@ -105,7 +105,7 @@ module VagrantPlugins
             info[:ip]       = net_info['Parallels adapter']['IP address']
             info[:netmask]  = net_info['Parallels adapter']['Subnet mask']
             # Such interfaces are always in 'Up'
-            info[:status]   = "Up"
+            info[:status]   = 'Up'
 
             # There may be a fake DHCPv4 parameters
             # We can trust them only if adapter IP and DHCP IP are in the same subnet
@@ -128,23 +128,23 @@ module VagrantPlugins
 
           # Get enabled VM's network interfaces
           ifaces = read_settings.fetch('Hardware', {}).keep_if do |dev, params|
-            dev.start_with?('net') and params.fetch("enabled", true)
+            dev.start_with?('net') and params.fetch('enabled', true)
           end
           ifaces.each do |name, params|
             adapter = name.match(/^net(\d+)$/)[1].to_i
             nics[adapter] ||= {}
 
-            if params['type'] == "shared"
+            if params['type'] == 'shared'
               nics[adapter][:type] = :shared
-            elsif params['type'] == "host"
+            elsif params['type'] == 'host'
               # It is PD internal host-only network and it is bounded to 'vnic1'
               nics[adapter][:type] = :hostonly
-              nics[adapter][:hostonly] = "vnic1"
-            elsif params['type'] == "bridged" and params.fetch('iface','').start_with?('vnic')
+              nics[adapter][:hostonly] = 'vnic1'
+            elsif params['type'] == 'bridged' and params.fetch('iface','').start_with?('vnic')
               # Bridged to the 'vnicXX'? Then it is a host-only, actually.
               nics[adapter][:type] = :hostonly
               nics[adapter][:hostonly] = params.fetch('iface','')
-            elsif params['type'] == "bridged"
+            elsif params['type'] == 'bridged'
               nics[adapter][:type] = :bridged
               nics[adapter][:bridge] = params.fetch('iface','')
             end
@@ -160,7 +160,7 @@ module VagrantPlugins
             name:    net_info['Bound To'],
             ip:      net_info['Parallels adapter']['IP address'],
             netmask: net_info['Parallels adapter']['Subnet mask'],
-            status:  "Up"
+            status: 'Up'
           }
 
           if net_info.key?('DHCPv4 server')

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

@@ -2,7 +2,7 @@ require 'log4r'
 
 require 'vagrant/util/platform'
 
-require File.expand_path('../pd_8', __FILE__)
+require_relative 'pd_8'
 
 module VagrantPlugins
   module Parallels

data/lib/vagrant-parallels/errors.rb

@@ -1,10 +1,10 @@
-require "vagrant"
+require 'vagrant'
 
 module VagrantPlugins
   module Parallels
     module Errors
       class VagrantParallelsError < Vagrant::Errors::VagrantError
-        error_namespace("vagrant_parallels.errors")
+        error_namespace('vagrant_parallels.errors')
       end
 
       class DhcpLeasesNotAccessible < VagrantParallelsError

data/lib/vagrant-parallels/guest_cap/linux/install_parallels_tools.rb

@@ -7,14 +7,14 @@ module VagrantPlugins
           if ptiagent_usable?(machine)
             # Argument '--info' means that Parallels Tools version will be
             # checked before the installing.
-            machine.communicate.sudo("ptiagent-cmd --info")
+            machine.communicate.sudo('ptiagent-cmd --info')
           else
             machine.communicate.tap do |comm|
               tools_iso_path = File.expand_path(
-                machine.provider.driver.read_guest_tools_iso_path("linux"),
+                machine.provider.driver.read_guest_tools_iso_path('linux'),
                 machine.env.root_path
               )
-              remote_file = "/tmp/prl-tools-lin.iso"
+              remote_file = '/tmp/prl-tools-lin.iso'
               mount_point = "/media/prl-tools-lin_#{rand(100000)}/"
 
               comm.upload(tools_iso_path, remote_file)
@@ -44,8 +44,8 @@ module VagrantPlugins
           # 'ptiagent-cmd' binary should be available on the guest
 
           machine.provider_name == :parallels &&
-          Gem::Version.new(machine.provider.driver.version) >= Gem::Version.new("9") &&
-          machine.communicate.test("which ptiagent-cmd", :sudo => true)
+          Gem::Version.new(machine.provider.driver.version) >= Gem::Version.new('9') &&
+          machine.communicate.test('which ptiagent-cmd', :sudo => true)
         end
       end
     end

data/lib/vagrant-parallels/guest_cap/linux/mount_parallels_shared_folder.rb

@@ -36,12 +36,12 @@ module VagrantPlugins
 
           # First mount command uses getent to get the group
           mount_options = "-o uid=#{mount_uid},gid=#{mount_gid}"
-          mount_options += ",#{options[:mount_options].join(",")}" if options[:mount_options]
+          mount_options += ",#{options[:mount_options].join(',')}" if options[:mount_options]
           mount_commands << "mount -t prl_fs #{mount_options} #{name} #{expanded_guest_path}"
 
           # Second mount command uses the old style `id -g`
           mount_options = "-o uid=#{mount_uid},gid=#{mount_gid_old}"
-          mount_options += ",#{options[:mount_options].join(",")}" if options[:mount_options]
+          mount_options += ",#{options[:mount_options].join(',')}" if options[:mount_options]
           mount_commands << "mount -t prl_fs #{mount_options} #{name} #{expanded_guest_path}"
 
           # Clear prior symlink if exists
@@ -80,7 +80,7 @@ module VagrantPlugins
           end
 
           # Emit an upstart event if we can
-          if machine.communicate.test("test -x /sbin/initctl")
+          if machine.communicate.test('test -x /sbin/initctl')
             machine.communicate.sudo(
               "/sbin/initctl emit --no-wait vagrant-mounted MOUNTPOINT=#{expanded_guest_path}")
           end

data/lib/vagrant-parallels/model/forwarded_port.rb

@@ -37,7 +37,7 @@ module VagrantPlugins
           options ||= {}
           @auto_correct = false
           @auto_correct = options[:auto_correct] if options.has_key?(:auto_correct)
-          @protocol = options[:protocol] || "tcp"
+          @protocol = options[:protocol] || 'tcp'
         end
 
         # This corrects the host port and changes it to the given new port.

data/lib/vagrant-parallels/plugin.rb

@@ -1,105 +1,140 @@
 begin
-  require "vagrant"
+  require 'vagrant'
 rescue LoadError
-  raise "The Vagrant Parallels plugin must be run within Vagrant."
+  raise 'The Vagrant Parallels plugin must be run within Vagrant.'
 end
 
 # This is a sanity check to make sure no one is attempting to install
 # this into an early Vagrant version.
-if Vagrant::VERSION < "1.5.0"
-  raise "The Vagrant Parallels plugin is only compatible with Vagrant 1.5+"
+if Vagrant::VERSION < '1.5.0'
+  raise 'The Vagrant Parallels plugin is only compatible with Vagrant 1.5+'
 end
 
 module VagrantPlugins
   module Parallels
-
-    class Plugin < Vagrant.plugin("2")
-      name "vagrant-parallels"
+    class Plugin < Vagrant.plugin('2')
+      name 'vagrant-parallels'
       description <<-EOF
       The Parallels provider allows Vagrant to manage and control
-      Parallels-based virtual machines.
+      Parallels Desktop virtual machines.
       EOF
 
       provider(:parallels, parallel: true, priority: 7) do
-        require File.expand_path("../provider", __FILE__)
+        # Setup logging and i18n
+        setup_logging
+        setup_i18n
+
+        require_relative 'provider'
         Provider
       end
 
       config(:parallels, :provider) do
-        require File.expand_path("../config", __FILE__)
+        require_relative 'config'
         Config
       end
 
       guest_capability(:darwin, :mount_parallels_shared_folder) do
-        require_relative "guest_cap/darwin/mount_parallels_shared_folder"
+        require_relative 'guest_cap/darwin/mount_parallels_shared_folder'
         GuestDarwinCap::MountParallelsSharedFolder
       end
 
       guest_capability(:darwin, :unmount_parallels_shared_folder) do
-        require_relative "guest_cap/darwin/mount_parallels_shared_folder"
+        require_relative 'guest_cap/darwin/mount_parallels_shared_folder'
         GuestDarwinCap::MountParallelsSharedFolder
       end
 
       guest_capability(:linux, :mount_parallels_shared_folder) do
-        require_relative "guest_cap/linux/mount_parallels_shared_folder"
+        require_relative 'guest_cap/linux/mount_parallels_shared_folder'
         GuestLinuxCap::MountParallelsSharedFolder
       end
 
       guest_capability(:linux, :unmount_parallels_shared_folder) do
-        require_relative "guest_cap/linux/mount_parallels_shared_folder"
+        require_relative 'guest_cap/linux/mount_parallels_shared_folder'
         GuestLinuxCap::MountParallelsSharedFolder
       end
 
       guest_capability(:linux, :prepare_psf_services) do
-        require_relative "guest_cap/linux/mount_parallels_shared_folder"
+        require_relative 'guest_cap/linux/mount_parallels_shared_folder'
         GuestLinuxCap::MountParallelsSharedFolder
       end
 
       guest_capability(:linux, :install_parallels_tools) do
-        require_relative "guest_cap/linux/install_parallels_tools"
+        require_relative 'guest_cap/linux/install_parallels_tools'
         GuestLinuxCap::InstallParallelsTools
       end
 
       provider_capability(:parallels, :public_address) do
-        require_relative "cap/public_address"
+        require_relative 'cap/public_address'
         Cap::PublicAddress
       end
 
       provider_capability(:parallels, :host_address) do
-        require_relative "cap/host_address"
+        require_relative 'cap/host_address'
         Cap::HostAddress
       end
 
       provider_capability(:parallels, :nic_mac_addresses) do
-        require_relative "cap/nic_mac_addresses"
+        require_relative 'cap/nic_mac_addresses'
         Cap::NicMacAddresses
       end
 
       synced_folder(:parallels) do
-        require File.expand_path("../synced_folder", __FILE__)
+        require_relative 'synced_folder'
         SyncedFolder
       end
 
-    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
 
-    autoload :Action, File.expand_path("../action", __FILE__)
+      # 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
+    end
 
     # Drop some autoloads in here to optimize the performance of loading
     # our drivers only when they are needed.
     module Driver
-      autoload :Meta, File.expand_path("../driver/meta", __FILE__)
-      autoload :PD_8, File.expand_path("../driver/pd_8", __FILE__)
-      autoload :PD_9, File.expand_path("../driver/pd_9", __FILE__)
-      autoload :PD_10, File.expand_path("../driver/pd_10", __FILE__)
-      autoload :PD_11, File.expand_path("../driver/pd_11", __FILE__)
+      autoload :Meta, File.expand_path('../driver/meta', __FILE__)
+      autoload :PD_8, File.expand_path('../driver/pd_8', __FILE__)
+      autoload :PD_9, File.expand_path('../driver/pd_9', __FILE__)
+      autoload :PD_10, File.expand_path('../driver/pd_10', __FILE__)
+      autoload :PD_11, File.expand_path('../driver/pd_11', __FILE__)
     end
 
     module Model
-      autoload :ForwardedPort, File.expand_path("../model/forwarded_port", __FILE__)
+      autoload :ForwardedPort, File.expand_path('../model/forwarded_port', __FILE__)
     end
 
     module Util
-      autoload :CompileForwardedPorts, File.expand_path("../util/compile_forwarded_ports", __FILE__)
+      autoload :CompileForwardedPorts, File.expand_path('../util/compile_forwarded_ports', __FILE__)
     end
   end
-end
+end