simp-rake-helpers 3.1.2 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec46ab6ca3ff2615f06d8552bc34c2fbf04b9119
-  data.tar.gz: 5a4dba95fa0eef1f1f62f7b76e158b7a4f15b8d9
+  metadata.gz: 04f0b9f052a35c5a21e97ac67ab1ad65a5557e8f
+  data.tar.gz: 5684a31924f21f62cee1db140512e74f24115866
 SHA512:
-  metadata.gz: d210e9e63829deb0369e30570f4d66530aac76641f449a39c627a3dbc38ad85d3e7b1bf026ae47af9cb1fa21826f7405cc6f925d8dc3e7ce17af2569c4301317
-  data.tar.gz: cc5b83ad98dd7fdccd901643554ee85f659bc9b1fd5b669d22d2a3fa0922384072bd3a62286442227c9db1e4054f3377fcc7704b907ab7d89fe8471dce3e7a75
+  metadata.gz: 49d3ce2a0da2bfb914b48df402e521406b5073b7ff5226ce1ab4008b725366d37d55d38443b89c20b3640d6d5a34893d3a3b3e453e1b3290350a7929525d3653
+  data.tar.gz: b5741af61038d604f265331f195fa908804e8586a2b638467d54f812cf15c6c3211cb7128a327c22169607bb6431f86b5ca9171c9173db786b1031989b12a9bd

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### 3.1.3 / 2016-12-02
+* Fixed issues with looping through the build directories
+
 ### 3.1.2 / 2016-12-02
 * Look for the DVD directory in the distribution directories
 

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

@@ -52,7 +52,7 @@ module Simp::Rake::Build
                                            Will default to a full build and *will* erase existing artifacts.
             - SIMP_BUILD_staging_dir    => Path to stage big build assets
                                            [Default: './SIMP_ISO_STAGING']
-            - SIMP_BUILD_rm_staging_dir => 'yes' forcibly removes the staging dir before starting
+            - SIMP_BUILD_rm_staging_dir => 'no' do not forcibly remove the staging dir before starting
             - SIMP_BUILD_force_dirty    => 'yes' tries to checks out subrepos even if dirty
             - SIMP_BUILD_docs           => 'yes' builds & includes documentation
             - SIMP_BUILD_checkout       => 'no' will skip the git repo checkouts
@@ -90,10 +90,8 @@ module Simp::Rake::Build
             do_packer_vars   = ENV.fetch('SIMP_BUILD_packer_vars', 'yes') == 'yes'
             verbose          = ENV.fetch('SIMP_BUILD_verbose', 'no') == 'yes'
             prompt           = ENV.fetch('SIMP_BUILD_prompt', 'yes') != 'no'
-            pwd              = Dir.pwd
-            repo_root_dir    = File.expand_path( @base_dir )
             method           = ENV.fetch('SIMP_BUILD_puppetfile','tracking')
-            do_rm_staging    = ENV['SIMP_BUILD_rm_staging_dir'] == 'yes'
+            do_rm_staging    = ENV.fetch('SIMP_BUILD_rm_staging_dir', 'yes') == 'yes'
             do_docs          = ENV['SIMP_BUILD_docs'] == 'yes' ? 'true' : 'false'
             do_merge         = ENV['SIMP_BUILD_unpack_merge'] != 'no'
             do_prune         = ENV['SIMP_BUILD_prune'] != 'no' ? 'true' : 'false'
@@ -102,7 +100,6 @@ module Simp::Rake::Build
             do_unpack        = ENV['SIMP_BUILD_unpack'] != 'no'
             full_iso_name    = ENV.fetch('SIMP_BUILD_iso_name', false)
             iso_name_tag     = ENV.fetch('SIMP_BUILD_iso_tag', false)
-            tarball          = false
 
             iso_status = {}
 
@@ -117,6 +114,9 @@ module Simp::Rake::Build
                 end
 
                 @os_build_metadata['distributions'][distro][version]['arch'].sort.each do |arch|
+                  tarball          = false
+                  repo_root_dir    = File.expand_path( @base_dir )
+
                   begin
                     distro_build_dir = File.join(@distro_build_dir, distro, version, arch)
 
@@ -185,6 +185,10 @@ module Simp::Rake::Build
                                                "    '#{output_dir}'\n\n"
                     end
 
+                    unless File.directory?(output_dir)
+                      FileUtils.mkdir_p(output_dir)
+                    end
+
                     # Look up ISOs against known build assets
                     # --------------------
                     target_data = get_target_data(target_release, iso_paths, yaml_file, do_checksum, verbose )
@@ -208,8 +212,11 @@ module Simp::Rake::Build
                       puts
                       puts "     (skip with `SIMP_BUILD_checkout=no`)"
                       puts '='*80
+
                       Dir.chdir repo_root_dir
+                      Rake::Task['deps:status'].reenable
                       Rake::Task['deps:status'].invoke
+
                       if @dirty_repos && !ENV['SIMP_BUILD_force_dirty'] == 'yes'
                         raise SIMPBuildException, "ERROR: Dirty repos detected!  I refuse to destroy uncommitted work."
                       else
@@ -217,6 +224,7 @@ module Simp::Rake::Build
                         puts '-'*80
                         puts "#### Checking out subrepositories using method '#{method}'"
                         puts '-'*80
+                        Rake::Task['deps:checkout'].reenable
                         Rake::Task['deps:checkout'].invoke(method)
                       end
 
@@ -226,6 +234,7 @@ module Simp::Rake::Build
                         puts "#### Running bundler in all repos"
                         puts '     (Disable with `SIMP_BUILD_bundle=no`)'
                         puts '-'*80
+                        Rake::Task['build:bundle'].reenable
                         Rake::Task['build:bundle'].invoke
                       else
                         puts
@@ -260,6 +269,7 @@ module Simp::Rake::Build
                       # Horrible state passing magic vars
                       $tarball_tgt = File.join(distro_build_dir, 'DVD_Overlay', "SIMP-#{@simp_version}-#{distro}-#{version}-#{arch}.tar.gz")
 
+                      Rake::Task['tar:build'].reenable
                       Rake::Task['tar:build'].invoke(target_data['mock'],key_name,do_docs)
 
                       tarball = $tarball_tgt
@@ -271,6 +281,7 @@ module Simp::Rake::Build
                     puts '-'*80
                     puts "#### rake build:yum:sync[#{target_data['flavor']},#{target_data['os_version']}]"
                     puts '-'*80
+                    Rake::Task['build:yum:sync'].reenable
                     Rake::Task['build:yum:sync'].invoke(target_data['flavor'],target_data['os_version'])
 
                     # If you have previously downloaded packages from yum, you may need to run
@@ -310,23 +321,24 @@ module Simp::Rake::Build
                       puts
                     end
 
-                    Dir.chdir repo_root_dir
+                    Dir.chdir staging_dir
 
                     puts
                     puts '='*80
-                    puts "#### iso:build[#{tarball}]"
+                    puts "#### iso:build[#{tarball}, #{staging_dir}, #{do_prune}]"
                     puts '='*80
                     puts
 
                     ENV['SIMP_ISO_verbose'] = 'yes' if verbose
                     ENV['SIMP_PKG_verbose'] = 'yes' if verbose
+                    Rake::Task['iso:build'].reenable
                     Rake::Task['iso:build'].invoke(tarball,staging_dir,do_prune)
 
-                    _isos = Dir[ File.join(Dir.pwd,'SIMP-*.iso') ]
+                    _isos = Dir[ File.join(staging_dir, 'SIMP-*.iso') ]
                     if _isos.size == 0
-                      fail "ERROR: No SIMP ISOs found in '#{Dir.pwd}'"
+                      fail "ERROR: No SIMP ISOs found in '#{staging_dir}'"
                     elsif _isos.size > 1
-                      warn "WARNING: More than one SIMP ISO found in '#{Dir.pwd}'"
+                      warn "WARNING: More than one SIMP ISO found in '#{staging_dir}'"
                       _isos.each{ |i| warn i }
                     end
 
@@ -416,6 +428,7 @@ module Simp::Rake::Build
             end
 
             unless successful_isos.empty?
+              puts '='*80
               puts '='*80
               puts("Successful ISOs:")
               puts(%(  * #{successful_isos.join("\n  * ")}))

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.2'
+  VERSION = '3.1.3'
 end

metadata

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