kitchen-pester 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09484ef2e5522d84210a1a61d4b073e69cf0c16b9c1c04675fcb9ef0d8c734e2'
-  data.tar.gz: 4d503946de43116dd54786eba30913c6f095e1b4bbc9d5bbce72417e0a7cac2d
+  metadata.gz: 035e3a6cc233184cbefdf808a6712b7fc538d89cb4bc6613e66e073514e54280
+  data.tar.gz: 5981514b90ce8c1ecf2f81e213f22eacd5cb88acf986b66266cadcd47f40809e
 SHA512:
-  metadata.gz: ed143b476765bb34ee3897284f377e28e9fdd6f60072035d59007db91f7a774e5c0d0c0e975aafb856d8042796abbce77cb954ca3c53a43ba25b05bb7af5cdbd
-  data.tar.gz: 53e54218891590a598aee9718cb5d9137f569784bf3864b8d81a7a9d860a83f8dd033d542c99e51404fe4a75de66a991bce734d4628f8823f52d0b477519c5bc
+  metadata.gz: 3ad622c48d073d4f8ea62badd283dc87bc2f9d81277089a2a5078e6c00c9b9f0f8aacebbfa1e4436e8ef0d2f3e815aac3fc6b333946e5a1f5df875a7de8d9d62
+  data.tar.gz: c232cfd8ba4e99c94be84b6af8e3328c15d080cb6691237ff40760c8cbc2a1703dc86ec831828340a412cef38c0ffedf366cd2f6dbee4d8c514d3e5a8f8713a8

data/Gemfile

@@ -11,12 +11,12 @@ group :integration do
 end
 
 group :changelog do
-  gem "github_changelog_generator", "1.15.0"
+  gem "github_changelog_generator", "1.15.2"
 end
 
 group :debug do
-  gem "pry"
-  gem "pry-byebug"
+  gem "pry", "~>0.13.1"
+  gem "pry-byebug", "~>3.8.0"
   gem "pry-stack_explorer"
 end
 

data/lib/kitchen/verifier/pester.rb

@@ -123,14 +123,19 @@ module Kitchen
       # private
       def run_command_script
         <<-CMD
-          Import-Module Pester -Force
+          Import-Module -Name Pester -Force
+
           $TestPath = "#{config[:root_path]}"
-          $OutputFilePath = $TestPath | Join-Path -ChildPath 'PesterTestResults.xml'
+          $OutputFilePath = Join-Path $TestPath -ChildPath 'PesterTestResults.xml'
+
+          $options = New-PesterOption -TestSuiteName "Pester - #{instance.to_str}"
 
-          $result = Invoke-Pester -OutputFile $OutputFilePath -OutputFormat NUnitXml -Path $TestPath -Passthru
+          $result = Invoke-Pester -Script $TestPath -OutputFile $OutputFilePath -OutputFormat NUnitXml -PesterOption $option -PassThru
           $result | Export-CliXml -Path (Join-Path -Path $TestPath -ChildPath 'result.xml')
+
           $LASTEXITCODE = $result.FailedCount
           $host.SetShouldExit($LASTEXITCODE)
+
           exit $LASTEXITCODE
         CMD
       end
@@ -141,102 +146,140 @@ module Kitchen
 
       def use_local_powershell_modules(script)
         <<-EOH
-          set-executionpolicy unrestricted -force;
+          try {
+              Set-ExecutionPolicy Unrestricted -force
+          }
+          catch {
+              $_ | Out-String | Write-Warning
+          }
+
           $global:ProgressPreference = 'SilentlyContinue'
-          $env:psmodulepath += ";$(join-path (resolve-path $env:temp).path 'verifier/modules')"
+          $env:PSModulePath = "$(Join-Path (Get-Item -Path $env:TEMP).FullName -ChildPath 'verifier/modules');$env:PSModulePath"
+
           #{script}
         EOH
       end
 
       def install_command_script
         <<-EOH
-          [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-          function directory($path){
-            if (test-path $path) {(resolve-path $path).providerpath}
-            else {(resolve-path (mkdir $path)).providerpath}
+          [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12
+
+          function Confirm-Directory {
+              [CmdletBinding()]
+              param($Path)
+
+              $Item = if (Test-Path $Path) {
+                  Get-Item -Path $Path
+              }
+              else {
+                  New-Item -Path $Path -ItemType Directory
+              }
+
+              $Item.FullName
           }
-          $VerifierModulePath = directory $env:temp/verifier/modules
-          $VerifierTestsPath = directory $env:temp/verifier/pester
 
-    $env:psmodulepath += ";$VerifierModulePath"
-          function test-module($module){
-            (get-module $module -list) -ne $null
+          function Test-Module {
+              [CmdletBinding()]
+              param($Name)
+
+              @(Get-Module -Name $Name -ListAvailable -ErrorAction SilentlyContinue).Count -gt 0
           }
-          if (-not (test-module pester)) {
-            if (test-module PowerShellGet){
-              import-module PowerShellGet -force
-              import-module PackageManagement -force
-              get-packageprovider -name NuGet -force | out-null
-              install-module Pester -force
-            }
-            else {
-              if (-not (test-module PsGet)){
-              $wc = New-Object -TypeName Net.WebClient
-
-              if($env:http_Proxy){
-                if($env:no_proxy){
-                  Write-Output "Creating WebProxy with 'http_proxy' and 'no_proxy' environment variables.
-                    $webproxy = New-Object System.Net.WebProxy($env:http_Proxy,$true,$env:no_proxy)
-                    }else{
-                  Write-Output "Creating WebProxy with 'http_proxy' environment variable.
-                  $webproxy = New-Object -TypeName System.Net.WebProxy -ArgumentList ($env:http_Proxy)
-                }
-
-                $wc.proxy = $webproxy
-              }
 
-              Invoke-Expression -Command $wc.DownloadString('http://bit.ly/GetPsGet')
-              }
-              try {
-                import-module psget -force -erroraction stop
-                Install-Module Pester
+          $VerifierModulePath = Confirm-Directory -Path $env:TEMP/verifier/modules
+          $VerifierTestsPath = Confirm-Directory -Path $env:TEMP/verifier/pester
+
+          $env:PSModulePath = "$VerifierModulePath;$PSModulePath"
+
+          if (-not (Test-Module -Name Pester)) {
+              if (Test-Module -Name PowerShellGet) {
+                  Import-Module PowerShellGet -Force
+                  Import-Module PackageManagement -Force
+
+                  Get-PackageProvider -Name NuGet -Force > $null
+
+                  Install-Module Pester -Force
               }
-              catch {
-                Write-Output "Installing from Github"
-                $zipfile = join-path(resolve-path "$env:temp/verifier") "pester.zip"
-                if (-not (test-path $zipfile)){
-                  $source = 'https://github.com/pester/Pester/archive/3.3.14.zip'
-                  $wc = New-Object -TypeName Net.WebClient
-
-                  if($env:http_Proxy){
-                    if($env:no_proxy){
-                      Write-Output "Creating WebProxy with 'http_proxy' and 'no_proxy' environment variables."
-                      $webproxy = New-Object System.Net.WebProxy($env:http_Proxy,$true,$env:no_proxy)
-                    }else{
-                      Write-Output "Creating WebProxy with 'http_proxy' environment variable."
-                      $webproxy = New-Object -TypeName System.Net.WebProxy -ArgumentList ($env:http_Proxy)
-                    }
-
-                  $wc.proxy = $webproxy
+              else {
+                  if (-not (Test-Module -Name PsGet)){
+                      $webClient = New-Object -TypeName System.Net.WebClient
+
+                      if ($env:HTTP_PROXY){
+                          if ($env:NO_PROXY){
+                              Write-Host "Creating WebProxy with 'HTTP_PROXY' and 'NO_PROXY' environment variables.
+                              $webproxy = New-Object -TypeName System.Net.WebProxy -ArgumentList $env:HTTP_PROXY, $true, $env:NO_PROXY
+                          }
+                          else {
+                              Write-Host "Creating WebProxy with 'HTTP_PROXY' environment variable.
+                              $webproxy = New-Object -TypeName System.Net.WebProxy -ArgumentList $env:HTTP_PROXY
+                          }
+
+                          $webClient.Proxy = $webproxy
+                      }
+
+                      Invoke-Expression -Command $webClient.DownloadString('http://bit.ly/GetPsGet')
                   }
 
-                  [byte[]]$bytes = $wc.DownloadData($source)
-                  [IO.File]::WriteAllBytes($zipfile, $bytes)
-                  $bytes = $null
-                  [gc]::collect()
-                  write-output "Downloaded Pester.zip"
-                }
-                write-output "Creating Shell.Application COM object"
-                $shellcom = new-object -com shell.application
-                Write-Output "Creating COM object for zip file."
-                $zipcomobject = $shellcom.namespace($zipfile)
-                Write-Output "Creating COM object for module destination."
-                $destination = $shellcom.namespace($VerifierModulePath)
-                Write-Output "Unpacking zip file."
-                $destination.CopyHere($zipcomobject.Items(), 0x610)
-                rename-item (join-path $VerifierModulePath "Pester-3.3.14") -newname 'Pester' -force
+                  try {
+                      # If the module isn't already loaded, ensure we can import it.
+                      if (-not (Get-Module -Name PsGet -ErrorAction SilentlyContinue)) {
+                          Import-Module -Name PsGet -Force -ErrorAction Stop
+                      }
+
+                      Install-Module -Name Pester
+                  }
+                  catch {
+                      Write-Host "Installing from Github"
+                      $zipfile = Join-Path (Get-Item -Path "$env:TEMP/module").FullName -ChildPath "pester.zip"
+
+                      if (-not (Test-Path $zipfile)) {
+                          $source = 'https://github.com/pester/Pester/archive/4.10.1.zip'
+                          $webClient = New-Object -TypeName Net.WebClient
+
+                          if ($env:HTTP_PROXY) {
+                              if ($env:NO_PROXY) {
+                                  Write-Host "Creating WebProxy with 'HTTP_PROXY' and 'NO_PROXY' environment variables."
+                                  $webproxy = New-Object -TypeName System.Net.WebProxy -ArgumentList $env:HTTP_PROXY, $true, $env:NO_PROXY
+                              }
+                              else {
+                                  Write-Host "Creating WebProxy with 'HTTP_PROXY' environment variable."
+                                  $webproxy = New-Object -TypeName System.Net.WebProxy -ArgumentList $env:HTTP_PROXY
+                              }
+
+                              $webClient.Proxy = $webproxy
+                          }
+
+                          [IO.File]::WriteAllBytes($zipfile, $webClient.DownloadData($source))
+
+                          [GC]::Collect()
+                          Write-Host "Downloaded Pester.zip"
+                      }
+
+                      Write-Host "Creating Shell.Application COM object"
+                      $shellcom = New-Object -ComObject Shell.Application
+
+                      Write-Host "Creating COM object for zip file."
+                      $zipcomobject = $shellcom.Namespace($zipfile)
+
+                      Write-Host "Creating COM object for module destination."
+                      $destination = $shellcom.Namespace($VerifierModulePath)
+
+                      Write-Host "Unpacking zip file."
+                      $destination.CopyHere($zipcomobject.Items(), 0x610)
+
+                      Rename-Item -Path (Join-Path $VerifierModulePath -ChildPath "Pester-4.10.1") -NewName 'Pester' -Force
+                  }
               }
-            }
           }
-          if (-not (test-module Pester)) {
-            throw "Unable to install Pester.  Please include Pester in your base image or install during your converge."
+
+          if (-not (Test-Module Pester)) {
+              throw "Unable to install Pester.  Please include Pester in your base image or install during your converge."
           }
         EOH
       end
 
       def restart_winrm_service
         cmd = "schtasks /Create /TN restart_winrm /TR " \
-              '"powershell -command restart-service winrm" ' \
+              '"powershell -Command Restart-Service winrm" ' \
               "/SC ONCE /ST 00:00 "
         wrap_shell_code(Util.outdent!(<<-CMD
           #{cmd}
@@ -252,7 +295,7 @@ module Kitchen
           config[:downloads].to_h.each do |remotes, local|
             debug("Downloading #{Array(remotes).join(", ")} to #{local}")
 
-            remotes.each do |file|
+            Array(remotes).each do |file|
               safe_name = instance.name.gsub(/[^0-9A-Z-]/i, "_")
               local_path = File.join(local, safe_name, file)
               remote_path = File.join(config[:root_path], file)

data/lib/kitchen/verifier/pester_version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Verifier
-    PESTER_VERSION = "0.11.0".freeze
+    PESTER_VERSION = "0.12.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-pester
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Steven Murawski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-25 00:00:00.000000000 Z
+date: 2020-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler