simp-rake-helpers 5.25.0 → 6.0.0

data/spec/acceptance/suites/default/00_pkg_rpm_custom_scriptlets_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper_acceptance'
 require_relative 'support/pkg_rpm_helpers'
 
@@ -7,11 +9,11 @@ RSpec.configure do |c|
 end
 
 shared_examples_for 'an RPM generator with customized scriptlets' do
-  it 'should create an RPM with customized scriptlets' do
+  it 'creates an RPM with customized scriptlets' do
     scriptlets = rpm_scriptlets_for(
       host,
-      "#{pkg_root_dir}/testpackage_custom_scriptlet/dist/" +
-      "pupmod-simp-testpackage-0.0.1-1#{rpm_dist}.noarch.rpm"
+      "#{pkg_root_dir}/testpackage_custom_scriptlet/dist/" \
+      "pupmod-simp-testpackage-0.0.1-1#{rpm_dist}.noarch.rpm",
     )
 
     comment '...the expected scriptlet types are present'
@@ -24,18 +26,18 @@ shared_examples_for 'an RPM generator with customized scriptlets' do
     ].sort
 
     comment '...there are no duplicates' # this *should* be impossible
-    expect(scriptlets.map{|k,v| v[:count]}.max).to be == 1
+    expect(scriptlets.map { |_k, v| v[:count] }.max).to eq 1
 
     comment '...pretrans scriptlet contains custom content'
     expect(scriptlets['pretrans'][:content]).to eq '-- Custom scriptlet'
 
     comment '...preinstall scriptlet has been overridden with custom content'
     expect(scriptlets['preinstall'][:bare_content]).to eq(
-      "echo 'I override the default %%pre section provided by the spec file.'"
+      "echo 'I override the default %%pre section provided by the spec file.'",
     )
 
     comment '...default preun postun scriptlets call simp_rpm_helper with correct arguments'
-    expected_simp_rpm_helper_scriptlets = scriptlet_label_map.select{|k,v| %w(preun postun).include? v }
+    expected_simp_rpm_helper_scriptlets = scriptlet_label_map.select { |_k, v| ['preun', 'postun'].include? v }
     expected_simp_rpm_helper_scriptlets.each do |rpm_label, simp_helper_label|
       expected = <<~EOM
         if [ -x /usr/local/sbin/simp_rpm_helper ] ; then
@@ -64,15 +66,13 @@ shared_examples_for 'an RPM generator with customized scriptlets' do
 end
 
 shared_examples_for 'an RPM generator with customized triggers' do
-
-  it 'should create an RPM with customized triggers' do
+  it 'creates an RPM with customized triggers' do
     triggers = rpm_triggers_for(
       host,
-      "#{pkg_root_dir}/testpackage_custom_scriptlet/dist/" +
-      "pupmod-simp-testpackage-0.0.1-1#{rpm_dist}.noarch.rpm"
+      "#{pkg_root_dir}/testpackage_custom_scriptlet/dist/" \
+      "pupmod-simp-testpackage-0.0.1-1#{rpm_dist}.noarch.rpm",
     )
 
-
     comment '...the expected trigger types are present'
     expect(triggers.keys.sort).to eq [
       'triggerun scriptlet (using /bin/sh) -- bar',
@@ -80,55 +80,50 @@ shared_examples_for 'an RPM generator with customized triggers' do
     ]
 
     comment '...there are no duplicates' # <-- this also should be impossible
-    expect(triggers.map{|k,v| v[:count]}.max).to be == 1
+    expect(triggers.map { |_k, v| v[:count] }.max).to eq 1
 
     comment '..."triggerun -- foo" contains the expected content'
     expect(triggers['triggerun scriptlet (using /bin/sh) -- foo'][:bare_content]).to eq(
-      %q{echo "The 'foo' package is great; why would you uninstall it?"}
+      %q(echo "The 'foo' package is great; why would you uninstall it?"),
     )
 
     comment '..."triggerun -- bar" contains the expected content'
     expect(triggers['triggerun scriptlet (using /bin/sh) -- bar'][:bare_content]).to eq(
-      %q{echo "This trigger runs just before the 'bar' package's %%preun"}
+      %q(echo "This trigger runs just before the 'bar' package's %%preun"),
     )
   end
-
 end
 
 describe 'rake pkg:rpm with customized content' do
-
   before :all do
     copy_host_files_into_build_user_homedir(hosts)
   end
 
-  let(:pkg_root_dir){'/home/build_user/host_files/spec/acceptance/suites/default/files'}
-  let(:testpackage_dir){"#{pkg_root_dir}/testpackage"}
+  let(:pkg_root_dir) { '/home/build_user/host_files/spec/acceptance/suites/default/files' }
+  let(:testpackage_dir) { "#{pkg_root_dir}/testpackage" }
 
   hosts.each do |_host|
     context "on #{_host}" do
-      let!(:host){ _host }
-      let(:rpm_dist){ on(host, %{rpm --eval '%{dist}'}).output.strip.gsub(/\.centos$/, '') }
+      let!(:host) { _host }
+      let(:rpm_dist) { on(host, %(rpm --eval '%{dist}')).output.strip.gsub(%r{\.centos$}, '') }
 
       it 'can prep the package directories' do
         testpackages = [
-         'testpackage_custom_scriptlet',
+          'testpackage_custom_scriptlet',
         ]
 
         testpackages.each do |package|
-          on hosts, %Q(#{run_cmd} "cd #{pkg_root_dir}/#{package}; ) +
-                    %Q(rvm use default; bundle update --local || bundle update")
+          on hosts, "#{run_cmd} \"cd #{pkg_root_dir}/#{package}; bundle update --local || bundle update\""
         end
       end
 
       context 'when valid custom content is defined under rpm_metadata' do
-
-        it 'should create an RPM' do
+        it 'creates an RPM' do
           on host, %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_custom_scriptlet; #{rake_cmd} pkg:rpm")
         end
 
-        it_should_behave_like 'an RPM generator with customized scriptlets'
-        it_should_behave_like 'an RPM generator with customized triggers'
-
+        it_behaves_like 'an RPM generator with customized scriptlets'
+        it_behaves_like 'an RPM generator with customized triggers'
       end
     end
   end

data/spec/acceptance/suites/default/10_pkg_rpm_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper_acceptance'
 require_relative 'support/pkg_rpm_helpers'
 
@@ -7,65 +9,64 @@ RSpec.configure do |c|
 end
 
 shared_examples_for 'an RPM generator with edge cases' do
-  it 'should use specified release number for the RPM' do
+  it 'uses specified release number for the RPM' do
     on host, %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_with_release; #{rake_cmd} pkg:rpm")
     release_test_rpm = File.join(pkg_root_dir, 'testpackage_with_release',
-      'dist', "pupmod-simp-testpackage-0.0.1-42#{rpm_dist}.noarch.rpm")
+                                 'dist', "pupmod-simp-testpackage-0.0.1-42#{rpm_dist}.noarch.rpm")
     on host, %(test -f #{release_test_rpm})
   end
 
-  it 'should generate a changelog for the RPM when no CHANGELOG exists' do
+  it 'generates a changelog for the RPM when no CHANGELOG exists' do
     on host, %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_without_changelog; #{rake_cmd} pkg:rpm")
     changelog_test_rpm = File.join(pkg_root_dir, 'testpackage_without_changelog',
-      'dist', File.basename(testpackage_rpm))
+                                   'dist', File.basename(testpackage_rpm))
     on host, %(rpm --changelog -qp #{changelog_test_rpm} | grep -q 'Auto Changelog')
   end
 
-  it 'should not fail to create an RPM when the CHANGELOG has a bad date' do
+  it 'does not fail to create an RPM when the CHANGELOG has a bad date' do
     on host,
-      %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_with_bad_changelog_date; #{rake_cmd} pkg:rpm")
+       %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_with_bad_changelog_date; #{rake_cmd} pkg:rpm")
 
     bad_date_test_rpm = File.join(pkg_root_dir, 'testpackage_with_bad_changelog_date',
-      'dist', File.basename(testpackage_rpm))
+                                  'dist', File.basename(testpackage_rpm))
     on host, %(test -f #{bad_date_test_rpm})
   end
 
-  it 'should fail to create an RPM when metadata.json is missing' do
+  it 'fails to create an RPM when metadata.json is missing' do
     on host,
-      %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_missing_metadata_file; #{rake_cmd} pkg:rpm"),
-      :acceptable_exit_codes => [1]
+       %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_missing_metadata_file; #{rake_cmd} pkg:rpm"),
+       :acceptable_exit_codes => [1]
   end
 
-  it 'should fail to create an RPM when license metadata is missing' do
+  it 'fails to create an RPM when license metadata is missing' do
     on host,
-      %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_missing_license; #{rake_cmd} pkg:rpm"),
-      :acceptable_exit_codes => [1]
+       %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_missing_license; #{rake_cmd} pkg:rpm"),
+       :acceptable_exit_codes => [1]
   end
 
-  it 'should fail to create an RPM when name metadata is missing' do
+  it 'fails to create an RPM when name metadata is missing' do
     on host,
-      %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_missing_name; #{rake_cmd} pkg:rpm"),
-      :acceptable_exit_codes => [1]
+       %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_missing_name; #{rake_cmd} pkg:rpm"),
+       :acceptable_exit_codes => [1]
   end
 
-  it 'should fail to create an RPM when source metadata is missing' do
+  it 'fails to create an RPM when source metadata is missing' do
     on host,
-      %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_missing_source; #{rake_cmd} pkg:rpm"),
-      :acceptable_exit_codes => [1]
+       %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_missing_source; #{rake_cmd} pkg:rpm"),
+       :acceptable_exit_codes => [1]
   end
 
-  it 'should fail to create an RPM when summary metadata is missing' do
+  it 'fails to create an RPM when summary metadata is missing' do
     on host,
-      %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_missing_summary; #{rake_cmd} pkg:rpm"),
-      :acceptable_exit_codes => [1]
+       %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_missing_summary; #{rake_cmd} pkg:rpm"),
+       :acceptable_exit_codes => [1]
   end
 
-  it 'should fail to create an RPM when version metadata is missing' do
+  it 'fails to create an RPM when version metadata is missing' do
     on host,
-      %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_missing_version; #{rake_cmd} pkg:rpm"),
-      :acceptable_exit_codes => [1]
+       %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_missing_version; #{rake_cmd} pkg:rpm"),
+       :acceptable_exit_codes => [1]
   end
-
 end
 
 describe 'rake pkg:rpm' do
@@ -75,41 +76,38 @@ describe 'rake pkg:rpm' do
 
   hosts.each do |_host|
     context "on #{_host}" do
-      let!(:host){ _host }
-      let(:rpm_dist){ on(host, %{rpm --eval '%{dist}'}).output.strip.gsub(/\.centos$/, '') }
+      let!(:host) { _host }
+      let(:rpm_dist) { on(host, %(rpm --eval '%{dist}')).output.strip.gsub(%r{\.centos$}, '') }
 
       context 'rpm building' do
-
-        let(:pkg_root_dir){'/home/build_user/host_files/spec/acceptance/suites/default/files'}
-        let(:testpackage_dir){"#{pkg_root_dir}/testpackage"}
+        let(:pkg_root_dir) { '/home/build_user/host_files/spec/acceptance/suites/default/files' }
+        let(:testpackage_dir) { "#{pkg_root_dir}/testpackage" }
 
         it 'can prep the package directories' do
           testpackages = [
-           'simplib',
-           'testpackage',
-           'testpackage_missing_license',
-           'testpackage_missing_metadata_file',
-           'testpackage_missing_name',
-           'testpackage_missing_source',
-           'testpackage_missing_summary',
-           'testpackage_missing_version',
-           'testpackage_with_bad_changelog_date',
-           'testpackage_with_release',
-           'testpackage_without_changelog',
+            'simplib',
+            'testpackage',
+            'testpackage_missing_license',
+            'testpackage_missing_metadata_file',
+            'testpackage_missing_name',
+            'testpackage_missing_source',
+            'testpackage_missing_summary',
+            'testpackage_missing_version',
+            'testpackage_with_bad_changelog_date',
+            'testpackage_with_release',
+            'testpackage_without_changelog',
           ]
 
           testpackages.each do |package|
-            on hosts, %Q(#{run_cmd} "cd #{pkg_root_dir}/#{package}; ) +
-                      %Q(rvm use default; bundle update --local || bundle update")
+            on hosts, "#{run_cmd} \"cd #{pkg_root_dir}/#{package}; bundle update --local || bundle update\""
           end
         end
 
         context 'using simpdefault.spec' do
-
-          let(:build_type) {:default}
+          let(:build_type) { :default }
           let(:testpackage_rpm) { File.join(testpackage_dir, "dist/pupmod-simp-testpackage-0.0.1-1#{rpm_dist}.noarch.rpm") }
 
-          it 'should create an RPM' do
+          it 'creates an RPM' do
             comment "produces RPM on #{host}"
             on host, %(#{run_cmd} "cd #{testpackage_dir}; #{rake_cmd} pkg:rpm")
             on host, %(test -f #{testpackage_rpm})
@@ -139,7 +137,7 @@ describe 'rake pkg:rpm' do
             ].sort
 
             comment '...default preinstall scriptlet'
-            expected =<<~EOM
+            expected = <<~EOM
               # (default scriptlet for SIMP 6.x)
               # when $1 = 1, this is an install
               # when $1 = 2, this is an upgrade
@@ -149,10 +147,10 @@ describe 'rake pkg:rpm' do
                 /usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='pre' --rpm_status=$1
               fi
             EOM
-            expect(scriptlets['preinstall'][:content]).to eq( expected.strip )
+            expect(scriptlets['preinstall'][:content]).to eq(expected.strip)
 
             comment '...default preuninstall scriptlet'
-            expected =<<~EOM
+            expected = <<~EOM
               # (default scriptlet for SIMP 6.x)
               # when $1 = 1, this is the uninstall of the previous version during an upgrade
               # when $1 = 0, this is the uninstall of the only version during an erase
@@ -160,10 +158,10 @@ describe 'rake pkg:rpm' do
                 /usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='preun' --rpm_status=$1
               fi
             EOM
-            expect(scriptlets['preuninstall'][:content]).to eq( expected.strip )
+            expect(scriptlets['preuninstall'][:content]).to eq(expected.strip)
 
             comment '...default postuninstall scriptlet'
-            expected =<<~EOM
+            expected = <<~EOM
               # (default scriptlet for SIMP 6.x)
               # when $1 = 1, this is the uninstall of the previous version during an upgrade
               # when $1 = 0, this is the uninstall of the only version during an erase
@@ -171,10 +169,10 @@ describe 'rake pkg:rpm' do
                 /usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='postun' --rpm_status=$1
               fi
             EOM
-            expect(scriptlets['postuninstall'][:content]).to eq( expected.strip )
+            expect(scriptlets['postuninstall'][:content]).to eq(expected.strip)
 
             comment '...default posttrans scriptlet'
-            expected =<<~EOM
+            expected = <<~EOM
               # (default scriptlet for SIMP 6.x)
               # Marker file is created in %pre and only exists for installs or upgrades
               # when marker file is prepended with 'rpm_status1.', this is an install
@@ -191,7 +189,7 @@ describe 'rake pkg:rpm' do
                 fi
               fi
             EOM
-            expect(scriptlets['posttrans'][:content]).to eq( expected.strip )
+            expect(scriptlets['posttrans'][:content]).to eq(expected.strip)
 
             comment 'does not modify the shebangs in executable scripts in the RPM'
             # if the shebangs were modified, we should see /usr/bin/ruby and /usr/bin/rspec
@@ -200,7 +198,7 @@ describe 'rake pkg:rpm' do
             on host, %(rpm -qpR #{testpackage_rpm} | grep -q /usr/bin/rspec), :acceptable_exit_codes => [1]
           end
 
-          it_should_behave_like 'an RPM generator with edge cases'
+          it_behaves_like 'an RPM generator with edge cases'
         end
       end
     end

data/spec/acceptance/suites/default/30_pkg_misc_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper_acceptance'
 require_relative 'support/pkg_rpm_helpers'
 
@@ -6,28 +8,27 @@ RSpec.configure do |c|
   c.extend  Simp::BeakerHelpers::SimpRakeHelpers::PkgRpmHelpers
 end
 
-
 shared_examples_for 'a valid RPM changelog processor' do |project|
-  it 'should validate the RPM changelog' do
+  it 'validates the RPM changelog' do
     on host, %(#{run_cmd} "cd #{pkg_root_dir}/#{project}; #{rake_cmd} pkg:check_rpm_changelog")
   end
 
-  it 'should generate the tag changelog' do
+  it 'generates the tag changelog' do
     on host, %(#{run_cmd} "cd #{pkg_root_dir}/#{project}; #{rake_cmd} pkg:create_tag_changelog")
   end
 end
 
 shared_examples_for 'an invalid RPM changelog processor' do |project|
-  it 'should reject the RPM changelog' do
+  it 'rejects the RPM changelog' do
     on host,
-      %(#{run_cmd} "cd #{pkg_root_dir}/#{project}; #{rake_cmd} pkg:check_rpm_changelog"),
-      :acceptable_exit_codes => [1]
+       %(#{run_cmd} "cd #{pkg_root_dir}/#{project}; #{rake_cmd} pkg:check_rpm_changelog"),
+       :acceptable_exit_codes => [1]
   end
 
-  it 'should not generate the tag changelog' do
+  it 'does not generate the tag changelog' do
     on host,
-      %(#{run_cmd} "cd #{pkg_root_dir}/#{project}; #{rake_cmd} pkg:create_tag_changelog"),
-      :acceptable_exit_codes => [1]
+       %(#{run_cmd} "cd #{pkg_root_dir}/#{project}; #{rake_cmd} pkg:create_tag_changelog"),
+       :acceptable_exit_codes => [1]
   end
 end
 
@@ -36,10 +37,9 @@ describe 'rake pkg:check_rpm_changelog' do
     copy_host_files_into_build_user_homedir(hosts)
   end
 
-
   hosts.each do |_host|
     context "on #{_host}" do
-      let!(:host){ _host }
+      let!(:host) { _host }
       let(:pkg_root_dir) { '/home/build_user/host_files/spec/acceptance/suites/default/files' }
 
       it 'can prep the package directories' do
@@ -47,24 +47,22 @@ describe 'rake pkg:check_rpm_changelog' do
           'asset',
           'asset_with_misordered_entries',
           'module',
-          'module_with_misordered_entries'
+          'module_with_misordered_entries',
         ]
 
         testpackages.each do |package|
-          on hosts, %Q(#{run_cmd} "cd #{pkg_root_dir}/#{package}; ) +
-                    %Q(rvm use default; bundle update --local || bundle update")
+          on hosts, "#{run_cmd} \"cd #{pkg_root_dir}/#{package}; bundle update --local || bundle update\""
         end
       end
 
       context 'with no project changelog errors' do
-        it_should_behave_like('a valid RPM changelog processor', 'asset')
-        it_should_behave_like('a valid RPM changelog processor', 'module')
+        it_behaves_like('a valid RPM changelog processor', 'asset')
+        it_behaves_like('a valid RPM changelog processor', 'module')
       end
 
-
       context 'with project changelog errors' do
-        it_should_behave_like('an invalid RPM changelog processor', 'asset_with_misordered_entries')
-        it_should_behave_like('an invalid RPM changelog processor', 'module_with_misordered_entries')
+        it_behaves_like('an invalid RPM changelog processor', 'asset_with_misordered_entries')
+        it_behaves_like('an invalid RPM changelog processor', 'module_with_misordered_entries')
       end
     end
   end

data/spec/acceptance/suites/default/50_local_gpg_signing_key_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper_acceptance'
 require_relative 'support/build_user_helpers'
 
@@ -14,8 +16,7 @@ end
 # It should be possible manage GPG keys using this logic from many OSes,
 # but it's silly to try to mock them all directly in RSpec.
 describe 'local_gpg_signing_key unit test' do
-
-  def hf_cmd( hosts, cmd, env_str=nil, opts={})
+  def hf_cmd(hosts, cmd, env_str = nil, opts = {})
     if ENV['PUPPET_VERSION']
       env_str ||= %(export PUPPET_VERSION='#{ENV['PUPPET_VERSION']}';)
     end
@@ -28,11 +29,10 @@ describe 'local_gpg_signing_key unit test' do
     # If the build environment of user executing this test has a newer
     # version of bundler than provided by the published docker container,
     # the Gemfile.lock will cause problems. So, make sure to remove it!
-    hf_cmd(hosts, 'rm Gemfile.lock; bundle --local || bundle', nil, {run_in_parallel: true})
+    hf_cmd(hosts, 'rm Gemfile.lock; bundle --local || bundle', nil, { run_in_parallel: true })
   end
 
   it 'can run the os-dependent Simp::LocalGpgSigningKey spec tests' do
-    hf_cmd( hosts, 'bundle exec rspec spec/lib/simp/local_gpg_signing_key_spec.rb.beaker-only' );
+    hf_cmd(hosts, 'bundle exec rspec spec/lib/simp/local_gpg_signing_key_spec.rb.beaker-only')
   end
 end
-