simp-rake-helpers 5.10.2 → 5.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79ad7ad7188d33672087722a247a56a145315e941ffa7e44fc26b7a847ef91f5
-  data.tar.gz: 05ff2357f2615369f5e24f84be1aff9d7bb16d535c8b77f2126fdd2a7b2adced
+  metadata.gz: a8df4b35e000bb36b26db550e81337f96b2fa1dfa99646dc4d7fcbfe76e2ecdf
+  data.tar.gz: d3f6ea0a5ef4d1ac277b6447615305a118184c0e59f79d860ae9acc34439bf70
 SHA512:
-  metadata.gz: 0fe5a161b357ef4777f58c28397a39622d061750a20c129effc80d4c61f2678f6846ccb710ee170ab4375290498e9cfcad500451c2f24233a1b172c49ec59daf
-  data.tar.gz: 75c69637690c41f54545f7b977893b8b7b28ca038b2160f2a2a843b3caa2a26a81e10c0861104a75fd9c95ba8db962856e2a51119926b2bb946c74bf6877319d
+  metadata.gz: db7c733f928206a27e60a984b5b1b9bcb4fae865adbb57818803ff9f9738eefe976372ce5a14fab45be2cb836906798e33074068f4654b71b6733b2b85714fb8
+  data.tar.gz: 90408311e53eefc6b4d9714e63c39c325b66c7a5c1dd720b540014d59d00c067413a16f1940359d769feaa37d22705a13c06ab2540b7780b092f9142279b9d83

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### 5.11.0 / 2020-03-16
+* Add SIMP optional dependencies to RPM requires list
+
 ### 5.10.2 / 2020-02-10
 * Allow v3 of simp-rspec-puppet-facts
 * Fix '~> 0' notation

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

@@ -103,6 +103,13 @@ module Simp::Rake::Build::RpmDeps
         short_names.include?(dep['name'])
       }
 
+      if dep_info.empty? && module_metadata['simp'] &&
+        module_metadata['simp']['optional_dependencies']
+        dep_info = module_metadata['simp']['optional_dependencies'].select{ |dep|
+          short_names.include?(dep['name'])
+        }
+      end
+
       if dep_info.empty?
         err_msg = "Could not find #{short_names.first} dependency"
         raise SIMPRpmDepException.new(err_msg)
@@ -145,7 +152,7 @@ module Simp::Rake::Build::RpmDeps
   end
 
   # Generate 'Requires' lines from each dependency specified in the
-  # module_metadata hash
+  # module_metadata hash, including SIMP optional dependencies
   #
   # returns array of strings, each of which is a 'Requires' line for
   # use in an RPM spec file
@@ -157,20 +164,29 @@ module Simp::Rake::Build::RpmDeps
   #   module's 'metadata.json' file
   def self.generate_module_rpm_requires(module_metadata)
     rpm_metadata_content = []
-    # metadata.json should always contain dependencies list, even
-    # if it is empty, but we'll safely handle that error case here
+
+    deps = []
     if module_metadata['dependencies']
-      module_metadata['dependencies'].each do |dep|
-        pkg = "pupmod-#{dep['name'].gsub('/', '-')}"
-        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" +
-            " version '#{dep_version}'"
-          raise SIMPRpmDepException.new(err_msg)
-        end
+      deps += module_metadata['dependencies']
+    end
+
+    if module_metadata['simp'] &&
+      module_metadata['simp']['optional_dependencies']
+
+      deps += module_metadata['simp']['optional_dependencies']
+    end
+
+    deps.sort! { |x,y| x['name'] <=> y['name'] }
+    deps.each do |dep|
+      pkg = "pupmod-#{dep['name'].gsub('/', '-')}"
+      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" +
+          " version '#{dep_version}'"
+        raise SIMPRpmDepException.new(err_msg)
       end
     end
 
@@ -202,8 +218,9 @@ module Simp::Rake::Build::RpmDeps
   # * 'Requires' line(s) for any external dependencies specified
   #   in the module_rpm_meta hash.
   #
-  # Otherwise, the generated 'requires' file will contain
-  # "Requires" lines for each dependency specified module_metadata.
+  # Otherwise, the generated 'requires' file will contain "Requires"
+  # lines for each dependency and each SIMP optional dependency
+  # specified in module_metadata.
   #
   # raises SIMPRpmDepException if any 'metadata.json' dependency
   #   version string from module_metadata cannot be parsed or a

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

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

data/spec/lib/simp/rake/build/files/changed_name_mod/metadata.json

@@ -24,16 +24,20 @@
     {
       "name": "foo4/bar4",
       "version_requirement": ">= 4.0.0 < 5.0.0"
-    },
-    {
-      "name": "foo5/bar5",
-      "version_requirement": "5.x"
-    },
-    {
-      "name": "foo6/bar6",
-      "version_requirement": "6.4.x"
     }
   ],
+  "simp": {
+    "optional_dependencies": [
+      {
+        "name": "foo5/bar5",
+        "version_requirement": "5.x"
+      },
+      {
+        "name": "foo6/bar6",
+        "version_requirement": "6.4.x"
+      }
+    ]
+  },
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",

data/spec/lib/simp/rake/build/files/unmanaged_mod/metadata.json

@@ -12,19 +12,23 @@
       "name": "puppetlabs/inifile",
       "version_requirement": ">= 1.6.0 < 2.0.0"
     },
-    {
-      "name": "puppetlabs/puppetdb",
-      "version_requirement": ">= 5.1.2 < 6.0.0"
-    },
-    {
-      "name": "puppetlabs/postgresql",
-      "version_requirement": ">= 4.8.0 < 5.0.0"
-    },
     {
       "name": "puppetlabs/stdlib",
       "version_requirement": ">= 4.13.1 < 5.0.0"
     }
   ],
+  "simp": {
+    "optional_dependencies": [
+      {
+        "name": "puppetlabs/puppetdb",
+        "version_requirement": ">= 5.1.2 < 6.0.0"
+      },
+      {
+        "name": "puppetlabs/postgresql",
+        "version_requirement": ">= 4.8.0 < 5.0.0"
+      }
+    ]
+  },
   "requirements": [
     {
       "name": "puppet",

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

@@ -40,6 +40,14 @@ describe 'Simp::Rake::Build::RpmDeps#get_version_requires' do
   end
 end
 
+# In the tests below, a 'managed' component is one with an entry in the
+# simp-core/build/rpm/dependencies.yaml. It is a module, whose RPM
+# dependencies, obsoletes, and/or release qualifier need to be managed.
+#
+# An 'unmanaged' component is a module that has no special packaging needs.
+# It has no obsoletes, can use the default release qualifier of 0, and needs
+# no adjustments to the dependencies it advertises in its metadata.json file.
+#
 describe 'Simp::Rake::Build::RpmDeps#generate_rpm_meta_files' do
   let(:files_dir) { File.join(File.dirname(__FILE__), 'files') }
   let(:rpm_metadata) {
@@ -143,10 +151,10 @@ EOM
       expected = <<EOM
 Requires: pupmod-puppetlabs-inifile >= 1.6.0
 Requires: pupmod-puppetlabs-inifile < 2.0.0
-Requires: pupmod-puppetlabs-puppetdb >= 5.1.2
-Requires: pupmod-puppetlabs-puppetdb < 6.0.0
 Requires: pupmod-puppetlabs-postgresql >= 4.8.0
 Requires: pupmod-puppetlabs-postgresql < 5.0.0
+Requires: pupmod-puppetlabs-puppetdb >= 5.1.2
+Requires: pupmod-puppetlabs-puppetdb < 6.0.0
 Requires: pupmod-puppetlabs-stdlib >= 4.13.1
 Requires: pupmod-puppetlabs-stdlib < 5.0.0
 EOM

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 5.10.2
+  version: 5.11.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-11 00:00:00.000000000 Z
+date: 2020-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simp-beaker-helpers