vagrant-parallels 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86f3ba721613e8310adfe4cb4adb335703bc398eb6f28e0d8525af257b3be729
-  data.tar.gz: 389a8f69e3125f0ecd3e66d3b418f16cbb8a424a17097300cde59b9f91ace6df
+  metadata.gz: 3ff32a59a5a53f6225bc9595f05ecc24583ffefab4cebd77ad5cbb8901c8725d
+  data.tar.gz: 33664d070c0831774d66bfd3c3da5b5a1d3c20456521c543f01aec4c0a9a8911
 SHA512:
-  metadata.gz: d36309ae8b86da70114723881277f840d76220fcedb570b047cdc345b0cde34bc7e363614698d3c959429a86e34470c9a2463b9c613b708b1a9046dcf9e9fe6a
-  data.tar.gz: 97e8598b3ab0ea621264efcae32877f3afb914a73f0d36d9653cce093a01207de46db0a2af619fd6350fa8a078e740e74199294d1f0b05cdaae836898d68a23d
+  metadata.gz: fec7982dd9ad7948f5830fae0a13beeada091a0464076df096ead3e8ec03da22f1c4f6f15d7a3af997e8ebd3ea294bb039d326a3ada5b9e16d242acd3fcce76f
+  data.tar.gz: fae1a0a7b2e7b414dcba9110309fa41ecfef8244616a6c34d9b9c2ac790a89db648f8fb78bd022f48810e4755bbe15c15cac69721571a0f33c5cecc2965c178a

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 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

data/lib/vagrant-parallels/cap/mount_options.rb

@@ -30,8 +30,18 @@ module VagrantPlugins
           return PRL_MOUNT_TYPE
         end
 
-        def self.mount_name(machine, data)
-          data[:guestpath].gsub(/[*":<>?|\/\\]/,'_').sub(/^_/, '')
+        ## We have to support 2 different expected interfaces of `mount_name` call:
+        ##   Vagrant < 2.2.15:   `def self.mount_name(machine, data)`
+        ##   Vagrant >= 2.2.15:  `def self.mount_name(machine, id, data)`
+        ## https://github.com/Parallels/vagrant-parallels/issues/384
+        def self.mount_name(*args)
+          if args.length >= 3
+            id = args[1]
+          else
+            id = args[-1][:guestpath]
+          end
+
+          id.gsub(/[*":<>?|\/\\]/,'_').sub(/^_/, '')
         end
       end
     end

data/lib/vagrant-parallels/synced_folder.rb

@@ -19,7 +19,7 @@ module VagrantPlugins
           end
 
           defs << {
-            name: data[:plugin].capability(:mount_name, data),
+            name: data[:plugin].capability(:mount_name, id, data),
             hostpath: hostpath.to_s,
           }
         end
@@ -62,7 +62,7 @@ module VagrantPlugins
             # Mount the actual folder
             machine.guest.capability(
               :mount_parallels_shared_folder,
-              data[:plugin].capability(:mount_name, data),
+              data[:plugin].capability(:mount_name, id, data),
               data[:guestpath],
               data
             )
@@ -84,7 +84,7 @@ module VagrantPlugins
         end
 
         # Remove the shared folders from the VM metadata
-        names = folders.map { |_id, data| data[:plugin].capability(:mount_name, data) }
+        names = folders.map { |id, data| data[:plugin].capability(:mount_name, id, data) }
         driver(machine).unshare_folders(names)
       end
 

data/lib/vagrant-parallels/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Mikhail Zholobov
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-03 00:00:00.000000000 Z
+date: 2021-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri