vagrant-parallels 2.2.5 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ede8c43d4ad31a4ad5cec8ecf94158e93a825ea959bf4a2cbf5da1b1428108ad
-  data.tar.gz: 0e56a44dcbd181577e69ef04525be3278a86fd6c0ccb41139635a19176d3768e
+  metadata.gz: 4cc3b37f94bef78ed214b98add9ae9814d6cad49650e5016fce26c7b7641eaaa
+  data.tar.gz: 0e1ffee3b192374a3acc9b36438334605702e7c5b472d1e47857a31acd5c7196
 SHA512:
-  metadata.gz: a283f0ebedc0074f277fd902725d6724b1db7a7c822621885f5df8bba6197abe9e3e6a914a5cfc8146c4abd187c04a81c59ff02f364c058ffa3fbe7f7fc634be
-  data.tar.gz: 8af828330dc40be03eefcd34834e2eb1d7490ba7ed7331d01dbec224f148ca9743d961cc2510c889d97112f50bc3f7d0db0047c0c3cb5cc03316ed256ed665a3
+  metadata.gz: f03a6bc1a95f28f95a736d3ce59dc52edb00bd609780e24ef26b38090ef32421ef8db5f362cd9692954aa88292e18af89cd884ea423f9a244d5932cdfff1749d
+  data.tar.gz: 86467aba98c5870183d5da52a0b688ca28f5f06eb5160d983ea26d80a582a20108958e0b54c2c4ee14adb8f3740608ffeaf4f84debdbafb614a79da75c9f8e5b

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 2.3.0 (March 22, 2022)
+IMPROVEMENTS:
+  - Support fetching the VM IP using prlctl
+  [[GH-434](https://github.com/Parallels/vagrant-parallels/pull/434)].
+  - Update gem dependensies and support Ruby 3.0
+  [[GH-437](https://github.com/Parallels/vagrant-parallels/pull/437)],
+  [[GH-439](https://github.com/Parallels/vagrant-parallels/pull/439)].
+
+BUG FIXES:
+  - Fixes SSH access to `.macvm` VMs on Macs with Apple M-series chip
+  [[GH-435](https://github.com/Parallels/vagrant-parallels/issues/435)]
+
+## 2.2.6 (December 19, 2022)
+BUG FIXES:
+  - Fix the macOS VMs support on ARM-based Mac
+  [[GH-429](https://github.com/Parallels/vagrant-parallels/pull/429)]
+
 ## 2.2.5 (February 22, 2022)
 BUG FIXES:
   - Fixed Parallels Tool installation on M1 hosts with arm64

data/LICENSE.txt

@@ -1,5 +1,5 @@
 Copyright (c) 2013 Youssef Shahin
-Copyright (c) 2013-2017 Parallels International GmbH.
+Copyright (c) 2013-2023 Parallels International GmbH.
 
 MIT License
 

data/README.md

@@ -53,6 +53,6 @@ please report it on the [Issue Tracker](https://github.com/Parallels/vagrant-par
 
 * Author: Youssef Shahin <yshahin@gmail.com>
 * Author: Mikhail Zholobov <legal90@gmail.com>
-* Copyright 2013-2020, Parallels International GmbH.
+* Copyright 2013-2023, Parallels International GmbH.
 
 Vagrant Parallels Provider is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).

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

@@ -39,13 +39,13 @@ module VagrantPlugins
         protected
 
         def box_path(env)
-          pvm = Dir.glob(env[:machine].box.directory.join('*.pvm')).first
+          res = Dir.glob(env[:machine].box.directory.join('*.{pvm,macvm}')).first
 
-          if !pvm
+          if !res
             raise Errors::BoxImageNotFound, name: env[:machine].box.name
           end
 
-          pvm
+          res
         end
 
         def box_id(env)
@@ -120,9 +120,6 @@ module VagrantPlugins
             f.write(env[:clone_id])
           end
 
-          # Convert template to VM (compatibility with old-styled boxes)
-          env[:machine].provider.driver.execute_prlctl(
-            'set', env[:clone_id], '--template', 'off')
         end
       end
     end

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

@@ -4,6 +4,7 @@ module VagrantPlugins
   module Parallels
     module Action
       class Import
+        include VagrantPlugins::Parallels::Util::Common
         @@lock = Mutex.new
 
         def initialize(app, env)
@@ -24,7 +25,8 @@ module VagrantPlugins
           end
 
           # Linked clones are supported only for PD 11 and higher
-          if env[:machine].provider_config.linked_clone
+          # Linked clones are not supported in macvms
+          if env[:machine].provider_config.linked_clone and !is_macvm(env)
             # Linked clone creation should not be concurrent [GH-206]
             options[:snapshot_id] = env[:clone_snapshot_id]
             options[:linked] = true

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

@@ -6,6 +6,7 @@ module VagrantPlugins
   module Parallels
     module Action
       class PrepareCloneSnapshot
+        include VagrantPlugins::Parallels::Util::Common
         @@lock = Mutex.new
 
         def initialize(app, env)
@@ -19,6 +20,12 @@ module VagrantPlugins
             return @app.call(env)
           end
 
+          if is_macvm(env)
+            #Ignore, since macvms doesn't support snapshot creation
+            @logger.info('Snapshot creation is not supported yet for macOS ARM Guests, skip snapshot preparing')
+            return @app.call(env)
+          end
+
           # If we're not doing a linked clone, snapshots don't matter
           if !env[:machine].provider_config.linked_clone
             return @app.call(env)

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

@@ -37,7 +37,7 @@ module VagrantPlugins
         # The ! indicates that this method modifies its argument.
         def add_ips_to_env!(env)
           host_ip  = @machine.provider.driver.read_shared_interface[:ip]
-          guest_ip = @machine.provider.driver.read_guest_ip
+          guest_ip = @machine.provider.driver.ssh_ip
 
           # If we couldn't determine either guest's or host's IP, then
           # it is probably a bug. Display an appropriate error message.

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

@@ -4,6 +4,8 @@ module VagrantPlugins
   module Parallels
     module Action
       class SaneDefaults
+        include VagrantPlugins::Parallels::Util::Common
+
         def initialize(app, env)
           @logger = Log4r::Logger.new('vagrant_parallels::action::sanedefaults')
           @app = app
@@ -27,6 +29,9 @@ module VagrantPlugins
         private
 
         def default_settings
+          # Options defined below are not supported for `*.macvm` VMs
+          return {} if is_macvm(@env)
+
           {
             tools_autoupdate: 'no',
             on_shutdown: 'close',

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

@@ -403,11 +403,12 @@ module VagrantPlugins
           end
         end
 
-        # Returns an IP of the virtual machine. It requires that Shared network
-        # adapter is configured for this VM and it obtains an IP via DHCP.
+        # Returns an IP of the virtual machine fetched from the DHCP lease file.
+        # It requires that Shared network adapter is configured for this VM
+        # and it obtains an IP via DHCP.
         #
         # @return [String] IP address leased by DHCP server in "Shared" network
-        def read_guest_ip
+        def read_guest_ip_dhcp
           mac_addr = read_mac_address.downcase
           leases_file = '/Library/Preferences/Parallels/parallels_dhcp_leases'
           leases = {}
@@ -430,6 +431,15 @@ module VagrantPlugins
           leases.max_by { |_ip, lease_time| lease_time }.first
         end
 
+        # Returns an IP of the virtual machine fetched from prlctl.
+        #
+        # @return [String] IP address returned by `prlctl list -f` command
+        def read_guest_ip_prlctl
+          vm_info = json { execute_prlctl('list', @uuid, '--full', '--json') }
+          ip = vm_info.first.fetch('ip_configured', nil)
+          ip == '-' ? nil : ip
+        end
+
         # Returns path to the Parallels Tools ISO file.
         #
         # @param [String] guest_os Guest os type: "linux", "darwin" or "windows"
@@ -757,11 +767,14 @@ module VagrantPlugins
           end
         end
 
-        # Reads the SSH IP of this VM.
+        # Reads the SSH IP of this VM from DHCP lease file or from `prlctl list`
+        # command - whatever returns a non-empty result.
+        # The method with DHCP does not work for *.macvm VMs on Apple M-series Macs,
+        # so we try both sources here.
         #
         # @return [String] IP address to use for SSH connection to the VM.
         def ssh_ip
-          read_guest_ip
+          read_guest_ip_dhcp || read_guest_ip_prlctl
         end
 
         # Reads the SSH port of this VM.

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

@@ -87,7 +87,8 @@ module VagrantPlugins
                        :read_bridged_interfaces,
                        :read_current_snapshot,
                        :read_forwarded_ports,
-                       :read_guest_ip,
+                       :read_guest_ip_dhcp,
+                       :read_guest_ip_prlctl,
                        :read_guest_tools_state,
                        :read_guest_tools_iso_path,
                        :read_host_only_interfaces,

data/lib/vagrant-parallels/plugin.rb

@@ -168,6 +168,7 @@ module VagrantPlugins
 
     module Util
       autoload :CompileForwardedPorts, File.expand_path('../util/compile_forwarded_ports', __FILE__)
+      autoload :Common, File.expand_path('../util/common', __FILE__)
     end
   end
 end

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

@@ -0,0 +1,15 @@
+module VagrantPlugins
+  module Parallels
+    module Util
+      module Common
+
+        # Determines whether the VM's box contains a macOS guest for an Apple Silicon host.
+        # In this case the image file ends with '.macvm' instead of '.pvm'
+        def is_macvm(env)
+          return !!Dir.glob(env[:machine].box.directory.join('*.macvm')).first
+        end
+
+      end
+    end
+  end
+end

data/lib/vagrant-parallels/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Parallels
-    VERSION = '2.2.5'
+    VERSION = '2.3.0'
   end
 end

data/locales/en.yml

@@ -16,7 +16,7 @@ en:
         Box VM config: "%{config}"
 
       box_image_not_found: |-
-        Parallels VM image (*.pvm) could not be found in the directory of
+        Parallels VM image (*.pvm or *.macvm) could not be found in the directory of
         '%{name}' box. This is usually because the image has been removed manually.
         Please remove the box, re-add it, and try again.
       dhcp_leases_file_not_accessible: |-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.3.0
 platform: ruby
 authors:
 - Mikhail Zholobov
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-22 00:00:00.000000000 Z
+date: 2023-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: '3.11'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -67,9 +67,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
 description: Enables Vagrant to manage Parallels virtual machines.
 email:
-- mzholobov@parallels.com
+- legal90@gmail.com
 - yshahin@gmail.com
 executables: []
 extensions: []
@@ -128,6 +142,7 @@ files:
 - lib/vagrant-parallels/plugin.rb
 - lib/vagrant-parallels/provider.rb
 - lib/vagrant-parallels/synced_folder.rb
+- lib/vagrant-parallels/util/common.rb
 - lib/vagrant-parallels/util/compile_forwarded_ports.rb
 - lib/vagrant-parallels/util/unix_mount_helpers.rb
 - lib/vagrant-parallels/version.rb
@@ -151,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Parallels provider for Vagrant.