vagrant-bolt 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9d03a761285c5908c03130961208c1bdba05835f96cbebdaadefa0a5e5379d4
-  data.tar.gz: 4df11b142b911d3f71306f1a99de585bdb1375b0fbcc20bb0b2fafc630f24fda
+  metadata.gz: 5db77647479d994addb8c0d44266d5408001a0035f7d57d913107f88c1290a07
+  data.tar.gz: 5ede9d54e55e4401133fa1ede70d62bf7e9ab6aef4805a9533bc0b106cea7cee
 SHA512:
-  metadata.gz: 5378d353881473477b724456fa94c7a2188bf788ade2553c1139cd2c3a091f130793594ea73f02007099f42349ae0a4033c29b275f2b73f75f0e2c4c67496986
-  data.tar.gz: 5b3ceec04cc8c543bb93eb7a3218261772081a146bd84f09df9d80ccb24f3355801cf032f8976dc25906dc22318e2db5603d2e403c3d751310a34f98ff46a59a
+  metadata.gz: 90a889e58965672e19a4b4fdd5e667fe05ace1d96d401481e9c73cfba89cc26e284c557a530902b38b97a8bb1cb68f45e163ffd2ecc3094380c309fe4d38920b
+  data.tar.gz: d25d14d296e07fcf22d8a75612e37525495a4e33d2b2f031b804e9d1ac2e28ab0e82c2bd0352329d4a6cc421a7e22be505d842b0e90d3d804cd207f0659a3d8d

data/.travis.yml

@@ -22,7 +22,7 @@ rvm:
 matrix:
   fast_finish: true
   include:
-    - rvm: 2.4.4
-      env: TEST_VAGRANT_VERSION=v2.2.7
     - rvm: 2.5.0
+      env: TEST_VAGRANT_VERSION=v2.2.9
+    - rvm: 2.6.6
       env: TEST_VAGRANT_VERSION=HEAD

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [v0.3.0](https://github.com/oscar-stack/vagrant-bolt/tree/v0.3.0) (2020-06-02)
+
+[Full Changelog](https://github.com/oscar-stack/vagrant-bolt/compare/v0.2.1...v0.3.0)
+
+**Merged pull requests:**
+
+- Update inventory naming [\#16](https://github.com/oscar-stack/vagrant-bolt/pull/16) ([jarretlavallee](https://github.com/jarretlavallee))
+
 ## [v0.2.1](https://github.com/oscar-stack/vagrant-bolt/tree/v0.2.1) (2020-03-23)
 
 [Full Changelog](https://github.com/oscar-stack/vagrant-bolt/compare/v0.2.0...v0.2.1)

data/Gemfile

@@ -3,7 +3,7 @@
 source 'https://rubygems.org'
 require 'rubygems/version'
 
-vagrant_branch = ENV['TEST_VAGRANT_VERSION'] || 'v2.2.7'
+vagrant_branch = ENV['TEST_VAGRANT_VERSION'] || 'v2.2.9'
 
 group :plugins do
   gemspec
@@ -27,11 +27,12 @@ group :test do
                    tag: vagrant_branch
   end
 
-  gem 'vagrant-spec', git: 'https://github.com/hashicorp/vagrant-spec.git'
+  gem 'vagrant-spec', git: 'https://github.com/hashicorp/vagrant-spec.git',
+                   branch: 'master'
 end
 
 group :system_tests do
-  gem 'bolt', "~> 1.48.0"
+  gem 'bolt', "~> 2.0.0"
 end
 
 

data/README.md

@@ -260,6 +260,10 @@ The settings available in the triggers and the provisioner are the same.
   * Description: A boolean which controls if the connection should use SSL on with WinRM (Windows)
 * `ssl_verify`
   * Description: A boolean which controls if the connection should verify SSL on with WinRM (Windows)
+* `machine_alias`
+  * Description: A string to use as the machine's alias in the bolt inventory file. Defaults to nil unless `machine_name` is configured in which case it defaults to the machine name.
+* `machine_name`
+  * Description: A string to use as the machine's name in the bolt inventory file. Defaults to the machine name.
 * `modulepath`
   * Description: A string containing the path to bolt modules
 * `tmpdir`

data/lib/vagrant-bolt/config/bolt.rb

@@ -68,20 +68,7 @@ class VagrantBolt::Config::Bolt < VagrantBolt::Config::Global
   def finalize!
     @bolt_exe       = nil if @bolt_exe == UNSET_VALUE
     @boltdir        = nil if @boltdir == UNSET_VALUE
-    @host_key_check = nil if @host_key_check == UNSET_VALUE
-    @modulepath     = nil if @modulepath == UNSET_VALUE
-    @port           = nil if @port == UNSET_VALUE
-    @password       = nil if @password == UNSET_VALUE
-    @private_key    = nil if @private_key == UNSET_VALUE
-    @run_as         = nil if @run_as == UNSET_VALUE
-    @ssl            = nil if @ssl == UNSET_VALUE
-    @ssl_verify     = nil if @ssl_verify == UNSET_VALUE
-    @sudo_password  = nil if @sudo_password == UNSET_VALUE
-    @tmpdir         = nil if @tmpdir == UNSET_VALUE
-    @user           = nil if @user == UNSET_VALUE
-    @verbose        = nil if @verbose == UNSET_VALUE
-    @debug          = nil if @debug == UNSET_VALUE
-
+    super
     @args           = nil if @args == UNSET_VALUE
     @name           = nil if @name == UNSET_VALUE
     @node_list      = nil if @node_list == UNSET_VALUE

data/lib/vagrant-bolt/config/global.rb

@@ -17,6 +17,14 @@ class VagrantBolt::Config::Global < Vagrant.plugin('2', :config)
   # @return [Boolean] If the connection should check the host key on the remote host (linux)
   attr_accessor :host_key_check
 
+  # @!attribute [rw] machine_alias
+  # @return [String] The alias of the machine to set in the bolt inventory
+  attr_accessor :machine_alias
+
+  # @!attribute [rw] machine_name
+  # @return [String] The name of the machine to set in the bolt inventory
+  attr_accessor :machine_name
+
   # @!attribute [rw] modulepath
   # @return [String] The path to the modules.
   attr_accessor :modulepath
@@ -82,6 +90,8 @@ class VagrantBolt::Config::Global < Vagrant.plugin('2', :config)
     @boltdir         = UNSET_VALUE
     @connect_timeout = UNSET_VALUE
     @host_key_check  = UNSET_VALUE
+    @machine_alias   = UNSET_VALUE
+    @machine_name    = UNSET_VALUE
     @modulepath      = UNSET_VALUE
     @password        = UNSET_VALUE
     @port            = UNSET_VALUE
@@ -104,6 +114,8 @@ class VagrantBolt::Config::Global < Vagrant.plugin('2', :config)
     @boltdir         = '.' if @boltdir == UNSET_VALUE
     @connect_timeout = nil if @connect_timeout == UNSET_VALUE
     @host_key_check  = nil if @host_key_check == UNSET_VALUE
+    @machine_alias   = nil if @machine_alias == UNSET_VALUE
+    @machine_name    = nil if @machine_name == UNSET_VALUE
     @modulepath      = nil if @modulepath == UNSET_VALUE
     @port            = nil if @port == UNSET_VALUE
     @password        = nil if @password == UNSET_VALUE
@@ -146,6 +158,8 @@ class VagrantBolt::Config::Global < Vagrant.plugin('2', :config)
 
       if group_objects.include?(key)
         config[key] = value
+      elsif %r{machine_\w+}.match?(key)
+        config[key.sub('machine_', '')] = value
       else
         setting_map.each do |transport, settings|
           next unless settings.include?(key)

data/lib/vagrant-bolt/config_builder/config.rb

@@ -28,6 +28,14 @@ class VagrantBolt::ConfigBuilder::Config < ConfigBuilder::Model::Base
   # @return [Boolean] If the connection should check the host key on the remote host (linux)
   def_model_attribute :host_key_check
 
+  # @!attribute [rw] machine_alias
+  # @return [String] The alias of the machine to set in the bolt inventory
+  def_model_attribute :machine_alias
+
+  # @!attribute [rw] machine_name
+  # @return [String] The name of the machine to set in the bolt inventory
+  def_model_attribute :machine_name
+
   # @!attribute [rw] modulepath
   # @return [String] The path to the modules.
   def_model_attribute :modulepath
@@ -142,6 +150,8 @@ class VagrantBolt::ConfigBuilder::Config < ConfigBuilder::Model::Base
       with_attr(:debug)           { |val| bolt.debug           = val }
       with_attr(:connect_timeout) { |val| bolt.connect_timeout = val }
       with_attr(:host_key_check)  { |val| bolt.host_key_check  = val }
+      with_attr(:machine_alias)   { |val| bolt.machine_alias   = val }
+      with_attr(:machine_name)    { |val| bolt.machine_name    = val }
       with_attr(:modulepath)      { |val| bolt.modulepath      = val }
       with_attr(:name)            { |val| bolt.name            = val }
       with_attr(:nodes)           { |val| bolt.nodes           = val }

data/lib/vagrant-bolt/config_builder/provisioner.rb

@@ -28,6 +28,14 @@ class VagrantBolt::ConfigBuilder::Provisioner < ConfigBuilder::Model::Provisione
   # @return [Boolean] If the connection should check the host key on the remote host (linux)
   def_model_attribute :host_key_check
 
+  # @!attribute [rw] machine_alias
+  # @return [String] The alias of the machine to set in the bolt inventory
+  def_model_attribute :machine_alias
+
+  # @!attribute [rw] machine_name
+  # @return [String] The name of the machine to set in the bolt inventory
+  def_model_attribute :machine_name
+
   # @!attribute [rw] modulepath
   # @return [String] The path to the modules.
   def_model_attribute :modulepath

data/lib/vagrant-bolt/util/bolt.rb

@@ -64,7 +64,6 @@ module VagrantBolt::Util
       ssh_info = machine.ssh_info
       return node_hash if ssh_info.nil?
 
-      node_hash['alias'] = machine.name.to_s
       machine_config = machine.config.bolt.inventory_config
       node_hash['config'] = {}
       transport = VagrantBolt::Util::Machine.windows?(machine) ? 'winrm' : 'ssh'
@@ -76,6 +75,8 @@ module VagrantBolt::Util
 
         node_hash[key] = value
       end
+      node_hash['name'] ||= machine.name.to_s
+      node_hash['alias'] = machine.name.to_s if node_hash['alias'].nil? && node_hash['name'] != machine.name.to_s
       node_hash.compact
     end
 

data/lib/vagrant-bolt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module VagrantBolt
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/spec/unit/config/bolt_spec.rb

@@ -101,6 +101,8 @@ describe VagrantBolt::Config::Bolt do
       "verbose",
       "debug",
       "host_key_check",
+      "machine_alias",
+      "machine_name",
       "modulepath",
       "bolt_exe",
       "boltdir",

data/spec/unit/util/bolt_spec.rb

@@ -26,7 +26,6 @@ describe VagrantBolt::Util::Bolt do
     end
     let(:machine_hash) do
       {
-        "alias" => "machine",
         "config" => {
           "ssh" => {
             "connect-timeout" => "30",
@@ -41,6 +40,8 @@ describe VagrantBolt::Util::Bolt do
         },
         "uri" => "ssh://machine:22",
         "facts" => { 'a' => 'b' },
+        "alias" => 'machine',
+        "name" => 'somename',
         "vars" => { 'foo' => 'bar' },
         "features" => ['foo'],
       }
@@ -64,6 +65,7 @@ describe VagrantBolt::Util::Bolt do
       config.facts = { 'a' => 'b' }
       config.features = ['foo']
       config.vars = { 'foo' => 'bar' }
+      config.machine_name = 'somename'
       config.finalize!
       allow(machine).to receive_message_chain("config.bolt.inventory_config").and_return(config.inventory_config)
       allow(machine).to receive_message_chain("config.vm.communicator").and_return(:ssh)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-bolt
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Jarret Lavallee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-23 00:00:00.000000000 Z
+date: 2020-06-02 00:00:00.000000000 Z
 dependencies: []
 description: "  Vagrant provisioning with Puppet Bolt\n"
 email: