vagrant-zones 0.1.100 → 0.1.102

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f3b4be02798563d9d0f4fce9a66a07ac6cd1ea7ef09edfdeb4f9fe232a67341
-  data.tar.gz: 9ed384b15f7ee5d4f81552116580fb94c72aa9dcff84f644d8d74e9fa4db7d66
+  metadata.gz: 3dcaf86e540128ea22ea6922155447dbc00bee6d2f32ed8aa5c71eaa5563b4b7
+  data.tar.gz: 388ac4b26fac9bfcddbd671970ecacbb16e10923764f8073a0645b77c64ff800
 SHA512:
-  metadata.gz: 4bf472087023060df2fe90c19a12410cf7e73b805dc78e3f1de4addf173466b50306257dfacabfb436d016b359b65f39a37a490fd7eaf77a0a3d26ed18e38643
-  data.tar.gz: faea40fce30d5dfc5be5915ec4c68c11d8df94afcc846707fbcad16818e0396b1209e4dc9fbb473ac147be574b4faded2fb5a63f90e23f1325c3177e69ab192a
+  metadata.gz: a10de93c1513727b5292e21276e01d94e9867c15ea3befc09967df48a8ed82e1f812e2ea3e35ec45b614f0c8f163917b3c97d33c1f2a718f04f195ac0dd8fcc8
+  data.tar.gz: 82b695f7702fafec3ac023d0b1682712f06e334b2c0f502b4fd63ab94e234b7726c0ce8fbef3291570905c0c2eb7ec9fd262336d7ffc0a477fa59bed35186fe9

data/.rubocop.yml

@@ -12,6 +12,7 @@ Metrics/ClassLength:
   Enabled: true
   Exclude:
     - lib/vagrant-zones/driver*
+    - lib/vagrant-zones/action/package.rb
 
 Naming/MethodName:
   EnforcedStyle: snake_case

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## [0.1.102](https://github.com/STARTcloud/vagrant-zones/compare/v0.1.101...v0.1.102) (2025-06-01)
+
+
+### Bug Fixes
+
+* rubocop ([b46dfe4](https://github.com/STARTcloud/vagrant-zones/commit/b46dfe4093191c4868fdfe77d73e454856e4fb85))
+* Vagrantfile addition ([aa59866](https://github.com/STARTcloud/vagrant-zones/commit/aa59866fe98b85cc5655f2a1b6495120e28cdb90))
+* Vagrantfile addition ([f6ca043](https://github.com/STARTcloud/vagrant-zones/commit/f6ca0438c2a94201c75405a6925e8178f7252180))
+
+## [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/action/package.rb

@@ -68,16 +68,24 @@ module VagrantPlugins
           end
 
           ## Create a Vagrantfile or load from Users Defined File
-          vagrantfile_content = <<~'CODE'
-            require 'yaml'
-            require_relative 'Hosts'
-            settings = YAML::load(File.read("#{File.dirname(__FILE__)}/Hosts.yml"))
-            Vagrant.configure("2") do |config|
-              Hosts.configure(config, settings)
-            end
-          CODE
-          File.write("#{Dir.pwd}/_tmp_package/Vagrantfile", vagrantfile_content)
-          files[env['package.vagrantfile']] = '_Vagrantfile' if env['package.vagrantfile']
+          if env['package.vagrantfile']
+            # Use the custom Vagrantfile provided by the user
+            custom_vagrantfile = env['package.vagrantfile']
+            raise Vagrant::Errors::PackageIncludeMissing, file: custom_vagrantfile unless File.exist?(custom_vagrantfile)
+
+            FileUtils.cp(custom_vagrantfile, "#{Dir.pwd}/_tmp_package/Vagrantfile", preserve: true)
+          else
+            # Use the default Vagrantfile content
+            vagrantfile_content = <<~'CODE'
+              require 'yaml'
+              require File.expand_path("#{File.dirname(__FILE__)}/core/Hosts.rb")
+              settings = YAML::load(File.read("#{File.dirname(__FILE__)}/Hosts.yml"))
+              Vagrant.configure("2") do |config|
+                Hosts.configure(config, settings)
+              end
+            CODE
+            File.write("#{Dir.pwd}/_tmp_package/Vagrantfile", vagrantfile_content)
+          end
 
           info_content_hash = {
             'boxname' => boxname,

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.102'
     NAME = 'vagrant-zones'
   end
 end

data/locales/en.yml

@@ -16,7 +16,7 @@ en:
         Invalid bhyve configuration detected
       console_failed: |-
         Failed to access console
-      console_failed: |-
+      netplan_failed: |-
         Failed to apply the netplan configuration inside the VM
       console_failed_exit: |-
         Exiting
@@ -184,7 +184,7 @@ en:
       Starting the zone
     joyent_image_uuid_verified: |-
       Joyent image UUID has been verified ==> 
-    lx_zone_dataset: |-
+    lx_zone_dataset_info: |-
       LX zone dataset ==> 
     setting_dns_server: |-
       Setting nameserver ==> 
@@ -327,5 +327,4 @@ en:
     win_applied_dns1: |-
       - Set Primary DNS
     win_applied_dns2: |-
-      - Set Secondary DNS        
-      
+      - Set Secondary DNS

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-zones
 version: !ruby/object:Gem::Version
-  version: 0.1.100
+  version: 0.1.102
 platform: ruby
 authors:
 - Mark Gilbert
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-09 00:00:00.000000000 Z
+date: 2025-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n