beaker-pe 2.11.7 → 2.11.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2729fa197d07e6977316382ea5621a152a0d740a19b1bd8639101867384eb15f
-  data.tar.gz: 434680a7743f98182d0a2261c5151b204bd1e0439cf4532ce249bdfb93e2ac14
+  metadata.gz: 405e2df559bbc58f3276296b09461c2fbf9096b5d88061097a69dab3877ab982
+  data.tar.gz: 00479874f7c314e0f5e803ecdfab2ea0158dff21648b3a08f64f9ca1d67b80bf
 SHA512:
-  metadata.gz: 024973babe90a837c4c86b3efecfe5792dc1610eae356a3e05abd54ecafb529640b616923aa674e51c125a4bd4405b67ab15dfaac82f391a9aa7a1cbafb5513c
-  data.tar.gz: 884e05b5a6a9e0c0a43420f5fa71bd5c805cc641d2b5cf5bcd3ff9eb2f359bd239c297d93e2405cad89bd06805430006d59666fb4903e9a44d78da9905f9341a
+  metadata.gz: 99b201517f264cdd54d12d535ed683d25f90ef86c7529b5190e63091b37088d5c63169df621b8aedabd5b98510f4a65bececcbbd3efa9286120c2705f4787789
+  data.tar.gz: 36f09dc7bb699212210eab2385bdcebda15194f5f4f0a9796599115e6076c94e7339fd67c87fc1e41d6069ba1154ef98a5e53197b457b9845fd49700880e5d01

data/beaker-pe.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec-its'
   s.add_development_dependency 'fakefs', '~> 0.6', '< 0.14.0'
   s.add_development_dependency 'rake', '~> 12.3.3'
-  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'simplecov', '= 0.18.5'
   s.add_development_dependency 'pry', '~> 0.10'
 
   # Documentation dependencies

data/lib/beaker-pe/install/pe_utils.rb

@@ -1047,7 +1047,11 @@ module Beaker
           facts_result = on(master, 'puppet facts')
           raise ArgumentError, fail_message if facts_result.exit_code != 0
           facts_hash = JSON.parse(facts_result.stdout.chomp)
-          puppet_agent_version = facts_hash['values']['aio_agent_version']
+          # In Puppet 7, facts are at the top level of the hash. Before that
+          # version, they were wrapped inside a `values` key. Since we're
+          # trying to determine the agent version here, we can't just switch
+          # our behavior by agent version, so we check both possible locations.
+          puppet_agent_version = facts_hash['aio_agent_version'] || facts_hash.dig('values', 'aio_agent_version')
           raise ArgumentError, fail_message if puppet_agent_version.nil?
           logger.warn("#{log_prefix} Read puppet-agent version #{puppet_agent_version} from master")
           # saving so that we don't have to query the master more than once

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '2.11.7'
+        STRING = '2.11.8'
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 2.11.7
+  version: 2.11.8
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-12 00:00:00.000000000 Z
+date: 2020-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -76,16 +76,16 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.5
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement