vagrant-vmware-desktop 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdcfbbb304726e177ac071a8842c567ca35ebac76acb944b8b787b4a3c8b95d6
-  data.tar.gz: b871eaf2ccfdf8fb33384feb5c050e8b4e45daf61557158af7c23f7b57b9bf80
+  metadata.gz: b510c2fb41294efb8735cd97794a2076b57136b18882ea9c82e529886febdece
+  data.tar.gz: 56f7fb51de33325f5fa7bca40b2fc0807e62aec3812dbda556ec9f726874915e
 SHA512:
-  metadata.gz: 6efa97edc063503dfa6d858160a23d57e0ff73f66cf4f09b9bc16027b9f2fc1000c41536ab9dd16c24e69b417cc9d17c1fec26d6dec6e3ecb37e94af701c64c7
-  data.tar.gz: ae05d94217266dedfb30bdbc392c05ec67a97f1604c17c51810b2cc8df1ae71af1b2e39246b9dcb41373826147b4ef2b286d8d28c4ad00d111ab7ecff588e6b8
+  metadata.gz: a3665a4e29273abad6a60a5bacf80925d5a6ec8d655622105207f6be96a8d1dee0880991a911a8036a3053ad03375cc655301e85bbba638e9287a705d7b3de38
+  data.tar.gz: 07b2c44807eb5fb4cc2ce6fbf5020d0a0b6581bae1394e1245dbee5029af21c1c112b9a73584585aba4f5e9db90fd744afc8c1ce52b1461deb8cc84e677676cf

data/lib/vagrant-vmware-desktop/driver/base.rb

@@ -237,6 +237,13 @@ module HashiCorp
             h_port = fwd[:port]
             f_proto = fwd[:protocol].downcase.to_sym
             result[g_ip] ||= {:tcp => {}, :udp => {}}
+            if f_proto != :tcp && f_proto != :udp
+              raise Errors::PortForwardInvalidProtocol,
+                guest_ip: g_ip,
+                guest_port: g_port,
+                host_port: h_port,
+                protocol: f_proto
+            end
             result[g_ip][f_proto][g_port] = h_port
           end
           if ip
@@ -398,7 +405,11 @@ module HashiCorp
         # This deletes the VM.
         def delete
           @logger.info("Deleting VM: #{@vm_dir}")
-          @vm_dir.rmtree
+          begin
+            @vm_dir.rmtree
+          rescue Errno::ENOTEMPTY
+            FileUtils.rm_rf(@vm_dir.to_s)
+          end
         end
 
         # This discards the suspended state of the machine.
@@ -835,12 +846,28 @@ module HashiCorp
 
         def snapshot_tree
           snapshots = []
+          snap_level = 0
           vmrun("listSnapshots", host_vmx_path, "showTree").stdout.split("\n").each do |line|
             if !line.include?("Total snapshot")
               # if the line starts with white space then it is a child
               # of the previous line
               if line.start_with?(/\s/)
-                name = "#{snapshots.last}/#{line.gsub(/\s/, "")}"
+                current_level = line.count("\t")
+                if current_level > snap_level
+                  name = "#{snapshots.last}/#{line.gsub(/\s/, "")}"
+                elsif current_level == snap_level
+                  path = snapshots.last.split("/")
+                  path.pop
+                  path << line.gsub(/\s/, "")
+                  name = path.join("/")
+                else
+                  path = snapshots.last.split("/")
+                  diff = snap_level - current_level
+                  (0..diff).to_a.each { |i| path.pop }
+                  path << line.gsub(/\s/, "")
+                  name = path.join("/")
+                end
+                snap_level = current_level
                 snapshots << name
               else
                 snapshots << line

data/lib/vagrant-vmware-desktop/errors.rb

@@ -206,6 +206,10 @@ module HashiCorp
         error_key(:package_not_supported)
       end
 
+      class PortForwardInvalidProtocol < Base
+        error_key(:port_forward_invalid_protocol)
+      end
+
       class RoutingTableError < Base; end
 
       class RoutingTableCommandNotFound < RoutingTableError

data/lib/vagrant-vmware-desktop/synced_folder.rb

@@ -54,7 +54,7 @@ module HashiCorp
         machine.ui.info I18n.t("hashicorp.vagrant_vmware_desktop.sharing_folders")
         machine.provider.driver.enable_shared_folders
         shared_folders.each do |id, data|
-          id        = id.gsub('/', machine.provider_config.shared_folder_special_char)
+          id        = id.gsub(%r{[:\\/]}, machine.provider_config.shared_folder_special_char)
           path      = data[:hostpath]
           guestpath = data[:guestpath]
 

data/locales/en.yml

@@ -383,6 +383,20 @@ en:
           The "package" command is not supported with VMware. We recommend
           taking a look at Packer (www.packer.io) as an option for creating
           VMware images.
+        port_forward_invalid_protocol: |-
+          An invalid protocol type has been provided for a port forward
+          configuration. Vagrant supports port forwarding protocols values:
+
+            * udp
+            * tcp
+
+          Please update your port forward configuration and run the command
+          again. Below is the invalid port forward entry:
+
+            Guest IP:   %{guest_ip}
+            Guest Port: %{guest_port}
+            Host Port:  %{host_port}
+            Protocol:   %{protocol}
         routing_table_command_not_found: |-
           The external program used to read TCP/IP routing tables in order
           to protect you against creating network collisions could not be
@@ -627,8 +641,7 @@ en:
             Device:  %{device}
             MAC:     %{mac}
             Reason:  %{message}
-      disks: 
+      disks:
         cap:
           disks:
             floppy_not_supported: "Floppy disk configuration not yet supported. Skipping disk '%{name}'..."
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vmware-desktop
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Vagrant Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-09 00:00:00.000000000 Z
+date: 2021-09-28 00:00:00.000000000 Z
 dependencies: []
 description: Enables Vagrant to power VMware Workstation/Fusion machines.
 email: vagrant@hashicorp.com