simp-rake-helpers 5.11.1 → 5.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 842c7c807e886d28ecc77134d1737609a2bdf1086684437a7f9963ec925cc39c
-  data.tar.gz: feeb1ee8af97de4ad45ed94d845d6767f91a905b98c5f3923528196a4c966d18
+  metadata.gz: 120ba7852eb7531d190da1c922c9eccd42bd98ff9f3506ed9d6f0bdb2cd36e96
+  data.tar.gz: 310f8cc891fe4bc07a35699b3d7e735d2222888fd96964b1fed7143e70be35b6
 SHA512:
-  metadata.gz: 2ab96c058e9375634c96e5ef949f30880657397efc9b5ed5a49acbd6e575452d568468aa8a6410597a495a2c31a8fc692c3ba049aec11099c398875f184e5399
-  data.tar.gz: 82f08cfae6782f618c682f24c1bc699ea28300d34620d7cce68ab017e795399f577d5d46984098a9553e972f620fab8b60a1027b06ac3e0a95ba0a6c1708daf1
+  metadata.gz: c55a930c618700c3daa341ba4d32fd815ce28c11582cb033be23f313248394de762915d8c9eb4e320c0758f8d25eef200cf00eebbc222755f46ba048d804df8f
+  data.tar.gz: 01bb7784afab0d0074c0ec46bb0ea68b56c62f28310e6e0b504fb6e2b614707a84ffb6fe084e48384ac639a4cdefa12e462dbd4a3fd0ae65c3eb8d3277745be2

data/CHANGELOG.md

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

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
 

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.1'
+  VERSION = '5.11.2'
 end

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 5.11.1
+  version: 5.11.2
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-08 00:00:00.000000000 Z
+date: 2020-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simp-beaker-helpers