vagrant-zones 0.1.3 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4f79eefa3ab3f639f13182d9ce44cd0c335be15a7b31746a353be86685c8949
-  data.tar.gz: 4616c7c7e28015d457f852b8c9defcdbb382e841730a717c64673b6fef5490c4
+  metadata.gz: 61093727973c543138ab99453c56b8214074a849d1f1eb79e2eab3950ca6cbeb
+  data.tar.gz: de84cd17ca149f09a2b8e81b6f918a3246c5114f304ce18f0898433d78ca4ab7
 SHA512:
-  metadata.gz: 70d913181b7eb9d00b5a876d0f2c4d0bf84e8696183b3fa3965d319f78726d771d20fd7ef1dfe9bc7c7629207c7b5a7de9a118cc44132990ebb13c84d7498606
-  data.tar.gz: 788d1550bd7d142779d0ee855932911909c0ac9d3bb9bbbd852106c1d9c0a1d8d2b0857bb48470e1cffc3a122377f20bf04f92997367255416dbfbeb357a45d5
+  metadata.gz: 9378aa24d458dee3a8cb8f4170ff855691354c0a7ecfce08e7a2d1e9f6c8054fd94c0fc46c19f04bd5baf6bc046a2d8bac5facd5fc72d7e215d526371e95407d
+  data.tar.gz: 2cfcb830b1f52da8a612cf35ae1621dc89842f68125b3056ba79aa6239fe0dec520ff3f8d89d51e1d5c4d01f4c5d2fd54131289ce85acee8b03e8d85fe884feb

data/.github/workflows/lint-release-and-publish.yml

@@ -25,10 +25,10 @@ jobs:
         if: ${{ steps.release.outputs.release_created }}
 
       # Setup ruby if a release was created
-      - name: Set up Ruby 2.7
+      - name: Set up Ruby 3.0.0
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: 3.0.0
         if: ${{ steps.release.outputs.release_created }}
 
       # Bundle install

data/CHANGELOG.md

@@ -1,5 +1,40 @@
 # Changelog
 
+### [0.1.8](https://www.github.com/STARTcloud/vagrant-zones/compare/v0.1.7...v0.1.8) (2022-11-02)
+
+
+### Bug Fixes
+
+* version fix ([5fa814e](https://www.github.com/STARTcloud/vagrant-zones/commit/5fa814eac5006344845616e065d49b68ba67326c))
+
+### [0.1.7](https://www.github.com/STARTcloud/vagrant-zones/compare/v0.1.6...v0.1.7) (2022-11-02)
+
+
+### Bug Fixes
+
+* bundler ([912d3e1](https://www.github.com/STARTcloud/vagrant-zones/commit/912d3e1211ffcd79dd75dabe6e8b6a61a4752ea0))
+
+### [0.1.6](https://www.github.com/STARTcloud/vagrant-zones/compare/v0.1.5...v0.1.6) (2022-11-02)
+
+
+### Bug Fixes
+
+* version ([78395ae](https://www.github.com/STARTcloud/vagrant-zones/commit/78395ae01b2c97b9c1fd8e2c031e702191740a8f))
+
+### [0.1.5](https://www.github.com/STARTcloud/vagrant-zones/compare/v0.1.4...v0.1.5) (2022-11-02)
+
+
+### Bug Fixes
+
+* version ([d37daf3](https://www.github.com/STARTcloud/vagrant-zones/commit/d37daf33a7bceb724d9bb9e1669072005b131974))
+
+### [0.1.4](https://www.github.com/STARTcloud/vagrant-zones/compare/v0.1.3...v0.1.4) (2022-11-02)
+
+
+### Features
+
+* Ruby 3 and remove Nokogiri dep ([500dc87](https://www.github.com/STARTcloud/vagrant-zones/commit/500dc87201c4f20227565134aa6acb196abb12a5))
+
 ### [0.1.3](https://www.github.com/STARTcloud/vagrant-zones/compare/v0.1.2...v0.1.3) (2022-07-13)
 
 

data/CONTRIBUTING.md

@@ -70,8 +70,9 @@ method for Vagrant plugin development.
 
 The Conventional Commits specification is a lightweight convention on top of commit messages. It provides an easy set of rules for creating an explicit commit history; which makes it easier to write automated tools on top of. This convention dovetails with SemVer, by describing the features, fixes, and breaking changes made in commit messages.
 
-[Conventional Commits](https://github.com/conventional-commits/conventionalcommits.org/blob/master/content/v1.0.0/index.md)
-[Better Committing Practices](https://riptutorial.com/git/example/4729/good-commit-messages)
+* [Conventional Commits](https://github.com/conventional-commits/conventionalcommits.org/blob/master/content/v1.0.0/index.md)
+* [SemVer](https://semver.org/)
+* [Better Committing Practices](https://riptutorial.com/git/example/4729/good-commit-messages)
 
 ## Releasing
 

data/Gemfile

@@ -6,7 +6,7 @@ group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
-  gem 'vagrant', github: 'mitchellh/vagrant', ref: 'v2.2.19'
+  gem 'vagrant', github: 'hashicorp/vagrant', ref: 'v2.2.19'
 end
 
 group :plugins do

data/README.md

@@ -8,7 +8,7 @@ This project is still in the early stages, any feedback is much appreciated
 - [Status](#status)
   - [Functions](../../wiki/Status#functions)
   - [Boxes](../../wiki/Status#Box-Support)
-- [Examples](https://github.com/Makr91/vagrant-zones-examples)
+- [Examples](https://github.com/STARTCloud/vagrant-zones-examples)
 - [Installation](#installation)
 - [Known Issues](../../wiki/Known-Issues-and-Workarounds)
 - [Development](../../wiki/Plugin-Development-Environment)
@@ -31,7 +31,7 @@ This project is still in the early stages, any feedback is much appreciated
 
 Publiched Package locations:
 - [rubygems.org](https://rubygems.org/gems/vagrant-zones).
-- [github.com](https://github.com/Makr91/vagrant-zones/packages/963217)
+- [github.com](../../packages)
 
 ### Setup OS Installation
 
@@ -50,7 +50,7 @@ Publiched Package locations:
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/Makr91/vagrant-zones.
+Bug reports and pull requests are welcome on GitHub at https://github.com/STARTcloud/vagrant-zones/issues
 
 ## License
 

data/RELEASE.md

@@ -1,15 +1,22 @@
 # Release process
 
 This is vagrant-zones' current release process, documented so people know what is
-currently done.
+currently done to release it.
 
 ## Prepare the release
 
+Github Actions now handles the release cycle. We are using SemVer Verision and Convential Commits to ensure that we can use our Commits in our CI/CD Workflow
+
+To push a fix, ie a the Patch digit in Version string, prefix your commit header with "fix:  Some Commit Message"
+
+To push a feature, ie a the feature digit in Version string, prefix your commit header with "feat:  Some Commit Message"
+
+Doing so will cause GitHub Actions to perform the following
 * Update the version in "lib/vagrant-zones/version.rb"
 * Update the version in CHANGELOG.md
-* Use "rake release". This will make sure to tag that commit and push it RubyGems.
-* Update the version again in both files to a dev version for working again.
+* Create a Release and Corresponding tag
+* Push the package to the GPR and Ruby Gems
 
-The CHANGELOG.md should be maintained in a similar format to Vagrant:
+The CHANGELOG.md will be automatically maintained in a similar format to Vagrant by the Github Action Release-Please:
 
 https://github.com/mitchellh/vagrant/blob/master/CHANGELOG.md

data/docs/index.html

@@ -21,13 +21,13 @@
                 </div>
                 <div class="row justify-content-md-center">
                     <div class="menu-link col-md-auto fs-3 p-3 text-center">
-                        <a href="index.html">Home</a>
+                        <a href="https://github.com/STARTcloud/vagrant-zones">Home</a>
                     </div>
                     <div class="menu-link col-md-auto fs-3 p-3 text-center">
-                        <a href="own-your-data.html">Create your Automation</a>
+                        <a href="http://rubydoc.info/gems/vagrant-zones">Ruby Docs</a>
                     </div>
                     <div class="menu-link col-md-auto fs-3 p-3 text-center">
-                        <a href="contact-us.html">Issue Tracking</a>
+                        <a href="https://github.com/STARTcloud/vagrant-zones/issues">Issue Tracking</a>
                     </div>
                 </div>
             </div>

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

@@ -2,7 +2,6 @@
 
 require 'net/http'
 require 'vagrant-zones/util/subprocess'
-require 'pp'
 require 'vagrant/box_metadata'
 require 'vagrant/util/downloader'
 require 'vagrant/util/platform'

data/lib/vagrant-zones/config.rb

@@ -29,7 +29,7 @@ module VagrantPlugins
         @winalcheck = 'EVENT: The CMD command is now available.'
         @winlcheck = 'EVENT: The CMD command is now available.'
         @zunlockbootkey = ''
-        @zunlockboot = false
+        @zunlockboot = 'Importing ZFS root pool'
         @safe_restart = nil
         @safe_shutdown = nil
         @debug_boot = nil

data/lib/vagrant-zones/driver.rb

@@ -714,7 +714,7 @@ module VagrantPlugins
           execute(false, "#{@pfexec} zfs create #{sparse} #{refres} -V #{bootconfigs['size']} #{datasetroot}")
 
           ## Import template to boot volume
-          commandtransfer = "#{@pfexec} pv -n #{@machine.box.directory.join('box.zss')} | #{@pfexec} zfs recv -u -v -F #{datasetroot} "
+          commandtransfer = "#{@pfexec} pv -n #{@machine.box.directory.join('box.zss')} | #{@pfexec} zfs recv -u -v -F #{datasetroot}"
           uii.info(I18n.t('vagrant_zones.template_import_path'))
           uii.info("  #{@machine.box.directory.join('box.zss')}")
           Util::Subprocess.new commandtransfer do |_stdout, stderr, _thread|
@@ -725,6 +725,10 @@ module VagrantPlugins
             end
           end
           uii.clear_line
+
+          uii.info(I18n.t('vagrant_zones.template_import_path_set_size'))
+          execute(false, "#{@pfexec} zfs set volsize=#{bootconfigs['size']} #{datasetroot}")
+
         when 'illumos' || 'kvm'
           raise Errors::NotYetImplemented
         else
@@ -1137,7 +1141,7 @@ module VagrantPlugins
         network(uii, 'setup') if config.brand == 'bhyve' && !config.cloud_init_enabled
       end
 
-      ## this allows us a terminal to pass commands and manipulate the VM OS via serial/tty
+      ## this allows us a terminal to pass commands and manipulate the VM OS via serial/tty, I want to redo this at some point
       def zloginboot(uii)
         name = @machine.name
         config = @machine.provider_config
@@ -1148,6 +1152,7 @@ module VagrantPlugins
         bstring = ' OK ' if config.booted_string.nil?
         bstring = config.booted_string unless config.booted_string.nil?
         zunlockboot = 'Importing ZFS root pool'
+        zunlockboot = config.zunlockboot unless config.zunlockboot.nil?
         zunlockbootkey = config.zunlockbootkey unless config.zunlockbootkey.nil?
         pcheck = 'Password:'
         uii.info(I18n.t('vagrant_zones.automated-zlogin'))
@@ -1292,7 +1297,7 @@ module VagrantPlugins
             end
             if zlogin_read.expect(/Username:/)
               uii.info(I18n.t('vagrant_zones.windows_enter_username'))
-              zlogin_write.printf("Administrator\n")
+              zlogin_write.printf("#{user(@machine)}\n")
             end
             if zlogin_read.expect(/Domain/)
               uii.info(I18n.t('vagrant_zones.windows_enter_domain'))
@@ -1300,7 +1305,7 @@ module VagrantPlugins
             end
             if zlogin_read.expect(/Password/)
               uii.info(I18n.t('vagrant_zones.windows_enter_password'))
-              zlogin_write.printf("P@ssWord22\n")
+              zlogin_write.printf("#{vagrantuserpass(@machine)}\n")
             end
             if zlogin_read.expect(/#{cmd}/)
               uii.info(I18n.t('vagrant_zones.windows_cmd_accessible'))

data/lib/vagrant-zones/version.rb

@@ -2,6 +2,6 @@
 
 module VagrantPlugins
   module ProviderZone
-    VERSION = '0.1.3'
+    VERSION = '0.1.8'
   end
 end

data/locales/en.yml

@@ -195,6 +195,8 @@ en:
       - Importing Box template to disk ==> 
     template_import_path: |-
       - Template path:
+    template_import_path_set_size: |-
+      - Setting Boot Volume Size
     importing_joyent_image: |-
       - Importing Joyent image ==> 
     graceful_restart: |-
@@ -298,7 +300,7 @@ en:
     automated-zbootunlock: |-
       - Unlocking LUKS Keystore for the boot disk
     automated-zlogin-root: |-
-      - Impersonatig root, Waiting a few seconds
+      - Impersonating root, Waiting a few seconds
     windows_skip_first_boot: |-
       - Skipping First EVENT for CMD due to Sysprep Reboot
     windows_start_cmd: |-

data/vagrant-zones.gemspec

@@ -2,8 +2,6 @@
 
 Encoding.default_external = Encoding::UTF_8
 
-Encoding.default_internal = Encoding::UTF_8
-
 require File.expand_path('lib/vagrant-zones/version', __dir__)
 
 Gem::Specification.new do |spec|
@@ -35,9 +33,8 @@ Gem::Specification.new do |spec|
   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 'nokogiri', '<=  1.13.6'
   spec.add_runtime_dependency 'ruby_expect', '~> 1.7', '>= 1.7.5'
-  spec.add_development_dependency 'bundler', '~> 2.2', '>= 2.2.25'
+  spec.add_development_dependency 'bundler', '~> 2.2', '>= 2.2.3'
   spec.add_development_dependency 'code-scanning-rubocop', '~> 0.5', '>= 0.5.0'
   spec.add_development_dependency 'rake', '~> 13.0', '>= 13.0.6'
   spec.add_development_dependency 'rspec', '~> 3.4'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-zones
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.8
 platform: ruby
 authors:
 - Mark Gilbert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-13 00:00:00.000000000 Z
+date: 2022-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -72,20 +72,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.4
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 1.13.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 1.13.6
 - !ruby/object:Gem::Dependency
   name: ruby_expect
   requirement: !ruby/object:Gem::Requirement
@@ -115,7 +101,7 @@ dependencies:
         version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.25
+        version: 2.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -125,7 +111,7 @@ dependencies:
         version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.25
+        version: 2.2.3
 - !ruby/object:Gem::Dependency
   name: code-scanning-rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -405,7 +391,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Vagrant provider plugin to support zones