kitchen-puppet 1.0.37 → 1.37.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ec6e8a4314d3fd7eaaf678f211cf13069d04786
-  data.tar.gz: fb7cece3c7762cbc6d018f87cb2e96da95c49af0
+  metadata.gz: 8f163d8d8f9248b899ed3991dcf8c0cbfa7ae3b7
+  data.tar.gz: e9e2a9ecc77628dfc8edcd4fe4da92e9cb73497c
 SHA512:
-  metadata.gz: f3af7659697d626850a0af5ff1f896bc3c259f1cd344b53c14b79497711f4aa4cdc8faf38545469d619bde364f5a6fe8b0595bedbba077b8adb00045819d4e41
-  data.tar.gz: e7d93b7ae91bf5a89aa1c841c9b4e24e5bf06e027860311ef16dcf3769ceab10dcf35d43c357ef8f2e2b831946f1fb850291bbd03a36d312ea4815650368142a
+  metadata.gz: e581c8f25b15a659dd7d3bd2560279020f2410a6ff64779660bc07f3cda724d5bc6094d42bf7856d1c2f4247ee9a63a287b69c20204832f8b95e83aaa48ec400
+  data.tar.gz: 36eca3d2f51e82df641fbf4b898ceec97d6da8d46f685b389dd1700d0573572d6191a86c159a68a158df1f8d5b7860d1d274100c36ac91698542faf0e70e3976

data/kitchen-puppet.gemspec

@@ -17,7 +17,11 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
   s.rubyforge_project = '[none]'
   s.add_dependency 'test-kitchen', '~> 1.4'
-  s.add_dependency 'net-ssh', '~> 2.0'
+  if RUBY_VERSION >= '2.0'
+    s.add_dependency 'net-ssh', '~> 3.0'
+  else
+    s.add_dependency 'net-ssh', '~> 2.9'
+  end
   s.description = <<-EOF
 == DESCRIPTION:
 

data/lib/kitchen-puppet/version.rb

@@ -2,6 +2,6 @@
 
 module Kitchen
   module Puppet
-    VERSION = '1.0.37'.freeze
+    VERSION = '1.37.1'.freeze
   end
 end

data/lib/kitchen/provisioner/puppet_agent.rb

@@ -260,7 +260,11 @@ module Kitchen
       end
 
       def puppet_redhat_version
-        config[:puppet_version] ? "-#{config[:puppet_version]}" : nil
+        if puppet_platform == 'amazon'
+          config[:puppet_version]
+        else
+          config[:puppet_version] ? "-#{config[:puppet_version]}" : nil
+        end
       end
 
       def puppet_noop_flag

data/lib/kitchen/provisioner/puppet_apply.rb

@@ -63,6 +63,7 @@ module Kitchen
       default_config :chef_bootstrap_url, 'https://www.getchef.com/chef/install.sh'
       default_config :puppet_logdest, nil
       default_config :custom_install_command, nil
+      default_config :puppet_whitelist_exit_code, nil
 
       default_config :puppet_apply_command, nil
 
@@ -417,6 +418,9 @@ module Kitchen
         return if sandbox_path.nil?
         debug("Cleaning up local sandbox in #{sandbox_path}")
         FileUtils.rmtree(sandbox_path)
+        return if remove_repo.nil?
+        debug("Cleaning up remote sandbox: #{remove_repo}")
+        instance.remote_exec remove_repo
       end
 
       # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
@@ -537,7 +541,7 @@ module Kitchen
             puppet_verbose_flag,
             puppet_debug_flag,
             puppet_logdest_flag,
-            remove_repo
+            puppet_whitelist_exit_code
           ].join(' ')
           info("Going to invoke puppet apply with: #{result}")
           result
@@ -674,7 +678,11 @@ module Kitchen
       end
 
       def puppet_redhat_version
-        config[:puppet_version] ? "-#{config[:puppet_version]}" : nil
+        if puppet_platform == 'amazon'
+          config[:puppet_version]
+        else
+          config[:puppet_version] ? "-#{config[:puppet_version]}" : nil
+        end
       end
 
       def puppet_environment_flag
@@ -775,7 +783,11 @@ module Kitchen
       end
 
       def remove_repo
-        remove_puppet_repo ? "; #{sudo('rm')} -rf /tmp/kitchen #{hiera_data_remote_path} #{hiera_eyaml_key_remote_path} #{puppet_dir}/* " : nil
+        remove_puppet_repo ? "#{sudo('rm')} -rf /tmp/kitchen #{hiera_data_remote_path} #{hiera_eyaml_key_remote_path} #{puppet_dir}/* " : nil
+      end
+
+      def puppet_whitelist_exit_code
+        config[:puppet_whitelist_exit_code] ? "; [ $? -eq #{config[:puppet_whitelist_exit_code]} ] && exit 0" : nil
       end
 
       def puppet_apt_repo

data/provisioner_options.md

@@ -20,7 +20,7 @@ _for RH/Centos7 change to_ | "https://yum.puppetlabs.com/puppetlabs-release-pc1-
 puppet_apt_collections_repo | "http://apt.puppetlabs.com/puppetlabs-release-pc1-wheezy.deb" | apt collections repo
 _for Ubuntu15 change to_ | "http://apt.puppetlabs.com/puppetlabs-release-pc1-jessie.deb" |
 puppet_coll_remote_path | "/opt/puppetlabs" | Server Installation location of a puppet collections install.
-puppet_detailed_exitcodes | nil | Provide transaction information via exit codes.
+puppet_detailed_exitcodes | nil | Provide transaction information via exit codes. See `--detailed-exitcodes` section of `puppet help apply`
 manifests_path | | puppet repo manifests directory
 manifest | 'site.pp' | manifest for puppet apply to run
 modules_path | | puppet repo manifests directory
@@ -56,6 +56,7 @@ https_proxy | nil | use https proxy when installing puppet, packages and running
 puppet_logdest | nil | _Array_ of log destinations. Include 'console' if wanted
 custom_options | | custom options to add to puppet apply command.
 custom_install_command | nil | Custom shell command to be used at install stage. Can be multiline. See examples below.
+puppet_whitelist_exit_code | nil | Whitelist exit code expected from puppet run. Intended to be used together with `puppet_detailed_exitcodes`.
 
 
 ## Puppet Apply Configuring Provisioner Options

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-puppet
 version: !ruby/object:Gem::Version
-  version: 1.0.37
+  version: 1.37.1
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 description: |+
   == DESCRIPTION: