simp-rake-helpers 5.13.2 → 5.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34a577aa7249f7f21146cedc2a72eb0c922ade1d4cf12ec152097297d8c36ec9
-  data.tar.gz: 7cdefe54c3206c33da6fab2a1bdefb7e68ea1806f2905405a0edc3c4b6a6cce1
+  metadata.gz: 37092929f65e40c37650e9d14f8355dc1fddafd1355e05a08ac26ac033f3bb30
+  data.tar.gz: 7dde697dd869d589a28b58e8503f7e69fbab85a33acdeb2d3213122b257fd4f1
 SHA512:
-  metadata.gz: 063ea6a2ab7f471532b948400460587835b3e98497a33c682113cd216216fb0e362ed24f301edff42972ea79903c28ae8cdad81b56e6cc8834fc4ad48d19ee76
-  data.tar.gz: 2d05c1877803b352a2c85cf473c8a79b520159d23e023c9b69c13776e8d59209f79d13ae2eadb674bbf0aa96d71c00af168269f6914334f35db802c28609c637
+  metadata.gz: a314be69fcde5bb3661abdccce49623d6a1fa93065bf32ac6e44a1db22cf5547808284cde80093cdbfd8d90e0b97e13f9b3489dbe62502ff3d9471fe55d24502
+  data.tar.gz: 93658197582ab5a656751f5c1ddffcf971c204ce89478d4b3f8df753f792fe479653369213df4c00a053376035eb1582caeca21322bcd8df1a0c5e91ea7d7235

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+### 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`
+    file that will override those in the `metadata.json`
+
+### 5.14.0 / 2022-05-14
+- Added
+  - Run `implantisomd5` after the ISO has been created so that it can be
+    validated by the installer at runtime.
+
+### 5.13.3 / 2022-05-20
+- Fixed:
+  - Changed default RPM installed file permissions to 0644/0755
+  - The tarball unpack exclusions were too aggressive. The `SIMP/GPGKEYS`
+      directory is now preserved properly.
+
 ### 5.13.2 / 2022-05-13
 - Fixed:
   - SIMP_BUILD_reposync_only now properly unpacks the tarball

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/auto.rb

@@ -38,6 +38,7 @@ module Simp::Rake::Build
       'gpg',
       'grep',
       'gzip',
+      'implantisomd5',
       'install',
       'isoinfo',
       'm4',
@@ -139,6 +140,7 @@ module Simp::Rake::Build
             :key_name     => ENV['SIMP_BUILD_signing_key'] || 'dev'
           )
 
+          reposync_only    = ENV.fetch('SIMP_BUILD_reposync_only', 'no') == 'yes'
           iso_paths        = File.expand_path(args[:iso_paths])
           target_release   = args[:release]
           do_checksum      = (args.do_checksum = ~ /^$/ ? 'false' : args.do_checksum)

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

@@ -268,7 +268,7 @@ module Simp::Rake::Build
                 puts
 
                 # Only add the ISO modifications
-                system(%(tar --no-same-permissions --exclude="SIMP" -C #{dir} -xzf #{tball}))
+                system(%(tar --no-same-permissions --exclude="*.rpm" -C #{dir} -xzf #{tball}))
               else
                 # Add the SIMP code and ISO modifications
                 system("tar --no-same-permissions -C #{dir} -xzf #{tball}")
@@ -449,7 +449,10 @@ module Simp::Rake::Build
           end # End of tarfiles loop
 
           # If we got here and didn't generate any ISOs, something went horribly wrong
-          fail('Error: No ISO was built!') unless @simp_output_iso
+          fail('Error: No ISO was built!') unless ( @simp_output_iso && File.exist?(@simp_output_iso) )
+
+          # Embed the validation checksum
+          system("implantisomd5 --supported-iso #{@simp_output_iso}")
         end
 
 =begin

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

@@ -89,12 +89,40 @@ module Simp::Rake::Build::RpmDeps
   #
   # +requires_list+:: list of package this module should require
   #   from the 'dependencies.yaml'
+  #
+  #   * If the entry is an Array, the second value will be treated as the
+  #     minimum version and the third as the maximum version
+  #   * If you specify your own limiters, it will put them in place verbatim
+  #   * Examples:
+  #     * ['rpm-name', '1.2.3']
+  #       * Requires rpm-name >= 1.2.3
+  #     * ['rpm-name', '1.2.3', '2.0.0']
+  #       * Requires rpm-name >= 1.2.3
+  #       * Requires rpm-name < 2.0.0
+  #     * ['rpm-name', '> 1.2.3', '<= 2.0.0']
+  #       * Requires rpm-name > 1.2.3
+  #       * 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)
     rpm_metadata_content = []
 
-    requires_list.each do |pkg|
+    requires_list.each do |pkg_to_modify|
+      pkg = pkg_to_modify
+      min_version = nil
+      max_version = nil
+
+      pkg, min_version, max_version = pkg if pkg.is_a?(Array)
+
+      rpm_version_chars = ['<','>','=']
+
+      if min_version && rpm_version_chars.none? { |x| min_version.include?(x) }
+        min_version = ">= #{min_version}"
+      end
+      if max_version && rpm_version_chars.none? { |x| max_version.include?(x) }
+        max_version = "< #{max_version}"
+      end
+
       pkg_parts = pkg.split(%r(-|/))[-2..-1]
 
       # Need to cover all base cases
@@ -118,12 +146,18 @@ module Simp::Rake::Build::RpmDeps
         dep_version = dep_info.first['version_requirement']
       end
 
-      begin
-        rpm_metadata_content << get_version_requires(pkg, dep_version)
-      rescue SIMPRpmDepVersionException
-        err_msg = "Unable to parse #{short_names.first} dependency" +
-          " version '#{dep_version}'"
-        raise SIMPRpmDepException.new(err_msg)
+      # Use the version specified in the config file if it exists
+      if min_version || max_version
+        rpm_metadata_content << "Requires: #{pkg} #{min_version}" if min_version
+        rpm_metadata_content << "Requires: #{pkg} #{max_version}" if max_version
+      else
+        begin
+          rpm_metadata_content << get_version_requires(pkg, dep_version)
+        rescue SIMPRpmDepVersionException
+          err_msg = "Unable to parse #{short_names.first} dependency" +
+            " version '#{dep_version}'"
+          raise SIMPRpmDepException.new(err_msg)
+        end
       end
     end
     rpm_metadata_content.flatten

data/lib/simp/rake/helpers/assets/rpm_spec/simp6.spec

@@ -587,7 +587,7 @@ mkdir -p %{buildroot}/%{prefix}
 
 
 %files
-%defattr(0640,root,root,0750)
+%defattr(0644,root,root,0755)
 %{prefix}/%{module_name}
 
 %changelog

data/lib/simp/rake/helpers/assets/rpm_spec/simpdefault.spec

@@ -587,7 +587,7 @@ mkdir -p %{buildroot}/%{prefix}
 
 
 %files
-%defattr(0640,root,root,0750)
+%defattr(0644,root,root,0755)
 %{prefix}/%{module_name}
 
 %changelog

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

@@ -2,5 +2,5 @@ module Simp; end
 module Simp::Rake; end
 
 class Simp::Rake::Helpers
-  VERSION = '5.13.2'
+  VERSION = '5.16.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
@@ -290,7 +290,7 @@ class Simp::Rake::Pupmod::Helpers < ::Rake::TaskLib
     # That will give Travis a way of warning us if the changelog
     # will prevent the rpm from building.
     task :changelog_annotation, [:quiet] do |t,args|
-      warning('DEPRECATED: use pkg:create_tag_changelog')
+      warn('DEPRECATED: use pkg:create_tag_changelog')
       quiet = true if args[:quiet].to_s == 'true'
       puts changelog_annotation( quiet )
     end
@@ -333,7 +333,7 @@ class Simp::Rake::Pupmod::Helpers < ::Rake::TaskLib
       - doc directory
     EOM
     task :compare_latest_tag, [:tags_source, :ignore_owner, :verbose] do |t,args|
-      warning('DEPRECATED: use pkg:compare_latest_tag')
+      warn('DEPRECATED: use pkg:compare_latest_tag')
       require 'json'
 
       tags_source = args[:tags_source].nil? ? 'origin' : args[:tags_source]

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

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

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

@@ -105,8 +105,8 @@ Requires: pupmod-puppetlabs-stdlib >= 3.2.0
 Requires: pupmod-puppetlabs-stdlib < 5.0.0
 Requires: pupmod-ceritsc-yum >= 0.9.6
 Requires: pupmod-ceritsc-yum < 1.0.0
-Requires: pupmod-richardc-datacat >= 0.6.2
-Requires: pupmod-richardc-datacat < 1.0.0
+Requires: pupmod-richardc-datacat >= 1.2.3
+Requires: pupmod-richardc-datacat <=3.4.5
 Requires: rubygem-puppetserver-toml >= 0.1.2
 Requires: rubygem-puppetserver-blackslate >= 2.1.2.4-1
 Requires: rubygem-puppetserver-blackslate < 2.2.0.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 5.13.2
+  version: 5.16.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-13 00:00:00.000000000 Z
+date: 2022-06-29 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