simp-rake-helpers 5.20.0 → 5.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7e5f9fd7413d64412d81d2db783696705e1848437d9cb071213959f4931cfc3
-  data.tar.gz: 0a4a3c448f46f813a3d85ea7845811ab5d34b6ac9905ecc5693aba9c90379106
+  metadata.gz: 321387edbe99a15f34c2826cd1c822582f3f7654dd1a4acbd2e96ef0a133215d
+  data.tar.gz: 541e7eb0edca9975c7a0bf8c0b33895413f9fde8b0a400274d0cd41ea5551cee
 SHA512:
-  metadata.gz: 96727f2454c5899693fc2461038d6447a8945e8e76a20e89d2377ef229e7edd63f2e3f35fa1cd93fb189bc7ca71e034de2c508aa328927f91ee5eeceb7099d01
-  data.tar.gz: 53a726a06449d1f09c820d6c0fe7c14e01c0df67103520a0c4261c17c1bbaaed4b9f4c1c8c86553280691a1f3ecc45e3c2929510326276713d1fdb7ca0776748
+  metadata.gz: 4132a9ac29c5f264162551a8dfcef44bed5a287cca8f5fb18361b020c780b63ed0748a150bc0e2acab9f7384765656f281de553b5b205ca5ad553c5da4db3f7d
+  data.tar.gz: a753b2d3d99eeab967aab912da8448a75ccd025376f6ac5d4e379d19821a79090031236fdf67d819827238903c86e2ffed498f1fcd19627fd89e38eb82fbe56e

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 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`

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

@@ -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.20.0'
+  VERSION = '5.21.0'
 end

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

@@ -107,7 +107,7 @@ class Simp::Rake::Pupmod::Helpers < ::Rake::TaskLib
     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

@@ -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_ruby3_1
-    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:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 5.20.0
+  version: 5.21.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: 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
@@ -114,7 +114,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,7 +124,7 @@ dependencies:
         version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: puppet-lint-params_empty_string-check
   requirement: !ruby/object:Gem::Requirement
@@ -242,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
@@ -252,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
@@ -262,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
@@ -272,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
@@ -643,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: