simp-rake-helpers 5.5.2 → 5.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55923c19133642bbedd90f75926344b61c8ca0fc72d12a83d5a3f265a027f0dc
-  data.tar.gz: 595956bbaa3b3b3af35f3bfdbd4ec9acfdf6dc858d15057eb1f3fd0491f1c060
+  metadata.gz: b500aee6edc684f4deccd9ff8cdb0ad5e58ee63245ee62d0361fa2586eea0b53
+  data.tar.gz: ea8a91b88e88ccd1602caa2b837617eef22e32218e27971551e44d17ab130026
 SHA512:
-  metadata.gz: 8959c27f5a86af2921336dfa3e55bc0872473c1edf6b1fd10eaa55e2881c7d56d11830b0c9bc8392ace4c3666364199d533725aac2ed540eabf269a061be03f4
-  data.tar.gz: 44084a5f896837b8f591311da3ac744e9913844d60c0dfaa2a8b39195efb2aed5a91902de78962311d08b1408659e369e8385245f2e36aa61219aa5fcc8b0a6a
+  metadata.gz: feffd37735210c71626ec9aab64ab909477c7c3a22fb6bafa5300289da567b5629abe88f8d0db0c8e7542ceed712184eee78397ebf4ae6a6837b661b5932a87d
+  data.tar.gz: c112afedf1e4b3372267568d20d2345d5ea693e23ece1ea6af28217b2ae6e81c14e85dcd976728cd8913218db21a7f724ba07ae13463d8b21be20811d97ffd65

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 5.5.3 / 2018-08-28
+* Fix issue where the `pkg:signrpms` rake task would not honor 'force'
+* Add a check for the existence of /usr/local/sbin/simp_rpm_helper, before
+  running it in the latest Puppet-module RPM spec file.
+
 ### 5.5.2 / 2018-08-21
 * Add additional UEFI support options to the ISO build based on user feedback.
   All of our testing could use the ISO on different UEFI systems successfully

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

@@ -446,13 +446,23 @@ module Simp::Rake::Build
           build(@build_dirs[:doc],t)
         end
 
-        desc "Sign the RPMs."
+        desc <<-EOM
+          Sign a set of RPMs.
+
+            Signs any unsigned RPMs in the specified directory
+              * :key - The key directory to use under #{@build_dir}/build_keys
+                * Defaults to #{File.join(File.dirname(@rpm_dir), '*RPMS')}
+              * :rpm_dir - A directory containing RPM files to sign. Will recurse!
+                * Defaults to 'dev'
+              * :force - Force rpms that are already signed to be resigned
+                * Defaults to 'false', can be enabled with 'true'
+        EOM
         task :signrpms,[:key,:rpm_dir,:force] => [:prep,:key_prep] do |t,args|
           which('rpmsign') || raise(StandardError, 'Could not find rpmsign on your system. Exiting.')
 
           args.with_defaults(:key => 'dev')
           args.with_defaults(:rpm_dir => File.join(File.dirname(@rpm_dir), '*RPMS'))
-          args.with_default(:force => 'false')
+          args.with_defaults(:force => 'false')
 
           force = (args[:force].to_s == 'false' ? false : true)
 
@@ -472,7 +482,10 @@ module Simp::Rake::Build
             :progress => t.name
           ) do |rpm|
             rpm_info = Simp::RPM.new(rpm)
-            Simp::RPM.signrpm(rpm, "#{@build_dir}/build_keys/#{args[:key]}") unless rpm_info.signature
+
+            if force || !rpm_info.signature
+              Simp::RPM.signrpm(rpm, "#{@build_dir}/build_keys/#{args[:key]}")
+            end
           end
         end
 

data/lib/simp/rake/helpers/assets/rpm_spec/simpdefault.spec

@@ -484,8 +484,8 @@ mkdir -p %{buildroot}/%{prefix}
 
   -- Declares default scriptlets for SIMP 6.X (referenced from 6.1.0)
   --
-  --   In order to keep the package-maintained pupmod-*-* pacakges
-  --   Packages notify /usr/local/sbin/simp_rpm_helper, which
+  --   In order to keep the package-maintained pupmod-*-* packages.
+  --   Packages notify /usr/local/sbin/simp_rpm_helper.
   --   See: https://github.com/simp/simp-adapter/blob/master/src/sbin/simp_rpm_helper
   --
   -- This function should be called last
@@ -504,8 +504,10 @@ mkdir -p %{buildroot}/%{prefix}
         '# (default scriptlet for SIMP 6.x)\n'..
         '# when $1 = 1, this is an install\n'..
         '# when $1 = '.. data.upgrade ..', this is an upgrade\n'..
-        '/usr/local/sbin/simp_rpm_helper --rpm_dir='..
-        rpm_dir.." --rpm_section='"..name.."' --rpm_status=$1\n\n"
+        'if [ -x /usr/local/sbin/simp_rpm_helper ] ; then\n'..
+        '  /usr/local/sbin/simp_rpm_helper --rpm_dir='..
+        rpm_dir.." --rpm_section='"..name.."' --rpm_status=$1\n"..
+        'fi\n\n'
       )
 
       define_custom_content(content, custom_content_table, declared_scriptlets_table)

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

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

data/spec/acceptance/00_pkg_rpm_custom_scriptlets_spec.rb

@@ -37,14 +37,16 @@ shared_examples_for 'an RPM generator with customized scriptlets' do
     comment '...remaining default scriptlets call simp_rpm_helper with correct arguments'
     expected_simp_rpm_helper_scriptlets = scriptlet_label_map.select{|k,v| %w(post preun postun).include? v }
     expected_simp_rpm_helper_scriptlets.each do |rpm_label, simp_helper_label|
-      expect(scriptlets[rpm_label][:bare_content]).to eq(
-         "/usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='#{simp_helper_label}' --rpm_status=$1"
-      )
+      expected = <<EOM
+if [ -x /usr/local/sbin/simp_rpm_helper ] ; then
+  /usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='#{simp_helper_label}' --rpm_status=$1
+fi
+EOM
+      expect(scriptlets[rpm_label][:bare_content]).to eq(expected.strip)
     end
   end
 end
 
-
 shared_examples_for 'an RPM generator with customized triggers' do
 
   it 'should create an RPM with customized triggers' do

data/spec/acceptance/10_pkg_rpm_spec.rb

@@ -137,12 +137,12 @@ describe 'rake pkg:rpm' do
 
             comment 'produces RPM with appropriate pre/post/preun/postun'
             result = on host, %(rpm -qp --scripts #{testpackage_rpm})
-            scriptlets = result.stdout.scan( %r{^.*?scriptlet.*?/usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage.*?$}m )
+            scriptlets = result.stdout.scan( %r{^.*?scriptlet.*?/usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage.*?fi$}m )
 
-            expect( scriptlets.grep( %r{\Apreinstall scriptlet.*\n/usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='pre' --rpm_status=\$1\Z}m )).not_to be_empty
-            expect( scriptlets.grep( %r{\Apostinstall scriptlet.*\n/usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='post' --rpm_status=\$1\Z}m )).not_to be_empty
-            expect( scriptlets.grep( %r{\Apreuninstall scriptlet.*\n/usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='preun' --rpm_status=\$1\Z}m )).not_to be_empty
-            expect( scriptlets.grep( %r{\Apostuninstall scriptlet.*\n/usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='postun' --rpm_status=\$1\Z}m )).not_to be_empty
+            expect( scriptlets.grep( %r{\Apreinstall scriptlet.*  /usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='pre' --rpm_status=\$1}m )).not_to be_empty
+            expect( scriptlets.grep( %r{\Apostinstall scriptlet.*  /usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='post' --rpm_status=\$1}m )).not_to be_empty
+            expect( scriptlets.grep( %r{\Apreuninstall scriptlet.*  /usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='preun' --rpm_status=\$1}m )).not_to be_empty
+            expect( scriptlets.grep( %r{\Apostuninstall scriptlet.*  /usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='postun' --rpm_status=\$1}m )).not_to be_empty
           end
 
           it_should_behave_like 'an RPM generator with edge cases'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 5.5.2
+  version: 5.5.3
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-29 00:00:00.000000000 Z
+date: 2018-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler