simp-rake-helpers 5.11.0 → 5.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8df4b35e000bb36b26db550e81337f96b2fa1dfa99646dc4d7fcbfe76e2ecdf
-  data.tar.gz: d3f6ea0a5ef4d1ac277b6447615305a118184c0e59f79d860ae9acc34439bf70
+  metadata.gz: 842c7c807e886d28ecc77134d1737609a2bdf1086684437a7f9963ec925cc39c
+  data.tar.gz: feeb1ee8af97de4ad45ed94d845d6767f91a905b98c5f3923528196a4c966d18
 SHA512:
-  metadata.gz: db7c733f928206a27e60a984b5b1b9bcb4fae865adbb57818803ff9f9738eefe976372ce5a14fab45be2cb836906798e33074068f4654b71b6733b2b85714fb8
-  data.tar.gz: 90408311e53eefc6b4d9714e63c39c325b66c7a5c1dd720b540014d59d00c067413a16f1940359d769feaa37d22705a13c06ab2540b7780b092f9142279b9d83
+  metadata.gz: 2ab96c058e9375634c96e5ef949f30880657397efc9b5ed5a49acbd6e575452d568468aa8a6410597a495a2c31a8fc692c3ba049aec11099c398875f184e5399
+  data.tar.gz: 82f08cfae6782f618c682f24c1bc699ea28300d34620d7cce68ab017e795399f577d5d46984098a9553e972f620fab8b60a1027b06ac3e0a95ba0a6c1708daf1

data/CHANGELOG.md

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

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/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.11.0'
+  VERSION = '5.11.1'
 end

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/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/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.11.0
+  version: 5.11.1
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-25 00:00:00.000000000 Z
+date: 2020-04-08 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