kitchen-puppet 1.46.1 → 1.46.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d4d106abb0a6bbd0faae002756bb884faeed419
-  data.tar.gz: 105f006fd5430f78e31436e97576b014349bc879
+  metadata.gz: 5b50b0b38f7d949f0d3e44755a61dbb0da1241e2
+  data.tar.gz: e7669336277eeaa4c5d480d1006c8528b78bde3f
 SHA512:
-  metadata.gz: aeabced81a5ae2344d5e694ddd8f47984df3737c18028532cc0c6b6ebbc1d46c5230c73fa35d8d6081b13c02354139a8ef848d6231d58cbe626fc7e675d12eb3
-  data.tar.gz: 5099f121a88631ceeaf0a8d7b202fa1e44c443e00c51e683af91d8c4097a7f247bcacc11c4b844dbbaebe9af0d57e6132f0c18823021a5e7e58714ed7f405406
+  metadata.gz: f197e97a0e3d34ef15ddf2b3aa496f0409982e42b15c6c69224ba1484f05c903437d62ef9df0e74eed53c9c9993b12e2c6b5a45143bece82f7064881ad47ee6b
+  data.tar.gz: 9476964e13a4801a1f42908f515ce9978cb13ba3eacecb3b219779dab733cdb20109d84d8422ff5d139d7e20baad3e5362c2d727a0e78e0b653edd0f37a180fb

data/lib/kitchen-puppet/version.rb

@@ -2,6 +2,6 @@
 
 module Kitchen
   module Puppet
-    VERSION = '1.46.1'.freeze
+    VERSION = '1.46.2'.freeze
   end
 end

data/lib/kitchen/provisioner/puppet_apply.rb

@@ -235,12 +235,8 @@ module Kitchen
               } else {
                   $MsiUrl = "https://downloads.puppetlabs.com/windows/puppet-#{puppet_windows_version}${architecture}.msi"
               }
-              if http_proxy
-                wget $MsiUrl -UseBasicParsing -OutFile "C:/puppet.msi" -Proxy #{http_proxy}
-                $process = Start-Process -FilePath msiexec.exe -Wait -PassThru -ArgumentList '/qn', '/norestart', '/i', 'C:\\puppet.msi'
-              else
-                $process = Start-Process -FilePath msiexec.exe -Wait -PassThru -ArgumentList '/qn', '/norestart', '/i', $MsiUrl
-              end
+              wget $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."
                   Exit 1
@@ -332,12 +328,8 @@ module Kitchen
             } else {
                 $MsiUrl = "https://downloads.puppetlabs.com/windows/puppet-agent-#{puppet_windows_version}-${architecture}.msi"
             }
-            if http_proxy
-              wget $MsiUrl -UseBasicParsing -OutFile "C:/puppet.msi" -Proxy #{http_proxy}
-              $process = Start-Process -FilePath msiexec.exe -Wait -PassThru -ArgumentList '/qn', '/norestart', '/i', 'C:\\puppet.msi'
-            else
-              $process = Start-Process -FilePath msiexec.exe -Wait -PassThru -ArgumentList '/qn', '/norestart', '/i', $MsiUrl
-            end
+            wget $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."
                 Exit 1
@@ -1061,6 +1053,10 @@ module Kitchen
         p || s ? "-e use_proxy=yes #{p} #{s}" : nil
       end
 
+      def posh_proxy_parm
+        http_proxy ? "-Proxy #{http_proxy}" : nil
+      end
+
       def export_http_proxy_parm
         http_proxy ? "export http_proxy=#{http_proxy}" : nil
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-puppet
 version: !ruby/object:Gem::Version
-  version: 1.46.1
+  version: 1.46.2
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-09 00:00:00.000000000 Z
+date: 2017-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen