vagrant-parallels 1.7.7 → 2.2.0

data/lib/vagrant-parallels/util/unix_mount_helpers.rb

@@ -0,0 +1,121 @@
+require "shellwords"
+require "vagrant/util/retryable"
+
+module VagrantPlugins
+  module Parallels
+    module Util
+      module UnixMountHelpers
+
+        def self.extended(klass)
+          if !klass.class_variable_defined?(:@@logger)
+            klass.class_variable_set(:@@logger, Log4r::Logger.new(klass.name.downcase))
+          end
+          klass.extend Vagrant::Util::Retryable
+        end
+
+        def detect_owner_group_ids(machine, guest_path, mount_options, options)
+          mount_uid = find_mount_options_id("uid", mount_options)
+          mount_gid = find_mount_options_id("gid", mount_options)
+
+          if mount_uid.nil?
+            if options[:owner].to_i.to_s == options[:owner].to_s
+              mount_uid = options[:owner]
+              self.class_variable_get(:@@logger).debug("Owner user ID (provided): #{mount_uid}")
+            else
+              output = {stdout: '', stderr: ''}
+              uid_command = "id -u #{options[:owner]}"
+              machine.communicate.execute(uid_command,
+                error_class: Errors::ParallelsMountFailed,
+                error_key: :parallels_mount_failed,
+                command: uid_command,
+                output: output[:stderr]
+              ) { |type, data| output[type] << data if output[type] }
+              mount_uid = output[:stdout].chomp
+              self.class_variable_get(:@@logger).debug("Owner user ID (lookup): #{options[:owner]} -> #{mount_uid}")
+            end
+          else
+            machine.ui.warn "Detected mount owner ID within mount options. (uid: #{mount_uid} guestpath: #{guest_path})"
+          end
+
+          if mount_gid.nil?
+            if options[:group].to_i.to_s == options[:group].to_s
+              mount_gid = options[:group]
+              self.class_variable_get(:@@logger).debug("Owner group ID (provided): #{mount_gid}")
+            else
+              begin
+                output = {stdout: '', stderr: ''}
+                gid_command = "getent group #{options[:group]}"
+                machine.communicate.execute(gid_command,
+                  error_class: Errors::ParallelsMountFailed,
+                  error_key: :parallels_mount_failed,
+                  command: gid_command,
+                  output: output[:stderr]
+                ) { |type, data| output[type] << data if output[type] }
+                mount_gid = output[:stdout].split(':').at(2).to_s.chomp
+                self.class_variable_get(:@@logger).debug("Owner group ID (lookup): #{options[:group]} -> #{mount_gid}")
+              rescue Vagrant::Errors::ParallelsMountFailed
+                if options[:owner] == options[:group]
+                  self.class_variable_get(:@@logger).debug("Failed to locate group `#{options[:group]}`. Group name matches owner. Fetching effective group ID.")
+                  output = {stdout: ''}
+                  result = machine.communicate.execute("id -g #{options[:owner]}",
+                    error_check: false
+                  ) { |type, data| output[type] << data if output[type] }
+                  mount_gid = output[:stdout].chomp if result == 0
+                  self.class_variable_get(:@@logger).debug("Owner group ID (effective): #{mount_gid}")
+                end
+                raise unless mount_gid
+              end
+            end
+          else
+            machine.ui.warn "Detected mount group ID within mount options. (gid: #{mount_gid} guestpath: #{guest_path})"
+          end
+          {:gid => mount_gid, :uid => mount_uid}
+        end
+
+        def find_mount_options_id(id_name, mount_options)
+          id_line = mount_options.detect{|line| line.include?("#{id_name}=")}
+          if id_line
+            match = id_line.match(/,?#{Regexp.escape(id_name)}=(?<option_id>\d+),?/)
+            found_id = match["option_id"]
+            updated_id_line = [
+              match.pre_match,
+              match.post_match
+            ].find_all{|string| !string.empty?}.join(',')
+            if updated_id_line.empty?
+              mount_options.delete(id_line)
+            else
+              idx = mount_options.index(id_line)
+              mount_options.delete(idx)
+              mount_options.insert(idx, updated_id_line)
+            end
+          end
+          found_id
+        end
+
+        def emit_upstart_notification(machine, guest_path)
+          # Emit an upstart event if we can
+          machine.communicate.sudo <<-EOH.gsub(/^ {12}/, "")
+              if command -v /sbin/init && /sbin/init 2>/dev/null --version | grep upstart; then
+                /sbin/initctl emit --no-wait vagrant-mounted MOUNTPOINT=#{guest_path}
+              fi
+            EOH
+        end
+
+        def merge_mount_options(base, overrides)
+          base = base.join(",").split(",")
+          overrides = overrides.join(",").split(",")
+          b_kv = Hash[base.map{|item| item.split("=", 2) }]
+          o_kv = Hash[overrides.map{|item| item.split("=", 2) }]
+          merged = {}.tap do |opts|
+            (b_kv.keys + o_kv.keys).uniq.each do |key|
+              opts[key] = o_kv.fetch(key, b_kv[key])
+            end
+          end
+          merged.map do |key, value|
+            [key, value].compact.join("=")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-parallels/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Parallels
-    VERSION = '1.7.7'
+    VERSION = '2.2.0'
   end
 end

data/locales/en.yml

@@ -45,26 +45,26 @@ en:
         disk is inconsistent, please remove it from the VM configuration.
 
         Disk image path: %{path}
-      linux_mount_failed: |-
-        Failed to mount folders in Linux guest. This is usually because
-        the "prl_fs" file system is not available. Please verify that
-        Parallels Tools are properly installed in the guest and
-        can work properly. If so, the VM reboot can solve a problem.
-        The command attempted was:
-
-        %{command}
       linux_prl_fs_invalid_options: |-
         Failed to mount folders in Linux guest. You've specified mount options
         which are not supported by "prl_fs" file system.
 
         Invalid mount options: %{options}
+      network_collision: |-
+        The specified host network collides with a non-hostonly network!
+        This will cause your specified IP to be inaccessible. Please change
+        the IP or name of your host only network so that it no longer matches that of
+        a bridged or non-hostonly network.
+
+        Host-only Network Address: '%{hostonly_netaddr}'
+        Bridged Network '%{bridge_interface}': '%{bridge_netaddr}'
       network_invalid_address: |-
         Network settings specified in your Vagrantfile are invalid:
 
         Network settings: %{options}
         Error: %{error}
       mac_os_x_required: |-
-        Parallels provider works only on OS X (Mac OS X) systems.
+        Parallels provider works only on macOS (Mac OS X) systems.
       parallels_install_incomplete: |-
         Parallels Desktop is complaining that the installation is incomplete.
         Try to reinstall Parallels Desktop or contact Parallels support.
@@ -73,6 +73,19 @@ en:
           %{output}
 
         This is an internal error that should be reported as a bug.
+      parallels_mount_failed: |-
+        Vagrant was unable to mount Parallels Desktop shared folders. This is usually
+        because the filesystem "prl_fs" is not available. This filesystem is
+        made available via the Parallels Tools and kernel module.
+        Please verify that these guest tools are properly installed in the
+        guest. This is not a bug in Vagrant and is usually caused by a faulty
+        Vagrant box. For context, the command attempted was:
+
+        %{command}
+
+        The error output from the command was:
+
+        %{output}
       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"
@@ -101,12 +114,12 @@ en:
         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
+        Please upgrade your installation: https://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 10 or later.
-        Please upgrade your installation: http://parallels.com/desktop
+        only with Parallels Desktop 11 or later.
+        Please upgrade your installation: https://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
@@ -205,8 +218,8 @@ en:
         check_shared_interface:
           connecting: Connecting host to Shared network...
         clone:
-          full: Cloning new virtual machine...
-          linked: Creating new virtual machine as a linked clone...
+          full: Creating new virtual machine as a full clone of the box image...
+          linked: Creating new virtual machine as a linked clone of the box image...
         handle_guest_tools:
           cant_install: |-
             Vagrant doesn't support installing Parallels Tools for the guest OS

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 1.7.7
+  version: 2.2.0
 platform: ruby
 authors:
 - Mikhail Zholobov
 - Youssef Shahin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-10-15 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.3.0
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.3.0
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 description: Enables Vagrant to manage Parallels virtual machines.
 email:
 - mzholobov@parallels.com
@@ -98,6 +98,7 @@ files:
 - lib/vagrant-parallels/action/network.rb
 - lib/vagrant-parallels/action/package.rb
 - lib/vagrant-parallels/action/package_config_files.rb
+- lib/vagrant-parallels/action/package_vagrantfile.rb
 - lib/vagrant-parallels/action/prepare_clone_snapshot.rb
 - lib/vagrant-parallels/action/prepare_forwarded_port_collision_params.rb
 - lib/vagrant-parallels/action/prepare_nfs_settings.rb
@@ -111,10 +112,10 @@ files:
 - lib/vagrant-parallels/action/snapshot_save.rb
 - lib/vagrant-parallels/action/suspend.rb
 - lib/vagrant-parallels/cap.rb
+- lib/vagrant-parallels/cap/mount_options.rb
 - lib/vagrant-parallels/config.rb
 - lib/vagrant-parallels/driver/base.rb
 - lib/vagrant-parallels/driver/meta.rb
-- lib/vagrant-parallels/driver/pd_10.rb
 - lib/vagrant-parallels/driver/pd_11.rb
 - lib/vagrant-parallels/driver/pd_12.rb
 - lib/vagrant-parallels/errors.rb
@@ -128,13 +129,14 @@ files:
 - lib/vagrant-parallels/provider.rb
 - lib/vagrant-parallels/synced_folder.rb
 - lib/vagrant-parallels/util/compile_forwarded_ports.rb
+- lib/vagrant-parallels/util/unix_mount_helpers.rb
 - lib/vagrant-parallels/version.rb
 - locales/en.yml
-homepage: http://github.com/Parallels/vagrant-parallels
+homepage: https://github.com/Parallels/vagrant-parallels
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -149,9 +151,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: vagrant-parallels
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Parallels provider for Vagrant.
 test_files: []

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

@@ -1,20 +0,0 @@
-require 'log4r'
-
-require 'vagrant/util/platform'
-
-require_relative 'base'
-
-module VagrantPlugins
-  module Parallels
-    module Driver
-      # Driver for Parallels Desktop 10.
-      class PD_10 < Base
-        def initialize(uuid)
-          super(uuid)
-
-          @logger = Log4r::Logger.new('vagrant_parallels::driver::pd_10')
-        end
-      end
-    end
-  end
-end