vagrant-zones 0.1.101 → 0.1.103

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b58a4f65279cdf4fd1ef75666dfad9977f8003c77d6b228672a126d4a436f76a
-  data.tar.gz: b48932d77bd5cbe24e35678f5ed4a13a0be2ac04cfd0fba11f4a6d72048584c8
+  metadata.gz: 199dc637182518fb306265b19efe0d193621a2122ac05239b10cd7373783ca90
+  data.tar.gz: 7bcbbf9ef88e301dd6319e8c0e8179ef437e32b39f3020173af4517c89a03110
 SHA512:
-  metadata.gz: acaa60b70fc4dd5a51c7adafb54995629ded5e95884c86ce8cd2b43d1a0745756e7044a59496f5603b203e24bc9a2894b40fdfece7227cd0001deb167579d199
-  data.tar.gz: 60e9a8a9ca5b93603740742c56e5250f62b9e848515ef10e8889e17c39d0d46c4ba57ea032eb2d4284ede6c51b49814f00c7ed4c5859398f041e3b66604926c8
+  metadata.gz: 1f52fa426012f1d8a4bb1eba1759e5ce0618f43830669df61bf5074f77c4c7f055d8f3b6eafe32b52675a8e4d47d3f85c2a5c8ca1a96a7feeb9bc6a58d6005bc
+  data.tar.gz: 44fceee141650ee9b86b794e3980a8941f986f602a5a30827503186cced99caa974761ec450fe4a443ebf615eacc803ca219fa8d43b405deaa7639e2ba50c4e6

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,23 @@
 # Changelog
 
+## [0.1.103](https://github.com/STARTcloud/vagrant-zones/compare/v0.1.102...v0.1.103) (2025-09-19)
+
+
+### Bug Fixes
+
+* add metric to windows nat interfaces ([4d37895](https://github.com/STARTcloud/vagrant-zones/commit/4d378953869a4c7983baa58b5a518398207db01d))
+* linting ([03be1ce](https://github.com/STARTcloud/vagrant-zones/commit/03be1cecdb656d30dcf2d998231c68da94f85c5e))
+* linting ([fbda546](https://github.com/STARTcloud/vagrant-zones/commit/fbda546b652248ade68abcc0d4f8a15a330e62e7))
+
+## [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)
 
 

data/Gemfile

@@ -20,7 +20,7 @@ group :plugins do
   gem 'rspec-mocks', '~> 3.10', '>= 3.10.0'
   gem 'rubocop', '~> 1.0'
   gem 'rubocop-rake', '~> 0.6', '>= 0.6.0'
-  gem 'rubocop-rspec', '~> 2.4', '>= 2.4.0'
+  gem 'rubocop-rspec', '~> 3.7'
   gem 'ruby-progressbar', '~> 1.11', '>= 1.11.0'
   gem 'strings-ansi', '~> 0.2.0'
 end

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/action/restart.rb

@@ -10,6 +10,7 @@ module VagrantPlugins
       # This is used to restart the zone
       class Restart
         include Vagrant::Util::Retryable
+
         def initialize(app, _env)
           @logger = Log4r::Logger.new('vagrant_zones::action::restart')
           @app = app

data/lib/vagrant-zones/action/shutdown.rb

@@ -10,6 +10,7 @@ module VagrantPlugins
       # This is used to shutdown the zone
       class Shutdown
         include Vagrant::Util::Retryable
+
         def initialize(app, _env)
           @logger = Log4r::Logger.new('vagrant_zones::action::shutdown')
           @app = app

data/lib/vagrant-zones/action.rb

@@ -8,6 +8,7 @@ module VagrantPlugins
     # Run actions against the machine
     module Action # rubocop:disable Metrics/ModuleLength
       include Vagrant::Action::Builtin
+
       @logger = Log4r::Logger.new('vagrant_zones::action')
 
       # This action is called to bring the box up from nothing.

data/lib/vagrant-zones/driver.rb

@@ -22,6 +22,7 @@ module VagrantPlugins
     # This class does the heavy lifting of the zone provider
     class Driver
       include Vagrant::Util::Retryable
+
       attr_accessor :executor
 
       def initialize(machine)
@@ -1342,6 +1343,7 @@ module VagrantPlugins
         ip = ipaddress(uii, opts)
         vnic_name = vname(uii, opts)
         defrouter = opts[:gateway].to_s
+        metric = opts[:metric] || 100
         uii.info(I18n.t('vagrant_zones.configure_win_interface_using_vnic'))
         sleep(60)
 
@@ -1399,6 +1401,11 @@ module VagrantPlugins
 
           # Configure the interface with IP, mask, and gateway
           cmd = %(netsh interface ipv4 set address name="#{vnic_name}" static #{ip} #{opts[:netmask]} #{defrouter})
+          # Add metric setting for NAT networks
+          if opts[:nictype] == 'nat' || opts[:provisional]
+            metric_cmd = %(netsh interface ipv4 set interface "#{vnic_name}" metric=#{metric})
+            zlogin(uii, metric_cmd)
+          end
           uii.info(I18n.t('vagrant_zones.win_applied_static')) if zlogin(uii, cmd)
 
           # Configure DNS if provided

data/lib/vagrant-zones/version.rb

@@ -2,7 +2,7 @@
 
 module VagrantPlugins
   module ProviderZone
-    VERSION = '0.1.101'
+    VERSION = '0.1.103'
     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.101
+  version: 0.1.103
 platform: ruby
 authors:
 - Mark Gilbert
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-09 00:00:00.000000000 Z
+date: 2025-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n