vagrant-bolt 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5fba8cd90a1ba29c44dd28d5a1d7d6de8c8276a742386b1f24eacc900e638fc
-  data.tar.gz: 75713e7c5c1f6b1c5e8338ec9a9012188258224c049b22ea8c929fffa15772bd
+  metadata.gz: ac8831c37dc6fd0c0e551015f54ba1cb85e0c0ef6d264d5767429e84d7ad2a45
+  data.tar.gz: 63ee832a3448361a91433d54d89484f1a3916f349bac2313602e478b1e4840f3
 SHA512:
-  metadata.gz: 469933d26046b905881486ad771febef1310b6a99dc3911df6075ea28b1a62e8e262bb2202c327b837e195b0977548afee47d73b3b63651f760c806ad37badc0
-  data.tar.gz: 0bb43ca82eef7a6aac4a5cbabec09130f9d8d81d19aa3155db7154fbf24174c7bf9c8a18494e162646d9e747c7ecd64ddb7b5fb4e7cd5246a6fdd8fd3d19e30b
+  metadata.gz: d12d5842671a0c5d49991d96d00ec6ff1e4242b22b64a49e5634ec341bb6168e96d7fcd56193d622301748eeb1a7039d4cbf79bfc45751cb80d4e9fa394c63bf
+  data.tar.gz: b85ae2521973b7c65c3be2aa0539ea78a6a6baf5728dd43eb4573ac5d77d9d9aaee0a491ba4d5326ef828a61f90890b954c87d8accec5ab12c181ad73db788e0

data/.gitignore

@@ -12,4 +12,6 @@ Gemfile.local
 *.bak
 .vagrant
 /modules
+/site-modules
 *.box
+*.rerun.json

data/CHANGELOG.md

@@ -0,0 +1,24 @@
+# Change Log
+
+## [0.1.1](https://github.com/oscar-stack/vagrant-bolt/tree/0.1.1) (2019-07-01)
+[Full Changelog](https://github.com/oscar-stack/vagrant-bolt/compare/v0.1.0...0.1.1)
+
+**Merged pull requests:**
+
+- Add changelog generation [\#9](https://github.com/oscar-stack/vagrant-bolt/pull/9) ([jarretlavallee](https://github.com/jarretlavallee))
+- Clean up command line arguments and paths [\#8](https://github.com/oscar-stack/vagrant-bolt/pull/8) ([jarretlavallee](https://github.com/jarretlavallee))
+- Add connect\_timeout option to inventory [\#7](https://github.com/oscar-stack/vagrant-bolt/pull/7) ([jarretlavallee](https://github.com/jarretlavallee))
+
+## [v0.1.0](https://github.com/oscar-stack/vagrant-bolt/tree/v0.1.0) (2018-12-11)
+**Merged pull requests:**
+
+- \(SUP-874\) Add a command line interface [\#6](https://github.com/oscar-stack/vagrant-bolt/pull/6) ([jarretlavallee](https://github.com/jarretlavallee))
+- Add Support for config\_builder bolt triggers [\#5](https://github.com/oscar-stack/vagrant-bolt/pull/5) ([jarretlavallee](https://github.com/jarretlavallee))
+- Add Config Options and cleanup some bad code [\#4](https://github.com/oscar-stack/vagrant-bolt/pull/4) ([jarretlavallee](https://github.com/jarretlavallee))
+- Consolidate files and add some spec tests [\#3](https://github.com/oscar-stack/vagrant-bolt/pull/3) ([jarretlavallee](https://github.com/jarretlavallee))
+- Add the ability to use triggers and provisioners [\#2](https://github.com/oscar-stack/vagrant-bolt/pull/2) ([jarretlavallee](https://github.com/jarretlavallee))
+- Initial Implementation [\#1](https://github.com/oscar-stack/vagrant-bolt/pull/1) ([jarretlavallee](https://github.com/jarretlavallee))
+
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/Gemfile

@@ -15,6 +15,7 @@ group :development do
   gem 'rubocop'
   gem 'rubocop-rspec'
   gem 'yard', '~> 0.9.16'
+  gem 'github_changelog_generator'
 end
 
 group :test do

data/Puppetfile

@@ -2,6 +2,4 @@
 
 forge "http://forge.puppetlabs.com"
 
-moduledir File.join(File.dirname(__FILE__), 'modules')
-
 mod 'puppetlabs-facts', '0.3.1'

data/README.md

@@ -166,7 +166,7 @@ The methods for a bolt command in a trigger allow for a task, plan, or command.
     * Required: `machine` The machine object
     * Optional: `**args` A hash of [Plugin Settings](#plugin-settings) which override any previous config
 
-Example of the arguments can be seen below. 
+An example of the arguments can be seen below.
 
 Run the `facts` task using a specific user and password.
 
@@ -248,6 +248,8 @@ The settings available in the triggers and the provisioner are the same.
   * Default: The port that vagrant uses to connect to the machine
 * `sudo_password`
   * Description: A string containing the password bolt will use to escalate privileges on the machine
+* `connect_timeout`
+  * Description: A string which controls if the connection timeout for ssh (linux)
 * `host_key_check`
   * Description: A boolean which controls if the connection should check the host key on the remote host (linux)
   * Default: `false`
@@ -260,7 +262,6 @@ The settings available in the triggers and the provisioner are the same.
   * Description: A boolean which controls if the connection should verify SSL on with WinRM (Windows)
 * `modulepath`
   * Description: A string containing the path to bolt modules
-  * Default: `modules` in the vagrant root
 * `tmpdir`
   * Description: A string containing the directory to upload and execute temporary files on the target
 * `verbose`
@@ -311,10 +312,10 @@ vms:
 
 ### Trigger Configuration
 
-Bolt triggers cab be configured at the root or within a VM object. To configure a bolt trigger a few additional params are required. 
+Bolt triggers cab be configured at the root or within a VM object. To configure a bolt trigger a few additional params are required.
 
 * `trigger_type`
-  * Description: A symbol of the trigger type. 
+  * Description: A symbol of the trigger type.
   * Valid Values: `:before` or `:after`
 * `trigger_commands`
   * Description: An array of symbols for the commands to run the trigger on
@@ -366,7 +367,7 @@ Options:
     -u, --[no-]updateinventory       Update the inventory file (defaults to false)
 ~~~
 
-The command can be used to deploy the Puppetfile, for example. 
+The command can be used to deploy the Puppetfile, for example.
 
 ~~~shell
 vagrant bolt puppetfile install
@@ -380,7 +381,7 @@ vagrant bolt -u task run facts -n server
 
 The `--updateinventory` flag will regenerate the inventory file from the active running machines, however it defaults to being off. In the example above, the inventory file will be updated prior to running the task.
 
-All arguments except for the `-u` will be passed to bolt, so a bolt command like the exaple below can be run. 
+All arguments except for the `-u` will be passed to bolt, so a bolt command like the example below can be run.
 
 ~~~shell
 vagrant bolt command run 'date' -n agent,master
@@ -389,7 +390,7 @@ vagrant bolt command run 'date' -n agent,master
 Other Use Cases
 ---------------
 
-There are some other use cases for Vagrant Bolt. One of which is to not use the triggers or provisioning to run bolt commands on the nodes, but to manage the inventory file for manual testing. This can easily be accomplished by using a trigger to manage the `inventory.yaml` file and specifying the configuration for the nodes in the config based on the options above. Below is an example trigger that will manage a `./inventory.yaml` file for use with external bolt commands. 
+There are some other use cases for Vagrant Bolt. One of which is to not use the triggers or provisioning to run bolt commands on the nodes, but to manage the inventory file for manual testing. This can easily be accomplished by using a trigger to manage the `inventory.yaml` file and specifying the configuration for the nodes in the config based on the options above. Below is an example trigger that will manage a `./inventory.yaml` file for use with external bolt commands.
 
 ~~~ruby
 require 'vagrant-bolt'
@@ -422,10 +423,10 @@ Requirements
 ------------
 
 * Vagrant 2.2.0+ is required for this plugin.
-* Bolt 1.5+ needs to be installed on the platform machine and accessible on the path. Use the `bolt_exe` config parameter if it is not on the path.
+* Bolt 1.10+ needs to be installed on the platform machine and accessible on the path. Use the `bolt_exe` config parameter if it is not on the path.
 * Ruby 2.3+
 
 Known Issues
 ------------
 
-* Machine names with hyphens in them are not valid in bolt 1.5.0. This is because of <https://tickets.puppetlabs.com/browse/BOLT-1022>.
+* Machine names with hyphens in them are not valid until bolt 1.10.0. Please upgrade to Bolt 1.10.0+ to use hyphens in the machine names.

data/lib/vagrant-bolt/command.rb

@@ -42,20 +42,17 @@ class VagrantBolt::Command < Vagrant.plugin('2', :command)
     execute_bolt_command(bolt_args)
   end
 
-  # Run a bolt command with the inventory path, module path, and boltdir
+  # Run a bolt command with the inventory path, and boltdir
   # @param args [Array<String>] An array containing the bolt arguments
   def execute_bolt_command(args)
     bolt_exe = @env.vagrantfile.config.bolt.bolt_exe
-    modulepath = VagrantBolt::Util::Config.full_path(@env.vagrantfile.config.bolt.modulepath, @env.root_path)
-    boltdir = VagrantBolt::Util::Config.full_path(@env.vagrantfile.config.bolt.boltdir, @env.root_path)
+    boltdir = VagrantBolt::Util::Config.relative_path(@env.vagrantfile.config.bolt.boltdir, @env.root_path)
     inventoryfile = VagrantBolt::Util::Bolt.inventory_file(@env)
 
     quoted_args = args.flatten.compact.map { |a| "'#{a}'" }
     command = [
       "\'#{bolt_exe}\'",
       quoted_args,
-      '--modulepath',
-      "\'#{modulepath}\'",
       '--boltdir',
       "\'#{boltdir}\'",
     ]

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

@@ -9,12 +9,16 @@ class VagrantBolt::Config::Global < Vagrant.plugin('2', :config)
   # @return [String] The bolt working directory. Defaults to `.`
   attr_accessor :boltdir
 
+  # @!attribute [rw] host_key_check
+  # @return [String] If the connection should check the host key on the remote host (linux)
+  attr_accessor :connect_timeout
+
   # @!attribute [rw] host_key_check
   # @return [Boolean] If the connection should check the host key on the remote host (linux)
   attr_accessor :host_key_check
 
   # @!attribute [rw] modulepath
-  # @return [String] The path to the modules. Defaults to `modules`.
+  # @return [String] The path to the modules.
   attr_accessor :modulepath
 
   # @!attribute [rw] user
@@ -74,45 +78,47 @@ class VagrantBolt::Config::Global < Vagrant.plugin('2', :config)
   attr_accessor :features
 
   def initialize
-    @bolt_exe       = UNSET_VALUE
-    @boltdir        = UNSET_VALUE
-    @host_key_check = UNSET_VALUE
-    @modulepath     = UNSET_VALUE
-    @password       = UNSET_VALUE
-    @port           = UNSET_VALUE
-    @private_key    = UNSET_VALUE
-    @run_as         = UNSET_VALUE
-    @ssl            = UNSET_VALUE
-    @ssl_verify     = UNSET_VALUE
-    @sudo_password  = UNSET_VALUE
-    @tmpdir         = UNSET_VALUE
-    @user           = UNSET_VALUE
-    @verbose        = UNSET_VALUE
-    @debug          = UNSET_VALUE
-    @facts          = UNSET_VALUE
-    @vars           = UNSET_VALUE
-    @features       = UNSET_VALUE
+    @bolt_exe        = UNSET_VALUE
+    @boltdir         = UNSET_VALUE
+    @connect_timeout = UNSET_VALUE
+    @host_key_check  = UNSET_VALUE
+    @modulepath      = UNSET_VALUE
+    @password        = UNSET_VALUE
+    @port            = UNSET_VALUE
+    @private_key     = UNSET_VALUE
+    @run_as          = UNSET_VALUE
+    @ssl             = UNSET_VALUE
+    @ssl_verify      = UNSET_VALUE
+    @sudo_password   = UNSET_VALUE
+    @tmpdir          = UNSET_VALUE
+    @user            = UNSET_VALUE
+    @verbose         = UNSET_VALUE
+    @debug           = UNSET_VALUE
+    @facts           = UNSET_VALUE
+    @vars            = UNSET_VALUE
+    @features        = UNSET_VALUE
   end
 
   def finalize!
-    @bolt_exe       = 'bolt' if @bolt_exe == UNSET_VALUE
-    @boltdir        = '.' if @boltdir == UNSET_VALUE
-    @host_key_check = nil if @host_key_check == UNSET_VALUE
-    @modulepath     = 'modules' 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
-    @facts          = nil if @facts == UNSET_VALUE
-    @features       = nil if @features == UNSET_VALUE
-    @vars           = nil if @vars == UNSET_VALUE
+    @bolt_exe        = 'bolt' if @bolt_exe == UNSET_VALUE
+    @boltdir         = '.' if @boltdir == UNSET_VALUE
+    @connect_timeout = nil if @connect_timeout == 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
+    @facts           = nil if @facts == UNSET_VALUE
+    @features        = nil if @features == UNSET_VALUE
+    @vars            = nil if @vars == UNSET_VALUE
   end
 
   def validate(_machine)
@@ -127,7 +133,7 @@ class VagrantBolt::Config::Global < Vagrant.plugin('2', :config)
     group_objects = ['facts', 'features', 'vars']
     config = {}
     instance_variables_hash.each do |key, value|
-      next if value.nil?
+      next if value.nil? || (value == UNSET_VALUE)
 
       if group_objects.include?(key)
         config[key] = value
@@ -154,6 +160,7 @@ class VagrantBolt::Config::Global < Vagrant.plugin('2', :config)
         'run_as',
         'port',
         'private_key',
+        'connect_timeout',
         'host_key_check',
         'sudo_password',
         'tmpdir',

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

@@ -20,12 +20,16 @@ class VagrantBolt::ConfigBuilder::Config < ConfigBuilder::Model::Base
   # @return [Boolean] Shows debug logging
   def_model_attribute :debug
 
+  # @!attribute [rw] connect_timeout
+  # @return [String] The timeout for the ssh connection (linux)
+  def_model_attribute :connect_timeout
+
   # @!attribute [rw] host_key_check
   # @return [Boolean] If the connection should check the host key on the remote host (linux)
   def_model_attribute :host_key_check
 
   # @!attribute [rw] modulepath
-  # @return [String] The path to the modules. Defaults to `modules`.
+  # @return [String] The path to the modules.
   def_model_attribute :modulepath
 
   # @!attribute [rw] name
@@ -118,32 +122,33 @@ class VagrantBolt::ConfigBuilder::Config < ConfigBuilder::Model::Base
   def to_proc
     proc do |config|
       bolt = config.bolt
-      with_attr(:args)           { |val| bolt.args           = val }
-      with_attr(:bolt_exe)       { |val| bolt.bolt_exe       = val }
-      with_attr(:command)        { |val| bolt.command        = val }
-      with_attr(:boltdir)        { |val| bolt.boltdir        = val }
-      with_attr(:debug)          { |val| bolt.debug          = val }
-      with_attr(:host_key_check) { |val| bolt.host_key_check = val }
-      with_attr(:modulepath)     { |val| bolt.modulepath     = val }
-      with_attr(:name)           { |val| bolt.name           = val }
-      with_attr(:nodes)          { |val| bolt.nodes          = val }
-      with_attr(:noop)           { |val| bolt.noop           = val }
-      with_attr(:excludes)       { |val| bolt.excludes       = val }
-      with_attr(:node_list)      { |val| bolt.node_list      = val }
-      with_attr(:params)         { |val| bolt.params         = val }
-      with_attr(:user)           { |val| bolt.user           = val }
-      with_attr(:password)       { |val| bolt.password       = val }
-      with_attr(:port)           { |val| bolt.port           = val }
-      with_attr(:private_key)    { |val| bolt.private_key    = val }
-      with_attr(:run_as)         { |val| bolt.run_as         = val }
-      with_attr(:sudo_password)  { |val| bolt.sudo_password  = val }
-      with_attr(:ssl)            { |val| bolt.ssl            = val }
-      with_attr(:ssl_verify)     { |val| bolt.ssl_verify     = val }
-      with_attr(:tmpdir)         { |val| bolt.tmpdir         = val }
-      with_attr(:verbose)        { |val| bolt.verbose        = val }
-      with_attr(:facts)          { |val| bolt.facts          = val }
-      with_attr(:features)       { |val| bolt.features       = val }
-      with_attr(:vars)           { |val| bolt.vars           = val }
+      with_attr(:args)            { |val| bolt.args            = val }
+      with_attr(:bolt_exe)        { |val| bolt.bolt_exe        = val }
+      with_attr(:command)         { |val| bolt.command         = val }
+      with_attr(:boltdir)         { |val| bolt.boltdir         = val }
+      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(:modulepath)      { |val| bolt.modulepath      = val }
+      with_attr(:name)            { |val| bolt.name            = val }
+      with_attr(:nodes)           { |val| bolt.nodes           = val }
+      with_attr(:noop)            { |val| bolt.noop            = val }
+      with_attr(:excludes)        { |val| bolt.excludes        = val }
+      with_attr(:node_list)       { |val| bolt.node_list       = val }
+      with_attr(:params)          { |val| bolt.params          = val }
+      with_attr(:user)            { |val| bolt.user            = val }
+      with_attr(:password)        { |val| bolt.password        = val }
+      with_attr(:port)            { |val| bolt.port            = val }
+      with_attr(:private_key)     { |val| bolt.private_key     = val }
+      with_attr(:run_as)          { |val| bolt.run_as          = val }
+      with_attr(:sudo_password)   { |val| bolt.sudo_password   = val }
+      with_attr(:ssl)             { |val| bolt.ssl             = val }
+      with_attr(:ssl_verify)      { |val| bolt.ssl_verify      = val }
+      with_attr(:tmpdir)          { |val| bolt.tmpdir          = val }
+      with_attr(:verbose)         { |val| bolt.verbose         = val }
+      with_attr(:facts)           { |val| bolt.facts           = val }
+      with_attr(:features)        { |val| bolt.features        = val }
+      with_attr(:vars)            { |val| bolt.vars            = val }
     end
   end
   # rubocop:enable Metrics/BlockLength

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

@@ -20,12 +20,16 @@ class VagrantBolt::ConfigBuilder::Provisioner < ConfigBuilder::Model::Provisione
   # @return [Boolean] Shows debug logging
   def_model_attribute :debug
 
+  # @!attribute [rw] connect_timeout
+  # @return [String] The ssh connection timeout (linux)
+  def_model_attribute :connect_timeout
+
   # @!attribute [rw] host_key_check
   # @return [Boolean] If the connection should check the host key on the remote host (linux)
   def_model_attribute :host_key_check
 
   # @!attribute [rw] modulepath
-  # @return [String] The path to the modules. Defaults to `modules`.
+  # @return [String] The path to the modules.
   def_model_attribute :modulepath
 
   # @!attribute [rw] name

data/lib/vagrant-bolt/runner.rb

@@ -50,8 +50,8 @@ class VagrantBolt::Runner
     config.node_list ||= @machine.name.to_s unless config.excludes.include?(@machine.name.to_s)
 
     # Ensure these are absolute paths to allow for running vagrant commands outside of the root dir
-    config.modulepath = VagrantBolt::Util::Config.full_path(config.modulepath, @env.root_path)
-    config.boltdir = VagrantBolt::Util::Config.full_path(config.boltdir, @env.root_path)
+    config.modulepath = VagrantBolt::Util::Config.relative_path(config.modulepath, @env.root_path)
+    config.boltdir = VagrantBolt::Util::Config.relative_path(config.boltdir, @env.root_path)
 
     config
   end

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

@@ -108,7 +108,7 @@ module VagrantBolt::Util
     # @param env [Object] The environment
     # @return [String] The path to the inventory file
     def self.inventory_file(env)
-      File.join(env.local_data_path, 'bolt_inventory.yaml')
+      VagrantBolt::Util::Config.relative_path('bolt_inventory.yaml', env.local_data_path)
     end
 
     # Update and write the inventory file for the current running machines

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'pathname'
+
 module VagrantBolt::Util
   module Config
     # Config Utility Functions
@@ -30,14 +32,25 @@ module VagrantBolt::Util
       result
     end
 
-    # Convert a path to the absolute path of the inventory if it is relative
+    # Convert a path to the absolute path if it is relative
     # @param path [String] The path to convert
     # @param root_path [Object] The root path to append
     # @return [String] The absolute path or nil if path is nil
     def self.full_path(path, root_path)
       return path if path.nil? || root_path.nil?
 
-      %r{^/.*}.match?(path) ? path : "#{root_path}/#{path}"
+      (Pathname.new path).absolute? ? path : File.expand_path(path, root_path)
+    end
+
+    # Convert a path to the relative path from the current directory
+    # @param path [String] The path to convert
+    # @param root_path [Object] The root path to append
+    # @return [String] The relative path or nil if path is nil
+    def self.relative_path(path, root_path)
+      return path if path.nil?
+
+      absolute_path = Pathname.new full_path(path, root_path)
+      absolute_path.relative_path_from(Pathname.getwd).to_s
     end
   end
 end

data/lib/vagrant-bolt/version.rb

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

data/spec/unit/config/global_spec.rb

@@ -21,7 +21,6 @@ describe VagrantBolt::Config::Global do
 
   context "defaults" do
     expected_values = {
-      modulepath: "modules",
       bolt_exe: "bolt",
       boltdir: ".",
     }
@@ -42,12 +41,14 @@ describe VagrantBolt::Config::Global do
       "run_as",
       "ssl",
       "ssl_verify",
+      "connect_timeout",
       "host_key_check",
       "verbose",
       "debug",
       "facts",
       "vars",
       "features",
+      "modulepath",
     ]
     expected_nil.each do |val|
       it "defaults #{val} to nil" do

data/spec/unit/runner/runner_spec.rb

@@ -28,13 +28,11 @@ describe VagrantBolt::Runner do
       allow(result).to receive(:stderr).and_return("")
     end
   end
-  let(:root_path) { '/root/path' }
-  let(:local_data_path) { '/local/data/path' }
-  let(:inventory_path) { "#{local_data_path}/bolt_inventory.yaml" }
+  let(:root_path) { Dir.getwd }
+  let(:local_data_path) { "#{root_path}/.vagrant" }
+  let(:inventory_path) { ".vagrant/bolt_inventory.yaml" }
   before(:each) do
     allow(VagrantBolt::Util::Bolt).to receive(:update_inventory_file).with(iso_env).and_return(inventory_path)
-    allow(iso_env).to receive(:root_path).and_return(root_path)
-    allow(iso_env).to receive(:local_data_path).and_return(local_data_path)
     allow(machine).to receive(:env).and_return(:iso_env)
     allow(machine).to receive(:ssh_info).and_return(
       host: 'foo',
@@ -94,6 +92,8 @@ describe VagrantBolt::Runner do
     let(:options) { { notify: [:stdout, :stderr], env: { PATH: nil } } }
     before(:each) do
       allow(Vagrant::Util::Subprocess).to receive(:execute).and_return(subprocess_result)
+      allow(iso_env).to receive(:root_path).and_return(root_path)
+      allow(iso_env).to receive(:local_data_path).and_return(local_data_path)
     end
 
     it 'does not raise an exeption when all parameters are specified' do
@@ -110,11 +110,10 @@ describe VagrantBolt::Runner do
 
     it 'creates a shell execution' do
       config.bolt_exe = 'bolt'
-      config.modulepath = 'modules'
       config.boltdir = '.'
       config.node_list = 'ssh://test:22'
       config.finalize!
-      command = "bolt task run 'foo' --boltdir '#{root_path}/.' --modulepath '#{root_path}/modules' --inventoryfile '#{inventory_path}' --nodes 'ssh://test:22'"
+      command = "bolt task run 'foo' --boltdir '.' --inventoryfile '#{inventory_path}' --nodes 'ssh://test:22'"
       expect(Vagrant::Util::Subprocess).to receive(:execute).with('bash', '-c', command, options).and_return(subprocess_result)
       subject.run('task', 'foo')
     end

data/spec/unit/util/bolt_spec.rb

@@ -29,6 +29,7 @@ describe VagrantBolt::Util::Bolt do
         "alias" => "machine",
         "config" => {
           "ssh" => {
+            "connect-timeout" => "30",
             "host-key-check" => false,
             "port" => "22",
             "user" => "vagrant",
@@ -56,6 +57,7 @@ describe VagrantBolt::Util::Bolt do
       config.run_as = 'root'
       config.port = '22'
       config.private_key = 'bar'
+      config.connect_timeout = '30'
       config.host_key_check = false
       config.user = 'vagrant'
       config.facts = { 'a' => 'b' }

data/tasks/changelog.rake

@@ -0,0 +1,8 @@
+require 'github_changelog_generator/task'
+require_relative '../lib/vagrant-bolt/version'
+
+GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+  config.user ='oscar-stack'
+  config.project = 'vagrant-bolt'
+  config.future_release = VagrantBolt::VERSION
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-bolt
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jarret Lavallee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-11 00:00:00.000000000 Z
+date: 2019-07-01 00:00:00.000000000 Z
 dependencies: []
 description: "  Vagrant provisioning with Puppet Bolt\n"
 email:
@@ -22,6 +22,7 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - ".yardopts"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - Puppetfile
@@ -79,6 +80,7 @@ files:
 - spec/unit/util/config_spec.rb
 - spec/unit/vagrant_spec.rb
 - tasks/acceptance.rake
+- tasks/changelog.rake
 - tasks/spec.rake
 - templates/locales/en.yml
 - vagrant-bolt.gemspec