kitchen-puppet 1.48.0 → 1.48.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 942ab91b20ef7cd39f819db78b5f6beb9f7a6bd5
-  data.tar.gz: 6f214a9565ccf1b9db8508d939971b63dafb2097
+  metadata.gz: debd28736910200661dc96c3c1bf12549f57e75c
+  data.tar.gz: 8d0813e4a2007ec467241a9335df5d8401f67aac
 SHA512:
-  metadata.gz: 835b2f4473b1531a4a841abc509be2c411afe12c5b168b157a4f4eb62eaacd1bef813497f682db440d054a96c4b679a9e1b310fac631adf92000a9e0d5c4d0d2
-  data.tar.gz: 99cbab9178d8b3a63aa10522431bd1c7a9691bc0dadd78466a0ff5bfa8701734905d03acfe61a389b5de4d528b472c1ef9edf20b612abb527e715ff8abecadd0
+  metadata.gz: 20babd32d215eb95382eb4b9d82619c12b70df547c46995f7d9a03aa021a728d9d4893d8c7936a3587a911b58eb994cc0689ed1d33bf57091702eef3a91e8934
+  data.tar.gz: 153af5383999fe6ce89afcd1c481a21b92721e3329e99549869561b933dc2d5c0f88e7d3d950d82d63c386f6d25544ca3b489b17776159c028bcad89e6d8338c

data/kitchen-puppet.gemspec

@@ -23,13 +23,13 @@ Gem::Specification.new do |s|
     s.add_dependency 'net-ssh', '~> 2.9'
   end
   s.description = <<-EOF
-== DESCRIPTION:
+  == DESCRIPTION:
 
-Puppet Provisioner for Test Kitchen
+  Puppet Provisioner for Test Kitchen
 
-== FEATURES:
+  == FEATURES:
 
-Supports puppet apply, puppet agent, hiera, hiera-eyaml, hiera-eyaml-gpg, custom facts, librarian-puppet, puppet collections (v4)
+  Supports puppet apply, puppet agent, hiera, hiera-eyaml, hiera-eyaml-gpg, custom facts, librarian-puppet, puppet collections (v4)
 
 EOF
 end

data/lib/kitchen-puppet/version.rb

@@ -2,6 +2,6 @@
 
 module Kitchen
   module Puppet
-    VERSION = '1.48.0'.freeze
+    VERSION = '1.48.1'.freeze
   end
 end

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

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+
 #
 # Author:: Fletcher Nichol (<fnichol@nichol.ca>) Neill Turner (<neillwturner@gmail.com>)
 #

data/lib/kitchen/provisioner/puppet_agent.rb

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+
 #
 # Author:: Chris Lundquist (<chris.lundquist@github.com>) Neill Turner (<neillwturner@gmail.com>)
 #
@@ -27,7 +28,7 @@ require 'kitchen/provisioner/puppet/librarian'
 module Kitchen
   class Busser
     def non_suite_dirs
-      %w(data data_bags environments nodes roles puppet)
+      %w[data data_bags environments nodes roles puppet]
     end
   end
 

data/lib/kitchen/provisioner/puppet_apply.rb

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+
 #
 # Author:: Chris Lundquist (<chris.lundquist@github.com>) Neill Turner (<neillwturner@gmail.com>)
 #
@@ -28,7 +29,7 @@ require 'kitchen/provisioner/puppet/librarian'
 module Kitchen
   class Busser
     def non_suite_dirs
-      %w(data data_bags environments nodes roles puppet)
+      %w[data data_bags environments nodes roles puppet]
     end
   end
 
@@ -240,7 +241,7 @@ module Kitchen
               } else {
                   $MsiUrl = "https://downloads.puppetlabs.com/windows/puppet-#{puppet_windows_version}${architecture}.msi"
               }
-              wget $MsiUrl -UseBasicParsing -OutFile "C:/puppet.msi" #{posh_proxy_parm}
+              Invoke-WebRequest $MsiUrl -UseBasicParsing -OutFile "C:/puppet.msi" #{posh_proxy_parm}
               $process = Start-Process -FilePath msiexec.exe -Wait -PassThru -ArgumentList '/qn', '/norestart', '/i', 'C:\\puppet.msi'
               if ($process.ExitCode -ne 0) {
                   Write-Host "Installer failed."
@@ -333,7 +334,7 @@ module Kitchen
             } else {
                 $MsiUrl = "https://downloads.puppetlabs.com/windows/puppet-agent-#{puppet_windows_version}-${architecture}.msi"
             }
-            wget $MsiUrl -UseBasicParsing -OutFile "C:/puppet-agent.msi" #{posh_proxy_parm}
+            Invoke-WebRequest $MsiUrl -UseBasicParsing -OutFile "C:/puppet-agent.msi" #{posh_proxy_parm}
             $process = Start-Process -FilePath msiexec.exe -Wait -PassThru -ArgumentList '/qn', '/norestart', '/i', 'C:\\puppet-agent.msi'
             if ($process.ExitCode -ne 0) {
                 Write-Host "Installer failed."
@@ -519,7 +520,7 @@ module Kitchen
       end
 
       def init_command
-        todelete = %w(modules manifests files hiera hiera.yaml facter spec enc)
+        todelete = %w[modules manifests files hiera hiera.yaml facter spec enc]
                    .map { |dir| File.join(config[:root_path], dir) }
         todelete += [hiera_data_remote_path,
                      '/etc/hiera.yaml',
@@ -788,7 +789,12 @@ module Kitchen
 
       def hiera_data_remote_path
         return config[:hiera_data_remote_path] if config[:hiera_data_remote_path]
-        powershell? ? 'C:/ProgramData/PuppetLabs/hiera/var' : '/var/lib/hiera'
+
+        if config[:require_puppet_collections]
+          powershell? ? 'C:/ProgramData/PuppetLabs/code/environments/production/hieradata' : '/etc/puppetlabs/code/environments/production/hieradata'
+        else
+          powershell? ? 'C:/ProgramData/PuppetLabs/hiera/var' : '/var/lib/hiera'
+        end
       end
 
       def hiera_writer
@@ -965,7 +971,7 @@ module Kitchen
 
       def facterlib
         factpath = nil
-        factpath = File.join(config[:root_path], 'facter').to_s if config[:install_custom_facts] && !config[:custom_facts].none?
+        factpath = File.join(config[:root_path], 'facter').to_s if config[:install_custom_facts] && config[:custom_facts].any?
         factpath = File.join(config[:root_path], 'facter').to_s if config[:facter_file]
         factpath = "#{factpath}:" if config[:facterlib] && !factpath.nil?
         factpath = "#{factpath}#{config[:facterlib]}" if config[:facterlib]
@@ -1200,7 +1206,7 @@ module Kitchen
       end
 
       def copy_modules(modules, destination)
-        excluded_paths = %w(modules pkg) + config[:ignored_paths_from_root]
+        excluded_paths = %w[modules pkg] + config[:ignored_paths_from_root]
         debug("Copying modules to directory: #{destination}")
         modules.each do |name, source|
           next unless File.directory?(source)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-puppet
 version: !ruby/object:Gem::Version
-  version: 1.48.0
+  version: 1.48.1
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-24 00:00:00.000000000 Z
+date: 2017-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -38,14 +38,14 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3'
-description: |+
-  == DESCRIPTION:
+description: |2+
+    == DESCRIPTION:
 
-  Puppet Provisioner for Test Kitchen
+    Puppet Provisioner for Test Kitchen
 
-  == FEATURES:
+    == FEATURES:
 
-  Supports puppet apply, puppet agent, hiera, hiera-eyaml, hiera-eyaml-gpg, custom facts, librarian-puppet, puppet collections (v4)
+    Supports puppet apply, puppet agent, hiera, hiera-eyaml, hiera-eyaml-gpg, custom facts, librarian-puppet, puppet collections (v4)
 
 email:
 - neillwturner@gmail.com