simp-rake-helpers 5.19.2 → 5.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ac10a3909fa53721a58abc43425a87b19e05f39c708b708c72f05156daab6f8
-  data.tar.gz: 149664e7aedb68668912e8541ac7b664d0041f7ebcb5e0b423d370588295fde2
+  metadata.gz: 321387edbe99a15f34c2826cd1c822582f3f7654dd1a4acbd2e96ef0a133215d
+  data.tar.gz: 541e7eb0edca9975c7a0bf8c0b33895413f9fde8b0a400274d0cd41ea5551cee
 SHA512:
-  metadata.gz: 918d9a55db0c5f9b6b7dd4128a19ddbb8a94f63b923da0c57f9193954cee9380cc0844ac0f9a8e459f0f95b83b7d2339b97808c0aae39461ef332d4a6b0300f9
-  data.tar.gz: 27f663a9423e24ac41009ffe539be6c450c8c6ab00326bc8d6217cb2060d3c4ac136ec3a78df60a66a3885696e17d151fdb2d15c3132026931ab7530255c0700
+  metadata.gz: 4132a9ac29c5f264162551a8dfcef44bed5a287cca8f5fb18361b020c780b63ed0748a150bc0e2acab9f7384765656f281de553b5b205ca5ad553c5da4db3f7d
+  data.tar.gz: a753b2d3d99eeab967aab912da8448a75ccd025376f6ac5d4e379d19821a79090031236fdf67d819827238903c86e2ffed498f1fcd19627fd89e38eb82fbe56e

data/CHANGELOG.md

@@ -1,16 +1,37 @@
-### 5.19.2 /2023-05-09
+### 5.21.0 / 2023-08-24
+- Fixed
+  - Support for Ruby 3 and Puppet 8
+  - Update gem dependencies
+
+### 5.20.0 /2023-07-03
+- Added
+  - Support for `puppetlabs-spec-helper` 6.x and `puppet-lint`
+    - New gem dependencies:
+      - `metadata-json-lint`
+      - `puppet-lint-params_empty_string-check`
+  - Acceptance test/nodeset support for Puppet 8
+  - Modernized GHA PR test matrix
+- Changed
+  - Default Puppet = 7.x
+  - Default Ruby = 2.7
+- Fixed
+  - Don't fail when `metadata` task is not present
+  - Untangled non-standard GHA workflows
+  - Release workflow bug
+
+### 5.19.1 / 2023-05-15
 - Fixed
   - Bumped required puppet version to < 9.0
   - The base repo for the el7 ISO was unusable because the repodata for it
     was being excluded on the unpack of the distribution ISO; In the case
     of building an el7 iso, we now ensure the repodata directory exists.
 
-### 5.19.1 /2023-03-27
+### 5.19.1 / 2023-03-27
 - Added
   - Allow `SIMP_BUILD_PKG_require_rebuild` to be case-insensitive to
     accommodate GHA
 
-### 5.19.0 /2023-03-20
+### 5.19.0 / 2023-03-20
 - Added
   - `pkg:single` will skip the `require_rebuild?` logic
     when `SIMP_BUILD_PKG_require_rebuild=yes`
@@ -19,7 +40,7 @@
     now use `SIMP_BUILD_PKG_require_rebuild=yes`
 
 
-### 5.18.0 /2023-02-27
+### 5.18.0 / 2023-02-27
 - Added
   - `SIMP_BUILD_reposync_only` now excludes RPMs and yum repos from the ISO
     `unpack` task
@@ -28,12 +49,12 @@
   - EL7 ISO unpack no longer interferes with reposync repos when
     `SIMP_BUILD_reposync_only=yes`
 
-### 5.17.1 /2022-11-11
+### 5.17.1 / 2022-11-11
 - Fixed
   - Fixed an edge case where the `SIMP` directory YUM metadata was not
     present if you used `reposync` for everything but the `SIMP` directory
 
-### 5.17.0 /2022-10-30
+### 5.17.0 / 2022-10-30
 - Added
   - The RPM dependency file can now use `ignores` to remove items instead of
     needing to redefine the entire dependency stack to remove deps
@@ -179,7 +200,7 @@
   pkg:check_published.  Attempt as many checks as possible and then
   report all failures.
 
-### 5.10.0 /2019-08-30
+### 5.10.0 / 2019-08-30
 * Add initial linting tasks for CI configuration (simp:ci_lint and
   simp:gitlab_ci_lint).  The only checks currently being done are
   as follows:
@@ -189,7 +210,7 @@
     specifies the suite and nodeset to be used and that the specified
     suite and nodeset exist.
 
-### 5.9.1 /2019-08-06
+### 5.9.1 / 2019-08-06
 Fixed 2 bugs in the SIMP Puppet module generated RPM spec files
 * When SIMP Puppet module RPMs were installed, they created the wrong
   state directory, '/%{_localstatedir}/lib/rpm-state/simp-adapter'.

data/Gemfile

@@ -2,7 +2,7 @@
 #
 # SIMP_GEM_SERVERS | a space/comma delimited list of rubygem servers
 # PUPPET_VERSION   | specifies the version of the puppet gem to load
-puppetversion = ENV.key?('PUPPET_VERSION') ? "#{ENV['PUPPET_VERSION']}" : '~> 7'
+puppetversion = ENV.key?('PUPPET_VERSION') ? "#{ENV['PUPPET_VERSION']}" : ['>= 7.0.0', '< 9.0.0']
 gem_sources   = ENV.key?('SIMP_GEM_SERVERS') ? ENV['SIMP_GEM_SERVERS'].split(/[, ]+/) : ['https://rubygems.org']
 
 gem_sources.each { |gem_source| source gem_source }

data/lib/simp/ci/gitlab.rb

@@ -80,7 +80,7 @@ class Simp::Ci::Gitlab
     return @gitlab_yaml if @gitlab_yaml
 
     begin
-      @gitlab_yaml = YAML.load_file(@gitlab_config_file)
+      @gitlab_yaml = YAML.safe_load(File.read(@gitlab_config_file), filename: @gitlab_config_file, aliases: true)
     rescue Psych::SyntaxError => e
       msg = "ERROR: Malformed YAML: #{e.message}"
       raise LintError.new(msg)

data/lib/simp/componentinfo.rb

@@ -85,7 +85,7 @@ class Simp::ComponentInfo
   def initialize(component_dir, latest_version_only = false, verbose = true)
     @component_dir = component_dir
 
-    if File.exists?(File.join(@component_dir, 'metadata.json'))
+    if File.exist?(File.join(@component_dir, 'metadata.json'))
       @type = :module
       load_module_info(latest_version_only, verbose)
     else
@@ -107,7 +107,7 @@ class Simp::ComponentInfo
 
 
     changelog_file = File.join(component_dir, 'CHANGELOG')
-    unless File.exists?(changelog_file)
+    unless File.exist?(changelog_file)
       fail("ERROR: No CHANGELOG file found in #{component_dir}")
     end
     @changelog = parse_changelog(IO.read(changelog_file), latest_version_only, verbose)

data/lib/simp/rake/build/auto.rb

@@ -241,7 +241,7 @@ module Simp::Rake::Build
               fail SIMPBuildException, "ERROR: Mixing `SIMP_BUILD_rm_staging_dir=yes` and `SIMP_BUILD_unpack=no` is silly."
             end
 
-            if File.exists?(output_dir) && !File.directory?(output_dir)
+            if File.exist?(output_dir) && !File.directory?(output_dir)
               fail SIMPBuildException, "ERROR: ISO output dir exists but is not a directory:\n\n" +
                                        "    '#{output_dir}'\n\n"
             end
@@ -521,7 +521,7 @@ module Simp::Rake::Build
           puts '-'*80
 
           FileUtils.rm_rf staging_dir, :verbose => verbose
-        elsif File.exists? staging_dir
+        elsif File.exist? staging_dir
           warn ''
           warn '!'*80
           warn '#### WARNING: staging dir already exists at:'

data/lib/simp/rake/build/build.rb

@@ -64,7 +64,7 @@ module Simp::Rake::Build
 
             fail("Could not find directory #{mod}") unless Dir.exist?(mod)
 
-            next unless File.exists?(File.join(mod,'Gemfile'))
+            next unless File.exist?(File.join(mod,'Gemfile'))
             puts "\n#{mod}\n" if verbose
             Dir.chdir(mod) do
               if File.exist?('Gemfile.lock')
@@ -515,7 +515,7 @@ module Simp::Rake::Build
 
             # Create example packages.yaml
             packages_yaml_path = File.join(target_dir, 'packages.yaml')
-            unless File.exists? packages_yaml_path
+            unless File.exist? packages_yaml_path
               pkg = 'example-package-name'
               pkg_file = "#{pkg}-1.0.0-1.el#{major_os_ver}.#{args[:arch]}.rpm"
               yum_url = "https://yum.server/#{args[:os]}/#{major_os_ver}/#{args[:arch]}"

data/lib/simp/rake/build/pkg.rb

@@ -183,12 +183,12 @@ module Simp::Rake::Build
                 end
 
                 rpm_build_keys.each do |gpgkey|
-                  cp(gpgkey, dvd_dir, :verbose => @verbose)
+                  FileUtils.cp(gpgkey, dvd_dir, :verbose => @verbose)
                 end
               # Otherwise, make sure it isn't present for the build
               else
                 Dir[File.join(dvd_dir,'RPM-GPG-KEY-SIMP*')].each do |to_del|
-                  rm(to_del)
+                  FileUtils.rm(to_del)
                 end
               end
             end
@@ -602,7 +602,7 @@ module Simp::Rake::Build
                 .delete_if{|x| x =~ /\.src\.rpm$/}
                 .each do |path|
                   sym_path = "repos/basetest/#{File.basename(path)}"
-                  ln_sf(path,sym_path, :verbose => @verbose) unless File.exists?(sym_path)
+                  ln_sf(path,sym_path, :verbose => @verbose) unless File.exist?(sym_path)
               end
 
               if args[:aux_dir]
@@ -610,7 +610,7 @@ module Simp::Rake::Build
                   .delete_if{|x| x =~ /\.src\.rpm$/}
                   .each do |path|
                     sym_path = "repos/lookaside/#{File.basename(path)}"
-                    ln_sf(path,sym_path, :verbose => @verbose) unless File.exists?(sym_path)
+                    ln_sf(path,sym_path, :verbose => @verbose) unless File.exist?(sym_path)
                 end
               end
 

data/lib/simp/rake/helpers/version.rb

@@ -2,5 +2,5 @@ module Simp; end
 module Simp::Rake; end
 
 class Simp::Rake::Helpers
-  VERSION = '5.19.2'
+  VERSION = '5.21.0'
 end

data/lib/simp/rake/pupmod/helpers.rb

@@ -100,14 +100,14 @@ class Simp::Rake::Pupmod::Helpers < ::Rake::TaskLib
     end
 
     desc 'lint metadata.json'
-    Rake::Task[:metadata].clear
+    Rake::Task[:metadata].clear if Rake::Task.tasks.any?{ |x| x.name == 'metadata' }
     task :metadata => :metadata_lint
 
     # Read the metadata.json as a data structure
     def metadata( file_path = nil )
       require 'json'
       _file = file_path || File.join(@base_dir, 'metadata.json')
-      fail "ERROR: file not found: '#{_file}'" unless File.exists? _file
+      fail "ERROR: file not found: '#{_file}'" unless File.exist? _file
       @metadata ||= JSON.parse( File.read(_file) )
     end
 

data/spec/acceptance/nodesets/default.yml

@@ -1,3 +1,4 @@
+---
 HOSTS:
   el7-build-server:
     roles:
@@ -6,7 +7,7 @@ HOSTS:
     platform: el-7-x86_64
     hypervisor: docker
     image: simpproject/simp_build_centos7
-    docker_cmd: '/usr/sbin/sshd -D -E /var/log/sshd.log'
+    docker_cmd: "/usr/sbin/sshd -D -E /var/log/sshd.log"
 
   el8-build-server:
     roles:
@@ -19,12 +20,8 @@ HOSTS:
 
 CONFIG:
   log_level: verbose
-  type:      aio
-<% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
-  puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
-<% else -%>
-  puppet_collection: puppet6
-<% end -%>
+  type: aio
+  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
   ssh:
     password: root
     auth_methods:

data/spec/acceptance/nodesets/default_ruby3_1.yml

@@ -0,0 +1,33 @@
+---
+HOSTS:
+  el7-build-server:
+    roles:
+      - default
+      - build_server
+    platform: el-7-x86_64
+    hypervisor: docker
+    image: simpproject/simp_build_centos7_ruby3_1
+    docker_cmd: "/usr/sbin/sshd -D -E /var/log/sshd.log"
+
+  el8-build-server:
+    roles:
+      - build_server
+    platform: el-8-x86_64
+    hypervisor: docker
+    image: simpproject/simp_build_centos8_ruby3_1
+    docker_cmd: '["/sbin/init"]'
+    docker_preserve_image: true
+
+CONFIG:
+  log_level: verbose
+  type: aio
+  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
+  ssh:
+    password: root
+    auth_methods:
+      - password
+  docker_preserve_image: true
+  mount_folders:
+    host_files:
+      host_path: ./
+      container_path: /host_files

data/spec/acceptance/suites/default/55_build_pkg_signing_spec.rb

@@ -135,8 +135,7 @@ describe 'rake pkg:signrpms and pkg:checksig' do
     it 'creates GPG dev signing key and signs packages' do
       hosts.each do |host|
         # NOTE: pkg:signrpms will not actually fail if it can't sign a RPM
-        on(hosts, %(#{run_cmd} "cd '#{test_dir}'; #{signrpm_cmd}"), run_opts)
-
+        on(hosts, %(#{run_cmd} "cd '#{test_dir}'; SIMP_PKG_verbose=yes #{signrpm_cmd}"), run_opts)
         expect(file_exists_on(host,"#{dirs[host][:dvd_dir]}/RPM-GPG-KEY-SIMP-Dev")).to be true
 
         result = on(host, "rpm -qip '#{test_rpm}' | grep ^Signature", run_opts)

data/spec/acceptance/suites/default/support/build_project_helpers.rb

@@ -48,7 +48,7 @@ module Simp::BeakerHelpers::SimpRakeHelpers::BuildProjectHelpers
     maj_rel = facts['operatingsystemmajrelease'] ||
               facts.fetch('os', {}).fetch('release', {})['major'] ||
               facts['operatingsystemrelease'].split('.').first
-    architecture = facts['architecture']
+    architecture = facts['architecture'] || facts.dig('os','architecture')
 
     dir = "#{proj_dir}/build/distributions/#{name}/#{maj_rel}/#{architecture}"
     @distribution_dirs[host.to_s] = dir

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 5.19.2
+  version: 5.21.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-09 00:00:00.000000000 Z
+date: 2023-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simp-beaker-helpers
@@ -54,7 +54,7 @@ dependencies:
         version: '10.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '14.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -64,7 +64,7 @@ dependencies:
         version: '10.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '14.0'
 - !ruby/object:Gem::Dependency
   name: puppet
   requirement: !ruby/object:Gem::Requirement
@@ -87,6 +87,26 @@ dependencies:
         version: '9.0'
 - !ruby/object:Gem::Dependency
   name: puppet-lint
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: puppet-lint-optional_default-check
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -106,7 +126,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: puppet-lint-optional_default-check
+  name: puppet-lint-params_empty_string-check
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -114,7 +134,7 @@ dependencies:
         version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -124,19 +144,39 @@ dependencies:
         version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: puppetlabs_spec_helper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: metadata-json-lint
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
@@ -177,16 +217,22 @@ dependencies:
   name: puppet-blacksmith
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: parallel_tests
   requirement: !ruby/object:Gem::Requirement
@@ -196,7 +242,7 @@ dependencies:
         version: '2.4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.25'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -206,7 +252,7 @@ dependencies:
         version: '2.4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.25'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: r10k
   requirement: !ruby/object:Gem::Requirement
@@ -216,7 +262,7 @@ dependencies:
         version: '2.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -226,7 +272,7 @@ dependencies:
         version: '2.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: pager
   requirement: !ruby/object:Gem::Requirement
@@ -337,6 +383,7 @@ files:
 - lib/simp/rpm_signer.rb
 - lib/simp/yum.rb
 - spec/acceptance/nodesets/default.yml
+- spec/acceptance/nodesets/default_ruby3_1.yml
 - spec/acceptance/suites/default/00_pkg_rpm_custom_scriptlets_spec.rb
 - spec/acceptance/suites/default/10_pkg_rpm_spec.rb
 - spec/acceptance/suites/default/30_pkg_misc_spec.rb
@@ -596,7 +643,7 @@ homepage: https://github.com/simp/rubygem-simp-rake-helpers
 licenses:
 - Apache-2.0
 metadata:
-  issue_tracker: https://simp-project.atlassian.net
+  issue_tracker: https://github.com/simp/rubygem-simp-rake-helpers/issues
 post_install_message: 
 rdoc_options: []
 require_paths: