vagrant-zones 0.1.93 → 0.1.96

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e07b281bab5dd258c7b640b659c330061d87458a795247b941c05dbc6e194b84
-  data.tar.gz: d48d93a6e9089267a6e93ddf45419fb2d8729fce1e806421e514ec0d9a81b3f2
+  metadata.gz: '08790ff565fafcf9be7f4019efe4d7cf0096e37accf7d8c463afeb7adab1ed14'
+  data.tar.gz: ae393608d7eb853c88262466d6b571249a6d1a80133818c92cdf269c38e0bccb
 SHA512:
-  metadata.gz: '0685b5eab45e2cd3ec84f3bcca2fb6f1ca141967b832d2162b1853d91cfcd533ea98bb66fc6f01c0a17fd20ae0768baef5821d2b5fb80fefa44899d3ea264c0c'
-  data.tar.gz: 25bcb6927db98c2e4771883796758908f56fa9a243f592dbc2af68fca2ac45084589945a974df289fa8bdbf5a1c71804b6498d60a8f71e9984cefed9d5c3f3b0
+  metadata.gz: 73cd100176065cb79599347a5183167904f8db71fe4651db60f72dd67d87d98d62ffad433db78c09c75020c5611137103573ad7e338e68ea46d6fb5a95a1c751
+  data.tar.gz: 7ba74192089545507add98990cd383c8f44b5ba7ecc4d5011613f8c9067b6ee2d41aaa805d564724e38382710a1ac25f728581d13e96e43ed1873319c99be3ab

data/CHANGELOG.md

@@ -1,5 +1,53 @@
 # Changelog
 
+## [0.1.96](https://github.com/STARTcloud/vagrant-zones/compare/v0.1.95...v0.1.96) (2024-08-17)
+
+
+### Bug Fixes
+
+* linting ([86dc089](https://github.com/STARTcloud/vagrant-zones/commit/86dc089c8c2b3b1740fb4ef4eb315f2b2e2dd94a))
+* linting ([04d665d](https://github.com/STARTcloud/vagrant-zones/commit/04d665d09e68473093a31d86e33065d7f0b698ca))
+
+## [0.1.95](https://github.com/STARTcloud/vagrant-zones/compare/v0.1.94...v0.1.95) (2024-08-17)
+
+
+### Bug Fixes
+
+* linting ([d39015c](https://github.com/STARTcloud/vagrant-zones/commit/d39015c0faba337c8b197e9b35e79f4d1549daba))
+* linting ([14f34e2](https://github.com/STARTcloud/vagrant-zones/commit/14f34e2c4c10e716924de77d2000618ed249b0d0))
+* linting ([e908e4d](https://github.com/STARTcloud/vagrant-zones/commit/e908e4dce96a872890201cb67fadbd1fa7a69a02))
+* linting ([d62952d](https://github.com/STARTcloud/vagrant-zones/commit/d62952de42a07b637a95d6433d0a5d9279b74deb))
+* linting ([1403f3e](https://github.com/STARTcloud/vagrant-zones/commit/1403f3e24ca50c6878de684ec8770c1542c2798f))
+* linting ([43d7ecd](https://github.com/STARTcloud/vagrant-zones/commit/43d7ecd08425149f1c262a4af83cf447b2ebd5be))
+* updating vlans ([1749012](https://github.com/STARTcloud/vagrant-zones/commit/1749012ad76ec05c61ba49e66cf389f09531cfb2))
+
+## [0.1.94](https://github.com/STARTcloud/vagrant-zones/compare/v0.1.93...v0.1.94) (2024-01-09)
+
+
+### Bug Fixes
+
+* linting changes ([6e0ca30](https://github.com/STARTcloud/vagrant-zones/commit/6e0ca305cb708cf3e9b8856c81f232b30d1fbd34))
+* linting changes ([5efd5ae](https://github.com/STARTcloud/vagrant-zones/commit/5efd5ae4df118f0236541dc2f801221732864602))
+* linting changes ([b74c980](https://github.com/STARTcloud/vagrant-zones/commit/b74c9808d1867d5fa05f0193419f777da39fa5de))
+* linting changes ([eeaf8eb](https://github.com/STARTcloud/vagrant-zones/commit/eeaf8eb5da9162123b7fa2be99790deac6121a28))
+* linting changes ([d2e23b4](https://github.com/STARTcloud/vagrant-zones/commit/d2e23b43c20a8037a50a49ca738d8e66a3fedc61))
+* linting changes ([ce961e3](https://github.com/STARTcloud/vagrant-zones/commit/ce961e3c6d96aa24f8140beb6e4f92e4974feb5b))
+* linting changes ([7735b66](https://github.com/STARTcloud/vagrant-zones/commit/7735b66944efcfe62cb86a19f58f42aa7933a994))
+* linting changes ([117af25](https://github.com/STARTcloud/vagrant-zones/commit/117af25973eef16eda3f3d7ec3f83ab7e2ed0f4b))
+* linting changes ([50a32ec](https://github.com/STARTcloud/vagrant-zones/commit/50a32ecd3fa3704d67068c7f50803d639a205c1b))
+* linting changes ([6ae3aa1](https://github.com/STARTcloud/vagrant-zones/commit/6ae3aa10a7bca6cc057091bb0af77a634cb2083d))
+* linting changes ([b936a8b](https://github.com/STARTcloud/vagrant-zones/commit/b936a8b218ac4046a44b1242d98852eaab382847))
+* linting changes ([5c30988](https://github.com/STARTcloud/vagrant-zones/commit/5c30988965bf396fd8744464ea16ca6260f8a406))
+* linting changes ([f96e885](https://github.com/STARTcloud/vagrant-zones/commit/f96e8854a5eea2c499de3ea9b93c4e9f4349be3a))
+* linting changes ([b0cc1c3](https://github.com/STARTcloud/vagrant-zones/commit/b0cc1c3577d50940badf28e60c6bbfc155ff5ffc))
+* linting changes ([547d81d](https://github.com/STARTcloud/vagrant-zones/commit/547d81d564c9a241fba856748a223faf65ce7f4a))
+* linting changes ([bc66f9b](https://github.com/STARTcloud/vagrant-zones/commit/bc66f9bffc7e2d4f0ff475a942c0514c4916c487))
+* linting changes ([a0b7295](https://github.com/STARTcloud/vagrant-zones/commit/a0b7295ca60ecfb6ee85cb178d1d70cb217a3fb3))
+* linting changes ([895fb1f](https://github.com/STARTcloud/vagrant-zones/commit/895fb1f214888128b2512df3e827b6f5fdef90c2))
+* linting changes ([13893a7](https://github.com/STARTcloud/vagrant-zones/commit/13893a70d389eca1a583bd150dae35d85fd7e7db))
+* linting changes ([ed04b7f](https://github.com/STARTcloud/vagrant-zones/commit/ed04b7f94c3f433eaca4ff60ff678755edebb4ef))
+* packaging process ([59bbb0d](https://github.com/STARTcloud/vagrant-zones/commit/59bbb0d5a2b0fcb0f851113718eb2196725c6708))
+
 ## [0.1.93](https://github.com/STARTcloud/vagrant-zones/compare/v0.1.92...v0.1.93) (2024-01-07)
 
 

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

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
+require 'fileutils'
+require 'pathname'
 require 'log4r'
+require 'json'
 module VagrantPlugins
   module ProviderZone
     module Action
@@ -25,58 +28,79 @@ module VagrantPlugins
         end
 
         def call(env)
-          @machine = env[:machine]
-          @driver = @machine.provider.driver
-          name = @machine.name
           boxname = env['package.output']
-          brand = @machine.provider_config.brand
-          kernel = @machine.provider_config.kernel
-          vcc = @machine.provider_config.vagrant_cloud_creator
-          boxshortname = @machine.provider_config.boxshortname
+          mpc = env[:machine].provider_config
+          files = {}
           raise "#{boxname}: Already exists" if File.exist?(boxname)
 
           ## Create Snapshot
-          tmp_dir = "#{Dir.pwd}/_tmp_package"
-          Dir.mkdir(tmp_dir)
-          datasetpath = "#{@machine.provider_config.boot['array']}/#{@machine.provider_config.boot['dataset']}/#{name}"
-          t = Time.new
-          datetime = %(#{t.year}-#{t.month}-#{t.day}-#{t.hour}:#{t.min}:#{t.sec})
-          snapshot_create(datasetpath, datetime, env[:ui], @machine.provider_config)
-          snapshot_send(datasetpath, "#{tmp_dir}/box.zss", datetime, env[:ui], @machine.provider_config)
-          ## snapshot_delete(datasetpath, env[:ui], datetime)
-
-          # Package VM
-          extra = ''
+          FileUtils.mkdir_p("#{Dir.pwd}/_tmp_package")
+          datasetpath = "#{mpc.boot['array']}/#{mpc.boot['dataset']}/#{env[:machine].name}"
+          datetime = Time.new.strftime('%Y-%m-%d-%H:%M:%S')
+          snapshot_create(datasetpath, datetime, env[:ui], mpc)
+          snapshot_send(datasetpath, "#{Dir.pwd}/_tmp_package/box.zss", datetime, env[:ui], mpc)
 
           ## Include User Extra Files
-          if env['package.include']
-            extra = '_include'
-            env['package.include'].each do |f|
-              env[:ui].info("Including user file: #{f}")
-              FileUtils.cp(f, tmp_dir)
-            end
+          env['package.include'].each do |file|
+            source = Pathname.new(file)
+            dest = if source.relative?
+                     source
+                   else
+                     source.basename
+                   end
+            files[file] = dest
+          end
+
+          # Verify the mapping
+          files.each_key do |from|
+            raise Vagrant::Errors::PackageIncludeMissing, file: from unless File.exist?(from)
           end
 
-          ## Include Vagrant file
-          if env['package.vagrantfile']
-            extra = '_include'
-            Dir.mkdir(@tmp_include) unless File.directory?(@tmp_include)
-            env[:ui].info('Including user Vagrantfile')
-            FileUtils.cp(env['package.vagrantfile'], "#{@tmp_include}/Vagrantfile")
+          files.each do |from, dest|
+            include_directory = Pathname.new("#{Dir.pwd}/_tmp_package/")
+            to = include_directory.join(dest)
+            FileUtils.mkdir_p(to.parent)
+            if File.directory?(from)
+              FileUtils.cp_r(Dir.glob(from), to.parent, preserve: true)
+            else
+              FileUtils.cp(from, to, preserve: true)
+            end
           end
 
-          ## Create the Metadata and Vagrantfile
-          Dir.chdir(tmp_dir)
-          File.write('./metadata.json', metadata_content(brand, kernel, vcc, boxshortname))
-          File.write('./Vagrantfile', vagrantfile_content(brand, kernel, datasetpath))
+          ## 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']
+
+          info_content_hash = {
+            'boxname' => boxname,
+            'Author' => mpc.vagrant_cloud_creator,
+            'Vagrant-Zones' => 'This box was built with Vagrant-Zones: https://github.com/STARTcloud/vagrant-zones'
+          }
+          File.write("#{Dir.pwd}/_tmp_package/info.json", info_content_hash.to_json)
+
+          metadata_content_hash = {
+            'provider' => 'zone',
+            'architecture' => 'amd64',
+            'brand' => mpc.brand,
+            'format' => 'zss',
+            'url' => "https://app.vagrantup.com/#{mpc.vagrant_cloud_creator}/boxes/#{mpc.boxshortname}"
+          }
+          metadata_content_hash['kernel'] = mpc.kernel if !mpc.kernel.nil? && mpc.kernel != false
+          File.write("#{Dir.pwd}/_tmp_package/metadata.json", metadata_content_hash.to_json)
 
           ## Create the Box file
-          assemble_box(boxname, extra)
-          FileUtils.mv("#{tmp_dir}/#{boxname}", "../#{boxname}")
-          Dir.chdir('../')
-          FileUtils.rm_rf(tmp_dir)
+          assemble_box(boxname, "#{Dir.pwd}/_tmp_package")
+          FileUtils.rm_rf("#{Dir.pwd}/_tmp_package")
 
-          env[:ui].info("Box created, You can now add the box: 'vagrant box add #{boxname} --nameofnewbox'")
+          env[:ui].info("Box created, You can now add the box: 'vagrant box add #{boxname} --name newbox'")
           @app.call(env)
         end
 
@@ -94,32 +118,16 @@ module VagrantPlugins
         def snapshot_send(datasetpath, destination, datetime, uii, config)
           uii.info('Sending Snapshot to ZFS Send Stream image.')
           result = execute(true, "#{@pfexec} zfs send #{datasetpath}/boot@vagrant_box#{datetime} > #{destination}")
-          puts "#{@pfexec} zfs send -r #{datasetpath}/boot@vagrant_box#{datetime} > #{destination}" if result.zero? && config.debug
-        end
-
-        def metadata_content(_brand, _kernel, vcc, boxshortname)
-          <<-ZONEBOX
-  { "provider": "zone", "architecture": "amd64", "url": "https://app.vagrantup.com/#{vcc}/boxes/#{boxshortname}" }
-          ZONEBOX
-        end
-
-        def vagrantfile_content(brand, _kernel, datasetpath)
-          <<-ZONEBOX
-          Vagrant.configure('2') do |config|
-            config.vm.provider :zone do |zone|
-              zone.brand = "#{brand}"
-              zone.datasetpath = "#{datasetpath}"
-            end
-          end
-          user_vagrantfile = File.expand_path('../_include/Vagrantfile', __FILE__)
-          load user_vagrantfile if File.exists?(user_vagrantfile)
-          ZONEBOX
+          uii.info("#{@pfexec} zfs send -r #{datasetpath}/boot@vagrant_box#{datetime} > #{destination}") if result.zero? && config.debug
         end
 
-        def assemble_box(boxname, extra)
+        def assemble_box(boxname, tmp_dir)
           is_linux = `bash -c '[[ "$(uname -a)" =~ "Linux" ]]'`
-          `tar -cvzf #{boxname} ./metadata.json ./Vagrantfile ./box.zss #{extra}` if is_linux
-          `tar -cvzEf #{boxname} ./metadata.json ./Vagrantfile ./box.zss #{extra}` unless is_linux
+          Dir.chdir(tmp_dir) do
+            files = Dir.glob(File.join('.', '*'))
+            tar_command = is_linux ? 'tar -cvzf' : 'tar -cvzEf'
+            `#{tar_command} ../#{boxname} #{files.join(' ')}`
+          end
         end
       end
     end

data/lib/vagrant-zones/command/console.rb

@@ -21,7 +21,7 @@ module VagrantPlugins
             require File.expand_path('webvnc_console', __dir__)
             WebVNCConsole
           end
-          super(argv, env)
+          super
         end
 
         def execute
@@ -48,9 +48,8 @@ module VagrantPlugins
             subopts.separator 'Available subcommands:'
             # Add the available subcommands as separators in order to print them
             # out as well.
-            keys = []
-            @subcommands.each { |(key, _value)| keys << key.to_s }
-            keys.sort.each do |key|
+            keys = @subcommands.map { |(key, _value)| key.to_s }.sort
+            keys.each do |key|
               subopts.separator "     #{key}"
             end
             subopts.separator 'For help on any individual subcommand run `vagrant zone console <subcommand> -h`'

data/lib/vagrant-zones/command/guest_power_controls.rb

@@ -17,7 +17,7 @@ module VagrantPlugins
             require File.expand_path('shutdown_guest', __dir__)
             ShutdownGuest
           end
-          super(argv, env)
+          super
         end
 
         def execute
@@ -42,9 +42,8 @@ module VagrantPlugins
             subopts.separator 'Available subcommands:'
             # Add the available subcommands as separators in order to print them
             # out as well.
-            keys = []
-            @subcommands.each { |(key, _value)| keys << key.to_s }
-            keys.sort.each do |key|
+            keys = @subcommands.map { |(key, _value)| key.to_s }.sort
+            keys.each do |key|
               subopts.separator "     #{key}"
             end
             subopts.separator ''

data/lib/vagrant-zones/command/zfssnapshot.rb

@@ -25,7 +25,7 @@ module VagrantPlugins
             require File.expand_path('configure_snapshots', __dir__)
             ConfigureSnapshots
           end
-          super(argv, env)
+          super
         end
 
         def execute
@@ -51,9 +51,8 @@ module VagrantPlugins
             subopts.separator 'Available subcommands:'
             # Add the available subcommands as separators in order to print them
             # out as well.
-            keys = []
-            @subcommands.each { |(key, _value)| keys << key.to_s }
-            keys.sort.each do |key|
+            keys = @subcommands.map { |(key, _value)| key.to_s }.sort
+            keys.each do |key|
               subopts.separator "     #{key}"
             end
             subopts.separator ''

data/lib/vagrant-zones/command/zone.rb

@@ -28,7 +28,7 @@ module VagrantPlugins
             require File.expand_path('console', __dir__)
             Console
           end
-          super(argv, env)
+          super
         end
 
         def execute
@@ -54,10 +54,8 @@ module VagrantPlugins
 
             # Add the available subcommands as separators in order to print them
             # out as well.
-            keys = []
-            @subcommands.each { |(key, _value)| keys << key.to_s }
-
-            keys.sort.each do |key|
+            keys = @subcommands.map { |(key, _value)| key.to_s }.sort
+            keys.each do |key|
               subopts.separator "     #{key}"
             end
 

data/lib/vagrant-zones/config.rb

@@ -17,7 +17,7 @@ module VagrantPlugins
         @additional_disks = UNSET_VALUE
         @autoboot = true
         @post_provision_boot = false
-        @kernel = UNSET_VALUE
+        @kernel = nil
         @boxshortname = UNSET_VALUE
         @cdroms = nil
         @shared_dir = nil

data/lib/vagrant-zones/driver.rb

@@ -625,16 +625,16 @@ module VagrantPlugins
         vnic_name = vname(uii, opts)
         uii.info(I18n.t('vagrant_zones.nat_vnic_setup'))
         uii.info("  #{vnic_name}")
-        strt = "#{@pfexec} zonecfg -z #{@machine.name} "
+        zonecfg_cmd = "#{@pfexec} zonecfg -z #{@machine.name} "
         cie = config.cloud_init_enabled
         case config.brand
         when 'lx'
           shrtstr1 = %(set allowed-address=#{allowed_address}; add property (name=gateway,value="#{defrouter}"); )
           shrtstr2 = %(add property (name=ips,value="#{allowed_address}"); add property (name=primary,value="true"); end;)
-          execute(false, %(#{strt}set global-nic=auto; #{shrtstr1} #{shrtstr2}"))
+          execute(false, %(#{zonecfg_cmd}set global-nic=auto; #{shrtstr1} #{shrtstr2}"))
         when 'bhyve'
-          execute(false, %(#{strt}"add net; set physical=#{vnic_name}; end;")) unless cie
-          execute(false, %(#{strt}"add net; set physical=#{vnic_name}; set allowed-address=#{allowed_address}; end;")) if cie
+          execute(false, %(#{zonecfg_cmd}"add net; set physical=#{vnic_name}; end;")) unless cie
+          execute(false, %(#{zonecfg_cmd}"add net; set physical=#{vnic_name}; set allowed-address=#{allowed_address}; end;")) if cie
         end
       end
 
@@ -724,16 +724,12 @@ module VagrantPlugins
       def zoneniccreate(uii, opts)
         mac = macaddress(uii, opts)
         vnic_name = vname(uii, opts)
-        if opts[:vlan].nil?
-          uii.info(I18n.t('vagrant_zones.creating_vnic'))
-          uii.info("  #{vnic_name}")
-          execute(false, "#{@pfexec} dladm create-vnic -l #{opts[:bridge]} -m #{mac} #{vnic_name}")
-        else
-          vlan = opts[:vlan]
-          uii.info(I18n.t('vagrant_zones.creating_vnic'))
-          uii.info("  #{vnic_name}")
-          execute(false, "#{@pfexec} dladm create-vnic -l #{opts[:bridge]} -m #{mac} -v #{vlan} #{vnic_name}")
-        end
+        uii.info(I18n.t('vagrant_zones.creating_vnic'))
+        uii.info("  #{vnic_name}")
+        command = "#{@pfexec} dladm create-vnic -l #{opts[:bridge]} -m #{mac}"
+        command += " -v #{opts[:vlan]}" unless opts[:vlan].nil? || (opts[:vlan]).zero?
+        command += " #{vnic_name}"
+        execute(false, command)
       end
 
       # This helps us create all the datasets for the zone
@@ -1029,10 +1025,8 @@ module VagrantPlugins
         execute(false, %(#{zcfg}"add attr; set name=password; set value=#{ccip}; set type=string; end;")) unless ccip.nil?
 
         cclir = config.dns
-        dservers = []
-        cclir['dns'].each do |ns|
-          dservers.append(ns['nameserver'])
-        end
+        dservers = cclir['dns'].map { |ns| ns['nameserver'] }
+
         uii.info(I18n.t('vagrant_zones.setting_cloud_resolvers')) unless dservers.nil?
         uii.info("  #{dservers}") unless dservers.nil?
         execute(false, %(#{zcfg}"add attr; set name=resolvers; set value=#{dservers}; set type=string; end;")) unless dservers.nil?
@@ -1051,28 +1045,24 @@ module VagrantPlugins
         config = @machine.provider_config
         uii.info(I18n.t('vagrant_zones.vnic_setup'))
         uii.info("  #{vnic_name}")
-        strt = "#{@pfexec} zonecfg -z #{@machine.name} "
+        zonecfg_cmd = "#{@pfexec} zonecfg -z #{@machine.name} "
         cie = config.cloud_init_enabled
         aa = config.allowed_address
         case config.brand
         when 'lx'
           shrtstr1 = %(set allowed-address=#{allowed_address}; add property (name=gateway,value="#{defrouter}"); )
           shrtstr2 = %(add property (name=ips,value="#{allowed_address}"); add property (name=primary,value="true"); end;)
-          execute(false, %(#{strt}set global-nic=auto; #{shrtstr1} #{shrtstr2}"))
+          execute(false, %(#{zonecfg_cmd}set global-nic=auto; #{shrtstr1} #{shrtstr2}"))
         when 'bhyve'
-          if config.on_demand_vnics && !opts[:vlan].nil?
-            execute(false, %(#{strt}"add net; set physical=#{vnic_name}; set vlan-id=#{opts[:vlan]}; set global-nic=#{opts[:bridge]}; end;")) unless cie
-            execute(false, %(#{strt}"add net; set physical=#{vnic_name}; set vlan-id=#{opts[:vlan]}; set global-nic=#{opts[:bridge]}; set allowed-address=#{allowed_address}; end;")) if cie && aa
-            execute(false, %(#{strt}"add net; set physical=#{vnic_name}; set vlan-id=#{opts[:vlan]}; set global-nic=#{opts[:bridge]}; end;")) if cie && !aa
-          elsif config.on_demand_vnics && opts[:vlan].nil?
-            execute(false, %(#{strt}"add net; set physical=#{vnic_name}; set global-nic=#{opts[:bridge]}; end;")) unless cie
-            execute(false, %(#{strt}"add net; set physical=#{vnic_name}; set global-nic=#{opts[:bridge]}; set allowed-address=#{allowed_address}; end;")) if cie && aa
-            execute(false, %(#{strt}"add net; set physical=#{vnic_name}; set global-nic=#{opts[:bridge]}; end;")) if cie && !aa
-          elsif !config.on_demand_vnics
-            execute(false, %(#{strt}"add net; set physical=#{vnic_name}; end;")) unless cie
-            execute(false, %(#{strt}"add net; set physical=#{vnic_name}; set allowed-address=#{allowed_address}; end;")) if cie && aa
-            execute(false, %(#{strt}"add net; set physical=#{vnic_name}; end;")) if cie && !aa
-          end
+          vlan_option = opts[:vlan].nil? || opts[:vlan].zero? ? '' : "set vlan-id=#{opts[:vlan]}; "
+          base_cmd = if config.on_demand_vnics
+                       %(#{zonecfg_cmd}"add net; set physical=#{vnic_name}; #{vlan_option}set global-nic=#{opts[:bridge]}; )
+                     else
+                       %(#{zonecfg_cmd}"add net; set physical=#{vnic_name}; )
+                     end
+          execute(false, %(#{base_cmd}end;)) unless cie
+          execute(false, %(#{base_cmd}set allowed-address=#{allowed_address}; end;)) if cie && aa
+          execute(false, %(#{base_cmd}end;)) if cie && !aa
         end
       end
 

data/lib/vagrant-zones/provider.rb

@@ -12,7 +12,7 @@ module VagrantPlugins
       def initialize(machine)
         @logger = Log4r::Logger.new('vagrant::provider::zone')
         @machine = machine
-        super(machine)
+        super
       end
 
       def driver

data/lib/vagrant-zones/version.rb

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

data/vagrant-zones.gemspec

@@ -29,9 +29,9 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.7.0'
   spec.required_rubygems_version = '>= 1.3.6'
-  spec.add_runtime_dependency 'i18n', '~> 1.0'
-  spec.add_runtime_dependency 'iniparse', '~> 1.0'
-  spec.add_runtime_dependency 'log4r', '~> 1.1'
-  spec.add_runtime_dependency 'netaddr', '~> 2.0', '>= 2.0.4'
-  spec.add_runtime_dependency 'ruby_expect', '~> 1.7', '>= 1.7.5'
+  spec.add_dependency  'i18n', '~> 1.0'
+  spec.add_dependency  'iniparse', '~> 1.0'
+  spec.add_dependency  'log4r', '~> 1.1'
+  spec.add_dependency  'netaddr', '~> 2.0', '>= 2.0.4'
+  spec.add_dependency  'ruby_expect', '~> 1.7', '>= 1.7.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-zones
 version: !ruby/object:Gem::Version
-  version: 0.1.93
+  version: 0.1.96
 platform: ruby
 authors:
 - Mark Gilbert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-07 00:00:00.000000000 Z
+date: 2024-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n