kitchen-puppet 3.4.0 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df14da642855ea0a839df2f8ad0cdc4792f8c2b9
-  data.tar.gz: aa9ae40146325dbbcd971fa3386d2ee2254964e1
+  metadata.gz: 139b2174dec96faca4984ddd13423117d5ffd3b7
+  data.tar.gz: 1d5ee53ff7254ff378d7c860bb7025da2915e019
 SHA512:
-  metadata.gz: 84b81095921b8eb7468aff290085afb48be1b7f58d3f752934ede4d6d3f933717b9ef4dc96ba08c0839b05f1eb3595664b4728d4bc3a5ff6ac24402d1c9fbf74
-  data.tar.gz: a03e2f07fc71aab142738ccba3d90f7eab350be33a474a95b3d98ab6fc624a280a0ef8684eb559a5a843dbbe748c8197f2968aa506ba986c19304535769fe866
+  metadata.gz: acd7448be488e478c7c2a71242303b06b1f0ca092cefa30dd9fbf68447e3b1d493e4cd1f091196e1979ab7adbb863e18c9860125516a8e4cb81e7b1376bcd25f
+  data.tar.gz: 46e0026cdb6a70ca6b54a16a93e3fb701c0e6dc5d26cde6f10f63eff3473e61ee58bede22081ca5c781ecd28cfa22c27eb5a4abac4de5fd733fb4973503329f5

data/lib/kitchen-puppet/version.rb

@@ -2,6 +2,6 @@
 
 module Kitchen
   module Puppet
-    VERSION = '3.4.0'.freeze
+    VERSION = '3.4.1'.freeze
   end
 end

data/lib/kitchen/provisioner/puppet/librarian.rb

@@ -19,6 +19,7 @@
 
 require 'kitchen/errors'
 require 'kitchen/logging'
+require 'librarian/ui'
 
 module Kitchen
   module Provisioner
@@ -29,6 +30,34 @@ module Kitchen
       class Librarian
         include Logging
 
+        class LoggerUI < ::Librarian::UI
+          attr_writer :logger
+
+          def initialize(logger)
+            @logger = logger
+          end
+
+          def warn(message = nil)
+            @logger.warn(message || yield)
+          end
+
+          def debug(message = nil)
+            @logger.debug(message || yield)
+          end
+
+          def error(message = nil)
+            @logger.error(message || yield)
+          end
+
+          def info(message = nil)
+            @logger.info(message || yield)
+          end
+
+          def confirm(message = nil)
+            @logger.info(message || yield)
+          end
+        end
+
         def initialize(puppetfile, path, logger = Kitchen.logger)
           @puppetfile = puppetfile
           @path = path
@@ -47,6 +76,7 @@ module Kitchen
           env = ::Librarian::Puppet::Environment.new(
             project_path: File.expand_path(File.dirname(puppetfile))
           )
+          env.ui = LoggerUI.new(@logger)
 
           env.config_db.local['path'] = path
           ::Librarian::Action::Resolve.new(env).run

data/lib/kitchen/provisioner/puppet_apply.rb

@@ -95,6 +95,7 @@ module Kitchen
       default_config :ignored_paths_from_root, ['spec']
       default_config :hiera_data_remote_path, nil
       default_config :manifest, ''
+      default_config :puppet_binary, 'puppet'
 
       default_config :manifests_path do |provisioner|
         provisioner.calculate_path('manifests') ||
@@ -915,7 +916,7 @@ module Kitchen
       def puppet_cmd
         return '& "C:\Program Files\Puppet Labs\Puppet\bin\puppet"' if powershell?
 
-        puppet_bin = config[:require_puppet_collections] ? "#{config[:puppet_coll_remote_path]}/bin/puppet" : 'puppet'
+        puppet_bin = config[:require_puppet_collections] ? "#{config[:puppet_coll_remote_path]}/bin/puppet" : config[:puppet_binary]
 
         if config[:puppet_no_sudo]
           puppet_bin

data/provisioner_options.md

@@ -75,6 +75,7 @@ puppet_apt_collections_repo | http://apt.puppetlabs.com/ puppet5-release-wheezy.
 _for Ubuntu14 change to_ |      http://apt.puppetlabs.com/ puppet5-release-trusty.deb |
 _for Ubuntu15 change to_ | http://apt.puppetlabs.com/ puppet5-release-jessie.deb |
 _for Ubuntu16.04 change to_ |   http://apt.puppetlabs.com/ puppet5-release-xenial.deb |
+puppet_binary | 'puppet' | puppet default binary
 puppet_coll_remote_path | "/opt/puppetlabs" | Server Installation location of a puppet collections install.
 puppet_config_path | | path of custom puppet.conf file
 puppet_debug| false| Enable full debugging logging on puppet run

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-puppet
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.1
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-12 00:00:00.000000000 Z
+date: 2018-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh