simp-rake-helpers 5.25.0 → 6.0.0

data/spec/lib/simp/rake/pupmod/module_build_spec.rb

@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+require 'tmpdir'
+
+require 'rake'
+# The library defines `namespace :pupmod` at the top level, which requires
+# Rake::DSL to be available. In a Rakefile this is implicit; here we make
+# it explicit before loading the file under test. record_task_metadata must
+# also be enabled before load, otherwise task descriptions are discarded.
+extend Rake::DSL
+
+Rake::TaskManager.record_task_metadata = true
+
+require 'simp/rake/pupmod/module_build'
+require 'spec_helper'
+
+describe Simp::Rake::Pupmod::PdkCompatBuilder do
+  around(:each) do |example|
+    Dir.mktmpdir('module_build_spec') do |dir|
+      @source = dir
+      File.write(File.join(dir, 'metadata.json'), '{"name":"simp-test","version":"0.0.1"}')
+      example.run
+    end
+  end
+
+  let(:builder) { described_class.new(@source) }
+
+  describe '#ignored_files' do
+    context 'when no .pdkignore is present' do
+      it "delegates to the parent class's default ignore list" do
+        spec = builder.ignored_files
+        expect(spec).to be_a(PathSpec)
+        # Parent's IGNORED list includes /pkg/ and metadata.json is explicitly NOT ignored
+        expect(spec.match('pkg/')).to be true
+        expect(spec.match('metadata.json')).to be false
+      end
+    end
+
+    context 'when a .pdkignore is present' do
+      before(:each) do
+        File.write(File.join(@source, '.pdkignore'), "/spec/\ncustom_excluded_dir/\n")
+      end
+
+      it 'returns a PathSpec built from the .pdkignore patterns' do
+        spec = builder.ignored_files
+        expect(spec).to be_a(PathSpec)
+        expect(spec.match('spec/')).to be true
+        expect(spec.match('custom_excluded_dir/')).to be true
+      end
+
+      it 'ignores dotfiles in addition to patterns from .pdkignore' do
+        spec = builder.ignored_files
+        expect(spec.match('.git')).to be true
+        expect(spec.match('.travis.yml')).to be true
+      end
+
+      it 'does not ignore files that are not listed' do
+        spec = builder.ignored_files
+        expect(spec.match('manifests/init.pp')).to be false
+        expect(spec.match('metadata.json')).to be false
+      end
+    end
+  end
+end
+
+describe 'pupmod:build rake task' do
+  before(:all) do
+    require 'rake'
+    # The task is registered at file load time; ensure it's defined.
+    require 'simp/rake/pupmod/module_build'
+  end
+
+  it 'is defined' do
+    expect(Rake::Task.task_defined?('pupmod:build')).to be true
+  end
+
+  it 'has a description' do
+    expect(Rake::Task['pupmod:build'].comment).to match(%r{build the puppet module package}i)
+  end
+
+  it 'has a single action defined in module_build.rb' do
+    actions = Rake::Task['pupmod:build'].actions
+    expect(actions.size).to eq 1
+    expect(actions.first.source_location.first).to end_with('module_build.rb')
+  end
+end

data/spec/lib/simp/rake_spec.rb

@@ -1,21 +1,22 @@
+# frozen_string_literal: true
+
 require 'simp/rake'
 require 'spec_helper'
 
 describe Simp::Rake do
   RSpec.configure do |c|
-    c.include Simp::Rake
+    c.include described_class
   end
 
-  describe ".get_cpu_limit" do
-    it "detects number of CPUs" do
+  describe '.get_cpu_limit' do
+    it 'detects number of CPUs' do
       expect(Parallel).to receive(:processor_count).and_return(3)
-      expect( get_cpu_limit ).to eq 2
+      expect(get_cpu_limit).to eq 2
     end
   end
 
-
   describe 'tests are missing' do
-    it 'should have more tests' do
+    it 'has more tests' do
       skip 'TODO: write more tests'
     end
   end

data/spec/lib/simp/relchecks_check_rpm_changelog_spec.rb

@@ -1,59 +1,54 @@
+# frozen_string_literal: true
+
 require 'simp/relchecks'
 require 'spec_helper'
 
-rpm_version = Simp::RPM.version
-
 describe 'Simp::RelChecks.check_rpm_changelog' do
-  let(:files_dir) {
-    File.join( File.dirname(__FILE__), 'files', File.basename(__FILE__, '.rb'))
-  }
+  let(:files_dir) do
+    File.join(File.dirname(__FILE__), 'files', File.basename(__FILE__, '.rb'))
+  end
 
-  let(:templates_dir) {
-    File.join( File.dirname(__FILE__), '..', '..', '..', 'lib', 'simp', 'rake',
-      'helpers', 'assets', 'rpm_spec' )
-  }
+  let(:templates_dir) do
+    File.join(File.dirname(__FILE__), '..', '..', '..', 'lib', 'simp', 'rake',
+              'helpers', 'assets', 'rpm_spec')
+  end
 
   context 'with no project changelog errors' do
     it 'succeeds for a Puppet module' do
       component_dir = File.join(files_dir, 'module')
       component_spec = File.join(templates_dir, 'simpdefault.spec')
 
-      expect{ Simp::RelChecks.check_rpm_changelog(component_dir, component_spec) }.
-        to_not raise_error
+      expect { Simp::RelChecks.check_rpm_changelog(component_dir, component_spec) }
+        .not_to raise_error
     end
 
     it 'succeeds for a non-Puppet asset' do
       component_dir = File.join(files_dir, 'asset')
       component_spec = File.join(component_dir, 'build', 'asset.spec')
 
-      expect{ Simp::RelChecks.check_rpm_changelog(component_dir, component_spec) }.
-        to_not raise_error
+      expect { Simp::RelChecks.check_rpm_changelog(component_dir, component_spec) }
+        .not_to raise_error
     end
   end
 
   context 'with changelog errors' do
+    # rpm >= 4.16 (EL9+) reports misordered changelog entries on stderr but
+    # exits 0; check_rpm_changelog detects the reported message, so these are
+    # expected to fail on every supported rpm version.
     it 'fails for a Puppet module' do
-      if Gem::Version.new(rpm_version) > Gem::Version.new('4.15.0')
-        skip("RPM #{rpm_version} does not properly process changelog entries")
-      else
-        component_dir = File.join(files_dir, 'module_with_misordered_entries')
-        component_spec = File.join(templates_dir, 'simpdefault.spec')
-
-        expect{ Simp::RelChecks.check_rpm_changelog(component_dir, component_spec) }.
-          to raise_error(/ERROR: Invalid changelog for module_with_misordered_entries/)
-      end
+      component_dir = File.join(files_dir, 'module_with_misordered_entries')
+      component_spec = File.join(templates_dir, 'simpdefault.spec')
+
+      expect { Simp::RelChecks.check_rpm_changelog(component_dir, component_spec) }
+        .to raise_error(%r{ERROR: Invalid changelog for module_with_misordered_entries})
     end
 
     it 'fails for a non-Puppet asset' do
-      if Gem::Version.new(rpm_version) > Gem::Version.new('4.15.0')
-        skip("RPM #{rpm_version} does not properly process changelog entries")
-      else
-        component_dir = File.join(files_dir, 'asset_with_misordered_entries')
-        component_spec = File.join(component_dir, 'build', 'asset_with_misordered_entries.spec')
-
-        expect{ Simp::RelChecks.check_rpm_changelog(component_dir, component_spec) }.
-          to raise_error(/ERROR: Invalid changelog for asset_with_misordered_entries/)
-      end
+      component_dir = File.join(files_dir, 'asset_with_misordered_entries')
+      component_spec = File.join(component_dir, 'build', 'asset_with_misordered_entries.spec')
+
+      expect { Simp::RelChecks.check_rpm_changelog(component_dir, component_spec) }
+        .to raise_error(%r{ERROR: Invalid changelog for asset_with_misordered_entries})
     end
   end
 end

data/spec/lib/simp/relchecks_compare_latest_tag_spec.rb

@@ -1,20 +1,22 @@
+# frozen_string_literal: true
+
 require 'simp/relchecks'
 require 'spec_helper'
 
 describe 'Simp::RelChecks.compare_latest_tag' do
-  let(:files_dir) {
-    File.join( File.dirname(__FILE__), 'files', File.basename(__FILE__, '.rb'))
-  }
+  let(:files_dir) do
+    File.join(File.dirname(__FILE__), 'files', File.basename(__FILE__, '.rb'))
+  end
 
-  let(:component_dir) {  File.join(files_dir, 'module') }
+  let(:component_dir) { File.join(files_dir, 'module') }
 
   context 'with no project errors' do
     it 'reports no tags for a project with no tags' do
       expect(Simp::RelChecks).to receive(:`).with('git fetch -t origin 2>/dev/null').and_return("\n")
       expect(Simp::RelChecks).to receive(:`).with('git tag -l').and_return("\n")
 
-      expect{ Simp::RelChecks.compare_latest_tag(component_dir) }.
-        to output("  No tags exist from origin\n").to_stdout
+      expect { Simp::RelChecks.compare_latest_tag(component_dir) }
+        .to output("  No tags exist from origin\n").to_stdout
     end
 
     it 'reports no new tag required when no files have changed' do
@@ -23,26 +25,28 @@ describe 'Simp::RelChecks.compare_latest_tag' do
       expect(Simp::RelChecks).to receive(:`).with('git diff tags/1.1.0 --name-only').and_return("\n")
 
       msg = "  No new tag required: No significant files have changed since '1.1.0' tag\n"
-      expect{ Simp::RelChecks.compare_latest_tag(component_dir) }.
-        to output(msg).to_stdout
+      expect { Simp::RelChecks.compare_latest_tag(component_dir) }
+        .to output(msg).to_stdout
     end
 
     it 'reports no new tag required when no significant files have changed' do
       expect(Simp::RelChecks).to receive(:`).with('git fetch -t origin 2>/dev/null').and_return("\n")
       expect(Simp::RelChecks).to receive(:`).with('git tag -l').and_return("1.0.0\nv1.0.1\n1.1.0\n")
       expect(Simp::RelChecks).to receive(:`).with('git diff tags/1.1.0 --name-only').and_return(
-        ".travis.yml\nRakefile\nREFERENCE.md\nGemfile.lock\nspec/some_spec.rb\ndoc/index.html\nrakelib/mytasks.rake\nrenovate.json\n")
+        ".travis.yml\nRakefile\nREFERENCE.md\nGemfile.lock\nspec/some_spec.rb\ndoc/index.html\nrakelib/mytasks.rake\nrenovate.json\n",
+      )
 
       msg = "  No new tag required: No significant files have changed since '1.1.0' tag\n"
-      expect{ Simp::RelChecks.compare_latest_tag(component_dir) }.
-        to output(msg).to_stdout
+      expect { Simp::RelChecks.compare_latest_tag(component_dir) }
+        .to output(msg).to_stdout
     end
 
     it 'reports a new tag is required for significant changes with bumped version' do
       expect(Simp::RelChecks).to receive(:`).with('git fetch -t origin 2>/dev/null').and_return("\n")
       expect(Simp::RelChecks).to receive(:`).with('git tag -l').and_return("1.0.0\n1.1.0-RC01\n")
       expect(Simp::RelChecks).to receive(:`).with('git diff tags/1.0.0 --name-only').and_return(
-         "CHANGELOG\nmetadata.json\nmanifest/init.pp\n")
+        "CHANGELOG\nmetadata.json\nmanifest/init.pp\n",
+      )
 
       msg = <<-EOM
 NOTICE: New tag of version '1.1.0' is required for 3 changed files:
@@ -51,8 +55,8 @@ NOTICE: New tag of version '1.1.0' is required for 3 changed files:
   * manifest/init.pp
       EOM
 
-      expect{ Simp::RelChecks.compare_latest_tag(component_dir) }.
-        to output(msg).to_stdout
+      expect { Simp::RelChecks.compare_latest_tag(component_dir) }
+        .to output(msg).to_stdout
     end
   end
 
@@ -61,20 +65,22 @@ NOTICE: New tag of version '1.1.0' is required for 3 changed files:
       expect(Simp::RelChecks).to receive(:`).with('git fetch -t origin 2>/dev/null').and_return("\n")
       expect(Simp::RelChecks).to receive(:`).with('git tag -l').and_return("1.0.0\n1.2.0\n")
       expect(Simp::RelChecks).to receive(:`).with('git diff tags/1.2.0 --name-only').and_return(
-         "CHANGELOG\nmetadata.json\nmanifest/init.pp\n")
+        "CHANGELOG\nmetadata.json\nmanifest/init.pp\n",
+      )
 
-      expect{ Simp::RelChecks.compare_latest_tag(component_dir) }.
-        to raise_error(/ERROR: Version regression. '1\.1\.0' < last tag '1\.2\.0'/)
+      expect { Simp::RelChecks.compare_latest_tag(component_dir) }
+        .to raise_error(%r{ERROR: Version regression. '1\.1\.0' < last tag '1\.2\.0'})
     end
 
     it 'fails when significant file changes need a version bump' do
       expect(Simp::RelChecks).to receive(:`).with('git fetch -t origin 2>/dev/null').and_return("\n")
       expect(Simp::RelChecks).to receive(:`).with('git tag -l').and_return("1.0.0\n1.1.0\n")
       expect(Simp::RelChecks).to receive(:`).with('git diff tags/1.1.0 --name-only').and_return(
-         "manifest/init.pp\n")
+        "manifest/init.pp\n",
+      )
 
-      expect{ Simp::RelChecks.compare_latest_tag(component_dir) }.
-        to raise_error(/ERROR: Version update beyond last tag '1.1.0' is required for 1 changed files:/)
+      expect { Simp::RelChecks.compare_latest_tag(component_dir) }
+        .to raise_error(%r{ERROR: Version update beyond last tag '1.1.0' is required for 1 changed files:})
     end
 
     # spot check just one of many failures handled by
@@ -82,8 +88,8 @@ NOTICE: New tag of version '1.1.0' is required for 3 changed files:
     # extensively tested elsewhere.
     it 'fails when module info cannot be loaded' do
       comp_dir = File.join(files_dir, 'module_without_changelog')
-      expect{ Simp::RelChecks.compare_latest_tag(comp_dir) }.
-        to raise_error(/No CHANGELOG file found in/ )
+      expect { Simp::RelChecks.compare_latest_tag(comp_dir) }
+        .to raise_error(%r{No CHANGELOG file found in})
     end
   end
 
@@ -91,13 +97,13 @@ NOTICE: New tag of version '1.1.0' is required for 3 changed files:
   # 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 )
+    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
+        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.'
+      skip 'This test is disabled by default.'
     end
   end
 end

data/spec/lib/simp/relchecks_create_tag_changelog_spec.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'simp/relchecks'
 require 'spec_helper'
 
 describe 'Simp::RelChecks.create_tag_changelog' do
-  let(:files_dir) {
-    File.join( File.dirname(__FILE__), 'files', File.basename(__FILE__, '.rb'))
-  }
+  let(:files_dir) do
+    File.join(File.dirname(__FILE__), 'files', File.basename(__FILE__, '.rb'))
+  end
 
   describe '.create_tag_changelog' do
     context 'with valid module input' do
@@ -45,26 +47,30 @@ EOM
     context 'with invalid module input' do
       it 'fails when module info cannot be loaded' do
         component_dir = File.join(files_dir, 'module_without_changelog')
-        expect{ Simp::RelChecks.create_tag_changelog(component_dir) }.to raise_error(
-          /No CHANGELOG file found in .*module_without_changelog/)
+        expect { Simp::RelChecks.create_tag_changelog(component_dir) }.to raise_error(
+          %r{No CHANGELOG file found in .*module_without_changelog},
+        )
       end
 
       it 'fails if no valid entry for the version can be found' do
         component_dir = File.join(files_dir, 'module_with_no_entry_for_version')
-        expect{ Simp::RelChecks.create_tag_changelog(component_dir) }.to raise_error(
-          /No valid changelog entry for version 4.0.0 found/)
+        expect { Simp::RelChecks.create_tag_changelog(component_dir) }.to raise_error(
+          %r{No valid changelog entry for version 4.0.0 found},
+        )
       end
 
       it 'fails if entry with newer version than metadata.json is found' do
         component_dir = File.join(files_dir, 'module_with_newer_changelog_entry')
-        expect{ Simp::RelChecks.create_tag_changelog(component_dir) }.to raise_error(
-          /Changelog entry for version > 3.8.0 found:/)
+        expect { Simp::RelChecks.create_tag_changelog(component_dir) }.to raise_error(
+          %r{Changelog entry for version > 3.8.0 found:},
+        )
       end
 
       it "fails if dates are out of order for the version's changelog entries" do
         component_dir = File.join(files_dir, 'module_with_misordered_entries')
-        expect{ Simp::RelChecks.create_tag_changelog(component_dir) }.to raise_error(
-          /ERROR:  Changelog entries are not properly date ordered/)
+        expect { Simp::RelChecks.create_tag_changelog(component_dir) }.to raise_error(
+          %r{ERROR:  Changelog entries are not properly date ordered},
+        )
       end
     end
 
@@ -117,26 +123,28 @@ EOM
     end
 
     context 'with invalid asset input' do
-
       it 'fails when asset info cannot be loaded' do
         component_dir = File.join(files_dir, 'asset_without_spec_file')
-        expect{ Simp::RelChecks.create_tag_changelog(component_dir) }.to raise_error(
-          /No RPM spec file found in .*asset_without_spec_file\/build/)
+        expect { Simp::RelChecks.create_tag_changelog(component_dir) }.to raise_error(
+          %r{No RPM spec file found in .*asset_without_spec_file/build},
+        )
       end
 
       it 'fails when changelog is missing from asset RPM spec file' do
-        #NOTE:  %changelog is optional in a spec file.  So this error
+        # NOTE:  %changelog is optional in a spec file.  So this error
         #       is not found when the changelog is read from the spec
         #       file, but, instead, during post-validation
         component_dir = File.join(files_dir, 'asset_missing_changelog')
-        expect{ Simp::RelChecks.create_tag_changelog(component_dir) }.to raise_error(
-          /No valid changelog entry for version 1.0.0 found/)
+        expect { Simp::RelChecks.create_tag_changelog(component_dir) }.to raise_error(
+          %r{No valid changelog entry for version 1.0.0 found},
+        )
       end
 
       it 'fails when release tag and release in changelog from asset RPM spec file are mismatched' do
         component_dir = File.join(files_dir, 'asset_mismatched_release')
-        expect{ Simp::RelChecks.create_tag_changelog(component_dir) }.to raise_error(
-          /Version release does not match/)
+        expect { Simp::RelChecks.create_tag_changelog(component_dir) }.to raise_error(
+          %r{Version release does not match},
+        )
       end
     end
   end

data/spec/lib/simp/rpm_signer_spec.rb

@@ -1,11 +1,11 @@
+# frozen_string_literal: true
+
 require 'simp/rpm_signer'
 require 'spec_helper'
 require 'fileutils'
 require 'tmpdir'
 
-
 describe Simp::RpmSigner do
-
   before :all do
     @tmp_dir = Dir.mktmpdir('spec_test__rpm_signer')
     @gpg_keydir = File.join(@tmp_dir, 'dev')
@@ -15,83 +15,89 @@ describe Simp::RpmSigner do
     FileUtils.remove_entry_secure(@tmp_dir)
   end
 
-  let(:verbose) { ENV['VERBOSE'].to_s =~ /^(yes|true)$/ }
+  let(:verbose) { ENV['VERBOSE'].to_s =~ %r{^(yes|true)$} }
   let(:gpg_email_name) { 'gatekeeper@simp.development.key' }
   let(:passphrase) { 'dev_passphrase' }
   let(:key_id) { '722B97A808E7DAEA' }
   let(:key_size) { 4096 }
-  let(:key_info) { {
-    :dir      => @gpg_keydir,
-    :name     => gpg_email_name,
-    :key_id   => key_id,
-    :key_size => key_size,
-    :password => passphrase
-  } }
-
-  let(:gpg_cmd) {  "gpg --with-colons --homedir=#{@gpg_keydir} --list-keys '<#{gpg_email_name}>' 2>&1" }
-  let(:key_list_output) { <<~EOM
+  let(:key_info) do
+    {
+      :dir => @gpg_keydir,
+      :name => gpg_email_name,
+      :key_id => key_id,
+      :key_size => key_size,
+      :password => passphrase
+    }
+  end
+
+  let(:gpg_cmd) { "gpg --with-colons --homedir=#{@gpg_keydir} --list-keys '<#{gpg_email_name}>' 2>&1" }
+  let(:key_list_output) do
+    <<~EOM
         tru::1:1521838828:0:3:1:5
         pub:e:4096:1:722B97A808E7DAEA:1521838554:1523048154::-:::sc::::::23::0:
         fpr:::::::::5DD3E8D45C99780DCA7D0B83722B97A808E7DAEA:
         uid:e::::1521838554::773C55CA511CCE31244D86D4AB70F6499024695F::SIMP Development (Development key 1521838554) <gatekeeper@simp.development.key>::::::::::0:
-      EOM
-  }
+    EOM
+  end
 
   # The bulk of load_key is tested in the acceptance test. These tests are
   # a few edge cases.
-  context '.load_key' do
+  describe '.load_key' do
     context 'key info missing from files' do
       before :each do
-        allow(Simp::RpmSigner).to receive(:which).with('gpg').and_return('/usr/bin/gpg')
+        allow(described_class).to receive(:which).with('gpg').and_return('/usr/bin/gpg')
         FileUtils.mkdir_p(@gpg_keydir)
       end
 
       after :each do
         FileUtils.rm_rf(@gpg_keydir)
-        Simp::RpmSigner.clear_gpg_keys_cache
+        described_class.clear_gpg_keys_cache
       end
 
-      it 'should prompt user for key email and passphrase when not in files' do
+      it 'prompts user for key email and passphrase when not in files' do
         expect($stdin).to receive(:gets).and_return(gpg_email_name, passphrase)
-        expect(Simp::RpmSigner).to receive(:`).with(gpg_cmd).and_return(key_list_output)
+        expect(described_class).to receive(:`).with(gpg_cmd).and_return(key_list_output)
 
-        expect(Simp::RpmSigner.load_key(@gpg_keydir, verbose)).to eq (key_info)
+        expect(described_class.load_key(@gpg_keydir, verbose)).to eq(key_info)
 
         # verifies returning info from the cache, otherwise user would be prompted again
         # and expectation on $stdin would fail
-        expect(Simp::RpmSigner.load_key(@gpg_keydir, verbose)).to eq (key_info)
+        expect(described_class.load_key(@gpg_keydir, verbose)).to eq(key_info)
       end
 
-      it "should read the passphrase from the 'password' file" do
-        File.open(File.join(@gpg_keydir, 'password'),'w') { |file| file.puts passphrase }
+      it "reads the passphrase from the 'password' file" do
+        File.open(File.join(@gpg_keydir, 'password'), 'w') { |file| file.puts passphrase }
         expect($stdin).to receive(:gets).and_return(gpg_email_name)
-        expect(Simp::RpmSigner).to receive(:`).with(gpg_cmd).and_return(key_list_output)
+        expect(described_class).to receive(:`).with(gpg_cmd).and_return(key_list_output)
 
-        expect(Simp::RpmSigner.load_key(@gpg_keydir, verbose)).to eq (key_info)
+        expect(described_class.load_key(@gpg_keydir, verbose)).to eq(key_info)
       end
     end
 
     context 'errors' do
-      it 'should fail when gpg does not exist' do
-        expect(Simp::RpmSigner).to receive(:which).with('gpg').and_return(nil)
-        expect { Simp::RpmSigner.load_key(@gpg_keydir, verbose) }.to raise_error(
-          /Cannot sign RPMs without 'gpg'/)
+      it 'fails when gpg does not exist' do
+        expect(described_class).to receive(:which).with('gpg').and_return(nil)
+        expect { described_class.load_key(@gpg_keydir, verbose) }.to raise_error(
+          %r{Cannot sign RPMs without 'gpg'},
+        )
       end
 
-      it 'should fail when keydir does not exist' do
-        expect(Simp::RpmSigner).to receive(:which).with('gpg').and_return('/usr/bin/gpg')
-        expect { Simp::RpmSigner.load_key(@gpg_keydir, verbose) }.to raise_error(
-          /Could not find GPG keydir/)
+      it 'fails when keydir does not exist' do
+        expect(described_class).to receive(:which).with('gpg').and_return('/usr/bin/gpg')
+        expect { described_class.load_key(@gpg_keydir, verbose) }.to raise_error(
+          %r{Could not find GPG keydir},
+        )
       end
 
-      it 'should fail when key info cannot be retrieved via gpg' do
+      it 'fails when key info cannot be retrieved via gpg' do
         FileUtils.mkdir_p(@gpg_keydir)
-        expect(Simp::RpmSigner).to receive(:which).with('gpg').and_return('/usr/bin/gpg')
+        expect(described_class).to receive(:which).with('gpg').and_return('/usr/bin/gpg')
         expect($stdin).to receive(:gets).and_return(gpg_email_name, passphrase)
-        expect(Simp::RpmSigner).to receive(:`).with(gpg_cmd).and_return('')
+        expect(described_class).to receive(:`).with(gpg_cmd).and_return('')
 
-        expect { Simp::RpmSigner.load_key(@gpg_keydir, verbose) }.to raise_error(
-          /Error getting GPG key ID or Key size metadata/)
+        expect { described_class.load_key(@gpg_keydir, verbose) }.to raise_error(
+          %r{Error getting GPG key ID or Key size metadata},
+        )
       end
     end
   end