beaker-pe 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10177cdb0e10d7ced0328799af5f404a76cb797f2f9e6d5eb388290a445eb5c3
-  data.tar.gz: e393d78f04fbb38da41232103567226fa2af7b900fbb17d54d1665ec1942bd51
+  metadata.gz: 3c0d8e3ba1b40ece8b4ce09269696496f8127b94cbd024a561be03c4329eeea8
+  data.tar.gz: efda94caab15d1fe1a46a7529053dc8c46f22a769740ead35be71e3ab57a1eab
 SHA512:
-  metadata.gz: a3546c0b2d1a457ba94e7e7131e9924c12576ed97cb58fc50687899a3142adfefb3f562a1a8ff3fd7ab473177b5e9e9d9ed025fdc1a03f6e3e4225e5e2586561
-  data.tar.gz: d106d7bc43f5134a55dcdcdc67f9ce89c3498af40174d5a5be47328d981ddea14d4716bd3cf933267b12aef3ea4d784aa9471679bbf2d690ed535fdaea45445d
+  metadata.gz: 9d5f4990007e80482f754be9733776583188b57065e5ce0dbd0e5db27aeaa20c86351098e7409fae2dc63627ee9094effb1953634096937678c06a24eb788ccc
+  data.tar.gz: d50685bbd3c0dec24a7205b5ad009b91a94cd5b8681680a7660d8c33d045b54f64c3de01a3bbb09e98e2b1d8b7a2cb86b9a5cf56b48f50e3ef58e5cedd2f049a

data/.github/workflows/testing.yml

@@ -12,6 +12,7 @@ jobs:
       matrix:
         ruby-version:
           - '2.7'
+          - '3.2'
     steps:
     - uses: actions/checkout@v4
     - name: Set up Ruby

data/CHANGELOG.md

@@ -1,8 +1,64 @@
 # Changelog
 
-## [3.0.1](https://github.com/puppetlabs/beaker-pe/tree/3.0.1) (2024-04-08)
+## [3.4.0](https://github.com/puppetlabs/beaker-pe/tree/3.4.0) (2025-03-12)
 
-[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.0.0...3.0.1)
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.3.1...3.4.0)
+
+**Implemented enhancements:**
+
+- \(PE-40143\) Add ruby 3.2 support [\#285](https://github.com/puppetlabs/beaker-pe/pull/285) ([tvpartytonight](https://github.com/tvpartytonight))
+
+## [3.3.1](https://github.com/puppetlabs/beaker-pe/tree/3.3.1) (2024-12-05)
+
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.3.0...3.3.1)
+
+**Implemented enhancements:**
+
+- \(maint\): Added support for v2 agent download url [\#283](https://github.com/puppetlabs/beaker-pe/pull/283) ([span786](https://github.com/span786))
+
+## [3.3.0](https://github.com/puppetlabs/beaker-pe/tree/3.3.0) (2024-06-21)
+
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/2.19.0...3.3.0)
+
+## [2.19.0](https://github.com/puppetlabs/beaker-pe/tree/2.19.0) (2024-06-21)
+
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.2.0...2.19.0)
+
+**Implemented enhancements:**
+
+- \(PE-38685\) Beaker 6 upgrade [\#281](https://github.com/puppetlabs/beaker-pe/pull/281) ([tlehman](https://github.com/tlehman))
+
+## [3.2.0](https://github.com/puppetlabs/beaker-pe/tree/3.2.0) (2024-06-11)
+
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/2.18.0...3.2.0)
+
+## [2.18.0](https://github.com/puppetlabs/beaker-pe/tree/2.18.0) (2024-06-11)
+
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.1.0...2.18.0)
+
+**Implemented enhancements:**
+
+- \(PE-38522\) Add install\_puppet\_agent\_pe\_promoted\_repo\_on [\#277](https://github.com/puppetlabs/beaker-pe/pull/277) ([tlehman](https://github.com/tlehman))
+
+## [3.1.0](https://github.com/puppetlabs/beaker-pe/tree/3.1.0) (2024-05-22)
+
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/2.17.0...3.1.0)
+
+**Merged pull requests:**
+
+- \(PE-37784\) Remove upper bound for beaker-puppet [\#273](https://github.com/puppetlabs/beaker-pe/pull/273) ([nmburgan](https://github.com/nmburgan))
+
+## [2.17.0](https://github.com/puppetlabs/beaker-pe/tree/2.17.0) (2024-04-10)
+
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.0.1...2.17.0)
+
+## [3.0.1](https://github.com/puppetlabs/beaker-pe/tree/3.0.1) (2024-04-10)
+
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/2.16.1...3.0.1)
+
+## [2.16.1](https://github.com/puppetlabs/beaker-pe/tree/2.16.1) (2024-03-19)
+
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.0.0...2.16.1)
 
 **Implemented enhancements:**
 

data/Gemfile

@@ -22,6 +22,6 @@ gem "scooter", *location_for(ENV['SCOOTER_VERSION'] || '~> 4.3')
 
 gem 'deep_merge'
 
-if File.exists? "#{__FILE__}.local"
+if File.exist? "#{__FILE__}.local"
   eval(File.read("#{__FILE__}.local"), binding)
 end

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

@@ -342,7 +342,7 @@ module Beaker
           extension = ".rpm"
           host.install_package_with_rpm("#{path}/#{filename}#{extension}")
         end
- 
+
         #Determine the PE package to download/upload on a windows host, download/upload that package onto the host.
         #Assumed file name format: puppet-enterprise-3.3.0-rc1-559-g97f0833.msi
         # @param [Host] host The windows host to download/upload and unpack PE onto
@@ -1076,7 +1076,11 @@ module Beaker
             pe_ver = host[:pe_ver] || opts[:pe_ver] || '4.0.0-rc1'
             opts = sanitize_opts(opts)
             opts[:download_url] =
-              "#{opts[:pe_promoted_builds_url]}/puppet-agent/#{pe_ver}/#{opts[:puppet_agent_version]}/repos"
+              if Gem::Version.new(pe_ver) > Gem::Version.new('2023.7.0')
+                "#{opts[:pe_promoted_builds_url]}/v2/agent/#{pe_ver}/#{opts[:puppet_agent_version]}/repos"
+              else
+                "#{opts[:pe_promoted_builds_url]}/puppet-agent/#{pe_ver}/#{opts[:puppet_agent_version]}/repos"
+              end
             opts[:copy_base_local]    ||= File.join('tmp', 'repo_configs')
             opts[:copy_dir_external]  ||= host.external_copy_base
             opts[:puppet_collection] ||= puppet_collection_for(:puppet_agent, opts[:puppet_agent_version])

data/lib/beaker-pe/options/pe_version_scraper.rb

@@ -17,7 +17,7 @@ module Beaker
       def self.load_pe_version dist_dir, version_file
         version = nil
         begin
-          open("#{dist_dir}/#{version_file}") do |file|
+          URI.open("#{dist_dir}/#{version_file}") do |file|
             while line = file.gets
               if /(\w.*)/ =~ line then
                 version = $1.strip

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '3.3.0'
+        STRING = '3.4.0'
       end
 
     end

data/spec/beaker-pe/install/pe_utils_spec.rb

@@ -2061,7 +2061,7 @@ describe ClassMixedWithDSLInstallUtils do
 
     it 'installs agent on agent hosts' do
       agents = [agent, agent]
-      expect(subject).to receive(:block_on).with(agents, :run_in_parallel => true).twice
+      expect(subject).to receive(:block_on).with(agents, { run_in_parallel: true }).twice
       subject.install_agents_only_on(agents, opts)
     end
 

data/spec/beaker-pe/pe-client-tools/installer_helper_spec.rb

@@ -36,7 +36,7 @@ describe ClassPEClientToolsMixedWithPatterns do
             'pe-client-tools',
             opts[:pe_client_tools_sha],
             '/tmp/repo_configs',
-            dev_builds_url: 'http://builds.delivery.puppetlabs.net'
+            { dev_builds_url: 'http://builds.delivery.puppetlabs.net' }
           )
           expect(host).to receive(:install_package).with("pe-client-tools")
 
@@ -51,7 +51,7 @@ describe ClassPEClientToolsMixedWithPatterns do
             'pe-client-tools',
             tag_opts[:pe_client_tools_version],
             '/tmp/repo_configs',
-            dev_builds_url: 'http://builds.delivery.puppetlabs.net'
+            { dev_builds_url: 'http://builds.delivery.puppetlabs.net' }
           )
           expect(host).to receive(:install_package).with("pe-client-tools")
 
@@ -69,7 +69,7 @@ describe ClassPEClientToolsMixedWithPatterns do
             'pe-client-tools',
             opts[:pe_client_tools_sha],
             '/tmp/repo_configs',
-            dev_builds_url: 'http://builds.delivery.puppetlabs.net'
+            { dev_builds_url: 'http://builds.delivery.puppetlabs.net' }
           )
           expect(host).to receive(:install_package).with('pe-client-tools')
 
@@ -84,7 +84,7 @@ describe ClassPEClientToolsMixedWithPatterns do
             'pe-client-tools',
             tag_opts[:pe_client_tools_version],
             '/tmp/repo_configs',
-            dev_builds_url: 'http://builds.delivery.puppetlabs.net'
+            { dev_builds_url: 'http://builds.delivery.puppetlabs.net' }
           )
           expect(host).to receive(:install_package).with('pe-client-tools')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Puppetlabs
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-21 00:00:00.000000000 Z
+date: 2025-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -267,7 +267,6 @@ files:
 - CHANGELOG.md
 - CODEOWNERS
 - Gemfile
-- Gemfile.lock
 - HISTORY.md
 - LICENSE
 - PULL_REQUEST_TEMPLATE.md
@@ -308,7 +307,7 @@ homepage: https://github.com/puppetlabs/beaker-pe
 licenses:
 - Apache2
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -323,8 +322,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Beaker PE DSL Helpers!
 test_files: []

data/Gemfile.lock

@@ -1,222 +0,0 @@
-PATH
-  remote: .
-  specs:
-    beaker-pe (3.3.0)
-      beaker (>= 4.0, < 7)
-      beaker-abs
-      beaker-answers (~> 1.0)
-      beaker-puppet (>= 1)
-      beaker-vmpooler (~> 1.0)
-      stringify-hash (~> 0.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (7.1.3.2)
-      base64
-      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      connection_pool (>= 2.2.5)
-      drb
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
-    ansi (1.5.0)
-    ast (2.4.2)
-    base64 (0.2.0)
-    bcrypt_pbkdf (1.1.0)
-    beaker (4.41.2)
-      beaker-hostgenerator
-      ed25519 (~> 1.0)
-      hocon (~> 1.0)
-      in-parallel (>= 0.1, < 2)
-      inifile (~> 3.0)
-      minitar (~> 0.6)
-      minitest (~> 5.4)
-      net-scp (>= 1.2, < 5.0)
-      net-ssh (>= 5.0)
-      rexml
-      rsync (~> 1.0.9)
-      stringify-hash (~> 0.0)
-      thor (>= 1.0.1, < 2.0)
-    beaker-abs (0.11.0)
-      bcrypt_pbkdf (>= 1.0, < 2.0)
-      beaker (~> 4.0)
-      ed25519 (>= 1.2, < 2.0)
-      vmfloaty (>= 1.0, < 2)
-    beaker-answers (1.0.0)
-      hocon (~> 1.0)
-      require_all (>= 1.3.2, < 3.1.0)
-      stringify-hash (~> 0.0.0)
-    beaker-hostgenerator (2.9.1)
-      deep_merge (~> 1.0)
-    beaker-puppet (2.0.0)
-      beaker (~> 4.1)
-      oga (~> 3.4)
-    beaker-vmpooler (1.4.0)
-      stringify-hash (~> 0.0.0)
-    bigdecimal (3.1.6)
-    coderay (1.1.3)
-    commander (4.6.0)
-      highline (~> 2.0.0)
-    concurrent-ruby (1.2.3)
-    connection_pool (2.4.1)
-    daemons (1.4.1)
-    deep_merge (1.2.2)
-    diff-lcs (1.5.1)
-    docile (1.4.0)
-    domain_name (0.6.20240107)
-    drb (2.2.0)
-      ruby2_keywords
-    ed25519 (1.3.0)
-    eventmachine (1.2.7)
-    fakefs (2.5.0)
-    faraday (1.10.3)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
-      ruby2_keywords (>= 0.0.4)
-    faraday-cookie_jar (0.0.7)
-      faraday (>= 0.8.0)
-      http-cookie (~> 1.0.0)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
-      faraday (~> 1.0)
-    highline (2.0.3)
-    hocon (1.4.0)
-    http-cookie (1.0.5)
-      domain_name (~> 0.5)
-    i18n (1.14.1)
-      concurrent-ruby (~> 1.0)
-    in-parallel (1.0.1)
-    inifile (3.0.0)
-    iniparser (1.0.1)
-    json (2.7.1)
-    kramdown (2.4.0)
-      rexml
-    logutils (0.6.1)
-    markdown (1.2.0)
-      kramdown (>= 1.5.0)
-      props (>= 1.1.2)
-      textutils (>= 0.10.0)
-    method_source (1.0.0)
-    minitar (0.9)
-    minitest (5.22.2)
-    multipart-post (2.4.0)
-    mutex_m (0.2.0)
-    net-ldap (0.19.0)
-    net-scp (4.0.0)
-      net-ssh (>= 2.6.5, < 8.0.0)
-    net-ssh (7.2.1)
-    oga (3.4)
-      ast
-      ruby-ll (~> 2.1)
-    power_assert (2.0.3)
-    props (1.2.0)
-      iniparser (>= 0.1.0)
-    pry (0.14.2)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    rack (2.2.8.1)
-    rake (13.1.0)
-    require_all (3.0.0)
-    rexml (3.2.6)
-    rspec (3.13.0)
-      rspec-core (~> 3.13.0)
-      rspec-expectations (~> 3.13.0)
-      rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
-      rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-its (1.3.0)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.13.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-support (3.13.0)
-    rsync (1.0.9)
-    ruby-ll (2.1.3)
-      ansi
-      ast
-    ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
-    scooter (4.5.4)
-      beaker
-      faraday
-      faraday-cookie_jar (>= 0.0.7)
-      faraday_middleware (~> 1.2)
-      json
-      net-ldap (~> 0.16)
-      test-unit
-    simplecov (0.22.0)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.4)
-    stringify-hash (0.0.2)
-    test-unit (3.6.1)
-      power_assert
-    textutils (1.4.0)
-      activesupport
-      logutils (>= 0.6.1)
-      props (>= 1.1.2)
-      rubyzip (>= 1.0.0)
-    thin (1.8.2)
-      daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0, >= 1.0.4)
-      rack (>= 1, < 3)
-    thor (1.3.0)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    vmfloaty (1.8.1)
-      commander (>= 4.4.3, < 4.7.0)
-      faraday (~> 1.5, >= 1.5.1)
-    yard (0.9.36)
-
-PLATFORMS
-  aarch64-linux
-  ruby
-  x86_64-linux
-
-DEPENDENCIES
-  activesupport (~> 7.0)
-  beaker (~> 4.0)
-  beaker-abs (~> 0.8)
-  beaker-pe!
-  beaker-vmpooler (~> 1.3)
-  deep_merge
-  fakefs (~> 2.4, < 2.6.0)
-  markdown
-  pry (~> 0.10)
-  rake (~> 13.1.0)
-  rspec (~> 3.0)
-  rspec-its
-  scooter (~> 4.3)
-  simplecov (= 0.22.0)
-  thin
-  yard
-
-BUNDLED WITH
-   2.4.22