kitchen-puppet 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fd3f0255598eccfa42487ea777dcc84ea1b1115
-  data.tar.gz: a880703ff969cafa64c25a1e8d60f7b61b3fd5d5
+  metadata.gz: 0542ac99d127e21a163136f2b52b95f0e2d84335
+  data.tar.gz: ad2486099b5fe869218c222d9196e7d89c821cb2
 SHA512:
-  metadata.gz: a7d4e20212b16e6dc6491eabddc791d1c56a13448f8d767d94e912d1deb3533d9c454c41e616c17aeed1004e98e80b23038530465abe3264cbfd7fb6181ccc85
-  data.tar.gz: 9ed8a833172fea17feb6f210fa9eedf4e2b7e539363b361801f5aaff110c8bf06ff601a7186a041287d25cc36c28d4499b33fb2834396cd6745632b1f80f6fb3
+  metadata.gz: e36d7314cccffb36e8a6c1a41e411326b6c59d45100745976164b16f93f519efdcf2dc31a572ae386f75147cf1ea0b4339ded5d71687eabacff880b49cee70b0
+  data.tar.gz: 6ca7dc799071b0d9155d1eb55a2a63e13cc3a58111c2b5e14c063e1200a2b88cb2324a0051669a3023d761636e622dc27225da59b57c3f98d7972a71e5cc61f0

data/README.md

@@ -19,6 +19,12 @@ The PuppetBolt provider works by passing the puppet bolt commands based on attri
 
 This provider has been tested against the Ubuntu 1604 and Centos 7 boxes running in docker and vagrant/virtualbox.
 
+## Template
+
+Template project for using kitchen for puppet development:
+
+https://github.com/scoopex/puppet-kitchen_template
+
 ## Resources
 * http://ehaselwanter.com/en/blog/2014/05/08/using-test-kitchen-with-puppet
 * http://www.slideshare.net/MartinEtmajer/testdriven-infrastructure-with-puppet-test-kitchen-serverspec-and-rspec

data/kitchen-puppet.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.platform      = Gem::Platform::RUBY
   s.require_paths = ['lib']
   s.rubyforge_project = '[none]'
-  s.required_ruby_version = '>= 2.0'
+  s.required_ruby_version = '>= 2.1'
   s.add_dependency 'net-ssh', '>= 3'
   s.add_dependency 'test-kitchen', '~> 1.4'
   s.description = <<-TEXT

data/lib/kitchen-puppet/version.rb

@@ -2,6 +2,6 @@
 
 module Kitchen
   module Puppet
-    VERSION = '3.3.1'.freeze
+    VERSION = '3.3.2'.freeze
   end
 end

data/lib/kitchen/provisioner/puppet_agent.rb

@@ -52,7 +52,7 @@ module Kitchen
 
       default_config :puppet_apt_repo, 'http://apt.puppetlabs.com/puppetlabs-release-precise.deb'
       default_config :puppet_yum_repo, 'https://yum.puppetlabs.com/puppetlabs-release-el-6.noarch.rpm'
-      default_config :chef_bootstrap_url, 'https://www.getchef.com/chef/install.sh'
+      default_config :chef_bootstrap_url, 'https://www.chef.io/chef/install.sh'
 
       default_config :puppet_agent_command, nil
 
@@ -79,7 +79,8 @@ module Kitchen
       default_config :puppet_test, false
       default_config :puppet_onetime, true
       default_config :puppet_no_daemonize, true
-      default_config :puppet_server, nil # will default to 'puppet'
+      # will default to 'puppet'
+      default_config :puppet_server, nil
       default_config :puppet_waitforcert, '0'
       default_config :puppet_certname, nil
       default_config :puppet_digest, nil

data/lib/kitchen/provisioner/puppet_apply.rb

@@ -71,7 +71,7 @@ module Kitchen
       end
       default_config :puppet_apt_repo, 'http://apt.puppetlabs.com/puppetlabs-release-precise.deb'
       default_config :puppet_yum_repo, 'https://yum.puppetlabs.com/puppetlabs-release-el-6.noarch.rpm'
-      default_config :chef_bootstrap_url, 'https://www.getchef.com/chef/install.sh'
+      default_config :chef_bootstrap_url, 'https://www.chef.io/chef/install.sh'
       default_config :puppet_logdest, nil
       default_config :custom_install_command, nil
       default_config :custom_pre_install_command, nil
@@ -711,6 +711,7 @@ module Kitchen
         debug(command)
         command
       end
+      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
       def run_command
         return config[:puppet_apply_command] unless config[:puppet_apply_command].nil?
@@ -1036,6 +1037,7 @@ module Kitchen
         config[:spec_files_remote_path]
       end
 
+      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       def facterlib
         factpath = nil
         factpath = File.join(config[:root_path], 'facter').to_s if config[:install_custom_facts] && config[:custom_facts].any?
@@ -1047,6 +1049,7 @@ module Kitchen
         debug(bash_vars)
         bash_vars
       end
+      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
       def custom_facts
         return nil if config[:custom_facts].none?
@@ -1088,6 +1091,7 @@ module Kitchen
         end
       end
 
+      # rubocop:disable Metrics/CyclomaticComplexity
       def puppet_apt_repo
         platform_version = config[:platform].partition('-')[2]
         case puppet_platform
@@ -1126,6 +1130,7 @@ module Kitchen
           false
         end
       end
+      # rubocop:enable Metrics/CyclomaticComplexity
 
       def puppet_apt_repo_file
         puppet_apt_repo.split('/').last if puppet_apt_repo
@@ -1248,6 +1253,7 @@ module Kitchen
         end
       end
 
+      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       def prepare_modules
         info('Preparing modules')
 
@@ -1279,6 +1285,7 @@ module Kitchen
           copy_modules(modules_to_copy, tmpmodules_dir)
         end
       end
+      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
       def copy_modules(modules, destination)
         excluded_paths = %w[modules pkg] + config[:ignored_paths_from_root]
@@ -1296,7 +1303,6 @@ module Kitchen
         end
       end
 
-      # rubocop:disable Lint/RescueWithoutErrorClass
       def read_self_module_name
         if File.exist?(modulefile)
           warn('Modulefile found but this is deprecated, ignoring it, see https://tickets.puppetlabs.com/browse/PUP-1188')
@@ -1306,13 +1312,12 @@ module Kitchen
         module_name = nil
         begin
           module_name = JSON.parse(IO.read(metadata_json))['name'].split('-').last
-        rescue
+        rescue JSON::ParserError
           error("not able to load or parse #{metadata_json} for the name of the module")
         end
 
         module_name
       end
-      # rubocop:enable Lint/RescueWithoutErrorClass
 
       def prepare_puppet_config
         return unless puppet_config

data/lib/kitchen/provisioner/puppet_bolt.rb

@@ -51,11 +51,14 @@ module Kitchen
       default_config :https_proxy, nil
       default_config :no_proxy, nil
       # for future use
-      default_config :bolt_cmd, nil        # bolt command run <COMMAND>, bolt script run, bolt task run, bolt plan run, bolt file upload
-      default_config :bolt_nodes, nil      # REQUIRED
-      default_config :bolt_user, nil       # BOLT_USER env variable
+      # bolt command run <COMMAND>, bolt script run, bolt task run, bolt plan run, bolt file upload
+      default_config :bolt_cmd, nil
+      default_config :bolt_nodes, nil
+      # BOLT_USER env variable
+      default_config :bolt_user, nil
       default_config :bolt_password, nil
-      default_config :bolt_modulepath, [] # Required for tasks and plans. The path to the module containing the task. Separate multiple paths with a semicolon (;) on Windows or a colon (:) on all other platforms.
+      # Required for tasks and plans. The path to the module containing the task. Separate multiple paths with a semicolon (;) on Windows or a colon (:) on all other platforms.
+      default_config :bolt_modulepath, []
       default_config :bolt_params, nil
       default_config :bolt_tty, false
       default_config :bolt_insecure, true

data/provisioner_options.md

@@ -27,7 +27,7 @@ It installs it in the following order:
 
 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.
+chef_bootstrap_url | https://www.chef.io/ 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.
@@ -232,7 +232,7 @@ puppet_noop| false| puppet runs in a no-op or dry-run mode
 update_package_repos| true| update OS repository metadata
 custom_facts| Hash.new | Hash to set the puppet facts before running puppet apply
 facterlib | nil | Path for dynamic fact generation, e.g. /etc/puppet/facter . See https://docs.puppetlabs.com/facter/2.2/custom_facts.html
-chef_bootstrap_url |"https://www.getchef.com/chef/install.sh"| the chef (needed for busser to run tests)
+chef_bootstrap_url |"https://www.chef.io/chef/install.sh"| the chef (needed for busser to run tests)
 puppet_agent_command | nil | Overwrite the puppet agent command. Needs "sudo -E puppet agent" as a prefix.
 require_chef_for_busser | true | Install chef as currently needed by busser to run tests. NOTE: kitchen 1.4 only requires ruby to run busser so this is not required.
 puppet_config_path | | path of custom puppet.conf file

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-puppet
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-22 00:00:00.000000000 Z
+date: 2018-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -73,7 +73,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="