simp-rake-helpers 5.2.0 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 476fb45c0548c83de14eec268b1970b990a0c50ef8ead160f502bb3c34fa3bd6
-  data.tar.gz: 0d6dde21abf6befaf136b973f324d2cd812f0d36d49c0a6e48971499b0487802
+  metadata.gz: cd72175666f147fd150435496fed0093586b507af569c4682afa713f12fb251f
+  data.tar.gz: 21b5c168ec65c56a9081d3b5a53d80f53fe96ec9b8e48b988c47f025d8476f29
 SHA512:
-  metadata.gz: f090fd69b70d38e94f0a71ba57d3e76782b10a7ef6e7987c8a4b8665b17a29b2b5c9b7065c0b150979544f09203b8ac385fea194b2bf5672b44499868302a9e0
-  data.tar.gz: 3671a8e5759091753650ca03fcddfbc68ada6c85fcb12e6c33e6d803e3b9c3d78eafbcf858ef828632ba085d9fe831abd3d4d124227e83afaf7a408c8f310a6c
+  metadata.gz: 50fc2bed131761ed25041f17ed4455bfe270d96d9c9e42e456ebf3ad870cf2cdb9c936af6ece47cbb98aea65d7ee9bc12429eab9e40f9c4017bcd396564ee68b
+  data.tar.gz: 08206ff2084e66f5544751d3bc6f9430437c6b2fee09d3df4665878d1c7dd97b847e075dc86eabe30f02189d0549b9acadab6bdede251c0996af4f4f46fdfdef

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 5.3.0 / 2018-02-02
+* Add ability to specify external, non-module, RPM dependencies for
+  a checked-out repo from `simp-core/build/rpm/dependencies.yaml`
+
 ### 5.2.0 / 2017-12-20
 * Create pkg:create_tag_changelog, which is a more thorough version
   of Simp::Rake::Pupmod::Helpers changelog_annotation task.

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

@@ -119,6 +119,29 @@ module Simp::Rake::Build::RpmDeps
     rpm_metadata_content.flatten
   end
 
+  # Generate 'Requires' lines from each dependency specified in the
+  # ext_deps_list array
+  #
+  # returns array of strings, each of which is a 'Requires' line
+  # for use in an RPM spec file
+  #
+  # +ext_deps_list+:: Array of dependency Hashes.  The key of each
+  #    dependency Hash the name of the dependency package and its value
+  #    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)
+    requires = []
+
+    ext_deps_list.each do |pkg_name, options|
+      requires << "Requires: #{pkg_name} >= #{options[:min]}"
+      if options[:max]
+        requires << "Requires: #{pkg_name} < #{options[:max]}"
+      end
+    end
+    requires
+  end
+
   # Generate 'Requires' lines from each dependency specified in the
   # module_metadata hash
   #
@@ -174,6 +197,8 @@ module Simp::Rake::Build::RpmDeps
   # * 'Requires' lines for any requires specified in the
   #   module_rpm_meta hash, where the versions for those
   #   dependencies are pulled from module_metadata.
+  # * '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.
@@ -200,6 +225,10 @@ module Simp::Rake::Build::RpmDeps
       rpm_metadata_content += generate_module_rpm_requires(module_metadata)
     end
 
+    if module_rpm_meta and module_rpm_meta[:external_dependencies]
+      rpm_metadata_content += generate_external_rpm_requires(module_rpm_meta[:external_dependencies])
+    end
+
     rpm_metadata_file = File.join(dir, 'build', 'rpm_metadata', 'requires')
 
     unless rpm_requires_up_to_date?(rpm_metadata_content, rpm_metadata_file)

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

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

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

@@ -22,6 +22,12 @@
     - 'pupmod-ceritsc-yum'
     - 'pupmod-richardc-datacat'
   :release: '2017.0'
+  :external_dependencies:
+    'rubygem-puppetserver-toml':
+      :min: '0.1.2'
+    'rubygem-puppetserver-blackslate':
+      :min: '2.1.2.4-1'
+      :max: '2.2.0.0'
 'release_only_mod':
   :release: '2017.2'
 'obsoletes_too_new_mod':

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

@@ -1,5 +1,6 @@
 require 'simp/rake/build/rpmdeps'
 require 'spec_helper'
+require 'tmpdir'
 require 'yaml'
 
 describe 'Simp::Rake::Build::RpmDeps#get_version_requires' do
@@ -81,7 +82,7 @@ EOM
     end
   end
 
-  context 'managed component with a subset of metadata.json dependencies and a release' do
+  context 'managed component with a subset of metadata.json deps, external deps and a release' do
     it 'should generate both a requires file and a release file from dependencies.yaml' do
       mod_dir = File.join(@tmp_dir, 'files', 'managed_mod')
       Simp::Rake::Build::RpmDeps::generate_rpm_meta_files(mod_dir, rpm_metadata)
@@ -97,6 +98,9 @@ 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: rubygem-puppetserver-toml >= 0.1.2
+Requires: rubygem-puppetserver-blackslate >= 2.1.2.4-1
+Requires: rubygem-puppetserver-blackslate < 2.2.0.0
 EOM
       actual = IO.read(requires_file)
       expect(actual).to eq expected

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.3.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-20 00:00:00.000000000 Z
+date: 2018-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -608,7 +608,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: SIMP rake helpers