simp-rake-helpers 4.1.1 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f75d80c343427ef7c599ede4745e3130fbbb139a
-  data.tar.gz: 1b26121177b51da14a44b84eebf86bad97996160
+  metadata.gz: 6c00ca9b785a703a809b933b2466a10a93ce6b84
+  data.tar.gz: ef20f00f91346b70604ce682f7305eee2406ba9e
 SHA512:
-  metadata.gz: 07f0e3a239091d9293de3d3fb882e42b0edd0f31348366298abad181905fb649e8b11cae4ac34fd81444edd557b71284e096fa1a5675b6fba68b66f12d872dba
-  data.tar.gz: 3b9d4028fd866e73073f0d8b90460a7f25a4c57a1312b014abc678064ac7401b0f83d8863cd35a9ccbf61386b8248077db46c7b03e3e97b65c647f9f21a9e92b
+  metadata.gz: 736f27200e550c12e7d5f489a45d37a636af1df6318ac7f04837df3122298107e08242fc6859b29c0467fb815bcefa486a36c92995feedd33e6690ab680a8755
+  data.tar.gz: f5b19fd4ac8200bb365959b44ec4f6db2b0f920c88ec6763abda087be3c5772c5a7e4ff55f473dda3f365744ea45991575a204b05340be42e0b9b0e988083e8d

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+### 5.0.0 / 2017-09-12
+* Removed all 'mock' support
+* Bound the build to only the OS upon which you are building
+* Removed legacy support code
+* Designed for use within a Docker environment
+  * Technically, you can install and run it inside mock but it's not
+    going to do any of the heavy lifting for you any longer
+* Is *NOT* backwards compatible with anything for the most part
+* Ensure that published RPMs are used before rebuilding
+* Cleaned up the git checking of subdirectories
+
 ### 4.1.1 / 2017-08-31
 * Added the ability to read RPM release qualifier for checked out
   module from `simp-core/build/rpm/dependencies.yaml`

data/lib/simp/rake.rb

@@ -8,6 +8,7 @@ module Simp::Rake
   require 'shellwords'
   require 'parallel'
   require 'tempfile'
+  require 'facter'
   require 'simp/rpm'
   require 'simp/rake/pkg'
 
@@ -98,27 +99,11 @@ module Simp::Rake
   # Originally snarfed from
   # http://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby
   def which(cmd)
-    File.executable?(cmd) and return cmd
+    command = Facter::Core::Execution.which(cmd)
 
-    cmd = File.basename(cmd)
+    warn "Warning: Command #{cmd} not found on the system." unless command
 
-    exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
-    ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-      exts.each { |ext|
-        exe = File.join(path, "#{cmd}#{ext}")
-        return exe if File.executable? exe
-      }
-    end
-
-    warn "Warning: Command #{cmd} not found on the system."
-    return nil
-  end
-
-  # Return whether or not the user is in the mock group
-  def validate_in_mock_group?
-    if not %x{groups}.split.include?('mock')
-      raise(Exception,"You need to be in the 'mock' group.")
-    end
+    return command
   end
 
   def help

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

@@ -3,6 +3,7 @@
 require 'simp/rake'
 require 'json'
 require 'simp/rake/build/constants'
+require 'simp/rake/helpers'
 
 include Simp::Rake
 
@@ -14,6 +15,58 @@ module Simp; end
 module Simp::Rake; end
 module Simp::Rake::Build
   class Auto < ::Rake::TaskLib
+
+    # Commands that are required by some part of the rake stack
+    BUILD_REQUIRED_COMMANDS = [
+      'basename',
+      'cat',
+      'checkmodule',
+      'chmod',
+      'cp',
+      'cpio',
+      'createrepo',
+      'date',
+      'diff',
+      'dirname',
+      'file',
+      'find',
+      'gawk',
+      'git',
+      'gpg',
+      'grep',
+      'gzip',
+      'install',
+      'isoinfo',
+      'm4',
+      'make',
+      'mkdir',
+      'mktemp',
+      'python',
+      'readlink',
+      'repoclosure',
+      'rm',
+      'rpm',
+      'rpmbuild',
+      'rpmdb',
+      'rpmkeys',
+      'rpmsign',
+      'rpmspec',
+      'sed',
+      'semodule_package',
+      'setfacl',
+      'sh',
+      'sort',
+      'tail',
+      'tar',
+      'uname',
+      'uniq',
+      'wc',
+      'which',
+      'xargs',
+      'yum',
+      'yumdownloader'
+    ]
+
     include Simp::Rake::Build::Constants
 
     def initialize( run_dir )
@@ -26,522 +79,153 @@ module Simp::Rake::Build
     def define
       namespace :build do
 
-        # SIMP 6 Style
-        if @os_build_metadata
-          desc <<-EOM
-          Automatically detect and build a SIMP ISO for a target SIMP release.
-
-          This task runs all other build tasks
-
-          Arguments:
-            * :iso_paths    => Path to source ISO(s) and/or directories  [Default: '.']
-                               NOTE: colon-delimited list
-                               If not set, will build all enabled distributions
-            * :release      => SIMP release to build (e.g., '6.X')
-                               The Full list can be found in '#{File.join(@build_dir, 'release_mappings.yaml')}'
-                               Default: #{[@simp_version.split('.').first, 'X'].join('.')}
-            * :output_dir   => path to write SIMP ISO. [Default: './SIMP_ISO']
-            * :do_checksum  => Use sha256sum checksum to compare each ISO.  [Default: 'false']
-            * :key_name     => Key name to sign packages [Default: 'dev']
-
-          ENV vars:
-            - SIMP_BUILD_isos           => Path to the base OS ISO images
-            - SIMP_BUILD_distro         => Distribution to build
-                                           See '#{File.join(@distro_build_dir, 'build_metadata.yaml')}'}
-            - SIMP_BUILD_prompt         => 'no' disables asking questions.
-                                           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 => '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
-            - 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_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_verbose        => 'yes' enables verbose reporting. [Default: 'no']
-            - SIMP_BUILD_packer_vars    => Write a packer vars.json to go with this ISO [Default: 'yes']
-            - SIMP_BUILD_signing_key    => The name of the GPG key to use to sign packages. [Default: 'dev']
-          EOM
-
-          task :auto, [:iso_paths,
-                       :release,
-                       :output_dir,
-                       :do_checksum,
-                       :key_name
-                      ] do |t, args|
-
-            args.with_defaults(
-              :iso_paths    => ENV['SIMP_BUILD_isos'] || Dir.pwd,
-              :distribution => 'ALL',
-              :release      => [@simp_version.split('.').first, 'X'].join('.'),
-              :output_dir   => '',
-              :do_checksum  => 'false',
-              :key_name     => ENV['SIMP_BUILD_signing_key'] || 'dev'
-            )
-
-            iso_paths        = File.expand_path(args[:iso_paths])
-            target_release   = args[:release]
-            do_checksum      = (args.do_checksum = ~ /^$/ ? 'false' : args.do_checksum)
-            key_name         = args[:key_name]
-            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'
-            method           = ENV.fetch('SIMP_BUILD_puppetfile','tracking')
-            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'
-            do_checkout      = ENV['SIMP_BUILD_checkout'] != 'no'
-            do_bundle        = ENV['SIMP_BUILD_bundle'] == 'yes' ? true : false
-            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)
-
-            iso_status = {}
-
-            @os_build_metadata['distributions'].keys.sort.each do |distro|
-              @os_build_metadata['distributions'][distro].keys.sort.each do |version|
-                unless @os_build_metadata['distributions'][distro][version]['build']
-                  if verbose
-                    $stderr.puts("Skipping build for #{distro} #{version}")
-                  end
-
-                  next
-                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)
-
-                    # For subtask mangling
-                    $simp6_build_dir = distro_build_dir
-                    $simp6_build_metadata = {
-                      :distro  => distro,
-                      :version => version,
-                      :arch    => arch
-                    }
-
-                    output_dir = args[:output_dir].sub(/^$/, File.expand_path( 'SIMP_ISO', distro_build_dir ))
-
-                    staging_dir = ENV.fetch('SIMP_BUILD_staging_dir', File.expand_path( 'SIMP_ISO_STAGING', distro_build_dir ))
-
-                    yaml_file = File.expand_path('release_mappings.yaml', distro_build_dir)
-
-                    tar_file = File.join(distro_build_dir, 'DVD_Overlay', "SIMP-#{@simp_version}-#{distro}-#{version}-#{arch}.tar.gz")
-
-                    if File.exist?(tar_file)
-                      if prompt
-                        valid_entry = false
-                        while !valid_entry do
-                          puts("Existing tar file found at #{tar_file}")
-                          print("Do you want to overwrite it? (y|N): ")
-
-                          resp = $stdin.gets.chomp
-
-                          if resp.empty? || (resp =~ /^(n|N)/)
-                            tarball = tar_file
-                            valid_entry = true
-                          elsif resp =~ /^(y|Y)/
-                            tarball = false
-                            valid_entry = true
-
-                            if verbose
-                              $stderr.puts("Notice: Overwriting existing tarball at #{tar_file}")
-                              $stderr.puts("Notice: PRESS CTRL-C WITHIN 5 SECONDS TO CANCEL")
-                            end
-
-                            sleep(5)
-                          else
-                            puts("Invalid input: '#{resp}', please try again")
-                          end
-                        end
-                      end
-                    end
-
-                    if tarball
-                      do_docs     = false
-                      do_checkout = false
-                      do_bundle   = false
-                    end
-
-                    @dirty_repos     = nil
-                    @simp_output_iso = nil
-
-                    # Build environment sanity checks
-                    # --------------------
-                    if do_rm_staging && !do_unpack
-                      fail SIMPBuildException, "ERROR: Mixing `SIMP_BUILD_rm_staging_dir=yes` and `SIMP_BUILD_unpack=no` is silly."
-                    end
-
-                    if File.exists?(output_dir) && !File.directory?(output_dir)
-                      fail SIMPBuildException, "ERROR: ISO output dir exists but is not a directory:\n\n" +
-                                               "    '#{output_dir}'\n\n"
-                    end
-
-                    unless File.directory?(output_dir)
-                      FileUtils.mkdir_p(output_dir)
-                    end
+        desc <<-EOM
+        Automatically detect and build a SIMP ISO for a target SIMP release.
+
+        This task runs all other build tasks
+
+        Arguments:
+          * :iso_paths    => Path to source ISO(s) and/or directories  [Default: '.']
+                             NOTE: colon-delimited list
+                             If not set, will build all enabled distributions
+          * :release      => SIMP release to build (e.g., '6.X')
+                             The Full list can be found in '#{File.join(@build_dir, 'release_mappings.yaml')}'
+                             Default: #{[@simp_version.split('.').first, 'X'].join('.')}
+          * :output_dir   => path to write SIMP ISO. [Default: './SIMP_ISO']
+          * :do_checksum  => Use sha256sum checksum to compare each ISO.  [Default: 'false']
+          * :key_name     => Key name to sign packages [Default: 'dev']
+
+        ENV vars:
+          - SIMP_BUILD_isos           => Path to the base OS ISO images
+          - SIMP_BUILD_distro         => Distribution to build
+                                         See '#{File.join(@distro_build_dir, 'build_metadata.yaml')}'}
+          - SIMP_BUILD_prompt         => 'no' disables asking questions.
+                                         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 => '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
+          - 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_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_verbose        => 'yes' enables verbose reporting. [Default: 'no']
+          - SIMP_BUILD_packer_vars    => Write a packer vars.json to go with this ISO [Default: 'yes']
+          - SIMP_BUILD_signing_key    => The name of the GPG key to use to sign packages. [Default: 'dev']
+        EOM
+
+        task :auto, [:iso_paths,
+                     :release,
+                     :output_dir,
+                     :do_checksum,
+                     :key_name
+                    ] do |t, args|
+
+          Simp::Rake::Helpers.check_required_commands(BUILD_REQUIRED_COMMANDS)
+
+          args.with_defaults(
+            :iso_paths    => ENV['SIMP_BUILD_isos'] || Dir.pwd,
+            :distribution => 'ALL',
+            :release      => [@simp_version.split('.').first, 'X'].join('.'),
+            :output_dir   => '',
+            :do_checksum  => 'false',
+            :key_name     => ENV['SIMP_BUILD_signing_key'] || 'dev'
+          )
+
+          iso_paths        = File.expand_path(args[:iso_paths])
+          target_release   = args[:release]
+          do_checksum      = (args.do_checksum = ~ /^$/ ? 'false' : args.do_checksum)
+          key_name         = args[:key_name]
+          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'
+          method           = ENV.fetch('SIMP_BUILD_puppetfile','tracking')
+          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'
+          do_checkout      = ENV['SIMP_BUILD_checkout'] != 'no'
+          do_bundle        = ENV['SIMP_BUILD_bundle'] == 'yes' ? true : false
+          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)
+
+          iso_status = {}
+
+          distro = @build_distro
+          version = @build_version
+          arch = @build_arch
+
+          tarball          = false
+          repo_root_dir    = File.expand_path( @base_dir )
+
+          fail("Cannot Build: No directory '#{@distro_build_dir}' found") unless File.directory?(@distro_build_dir)
+
+          begin
+            # For subtask mangling
+            $simp6_build_dir = @distro_build_dir
+            $simp6_build_metadata = {
+              :distro  => distro,
+              :version => version,
+              :arch    => arch
+            }
 
-                    # Look up ISOs against known build assets
-                    # --------------------
-                    target_data = get_target_data(target_release, iso_paths, yaml_file, do_checksum, verbose )
+            output_dir = args[:output_dir].sub(/^$/, File.expand_path( 'SIMP_ISO', @distro_build_dir ))
 
-                    simp6_mock_cfg = File.join($simp6_build_dir, 'mock.cfg')
+            staging_dir = ENV.fetch('SIMP_BUILD_staging_dir', File.expand_path( 'SIMP_ISO_STAGING', @distro_build_dir ))
 
-                    if File.exist?(simp6_mock_cfg)
-                      target_data['mock'] = simp6_mock_cfg
+            overlay_dir = File.join(@distro_build_dir, 'DVD_Overlay')
 
-                      if verbose
-                        $stderr.puts("Notice: Using mock config at #{simp6_mock_cfg}")
-                      end
-                    end
+            yaml_file = File.expand_path('release_mappings.yaml', @distro_build_dir)
 
-                    # check out subrepos
-                    # --------------------
-                    if do_checkout && !tarball
-                      puts
-                      puts '='*80
-                      puts "## Checking out subrepositories"
-                      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
-                        puts
-                        puts '-'*80
-                        puts "#### Checking out subrepositories using method '#{method}'"
-                        puts '-'*80
-                        Rake::Task['deps:checkout'].reenable
-                        Rake::Task['deps:checkout'].invoke(method)
-                      end
-
-                      if do_bundle
-                        puts
-                        puts '-'*80
-                        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
-                        puts '-'*80
-                        puts "#### SKIPPED: bundler in all repos"
-                        puts '     (Force with `SIMP_BUILD_bundle=yes`)'
-                        puts '-'*80
-                      end
-                    else
-                      puts
-                      puts '='*80
-                      puts "#### skipping sub repository checkout (because `SIMP_BUILD_checkout=no`)"
-                      puts
-                    end
+            tar_file = File.join(overlay_dir, "SIMP-#{@simp_version}-#{distro}-#{version}-#{arch}.tar.gz")
 
-                    # build tarball
-                    # --------------------
-                    if tarball
-                      puts
-                      puts '-'*80
-                      puts "#### Using pre-existing tarball:"
-                      puts "           '#{tarball}'"
-                      puts
-                      puts '-'*80
-
-                    else
-                      puts
-                      puts '='*80
-                      puts "#### Running tar:build"
-                      puts '='*80
-
-                      # 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
-                    end
+            $simp6_clean_dirs << output_dir
+            $simp6_clean_dirs << staging_dir
+            $simp6_clean_dirs << overlay_dir
 
-                    # yum sync
-                    # --------------------
-                    puts
-                    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
-                    # $ rake build:yum:clean_cache
-
-                    # Optionally, you may drop in custom packages you wish to have available during an install into build/yum_data/SIMP<simp_version>_<CentOS or RHEL><os_version>_<architecture>/packages
-                    # TODO: ENV var for optional packages
-
-                    prepare_staging_dir( staging_dir, do_rm_staging, repo_root_dir, verbose )
-                    Dir.chdir staging_dir
-
-                    #
-                    # --------------------
-                    if do_unpack
-                      puts
-                      puts '='*80
-                      puts "#### unpack ISOs into staging directory"
-                      puts "     staging area: '#{staging_dir}'"
-                      puts
-                      puts "     (skip with `SIMP_BUILD_unpack=no`)"
-                      puts '='*80
-                      puts
-
-                      Dir.glob( File.join(staging_dir, "#{target_data['flavor']}*/") ).each do |f|
-                        FileUtils.rm_f( f , :verbose => verbose )
-                      end
-
-                      target_data['isos'].each do |iso|
-                        puts "---- rake unpack[#{iso},#{do_merge},#{Dir.pwd},isoinfo,#{target_data['os_version']}]"
-                        Rake::Task['unpack'].reenable
-                        Rake::Task['unpack'].invoke(iso,do_merge,Dir.pwd,'isoinfo',target_data['os_version'])
-                      end
-                    else
-                      puts
-                      puts '='*80
-                      puts "#### skipping ISOs unpack (because `SIMP_BUILD_unpack=no`)"
-                      puts
-                    end
+            if File.exist?(tar_file)
+              if prompt
+                valid_entry = false
+                while !valid_entry do
+                  puts("Existing tar file found at #{tar_file}")
+                  print("Do you want to overwrite it? (y|N): ")
 
-                    Dir.chdir staging_dir
-
-                    puts
-                    puts '='*80
-                    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(staging_dir, 'SIMP-*.iso') ]
-                    if _isos.size == 0
-                      fail "ERROR: No SIMP ISOs found in '#{staging_dir}'"
-                    elsif _isos.size > 1
-                      warn "WARNING: More than one SIMP ISO found in '#{staging_dir}'"
-                      _isos.each{ |i| warn i }
-                    end
+                  resp = $stdin.gets.chomp
 
-                    # NOTE: It is possible at this point (given the right
-                    # `SIMP_BUILD_xxx=no` flags) that iso:build will not have set
-                    # `@simp_output_iso`.  In that case, look at the ISOs in the staging
-                    # dir (there should only be one) and take our best guess.
-                    if @simp_output_iso.nil?
-                       @simp_output_iso = File.basename(_isos.first)
-                    end
+                  if resp.empty? || (resp =~ /^(n|N)/)
+                    tarball = tar_file
+                    valid_entry = true
+                  elsif resp =~ /^(y|Y)/
+                    tarball = false
+                    valid_entry = true
 
-                    output_file = full_iso_name ? full_iso_name : @simp_output_iso
-                    if iso_name_tag
-                      output_file = output_file.sub(/\.iso$/i, "__#{iso_name_tag}.iso")
+                    if verbose
+                      $stderr.puts("Notice: Overwriting existing tarball at #{tar_file}")
+                      $stderr.puts("Notice: PRESS CTRL-C WITHIN 5 SECONDS TO CANCEL")
                     end
 
-                    puts
-                    puts '='*80
-                    puts "#### Moving '#{@simp_output_iso}' into:"
-                    puts "       '#{output_dir}/#{output_file}'"
-                    puts '='*80
-                    puts
-
-                    iso = File.join(output_dir,output_file)
-                    FileUtils.mkdir_p File.dirname(iso), :verbose => verbose
-                    FileUtils.mv(@simp_output_iso, iso, :verbose => verbose)
-
-                    # write vars.json for packer build
-                    # --------------------------------------
-                    vars_file = iso.sub(/.iso$/, '.json')
-                    puts
-                    puts '='*80
-                    puts "#### Checksumming #{iso}..."
-                    puts '='*80
-                    puts
-
-                    sum = `sha256sum "#{iso}"`.split(/ +/).first
-
-                    puts
-                    puts '='*80
-                    puts "#### Writing packer data to:"
-                    puts "       '#{vars_file}'"
-                    puts '='*80
-                    puts
-                    box_distro_release = "SIMP-#{target_release}-#{File.basename(target_data['isos'].first).sub(/\.iso$/,'').sub(/-x86_64/,'')}"
-                    packer_vars = {
-                      'box_simp_release'   => target_release,
-                      'box_distro_release' => box_distro_release,
-                      'iso_url'            => iso,
-                      'iso_checksum'       => sum,
-                      'iso_checksum_type'  => 'sha256',
-                      'new_password'       => 'suP3rP@ssw0r!suP3rP@ssw0r!suP3rP@ssw0r!',
-                      'output_directory'   => './OUTPUT',
-                    }
-                    File.open(vars_file, 'w'){|f| f.puts packer_vars.to_json }
-
-                    puts
-                    puts '='*80
-                    puts "#### FINIS!"
-                    puts '='*80
-                    puts
-
-                    iso_status[[distro, version, arch].join(' ')] = {
-                      'success' => true
-                    }
-
-                  rescue => e
-                    iso_status[[distro, version, arch].join(' ')] = {
-                    'success'   => false,
-                    'error'     => e.to_s,
-                    'backtrace' => e.backtrace
-                    }
+                    sleep(5)
+                  else
+                    puts("Invalid input: '#{resp}', please try again")
                   end
                 end
               end
             end
 
-            successful_isos = []
-            failed_isos = []
-
-            iso_status.keys.each do |iso|
-              if iso_status[iso]['success']
-                successful_isos << iso
-              else
-                failed_isos << iso
-              end
-            end
-
-            unless successful_isos.empty?
-              puts '='*80
-              puts '='*80
-              puts("Successful ISOs:")
-              puts(%(  * #{successful_isos.join("\n  * ")}))
-            end
-
-            unless failed_isos.empty?
-              puts '='*80
-              puts("Failed ISOs:")
-              failed_isos.each do |iso|
-                puts(%(  * #{iso}))
-                puts(%(    * Error: #{iso_status[iso]['error']}))
-
-                if verbose
-                  puts(%(    * Backtrace: #{iso_status[iso]['backtrace'].join("\n")}))
-                else
-                  puts(%(    * Context: #{iso_status[iso]['backtrace'].first}))
-                end
-              end
-            end
-          end
-        else
-          # Legacy
-          desc <<-EOM
-          Automatically detect and build a SIMP ISO for a target SIMP release.
-
-          This task runs all other build tasks
-
-          Arguments:
-            * :release     => SIMP release to build (e.g., '5.1.X')
-            - :iso_paths   => path to source ISO(s) and/or directories  [Default: '.']
-                              NOTE: colon-delimited list
-            - :tarball     => SIMP build tarball file; if given, skips tar build.  [Default: 'false']
-            - :output_dir  => path to write SIMP ISO.   [Default: './SIMP_ISO']
-            - :do_checksum => Use sha256sum checksum to compare each ISO.  [Default: 'false']
-            - :key_name    => Key name to sign packages [Default: 'dev']
-
-          ENV vars:
-            - 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_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
-            - 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_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_verbose        => 'yes' enables verbose reporting. [Default: 'no']
-            - SIMP_BUILD_packer_vars    => Write a packer vars.json to go with this ISO [Default: 'yes']
-
-          Notes:
-            - To skip `tar:build` (including `pkg:build`), use the `tarball` argument
-          EOM
-
-          task :auto,  [:release,
-                        :iso_paths,
-                        :tarball,
-                        :output_dir,
-                        :do_checksum,
-                        :key_name,
-                        :packer_vars,
-                       ] do |t, args|
-            # set up data
-            # --------------------------------------------------------------------------
-
-            args.with_defaults(
-              :release     => [@simp_version.split('.').first, 'X'].join('.'),
-              :iso_paths   => Dir.pwd,
-              :tarball     => 'false',
-              :output_dir  => '',
-              :do_checksum => 'false',
-              :key_name    => 'dev',
-            )
-
-            # locals
-            target_release   = args[:release]
-            iso_paths        = File.expand_path(args[:iso_paths])
-            tarball          = (args.tarball =~ /^(false|)$/ ? false : args.tarball)
-            output_dir       = args[:output_dir].sub(/^$/, File.expand_path( 'SIMP_ISO', Dir.pwd ))
-            do_checksum      = (args.do_checksum =~ /^$/ ? 'false' : args.do_checksum)
-            key_name         = args[:key_name]
-            staging_dir      = ENV.fetch('SIMP_BUILD_staging_dir',
-                                          File.expand_path( 'SIMP_ISO_STAGING', Dir.pwd ))
-            do_packer_vars   = ENV.fetch('SIMP_BUILD_packer_vars', 'yes') == 'yes'
-            verbose          = ENV.fetch('SIMP_BUILD_verbose', 'no') == 'yes'
-
-            yaml_file        = File.expand_path('build/release_mappings.yaml', @base_dir)
-            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_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'
-            do_checkout      = ENV['SIMP_BUILD_checkout'] != 'no'
-            do_bundle        = ENV['SIMP_BUILD_bundle'] == 'yes' ? true : false
-            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)
-
-            # Skip a bunch of unnecessary stuff if we're passed a tarball
             if tarball
-              do_docs = false
+              do_docs     = false
               do_checkout = false
-              do_bundle = false
+              do_bundle   = false
             end
 
             @dirty_repos     = nil
             @simp_output_iso = nil
 
-
             # Build environment sanity checks
             # --------------------
             if do_rm_staging && !do_unpack
@@ -553,16 +237,14 @@ 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 )
 
-            # Quick map to match the filenames in the build structures
-            target_data['flavor'] = 'RHEL' if target_data['flavor'] == 'RedHat'
-
-            # IDEA: check for prequisite build tools
-
             # check out subrepos
             # --------------------
             if do_checkout && !tarball
@@ -572,8 +254,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
@@ -581,6 +266,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
 
@@ -590,6 +276,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
@@ -620,10 +307,12 @@ module Simp::Rake::Build
               puts '='*80
               puts "#### Running tar:build"
               puts '='*80
+
               # Horrible state passing magic vars
-              $tarball_tgt = File.join(@base_dir, 'build', 'DVD_Overlay', "SIMP-#{@simp_version}-#{target_data['flavor']}-#{target_data['os_version']}.tar.gz")
+              $tarball_tgt = File.join(@distro_build_dir, 'DVD_Overlay', "SIMP-#{@simp_version}-#{distro}-#{version}-#{arch}.tar.gz")
 
-              Rake::Task['tar:build'].invoke(target_data['mock'],key_name,do_docs)
+              Rake::Task['tar:build'].reenable
+              Rake::Task['tar:build'].invoke(key_name,do_docs)
 
               tarball = $tarball_tgt
             end
@@ -634,6 +323,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
@@ -673,24 +363,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
 
@@ -752,6 +442,52 @@ module Simp::Rake::Build
             puts "#### FINIS!"
             puts '='*80
             puts
+
+            iso_status[[distro, version, arch].join(' ')] = {
+              'success' => true
+            }
+
+          rescue => e
+            iso_status[[distro, version, arch].join(' ')] = {
+            'success'   => false,
+            'error'     => e.to_s,
+            'backtrace' => e.backtrace
+            }
+          end
+
+          successful_isos = []
+          failed_isos = []
+
+          iso_status.keys.each do |iso|
+            if iso_status[iso]['success']
+              successful_isos << iso
+            else
+              failed_isos << iso
+            end
+          end
+
+          unless successful_isos.empty?
+            puts '='*80
+            puts '='*80
+            puts("Successful ISOs:")
+            puts(%(  * #{successful_isos.join("\n  * ")}))
+          end
+
+          unless failed_isos.empty?
+            puts '='*80
+            puts("Failed ISOs:")
+            failed_isos.each do |iso|
+              puts(%(  * #{iso}))
+              puts(%(    * Error: #{iso_status[iso]['error']}))
+
+              if verbose
+                puts(%(    * Backtrace: #{iso_status[iso]['backtrace'].join("\n")}))
+              else
+                puts(%(    * Context: #{iso_status[iso]['backtrace'].first}))
+              end
+            end
+
+            exit(1)
           end
         end
       end
@@ -820,4 +556,3 @@ module Simp::Rake::Build
     end
   end
 end
-