kitchen-puppet 1.43.1 → 1.44.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e913481016895e945afb71d289cfdb28f659572f
-  data.tar.gz: 0cd76403d1c5e7ab4c6e83954679e99400a5f3f1
+  metadata.gz: 6314cc10492c63f794d66098afb52e4fe9c9ac7e
+  data.tar.gz: 2b5dd23b20c8d1b403330429ebde2e865de3ce93
 SHA512:
-  metadata.gz: e962188077f822eabd2d14aaadcc8ffbb217009a1e024bc87efba2d90904a2be8bf99624259f407464d48adeb9e3adc2e7369c57beff5f001a0fb95b185cf293
-  data.tar.gz: 676923046eb3466948e53bc3104340261155c370f8e21368ed857680a73a83e50c0945911c516e7c55a041520423f100575902edd0795991d6a147201fc8a9ec
+  metadata.gz: 4b0f1ebdad959babb9a7faa930e6a49b9ee4c0488db4f13eaf7d0070ff8ee6ff8dcdfb7277f03abfbec1df359bedc21103ca730ab01e9b76c82eb593a021bdc7
+  data.tar.gz: 76775062140c2b890dbc1237d4db8e5daa737c93597c6a777e9dd12a8f4c959e42bb5236ef66bf31238c422277117a387bb27438f27ffee16ce26dd746da1ca1

data/lib/kitchen-puppet/version.rb

@@ -2,6 +2,6 @@
 
 module Kitchen
   module Puppet
-    VERSION = '1.43.1'.freeze
+    VERSION = '1.44.0'.freeze
   end
 end

data/lib/kitchen/provisioner/puppet_apply.rb

@@ -637,12 +637,19 @@ module Kitchen
             puppet_logdest_flag,
             puppet_whitelist_exit_code
           ].join(' ')
-          if config[:custom_pre_apply_command]
-            result = <<-RUN
-              #{config[:custom_pre_apply_command]}
-              #{result}
-            RUN
+          if config[:custom_post_apply_command]
+            custom_post_apply_trap = <<-TRAP
+              function custom_post_apply_command {
+                #{config[:custom_post_apply_command]}
+              }
+              trap custom_post_apply_command EXIT
+            TRAP
           end
+          result = <<-RUN
+            #{config[:custom_pre_apply_command]}
+            #{custom_post_apply_trap}
+            #{result}
+          RUN
           info("Going to invoke puppet apply with: #{result}")
           result
         end

data/provisioner_options.md

@@ -30,9 +30,10 @@ key | default value | Notes
 chef_bootstrap_url |"https://www.getchef.com/chef/install.sh"| the chef (needed for busser to run tests) NOTE: kitchen 1.4 only requires ruby to run busser so this is not required.
 custom_facts| Hash.new | Hash to set the puppet facts before running puppet apply
 custom_options | | custom options to add to puppet apply command.
+custom_pre_install_command | nil | Custom shell command to be used at beginning of install stage. Can be multiline.
 custom_install_command | nil | Custom shell command to be used at end of install stage. Can be multiline. See examples below.
 custom_pre_apply_command | nil | Custom shell command to be used before the puppet apply stage. Can be multiline. See examples below.
-custom_pre_install_command | nil | Custom shell command to be used at beginning of install stage. Can be multiline.
+custom_post_apply_command | nil | Custom shell command to be used after the puppet apply stage. Can be multiline. See examples below.
 facter_file | nil | yaml file of custom facter_files to be provided to the puppet-apply command
 facter_version | "latest"| desired version, affects apt installs.
 files_path | | directory to place at /tmp/kitchen/files

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-puppet
 version: !ruby/object:Gem::Version
-  version: 1.43.1
+  version: 1.44.0
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-28 00:00:00.000000000 Z
+date: 2016-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen