simp-beaker-helpers 1.30.0 → 1.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43a26304e3c73ccdceb260efe742031b4586f21f4bd2bf5dd1bf4b27bb0b8336
-  data.tar.gz: 8d3d7ed70d8a0ffd9da29e1b588c2af5c21ab4dca4660e6e2cdafc17db8883d3
+  metadata.gz: 61e6231d0cf45fea87d7eb679d94fe902ec1b5af2f95ca21d45e61104f0fdab8
+  data.tar.gz: 90972159bcf15d6ab02cad21dc31b1d56321cbbd8681d6bcc2ebcae025f77c53
 SHA512:
-  metadata.gz: 672d98b8d677b728cc19859daabd67e7914497d3dec98e0708ac6ca5efa6395efbf3156e194093e7043af1153bcc2431c49e11a754e45e3f21412b5e483b2126
-  data.tar.gz: 9af14a14f18493d44c1af69ce2cbf02f1458349268e856073fa5e95178387ece6bfc736ec60d3e83343a7586a436ca03cc27a05d6f87595fc2f46144445cbfc9
+  metadata.gz: e04d18c50a3de6d8c4d3dacfc69a596ca4063ff29c86bd25ffd10e97b61465fdba218d6140ed9cb2f4d69b01e609e27ee31cd3ace0ba820ebbe69446e86cbbeb
+  data.tar.gz: c6979d6fecb5daaef5f739cca62d532c2c32ba5aad5abc3642b41c6e02ba69f840a82139ef14783e9978bd04712edd824c655464ddb99770528514923e1faf88

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+### 1.32.0 / 2023-08-24
+* Added:
+  * Switch to Puppet 8 by default
+* Fixed:
+  * Update gem dependencies
+
+### 1.31.0 / 2023-07-18
+* Fixed:
+  * Compatibility with Ruby 3.2
+
 ### 1.30.0 / 2023-05-15
 * Added:
   * Default `puppet_collection` to `puppet7`

data/Gemfile

@@ -13,7 +13,7 @@ gem 'bundler'
 gem 'rake'
 
 group :system_tests do
-  beaker_gem_options = ENV.fetch('BEAKER_GEM_OPTIONS', ['>= 4.28.1', '< 5.0.0'])
+  beaker_gem_options = ENV.fetch('BEAKER_GEM_OPTIONS', ['>= 4.28.1', '< 6.0.0'])
 
   if "#{beaker_gem_options}".include?(':')
     # Just pass in BEAKER_GEM_OPTIONS as a string that would represent the usual
@@ -44,8 +44,8 @@ group :system_tests do
   gem 'beaker-rspec'
   gem 'beaker-windows'
   gem 'net-ssh'
-  gem 'puppet', ENV.fetch('PUPPET_VERSION', '~> 7.0')
+  gem 'puppet', ENV.fetch('PUPPET_VERSION', ['>= 7.0.0', '< 9.0.0'])
   gem 'rubocop'
   gem 'rubocop-rspec'
-  gem 'puppetlabs_spec_helper', '~> 4.0'
+  gem 'puppetlabs_spec_helper', '>= 4.0.0', '< 7.0.0'
 end

data/lib/simp/beaker_helpers/constants.rb

@@ -5,7 +5,7 @@ module Simp::BeakerHelpers
   #
   # This is done so that we know if some new thing that we're using breaks the
   # oldest system that we support
-  DEFAULT_PUPPET_AGENT_VERSION = '~> 7.0'
+  DEFAULT_PUPPET_AGENT_VERSION = '~> 8.0'
 
   SSG_REPO_URL = ENV['BEAKER_ssg_repo'] || 'https://github.com/ComplianceAsCode/content.git'
 

data/lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.30.0'
+  VERSION = '1.32.0'
 end

data/lib/simp/beaker_helpers.rb

@@ -310,7 +310,7 @@ module Simp::BeakerHelpers
       while( fixtures_yml.empty? && File.expand_path(dir) != '/' ) do
         file = File.expand_path( '.fixtures.yml', dir )
         STDERR.puts "  ** fixtures_yml_path: #{file}" if ENV['BEAKER_helpers_verbose']
-        if File.exists? file
+        if File.exist? file
           fixtures_yml = file
           break
         end
@@ -1367,7 +1367,7 @@ module Simp::BeakerHelpers
   def clear_temp_hieradata
     if @temp_hieradata_dirs && !@temp_hieradata_dirs.empty?
       @temp_hieradata_dirs.each do |data_dir|
-        if File.exists?(data_dir)
+        if File.exist?(data_dir)
           FileUtils.rm_r(data_dir)
         end
       end

data/simp-beaker-helpers.gemspec

@@ -16,19 +16,19 @@ Gem::Specification.new do |s|
   s.email       = 'simp@simp-project.org'
   s.homepage    = 'https://github.com/simp/rubygem-simp-beaker-helpers'
   s.metadata = {
-                 'issue_tracker' => 'https://simp-project.atlassian.net'
+                 'issue_tracker' => 'https://github.com/simp/rubygem-simp-beaker-helpers/issues'
                }
 
   s.required_ruby_version = '>= 2.3.0'
 
-  s.add_runtime_dependency 'beaker'                      , ['>= 4.17.0', '< 6.0.0']
-  s.add_runtime_dependency 'beaker-rspec'                , '~> 8.0'
-  s.add_runtime_dependency 'beaker-puppet'               , ['>= 1.18.14', '< 2.0.0']
-  s.add_runtime_dependency 'beaker-docker'               , ['>= 0.8.3', '< 2.0.0']
-  s.add_runtime_dependency 'docker-api'                  , ['>= 2.1.0', '< 3.0.0']
-  s.add_runtime_dependency 'beaker-vagrant'              , ['>= 0.6.4', '< 2.0.0']
-  s.add_runtime_dependency 'highline'                    , '~> 2.0'
-  s.add_runtime_dependency 'nokogiri'                    , '~> 1.8'
+  s.add_runtime_dependency 'beaker',         ['>= 4.17.0', '< 6.0.0']
+  s.add_runtime_dependency 'beaker-rspec',   '~> 8.0'
+  s.add_runtime_dependency 'beaker-puppet',  ['>= 1.18.14', '< 3.0.0']
+  s.add_runtime_dependency 'beaker-docker',  ['>= 0.8.3', '< 3.0.0']
+  s.add_runtime_dependency 'docker-api',     ['>= 2.1.0', '< 3.0.0']
+  s.add_runtime_dependency 'beaker-vagrant', ['>= 0.6.4', '< 2.0.0']
+  s.add_runtime_dependency 'highline',       '~> 2.0'
+  s.add_runtime_dependency 'nokogiri',       '~> 1.8'
 
   ### s.files = Dir['Rakefile', '{bin,lib,spec}/**/*', 'README*', 'LICENSE*'] & `git ls-files -z .`.split("\0")
   s.files       = `git ls-files`.split("\n")

data/spec/acceptance/nodesets/amzn2.yml

@@ -1,22 +1,14 @@
-<%
-  if ENV['BEAKER_HYPERVISOR']
-    hypervisor = ENV['BEAKER_HYPERVISOR']
-  else
-    hypervisor = 'vagrant'
-  end
--%>
+---
 HOSTS:
   amzn2:
     roles:
       - default
     platform: el-7-x86_64
     box: gbailey/amzn2
-    hypervisor: <%= hypervisor %>
+    hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
 
 CONFIG:
   log_level: verbose
-  synced_folder : disabled
+  synced_folder: disabled
   type: aio
-<% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
-  puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
-<% end -%>
+  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"

data/spec/acceptance/nodesets/default.yml

@@ -2,8 +2,8 @@
 HOSTS:
   el7:
     roles:
-    - default
-    - el7
+      - default
+      - el7
     platform: el-7-x86_64
     box: centos/7
     hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
@@ -11,9 +11,9 @@ HOSTS:
     gce_machine_type: n1-standard-2
   el8:
     roles:
-    - el8
+      - el8
     platform: el-8-x86_64
-    box: centos/stream8
+    box: generic/centos8s
     hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
     family: centos-cloud/centos-stream-8
     gce_machine_type: n1-standard-2
@@ -33,4 +33,4 @@ CONFIG:
       - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:encryption].join("\n#{' '*6}- ") %>
     hmac:
       - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:hmac].join("\n#{' '*6}- ") %>
-  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"
+  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"

data/spec/acceptance/nodesets/docker.yml

@@ -1,27 +1,26 @@
+---
 HOSTS:
   el7.test.net:
     roles:
       - default
       - el7
-    platform:   el-7-x86_64
+    platform: el-7-x86_64
     hypervisor: docker
     image: simpproject/simp_beaker_el7
-    docker_cmd: '/usr/sbin/sshd -D -E /var/log/sshd.log'
+    docker_cmd: "/usr/sbin/sshd -D -E /var/log/sshd.log"
 
   el8.test.net:
     roles:
       - el8
-    platform:   el-8-x86_64
+    platform: el-8-x86_64
     hypervisor: docker
     image: simpproject/simp_beaker_el8
-    docker_cmd: '/usr/sbin/sshd -D -E /var/log/sshd.log'
+    docker_cmd: "/usr/sbin/sshd -D -E /var/log/sshd.log"
 
 CONFIG:
   log_level: verbose
   type: aio
-<% if ENV['BEAKER_PUPPET_ENVIRONMENT'] -%>
-  puppet_environment: <%= ENV['BEAKER_PUPPET_ENVIRONMENT'] %>
-<% end -%>
+  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
   ssh:
     password: root
     auth_methods:

data/spec/acceptance/nodesets/oel.yml

@@ -1,10 +1,4 @@
-<%
-  if ENV['BEAKER_HYPERVISOR']
-    hypervisor = ENV['BEAKER_HYPERVISOR']
-  else
-    hypervisor = 'vagrant'
-  end
--%>
+---
 HOSTS:
   oel7:
     roles:
@@ -12,22 +6,20 @@ HOSTS:
       - el7
     platform: el-7-x86_64
     box: generic/oracle7
-    hypervisor: <%= hypervisor %>
+    hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
 
   oel8:
     roles:
       - el8
     platform: el-8-x86_64
     box: generic/oracle8
-    hypervisor: <%= hypervisor %>
+    hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
 
 CONFIG:
   log_level: verbose
   type: aio
   vagrant_cpus: 2
-<% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
-  puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
-<% end -%>
+  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
   ssh:
     keepalive: true
     keepalive_interval: 10

data/spec/acceptance/nodesets/ubuntu.yml

@@ -2,7 +2,7 @@
 HOSTS:
   focal:
     roles:
-    - default
+      - default
     platform: ubuntu-20.04-x86_64
     box: ubuntu/focal64
     hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
@@ -11,4 +11,4 @@ HOSTS:
 CONFIG:
   log_level: verbose
   type: aio
-  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"
+  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.30.0
+  version: 1.32.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-10 00:00:00.000000000 Z
+date: 2023-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
@@ -54,7 +54,7 @@ dependencies:
         version: 1.18.14
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -64,7 +64,7 @@ dependencies:
         version: 1.18.14
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: beaker-docker
   requirement: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
         version: 0.8.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -84,7 +84,7 @@ dependencies:
         version: 0.8.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
@@ -238,7 +238,7 @@ homepage: https://github.com/simp/rubygem-simp-beaker-helpers
 licenses:
 - Apache-2.0
 metadata:
-  issue_tracker: https://simp-project.atlassian.net
+  issue_tracker: https://github.com/simp/rubygem-simp-beaker-helpers/issues
 post_install_message: 
 rdoc_options: []
 require_paths: