vagrant-bolt 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac8831c37dc6fd0c0e551015f54ba1cb85e0c0ef6d264d5767429e84d7ad2a45
-  data.tar.gz: 63ee832a3448361a91433d54d89484f1a3916f349bac2313602e478b1e4840f3
+  metadata.gz: 990a16a93781adb1b28be300b0ea508f803ff3c0bc9be52116248e32de342b37
+  data.tar.gz: 7040a8261b3361000aa348c33655ef305450d143a0242258ba8e43a02038e027
 SHA512:
-  metadata.gz: d12d5842671a0c5d49991d96d00ec6ff1e4242b22b64a49e5634ec341bb6168e96d7fcd56193d622301748eeb1a7039d4cbf79bfc45751cb80d4e9fa394c63bf
-  data.tar.gz: b85ae2521973b7c65c3be2aa0539ea78a6a6baf5728dd43eb4573ac5d77d9d9aaee0a491ba4d5326ef828a61f90890b954c87d8accec5ab12c181ad73db788e0
+  metadata.gz: 4e69a5dc28b0091ade803b1f2e8fa350b9684b4ef55ebfa7d52b3a02fd8bbabafacff0a54bf9522cdd71a0c65d30de4ec596fbc0c4044c57545e16a1b72e494d
+  data.tar.gz: 5ba5d41497a76f67ae8092edf8928e584331813d9103852193008fdd40456b03b23999e05ae03e1a18d7e4cf35417f87a1f6cafd2b498ed872c973b5f36f9d28

data/CHANGELOG.md

@@ -1,7 +1,15 @@
 # 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)
+## [v0.1.2](https://github.com/oscar-stack/vagrant-bolt/tree/v0.1.2) (2019-10-17)
+[Full Changelog](https://github.com/oscar-stack/vagrant-bolt/compare/v0.1.1...v0.1.2)
+
+**Merged pull requests:**
+
+- Fix the bolt path issue and create a release [\#11](https://github.com/oscar-stack/vagrant-bolt/pull/11) ([jarretlavallee](https://github.com/jarretlavallee))
+- Fix changelog version tag [\#10](https://github.com/oscar-stack/vagrant-bolt/pull/10) ([jarretlavallee](https://github.com/jarretlavallee))
+
+## [v0.1.1](https://github.com/oscar-stack/vagrant-bolt/tree/v0.1.1) (2019-07-01)
+[Full Changelog](https://github.com/oscar-stack/vagrant-bolt/compare/v0.1.0...v0.1.1)
 
 **Merged pull requests:**
 

data/README.md

@@ -194,7 +194,7 @@ VagrantBolt.task(
   env,
   machine,
   run_as: 'root',
-  bolt_exe: '/usr/local/bin/bolt',
+  bolt_exe: '/opt/puppetlabs/bin/bolt',
   params: { name: "cron", action: "restart" },
 )
 ~~~
@@ -216,7 +216,7 @@ The settings available in the triggers and the provisioner are the same.
 
 * `bolt_exe`
   * Description: A string containing the full path to the bolt executable
-  * Default: `bolt`
+  * Default: `/opt/puppetlabs/bin/bolt` if it exists, else the first `bolt` in the PATH
 * `boltdir`
   * Description: A string containing the bolt working directory
   * Default: The vagrant root

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

@@ -100,7 +100,7 @@ class VagrantBolt::Config::Global < Vagrant.plugin('2', :config)
   end
 
   def finalize!
-    @bolt_exe        = 'bolt' if @bolt_exe == UNSET_VALUE
+    @bolt_exe        = bolt_exe_path 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
@@ -121,6 +121,15 @@ class VagrantBolt::Config::Global < Vagrant.plugin('2', :config)
     @vars            = nil if @vars == UNSET_VALUE
   end
 
+  # Get the full path to the bolt executable
+  # @return [String] The path to the bolt exe
+  def bolt_exe_path
+    unless Vagrant::Util::Platform.windows?
+      return '/opt/puppetlabs/bin/bolt' if File.file?('/opt/puppetlabs/bin/bolt')
+    end
+    Vagrant::Util::Which.which('bolt') || 'bolt'
+  end
+
   def validate(_machine)
     errors = _detected_errors
 

data/lib/vagrant-bolt/version.rb

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

data/spec/unit/config/global_spec.rb

@@ -20,8 +20,12 @@ describe VagrantBolt::Config::Global do
   end
 
   context "defaults" do
+    before(:each) do
+      allow(File).to receive(:file?).with('/opt/puppetlabs/bin/bolt').and_return(true)
+    end
+
     expected_values = {
-      bolt_exe: "bolt",
+      bolt_exe: "/opt/puppetlabs/bin/bolt",
       boltdir: ".",
     }
     expected_values.each do |val, expected|

data/tasks/changelog.rake

@@ -4,5 +4,5 @@ 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
+  config.future_release = "v#{VagrantBolt::VERSION}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-bolt
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jarret Lavallee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-01 00:00:00.000000000 Z
+date: 2019-10-17 00:00:00.000000000 Z
 dependencies: []
 description: "  Vagrant provisioning with Puppet Bolt\n"
 email: