kitchen-puppet 1.47.2 → 1.47.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c3e4ff489eab900c9165f7404833defb112829c
-  data.tar.gz: b077a8638d92ab3f846fafa6f20b9f0b35d5540d
+  metadata.gz: 6596c5f2430164122f20de74aa006ccb24ff1d05
+  data.tar.gz: 99b2d37ae1be0399b2dd1bf7d9e795b8f425731c
 SHA512:
-  metadata.gz: 4cd3c79075fbb5d37e8dfa37ccd1a7ee48b1b8335a0b686ba64b19a7939e949dff4e2172652a050933f99f1cebd4e2e00beaf303c42ee41a501e2edf28ff7851
-  data.tar.gz: d1f640fb5959de7d703257bd6902b79b1d65cb8becf5b86dbfe2685e81395a1ed57f5832c181e897546aa599d8a72a1a926df6276a7cedc1034f376a0270e320
+  metadata.gz: 3ee0dfda2fead9651e29d008c13c6ef26ab9fae9299c0411cca54cea9791a3ded09bbfee35198650214e5cf0fa578b031b0adceb734117aed06c089d594f598b
+  data.tar.gz: 4b754f7a4c325265aa25c8a76d2a6991da13d69246e7a5e3936f34606e952cc40e1e77416545a7dd4be352ee38e5cb30f7fd5d83b7f1d300e196693a30db6ea7

data/lib/kitchen-puppet/version.rb

@@ -2,6 +2,6 @@
 
 module Kitchen
   module Puppet
-    VERSION = '1.47.2'.freeze
+    VERSION = '1.47.3'.freeze
   end
 end

data/lib/kitchen/provisioner/puppet_agent.rb

@@ -54,6 +54,8 @@ module Kitchen
       default_config :puppet_agent_command, nil
 
       default_config :http_proxy, nil
+      default_config :https_proxy, nil
+      default_config :no_proxy, nil
 
       default_config :puppet_config_path do |provisioner|
         provisioner.calculate_path('puppet.conf', :file)
@@ -287,7 +289,10 @@ module Kitchen
       end
 
       def sudo_env(pm)
-        http_proxy ? "#{sudo('env')} http_proxy=#{http_proxy} #{pm}" : sudo(pm).to_s
+        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
@@ -359,17 +364,30 @@ module Kitchen
       end
 
       def gem_proxy_parm
-        http_proxy ? "--http-proxy #{http_proxy}" : nil
+        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
-        http_proxy ? "-e use_proxy=yes -e http_proxy=#{http_proxy}" : nil
+        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 chef_url
         config[:chef_bootstrap_url]
       end

data/lib/kitchen/provisioner/puppet_apply.rb

@@ -78,6 +78,7 @@ module Kitchen
 
       default_config :http_proxy, nil
       default_config :https_proxy, nil
+      default_config :no_proxy, nil
 
       default_config :ignored_paths_from_root, ['spec']
       default_config :hiera_data_remote_path, '/var/lib/hiera'
@@ -431,6 +432,7 @@ module Kitchen
             echo '-----> Installing Chef Omnibus to install busser to run tests'
             #{export_http_proxy_parm}
             #{export_https_proxy_parm}
+            #{export_no_proxy_parm}
             do_download #{chef_url} /tmp/install.sh
             #{sudo('sh')} /tmp/install.sh
           fi
@@ -450,6 +452,7 @@ module Kitchen
           echo "-----> Installing Puppet Omnibus"
           #{export_http_proxy_parm}
           #{export_https_proxy_parm}
+          #{export_no_proxy_parm}
           do_download #{config[:puppet_omnibus_url]} /tmp/install_puppet.sh
           #{sudo_env('sh')} /tmp/install_puppet.sh #{version}
         fi
@@ -938,7 +941,8 @@ module Kitchen
       def sudo_env(pm)
         s = https_proxy ? "https_proxy=#{https_proxy}" : nil
         p = http_proxy ? "http_proxy=#{http_proxy}" : nil
-        p || s ? "#{sudo('env')} #{p} #{s} #{pm}" : sudo(pm).to_s
+        n = no_proxy ? "no_proxy=#{no_proxy}" : nil
+        p || s ? "#{sudo('env')} #{p} #{s} #{n} #{pm}" : sudo(pm).to_s
       end
 
       def remove_puppet_repo
@@ -1057,13 +1061,16 @@ module Kitchen
       end
 
       def gem_proxy_parm
-        http_proxy ? "--http-proxy #{http_proxy}" : nil
+        p = http_proxy ? "--http-proxy #{http_proxy}" : nil
+        n = no_proxy ? "--no-http-proxy #{no_proxy}" : nil
+        p || n ? "#{p} #{n}" : nil
       end
 
       def wget_proxy_parm
         p = http_proxy ? "-e http_proxy=#{http_proxy}" : nil
         s = https_proxy ? "-e https_proxy=#{https_proxy}" : nil
-        p || s ? "-e use_proxy=yes #{p} #{s}" : nil
+        n = no_proxy ? "-e no_proxy=#{no_proxy}" : nil
+        p || s ? "-e use_proxy=yes #{p} #{s} #{n}" : nil
       end
 
       def posh_proxy_parm
@@ -1084,6 +1091,10 @@ module Kitchen
         https_proxy ? "export https_proxy=#{https_proxy}" : nil
       end
 
+      def export_no_proxy_parm
+        no_proxy ? "export no_proxy=#{no_proxy}" : nil
+      end
+
       def http_proxy
         config[:http_proxy]
       end
@@ -1092,6 +1103,10 @@ module Kitchen
         config[:https_proxy]
       end
 
+      def no_proxy
+        config[:no_proxy]
+      end
+
       def chef_url
         config[:chef_bootstrap_url]
       end
@@ -1151,38 +1166,50 @@ module Kitchen
 
         FileUtils.mkdir_p(tmpmodules_dir)
         resolve_with_librarian if File.exist?(puppetfile) && config[:resolve_with_librarian_puppet]
+        modules_to_copy = {}
 
-        if modules && modules.include?(':')
-          debug('Found multiple directories in module path merging.....')
+        # If root dir (.) is a module, add it for copying
+        self_name = read_self_module_name
+        modules_to_copy[self_name] = '.' if self_name
+
+        if modules
           modules_array = modules.split(':')
-          modules_array.each do |m|
-            copy_modules(m, tmpmodules_dir)
+          modules_array.each do |m_path|
+            Dir.glob("#{m_path}/*").each do |m|
+              name = File.basename(m)
+              if modules_to_copy.include? name
+                debug("Found duplicated module: #{name}. The path taking precedence: '#{modules_to_copy[name]}', ignoring '#{m}'")
+              else
+                modules_to_copy[name] = m
+              end
+            end
           end
-        elsif modules
-          copy_modules(modules, tmpmodules_dir)
-        else
-          info 'nothing to do for modules'
         end
 
-        copy_self_as_module
+        if modules_to_copy.empty?
+          info 'Nothing to do for modules'
+        else
+          copy_modules(modules_to_copy, tmpmodules_dir)
+        end
       end
 
-      def copy_modules(source, destination)
-        return unless File.directory?(source)
-
-        debug("Copying modules from #{source} to #{destination}")
-
+      def copy_modules(modules, destination)
         excluded_paths = %w(modules pkg) + config[:ignored_paths_from_root]
-
-        Dir.glob("#{source}/*").each do |f|
-          module_name = File.basename(f)
-          target = "#{destination}/#{module_name}"
+        debug("Copying modules to directory: #{destination}")
+        modules.each do |name, source|
+          next unless File.directory?(source)
+          debug("Copying module #{name} from #{source}...")
+          target = "#{destination}/#{name}"
           FileUtils.mkdir_p(target) unless File.exist? target
-          FileUtils.cp_r(Dir.glob("#{source}/#{module_name}/*").reject { |entry| entry =~ /#{excluded_paths.join('$|')}$/ }, target, remove_destination: true)
+          FileUtils.cp_r(
+            Dir.glob("#{source}/*").reject { |entry| entry =~ /#{excluded_paths.join('$|')}$/ },
+            target,
+            remove_destination: true
+          )
         end
       end
 
-      def copy_self_as_module
+      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')
         end
@@ -1192,20 +1219,10 @@ module Kitchen
         begin
           module_name = JSON.parse(IO.read(metadata_json))['name'].split('-').last
         rescue
-          error("not able to load or parse #{metadata_json_path} for the name of the module")
+          error("not able to load or parse #{metadata_json} for the name of the module")
         end
 
-        return unless module_name
-        module_target_path = File.join(sandbox_path, 'modules', module_name)
-        FileUtils.mkdir_p(module_target_path)
-
-        excluded_paths = %w(modules pkg) + config[:ignored_paths_from_root]
-
-        FileUtils.cp_r(
-          Dir.glob(File.join(config[:kitchen_root], '*')).reject { |entry| entry =~ /#{excluded_paths.join('$|')}$/ },
-          module_target_path,
-          remove_destination: true
-        )
+        module_name
       end
 
       def prepare_puppet_config

data/provisioner_options.md

@@ -62,6 +62,7 @@ manifest | 'site.pp' | manifest for puppet apply to run
 manifests_path | | puppet repo manifests directory
 max_retries| 1 | maximum number of retry attempts of converge command
 modules_path | | puppet repo manifests directory. Can be multiple directories separated by colons and then they will be merged
+no_proxy | nil | list of URLs or IPs that should be excluded from proxying 
 platform | platform_name kitchen.yml parameter | OS platform of server
 puppet_apply_command | nil | Overwrite the puppet apply command. Needs "sudo -E puppet apply" as a prefix.
 puppet_apt_repo | "http://apt.puppetlabs.com/puppetlabs-release-precise.deb"| apt repo Ubuntu12 see https://apt.puppetlabs.com for others
@@ -227,6 +228,8 @@ puppet_agent_command | nil | Overwrite the puppet agent command. Needs "sudo -E
 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
 http_proxy | nil | use http proxy when installing puppet and packages
+https_proxy | nil | use https proxy when installing puppet and packages
+no_proxy | nil | list of URLs or IPs that should be excluded from proxying
 ignore_spec_fixtures | | ignore spec/fixtures directory
 
 NOTE: Puppet Collections Support not in puppet agent yet

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-puppet
 version: !ruby/object:Gem::Version
-  version: 1.47.2
+  version: 1.47.3
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-24 00:00:00.000000000 Z
+date: 2017-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: "[none]"
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: puppet provisioner for test-kitchen