simp-rake-helpers 5.1.2 → 5.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d260fd31b63df8bf7e860e9f841a441c88c11b5a
-  data.tar.gz: c0ad88da3bfb756e50ee0bd9b53e9ec82d99fae6
+SHA256:
+  metadata.gz: 3172c665fe5f42370b01ef6a03b7530da556471e89a7b55a90e23b8cc5c899e5
+  data.tar.gz: 377fad7a7d2acccd401c1cf17e52548144a27bbcd220618e0caca66e7e3cadea
 SHA512:
-  metadata.gz: 778fee0c5eb4827b7e5f7351033101e59d83995bdd4d2356f9aab642f9b4a31f953f77e4d97d7703bd4c4329129de9360f08da722710fbb2ec3f1ec4ce8ab2ec
-  data.tar.gz: f62ca1fa679d08c7facb89023fbae5eec50e711621a001710dd09bc669a472109676ef74ce691382edfbc24c09e6b346ac644106bc1d9aec0dd5ad2916c29d76
+  metadata.gz: fa1a4fc7b92292ceb0908368d43768ca70ec77ff31efd8e9d5c4def2dec3b90c213066f9843eaf258b070e4cfe53aeae8f0066cad24a062b41992e3da005f3f2
+  data.tar.gz: 3dd45d6438797ba3a8173ee33b511f90319725b5602930f3e75068bdc4002d485e58b4a58dbcdc684dc46f7c6af1dcd53766c39f44aae95b9c036a8cee976d74

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 5.1.4 / 2017-11-27
+* Switch back to using Gem::Version.new instead of Puppet's vercmp since
+  Gem::Version matches the standard RPM version semantics and Puppet does not.
+
+### 5.1.3 / 2017-10-16
+* Ensure that the first package run uses the existing Bundle environment and
+  falls back to a clean Bundle environment on failure.
+
 ### 5.1.2 / 2017-10-06
 * Fixed 'Obsoletes' in the RPM spec files
 

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

@@ -924,10 +924,8 @@ protect=1
 
                   build_success = true
                   begin
-                    ::Bundler.with_clean_env do
-                      %x{#{cmd}}
-                      build_success = $?.success?
-                    end
+                    %x{#{cmd}}
+                    build_success = $?.success?
 
                     built_rpm = true
                   rescue

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

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

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

@@ -201,7 +201,6 @@ class Simp::Rake::Pupmod::Helpers < ::Rake::TaskLib
     EOM
     task :compare_latest_tag, [:tags_source, :ignore_owner, :verbose] do |t,args|
       require 'json'
-      require 'puppet/util/package'
 
       tags_source = args[:tags_source].nil? ? 'origin' : args[:tags_source]
       ignore_owner = true if args[:ignore_owner].to_s == 'true'
@@ -220,7 +219,7 @@ class Simp::Rake::Pupmod::Helpers < ::Rake::TaskLib
         if tags.empty?
           puts "No tags exist from #{tags_source}"
         else
-          last_tag = (tags.sort { |a,b| Puppet::Util::Package::versioncmp(a,b) })[-1]
+          last_tag = (tags.sort { |a,b| Gem::Version.new(a) <=> Gem::Version.new(b) })[-1]
 
           # determine mission-impacting files that have changed
           files_changed = `git diff tags/#{last_tag} --name-only`.strip.split("\n")
@@ -246,10 +245,12 @@ class Simp::Rake::Pupmod::Helpers < ::Rake::TaskLib
               end
             end
 
-            cmp_result = Puppet::Util::Package::versioncmp(module_version, last_tag)
-            if cmp_result < 0
+            curr_module_version = Gem::Version.new(module_version)
+            last_tag_version = Gem::Version.new(last_tag)
+
+            if curr_module_version < last_tag_version
               fail("ERROR: Version regression. '#{module_version}' < last tag '#{last_tag}'")
-            elsif cmp_result == 0
+            elsif curr_module_version == last_tag_version
               fail("ERROR: Version update beyond last tag '#{last_tag}' is required for changes to #{files_changed}")
             else
               puts "  New tag of version '#{module_version}' is required for changes to #{files_changed}"

data/lib/simp/rpm.rb

@@ -1,5 +1,4 @@
 require 'securerandom'
-require 'puppet/util'
 
 module Simp
   # An Simp::RPM instance represents RPM metadata extracted from an
@@ -226,9 +225,8 @@ module Simp
       end
 
       begin
-        # Puppet::Util::Package::versioncmp can handle simp-doc-UNKNOWN-0.el7, whereas
-        # Gem::Version can't
-        return Puppet::Util::Package::versioncmp(full_version(package), other_full_version) > 0
+
+        return Gem::Version.new(full_version(package)) > Gem::Version.new(other_full_version)
 
       rescue ArgumentError, NoMethodError
         fail("Could not compare RPMs '#{rpm_name(package)}' and '#{other_rpm}'")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 5.1.2
+  version: 5.1.4
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-06 00:00:00.000000000 Z
+date: 2017-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -559,7 +559,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: SIMP rake helpers