simp-rake-helpers 5.14.0 → 5.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dfb50582e2d9f05a5ea7ac039013727dadd80b6fc931bd1c7a35ef2f1a89400
-  data.tar.gz: 5507ff633482b131f3beeeeee24166e8afeacdbc94987fde93a7c564e77d6d05
+  metadata.gz: 0fc850ad07208e9cca1afe63b9ad29253c8e6dc2310290ad7c168faedd9ad0a7
+  data.tar.gz: 3bd521f05c66567b3478e675603be5c75a9b8a0ad9561322e43ad725e22f1d15
 SHA512:
-  metadata.gz: edf69ac817e38a9b4c7e32ab6352c96b612728fd85a7e8e1c247ed6ac47a6d9d84e92207ce7437e6aa1cc2743cfad5128a7f0d94832940a093d2042063482682
-  data.tar.gz: d9a07c960cbfe946978d97a565ebe468a6f259c9486002db13f89c0a6aefea8422d68d14e5e9c523e8bc34ce4b4ce48fce5c42a8f4d9ad329b8c3cf4fdf30a07
+  metadata.gz: f74eabacff77b22d46a168a1890fc0af3b97910e9aba213f72385e8bc349a0be59316158f14799dfc24d4b949d9c0342678767ce772181a0e1e938723bdad185
+  data.tar.gz: 61e13e8c60a02fe50481f5d19437e3d1ae9936cb28313d8a9e0a4a74041e243f63891872982b6695fcb26ffa5629237cb2d26b6777f4caba45a158e6d68fe571

data/CHANGELOG.md

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

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

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

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.14.0
+  version: 5.15.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-27 00:00:00.000000000 Z
+date: 2022-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simp-beaker-helpers