simp-rake-helpers 5.13.1 → 5.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6f0550abc4ac7ec968a8590bbc7003d0de2753ae072909396fce25c01a7edd3
-  data.tar.gz: 4eb8efa7f00322290a3a45a6e304ac6b1798e3d47283e1ad525184ae95f9560f
+  metadata.gz: 0fc850ad07208e9cca1afe63b9ad29253c8e6dc2310290ad7c168faedd9ad0a7
+  data.tar.gz: 3bd521f05c66567b3478e675603be5c75a9b8a0ad9561322e43ad725e22f1d15
 SHA512:
-  metadata.gz: e6eef279b4061c054908d69ab0408e5e850149bc92689db7b64f167d9815186af793a07c905bbf47d71763107088cdd4059da6f31e95f775410ab03803428b68
-  data.tar.gz: 4bf2a7cfedbd8a9a711f9ba19e62ad16c0dcd593511ab21d249eda819b1ac67ba7ed0285a085057e7b68e31a700fdb185d57736a773734512821781096bad478
+  metadata.gz: f74eabacff77b22d46a168a1890fc0af3b97910e9aba213f72385e8bc349a0be59316158f14799dfc24d4b949d9c0342678767ce772181a0e1e938723bdad185
+  data.tar.gz: 61e13e8c60a02fe50481f5d19437e3d1ae9936cb28313d8a9e0a4a74041e243f63891872982b6695fcb26ffa5629237cb2d26b6777f4caba45a158e6d68fe571

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+### 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
+
 ### 5.13.1 / 2022-05-01
 - Fixed:
   - Aligned wtih an API change in the `dirty?` method in `r10k`
@@ -5,6 +25,8 @@
 ### 5.13.0 / 2021-11-14
 - Added:
   - Output the full `mkisofs` command when building an ISO
+  - Added SIMP_BUILD_reposync_only to ignore the built tarball if a reposync
+    directory is present
 
 ### 5.12.7 / 2021-10-26
 - Added:

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

@@ -266,8 +266,11 @@ module Simp::Rake::Build
                 puts
                 puts '-'*80
                 puts
+
+                # Only add the ISO modifications
+                system(%(tar --no-same-permissions --exclude="*.rpm" -C #{dir} -xzf #{tball}))
               else
-                # Add the SIMP code
+                # Add the SIMP code and ISO modifications
                 system("tar --no-same-permissions -C #{dir} -xzf #{tball}")
 
                 # Pop the SIMP directory from the tarball into the correct spot
@@ -446,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.1'
+  VERSION = '5.15.0'
 end

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

@@ -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.1
+  version: 5.15.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-06 00:00:00.000000000 Z
+date: 2022-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simp-beaker-helpers
@@ -265,7 +265,7 @@ dependencies:
         version: '0'
 description: '    "simp-rake-helpers provides common methods for SIMP Rake Tasks"
 
-'
+  '
 email: simp@simp-project.org
 executables: []
 extensions: []
@@ -592,7 +592,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubyforge_project: 
+rubygems_version: 2.7.6.3
 signing_key: 
 specification_version: 4
 summary: SIMP rake helpers