simp-rake-helpers 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e87673678db1fcb3de3bc8d12177b038877c8ac7
-  data.tar.gz: b7a1b15926479bd4e6f233cabb706424745dfa6a
+  metadata.gz: ec46ab6ca3ff2615f06d8552bc34c2fbf04b9119
+  data.tar.gz: 5a4dba95fa0eef1f1f62f7b76e158b7a4f15b8d9
 SHA512:
-  metadata.gz: 9a8836e60d0f3c9dc8cbf8806e24757acc6b153cb45b5da607107a2d14cebbed26e7b13a4cbd0b13759997df40ad72d3fa05586b39c450da393035862219287b
-  data.tar.gz: 4938147533bca2b46cda3f2997b38d415a172993e30716ff03f072a92225a126a8eef713b9283d59f1f60144bd2fedb0a89a3d209cc5b49139af179d036f05bc
+  metadata.gz: d210e9e63829deb0369e30570f4d66530aac76641f449a39c627a3dbc38ad85d3e7b1bf026ae47af9cb1fa21826f7405cc6f925d8dc3e7ce17af2569c4301317
+  data.tar.gz: cc5b83ad98dd7fdccd901643554ee85f659bc9b1fd5b669d22d2a3fa0922384072bd3a62286442227c9db1e4054f3377fcc7704b907ab7d89fe8471dce3e7a75

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### 3.1.2 / 2016-12-02
+* Look for the DVD directory in the distribution directories
+
 ### 3.1.1 / 2016-11-29
 * Fixed bug in legacy compatibility
 

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

@@ -61,7 +61,7 @@ module Simp::Rake::Build::Constants
 
     @run_dir           = Dir.pwd
     @base_dir          = base_dir
-    @build_arch        = ENV['buld_arch'] || %x{#{:facter} hardwaremodel 2>/dev/null}.chomp
+    @build_arch        = ENV['SIMP_BUILD_arch'] || %x{#{:facter} hardwaremodel 2>/dev/null}.chomp
     @build_dir         = File.join(@base_dir, 'build')
     @dvd_dir           = File.join(@build_dir, 'DVD_Overlay')
     @target_dists      = ['CentOS', 'RedHat']

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

@@ -16,6 +16,10 @@ module Simp::Rake::Build
       define_tasks
     end
 
+    def verbose
+      ENV.fetch('SIMP_ISO_verbose','no') == 'yes'
+    end
+
     def define_tasks
 
       File.umask(0007)
@@ -33,8 +37,6 @@ module Simp::Rake::Build
         # [:exclude_dirs] Array of directories to not remove any packages from
         # [:exclude_pkgs] Array of packages to not remove
         def prune_packages(from_dir,exclude_dirs,exclude_pkgs,mkrepo='createrepo -p',use_hack=true)
-          verbose = ENV.fetch('SIMP_ISO_verbose','no') == 'yes'
-
           $stderr.puts "Starting to prune..."
           Dir.chdir(from_dir) do
             prune_count = 0
@@ -117,8 +119,6 @@ module Simp::Rake::Build
             end
           end
 
-          verbose = ENV.fetch('SIMP_ISO_verbose','no') == 'yes'
-
           tarfiles = File.directory?(tarball) ?
             Dir.glob("#{tarball}/*.tar.gz") : [tarball]
           vermap = YAML::load_file( File.join( File.dirname(__FILE__), 'vermap.yaml'))

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

@@ -37,6 +37,7 @@ module Simp::Rake::Build
 
           if $simp6
             @build_dir = $simp6_build_dir
+            @dvd_src = File.join(@build_dir, File.basename(@dvd_src))
           end
 
           args.with_defaults(:method => 'tracking')
@@ -570,7 +571,7 @@ module Simp::Rake::Build
 
               File.read(key).each_line do |line|
                 if line =~ /-----BEGIN PGP PUBLIC KEY BLOCK-----/
-                  sh %{#{rpm_cmd} --import #{key}}
+                  %x{#{rpm_cmd} --import #{key}}
                   break
                 end
               end
@@ -886,7 +887,7 @@ protect=1
         #desc "Checks the environment for building the DVD tarball
         def check_dvd_env
           ["#{@dvd_src}/isolinux","#{@dvd_src}/ks"].each do |dir|
-            File.directory?(dir)or raise "Environment not suitable: Unable to find directory '#{dir}'"
+            File.directory?(dir) or raise "Environment not suitable: Unable to find directory '#{dir}'"
           end
         end
 

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

@@ -21,6 +21,7 @@ module Simp::Rake::Build
         task :prep do
           if $simp6
             @build_dir = $simp6_build_dir
+            @dvd_src = File.join(@build_dir, File.basename(@dvd_src))
           end
 
           if $tarball_tgt

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2016-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler