kitchen-puppet 3.1.4 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a470760d6bcccb5f146c2a0d24d06467ad526144
-  data.tar.gz: 1b57a1ca243cd8706a992ec3c513ca7407f6a640
+  metadata.gz: a066a8ea421e32bbec8636de2f3d5c43f04a8f6e
+  data.tar.gz: bd2853a80ff37ca0fe4962c03673b2977fb78717
 SHA512:
-  metadata.gz: bef6ae28d59b2d6921ab36718d629f82b00e11dfc9793372f0eb7003446733289626f9f12a0382138a91abf1f447edb16727da34208960809f8ec8a87d8675fe
-  data.tar.gz: 91275834a49dfe7777faabd17b6ed0c5894baec9ead78b0e169db2fb2f437f022e03b286143416a285f3fbecf33cd522ddfacb552f880186c5e4f1cf43e800fd
+  metadata.gz: 7bbaf3e572fdd6a7e4229b5af9c1931a08955ec4c25b5e2300218b9e87028d4f7f0cdf09c914a0c0fefdd06afd9f97a79f1c73855f22dd3f6aae24700db0ad6f
+  data.tar.gz: a5f9977be5a4ea2541bd89c63ec49e9ce73aa765c6180a7f19aec0ffd5e8d3cecf237fa0435e93cf385dc6e2b2912e870b55680e6de61fc4a9bedf889817b014

data/kitchen-puppet.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
   s.rubyforge_project = '[none]'
   s.required_ruby_version = '>= 2.0'
-  s.add_dependency 'test-kitchen', '~> 1.4'
   s.add_dependency 'net-ssh', '>= 3'
+  s.add_dependency 'test-kitchen', '~> 1.4'
   s.description = <<-TEXT
   == DESCRIPTION:
 

data/lib/kitchen-puppet/version.rb

@@ -2,6 +2,6 @@
 
 module Kitchen
   module Puppet
-    VERSION = '3.1.4'.freeze
+    VERSION = '3.2.0'.freeze
   end
 end

data/lib/kitchen/provisioner/puppet_agent.rb

@@ -59,6 +59,7 @@ module Kitchen
       default_config :http_proxy, nil
       default_config :https_proxy, nil
       default_config :no_proxy, nil
+      default_config :puppet_whitelist_exit_code, nil
 
       default_config :puppet_config_path do |provisioner|
         provisioner.calculate_path('puppet.conf', :file)
@@ -240,7 +241,8 @@ module Kitchen
           puppet_noop_flag,
           puppet_environment_flag,
           puppet_verbose_flag,
-          puppet_debug_flag
+          puppet_debug_flag,
+          puppet_whitelist_exit_code
         ].compact.join(' ')
       end
 
@@ -396,6 +398,20 @@ module Kitchen
         config[:no_proxy]
       end
 
+      def powershell?
+        powershell_shell? || !(puppet_platform =~ /^windows.*/).nil?
+      end
+
+      def puppet_whitelist_exit_code
+        if config[:puppet_whitelist_exit_code].nil?
+          powershell? ? '; exit $LASTEXITCODE' : nil
+        elsif powershell?
+          "; if(@(#{[config[:puppet_whitelist_exit_code]].join(', ')}) -contains $LASTEXITCODE) {exit 0} else {exit $LASTEXITCODE}"
+        else
+          '; RC=$?; [ ' + [config[:puppet_whitelist_exit_code]].flatten.map { |x| "\$RC -eq #{x}" }.join(' -o ') + ' ] && exit 0; exit $RC'
+        end
+      end
+
       def chef_url
         config[:chef_bootstrap_url]
       end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-puppet
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.2.0
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-29 00:00:00.000000000 Z
+date: 2017-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: test-kitchen
+  name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: net-ssh
+  name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '1.4'
 description: |2+
     == DESCRIPTION: