vagrant-parallels 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 85e2c532a3b4223860ba143a446100ef6c3744f9
-  data.tar.gz: c99d45686b5d6c5463c9d65ad93559f19ea48cbf
+SHA256:
+  metadata.gz: 5fdb9ca9fa5d338982ac6541f4f5678e0ef2dee8c59702db2e306db6b78e680b
+  data.tar.gz: aa9b5f1f0e36c1738f110f398625a06966c1000372709f7f1c0b66a3ff8464cc
 SHA512:
-  metadata.gz: 43842f0c8f79ffdf6be311cf7bcac234697a1f82d70da62760604536ffa40eaf7a4d1c12f16c366988ccab1c3ea636606dc5c1bb6299c2bc3e98609f9683bbd6
-  data.tar.gz: f5dd3bced88d5f7d0721232dcd25f7f455856ed38391dd1dadbe045c712f891ba381831ebccfc0d8ed579c56bc854ec8a8d88307b23d8cde409f4556b677a9a3
+  metadata.gz: fcad3b44951d96a81e85a70de8eced5a79cc345927233de61cd0dae7cfc04793a6f5259d92f420accb1663563d285454435848c569b3de67e3df01bec90934ce
+  data.tar.gz: e3d94acb423edbe4222ad979717a7379780b4be870fc33c793f0c09f64fa48721086d3ef03d14b08e560ead90d44ed183a8a37035b7a043379d9148548bb13eb

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 2.1.0 (November 25, 2020)
+BUG FIXES:
+  - Fixed the private network adapter workflow on macOS 11.0 Big Sur
+  [[GH-371](https://github.com/Parallels/vagrant-parallels/pull/371)]
+  - Fixed the concurrency issue with box unregister in multi-vm environment
+  [[GH-370](https://github.com/Parallels/vagrant-parallels/pull/370)]
+  - Fixed the `vagrant package` with custom `Vagrantfile`
+  [[GH-368](https://github.com/Parallels/vagrant-parallels/pull/368)]
+
 ## 2.0.1 (April 23, 2019)
 BUG FIXES:
   - Fixed the error message for host-only network collision
@@ -9,9 +18,9 @@ BREAKING CHANGES:
   Now each time when you create a new virtual machine with `vagrant up` it is
   created as a linked clone of the box image (instead of the full clone, as it
   was before). Read more about it:
-  [Full Clone vs Linked Clone](http://parallels.github.io/vagrant-parallels/docs/configuration.html#linked_clone).
+  [Full Clone vs Linked Clone](https://parallels.github.io/vagrant-parallels/docs/configuration.html#linked_clone).
   - **Dropped support of Parallels Desktop 10**. It reached
-  [End-of-Life and End-of-Support](http://kb.parallels.com/eu/122533).
+  [End-of-Life and End-of-Support](https://kb.parallels.com/eu/122533).
 
 ## 1.7.8 (November 18, 2017)
 BUG FIXES:
@@ -87,7 +96,7 @@ BUG FIXES:
 ## 1.7.0 (November 15, 2016)
 BREAKING CHANGES:
   - **Dropped support of Parallels Desktop 8 and 9**. These versions have
-  reached their [End-of-Life and End-of-Support](http://kb.parallels.com/eu/122533).
+  reached their [End-of-Life and End-of-Support](https://kb.parallels.com/eu/122533).
   - **Removed customization options, which were previously deprecated:** [[GH-271](https://github.com/Parallels/vagrant-parallels/pull/271)]
     - "use_linked_clone" - use `linked_clone` instead.
     - "regen_box_uuid" - use `regen_src_uuid` instead.

data/README.md

@@ -3,16 +3,16 @@
 [![Build Status](https://travis-ci.org/Parallels/vagrant-parallels.svg?branch=master)](https://travis-ci.org/Parallels/vagrant-parallels)
 [![Code Climate](https://codeclimate.com/github/Parallels/vagrant-parallels.svg)](https://codeclimate.com/github/Parallels/vagrant-parallels)
 
-_Vagrant Parallels Provider_ is a plugin for [Vagrant](http://www.vagrantup.com),
-allowing to manage [Parallels Desktop](http://www.parallels.com/products/desktop/)
+_Vagrant Parallels Provider_ is a plugin for [Vagrant](https://www.vagrantup.com),
+allowing to manage [Parallels Desktop](https://www.parallels.com/products/desktop/)
 virtual machines on macOS hosts.
 
 ### Requirements
-- [Vagrant v1.8](http://www.vagrantup.com) or higher
+- [Vagrant v1.8](https://www.vagrantup.com) or higher
 (_there are known issues with Vagrant v1.9.5
 [[GH-297](https://github.com/Parallels/vagrant-parallels/issues/297#issuecomment-304458691)]
 and v1.9.6 [[GH-301]](https://github.com/Parallels/vagrant-parallels/issues/301)_)
-- [Parallels Desktop 11 for Mac](http://www.parallels.com/products/desktop/) or higher
+- [Parallels Desktop 11 for Mac](https://www.parallels.com/products/desktop/) or higher
 
 *Note:* Only **Pro** and **Business** editions of **Parallels Desktop for Mac**
 are compatible with this Vagrant provider.
@@ -24,11 +24,11 @@ The Parallels provider supports all basic Vagrant features, including Shared Fol
 Private and Public Networking, Forwarded ports and Vagrant Share.
 
 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.
+read the official [Vagrant documentation](https://docs.vagrantup.com/v2/) first.
 
 ## Installation
-Make sure that you have [Parallels Desktop for Mac](http://www.parallels.com/products/desktop/)
-and [Vagrant](http://www.vagrantup.com/downloads) properly installed.
+Make sure that you have [Parallels Desktop for Mac](https://www.parallels.com/products/desktop/)
+and [Vagrant](https://www.vagrantup.com/downloads.html) properly installed.
 We recommend that you use the latest versions of these products.
 
 Parallels provider is a plugin for Vagrant. Run this command to install it:
@@ -40,12 +40,12 @@ $ vagrant plugin install vagrant-parallels
 ## Provider Documentation
 
 More information about the Parallels provider is available in
-[Vagrant Parallels Documentation](http://parallels.github.io/vagrant-parallels/docs/)
+[Vagrant Parallels Documentation](https://parallels.github.io/vagrant-parallels/docs/)
 
 We recommend you to start from these pages:
-* [Usage](http://parallels.github.io/vagrant-parallels/docs/usage.html)
-* [Getting Started](http://parallels.github.io/vagrant-parallels/docs/getting-started.html)
-* [Boxes](http://parallels.github.io/vagrant-parallels/docs/boxes/index.html)
+* [Usage](https://parallels.github.io/vagrant-parallels/docs/usage.html)
+* [Getting Started](https://parallels.github.io/vagrant-parallels/docs/getting-started.html)
+* [Boxes](https://parallels.github.io/vagrant-parallels/docs/boxes/index.html)
 
 ## Getting Help
 
@@ -56,6 +56,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-2018, Parallels International GmbH.
+* Copyright 2013-2020, Parallels International GmbH.
 
-Vagrant Parallels Provider is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT).
+Vagrant Parallels Provider is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).

data/lib/vagrant-parallels/action.rb

@@ -113,6 +113,7 @@ module VagrantPlugins
             b1.use Package
             b1.use Export
             b1.use PackageConfigFiles
+            b1.use PackageVagrantfile
           end
         end
       end
@@ -413,6 +414,7 @@ module VagrantPlugins
       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 :PackageVagrantfile, File.expand_path('../action/package_vagrantfile', __FILE__)
       autoload :PrepareCloneSnapshot, File.expand_path('../action/prepare_clone_snapshot', __FILE__)
       autoload :PrepareForwardedPortCollisionParams, File.expand_path('../action/prepare_forwarded_port_collision_params', __FILE__)
       autoload :PrepareNFSSettings, File.expand_path('../action/prepare_nfs_settings', __FILE__)

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

@@ -53,9 +53,9 @@ module VagrantPlugins
             file.flush
           end
 
-          # Delete the lease file if we are the last who need this box.
+          # Delete the lease file if we were the last who needed this box.
           # Then the box image will be unregistered.
-          lease_file.delete if lease_file.read.chomp.to_i <= 1
+          lease_file.delete if lease_file.read.chomp.to_i <= 0
         end
 
         def unregister_box(env)

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

@@ -0,0 +1,33 @@
+require 'vagrant/util/template_renderer'
+
+module VagrantPlugins
+  module Parallels
+    module Action
+      class PackageVagrantfile
+        # For TemplateRenderer
+        include Vagrant::Util
+
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          @env = env
+          create_vagrantfile
+          @app.call(env)
+        end
+
+        # This method creates the auto-generated Vagrantfile at the root of the
+        # box. This Vagrantfile contains the MAC address so that the user doesn't
+        # have to worry about it.
+        def create_vagrantfile
+          File.open(File.join(@env["export.temp_dir"], "Vagrantfile"), "w") do |f|
+            f.write(TemplateRenderer.render("package_Vagrantfile", {
+              base_mac: @env[:machine].provider.driver.read_mac_address
+            }))
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -193,14 +193,13 @@ module VagrantPlugins
           end
         end
 
-        # Deletes any host only networks that aren't being used for anything.
+        # Deletes host-only networks that aren't being used by any virtual machine.
         def delete_unused_host_only_networks
           networks = read_virtual_networks
-          # 'Shared'(vnic0) and 'Host-Only'(vnic1) are default in Parallels Desktop
-          # They should not be deleted anyway.
+
+          # Exclude all host-only network interfaces which were not created by vagrant provider.
           networks.keep_if do |net|
-            net['Type'] == 'host-only' && net['Bound To'] &&
-              net['Bound To'].match(/^(?>vnic|Parallels Host-Only #)(\d+)$/)[1].to_i >= 2
+            net['Type'] == 'host-only' && net['Network ID'] =~ /^vagrant-vnet(\d+)$/
           end
 
           read_vms_info.each do |vm|
@@ -210,8 +209,8 @@ module VagrantPlugins
             end
           end
 
+          # Delete all unused network interfaces.
           networks.each do |net|
-            # Delete the actual host only network interface.
             execute_prlsrvctl('net', 'del', net['Network ID'])
           end
         end
@@ -496,7 +495,6 @@ module VagrantPlugins
         #
         # {
         #   name:     'Host-Only',     # Parallels Network ID
-        #   bound_to: 'vnic1',         # interface name
         #   ip:       '10.37.129.2',   # IP address of the interface
         #   netmask:  '255.255.255.0', # netmask associated with the interface
         #   status:   'Up'             # status of the interface
@@ -519,11 +517,9 @@ module VagrantPlugins
             }
 
             adapter = net_info['Parallels adapter']
-            if adapter && net_info['Bound To']
-              # In PD >= 10.1.2 there are new field names for an IP/Subnet
-              iface[:ip]       = adapter['IP address'] || adapter['IPv4 address']
-              iface[:netmask]  = adapter['Subnet mask'] || adapter['IPv4 subnet mask']
-              iface[:bound_to] = net_info['Bound To']
+            if adapter
+              iface[:ip]       = adapter['IPv4 address']
+              iface[:netmask]  = adapter['IPv4 subnet mask']
               iface[:status]   = 'Up'
 
               if adapter['IPv6 address'] && adapter['IPv6 subnet mask']
@@ -618,11 +614,9 @@ module VagrantPlugins
           }
           adapter = net_info['Parallels adapter']
 
-          if adapter && net_info['Bound To']
-            # In PD >= 10.1.2 there are new field names for an IP/Subnet
-            iface[:ip]       = adapter['IP address'] || adapter['IPv4 address']
-            iface[:netmask]  = adapter['Subnet mask'] || adapter['IPv4 subnet mask']
-            iface[:bound_to] = net_info['Bound To']
+          if adapter
+            iface[:ip]       = adapter['IPv4 address']
+            iface[:netmask]  = adapter['IPv4 subnet mask']
             iface[:status]   = 'Up'
           end
 

data/lib/vagrant-parallels/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Parallels
-    VERSION = '2.0.1'
+    VERSION = '2.1.0'
   end
 end

data/locales/en.yml

@@ -109,12 +109,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 11 or later.
-        Please upgrade your installation: http://parallels.com/desktop
+        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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Mikhail Zholobov
 - Youssef Shahin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-23 00:00:00.000000000 Z
+date: 2020-11-25 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
@@ -129,11 +130,11 @@ files:
 - lib/vagrant-parallels/util/compile_forwarded_ports.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
@@ -148,9 +149,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: vagrant-parallels
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Parallels provider for Vagrant.
 test_files: []