kitchen-puppet 3.4.1 → 3.4.2

data/kitchen-puppet.gemspec

@@ -1,32 +1,32 @@
-# encoding: utf-8
-
-$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
-require 'kitchen-puppet/version'
-
-Gem::Specification.new do |s|
-  s.name          = 'kitchen-puppet'
-  s.license       = 'Apache-2.0'
-  s.version       = Kitchen::Puppet::VERSION
-  s.authors       = ['Neill Turner']
-  s.email         = ['neillwturner@gmail.com']
-  s.homepage      = 'https://github.com/neillturner/kitchen-puppet'
-  s.summary       = 'puppet provisioner for test-kitchen'
-  candidates = Dir.glob('{lib}/**/*') + ['README.md', 'provisioner_options.md', 'kitchen-puppet.gemspec']
-  s.files = candidates.sort
-  s.platform      = Gem::Platform::RUBY
-  s.require_paths = ['lib']
-  s.rubyforge_project = '[none]'
-  s.required_ruby_version = '>= 2.1'
-  s.add_dependency 'net-ssh', '>= 3'
-  s.add_dependency 'test-kitchen', '~> 1.4'
-  s.description = <<-TEXT
-  == DESCRIPTION:
-
-  Puppet Provisioner for Test Kitchen
-
-  == FEATURES:
-
-  Supports puppet apply, puppet agent, puppet bolt, hiera, hiera-eyaml, hiera-eyaml-gpg, custom facts, librarian-puppet, puppet collections
-
-TEXT
-end
+# encoding: utf-8
+
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+require 'kitchen-puppet/version'
+
+Gem::Specification.new do |s|
+  s.name          = 'kitchen-puppet'
+  s.license       = 'Apache-2.0'
+  s.version       = Kitchen::Puppet::VERSION
+  s.authors       = ['Neill Turner']
+  s.email         = ['neillwturner@gmail.com']
+  s.homepage      = 'https://github.com/neillturner/kitchen-puppet'
+  s.summary       = 'puppet provisioner for test-kitchen'
+  candidates = Dir.glob('{lib}/**/*') + ['README.md', 'provisioner_options.md', 'kitchen-puppet.gemspec']
+  s.files = candidates.sort
+  s.platform      = Gem::Platform::RUBY
+  s.require_paths = ['lib']
+  s.rubyforge_project = '[none]'
+  s.required_ruby_version = '>= 2.1'
+  s.add_dependency 'net-ssh', '>= 3'
+  s.add_dependency 'test-kitchen', '~> 1.4'
+  s.description = <<-TEXT
+  == DESCRIPTION:
+
+  Puppet Provisioner for Test Kitchen
+
+  == FEATURES:
+
+  Supports puppet apply, puppet agent, puppet bolt, hiera, hiera-eyaml, hiera-eyaml-gpg, custom facts, librarian-puppet, puppet collections
+
+TEXT
+end

data/lib/kitchen-puppet/version.rb

@@ -1,7 +1,7 @@
-# encoding: UTF-8
-
-module Kitchen
-  module Puppet
-    VERSION = '3.4.1'.freeze
-  end
-end
+# encoding: UTF-8
+
+module Kitchen
+  module Puppet
+    VERSION = '3.4.2'.freeze
+  end
+end

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

@@ -1,111 +1,111 @@
-# -*- encoding: utf-8 -*-
-
-#
-# Author:: Fletcher Nichol (<fnichol@nichol.ca>) Neill Turner (<neillwturner@gmail.com>)
-#
-# Copyright (C) 2013, Fletcher Nichol, Neill Turner
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'kitchen/errors'
-require 'kitchen/logging'
-require 'librarian/ui'
-
-module Kitchen
-  module Provisioner
-    module Puppet
-      # Puppet module resolver that uses Librarian-Puppet and a Puppetfile to
-      # calculate # dependencies.
-      #
-      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
-          @logger = logger
-        end
-
-        def self.load!(logger = Kitchen.logger)
-          load_librarian!(logger)
-        end
-
-        def resolve
-          version = ::Librarian::Puppet::VERSION
-          info("Resolving module dependencies with Librarian-Puppet #{version}...")
-          debug("Using Puppetfile from #{puppetfile}")
-
-          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
-          ::Librarian::Action::Install.new(env).run
-        end
-
-        attr_reader :puppetfile, :path, :logger
-
-        def self.load_librarian!(logger)
-          first_load = require 'librarian/puppet'
-          require 'librarian/puppet/environment'
-          require 'librarian/action/resolve'
-          require 'librarian/action/install'
-
-          version = ::Librarian::Puppet::VERSION
-          if first_load
-            logger.debug("Librarian-Puppet #{version} library loaded")
-          else
-            logger.debug("Librarian-Puppet #{version} previously loaded")
-          end
-        rescue LoadError => e
-          logger.fatal("The `librarian-puppet' gem is missing and must be installed" \
-            ' or cannot be properly activated. Run' \
-            ' `gem install librarian-puppet` or add the following to your' \
-            " Gemfile if you are using Bundler: `gem 'librarian-puppet'`.")
-          raise UserError,
-                "Could not load or activate Librarian-Puppet (#{e.message})"
-        end
-      end
-    end
-  end
-end
+# -*- encoding: utf-8 -*-
+
+#
+# Author:: Fletcher Nichol (<fnichol@nichol.ca>) Neill Turner (<neillwturner@gmail.com>)
+#
+# Copyright (C) 2013, Fletcher Nichol, Neill Turner
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'kitchen/errors'
+require 'kitchen/logging'
+require 'librarian/ui'
+
+module Kitchen
+  module Provisioner
+    module Puppet
+      # Puppet module resolver that uses Librarian-Puppet and a Puppetfile to
+      # calculate # dependencies.
+      #
+      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
+          @logger = logger
+        end
+
+        def self.load!(logger = Kitchen.logger)
+          load_librarian!(logger)
+        end
+
+        def resolve
+          version = ::Librarian::Puppet::VERSION
+          info("Resolving module dependencies with Librarian-Puppet #{version}...")
+          debug("Using Puppetfile from #{puppetfile}")
+
+          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
+          ::Librarian::Action::Install.new(env).run
+        end
+
+        attr_reader :puppetfile, :path, :logger
+
+        def self.load_librarian!(logger)
+          first_load = require 'librarian/puppet'
+          require 'librarian/puppet/environment'
+          require 'librarian/action/resolve'
+          require 'librarian/action/install'
+
+          version = ::Librarian::Puppet::VERSION
+          if first_load
+            logger.debug("Librarian-Puppet #{version} library loaded")
+          else
+            logger.debug("Librarian-Puppet #{version} previously loaded")
+          end
+        rescue LoadError => e
+          logger.fatal("The `librarian-puppet' gem is missing and must be installed" \
+            ' or cannot be properly activated. Run' \
+            ' `gem install librarian-puppet` or add the following to your' \
+            " Gemfile if you are using Bundler: `gem 'librarian-puppet'`.")
+          raise UserError,
+                "Could not load or activate Librarian-Puppet (#{e.message})"
+        end
+      end
+    end
+  end
+end

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

@@ -1,73 +1,73 @@
-# -*- encoding: utf-8 -*-
-
-#
-# Author:: Fletcher Nichol (<fnichol@nichol.ca>) Neill Turner (<neillwturner@gmail.com>) Dennis Lerch (<dennis.lerch@transporeon.com>)
-#
-# Copyright (C) 2018, Fletcher Nichol, Neill Turner, Dennis Lerch
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'kitchen/errors'
-require 'kitchen/logging'
-
-module Kitchen
-  module Provisioner
-    module Puppet
-      # Puppet module resolver that uses R10K and a Puppetfile to
-      # calculate # dependencies.
-      #
-      class R10K
-        include Logging
-
-        def initialize(puppetfile, path, logger = Kitchen.logger)
-          @puppetfile = puppetfile
-          @path = path
-          @logger = logger
-        end
-
-        def self.load!(logger = Kitchen.logger)
-          load_r10k!(logger)
-        end
-
-        def resolve
-          version = ::R10K::VERSION
-          info("Resolving module dependencies with R10K-Puppet #{version}...")
-          debug("Using Puppetfile from #{puppetfile}")
-
-          ::R10K::Git::Cache.settings[:cache_root] = '.r10k/git'
-          ::R10K::Forge::ModuleRelease.settings[:cache_root] = '.r10k/cache'
-
-          pf = ::R10K::Puppetfile.new(nil, path, puppetfile)
-          pf.load
-          pf.modules.map(&:sync)
-        end
-
-        attr_reader :puppetfile, :path, :logger
-
-        def self.load_r10k!(logger)
-          require 'r10k/puppetfile'
-
-          version = ::R10K::VERSION
-          logger.debug("R10K #{version} library loaded")
-        rescue LoadError => e
-          logger.fatal("The `r10k' gem is missing and must be installed" \
-            ' or cannot be properly activated. Run' \
-            ' `gem install r10k` or add the following to your' \
-            " Gemfile if you are using Bundler: `gem 'r10k'`.")
-          raise UserError,
-                "Could not load or activate R10K (#{e.message})"
-        end
-      end
-    end
-  end
-end
+# -*- encoding: utf-8 -*-
+
+#
+# Author:: Fletcher Nichol (<fnichol@nichol.ca>) Neill Turner (<neillwturner@gmail.com>) Dennis Lerch (<dennis.lerch@transporeon.com>)
+#
+# Copyright (C) 2018, Fletcher Nichol, Neill Turner, Dennis Lerch
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'kitchen/errors'
+require 'kitchen/logging'
+
+module Kitchen
+  module Provisioner
+    module Puppet
+      # Puppet module resolver that uses R10K and a Puppetfile to
+      # calculate # dependencies.
+      #
+      class R10K
+        include Logging
+
+        def initialize(puppetfile, path, logger = Kitchen.logger)
+          @puppetfile = puppetfile
+          @path = path
+          @logger = logger
+        end
+
+        def self.load!(logger = Kitchen.logger)
+          load_r10k!(logger)
+        end
+
+        def resolve
+          version = ::R10K::VERSION
+          info("Resolving module dependencies with R10K-Puppet #{version}...")
+          debug("Using Puppetfile from #{puppetfile}")
+
+          ::R10K::Git::Cache.settings[:cache_root] = '.r10k/git'
+          ::R10K::Forge::ModuleRelease.settings[:cache_root] = '.r10k/cache'
+
+          pf = ::R10K::Puppetfile.new(nil, path, puppetfile)
+          pf.load
+          pf.modules.map(&:sync)
+        end
+
+        attr_reader :puppetfile, :path, :logger
+
+        def self.load_r10k!(logger)
+          require 'r10k/puppetfile'
+
+          version = ::R10K::VERSION
+          logger.debug("R10K #{version} library loaded")
+        rescue LoadError => e
+          logger.fatal("The `r10k' gem is missing and must be installed" \
+            ' or cannot be properly activated. Run' \
+            ' `gem install r10k` or add the following to your' \
+            " Gemfile if you are using Bundler: `gem 'r10k'`.")
+          raise UserError,
+                "Could not load or activate R10K (#{e.message})"
+        end
+      end
+    end
+  end
+end

data/lib/kitchen/provisioner/puppet_agent.rb

@@ -1,430 +1,430 @@
-# -*- encoding: utf-8 -*-
-
-#
-# Author:: Chris Lundquist (<chris.lundquist@github.com>) Neill Turner (<neillwturner@gmail.com>)
-#
-# Copyright (C) 2013,2014 Chris Lundquist, Neill Turner
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# See https://github.com/neillturner/kitchen-puppet/blob/master/provisioner_options.md
-# for documentation configuration parameters with puppet_agent provisioner.
-#
-
-require 'json'
-require 'kitchen'
-require 'kitchen/provisioner/base'
-require 'kitchen/provisioner/puppet/librarian'
-
-module Kitchen
-  class Busser
-    def non_suite_dirs
-      %w[data data_bags environments nodes roles puppet]
-    end
-  end
-
-  module Provisioner
-    #
-    # Puppet Agent provisioner.
-    #
-    class PuppetAgent < Base
-      attr_accessor :tmp_dir
-
-      default_config :require_puppet_omnibus, false
-      # TODO: use something like https://github.com/fnichol/omnibus-puppet
-      default_config :puppet_omnibus_url, nil
-      default_config :puppet_environment, nil
-      default_config :puppet_omnibus_remote_path, '/opt/puppet'
-      default_config :puppet_version, nil
-      default_config :facter_version, nil
-      default_config :require_puppet_repo, true
-      default_config :require_chef_for_busser, true
-
-      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.chef.io/chef/install.sh'
-
-      default_config :puppet_agent_command, nil
-
-      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)
-      end
-
-      default_config :puppet_debug, false
-      default_config :puppet_verbose, false
-      default_config :puppet_noop, false
-      default_config :puppet_platform, ''
-      default_config :update_package_repos, true
-
-      default_config :custom_facts, {}
-
-      default_config :puppet_detailed_exitcodes, nil
-      default_config :puppet_logdest, nil
-      default_config :puppet_masterport, nil
-      default_config :puppet_test, false
-      default_config :puppet_onetime, true
-      default_config :puppet_no_daemonize, true
-      # will default to 'puppet'
-      default_config :puppet_server, nil
-      default_config :puppet_waitforcert, '0'
-      default_config :puppet_certname, nil
-      default_config :puppet_digest, nil
-
-      def calculate_path(path, type = :directory)
-        base = config[:test_base_path]
-        candidates = []
-        candidates << File.join(base, instance.suite.name, 'puppet', path)
-        candidates << File.join(base, instance.suite.name, path)
-        candidates << File.join(base, path)
-        candidates << File.join(Dir.pwd, path)
-
-        candidates.find do |c|
-          type == :directory ? File.directory?(c) : File.file?(c)
-        end
-      end
-
-      # rubocop:disable Metrics/CyclomaticComplexity
-      def install_command
-        return unless config[:require_puppet_omnibus] || config[:require_puppet_repo]
-        if config[:require_puppet_omnibus]
-          info('Installing puppet using puppet omnibus')
-          version = ''
-          version = "-v #{config[:puppet_version]}" if config[:puppet_version]
-          <<-INSTALL
-            #{Util.shell_helpers}
-
-            if [ ! -d "#{config[:puppet_omnibus_remote_path]}" ]; then
-              echo "-----> Installing Puppet Omnibus"
-              do_download #{config[:puppet_omnibus_url]} /tmp/puppet_install.sh
-              #{sudo('sh')} /tmp/puppet_install.sh #{version}
-            fi
-            #{install_busser}
-          INSTALL
-        else
-          case puppet_platform
-          when 'debian', 'ubuntu'
-            info("Installing puppet on #{puppet_platform}")
-            <<-INSTALL
-              if [ ! $(which puppet) ]; then
-                #{sudo('apt-get')} -y install wget
-                #{sudo('wget')} #{wget_proxy_parm} #{puppet_apt_repo}
-                #{sudo('dpkg')} -i #{puppet_apt_repo_file}
-                #{update_packages_debian_cmd}
-                #{sudo_env('apt-get')} -y install facter#{facter_debian_version}
-                #{sudo('apt-get')} -y install puppet-common#{puppet_debian_version}
-                #{sudo('apt-get')} -y install puppet#{puppet_debian_version}
-              fi
-              #{install_busser}
-            INSTALL
-          when 'redhat', 'centos', 'fedora', 'oracle', 'amazon'
-            info("Installing puppet on #{puppet_platform}")
-            <<-INSTALL
-              if [ ! $(which puppet) ]; then
-                #{sudo('rpm')} -ivh #{proxy_parm} #{puppet_yum_repo}
-                #{update_packages_redhat_cmd}
-                #{sudo('yum')} -y install puppet#{puppet_redhat_version}
-              fi
-              #{install_busser}
-            INSTALL
-          else
-            info('Installing puppet, will try to determine platform os')
-            <<-INSTALL
-              if [ ! $(which puppet) ]; then
-                if [ -f /etc/centos-release ] || [ -f /etc/redhat-release ] || [ -f /etc/oracle-release ]; then
-                  #{sudo('rpm')} -ivh #{proxy_parm} #{puppet_yum_repo}
-                  #{update_packages_redhat_cmd}
-                  #{sudo('yum')} -y install puppet#{puppet_redhat_version}
-                else
-                  if [ -f /etc/system-release ] || grep -q 'Amazon Linux' /etc/system-release; then
-                    #{sudo('rpm')} -ivh #{proxy_parm} #{puppet_yum_repo}
-                    #{update_packages_redhat_cmd}
-                    #{sudo('yum')} -y install puppet#{puppet_redhat_version}
-                  else
-                    #{sudo('apt-get')} -y install wget
-                    #{sudo('wget')} #{wget_proxy_parm} #{puppet_apt_repo}
-                    #{sudo('dpkg')} -i #{puppet_apt_repo_file}
-                    #{update_packages_debian_cmd}
-                    #{sudo('apt-get')} -y install facter#{facter_debian_version}
-                    #{sudo('apt-get')} -y install puppet-common#{puppet_debian_version}
-                    #{sudo('apt-get')} -y install puppet#{puppet_debian_version}
-                  fi
-                fi
-              fi
-              #{install_busser}
-            INSTALL
-          end
-        end
-      end
-      # rubocop:enable Metrics/CyclomaticComplexity
-
-      def install_busser
-        return unless config[:require_chef_for_busser]
-        <<-INSTALL
-          #{Util.shell_helpers}
-          # install chef omnibus so that busser works as this is needed to run tests :(
-          # TODO: work out how to install enough ruby
-          # and set busser: { :ruby_bindir => '/usr/bin/ruby' } so that we dont need the
-          # whole chef client
-          if [ ! -d "/opt/chef" ]
-          then
-            echo "-----> Installing Chef Omnibus to install busser to run tests"
-            do_download #{chef_url} /tmp/install.sh
-            #{sudo('sh')} /tmp/install.sh
-          fi
-        INSTALL
-      end
-
-      def init_command; end
-
-      def create_sandbox
-        super
-        debug("Creating local sandbox in #{sandbox_path}")
-
-        yield if block_given?
-
-        prepare_puppet_config
-        info('Finished Preparing files for transfer')
-      end
-
-      def cleanup_sandbox
-        return if sandbox_path.nil?
-        debug("Cleaning up local sandbox in #{sandbox_path}")
-        FileUtils.rmtree(sandbox_path)
-      end
-
-      def prepare_command
-        commands = []
-
-        if puppet_config
-          commands << [
-            sudo('cp'),
-            File.join(config[:root_path], 'puppet.conf'),
-            '/etc/puppet'
-          ].join(' ')
-        end
-
-        command = commands.join(' && ')
-        debug(command)
-        command
-      end
-
-      def run_command
-        return config[:puppet_agent_command] unless config[:puppet_agent_command].nil?
-        [
-          custom_facts,
-          sudo_env('puppet'),
-          'agent',
-          puppet_server_flag,
-          "--waitforcert=#{config[:puppet_waitforcert]}",
-          puppet_masterport_flag,
-          puppet_certname_flag,
-          puppet_digest_flag,
-          puppet_detailed_exitcodes_flag,
-          puppet_logdest_flag,
-          puppet_test_flag,
-          puppet_onetime_flag,
-          puppet_no_daemonize_flag,
-          puppet_noop_flag,
-          puppet_environment_flag,
-          puppet_verbose_flag,
-          puppet_debug_flag,
-          puppet_whitelist_exit_code
-        ].compact.join(' ')
-      end
-
-      protected
-
-      def load_needed_dependencies!; end
-
-      def puppet_environment_flag
-        config[:puppet_environment] ? "--environment=\"#{config[:puppet_environment]}\"" : nil
-      end
-
-      def puppet_config
-        config[:puppet_config_path]
-      end
-
-      def puppet_debian_version
-        config[:puppet_version] ? "=#{config[:puppet_version]}" : nil
-      end
-
-      def facter_debian_version
-        config[:facter_version] ? "=#{config[:facter_version]}" : nil
-      end
-
-      def puppet_redhat_version
-        if puppet_platform == 'amazon'
-          config[:puppet_version]
-        else
-          config[:puppet_version] ? "-#{config[:puppet_version]}" : nil
-        end
-      end
-
-      def puppet_noop_flag
-        config[:puppet_noop] ? '--noop' : nil
-      end
-
-      def puppet_debug_flag
-        config[:puppet_debug] ? '-d' : nil
-      end
-
-      def puppet_verbose_flag
-        config[:puppet_verbose] ? '-v' : nil
-      end
-
-      def puppet_platform
-        config[:puppet_platform].to_s.downcase
-      end
-
-      def update_packages_debian_cmd
-        config[:update_package_repos] ? "#{sudo_env('apt-get')} update" : nil
-      end
-
-      def update_packages_redhat_cmd
-        config[:update_package_repos] ? "#{sudo_env('yum')} makecache" : nil
-      end
-
-      def sudo_env(pm)
-        s = https_proxy ? "https_proxy=#{https_proxy}" : nil
-        p = http_proxy ? "http_proxy=#{http_proxy}" : nil
-        n = no_proxy ? "no_proxy=#{no_proxy}" : nil
-        p || s ? "#{sudo('env')} #{p} #{s} #{n} #{pm}" : sudo(pm).to_s
-      end
-
-      def custom_facts
-        return nil if config[:custom_facts].none?
-        bash_vars = config[:custom_facts].map { |k, v| "FACTER_#{k}=#{v}" }.join(' ')
-        bash_vars = "export #{bash_vars};"
-        debug(bash_vars)
-        bash_vars
-      end
-
-      def puppet_server_flag
-        config[:puppet_server] ? "--server=#{config[:puppet_server]}" : nil
-      end
-
-      def puppet_masterport_flag
-        config[:puppet_masterport] ? "--masterport=#{config[:puppet_masterport]}" : nil
-      end
-
-      def puppet_detailed_exitcodes_flag
-        config[:puppet_detailed_exitcodes] ? '--detailed-exitcodes' : nil
-      end
-
-      def puppet_logdest_flag
-        config[:puppet_logdest] ? "--logdest=#{config[:puppet_logdest]}" : nil
-      end
-
-      def puppet_test_flag
-        config[:puppet_test] ? '--test' : nil
-      end
-
-      def puppet_onetime_flag
-        config[:puppet_onetime] ? '--onetime' : nil
-      end
-
-      def puppet_no_daemonize_flag
-        config[:puppet_no_daemonize] ? '--no-daemonize' : nil
-      end
-
-      def puppet_no_daemonize
-        config[:puppet_no_daemonize]
-      end
-
-      def puppet_server
-        config[:puppet_server]
-      end
-
-      def puppet_certname_flag
-        config[:puppet_certname] ? "--certname=#{config[:puppet_certname]}" : nil
-      end
-
-      def puppet_digest_flag
-        config[:puppet_digest] ? "--digest=#{config[:puppet_digest]}" : nil
-      end
-
-      def puppet_apt_repo
-        config[:puppet_apt_repo]
-      end
-
-      def puppet_apt_repo_file
-        config[:puppet_apt_repo].split('/').last
-      end
-
-      def puppet_yum_repo
-        config[:puppet_yum_repo]
-      end
-
-      def proxy_parm
-        http_proxy ? "--httpproxy #{URI.parse(http_proxy).host.downcase} --httpport #{URI.parse(http_proxy).port} " : nil
-      end
-
-      def gem_proxy_parm
-        p = http_proxy ? "--http-proxy #{http_proxy}" : nil
-        n = no_proxy ? "--no-http-proxy #{no_proxy}" : nil
-        p ? "#{p} #{n}" : nil
-      end
-
-      def wget_proxy_parm
-        s = https_proxy ? "-e https_proxy=#{https_proxy}" : nil
-        p = http_proxy ? "-e http_proxy=#{http_proxy}" : nil
-        n = no_proxy ? "-e no_proxy=#{no_proxy}" : nil
-        p || s ? "-e use_proxy=yes #{p} #{s} #{n}" : nil
-      end
-
-      def http_proxy
-        config[:http_proxy]
-      end
-
-      def https_proxy
-        config[:https_proxy]
-      end
-
-      def no_proxy
-        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
-
-      def prepare_puppet_config
-        return unless puppet_config
-
-        info('Preparing puppet.conf')
-        debug("Using puppet config from #{puppet_config}")
-
-        FileUtils.cp_r(puppet_config, File.join(sandbox_path, 'puppet.conf'))
-      end
-    end
-  end
-end
+# -*- encoding: utf-8 -*-
+
+#
+# Author:: Chris Lundquist (<chris.lundquist@github.com>) Neill Turner (<neillwturner@gmail.com>)
+#
+# Copyright (C) 2013,2014 Chris Lundquist, Neill Turner
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# See https://github.com/neillturner/kitchen-puppet/blob/master/provisioner_options.md
+# for documentation configuration parameters with puppet_agent provisioner.
+#
+
+require 'json'
+require 'kitchen'
+require 'kitchen/provisioner/base'
+require 'kitchen/provisioner/puppet/librarian'
+
+module Kitchen
+  class Busser
+    def non_suite_dirs
+      %w[data data_bags environments nodes roles puppet]
+    end
+  end
+
+  module Provisioner
+    #
+    # Puppet Agent provisioner.
+    #
+    class PuppetAgent < Base
+      attr_accessor :tmp_dir
+
+      default_config :require_puppet_omnibus, false
+      # TODO: use something like https://github.com/fnichol/omnibus-puppet
+      default_config :puppet_omnibus_url, nil
+      default_config :puppet_environment, nil
+      default_config :puppet_omnibus_remote_path, '/opt/puppet'
+      default_config :puppet_version, nil
+      default_config :facter_version, nil
+      default_config :require_puppet_repo, true
+      default_config :require_chef_for_busser, true
+
+      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.chef.io/chef/install.sh'
+
+      default_config :puppet_agent_command, nil
+
+      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)
+      end
+
+      default_config :puppet_debug, false
+      default_config :puppet_verbose, false
+      default_config :puppet_noop, false
+      default_config :puppet_platform, ''
+      default_config :update_package_repos, true
+
+      default_config :custom_facts, {}
+
+      default_config :puppet_detailed_exitcodes, nil
+      default_config :puppet_logdest, nil
+      default_config :puppet_masterport, nil
+      default_config :puppet_test, false
+      default_config :puppet_onetime, true
+      default_config :puppet_no_daemonize, true
+      # will default to 'puppet'
+      default_config :puppet_server, nil
+      default_config :puppet_waitforcert, '0'
+      default_config :puppet_certname, nil
+      default_config :puppet_digest, nil
+
+      def calculate_path(path, type = :directory)
+        base = config[:test_base_path]
+        candidates = []
+        candidates << File.join(base, instance.suite.name, 'puppet', path)
+        candidates << File.join(base, instance.suite.name, path)
+        candidates << File.join(base, path)
+        candidates << File.join(Dir.pwd, path)
+
+        candidates.find do |c|
+          type == :directory ? File.directory?(c) : File.file?(c)
+        end
+      end
+
+      # rubocop:disable Metrics/CyclomaticComplexity
+      def install_command
+        return unless config[:require_puppet_omnibus] || config[:require_puppet_repo]
+        if config[:require_puppet_omnibus]
+          info('Installing puppet using puppet omnibus')
+          version = ''
+          version = "-v #{config[:puppet_version]}" if config[:puppet_version]
+          <<-INSTALL
+            #{Util.shell_helpers}
+
+            if [ ! -d "#{config[:puppet_omnibus_remote_path]}" ]; then
+              echo "-----> Installing Puppet Omnibus"
+              do_download #{config[:puppet_omnibus_url]} /tmp/puppet_install.sh
+              #{sudo('sh')} /tmp/puppet_install.sh #{version}
+            fi
+            #{install_busser}
+          INSTALL
+        else
+          case puppet_platform
+          when 'debian', 'ubuntu'
+            info("Installing puppet on #{puppet_platform}")
+            <<-INSTALL
+              if [ ! $(which puppet) ]; then
+                #{sudo('apt-get')} -y install wget
+                #{sudo('wget')} #{wget_proxy_parm} #{puppet_apt_repo}
+                #{sudo('dpkg')} -i #{puppet_apt_repo_file}
+                #{update_packages_debian_cmd}
+                #{sudo_env('apt-get')} -y install facter#{facter_debian_version}
+                #{sudo('apt-get')} -y install puppet-common#{puppet_debian_version}
+                #{sudo('apt-get')} -y install puppet#{puppet_debian_version}
+              fi
+              #{install_busser}
+            INSTALL
+          when 'redhat', 'centos', 'fedora', 'oracle', 'amazon'
+            info("Installing puppet on #{puppet_platform}")
+            <<-INSTALL
+              if [ ! $(which puppet) ]; then
+                #{sudo('rpm')} -ivh #{proxy_parm} #{puppet_yum_repo}
+                #{update_packages_redhat_cmd}
+                #{sudo('yum')} -y install puppet#{puppet_redhat_version}
+              fi
+              #{install_busser}
+            INSTALL
+          else
+            info('Installing puppet, will try to determine platform os')
+            <<-INSTALL
+              if [ ! $(which puppet) ]; then
+                if [ -f /etc/centos-release ] || [ -f /etc/redhat-release ] || [ -f /etc/oracle-release ]; then
+                  #{sudo('rpm')} -ivh #{proxy_parm} #{puppet_yum_repo}
+                  #{update_packages_redhat_cmd}
+                  #{sudo('yum')} -y install puppet#{puppet_redhat_version}
+                else
+                  if [ -f /etc/system-release ] || grep -q 'Amazon Linux' /etc/system-release; then
+                    #{sudo('rpm')} -ivh #{proxy_parm} #{puppet_yum_repo}
+                    #{update_packages_redhat_cmd}
+                    #{sudo('yum')} -y install puppet#{puppet_redhat_version}
+                  else
+                    #{sudo('apt-get')} -y install wget
+                    #{sudo('wget')} #{wget_proxy_parm} #{puppet_apt_repo}
+                    #{sudo('dpkg')} -i #{puppet_apt_repo_file}
+                    #{update_packages_debian_cmd}
+                    #{sudo('apt-get')} -y install facter#{facter_debian_version}
+                    #{sudo('apt-get')} -y install puppet-common#{puppet_debian_version}
+                    #{sudo('apt-get')} -y install puppet#{puppet_debian_version}
+                  fi
+                fi
+              fi
+              #{install_busser}
+            INSTALL
+          end
+        end
+      end
+      # rubocop:enable Metrics/CyclomaticComplexity
+
+      def install_busser
+        return unless config[:require_chef_for_busser]
+        <<-INSTALL
+          #{Util.shell_helpers}
+          # install chef omnibus so that busser works as this is needed to run tests :(
+          # TODO: work out how to install enough ruby
+          # and set busser: { :ruby_bindir => '/usr/bin/ruby' } so that we dont need the
+          # whole chef client
+          if [ ! -d "/opt/chef" ]
+          then
+            echo "-----> Installing Chef Omnibus to install busser to run tests"
+            do_download #{chef_url} /tmp/install.sh
+            #{sudo('sh')} /tmp/install.sh
+          fi
+        INSTALL
+      end
+
+      def init_command; end
+
+      def create_sandbox
+        super
+        debug("Creating local sandbox in #{sandbox_path}")
+
+        yield if block_given?
+
+        prepare_puppet_config
+        info('Finished Preparing files for transfer')
+      end
+
+      def cleanup_sandbox
+        return if sandbox_path.nil?
+        debug("Cleaning up local sandbox in #{sandbox_path}")
+        FileUtils.rmtree(sandbox_path)
+      end
+
+      def prepare_command
+        commands = []
+
+        if puppet_config
+          commands << [
+            sudo('cp'),
+            File.join(config[:root_path], 'puppet.conf'),
+            '/etc/puppet'
+          ].join(' ')
+        end
+
+        command = commands.join(' && ')
+        debug(command)
+        command
+      end
+
+      def run_command
+        return config[:puppet_agent_command] unless config[:puppet_agent_command].nil?
+        [
+          custom_facts,
+          sudo_env('puppet'),
+          'agent',
+          puppet_server_flag,
+          "--waitforcert=#{config[:puppet_waitforcert]}",
+          puppet_masterport_flag,
+          puppet_certname_flag,
+          puppet_digest_flag,
+          puppet_detailed_exitcodes_flag,
+          puppet_logdest_flag,
+          puppet_test_flag,
+          puppet_onetime_flag,
+          puppet_no_daemonize_flag,
+          puppet_noop_flag,
+          puppet_environment_flag,
+          puppet_verbose_flag,
+          puppet_debug_flag,
+          puppet_whitelist_exit_code
+        ].compact.join(' ')
+      end
+
+      protected
+
+      def load_needed_dependencies!; end
+
+      def puppet_environment_flag
+        config[:puppet_environment] ? "--environment=\"#{config[:puppet_environment]}\"" : nil
+      end
+
+      def puppet_config
+        config[:puppet_config_path]
+      end
+
+      def puppet_debian_version
+        config[:puppet_version] ? "=#{config[:puppet_version]}" : nil
+      end
+
+      def facter_debian_version
+        config[:facter_version] ? "=#{config[:facter_version]}" : nil
+      end
+
+      def puppet_redhat_version
+        if puppet_platform == 'amazon'
+          config[:puppet_version]
+        else
+          config[:puppet_version] ? "-#{config[:puppet_version]}" : nil
+        end
+      end
+
+      def puppet_noop_flag
+        config[:puppet_noop] ? '--noop' : nil
+      end
+
+      def puppet_debug_flag
+        config[:puppet_debug] ? '-d' : nil
+      end
+
+      def puppet_verbose_flag
+        config[:puppet_verbose] ? '-v' : nil
+      end
+
+      def puppet_platform
+        config[:puppet_platform].to_s.downcase
+      end
+
+      def update_packages_debian_cmd
+        config[:update_package_repos] ? "#{sudo_env('apt-get')} update" : nil
+      end
+
+      def update_packages_redhat_cmd
+        config[:update_package_repos] ? "#{sudo_env('yum')} makecache" : nil
+      end
+
+      def sudo_env(pm)
+        s = https_proxy ? "https_proxy=#{https_proxy}" : nil
+        p = http_proxy ? "http_proxy=#{http_proxy}" : nil
+        n = no_proxy ? "no_proxy=#{no_proxy}" : nil
+        p || s ? "#{sudo('env')} #{p} #{s} #{n} #{pm}" : sudo(pm).to_s
+      end
+
+      def custom_facts
+        return nil if config[:custom_facts].none?
+        bash_vars = config[:custom_facts].map { |k, v| "FACTER_#{k}=#{v}" }.join(' ')
+        bash_vars = "export #{bash_vars};"
+        debug(bash_vars)
+        bash_vars
+      end
+
+      def puppet_server_flag
+        config[:puppet_server] ? "--server=#{config[:puppet_server]}" : nil
+      end
+
+      def puppet_masterport_flag
+        config[:puppet_masterport] ? "--masterport=#{config[:puppet_masterport]}" : nil
+      end
+
+      def puppet_detailed_exitcodes_flag
+        config[:puppet_detailed_exitcodes] ? '--detailed-exitcodes' : nil
+      end
+
+      def puppet_logdest_flag
+        config[:puppet_logdest] ? "--logdest=#{config[:puppet_logdest]}" : nil
+      end
+
+      def puppet_test_flag
+        config[:puppet_test] ? '--test' : nil
+      end
+
+      def puppet_onetime_flag
+        config[:puppet_onetime] ? '--onetime' : nil
+      end
+
+      def puppet_no_daemonize_flag
+        config[:puppet_no_daemonize] ? '--no-daemonize' : nil
+      end
+
+      def puppet_no_daemonize
+        config[:puppet_no_daemonize]
+      end
+
+      def puppet_server
+        config[:puppet_server]
+      end
+
+      def puppet_certname_flag
+        config[:puppet_certname] ? "--certname=#{config[:puppet_certname]}" : nil
+      end
+
+      def puppet_digest_flag
+        config[:puppet_digest] ? "--digest=#{config[:puppet_digest]}" : nil
+      end
+
+      def puppet_apt_repo
+        config[:puppet_apt_repo]
+      end
+
+      def puppet_apt_repo_file
+        config[:puppet_apt_repo].split('/').last
+      end
+
+      def puppet_yum_repo
+        config[:puppet_yum_repo]
+      end
+
+      def proxy_parm
+        http_proxy ? "--httpproxy #{URI.parse(http_proxy).host.downcase} --httpport #{URI.parse(http_proxy).port} " : nil
+      end
+
+      def gem_proxy_parm
+        p = http_proxy ? "--http-proxy #{http_proxy}" : nil
+        n = no_proxy ? "--no-http-proxy #{no_proxy}" : nil
+        p ? "#{p} #{n}" : nil
+      end
+
+      def wget_proxy_parm
+        s = https_proxy ? "-e https_proxy=#{https_proxy}" : nil
+        p = http_proxy ? "-e http_proxy=#{http_proxy}" : nil
+        n = no_proxy ? "-e no_proxy=#{no_proxy}" : nil
+        p || s ? "-e use_proxy=yes #{p} #{s} #{n}" : nil
+      end
+
+      def http_proxy
+        config[:http_proxy]
+      end
+
+      def https_proxy
+        config[:https_proxy]
+      end
+
+      def no_proxy
+        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
+
+      def prepare_puppet_config
+        return unless puppet_config
+
+        info('Preparing puppet.conf')
+        debug("Using puppet config from #{puppet_config}")
+
+        FileUtils.cp_r(puppet_config, File.join(sandbox_path, 'puppet.conf'))
+      end
+    end
+  end
+end