simp-rake-helpers 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6113186e329690af05d0b8ab80c1f9bcd49dce2d
-  data.tar.gz: 5058893b87cabbc46c2644d82a70d1f2f1aecd8c
+  metadata.gz: f75d80c343427ef7c599ede4745e3130fbbb139a
+  data.tar.gz: 1b26121177b51da14a44b84eebf86bad97996160
 SHA512:
-  metadata.gz: ef33179fc629100aab0347fba56ade32c1546c9b5b259daaaf726cd061b8fd9fab14dfc06f7584c7a4f1d5e53359a6ba1873805b5829040d0ee8c6d4701ea978
-  data.tar.gz: a697cc85f44d2150ec67e47b13971cd2d06440c9e3a1b911446f9077a3b8707f66ec5989cf4448aa1910ac2712b2f06bfeceefc2f104f8dfca005870de394ae2
+  metadata.gz: 07f0e3a239091d9293de3d3fb882e42b0edd0f31348366298abad181905fb649e8b11cae4ac34fd81444edd557b71284e096fa1a5675b6fba68b66f12d872dba
+  data.tar.gz: 3b9d4028fd866e73073f0d8b90460a7f25a4c57a1312b014abc678064ac7401b0f83d8863cd35a9ccbf61386b8248077db46c7b03e3e97b65c647f9f21a9e92b

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 4.1.1 / 2017-08-31
+* Added the ability to read RPM release qualifier for checked out
+  module from `simp-core/build/rpm/dependencies.yaml`
+
 ### 4.1.0 / 2017-08-02
 * Added the ability to read from `simp-core/build/rpm/dependencies.yaml` in a
   checked out repo to add the necessary Obsoletes and Requires statements for

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

@@ -745,7 +745,7 @@ protect=1
             'dependencies.yaml')
 
           if File.exist?(rpm_dependency_file)
-            rpm_dependency_metadata = YAML.load(File.read(rpm_dependency_file))
+            rpm_metadata = YAML.load(File.read(rpm_dependency_file))
           end
 
           metadata = Parallel.map(
@@ -769,10 +769,16 @@ protect=1
               # We're building a module, override anything down there
               if File.exist?('metadata.json')
 
-                # Generate RPM dependency/obsoletes information from the
-                # dependencies.yaml and the module's metadata.json
-                Simp::Rake::Build::RpmDeps::generate_rpm_requires_file(dir,
-                  rpm_dependency_metadata)
+                # Generate RPM metadata files
+                # - 'build/rpm_metadata/requires' file containing RPM
+                #   dependency/obsoletes information from the
+                #   'dependencies.yaml' and the module's
+                #   'metadata.json'; always created
+                # - 'build/rpm_metadata/release' file containing RPM
+                #   release qualifier from the 'dependencies.yaml';
+                #   only created if release qualifier if specified in
+                #   the 'dependencies.yaml'
+                Simp::Rake::Build::RpmDeps::generate_rpm_meta_files(dir, rpm_metadata)
 
                 unique_namespace = (0...24).map{ (65 + rand(26)).chr }.join.downcase
 

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

@@ -7,7 +7,13 @@ module Simp::Rake::Build; end
 module Simp::Rake::Build::RpmDeps
 
   # returns array of RPM spec file 'Requires' lines derived
-  # from a metadata.json dependency version specification.
+  # from a 'metadata.json' dependency version specification.
+  #
+  # +pkg+:: dependency package name
+  # +dep_version+:: dependency version string from a 'metadata.json'
+  #
+  # raises SIMPRpmDepVersionException if the dependency version
+  #   string cannot be parsed
   def self.get_version_requires(pkg, dep_version)
     requires = []
     if dep_version =~ /^\s*(\d+\.\d+\.\d+)\s*$/
@@ -34,36 +40,58 @@ module Simp::Rake::Build::RpmDeps
     requires
   end
 
-  # Generate 'Obsoletes' and 'Requires' lines, from a combination of
-  # the module_dep_info and module_metadata.  Only dependencies listed
-  # in the module_dep_info hash will be included in the output. The
-  # version requirements for each dependency will be pulled from
-  # module_metadata.
+  # Generate 'Obsoletes' lines from obsoletes_hash.
   #
-  # returns array of strings, each of which is an 'Obsoletes' or
-  # 'Requires' line for use in an RPM spec file
-  def self.generate_custom_rpm_requires(module_dep_info, module_metadata)
+  # returns array of strings, each of which is an 'Obsoletes' line for
+  # use in an RPM spec file
+  #
+  # +obsoletes_hash+:: Hash containing package names and their versions
+  #   this module obsoletes from the `dependencies.yaml` file
+  # +module_metadata+:: Hash containing the contents of the module's
+  #   'metadata.json' file
+  def self.generate_custom_rpm_obsoletes(obsoletes_hash, module_metadata)
     rpm_metadata_content = []
 
-    if module_dep_info[:obsoletes]
-      module_dep_info[:obsoletes].each_pair do |pkg, version|
-        module_version = module_metadata['version']
+    obsoletes_hash.each_pair do |pkg, version|
+      module_version = module_metadata['version']
 
-        # We don't want to add this if we're building an older
-        # version or the RPM will be malformed
-        if Gem::Version.new(module_version) >
-          Gem::Version.new(version.split('-').first)
+      # We don't want to add this if we're building an older
+      # version or the RPM will be malformed
+      if Gem::Version.new(module_version) >
+        Gem::Version.new(version.split('-').first)
 
-          rpm_metadata_content << "Obsoletes: #{pkg} > #{version}"
-        else
-          puts "Ignoring 'obsoletes' for #{pkg}: module version" +
-           " #{module_version} from metadata.json is not >" +
-           " obsolete version #{version}"
-        end
+        rpm_metadata_content << "Obsoletes: #{pkg} > #{version}"
+      else
+        puts "Ignoring 'obsoletes' for #{pkg}: module version" +
+         " #{module_version} from metadata.json is not >" +
+         " obsolete version #{version}"
       end
     end
+    rpm_metadata_content
+  end
+
+  # Generate 'Requires' lines, from a combination of the
+  # module_rpm_meta and module_metadata.  Only dependencies listed
+  # in the module_rpm_meta hash will be included in the output. The
+  # version requirements for each dependency will be pulled from
+  # module_metadata.
+  #
+  # returns array of strings, each of which is a 'Requires' line
+  # for use in an RPM spec file
+  #
+  # raises SIMPRpmDepException if any 'metadata.json' dependency
+  #   version string from module_metadata cannot be parsed or a
+  #   dependency specified in module_rpm_meta is not found in
+  #   module_metadata
+  #
+  # +requires_list+:: list of package this module should require
+  #   from the 'dependencies.yaml'
+  # +module_metadata+:: Hash containing the contents of the
+  #   module's 'metadata.json' file
+  def self.generate_custom_rpm_requires(requires_list, module_metadata)
+    rpm_metadata_content = []
 
-    module_dep_info[:requires].each do |pkg|
+    requires_list.each do |pkg|
       pkg_parts = pkg.split(%r(-|/))[-2..-1]
 
       # Need to cover all base cases
@@ -96,67 +124,153 @@ module Simp::Rake::Build::RpmDeps
   #
   # returns array of strings, each of which is a 'Requires' line for
   # use in an RPM spec file
+  #
+  # raises SIMPRpmDepException if any 'metadata.json' dependency
+  #   version string from module_metadata cannot be parsed
+  #
+  # +module_metadata+:: Hash containing the contents of the
+  #   module's 'metadata.json' file
   def self.generate_module_rpm_requires(module_metadata)
     rpm_metadata_content = []
-    module_metadata['dependencies'].each do |dep|
-      pkg = "pupmod-#{dep['name'].gsub('/', '-')}"
-      dep_version = dep['version_requirement']
+    # metadata.json should always contain dependencies list, even
+    # if it is empty, but we'll safely handle that error case here
+    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 => e
-        err_msg = "Unable to parse #{dep['name']} dependency" +
-          " version '#{dep_version}'"
-        raise SIMPRpmDepException.new(err_msg)
+        begin
+          rpm_metadata_content << get_version_requires(pkg, dep_version)
+        rescue SIMPRpmDepVersionException => e
+          err_msg = "Unable to parse #{dep['name']} dependency" +
+            " version '#{dep_version}'"
+          raise SIMPRpmDepException.new(err_msg)
+        end
       end
     end
 
     rpm_metadata_content.flatten
   end
 
+  # Check to see if the contents of the requires file match the new requires info
+  #
+  # +new_requires_info+:: The new requires metadata Array
+  # +rpm_requires_file+:: The path to the module requires file
+  def self.rpm_requires_up_to_date?(new_requires, rpm_requires_file)
+    return false unless File.exist?(rpm_requires_file)
+
+    rpm_requires_content = File.read(rpm_requires_file).lines.map(&:strip) - ['']
+
+    return (new_requires.flatten - rpm_requires_content).empty?
+  end
+
   # Generate 'build/rpm_metadata/requires' file containing
-  # 'Obsoletes' and/or 'Requires' lines for use in an RPM spec file
-  # from a combination of the 'metadata.json' file in dir and
-  # the rpm_dependency_metadata
-  # hash.
-  #
-  # If the rpm_dependency_metadata hash as an entry for the
-  # module named in the 'metadata.json' file, the generated
-  # 'requires' file will contain
+  # 'Obsoletes' and/or 'Requires' lines for use in an RPM spec file.
+  #
+  # If the module_rpm_meta is not nil, the generated 'requires'
+  # file will contain
   # * 'Obsoletes' lines for any obsoletes specified in the
-  #   rpm_dependency_metadata hash
+  #   module_rpm_meta hash
   # * 'Requires' lines for any requires specified in the
-  #   rpm_dependency_metadata hash, where the versions for those
-  #   dependencies are pulled from the 'metadata.json' file.
+  #   module_rpm_meta hash, where the versions for those
+  #   dependencies are pulled from module_metadata.
   #
   # Otherwise, the generated 'requires' file will contain
-  # "Requires" lines for each dependency specified in the
-  # 'metadata.json' file.
-  def self.generate_rpm_requires_file(dir, rpm_dependency_metadata)
+  # "Requires" lines for each dependency specified module_metadata.
+  #
+  # raises SIMPRpmDepException if any 'metadata.json' dependency
+  #   version string from module_metadata cannot be parsed or a
+  #   dependency specified in module_rpm_meta is not found in
+  #   module_metadata
+  #
+  # +dir+:: module root directory
+  # +module_metadata+:: Hash containing the contents of the
+  #   module's 'metadata.json' file
+  # +module_rpm_meta+:: module entry from the top-level
+  #   'dependencies.yaml' file or nil, if no entry exists
+  def self.generate_rpm_requires_file(dir, module_metadata, module_rpm_meta)
+    rpm_metadata_content = []
+    if module_rpm_meta and module_rpm_meta[:obsoletes]
+      rpm_metadata_content = generate_custom_rpm_obsoletes(module_rpm_meta[:obsoletes], module_metadata)
+    end
+
+    if module_rpm_meta and module_rpm_meta[:requires]
+      rpm_metadata_content += generate_custom_rpm_requires(module_rpm_meta[:requires], module_metadata)
+    else
+      rpm_metadata_content += generate_module_rpm_requires(module_metadata)
+    end
+
+    rpm_metadata_file = File.join(dir, 'build', 'rpm_metadata', 'requires')
+
+    unless rpm_requires_up_to_date?(rpm_metadata_content, rpm_metadata_file)
+      FileUtils.mkdir_p(File.dirname(rpm_metadata_file))
+      File.open(rpm_metadata_file, 'w') do |fh|
+        fh.puts(rpm_metadata_content.flatten.join("\n"))
+        fh.flush
+      end
+    end
+  end
+
+  # Check to see if the contents of the release file match the new release info
+  #
+  # +new_release_info+:: The new release metadata string
+  # +rpm_release_file+:: The path to the module release file
+  def self.release_file_up_to_date?(new_release_info, rpm_release_file)
+    return false unless File.exist?(rpm_release_file)
+
+    return File.read(rpm_release_file).strip == new_release_info.strip
+  end
+
+  # Generate 'build/rpm_metadata/release' file containing release qualifier
+  # specified in the module_rpm_meta
+  #
+  # +dir+:: module root directory
+  # +module_rpm_meta+:: module entry from the top-level
+  #   'dependencies.yaml' file or nil, if no entry exists
+  def self.generate_rpm_release_file(dir, module_rpm_meta)
+   return unless (module_rpm_meta and module_rpm_meta[:release])
+
+    rpm_release_file = File.join(dir, 'build', 'rpm_metadata', 'release')
+
+    unless release_file_up_to_date?(module_rpm_meta[:release], rpm_release_file)
+      FileUtils.mkdir_p(File.dirname(rpm_release_file))
+      File.open(rpm_release_file, 'w') do |fh|
+        fh.puts('# release set by simp-core dependencies.yaml')
+        fh.puts(module_rpm_meta[:release])
+        fh.flush
+      end
+    end
+  end
+
+  # Generate RPM metadata files
+  # * 'build/rpm_metadata/requires' file containing RPM
+  #   dependency/obsoletes information from the 'dependencies.yaml'
+  #   and the module's 'metadata.json'; always created
+  # * 'build/rpm_metadata/release' file containing RPM release
+  #   qualifier from the 'dependencies.yaml'; only created if release
+  #   qualifier if specified in the 'dependencies.yaml'
+  #
+  # raises SIMPRpmDepException if any 'metadata.json' dependency
+  #   version string from module_metadata cannot be parsed or a
+  #   dependency specified in module_rpm_meta is not found in
+  #   module_metadata
+  #
+  # +dir+:: module root directory
+  # +rpm_metadata+:: contents of top-level 'dependencies.yaml' file
+  def self.generate_rpm_meta_files(dir, rpm_metadata)
     require 'json'
 
     metadata_json_file = File.join(dir, 'metadata.json')
     module_metadata = JSON.parse(File.read(metadata_json_file))
     module_name = module_metadata['name'].split(%r(-|/)).last
+    module_rpm_meta = rpm_metadata[module_name]
 
-    module_dep_info = rpm_dependency_metadata[module_name]
-    rpm_metadata_content = []
     begin
-      if module_dep_info
-        rpm_metadata_content = generate_custom_rpm_requires(module_dep_info, module_metadata)
-      else
-        rpm_metadata_content = generate_module_rpm_requires(module_metadata)
-      end
+      generate_rpm_requires_file(dir, module_metadata, module_rpm_meta)
     rescue SIMPRpmDepException => e
       fail "#{e.message} in #{metadata_json_file}"
     end
 
-    rpm_metadata_file = File.join(dir, 'build', 'rpm_metadata', 'requires')
-
-    FileUtils.mkdir_p(File.dirname(rpm_metadata_file))
-    File.open(rpm_metadata_file, 'w') do |fh|
-      fh.puts(rpm_metadata_content.flatten.join("\n"))
-      fh.flush
-    end
+    generate_rpm_release_file(dir, module_rpm_meta)
   end
 end

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

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

data/lib/simp/rake/pkg.rb

@@ -48,9 +48,7 @@ module Simp::Rake
       @clean_list          = []
       @ignore_changes_list = [
         'Gemfile.lock',
-        'spec/fixtures/modules',
-        'build/rpm_metadata',          # this is generated
-        'build/rpm_metadata/requires'  # this is generated
+        'spec/fixtures/modules'
       ]
       @chroot_name         = unique_name
 

data/spec/lib/simp/rake/build/files/dependencies.yaml

@@ -21,6 +21,9 @@
     - 'pupmod-puppetlabs-stdlib'
     - 'pupmod-ceritsc-yum'
     - 'pupmod-richardc-datacat'
+  :release: '2017.0'
+'release_only_mod':
+  :release: '2017.2'
 'obsoletes_too_new_mod':
   :obsoletes:
     'pupmod-oldowner-obsoletes_too_new_mod': '2.5.0-2016.1'

data/spec/lib/simp/rake/build/files/release_only_mod/metadata.json

@@ -0,0 +1,45 @@
+{
+  "name": "owner-release_only_mod",
+  "version": "0.11.0",
+  "source": "https://github.com/owner/puppet-release_only_mod",
+  "author": "owner",
+  "license": "Apache-2.0",
+  "summary": "Module for release_only_mod",
+  "description": "Module for release_only_mod",
+  "project_page": "https://github.com/owner/puppet-release_only_mod",
+  "issues_url": "https://github.com/owner/puppet-release_only_mod/issues",
+  "dependencies": [
+    {
+      "name": "puppetlabs/stdlib",
+      "version_requirement": ">= 3.2.0 < 5.0.0"
+    }
+  ],
+  "operatingsystem_support": [
+    {
+      "operatingsystem": "RedHat",
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "CentOS",
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7"
+      ]
+    }
+  ],
+  "requirements": [
+    {
+      "name": "pe",
+      "version_requirement": ">= 3.3.2"
+    },
+    {
+      "name": "puppet",
+      "version_requirement": ">=3.2.0 <4.3.0"
+    }
+  ]
+}

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

@@ -6,7 +6,7 @@ describe 'Simp::Rake::Build::RpmDeps#get_version_requires' do
   let(:pkg) { 'pupmod-foo-bar' }
 
   context 'with valid version specifications' do
-    { 
+    {
       "1.0.0"            => ['Requires: pupmod-foo-bar = 1.0.0'],
       "> 2.0.0"          => ['Requires: pupmod-foo-bar > 2.0.0'],
       "< 3.0.0"          => ['Requires: pupmod-foo-bar < 3.0.0'],
@@ -25,24 +25,26 @@ describe 'Simp::Rake::Build::RpmDeps#get_version_requires' do
 
   context 'with invalid version specifications' do
     it do
-      expect{ Simp::Rake::Build::RpmDeps::get_version_requires(pkg,
-        '1.0.0.1') }.to raise_error(SIMPRpmDepVersionException)
+      expect{
+        Simp::Rake::Build::RpmDeps::get_version_requires(pkg, '1.0.0.1')
+      }.to raise_error(SIMPRpmDepVersionException)
     end
 
     # FIXME regex doesn't catch this
     pending do
-      expect{ Simp::Rake::Build::RpmDeps::get_version_requires(pkg,
-        '<= 3.0.0') }.to raise_error(SIMPRpmDepVersionException)
+      expect{
+        Simp::Rake::Build::RpmDeps::get_version_requires(pkg, '<= 3.0.0')
+      }.to raise_error(SIMPRpmDepVersionException)
     end
   end
 end
 
-describe 'Simp::Rake::Build::RpmDeps#generate_rpm_requires_file' do
+describe 'Simp::Rake::Build::RpmDeps#generate_rpm_meta_files' do
   let(:files_dir) { File.join(File.dirname(__FILE__), 'files') }
-  let(:rpm_dependency_metadata) {
+  let(:rpm_metadata) {
    YAML.load(File.read(File.join(files_dir, 'dependencies.yaml')))
   }
-  
+
   before :each do
     @tmp_dir = Dir.mktmpdir( File.basename( __FILE__ ) )
     FileUtils.cp_r(files_dir, @tmp_dir)
@@ -55,8 +57,7 @@ describe 'Simp::Rake::Build::RpmDeps#generate_rpm_requires_file' do
   context 'managed component with a name change (obsoletes)' do
     it 'should generate requires file with obsoletes' do
       mod_dir = File.join(@tmp_dir, 'files', 'changed_name_mod')
-      Simp::Rake::Build::RpmDeps::generate_rpm_requires_file(mod_dir,
-        rpm_dependency_metadata)
+      Simp::Rake::Build::RpmDeps::generate_rpm_meta_files(mod_dir, rpm_metadata)
 
       requires_file = File.join(mod_dir, 'build', 'rpm_metadata', 'requires')
       expect(File.exist?(requires_file)).to be true
@@ -74,14 +75,16 @@ Requires: pupmod-foo6-bar6 < 7.0.0
 EOM
       actual = IO.read(requires_file)
       expect(actual).to eq expected
+
+      release_file = File.join(mod_dir, 'build', 'rpm_metadata', 'release')
+      expect(File.exist?(release_file)).to be false
     end
   end
 
-  context 'managed component with a subset of metadata.json dependencies' do
-    it 'should generate requires file with dependencies only from dependencies.yaml' do
+  context 'managed component with a subset of metadata.json dependencies and a release' do
+    it 'should generate both a requires file and a release file from dependencies.yaml' do
       mod_dir = File.join(@tmp_dir, 'files', 'managed_mod')
-      Simp::Rake::Build::RpmDeps::generate_rpm_requires_file(mod_dir,
-        rpm_dependency_metadata)
+      Simp::Rake::Build::RpmDeps::generate_rpm_meta_files(mod_dir, rpm_metadata)
 
       requires_file = File.join(mod_dir, 'build', 'rpm_metadata', 'requires')
       expect(File.exist?(requires_file)).to be true
@@ -97,14 +100,38 @@ Requires: pupmod-richardc-datacat < 1.0.0
 EOM
       actual = IO.read(requires_file)
       expect(actual).to eq expected
+
+      release_file = File.join(mod_dir, 'build', 'rpm_metadata', 'release')
+      expect(File.exist?(release_file)).to be true
+      expect(IO.read(release_file)).to match(/^2017.0$/)
+    end
+  end
+
+  context 'managed component with only a release' do
+    it 'should generate a release file from dependencies.yaml' do
+      mod_dir = File.join(@tmp_dir, 'files', 'release_only_mod')
+      Simp::Rake::Build::RpmDeps::generate_rpm_meta_files(mod_dir, rpm_metadata)
+
+      requires_file = File.join(mod_dir, 'build', 'rpm_metadata', 'requires')
+      expect(File.exist?(requires_file)).to be true
+
+      expected = <<EOM
+Requires: pupmod-puppetlabs-stdlib >= 3.2.0
+Requires: pupmod-puppetlabs-stdlib < 5.0.0
+EOM
+      actual = IO.read(requires_file)
+      expect(actual).to eq expected
+
+      release_file = File.join(mod_dir, 'build', 'rpm_metadata', 'release')
+      expect(File.exist?(release_file)).to be true
+      expect(IO.read(release_file)).to match(/^2017.2$/)
     end
   end
 
   context 'unmanaged component' do
     it 'should replace requires file with metadata.json dependencies' do
       mod_dir = File.join(@tmp_dir, 'files', 'unmanaged_mod')
-      Simp::Rake::Build::RpmDeps::generate_rpm_requires_file(mod_dir,
-        rpm_dependency_metadata)
+      Simp::Rake::Build::RpmDeps::generate_rpm_meta_files(mod_dir, rpm_metadata)
 
       # expected should overwritten with simply dependencies in order
       # they were listed in metadata.json
@@ -127,14 +154,16 @@ EOM
       original = IO.readlines(File.join(files_dir, 'unmanaged_mod',
         'build', 'rpm_metadata', 'requires'))
       expect(actual).to_not eq original
+
+      release_file = File.join(mod_dir, 'build', 'rpm_metadata', 'release')
+      expect(File.exist?(release_file)).to be false
     end
   end
 
   context 'ignores obsoletes when version obsoleted is newer than this version' do
     it 'should generate requires file with no obsoletes' do
       mod_dir = File.join(@tmp_dir, 'files', 'obsoletes_too_new_mod')
-      Simp::Rake::Build::RpmDeps::generate_rpm_requires_file(mod_dir,
-        rpm_dependency_metadata)
+      Simp::Rake::Build::RpmDeps::generate_rpm_meta_files(mod_dir, rpm_metadata)
 
       requires_file = File.join(mod_dir, 'build', 'rpm_metadata', 'requires')
       expect(File.exist?(requires_file)).to be true
@@ -153,8 +182,9 @@ EOM
     it 'should fail when dep in depedencies.yaml is not found in metadata.json' do
       mod_dir = File.join(@tmp_dir, 'files', 'unknown_dep_mod')
       err_msg = "Could not find oops/unknown dependency in #{mod_dir}/metadata.json"
-      expect { Simp::Rake::Build::RpmDeps::generate_rpm_requires_file(mod_dir,
-        rpm_dependency_metadata) }.to raise_error(err_msg)
+      expect {
+        Simp::Rake::Build::RpmDeps::generate_rpm_meta_files(mod_dir, rpm_metadata)
+      }.to raise_error(err_msg)
     end
   end
 
@@ -162,18 +192,19 @@ EOM
     it 'should fail for managed component with invalid dep version in metadata.json' do
       mod_dir = File.join(@tmp_dir, 'files', 'malformed_dep_meta_mod')
       err_msg = "Unable to parse foo1/bar1 dependency version '1.0.0.1' in #{mod_dir}/metadata.json"
-      expect { Simp::Rake::Build::RpmDeps::generate_rpm_requires_file(mod_dir,
-        rpm_dependency_metadata) }.to raise_error(err_msg)
+      expect {
+        Simp::Rake::Build::RpmDeps::generate_rpm_meta_files(mod_dir, rpm_metadata)
+      }.to raise_error(err_msg)
     end
 
     it 'should fail for unmanaged component with invalid dep version in metadata.json' do
-      rpm_dep_meta = rpm_dependency_metadata.dup
-      rpm_dep_meta ['malformed_dep_meta_mod'] = nil
-puts rpm_dep_meta
+      rpm_meta = rpm_metadata.dup
+      rpm_meta ['malformed_dep_meta_mod'] = nil
       mod_dir = File.join(@tmp_dir, 'files', 'malformed_dep_meta_mod')
       err_msg = "Unable to parse foo1/bar1 dependency version '1.0.0.1' in #{mod_dir}/metadata.json"
-      expect { Simp::Rake::Build::RpmDeps::generate_rpm_requires_file(mod_dir,
-        rpm_dep_meta) }.to raise_error(err_msg)
+      expect {
+        Simp::Rake::Build::RpmDeps::generate_rpm_meta_files(mod_dir, rpm_meta)
+      }.to raise_error(err_msg)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-30 00:00:00.000000000 Z
+date: 2017-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -487,6 +487,7 @@ files:
 - spec/lib/simp/rake/build/files/malformed_dep_meta_mod/metadata.json
 - spec/lib/simp/rake/build/files/managed_mod/metadata.json
 - spec/lib/simp/rake/build/files/obsoletes_too_new_mod/metadata.json
+- spec/lib/simp/rake/build/files/release_only_mod/metadata.json
 - spec/lib/simp/rake/build/files/unknown_dep_mod/metadata.json
 - spec/lib/simp/rake/build/files/unmanaged_mod/build/rpm_metadata/requires
 - spec/lib/simp/rake/build/files/unmanaged_mod/metadata.json
@@ -555,7 +556,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: SIMP rake helpers