simp-rake-helpers 5.15.0 → 5.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fc850ad07208e9cca1afe63b9ad29253c8e6dc2310290ad7c168faedd9ad0a7
-  data.tar.gz: 3bd521f05c66567b3478e675603be5c75a9b8a0ad9561322e43ad725e22f1d15
+  metadata.gz: 6547ac015ab43e4ab18898ddddddecf10bc07d1f45fb03b44bd41c86f4cc5ef4
+  data.tar.gz: cc0c2474d430410ab54f5ad70620d0465099f322922ebbbdcc8fef46660dcda4
 SHA512:
-  metadata.gz: f74eabacff77b22d46a168a1890fc0af3b97910e9aba213f72385e8bc349a0be59316158f14799dfc24d4b949d9c0342678767ce772181a0e1e938723bdad185
-  data.tar.gz: 61e13e8c60a02fe50481f5d19437e3d1ae9936cb28313d8a9e0a4a74041e243f63891872982b6695fcb26ffa5629237cb2d26b6777f4caba45a158e6d68fe571
+  metadata.gz: c60b0c662f9db31c2923efffa06c3ca478194a701ff5bc4be1486086ecc14dc8a058dd3cb92dee596aa5df0e5efbc59f492f676b4a8086a99ff299d688594761
+  data.tar.gz: 450a2ba31bc7eac2f6158c629bc6c2f5cde6597ab4b3f42fec63f9c8ba97f96be0cc7ac144d8599ba44d4125da6257f3ad88d7f39a49ade2304d0a7e390befb2

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+### 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
+
+### 5.16.0 / 2022-06-24
+- Added
+  - The `puppet-lint-optional_default-check` was added to prevent setting
+    `Optional` parameters with default values.
+
 ### 5.15.0 / 2022-06-03
 - Added
   - Users now have the ability to set version limits in the `dependencies.yaml`

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']}" : '~> 6'
+puppetversion = ENV.key?('PUPPET_VERSION') ? "#{ENV['PUPPET_VERSION']}" : '~> 7'
 gem_sources   = ENV.key?('SIMP_GEM_SERVERS') ? ENV['SIMP_GEM_SERVERS'].split(/[, ]+/) : ['https://rubygems.org']
 
 gem_sources.each { |gem_source| source gem_source }
@@ -11,7 +11,6 @@ gemspec
 
 gem 'simp-build-helpers'
 gem 'simp-beaker-helpers'
-gem 'beaker-puppet_install_helper'
 gem 'rake', '>= 12.3.3'
 gem 'beaker-docker'
 

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

@@ -104,7 +104,8 @@ module Simp::Rake::Build::RpmDeps
   #       * Requires rpm-name <= 2.0.0
   # +module_metadata+:: Hash containing the contents of the
   #   module's 'metadata.json' file
-  def self.generate_custom_rpm_requires(requires_list, module_metadata)
+  # +ignores+:: Array of package names to ignore during processing
+  def self.generate_custom_rpm_requires(requires_list, module_metadata, ignores=[])
     rpm_metadata_content = []
 
     requires_list.each do |pkg_to_modify|
@@ -114,6 +115,8 @@ module Simp::Rake::Build::RpmDeps
 
       pkg, min_version, max_version = pkg if pkg.is_a?(Array)
 
+      next if ignores.include?(pkg)
+
       rpm_version_chars = ['<','>','=']
 
       if min_version && rpm_version_chars.none? { |x| min_version.include?(x) }
@@ -140,7 +143,7 @@ module Simp::Rake::Build::RpmDeps
       end
 
       if dep_info.empty?
-        err_msg = "Could not find #{short_names.first} dependency"
+        err_msg = "Could not find '#{short_names.first}' dependency"
         raise SIMPRpmDepException.new(err_msg)
       else
         dep_version = dep_info.first['version_requirement']
@@ -154,7 +157,7 @@ module Simp::Rake::Build::RpmDeps
         begin
           rpm_metadata_content << get_version_requires(pkg, dep_version)
         rescue SIMPRpmDepVersionException
-          err_msg = "Unable to parse #{short_names.first} dependency" +
+          err_msg = "Unable to parse '#{short_names.first}' dependency" +
             " version '#{dep_version}'"
           raise SIMPRpmDepException.new(err_msg)
         end
@@ -174,15 +177,19 @@ module Simp::Rake::Build::RpmDeps
   #    is a Hash containing the version info.  For example,
   #   [ 'package1' => { :min => '1.0.0' },
   #     'package2' => { :min => '3.1-1', :max => '4.0' } ]
-  def self.generate_external_rpm_requires(ext_deps_list)
+  # +ignores+:: Array of package names to ignore during processing
+  def self.generate_external_rpm_requires(ext_deps_list, ignores=[])
     requires = []
 
     ext_deps_list.each do |pkg_name, options|
+      next if ignores.include?(pkg_name)
+
       requires << "Requires: #{pkg_name} >= #{options[:min]}"
       if options[:max]
         requires << "Requires: #{pkg_name} < #{options[:max]}"
       end
     end
+
     requires
   end
 
@@ -197,7 +204,8 @@ module Simp::Rake::Build::RpmDeps
   #
   # +module_metadata+:: Hash containing the contents of the
   #   module's 'metadata.json' file
-  def self.generate_module_rpm_requires(module_metadata)
+  # +ignores+:: Array of package names to ignore during processing
+  def self.generate_module_rpm_requires(module_metadata, ignores=[])
     rpm_metadata_content = []
 
     deps = []
@@ -214,12 +222,15 @@ module Simp::Rake::Build::RpmDeps
     deps.sort! { |x,y| x['name'] <=> y['name'] }
     deps.each do |dep|
       pkg = "pupmod-#{dep['name'].gsub('/', '-')}"
+
+      next if ignores.include?(pkg)
+
       dep_version = dep['version_requirement']
 
       begin
         rpm_metadata_content << get_version_requires(pkg, dep_version)
       rescue SIMPRpmDepVersionException
-        err_msg = "Unable to parse #{dep['name']} dependency" +
+        err_msg = "Unable to parse '#{dep['name']}' dependency" +
           " version '#{dep_version}'"
         raise SIMPRpmDepException.new(err_msg)
       end
@@ -252,6 +263,10 @@ module Simp::Rake::Build::RpmDeps
   #   dependencies are pulled from module_metadata.
   # * 'Requires' line(s) for any external dependencies specified
   #   in the module_rpm_meta hash.
+  # * Any items matching the name in an 'ignores' array will be removed from the
+  #   dependency list.
+  #   * This will be an *exact* match, globbing and regexes are not supported
+  #   * Does not affect Obsoletes statements
   #
   # Otherwise, the generated 'requires' file will contain "Requires"
   # lines for each dependency and each SIMP optional dependency
@@ -269,18 +284,31 @@ module Simp::Rake::Build::RpmDeps
   #   'dependencies.yaml' file or nil, if no entry exists
   def self.generate_rpm_requires_file(dir, module_metadata, module_rpm_meta)
     rpm_metadata_content = []
+
+    ignores = module_rpm_meta ? Array(module_rpm_meta[:ignores]) : []
+
     if module_rpm_meta and module_rpm_meta[:obsoletes]
-      rpm_metadata_content = generate_custom_rpm_obsoletes(module_rpm_meta[:obsoletes], module_metadata)
+      rpm_metadata_content = generate_custom_rpm_obsoletes(
+        module_rpm_meta[:obsoletes],
+        module_metadata
+      )
     end
 
     if module_rpm_meta and module_rpm_meta[:requires]
-      rpm_metadata_content += generate_custom_rpm_requires(module_rpm_meta[:requires], module_metadata)
+      rpm_metadata_content += generate_custom_rpm_requires(
+        module_rpm_meta[:requires],
+        module_metadata,
+        ignores
+      )
     else
-      rpm_metadata_content += generate_module_rpm_requires(module_metadata)
+      rpm_metadata_content += generate_module_rpm_requires(module_metadata, ignores)
     end
 
     if module_rpm_meta and module_rpm_meta[:external_dependencies]
-      rpm_metadata_content += generate_external_rpm_requires(module_rpm_meta[:external_dependencies])
+      rpm_metadata_content += generate_external_rpm_requires(
+        module_rpm_meta[:external_dependencies],
+        ignores
+      )
     end
 
     rpm_metadata_file = File.join(dir, 'build', 'rpm_metadata', 'requires')

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

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

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

@@ -56,7 +56,7 @@ class Simp::Rake::Pupmod::Helpers < ::Rake::TaskLib
     begin
       require 'puppet_blacksmith/rake_tasks'
       Blacksmith::RakeTask.new do |t|
-        t.tag_pattern = "%s" # Use tage format "X.Y.Z" instead of "vX.Y.Z"
+        t.tag_pattern = "%s" # Use tag format "X.Y.Z" instead of "vX.Y.Z"
       end
     rescue LoadError
     end

data/spec/lib/simp/rake/build/files/dependencies.yaml

@@ -20,7 +20,10 @@
     # does NOT include puppetlabs/apt
     - 'pupmod-puppetlabs-stdlib'
     - 'pupmod-ceritsc-yum'
+    - 'i-should-not-exist'
     - ['pupmod-richardc-datacat', '1.2.3', '<=3.4.5']
+  :ignores:
+    - 'i-should-not-exist'
   :release: '2017.0'
   :external_dependencies:
     'rubygem-puppetserver-toml':

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

@@ -194,7 +194,7 @@ EOM
   context 'dependency from dependencies.yaml not found in metadata.json' do
     it 'should fail when dep in depedencies.yaml is not found in metadata.json' do
       mod_dir = File.join(@tmp_dir, 'files', 'unknown_dep_mod')
-      err_msg = "Could not find oops/unknown dependency in #{mod_dir}/metadata.json"
+      err_msg = "Could not find 'oops/unknown' dependency in #{mod_dir}/metadata.json"
       expect {
         Simp::Rake::Build::RpmDeps::generate_rpm_meta_files(mod_dir, rpm_metadata)
       }.to raise_error(err_msg)
@@ -204,7 +204,7 @@ EOM
   context 'malformed dependency version' do
     it 'should fail for managed component with invalid dep version in metadata.json' do
       mod_dir = File.join(@tmp_dir, 'files', 'malformed_dep_meta_mod')
-      err_msg = "Unable to parse foo1/bar1 dependency version '1.0.0.1' in #{mod_dir}/metadata.json"
+      err_msg = "Unable to parse 'foo1/bar1' dependency version '1.0.0.1' in #{mod_dir}/metadata.json"
       expect {
         Simp::Rake::Build::RpmDeps::generate_rpm_meta_files(mod_dir, rpm_metadata)
       }.to raise_error(err_msg)
@@ -214,7 +214,7 @@ EOM
       rpm_meta = rpm_metadata.dup
       rpm_meta ['malformed_dep_meta_mod'] = nil
       mod_dir = File.join(@tmp_dir, 'files', 'malformed_dep_meta_mod')
-      err_msg = "Unable to parse foo1/bar1 dependency version '1.0.0.1' in #{mod_dir}/metadata.json"
+      err_msg = "Unable to parse 'foo1/bar1' dependency version '1.0.0.1' in #{mod_dir}/metadata.json"
       expect {
         Simp::Rake::Build::RpmDeps::generate_rpm_meta_files(mod_dir, rpm_meta)
       }.to raise_error(err_msg)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 5.15.0
+  version: 5.17.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-03 00:00:00.000000000 Z
+date: 2022-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simp-beaker-helpers
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.24'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.24'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -105,20 +105,40 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: puppet-lint-optional_default-check
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: puppetlabs_spec_helper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement