beaker-puppet 1.18.15 → 1.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d7464999b32767212b3ba2f20b6018446e11d2d87a1c4b05b623c82b2cd1112
-  data.tar.gz: 96e6513d7e477276ac30d4c380d79f70e37a2ccad1ac87f9dc197d57c9ec60f9
+  metadata.gz: 60bedb07e0d938657c68fd639602effabaad255ed36f6df717c5dd54ec78e02d
+  data.tar.gz: 6bb70062423ad0789c073f553454e99c68ee4cd0c534523e7403a2167730219b
 SHA512:
-  metadata.gz: df1b72ec841b70eac0fa3bab3ad731b22c0070b2303178f0da110fbe728de077f31a1e4ada11b71c008cf9785decd947df2ca7bf4845ad23ab3f7706362b26fd
-  data.tar.gz: 690d02f1c91398b44ec9eb3a10440349e6b4ba05258a3be48885124bf6c0bf673f99648efffed0244328476c0da6dba5fb5629c57cadf8f945c1efbb737ed776
+  metadata.gz: 15ad14bf1ba9ca281a89eba2f91b8345b93fcdc4652680ab3ba662bdc545d416d17ec04845393d6dd87568725dd97b2cde032483dde2e8cf33155e66d5a329eb
+  data.tar.gz: 637788b471cd1be8902dbe2feb12eeb3112a80c7542adbed718a1511ad757cdd7cef3802783165ac50ef90e995972dbb6765659052b986663b57ea61003f3cf1

data/acceptance/pre_suite/pkg/install.rb

@@ -4,8 +4,8 @@ require 'beaker-puppet'
 # all versions are required for osx
 hosts.each do |host|
   install_puppet_on(host, {
-    :version        => ENV['BEAKER_PUPPET_VERSION'] || '5.5.13',
-    :puppet_agent_version => ENV['BEAKER_PUPPET_AGENT_VERSION'] || '5.5.13'
+    :version        => ENV['BEAKER_PUPPET_VERSION'] || '5.5.20',
+    :puppet_agent_version => ENV['BEAKER_PUPPET_AGENT_VERSION'] || '5.5.20'
   })
 
   on(host, puppet('resource user puppet ensure=present'))

data/beaker-puppet.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'rspec-its'
   s.add_development_dependency 'fakefs', '~> 0.6', '< 0.14.0'
-  s.add_development_dependency 'rake', '~> 10.1'
+  s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'pry', '~> 0.10'
 

data/lib/beaker-puppet/install_utils/windows_utils.rb

@@ -115,19 +115,21 @@ module Beaker
           block_on hosts do | host |
             msi_opts['PUPPET_AGENT_STARTUP_MODE'] ||= 'Manual'
             batch_path, log_file = create_install_msi_batch_on(host, msi_path, msi_opts)
-
+            # Powershell command looses an escaped slash resulting in cygwin relative path
+            # See https://github.com/puppetlabs/beaker/pull/1626#issuecomment-621341555
+            log_file_escaped = log_file.gsub('\\','\\\\\\')
             # begin / rescue here so that we can reuse existing error msg propagation
             begin
               # 1641 = ERROR_SUCCESS_REBOOT_INITIATED
               # 3010 = ERROR_SUCCESS_REBOOT_REQUIRED
               on host, Command.new("\"#{batch_path}\"", [], { :cmdexe => true }), :acceptable_exit_codes => [0, 1641, 3010]
             rescue
-              logger.info(file_contents_on(host, log_file))
+              logger.info(file_contents_on(host, log_file_escaped))
               raise
             end
 
             if opts[:debug]
-              logger.info(file_contents_on(host, log_file))
+              logger.info(file_contents_on(host, log_file_escaped))
             end
 
             unless host.is_cygwin?
@@ -201,20 +203,22 @@ module Beaker
         def generic_install_msi_on(hosts, msi_path, msi_opts = {}, opts = {})
           block_on hosts do | host |
             batch_path, log_file = create_install_msi_batch_on(host, msi_path, msi_opts)
-
+            # Powershell command looses an escaped slash resulting in cygwin relative path
+            # See https://github.com/puppetlabs/beaker/pull/1626#issuecomment-621341555
+            log_file_escaped = log_file.gsub('\\','\\\\\\')
             # begin / rescue here so that we can reuse existing error msg propagation
             begin
               # 1641 = ERROR_SUCCESS_REBOOT_INITIATED
               # 3010 = ERROR_SUCCESS_REBOOT_REQUIRED
               on host, Command.new("\"#{batch_path}\"", [], { :cmdexe => true }), :acceptable_exit_codes => [0, 1641, 3010]
             rescue
-              logger.info(file_contents_on(host, log_file))
+              logger.info(file_contents_on(host, log_file_escaped))
 
               raise
             end
 
             if opts[:debug]
-              logger.info(file_contents_on(host, log_file))
+              logger.info(file_contents_on(host, log_file_escaped))
             end
 
             host.close unless host.is_cygwin?

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '1.18.15'
+  VERSION = '1.19.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 1.18.15
+  version: 1.19.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2020-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement