kitchen-puppet 1.46.2 → 1.46.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b50b0b38f7d949f0d3e44755a61dbb0da1241e2
-  data.tar.gz: e7669336277eeaa4c5d480d1006c8528b78bde3f
+  metadata.gz: 453a104e476a43094a963f5395d69e4654efe766
+  data.tar.gz: 88bb2dde065c442d9c8658004f5802b277434530
 SHA512:
-  metadata.gz: f197e97a0e3d34ef15ddf2b3aa496f0409982e42b15c6c69224ba1484f05c903437d62ef9df0e74eed53c9c9993b12e2c6b5a45143bece82f7064881ad47ee6b
-  data.tar.gz: 9476964e13a4801a1f42908f515ce9978cb13ba3eacecb3b219779dab733cdb20109d84d8422ff5d139d7e20baad3e5362c2d727a0e78e0b653edd0f37a180fb
+  metadata.gz: 7f1049065ed3df321f857872606bf98ea10b8dd971fac43afccc4a14d8fbddc3d55671677979c94d453794b85fa5d93fcaf0865a2279adfda2a83045c0f1fb34
+  data.tar.gz: d9fb9b6efaef7bcf2378641f698073f551ce18a931ede8941c33808f58fa4806ac3d28cb073c4d84310d5a2de6137dc855d1d814e220999cfc1b5e0744dc09f5

data/lib/kitchen-puppet/version.rb

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

data/lib/kitchen/provisioner/puppet_apply.rb

@@ -227,6 +227,7 @@ module Kitchen
             INSTALL
           when /^windows.*/
             info("Installing puppet on #{puppet_platform}")
+            info('Powershell is not recognised by core test-kitchen assuming it is present') unless powershell_shell?
             <<-INSTALL
               if(Get-Command puppet -ErrorAction 0) { return; }
               $architecture = if( [Environment]::Is64BitOperatingSystem ) { '-x64' } else { '' }
@@ -665,7 +666,7 @@ module Kitchen
           ].join(' ')
         end
 
-        command = powershell_shell? ? commands.join('; ') : commands.join(' && ')
+        command = powershell? ? commands.join('; ') : commands.join(' && ')
         debug(command)
         command
       end
@@ -822,7 +823,7 @@ module Kitchen
       end
 
       def puppet_cmd
-        return '& "C:\Program Files\Puppet Labs\Puppet\bin\puppet"' if powershell_shell?
+        return '& "C:\Program Files\Puppet Labs\Puppet\bin\puppet"' if powershell?
 
         puppet_bin = config[:require_puppet_collections] ? "#{config[:puppet_coll_remote_path]}/bin/puppet" : 'puppet'
 
@@ -834,12 +835,12 @@ module Kitchen
       end
 
       def puppet_dir
-        return 'C:/ProgramData/PuppetLabs/puppet/etc' if powershell_shell?
+        return 'C:/ProgramData/PuppetLabs/puppet/etc' if powershell?
         config[:require_puppet_collections] ? '/etc/puppetlabs/puppet' : '/etc/puppet'
       end
 
       def hiera_config_dir
-        return 'C:/ProgramData/PuppetLabs/puppet/etc' if powershell_shell?
+        return 'C:/ProgramData/PuppetLabs/puppet/etc' if powershell?
         config[:require_puppet_collections] ? '/etc/puppetlabs/code' : '/etc/puppet'
       end
 
@@ -878,7 +879,7 @@ module Kitchen
       def puppet_manifestdir
         return nil if config[:require_puppet_collections]
         return nil if config[:puppet_environment]
-        return nil if powershell_shell?
+        return nil if powershell?
         bash_vars = "export MANIFESTDIR='#{File.join(config[:root_path], 'manifests')}';"
         debug(bash_vars)
         bash_vars
@@ -955,7 +956,7 @@ module Kitchen
       def custom_facts
         return nil if config[:custom_facts].none?
         return nil if config[:install_custom_facts]
-        if powershell_shell?
+        if powershell?
           environment_vars = config[:custom_facts].map { |k, v| "$env:FACTER_#{k}='#{v}'" }.join('; ')
           environment_vars = "#{environment_vars};"
         else
@@ -980,8 +981,8 @@ module Kitchen
 
       def puppet_whitelist_exit_code
         if config[:puppet_whitelist_exit_code].nil?
-          powershell_shell? ? '; exit $LASTEXITCODE' : nil
-        elsif powershell_shell?
+          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'
@@ -1057,6 +1058,12 @@ module Kitchen
         http_proxy ? "-Proxy #{http_proxy}" : nil
       end
 
+      def powershell?
+        return true if powershell_shell?
+        return true if puppet_platform =~ /^windows.*/
+        false
+      end
+
       def export_http_proxy_parm
         http_proxy ? "export http_proxy=#{http_proxy}" : nil
       end
@@ -1257,23 +1264,23 @@ module Kitchen
       end
 
       def cp_command
-        return 'cp -force' if powershell_shell?
+        return 'cp -force' if powershell?
         'cp'
       end
 
       def rm_command
-        return 'rm -force -recurse' if powershell_shell?
+        return 'rm -force -recurse' if powershell?
         'rm -rf'
       end
 
       def mkdir_command
-        return 'mkdir -force -path' if powershell_shell?
+        return 'mkdir -force -path' if powershell?
         'mkdir -p'
       end
 
       def rm_command_paths(paths)
         return :nil if paths.length.zero?
-        return "#{rm_command} \"#{paths.join('", "')}\"" if powershell_shell?
+        return "#{rm_command} \"#{paths.join('", "')}\"" if powershell?
         "#{rm_command} #{paths.join(' ')}"
       end
     end

metadata

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