simp-rake-helpers 5.10.2 → 5.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79ad7ad7188d33672087722a247a56a145315e941ffa7e44fc26b7a847ef91f5
-  data.tar.gz: 05ff2357f2615369f5e24f84be1aff9d7bb16d535c8b77f2126fdd2a7b2adced
+  metadata.gz: 3bde11b6e154b94ae99c983cc5efbc50ee72bfd5e4fff43752f3bde5a1fe9383
+  data.tar.gz: 1f20976af7376822f6d4ab663b2d5f4b01bab9c85cc71a3f86035d586771e443
 SHA512:
-  metadata.gz: 0fe5a161b357ef4777f58c28397a39622d061750a20c129effc80d4c61f2678f6846ccb710ee170ab4375290498e9cfcad500451c2f24233a1b172c49ec59daf
-  data.tar.gz: 75c69637690c41f54545f7b977893b8b7b28ca038b2160f2a2a843b3caa2a26a81e10c0861104a75fd9c95ba8db962856e2a51119926b2bb946c74bf6877319d
+  metadata.gz: bc56ab90f4e83059108725f9750793ba060bac5af618d72e819f095319233ae1229a7f8a153feb4ecd50de46808792fd9c3c2559f02ec632c606a9fdeb3a8659
+  data.tar.gz: 8cdf8f62c251be9bbc3388adaae57516fde2eb0478adf6ec4fd66c09bf411cf1902546ac309a455f87dcef1d30db3f5cd498dcc6838e2a80c0102f1448bc5c1e

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+### 5.11.4 / 2020-08-03
+* Permit *.md files in `rake pkg:compare_latest_tag`
+
+### 5.11.3 / 2020-05-19
+* Fix automatically added dependencies for SIMP 6.4+
+
+### 5.11.2 / 2020-04-08
+* Version information should not be required on dependencies in metadata.json
+
+### 5.11.1 / 2020-04-07
+* Puppet module RPM logic handles `-rc0` suffix in `metadata.json`
+
+### 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/Gemfile

@@ -12,6 +12,7 @@ gemspec
 gem 'simp-build-helpers'
 gem 'simp-beaker-helpers'
 gem 'beaker-puppet_install_helper'
+gem 'rake', '>= 12.3.3'
 
 if puppetversion
   gem 'puppet', puppetversion

data/lib/simp/componentinfo.rb

@@ -99,9 +99,12 @@ class Simp::ComponentInfo
     require 'json'
     metadata_file = File.join(@component_dir, 'metadata.json')
     metadata = JSON.parse(File.read(metadata_file))
-    @version = metadata['version']
-    @release = nil
-    fail("ERROR: Version missing from #{metadata_file}") if @version.nil?
+    fail("ERROR: Version missing from #{metadata_file}") if metadata['version'].nil?
+
+    @version = metadata['version'].split('-').first
+    rel_bits = metadata['version'].split('-')[1..-1]
+    @release = rel_bits.empty? ? nil : rel_bits.join('-')
+
 
     changelog_file = File.join(component_dir, 'CHANGELOG')
     unless File.exists?(changelog_file)

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

@@ -15,28 +15,29 @@ module Simp::Rake::Build::RpmDeps
   # raises SIMPRpmDepVersionException if the dependency version
   #   string cannot be parsed
   def self.get_version_requires(pkg, dep_version)
+    return ["Requires: #{pkg}"] if dep_version.nil?
+    return ["Requires: #{pkg} = #{$1}"] if dep_version =~ /^\s*(\d+\.\d+\.\d+)\s*$/
+
     requires = []
-    if dep_version =~ /^\s*(\d+\.\d+\.\d+)\s*$/
-      requires << "Requires: #{pkg} = #{$1}"
-    else
-      if dep_version.include?('x')
-        dep_parts = dep_version.split('.')
-
-        if dep_parts.count == 3
-          dep_version = ">= #{dep_parts[0]}.#{dep_parts[1]}.0 < #{dep_parts[0].to_i + 1}.0.0"
-        else
-          dep_version = ">= #{dep_parts[0]}.0.0 < #{dep_parts[0].to_i + 1}.0.0"
-        end
-      end
 
-      # metadata.json is a LOT more forgiving than the RPM spec file
-      if dep_version =~ /^\s*(?:(?:([<>]=?)\s*(\d+\.\d+\.\d+))\s*(?:(<)\s*(\d+\.\d+\.\d+))?)\s*$/
-        requires << "Requires: #{pkg} #{$1} #{$2}"
-        requires << "Requires: #{pkg} #{$3} #{$4}" if $3
+    if dep_version.include?('x')
+      dep_parts = dep_version.split('.')
+
+      if dep_parts.count == 3
+        dep_version = ">= #{dep_parts[0]}.#{dep_parts[1]}.0 < #{dep_parts[0].to_i + 1}.0.0"
       else
-        raise SIMPRpmDepVersionException.new
+        dep_version = ">= #{dep_parts[0]}.0.0 < #{dep_parts[0].to_i + 1}.0.0"
       end
     end
+
+    # metadata.json is a LOT more forgiving than the RPM spec file
+    if dep_version =~ /^\s*(?:(?:([<>]=?)\s*(\d+\.\d+\.\d+))\s*(?:(<)\s*(\d+\.\d+\.\d+))?)\s*$/
+      requires << "Requires: #{pkg} #{$1} #{$2}"
+      requires << "Requires: #{pkg} #{$3} #{$4}" if $3
+    else
+      raise SIMPRpmDepVersionException.new
+    end
+
     requires
   end
 
@@ -103,6 +104,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 +153,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 +165,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 +219,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/build/tar.rb

@@ -62,7 +62,7 @@ module Simp::Rake::Build
           else
             required_rpms['noarch'] << 'simp-rsync-skeleton'
             required_rpms['noarch'] << 'simp-environment-skeleton'
-            required_rpms['noarch'] << 'simp-environment-selinux-policy'
+            required_rpms['noarch'] << 'simp-selinux-policy'
           end
 
           rpm_dir = File.join(@build_dir,'SIMP','RPMS')

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

@@ -196,14 +196,28 @@ end
 
 -- Get the Module Version
 
-local version_match = metadata:match('"version":%s+"(.-)"%s*,')
+--  Note on '-rc0' style Release versions in metadata.json:
+--    Some Puppet orgs (like voxpupuli) append '-rc0' to the module version
+--    to denote prerelease status and act as a safety check (because the Forge
+--    only accepts release in SemVer \d+\.\d+\.\d+ release format)
+--
+--    This code will remove a '-rc0' style prerelease string from the RPM
+--     Version, and use it as the default RPM Release (instead of '-0')
 
+local version_match = metadata:match('"version":%s+"(.-)"%s*,'):gsub('-.*','')
 if version_match then
   package_version = version_match
 else
   error("Could not find valid package version in 'metadata.json'", 0)
 end
 
+-- Get the Module Release (if present)
+
+local release_match = metadata:match('"version":%s+"[%d.]+-([^"]+)"')
+
+if release_match then
+  package_release = release_match
+end
 }
 
 %{lua:

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

@@ -196,14 +196,28 @@ end
 
 -- Get the Module Version
 
-local version_match = metadata:match('"version":%s+"(.-)"%s*,')
+--  Note on '-rc0' style Release versions in metadata.json:
+--    Some Puppet orgs (like voxpupuli) append '-rc0' to the module version
+--    to denote prerelease status and act as a safety check (because the Forge
+--    only accepts release in SemVer \d+\.\d+\.\d+ release format)
+--
+--    This code will remove a '-rc0' style prerelease string from the RPM
+--     Version, and use it as the default RPM Release (instead of '-0')
 
+local version_match = metadata:match('"version":%s+"(.-)"%s*,'):gsub('-.*','')
 if version_match then
   package_version = version_match
 else
   error("Could not find valid package version in 'metadata.json'", 0)
 end
 
+-- Get the Module Release (if present)
+
+local release_match = metadata:match('"version":%s+"[%d.]+-([^"]+)"')
+
+if release_match then
+  package_release = release_match
+end
 }
 
 %{lua:

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.4'
 end

data/lib/simp/relchecks.rb

@@ -87,7 +87,7 @@ class Simp::RelChecks
         # determine mission-impacting files that have changed
         files_changed = `git diff tags/#{last_tag} --name-only`.strip.split("\n")
         files_changed.delete_if do |file|
-          file[0] ==  '.' or file == 'Rakefile' or file =~ /^Gemfile|^spec\/|^doc\/|^rakelib\//
+          file[0] ==  '.' or file == 'Rakefile' or file =~ /^Gemfile|^spec\/|^doc\/|^rakelib\/|.*\.md\Z/
         end
 
         if files_changed.empty?

data/spec/lib/simp/ci/files/job_broken_link_nodeset/spec/acceptance/suites/default/nodesets

@@ -1 +1 @@
-spec/lib/simp/ci/files/job_broken_link_nodeset/spec/acceptance/suites/default/../../nodesets
+../../nodesets

data/spec/lib/simp/ci/files/job_invalid_nodeset/spec/acceptance/suites/default/nodesets

@@ -1 +1 @@
-spec/lib/simp/ci/files/job_invalid_nodeset/spec/acceptance/suites/default/../../nodesets
+../../nodesets

data/spec/lib/simp/ci/files/job_invalid_suite/spec/acceptance/suites/default/nodesets

@@ -1 +1 @@
-spec/lib/simp/ci/files/job_invalid_suite/spec/acceptance/suites/default/../../nodesets
+../../nodesets

data/spec/lib/simp/ci/files/job_missing_nodeset/spec/acceptance/suites/default/nodesets

@@ -1 +1 @@
-spec/lib/simp/ci/files/job_missing_nodeset/spec/acceptance/suites/default/../../nodesets
+../../nodesets

data/spec/lib/simp/ci/files/job_missing_suite_and_nodeset/spec/acceptance/suites/default/nodesets

@@ -1 +1 @@
-spec/lib/simp/ci/files/job_missing_suite_and_nodeset/spec/acceptance/suites/default/../../nodesets
+../../nodesets

data/spec/lib/simp/ci/files/multiple_invalid_jobs/spec/acceptance/suites/default/nodesets

@@ -1 +1 @@
-spec/lib/simp/ci/files/multiple_invalid_jobs/spec/acceptance/suites/default/../../nodesets
+../../nodesets

data/spec/lib/simp/ci/files/multiple_valid_jobs/spec/acceptance/suites/default/nodesets

@@ -1 +1 @@
-spec/lib/simp/ci/files/multiple_valid_jobs/spec/acceptance/suites/default/../../nodesets
+../../nodesets

data/spec/lib/simp/ci/files/no_gitlab_config_with_tests/spec/acceptance/suites/default/nodesets

@@ -1 +1 @@
-spec/lib/simp/ci/files/no_gitlab_config_with_tests/spec/acceptance/suites/default/../../nodesets
+../../nodesets

data/spec/lib/simp/ci/files/no_gitlab_config_without_tests/spec/acceptance/suites/default/nodesets

@@ -1 +1 @@
-spec/lib/simp/ci/files/no_gitlab_config_without_tests/spec/acceptance/suites/default/../../nodesets
+../../nodesets

data/spec/lib/simp/ci/files/suite_skeleton_only/spec/acceptance/suites/default/nodesets

@@ -1 +1 @@
-spec/lib/simp/ci/files/suite_skeleton_only/spec/acceptance/suites/default/../../nodesets
+../../nodesets

data/spec/lib/simp/ci/files/valid_job_nodeset_dir_link/spec/acceptance/suites/default/nodesets

@@ -1 +1 @@
-spec/lib/simp/ci/files/valid_job_nodeset_dir_link/spec/acceptance/suites/default/../../nodesets
+../../nodesets

data/spec/lib/simp/componentinfo_spec.rb

@@ -7,14 +7,11 @@ describe Simp::ComponentInfo do
   }
 
   context 'with valid module input' do
-    it 'loads version and changelog info' do
-      component_dir = File.join(files_dir, 'module')
-      info = Simp::ComponentInfo.new(component_dir)
-      expect( info.component_dir ).to eq component_dir
-      expect( info.type ).to eq :module
-      expect( info.version ).to eq '3.8.0'
-      expect( info.release ).to be nil
-      expected_changelog = [
+    let(:component_dir){ File.join(files_dir, 'module') }
+    let(:info){ Simp::ComponentInfo.new(component_dir) }
+    let(:expected_release) { nil }
+    let(:expected_changelog) do
+      [
         {
           :date => 'Wed Nov 15 2017',
           :version => '3.8.0',
@@ -56,37 +53,28 @@ describe Simp::ComponentInfo do
           ]
         }
       ]
-      expect(info.changelog).to eq expected_changelog
     end
 
-    it 'loads version and latest changelog info' do
-      component_dir = File.join(files_dir, 'module')
-      info = Simp::ComponentInfo.new(component_dir, true)
-      expect( info.component_dir ).to eq component_dir
-      expect( info.type ).to eq :module
-      expect( info.version ).to eq '3.8.0'
-      expect( info.release ).to be nil
-      expected_changelog = [
-        {
-          :date => 'Wed Nov 15 2017',
-          :version => '3.8.0',
-          :release => '0',
-          :content => [
-            '* Wed Nov 15 2017 Mary Jones <mary.jones@simp.com> - 3.8.0-0',
-            '- Disable deprecation warnings by default'
-          ]
-        },
-        {
-          :date => 'Mon Nov 06 2017',
-          :version => '3.8.0',
-          :release => '0',
-          :content => [
-            '* Mon Nov 06 2017 Tom Smith <tom.smith@simp.com> - 3.8.0-0',
-            '- Fixes split failure when "findmnt" does not exist on Linux'
-          ]
-        }
-      ]
-      expect(info.changelog).to eq expected_changelog
+    shared_examples 'an instance with expected module data' do
+      it { expect( info.component_dir ).to eq component_dir }
+      it { expect( info.type ).to eq :module }
+      it { expect( info.version ).to eq '3.8.0' }
+      it { expect( info.release ).to eq expected_release }
+      it { expect(info.changelog).to eq expected_changelog }
+    end
+
+    it_behaves_like 'an instance with expected module data'
+
+    context 'with loads version and latest-version-only changelog info' do
+      let(:info){Simp::ComponentInfo.new(component_dir, true)}
+      let(:expected_changelog){ super()[0..1] }
+      it_behaves_like 'an instance with expected module data'
+    end
+
+    context 'with a module version containing a prerelease suffix (3.8.0-rc0)' do
+      let(:component_dir){ File.join(files_dir, 'module_with_prerelease_dash_in_version') }
+      let(:expected_release){ 'rc0' }
+      it_behaves_like 'an instance with expected module data'
     end
   end
 

data/spec/lib/simp/files/build/testpackage.spec

@@ -1 +1 @@
-spec/lib/simp/files/build/../testpackage.spec
+../testpackage.spec

data/spec/lib/simp/files/componentinfo_spec/module_with_prerelease_dash_in_version/CHANGELOG

@@ -0,0 +1,14 @@
+* Wed Nov 15 2017 Mary Jones <mary.jones@simp.com> - 3.8.0-0
+- Disable deprecation warnings by default
+
+* Mon Nov 06 2017 Tom Smith <tom.smith@simp.com> - 3.8.0-0
+- Fixes split failure when "findmnt" does not exist on Linux
+
+* Thu Oct 26 2017 Mary Jones <mary.jones@simp.com> - 3.7.0-0
+- Add Mod::Macaddress data type
+
+* Tue Sep 26 2017 Joe Brown <joe.brown@simp.com> - 3.6.0-0
+- Convert all 'sysctl' 'kernel.shm*' entries to Strings
+  - shmall and shmmax were causing Facter and newer versions of Puppet to crash
+  - See FACT-1732 for additional information
+- Add Puppet function `mod::assert_metadata_os()`

data/spec/lib/simp/files/componentinfo_spec/module_with_prerelease_dash_in_version/metadata.json

@@ -0,0 +1,44 @@
+{
+  "name": "simp-module",
+  "version": "3.8.0-rc0",
+  "author": "SIMP Team",
+  "summary": "A collection of common SIMP functions, facts, and types",
+  "license": "Apache-2.0",
+  "source": "https://github.com/simp/pupmod-simp-simplib",
+  "project_page": "https://github.com/simp/pupmod-simp-simplib",
+  "issues_url": "https://simp-project.atlassian.net",
+  "tags": [
+    "simp",
+    "functions",
+    "facts",
+    "types",
+    "alias",
+    "library"
+  ],
+  "dependencies": [
+
+  ],
+  "operatingsystem_support": [
+    {
+      "operatingsystem": "RedHat",
+      "operatingsystemrelease": [
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "CentOS",
+      "operatingsystemrelease": [
+        "6",
+        "7"
+      ]
+    }
+  ],
+  "requirements": [
+    {
+      "name": "puppet",
+      "version_requirement": ">= 4.7.0 < 6.0.0"
+    }
+  ],
+  "package_release_version": "0"
+}

data/spec/lib/simp/files/testpackage-rc0.spec

@@ -0,0 +1,32 @@
+Name:           testpackage
+Version:        1.0.0
+Release:        rc0
+Summary:        dummy test package
+BuildArch:      noarch
+
+License:        Apache-2.0
+URL:            http://foo.bar
+
+%description
+A dummy package used to test Simp::RPM methods
+
+%prep
+exit 0
+
+%build
+exit 0
+
+
+%install
+exit 0
+
+%clean
+exit 0
+
+%files
+%doc
+
+
+%changelog
+* Wed Jun 10 2015 nobody
+- some comment

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

@@ -16,7 +16,8 @@ describe 'Simp::Rake::Build::RpmDeps#get_version_requires' do
       "5.x"              => ['Requires: pupmod-foo-bar >= 5.0.0',
                              'Requires: pupmod-foo-bar < 6.0.0'],
       "6.4.x"            => ['Requires: pupmod-foo-bar >= 6.4.0',
-                             'Requires: pupmod-foo-bar < 7.0.0']
+                             'Requires: pupmod-foo-bar < 7.0.0'],
+      nil                => ['Requires: pupmod-foo-bar']
     }.each do |input, output|
       it do
         expect(Simp::Rake::Build::RpmDeps::get_version_requires(pkg, input)).to eq output
@@ -40,6 +41,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 +152,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

data/spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/acceptance/suites/default/nodesets

@@ -1 +1 @@
-spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/acceptance/suites/default/../../nodesets
+../../nodesets

data/spec/lib/simp/relchecks_compare_latest_tag_spec.rb

@@ -31,7 +31,7 @@ describe 'Simp::RelChecks.compare_latest_tag' do
       Simp::RelChecks.expects(:`).with('git fetch -t origin 2>/dev/null').returns("\n")
       Simp::RelChecks.expects(:`).with('git tag -l').returns("1.0.0\nv1.0.1\n1.1.0\n")
       Simp::RelChecks.expects(:`).with('git diff tags/1.1.0 --name-only').returns(
-        ".travis.yml\nRakefile\nGemfile.lock\nspec/some_spec.rb\ndoc/index.html\nrakelib/mytasks.rake\n")
+        ".travis.yml\nRakefile\nREFERENCE.md\nGemfile.lock\nspec/some_spec.rb\ndoc/index.html\nrakelib/mytasks.rake\n")
 
       msg = "  No new tag required: No significant files have changed since '1.1.0' tag\n"
       expect{ Simp::RelChecks.compare_latest_tag(component_dir) }.

data/spec/lib/simp/rpm_spec.rb

@@ -20,6 +20,9 @@ describe Simp::RPM do
     @d_rpm_file    = File.join( dir, 'testpackage-1-0.el7.noarch.rpm' )
     @d_rpm_obj     = Simp::RPM.new( @d_rpm_file )
 
+    @rc0_spec_file = File.join( dir, 'testpackage-rc0.spec' )
+    @rc0_spec_obj  = Simp::RPM.new( @rc0_spec_file )
+
 #FIXME
 #    @signed_rpm_file = File.join( dir, 'testpackage-1-0.noarch.rpm' )
 #    @signed_rpm_obj  = Simp::RPM.new( @signed_rpm_file )
@@ -85,6 +88,7 @@ describe Simp::RPM do
         expect( @m_spec_obj.version ).to eq '1'
         expect( @m_spec_obj.version('testpackage') ).to eq '1'
         expect( @m_spec_obj.version('testpackage-doc') ).to eq '1.0.1'
+        expect( @rc0_spec_obj.version ).to eq '1.0.0'
       end
 
       it 'fails when invalid package specified' do
@@ -103,6 +107,7 @@ describe Simp::RPM do
         expect( @m_spec_obj.release ).to eq '0'
         expect( @m_spec_obj.release('testpackage') ).to eq '0'
         expect( @m_spec_obj.release('testpackage-doc') ).to eq '2'
+        expect( @rc0_spec_obj.release ).to eq 'rc0'
       end
 
       it 'fails when invalid package specified' do

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.4
 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-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simp-beaker-helpers
@@ -534,6 +534,8 @@ files:
 - spec/lib/simp/files/componentinfo_spec/module_with_invalid_weekday_entry/metadata.json
 - spec/lib/simp/files/componentinfo_spec/module_with_malformed_metadata/CHANGELOG
 - spec/lib/simp/files/componentinfo_spec/module_with_malformed_metadata/metadata.json
+- spec/lib/simp/files/componentinfo_spec/module_with_prerelease_dash_in_version/CHANGELOG
+- spec/lib/simp/files/componentinfo_spec/module_with_prerelease_dash_in_version/metadata.json
 - spec/lib/simp/files/componentinfo_spec/module_with_version_misordered_entries/CHANGELOG
 - spec/lib/simp/files/componentinfo_spec/module_with_version_misordered_entries/metadata.json
 - spec/lib/simp/files/componentinfo_spec/module_without_changelog/metadata.json
@@ -568,6 +570,7 @@ files:
 - spec/lib/simp/files/testpackage-1-0.noarch.rpm
 - spec/lib/simp/files/testpackage-dist.spec
 - spec/lib/simp/files/testpackage-multi.spec
+- spec/lib/simp/files/testpackage-rc0.spec
 - spec/lib/simp/files/testpackage.spec
 - spec/lib/simp/local_gpg_signing_key_spec.rb.beaker-only
 - spec/lib/simp/packer/iso_vars_json_spec.rb
@@ -647,8 +650,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: SIMP rake helpers