simp-rake-helpers 5.12.0 → 5.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d979c12113e415884ec44b2880134bde9e20a3efc99495520e3518a994118f6
-  data.tar.gz: f9da255f0c077f662f00757ca2428b9375b1b4bd2d39de1b484c1a047d87c1f4
+  metadata.gz: 7388326de128952bb5ef2936e36da77f08a7f1ce6eb2970bb4e56bd68ac79424
+  data.tar.gz: 32f0cb5e47e874d9135af87f915f76ce9c9983b96c50f74e9f035971f0953266
 SHA512:
-  metadata.gz: 493c503f1ead3608b3718e113188ef08af8905d96fd7297f439adc4809c44e70f4ec6b1c3d08c1eb09458ef4ab1499db61ec3519f1d18ab297e1b8812c5620d1
-  data.tar.gz: bf8bd8cbbf5c36ac268a23e346554a6f7132523f5f32a3f76162fdc8d77dd01898362d51dadd6012e2e07efb08e61737c1398c123e09092b422b94e631a0b43a
+  metadata.gz: 7e34d9f14623fd9068226a074a43104943369e264d7b5ea3c92d0da3f72faeac929f66d9f48c4245a179f3654152a01f2fd8bfe7e2f76c071fd2ab23e9c2d18d
+  data.tar.gz: 3875e7ae51536e1dbe917e01ee7dd62b8fa6fd8b6cbdf524d6078dc10fd40e3315a847729838943333a120bf10f2a12958863da082e108f979c68fa15779628a

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 5.12.1 / 2021-05-27
+- Default `@build_dir` to `@distro_build_dir` in build tasks
+- Use  `file --keep-going` in the **unpack** task's ISO validation check.  This
+  allows the check to work from EL8-based systems, where `ISO 9660 CD-ROM
+  filesystem data` is not the first match.
+
 ### 5.12.0 / 2021-02-16
 - Ensure that pkg:install_gem uses the correct documentation options for the
   version of Ruby in use.

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

@@ -25,7 +25,7 @@ module Simp::Rake::Build
       namespace :build do
         task :prep do
           if $simp6
-            @build_dir = $simp6_build_dir
+            @build_dir = $simp6_build_dir || @distro_build_dir
           end
         end
 
@@ -96,7 +96,7 @@ module Simp::Rake::Build
           task :prep do
             if $simp6
               # `$simp6_build_dir` is set by the build:auto task
-              @build_dir = $simp6_build_dir
+              @build_dir = $simp6_build_dir || @distro_build_dir
 
               unless @build_dir
                 if ENV['SIMP_BUILD_yum_dir'] && File.exist?(File.join(ENV['SIMP_BUILD_yum_dir'], 'yum_data'))

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

@@ -26,7 +26,7 @@ module Simp::Rake::Build
       namespace :iso do
         task :prep do
           if $simp6
-            @build_dir = $simp6_build_dir
+            @build_dir = $simp6_build_dir || @distro_build_dir
           end
         end
 

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

@@ -43,7 +43,7 @@ module Simp::Rake::Build
 
           # This doesn't get caught for things like 'rake clean'
           if $simp6 && $simp6_build_dir
-            @build_dir = $simp6_build_dir
+            @build_dir = $simp6_build_dir || @distro_build_dir
             @dvd_src = File.join(@build_dir, File.basename(@dvd_src))
           end
 

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

@@ -17,7 +17,7 @@ module Simp::Rake::Build
       namespace :spec do
         task :prep do
           if $simp6
-            @build_dir = $simp6_build_dir
+            @build_dir = $simp6_build_dir || @distro_build_dir
           end
         end
 

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

@@ -20,7 +20,7 @@ module Simp::Rake::Build
       namespace :tar do
         task :prep do
           if $simp6
-            @build_dir = $simp6_build_dir
+            @build_dir = $simp6_build_dir || @distro_build_dir
             @dvd_src = File.join(@build_dir, File.basename(@dvd_src))
           end
 

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

@@ -50,7 +50,7 @@ module Simp::Rake::Build
         File.exist?(args.iso_path) or
           fail "Error: You must provide the full path and filename of the ISO image."
 
-        %x{file #{iso_path}}.split(":")[1..-1].to_s =~ /ISO/ or
+        %x{file --keep-going '#{iso_path}'}.split(":")[1..-1].to_s =~ /ISO/ or
           fail "Error: The file provided is not a valid ISO."
 
         pieces = File.basename(iso_path,'.iso').split('-')

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

@@ -21,7 +21,7 @@ module Simp::Rake::Build
       namespace :upload do
         task :prep do
           if $simp6
-            @build_dir = $simp6_build_dir
+            @build_dir = $simp6_build_dir || @distro_build_dir
           end
         end
 

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.0'
+  VERSION = '5.12.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 5.12.0
+  version: 5.12.1
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-27 00:00:00.000000000 Z
+date: 2021-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simp-beaker-helpers