simp-rake-helpers 5.4.1 → 5.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 939e5af4addd43fd7426e30482fa751d4998d8f537d63174dcb9a8ab5130b6a0
-  data.tar.gz: c923022ca6e164757b00a8d87a02648277fbe4c50c912520f09211420d35ccad
+SHA1:
+  metadata.gz: 2c6ce6418a9a5502135d802a6a96f42ee4b3660f
+  data.tar.gz: 2b18c76399ef02e72ca986723cb24f41d2b69267
 SHA512:
-  metadata.gz: 36fa3a75405f59e9ea37e133ab6bdc4810d68382d51332a6495e8155dba3f3aedb2109fb1431e5bab78656fd28d9cca10e079ba3f66e15f685702e594ca19ff3
-  data.tar.gz: 1f3db5d207c48657ba5dc46a17d8a4b1225d671df47c8ba9e2d426cfd192bb2537fc52914c31ae2f2168247bd4852c3e2e25bc4f35125b9368812918ffb6149b
+  metadata.gz: a66462436bec15a83457fa138effaa890773b7b8a681c1bee75d7c2901bc0426e1d0b37e64d417807072a62572d59de7450a82a51c69ca57b620315eac95d6a6
+  data.tar.gz: d45a422e9781164aa8df97f6542ff404a1d85284abecc1feff1c1d8f650d18bad155ba9289d8fc0b36ae6ab397c01847e30c6fa35c9feb3c00cbdf9141a97f19

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+### 5.4.3 / 2018-03-29
+* Fix RPM release processing when generating 'Obsoletes' metadata
+
+### 5.4.2 / 2018-03-06
+* Document requirement for double-digit day in CHANGELOG date.
+* Add optional spec test for CHANGELOG file at `$SIMP_SPEC_changelog`
+* Fix invalid `module_without_changelog` spec test for `Simp::RelChecks`
+* `load_and_validate_changelog` now passes on `verbose` to `Simp::ComponentInfo`
+
 ### 5.4.1 / 2018-03-04
 * Fix Travis CI deployment script
 

data/README.md

@@ -154,8 +154,18 @@ level of the project, if it exists.
 
   * The file is expected to conform to the [RPM Changelog][RPM CHANGELOG]
     format described in the Fedora packaging guidelines
+
   * The file MUST start with a well-formatted RPM changelog string, or it will
     be ignored.
+
+    Example:
+
+        * Mon Nov 06 2017 Tom Smith <tom.smith@simp.com> - 3.8.0-0
+        - Add feature x
+
+    **Important:** Note the leading zero in "`Nov 05`".  It is a convention
+
+    that is **required** by our CHANGELOG validation tasks.
   * The format is *not* fully checked before attempting to build the RPM―the
     RPM build will fail if the Changelog entries are not valid.
 

data/lib/simp/componentinfo.rb

@@ -149,7 +149,7 @@ class Simp::ComponentInfo
   #
   def parse_changelog(changelog, latest_version_only, verbose)
     # split on the entry-separating lines
-    changelog_entries = changelog.split(/^\s*$/)
+    changelog_entries = changelog.split(/\n\n+/)
     latest_version = nil # 1st version found is latest version
     prev_entry_date = nil
     changelogs = []
@@ -170,7 +170,6 @@ class Simp::ComponentInfo
         full_version += "-#{match[4]}" unless match[4].nil?
         current_version = Gem::Version.new(full_version)
         latest_version = current_version if latest_version.nil?
-
         if current_version > latest_version
           fail("ERROR:  Changelog entries are not properly version ordered")
         end

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

@@ -59,7 +59,6 @@ module Simp::Rake::Build::RpmDeps
       # version or the RPM will be malformed
       main_version, release = version.split('-')
       release = '0' unless release
-      release = release.to_i
 
       if Gem::Version.new(module_version) > Gem::Version.new(main_version)
         rpm_metadata_content << "Obsoletes: #{pkg} < #{main_version}-#{release}.obsolete"

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

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

data/lib/simp/relchecks.rb

@@ -31,7 +31,7 @@ class Simp::RelChecks
   #                   can be fetched.
   # +verbose+::       Set to 'true' if you want to see detailed messages
   def self.compare_latest_tag(component_dir, tags_source = 'origin', verbose = false)
-    info, changelogs = load_and_validate_changelog(component_dir, verbose)
+    info, _ = load_and_validate_changelog(component_dir, verbose)
     Dir.chdir(component_dir) do
       # determine last tag
       `git fetch -t #{tags_source} 2>/dev/null`
@@ -133,7 +133,6 @@ class Simp::RelChecks
   def self.extract_version_changelog(changelog_entries, version,
       release=nil, verbose=false)
 
-    version_entry_found = false
     changelogs = []
     changelog_entries.each do |entry|
       if entry[:version] > version
@@ -162,7 +161,7 @@ class Simp::RelChecks
   def self.load_and_validate_changelog(component_dir, verbose)
     # only get valid changelog entries for the latest version
     # (up to the first malformed entry)
-    info = Simp::ComponentInfo.new(component_dir, true)
+    info = Simp::ComponentInfo.new(component_dir, true, verbose)
 
     changelogs = extract_version_changelog(info.changelog, info.version,
         info.release, verbose)

data/spec/lib/simp/componentinfo_spec.rb

@@ -225,7 +225,7 @@ describe Simp::ComponentInfo do
       expect( info.component_dir ).to eq component_dir
       expect( info.type ).to eq :asset
       expect( info.version ).to eq '1.0.0'
-      expect( info.release ).to match /0/
+      expect( info.release ).to match(/0/)
       expected_changelog = [
         {
           :date => 'Wed Oct 18 2017',

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

@@ -63,8 +63,8 @@ describe 'Simp::Rake::Build::RpmDeps#generate_rpm_meta_files' do
       requires_file = File.join(mod_dir, 'build', 'rpm_metadata', 'requires')
       expect(File.exist?(requires_file)).to be true
       expected = <<EOM
-Obsoletes: pupmod-oldowner-changed_name_mod < 2.5.0-2016.obsolete
-Provides: pupmod-oldowner-changed_name_mod = 2.5.0-2016.obsolete
+Obsoletes: pupmod-oldowner-changed_name_mod < 2.5.0-2016.1.obsolete
+Provides: pupmod-oldowner-changed_name_mod = 2.5.0-2016.1.obsolete
 Requires: pupmod-foo1-bar1 = 1.0.0
 Requires: pupmod-foo2-bar2 > 2.0.0
 Requires: pupmod-foo3-bar3 < 3.0.0

data/spec/lib/simp/relchecks_compare_latest_tag_spec.rb

@@ -78,12 +78,26 @@ NOTICE: New tag of version '1.1.0' is required for 3 changed files:
     end
 
     # spot check just one of many failures handled by
-    # Simp::RelCheck.load_and_validate_changelog, as that method is 
+    # Simp::RelCheck.load_and_validate_changelog, as that method is
     # extensively tested elsewhere.
     it 'fails when module info cannot be loaded' do
-      comp_dir = File.join(files_dir, 'module_without_changelo')
+      comp_dir = File.join(files_dir, 'module_without_changelog')
       expect{ Simp::RelChecks.compare_latest_tag(comp_dir) }.
-        to raise_error(/No RPM spec file found in/ )
+        to raise_error(/No CHANGELOG file found in/ )
+    end
+  end
+
+  # If the environment variable `SIMP_SPEC_changelog` is the path to a file,
+  # test to see if will be considered a valid CHANGELOG (useful for debugging)
+  context 'with custom CHANGELOG at $SIMP_SPEC_changelog' do
+    _changelog_file = ENV['SIMP_SPEC_changelog'].to_s
+    if File.file?( _changelog_file )
+      it "validates the CHANGELOG file at '#{_changelog_file}'" do
+        comp_dir = File.dirname( _changelog_file )
+        expect{ Simp::RelChecks.load_and_validate_changelog(comp_dir, true) }.not_to raise_error
+      end
+    else
+        skip 'This test is disabled by default.'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 5.4.1
+  version: 5.4.3
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-04 00:00:00.000000000 Z
+date: 2018-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -371,8 +371,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-description: |2
-      "simp-rake-helpers provides common methods for SIMP Rake Tasks"
+description: '    "simp-rake-helpers provides common methods for SIMP Rake Tasks"
+
+'
 email: simp@simp-project.org
 executables: []
 extensions: []
@@ -635,7 +636,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: SIMP rake helpers