vagrant-parallels 2.2.6 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7035cf285af41cc2b66992971c09b3e77f68da5bb33ca3a8ef7586e4eec65334
-  data.tar.gz: '08a191cd2af6f7a5fbb626a16375be955cae4a386123519fb1db077b16345f9b'
+  metadata.gz: 45a092a3894860152f2315793cb2a6ca541bc3488b168e3e08c9ba9637f8c867
+  data.tar.gz: 7e6a76e6734bad9691232004722d0cc04f5bc53992798bd6e5074341dce985af
 SHA512:
-  metadata.gz: ac10bedbc9ecfd38984e710de98f634dd9c97572e5f6b8bf27f9a5f91f6d6af9cce0ae7152642b4d37ab2a9c49708189ae7ae9cb108b00c6710f44af9ca19921
-  data.tar.gz: 6fea796a741e76daefb24bd2ebbc86fc5a248c3665c347fb3d004c3f277ec6dc84d6c3bd2b3b4577d4e68e49f76d06abea4cf49fede0d198266dd0fa3cfce781
+  metadata.gz: 5ff72d8b55fde7f2d4444048fe9c736e0f312c61f8b5098b0ac5569a1b3415a6c6671b9c54375190cbcd43aebf55b74fbde681ae9ff2c77f0144bd199a525b60
+  data.tar.gz: 5181b7a0c84d03f593e7e4102e8289c95c292a5328566802f017851617259911012745707b78799bf113bd96e78200f95a6762abbb85135181883c273439dd6b

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 2.3.1 (March 23, 2022)
+BUG FIXES:
+  - Fix the detection of VM IP. Wait for the IP to become available to
+  avoid connection issues and Vagrant warnings.
+  [[GH-440](https://github.com/Parallels/vagrant-parallels/issues/440)]
+
+## 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

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/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/driver/base.rb

@@ -403,11 +403,13 @@ 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.
+        # Returns an empty string if the IP coudn't be determined this way.
         #
         # @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 +432,16 @@ module VagrantPlugins
           leases.max_by { |_ip, lease_time| lease_time }.first
         end
 
+        # Returns an IP of the virtual machine fetched from prlctl.
+        # Returns an empty string if the IP coudn't be determined this way.
+        #
+        # @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', '')
+          ip == '-' ? '' : ip
+        end
+
         # Returns path to the Parallels Tools ISO file.
         #
         # @param [String] guest_os Guest os type: "linux", "darwin" or "windows"
@@ -757,11 +769,26 @@ 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 first.
+        # 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
+          5.times do
+            ip = read_guest_ip_dhcp
+            return ip unless ip.empty?
+
+            ip = read_guest_ip_prlctl
+            return ip unless ip.empty?
+
+            sleep 2
+          end
+
+          # We didn't manage to determine IP - return nil and
+          # expect SSH client to do a retry
+          return nil
         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/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Parallels
-    VERSION = '2.2.6'
+    VERSION = '2.3.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 2.2.6
+  version: 2.3.1
 platform: ruby
 authors:
 - Mikhail Zholobov
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-19 00:00:00.000000000 Z
+date: 2023-03-23 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: []
@@ -152,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.