vagrant-zones 0.1.100 → 0.1.101

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f3b4be02798563d9d0f4fce9a66a07ac6cd1ea7ef09edfdeb4f9fe232a67341
-  data.tar.gz: 9ed384b15f7ee5d4f81552116580fb94c72aa9dcff84f644d8d74e9fa4db7d66
+  metadata.gz: b58a4f65279cdf4fd1ef75666dfad9977f8003c77d6b228672a126d4a436f76a
+  data.tar.gz: b48932d77bd5cbe24e35678f5ed4a13a0be2ac04cfd0fba11f4a6d72048584c8
 SHA512:
-  metadata.gz: 4bf472087023060df2fe90c19a12410cf7e73b805dc78e3f1de4addf173466b50306257dfacabfb436d016b359b65f39a37a490fd7eaf77a0a3d26ed18e38643
-  data.tar.gz: faea40fce30d5dfc5be5915ec4c68c11d8df94afcc846707fbcad16818e0396b1209e4dc9fbb473ac147be574b4faded2fb5a63f90e23f1325c3177e69ab192a
+  metadata.gz: acaa60b70fc4dd5a51c7adafb54995629ded5e95884c86ce8cd2b43d1a0745756e7044a59496f5603b203e24bc9a2894b40fdfece7227cd0001deb167579d199
+  data.tar.gz: 60e9a8a9ca5b93603740742c56e5250f62b9e848515ef10e8889e17c39d0d46c4ba57ea032eb2d4284ede6c51b49814f00c7ed4c5859398f041e3b66604926c8

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [0.1.101](https://github.com/STARTcloud/vagrant-zones/compare/v0.1.100...v0.1.101) (2025-05-09)
+
+
+### Bug Fixes
+
+* windows zoneniczloginsetup ([c0eef21](https://github.com/STARTcloud/vagrant-zones/commit/c0eef2157555d668d0a55dddfcbdb2ea419a623d))
+* windows zoneniczloginsetup ([68581e3](https://github.com/STARTcloud/vagrant-zones/commit/68581e37c4c9dd7353ccdfabdc7a5937f5c6a555))
+
 ## [0.1.100](https://github.com/STARTcloud/vagrant-zones/compare/v0.1.99...v0.1.100) (2025-05-09)
 
 

data/lib/vagrant-zones/driver.rb

@@ -1358,48 +1358,35 @@ module VagrantPlugins
         # Normalize the MAC address to uppercase with hyphens (Windows format)
         normalized_mac = mac.split(':').map { |segment| segment.rjust(2, '0') }.join('-').upcase
 
-        # Debug output
-        uii.info("Looking for adapter with MAC: #{normalized_mac}")
-
-        # Use the bash command with sed to wrap adapter name with VZWI markers
-        ## DO NOT EVER ADJUST THIS COMMAND, WE MUST USE THIS EXACT COMMAND TO GET THE DATA FROM THE MACHINE
-        ## DO NOT ADJUST THE COMMAND, IT IS IMPORTANT THAT WE DO NOT EVER ADJUST THIS COMMAND
-        ## DO NOT ADJUST THE COMMAND
-        ## DO NOT ADJUST THE COMMAND!!!!!!!!!! SERIOUSLY
-        getmac_cmd = %(bash -c "getmac /v /FO csv /NH | grep "#{normalized_mac}" | awk -F, '{print $1}' | sed 's/"/VZWI/g'")
+        # rubocop:disable Style/RedundantStringEscape
+        getmac_cmd = %(bash -c "getmac /v /FO csv /NH | grep \\\"#{normalized_mac}\\\" | awk -F, '{print $1}' | sed 's/\\\"/VZWI/g'")
+        # rubocop:enable Style/RedundantStringEscape
         raw_output = zlogin(uii, getmac_cmd)
-
-        uii.info("Raw adapter result: #{raw_output.inspect}")
-
-        if raw_output.is_a?(String)
-          hex_display = raw_output.bytes.map { |b| format('\\x%02X', b) }.join
-          uii.info("Hex representation: #{hex_display}")
-        elsif raw_output.is_a?(Array)
-          # Handle array case
-          hex_display = raw_output.join.bytes.map { |b| format('\\x%02X', b) }.join
-          uii.info("Hex representation (array joined): #{hex_display}")
-        end
-
-        # Use the strings-ansi gem to sanitize the raw output
         adapter_name = nil
 
         # First sanitize the raw output to remove all ANSI escape sequences
         raw_output_str = raw_output.is_a?(Array) ? raw_output.join : raw_output.to_s
         sanitized_output = Strings::ANSI.sanitize(raw_output_str)
 
-        # Debug the sanitized output
-        uii.info("Sanitized output: #{sanitized_output.inspect}")
-
         # Find VZWI markers in the sanitized output
         sanitized_output.split(/[\r\n]+/).each do |line|
           next unless line.include?('VZWI')
 
-          uii.info("Found line with VZWI markers (sanitized): #{line}")
+          # Find all positions of "VZWI" in the string
+          positions = []
+          pos = -1
+          while (pos = line.index('VZWI', pos + 1))
+            positions << pos
+          end
+
+          # If we have at least 2 occurrences, extract between the last pair
+          if positions.length >= 2
+            # Get the last two VZWI positions
+            last_pair_start = positions[-2]
+            last_pair_end = positions[-1]
 
-          # Extract the adapter name between VZWI markers using direct match
-          if line =~ /VZWI(.+?)VZWI/
-            adapter_name = ::Regexp.last_match(1)
-            uii.info("Extracted adapter name from sanitized output: '#{adapter_name}'")
+            # Extract between these positions (adding 4 to skip "VZWI")
+            adapter_name = line[(last_pair_start + 4)...last_pair_end]
           end
           break
         end
@@ -1407,7 +1394,6 @@ module VagrantPlugins
         # Only proceed if we got a valid adapter name
         if adapter_name && !adapter_name.empty?
           # Rename the adapter to the VNIC name
-          uii.info("Using extracted adapter name '#{adapter_name}' for rename")
           rename_adapter = %(netsh interface set interface name="#{adapter_name}" newname="#{vnic_name}")
           uii.info(I18n.t('vagrant_zones.win_applied_rename_adapter')) if zlogin(uii, rename_adapter)
 

data/lib/vagrant-zones/version.rb

@@ -2,7 +2,7 @@
 
 module VagrantPlugins
   module ProviderZone
-    VERSION = '0.1.100'
+    VERSION = '0.1.101'
     NAME = 'vagrant-zones'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-zones
 version: !ruby/object:Gem::Version
-  version: 0.1.100
+  version: 0.1.101
 platform: ruby
 authors:
 - Mark Gilbert