vagrant-parallels 2.1.0 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fdb9ca9fa5d338982ac6541f4f5678e0ef2dee8c59702db2e306db6b78e680b
-  data.tar.gz: aa9b5f1f0e36c1738f110f398625a06966c1000372709f7f1c0b66a3ff8464cc
+  metadata.gz: f4af52807cb579f4b1f18957178a8230186a4c0305bef6777879a05f48a4e26b
+  data.tar.gz: 130d7a27229008dbb74188269acb846199fe8001f0cb6e7694a954dc10316ddc
 SHA512:
-  metadata.gz: fcad3b44951d96a81e85a70de8eced5a79cc345927233de61cd0dae7cfc04793a6f5259d92f420accb1663563d285454435848c569b3de67e3df01bec90934ce
-  data.tar.gz: e3d94acb423edbe4222ad979717a7379780b4be870fc33c793f0c09f64fa48721086d3ef03d14b08e560ead90d44ed183a8a37035b7a043379d9148548bb13eb
+  metadata.gz: 61c6ff36e06913bdca908f225357c3f250b8f27c06659145c6f8285d4a836e673d2f4b8ebc9aed62929ca34de1564a73992e1e6b5e3b9754c4f8c42cfabf8649
+  data.tar.gz: 619bbae811769347eef8580f2ef1781e708eeb5a5c59a429d0a509ba09aa37ab1bc584837ca97e7ddad8550ec35c766a1a242a7187ecdf89b5b2990f799821a8

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+## 2.2.3 (July 14, 2021)
+BUG FIXES:
+  - Fixed the compatibility with Vagrant 2.2.17
+  [[GH-399](https://github.com/Parallels/vagrant-parallels/pull/399)]
+
+## 2.2.2 (June 23, 2021)
+BUG FIXES:
+  - Fixed shared folder mount on the VM reboot
+  [[GH-391](https://github.com/Parallels/vagrant-parallels/pull/391)]
+
+## 2.2.1 (April 14, 2021)
+BUG FIXES:
+  - Fixed the compatibility with Vagrant 2.2.15
+  [[GH-386](https://github.com/Parallels/vagrant-parallels/pull/386)]
+
+## 2.2.0 (March 3, 2021)
+IMPROVEMENTS:
+  - Mount shared folders after manual VM reboot
+  [[GH-377](https://github.com/Parallels/vagrant-parallels/pull/377)]
+
+BUG FIXES:
+  - Fixed mount of shared folders with non-ASCII symbols in the name
+  [[GH-290](https://github.com/Parallels/vagrant-parallels/issues/290)]
+
 ## 2.1.0 (November 25, 2020)
 BUG FIXES:
   - Fixed the private network adapter workflow on macOS 11.0 Big Sur

data/README.md

@@ -8,10 +8,7 @@ allowing to manage [Parallels Desktop](https://www.parallels.com/products/deskto
 virtual machines on macOS hosts.
 
 ### Requirements
-- [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)_)
+- [Vagrant v1.9.7](https://www.vagrantup.com) 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**

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

@@ -5,7 +5,7 @@ module VagrantPlugins
         include VagrantPlugins::Parallels::Util::CompileForwardedPorts
         @@lock = Mutex.new
 
-        def initialize(app, env)
+        def initialize(app, _env)
           @app = app
         end
 
@@ -22,17 +22,15 @@ module VagrantPlugins
           return @app.call(env) if env[:forwarded_ports].empty?
 
           # Acquire both of class- and process-level locks so that we don't
-          # forward ports simultaneousely with someone else.
+          # forward ports simultaneously with someone else.
           @@lock.synchronize do
-            begin
-              env[:machine].env.lock('forward_ports') do
-                env[:ui].output(I18n.t('vagrant.actions.vm.forward_ports.forwarding'))
-                forward_ports
-              end
-            rescue Errors::EnvironmentLockedError
-              sleep 1
-              retry
+            env[:machine].env.lock('forward_ports') do
+              env[:ui].output(I18n.t('vagrant.actions.vm.forward_ports.forwarding'))
+              forward_ports
             end
+          rescue Vagrant::Errors::EnvironmentLockedError
+            sleep 1
+            retry
           end
 
           @app.call(env)
@@ -46,7 +44,9 @@ module VagrantPlugins
           @env[:forwarded_ports].each do |fp|
             message_attributes = {
               guest_port: fp.guest_port,
-              host_port: fp.host_port
+              guest_ip: fp.guest_ip,
+              host_port: fp.host_port,
+              host_ip: fp.host_ip
             }
 
             # Assuming the only reason to establish port forwarding is
@@ -54,7 +54,7 @@ module VagrantPlugins
             # bridged networking don't require port-forwarding and establishing
             # forwarded ports on these attachment types has uncertain behaviour.
             @env[:ui].detail(I18n.t('vagrant_parallels.actions.vm.forward_ports.forwarding_entry',
-                                    message_attributes))
+                                    **message_attributes))
 
             # In Parallels Desktop the scope port forwarding rules is global,
             # so we have to keep their names unique.
@@ -69,14 +69,16 @@ module VagrantPlugins
 
             # Add the options to the ports array to send to the driver later
             ports << {
-              guestport: fp.guest_port,
-              hostport:  fp.host_port,
-              name:      unique_id,
-              protocol:  fp.protocol
+              guest_port: fp.guest_port,
+              guest_ip: fp.guest_ip,
+              host_port: fp.host_port,
+              host_ip: fp.host_ip,
+              name: unique_id,
+              protocol: fp.protocol
             }
           end
 
-          if !ports.empty?
+          unless ports.empty?
             # We only need to forward ports if there are any to forward
             @env[:machine].provider.driver.forward_ports(ports)
           end

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

@@ -16,7 +16,7 @@ module VagrantPlugins
         include Vagrant::Util::ScopedHashOverride
         @@lock = Mutex.new
 
-        def initialize(app, env)
+        def initialize(app, _env)
           @app    = app
           @logger = Log4r::Logger.new('vagrant_parallels::action::network')
         end
@@ -44,20 +44,20 @@ module VagrantPlugins
 
             # Figure out the slot that this adapter will go into
             slot = options[:adapter]
-            if !slot
-              if available_slots.empty?
-                raise VagrantPlugins::Parallels::Errors::ParallelsNoRoomForHighLevelNetwork
-              end
+            unless slot
+              raise VagrantPlugins::Parallels::Errors::ParallelsNoRoomForHighLevelNetwork if available_slots.empty?
 
               slot = available_slots.shift
             end
 
             # Configure it
             data = nil
-            if type == :private_network
+            #noinspection RubyCaseWithoutElseBlockInspection
+            case type
+            when :private_network
               # private_network = hostonly
               data = [:hostonly, options]
-            elsif type == :public_network
+            when :public_network
               # public_network = bridged
               data = [:bridged, options]
             end
@@ -103,16 +103,15 @@ module VagrantPlugins
             networks << network
           end
 
-          if !adapters.empty?
+          unless adapters.empty?
             # Enable the adapters
             @logger.info('Enabling adapters...')
             env[:ui].output(I18n.t('vagrant.actions.vm.network.preparing'))
             adapters.each do |adapter|
-              env[:ui].detail(I18n.t(
-                'vagrant_parallels.parallels.network_adapter',
-                adapter: adapter[:adapter].to_s,
-                type: adapter[:type].to_s,
-                extra: '',
+              env[:ui].detail(I18n.t('vagrant_parallels.parallels.network_adapter',
+                                     adapter: adapter[:adapter].to_s,
+                                     type: adapter[:type].to_s,
+                                     extra: '',
               ))
             end
 
@@ -124,12 +123,12 @@ module VagrantPlugins
 
           # If we have networks to configure, then we configure it now, since
           # that requires the machine to be up and running.
-          if !adapters.empty? && !networks.empty?
+          unless adapters.empty? && networks.empty?
             assign_interface_numbers(networks, adapters)
 
             # Only configure the networks the user requested us to configure
             networks_to_configure = networks.select { |n| n[:auto_config] }
-            if !networks_to_configure.empty?
+            unless networks_to_configure.empty?
               env[:ui].info I18n.t('vagrant.actions.vm.network.configuring')
               env[:machine].guest.capability(:configure_networks, networks_to_configure)
             end
@@ -138,10 +137,10 @@ module VagrantPlugins
 
         def bridged_config(options)
           {
-            auto_config:                     true,
-            bridge:                          nil,
-            mac:                             nil,
-            nic_type:                        nil,
+            auto_config: true,
+            bridge: nil,
+            mac: nil,
+            nic_type: nil,
             use_dhcp_assigned_default_route: false
           }.merge(options || {})
         end
@@ -162,17 +161,17 @@ module VagrantPlugins
             Array(config[:bridge]).each do |bridge|
               bridge = bridge.downcase if bridge.respond_to?(:downcase)
               bridgedifs.each do |interface|
-                if bridge === interface[:name].downcase
-                  @logger.debug('Specific bridge found as configured in the Vagrantfile. Using it.')
-                  chosen_bridge = interface[:name]
-                  break
-                end
+                next unless bridge === interface[:name].downcase
+
+                @logger.debug('Specific bridge found as configured in the Vagrantfile. Using it.')
+                chosen_bridge = interface[:name]
+                break
               end
               break if chosen_bridge
             end
 
             # If one wasn't found, then we notify the user here.
-            if !chosen_bridge
+            unless chosen_bridge
               @env[:ui].info I18n.t(
                 'vagrant.actions.vm.bridged_networking.specific_not_found',
                 bridge: config[:bridge])
@@ -183,7 +182,7 @@ module VagrantPlugins
           # specified in the Vagrantfile, or the bridge specified in the Vagrantfile
           # wasn't found), then we fall back to the normal means of searching for a
           # bridged network.
-          if !chosen_bridge
+          unless chosen_bridge
             if bridgedifs.length == 1
               # One bridgable interface? Just use it.
               chosen_bridge = bridgedifs[0][:name]
@@ -197,15 +196,14 @@ module VagrantPlugins
                 interface = bridgedifs[index]
                 @env[:ui].info("#{index + 1}) #{interface[:name]}", prefix: false)
               end
-              @env[:ui].info(I18n.t(
-                'vagrant.actions.vm.bridged_networking.choice_help')+"\n")
+              @env[:ui].info("#{I18n.t('vagrant.actions.vm.bridged_networking.choice_help')}\n")
 
               # The range of valid choices
               valid = Range.new(1, bridgedifs.length)
 
               # The choice that the user has chosen as the bridging interface
               choice = nil
-              while !valid.include?(choice)
+              until valid.include?(choice)
                 choice = @env[:ui].ask(
                   'Which interface should the network bridge to? Enter a number: ')
                 choice = choice.to_i
@@ -219,11 +217,11 @@ module VagrantPlugins
 
           # Given the choice we can now define the adapter we're using
           {
-            adapter:     config[:adapter],
-            type:        :bridged,
-            bridge:      chosen_bridge,
+            adapter: config[:adapter],
+            type: :bridged,
+            bridge: chosen_bridge,
             mac_address: config[:mac],
-            nic_type:    config[:nic_type]
+            nic_type: config[:nic_type]
           }
         end
 
@@ -231,16 +229,16 @@ module VagrantPlugins
           if config[:ip]
             options = {
               auto_config: true,
-              mac:         nil,
-              netmask:     '255.255.255.0',
-              type:        :static
+              mac: nil,
+              netmask: '255.255.255.0',
+              type: :static
             }.merge(config)
             options[:type] = options[:type].to_sym
             return options
           end
 
           {
-            type:                            :dhcp,
+            type: :dhcp,
             use_dhcp_assigned_default_route: config[:use_dhcp_assigned_default_route]
           }
         end
@@ -248,10 +246,10 @@ module VagrantPlugins
         def hostonly_config(options)
           options = {
             auto_config: true,
-            mac:         nil,
-            name:        nil,
-            nic_type:    nil,
-            type:        :static
+            mac: nil,
+            name: nil,
+            nic_type: nil,
+            type: :static
           }.merge(options)
 
           # Make sure the type is a symbol
@@ -290,13 +288,14 @@ module VagrantPlugins
             # network interface.
             @env[:machine].provider.driver.read_bridged_interfaces.each do |interface|
               next if interface[:status] == 'Down'
+
               that_netaddr = IPAddr.new("#{interface[:ip]}/#{interface[:netmask]}")
-              if netaddr.include? that_netaddr
-                raise VagrantPlugins::Parallels::Errors::NetworkCollision,
-                  hostonly_netaddr: netaddr,
-                  bridge_netaddr:   that_netaddr,
-                  bridge_interface: interface[:name]
-              end
+              next unless netaddr.include? that_netaddr
+
+              raise VagrantPlugins::Parallels::Errors::NetworkCollision,
+                    hostonly_netaddr: netaddr,
+                    bridge_netaddr: that_netaddr,
+                    bridge_interface: interface[:name]
             end
           end
 
@@ -319,14 +318,14 @@ module VagrantPlugins
           end
 
           {
-            adapter_ip:  options[:adapter_ip],
+            adapter_ip: options[:adapter_ip],
             auto_config: options[:auto_config],
-            ip:          options[:ip],
-            mac:         options[:mac],
-            name:        options[:name],
-            netmask:     options[:netmask],
-            nic_type:    options[:nic_type],
-            type:        options[:type]
+            ip: options[:ip],
+            mac: options[:mac],
+            name: options[:name],
+            netmask: options[:netmask],
+            nic_type: options[:nic_type],
+            type: options[:type]
           }.merge(dhcp_options)
         end
 
@@ -334,7 +333,7 @@ module VagrantPlugins
           @logger.info("Searching for matching hostonly network: #{config[:ip]}")
           interface = hostonly_find_matching_network(config)
 
-          if !interface
+          unless interface
             @logger.info('Network not found. Creating if we can.')
 
             # Create a new network
@@ -343,25 +342,25 @@ module VagrantPlugins
           end
 
           {
-            adapter:     config[:adapter],
-            hostonly:    interface[:name],
+            adapter: config[:adapter],
+            hostonly: interface[:name],
             mac_address: config[:mac],
-            nic_type:    config[:nic_type],
-            type:        :hostonly
+            nic_type: config[:nic_type],
+            type: :hostonly
           }
         end
 
         def hostonly_network_config(config)
           {
-            type:       config[:type],
+            type: config[:type],
             adapter_ip: config[:adapter_ip],
-            ip:         config[:ip],
-            netmask:    config[:netmask]
+            ip: config[:ip],
+            netmask: config[:netmask]
           }
         end
 
 
-        def shared_config(options)
+        def shared_config(_options)
           {
             auto_config: false
           }
@@ -370,11 +369,11 @@ module VagrantPlugins
         def shared_adapter(config)
           {
             adapter: config[:adapter],
-            type:    :shared
+            type: :shared
           }
         end
 
-        def shared_network_config(config)
+        def shared_network_config(_config)
           {}
         end
 
@@ -396,11 +395,11 @@ module VagrantPlugins
           # Make a first pass to assign interface numbers by adapter location
           vm_adapters = @env[:machine].provider.driver.read_network_interfaces
           vm_adapters.sort.each do |number, adapter|
-            if adapter[:type] != :none
-              # Not used, so assign the interface number and increment
-              adapter_to_interface[number] = current
-              current += 1
-            end
+            next unless adapter[:type] != :none
+
+            # Not used, so assign the interface number and increment
+            adapter_to_interface[number] = current
+            current += 1
           end
 
           # Make a pass through the adapters to assign the :interface
@@ -419,9 +418,7 @@ module VagrantPlugins
           # Get the list of numbers
           net_nums = []
           @env[:machine].provider.driver.read_virtual_networks.each do |net|
-            if net['Network ID'] =~ /^vagrant-vnet(\d+)$/
-              net_nums << $1.to_i
-            end
+            net_nums << $1.to_i if net['Network ID'] =~ /^vagrant-vnet(\d+)$/
           end
 
           if net_nums.empty?
@@ -440,12 +437,12 @@ module VagrantPlugins
           options = {
             network_id: config[:name] || next_network_id,
             adapter_ip: config[:adapter_ip],
-            netmask:    config[:netmask],
+            netmask: config[:netmask],
           }
 
           if config[:type] == :dhcp
             options[:dhcp] = {
-              ip:    config[:dhcp_ip],
+              ip: config[:dhcp_ip],
               lower: config[:dhcp_lower],
               upper: config[:dhcp_upper]
             }