simp-rake-helpers 5.12.7 → 5.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97111c5cebe9473b33a3ea7950af3cb1b26a48a67d46485435473bad9660cc46
-  data.tar.gz: b5e86d3cfad3b1a21300fef1ae99c81f38c87a7c41ce6304e9ceb2e48c1e6f5e
+  metadata.gz: 34a577aa7249f7f21146cedc2a72eb0c922ade1d4cf12ec152097297d8c36ec9
+  data.tar.gz: 7cdefe54c3206c33da6fab2a1bdefb7e68ea1806f2905405a0edc3c4b6a6cce1
 SHA512:
-  metadata.gz: eb8f742f59d39f13a22b79781a69c0ac2855bd8a57e1928e8cc8426d958b6f2724a53e9182cd7bc4139a808308cdeb668334fc707661f6a4576601a5ccbae191
-  data.tar.gz: 8b1e9f3584bec5a5c29397802d3c8048ea9552148934f230c15c0bdd226ca763c3a97801c8e98abdc45110bdc6527be68ba504ccd7e0c34c984322bb6b11c6a9
+  metadata.gz: 063ea6a2ab7f471532b948400460587835b3e98497a33c682113cd216216fb0e362ed24f301edff42972ea79903c28ae8cdad81b56e6cc8834fc4ad48d19ee76
+  data.tar.gz: 2d05c1877803b352a2c85cf473c8a79b520159d23e023c9b69c13776e8d59209f79d13ae2eadb674bbf0aa96d71c00af168269f6914334f35db802c28609c637

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+### 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:
   - Env var `SIMP_PKG_progress_bar=no` to turn off pkg RPM build progress bars

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

@@ -110,14 +110,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,

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="SIMP" -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
@@ -421,9 +440,11 @@ module Simp::Rake::Build
                 '-x ./lost+found',
                 "-o #{@simp_output_iso}",
                 dir
-              ]
+              ].join(' ')
+
+              $stdout.puts "Running: #{mkisofs_cmd}"
 
-              system(mkisofs_cmd.join(' '))
+              system(mkisofs_cmd)
             end
           end # End of tarfiles loop
 

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

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

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.12.7
+  version: 5.13.2
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-27 00:00:00.000000000 Z
+date: 2022-05-13 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: []