simp-rake-helpers 5.13.0 → 5.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5686fa0464ed4e47817e43609d4aa2ec52ccab1a9facd6429d73ec39b321f487
-  data.tar.gz: f787b34312ad9033c21811615adb5eb8d069655038e309109fab82560f1e0b81
+  metadata.gz: 5dfb50582e2d9f05a5ea7ac039013727dadd80b6fc931bd1c7a35ef2f1a89400
+  data.tar.gz: 5507ff633482b131f3beeeeee24166e8afeacdbc94987fde93a7c564e77d6d05
 SHA512:
-  metadata.gz: 64c644cf1b04dbceaface541e8b6d219a7d6d9f93ed863a18062b25dece5307d62715a1fee0351e444c3f00e9c8ce476b7455a08f2b76291184949796e1770cf
-  data.tar.gz: 18663a6da6f497810c0d505d2fd73109cd97355b664deaa3609f60787dd280fb6a6bee6f3e0f2fa473dacffc696bb369994396b271f48bebeae6fb1a31fabdc4
+  metadata.gz: edf69ac817e38a9b4c7e32ab6352c96b612728fd85a7e8e1c247ed6ac47a6d9d84e92207ce7437e6aa1cc2743cfad5128a7f0d94832940a093d2042063482682
+  data.tar.gz: d9a07c960cbfe946978d97a565ebe468a6f259c9486002db13f89c0a6aefea8422d68d14e5e9c523e8bc34ce4b4ce48fce5c42a8f4d9ad329b8c3cf4fdf30a07

data/CHANGELOG.md

@@ -1,6 +1,27 @@
-### 5.13.0 /2021-11-14
+### 5.14.0 / 2022-05-14
+- Added
+  - Run `implantisomd5` after the ISO has been created so that it can be
+    validated by the installer at runtime.
+
+### 5.13.3 / 2022-05-20
+- Fixed:
+  - Changed default RPM installed file permissions to 0644/0755
+  - The tarball unpack exclusions were too aggressive. The `SIMP/GPGKEYS`
+      directory is now preserved properly.
+
+### 5.13.2 / 2022-05-13
+- Fixed:
+  - SIMP_BUILD_reposync_only now properly unpacks the tarball
+
+### 5.13.1 / 2022-05-01
+- Fixed:
+  - Aligned wtih an API change in the `dirty?` method in `r10k`
+
+### 5.13.0 / 2021-11-14
 - Added:
   - Output the full `mkisofs` command when building an ISO
+  - Added SIMP_BUILD_reposync_only to ignore the built tarball if a reposync
+    directory is present
 
 ### 5.12.7 / 2021-10-26
 - Added:

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

@@ -38,6 +38,7 @@ module Simp::Rake::Build
       'gpg',
       'grep',
       'gzip',
+      'implantisomd5',
       'install',
       'isoinfo',
       'm4',
@@ -110,14 +111,15 @@ module Simp::Rake::Build
           - SIMP_BUILD_docs            => 'yes' builds & includes documentation
           - SIMP_BUILD_checkout        => 'no' will skip the git repo checkouts
           - SIMP_BUILD_bundle          => 'no' skips running bundle in each subrepo
-          - SIMP_BUILD_unpack          => 'no' skips the unpack section
-          - SIMP_BUILD_unpack_merge    => 'no' prevents auto-merging the unpacked DVD
+          - SIMP_BUILD_unpack          => 'no' prevents unpacking the source ISO
+          - SIMP_BUILD_unpack_merge    => 'no' prevents auto-merging the unpacked ISO
           - SIMP_BUILD_prune           => 'no' passes :prune=>false to iso:build
           - SIMP_BUILD_iso_name        => Renames the output ISO filename [Default: false]
           - SIMP_BUILD_iso_tag         => Appended to the output ISO's filename [Default: false]
           - SIMP_BUILD_update_packages => Automatically update any necessary packages in the packages.yaml file [Default: false]
           - SIMP_BUILD_verbose         => 'yes' enables verbose reporting. [Default: 'no']
           - SIMP_BUILD_signing_key     => The name of the GPG key to use to sign packages. [Default: 'dev']
+          - SIMP_BUILD_reposync_only   => 'yes' skips unpacking the locally-build tarball so that you only get items from the reposync directory (if present)
         EOM
 
         task :auto, [:iso_paths,
@@ -138,6 +140,7 @@ module Simp::Rake::Build
             :key_name     => ENV['SIMP_BUILD_signing_key'] || 'dev'
           )
 
+          reposync_only    = ENV.fetch('SIMP_BUILD_reposync_only', 'no') == 'yes'
           iso_paths        = File.expand_path(args[:iso_paths])
           target_release   = args[:release]
           do_checksum      = (args.do_checksum = ~ /^$/ ? 'false' : args.do_checksum)

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

@@ -16,7 +16,7 @@ class R10KHelper
     end
 
     # Return true if the repository has local modifications, false otherwise.
-    def dirty?
+    def dirty?(exclude_spec=false)
       repo_status = false
 
       return repo_status unless File.directory?(path)

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

@@ -252,61 +252,80 @@ module Simp::Rake::Build
                 end
               end
 
-              # Add the SIMP code
-              system("tar --no-same-permissions -C #{dir} -xzf #{tball}")
+              reposync_only = (ENV.fetch('SIMP_BUILD_reposync_only', 'no') == 'yes')
+              if reposync_only && !reposync_active
+                fail("ERROR: Reposync-only requested, but no reposync content found")
+              end
 
-              # Pop the SIMP directory from the tarball into the correct spot
-              # FIXME: This is a hack
-              unless dir == repo_target_dir
-                simpdir = File.join(dir,'SIMP')
+              if reposync_only
+                puts
+                puts '-'*80
+                puts '### Reposync-Only Mode ###'
+                puts
+                puts '  Locally built packages will not be added'
+                puts
+                puts '-'*80
+                puts
 
-                if File.directory?(simpdir)
-                   cp_r(simpdir, repo_target_dir, :verbose => verbose)
-                   rm_rf(simpdir, :verbose => verbose)
-                end
-              end
+                # Only add the ISO modifications
+                system(%(tar --no-same-permissions --exclude="*.rpm" -C #{dir} -xzf #{tball}))
+              else
+                # Add the SIMP code and ISO modifications
+                system("tar --no-same-permissions -C #{dir} -xzf #{tball}")
 
-              Dir.chdir("#{repo_target_dir}/SIMP") do
-                # Add the SIMP Dependencies
-                simp_base_ver = simpver.split('-').first
+                # Pop the SIMP directory from the tarball into the correct spot
+                # FIXME: This is a hack
+                unless dir == repo_target_dir
+                  simpdir = File.join(dir,'SIMP')
 
-                if $simp6
-                  yum_dep_location = File.join(@build_dir,'yum_data','packages')
-                else
-                  simp_dep_src = %(SIMP#{simp_base_ver}_#{baseos}#{baseosver}_#{arch})
-                  yum_dep_location = File.join(@build_dir,'yum_data',simp_dep_src,'packages')
+                  if File.directory?(simpdir)
+                     cp_r(simpdir, repo_target_dir, :verbose => verbose)
+                     rm_rf(simpdir, :verbose => verbose)
+                  end
                 end
 
-                yum_dep_rpms = Dir.glob(File.join(yum_dep_location,'*.rpm'))
+                Dir.chdir("#{repo_target_dir}/SIMP") do
+                  # Add the SIMP Dependencies
+                  simp_base_ver = simpver.split('-').first
 
-                unless File.directory?(yum_dep_location)
-                  fail("Could not find dependency directory at #{yum_dep_location}") unless reposync_active
-                end
+                  if $simp6
+                    yum_dep_location = File.join(@build_dir,'yum_data','packages')
+                  else
+                    simp_dep_src = %(SIMP#{simp_base_ver}_#{baseos}#{baseosver}_#{arch})
+                    yum_dep_location = File.join(@build_dir,'yum_data',simp_dep_src,'packages')
+                  end
 
-                if yum_dep_rpms.empty?
-                  fail("Could not find any dependency RPMs at #{yum_dep_location}") unless reposync_active
-                end
+                  yum_dep_rpms = Dir.glob(File.join(yum_dep_location,'*.rpm'))
 
-                # Add any one-off RPMs that you might want to add to your own build
-                # These are *not* checked to make sure that they actually match your
-                # environment
-                aux_packages = File.join(File.dirname(yum_dep_location),'aux_packages')
-                if File.directory?(aux_packages)
-                  yum_dep_rpms += Dir.glob(File.join(aux_packages,'*.rpm'))
-                end
+                  unless File.directory?(yum_dep_location)
+                    fail("Could not find dependency directory at #{yum_dep_location}") unless reposync_active
+                  end
 
-                yum_dep_rpms.each do |rpm|
-                  rpm_arch = rpm.split('.')[-2]
+                  if yum_dep_rpms.empty?
+                    fail("Could not find any dependency RPMs at #{yum_dep_location}") unless reposync_active
+                  end
 
-                  unless File.directory?(rpm_arch)
-                    mkdir(rpm_arch)
+                  # Add any one-off RPMs that you might want to add to your own build
+                  # These are *not* checked to make sure that they actually match your
+                  # environment
+                  aux_packages = File.join(File.dirname(yum_dep_location),'aux_packages')
+                  if File.directory?(aux_packages)
+                    yum_dep_rpms += Dir.glob(File.join(aux_packages,'*.rpm'))
                   end
 
-                  # Just in case this is a symlink, broken, or some other nonsense.
-                  target_file = File.join(rpm_arch,File.basename(rpm))
-                  rm_f(target_file) if File.exist?(target_file)
+                  yum_dep_rpms.each do |rpm|
+                    rpm_arch = rpm.split('.')[-2]
+
+                    unless File.directory?(rpm_arch)
+                      mkdir(rpm_arch)
+                    end
+
+                    # Just in case this is a symlink, broken, or some other nonsense.
+                    target_file = File.join(rpm_arch,File.basename(rpm))
+                    rm_f(target_file) if File.exist?(target_file)
 
-                  cp(rpm,rpm_arch, :verbose => verbose)
+                    cp(rpm,rpm_arch, :verbose => verbose)
+                  end
                 end
 
                 if reposync_active
@@ -430,7 +449,10 @@ module Simp::Rake::Build
           end # End of tarfiles loop
 
           # If we got here and didn't generate any ISOs, something went horribly wrong
-          fail('Error: No ISO was built!') unless @simp_output_iso
+          fail('Error: No ISO was built!') unless ( @simp_output_iso && File.exist?(@simp_output_iso) )
+
+          # Embed the validation checksum
+          system("implantisomd5 --supported-iso #{@simp_output_iso}")
         end
 
 =begin

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

@@ -587,7 +587,7 @@ mkdir -p %{buildroot}/%{prefix}
 
 
 %files
-%defattr(0640,root,root,0750)
+%defattr(0644,root,root,0755)
 %{prefix}/%{module_name}
 
 %changelog

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

@@ -587,7 +587,7 @@ mkdir -p %{buildroot}/%{prefix}
 
 
 %files
-%defattr(0640,root,root,0750)
+%defattr(0644,root,root,0755)
 %{prefix}/%{module_name}
 
 %changelog

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

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

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

@@ -290,7 +290,7 @@ class Simp::Rake::Pupmod::Helpers < ::Rake::TaskLib
     # That will give Travis a way of warning us if the changelog
     # will prevent the rpm from building.
     task :changelog_annotation, [:quiet] do |t,args|
-      warning('DEPRECATED: use pkg:create_tag_changelog')
+      warn('DEPRECATED: use pkg:create_tag_changelog')
       quiet = true if args[:quiet].to_s == 'true'
       puts changelog_annotation( quiet )
     end
@@ -333,7 +333,7 @@ class Simp::Rake::Pupmod::Helpers < ::Rake::TaskLib
       - doc directory
     EOM
     task :compare_latest_tag, [:tags_source, :ignore_owner, :verbose] do |t,args|
-      warning('DEPRECATED: use pkg:compare_latest_tag')
+      warn('DEPRECATED: use pkg:compare_latest_tag')
       require 'json'
 
       tags_source = args[:tags_source].nil? ? 'origin' : args[:tags_source]

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

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 describe Simp::Rake::Build::Helpers do
   before :each do
-    dir        = File.expand_path( '../../files/simp_build', File.dirname( __FILE__ ) )
+    dir = File.expand_path( '../../files/simp_build', File.dirname( __FILE__ ) )
     env = ENV['SIMP_RPM_dist'].dup
     ENV['SIMP_RPM_dist'] = '.el7'
     @obj = Simp::Rake::Build::Helpers.new( dir )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 5.13.0
+  version: 5.14.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-11 00:00:00.000000000 Z
+date: 2022-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simp-beaker-helpers
@@ -265,7 +265,7 @@ dependencies:
         version: '0'
 description: '    "simp-rake-helpers provides common methods for SIMP Rake Tasks"
 
-'
+  '
 email: simp@simp-project.org
 executables: []
 extensions: []