simp-rake-helpers 2.4.7 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3c3b2c1a47ba2ce959ba6e31716fd3dcc288dd3
-  data.tar.gz: 8222f40ce96eab1ec4e4477f5d140de3cdb4cead
+  metadata.gz: 6ac44b8dfa44bfa0bde4f0752f8698c347ad93bd
+  data.tar.gz: e425013cffa3024ad3538d3679119c2f4f4855f7
 SHA512:
-  metadata.gz: c5f7b59e386f9cead4d67a12a11d328079de00a2482ef0209dd83a1c1224327fa7a0e5c499512d56292e99f6e1fb5503e2a2fbdd5509cd85b875c80ca99b280b
-  data.tar.gz: a031834da602e106f958bd0724ea441ab8d29a87e8ba1b2fc7d50448e1226016b753136b24a34bd94a1fec7824f3fd7efb7ff804b66f9e953ba0ec745bd6431b
+  metadata.gz: 8927124043e3a9494ec35b679c2b8a2dd1a594b0bdc26c8c9f262684e26ceeeb04351eda37256dcf88bf5940f7ac286c996ec7a6da5672b3b236e7b757644839
+  data.tar.gz: f09399ce4a60cd02aa848d87668d417c64fd22d3400f60dbaa1f6b6f3cd91ab220a06616173fe2ab45909e51ec4eb0229524260578f1bef062d0ede804d74dd6

data/Gemfile

@@ -9,6 +9,8 @@ gem_sources.each { |gem_source| source gem_source }
 
 gemspec
 
+gem 'ruby-progressbar'
+gem 'simp-build-helpers'
 gem 'simp-beaker-helpers'
 
 if puppetversion

data/lib/simp/rake.rb

@@ -11,6 +11,28 @@ module Simp::Rake
   require 'simp/rpm'
   require 'simp/rake/pkg'
 
+  attr_reader(:puppetfile)
+  attr_reader(:module_paths)
+
+  def load_puppetfile(method='tracking')
+    unless @puppetfile
+
+      @puppetfile = R10KHelper.new("Puppetfile.#{method}")
+      @module_paths = []
+
+      @puppetfile.each_module do |mod|
+        path = mod[:path]
+        if Dir.exists?(path)
+          @module_paths.push(path)
+        end
+      end
+
+      if @module_paths.empty?
+        fail("Error: Could not find any module paths in 'Puppetfile.#{method}'")
+      end
+    end
+  end
+
   # Force the encoding to something that Ruby >= 1.9 is happy with
   def encode_line(line)
     if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('1.9')

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

@@ -27,16 +27,16 @@ module Simp::Rake::Build
 
         Arguments:
           * :release     => SIMP release to build (e.g., '5.1.X')
-          - :iso_paths   => path to source ISO(s) (colon-delimited list of files/directories) [Default: '.']
+          - :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']
-          - :packer_vars => Write a packer vars.json to go with this ISO [Default: 'true']
-          - :verbose     => Enable verbose reporting. [Default: 'false']
 
         ENV vars:
-          - SIMP_BUILD_staging_dir    => Path to stage big build assets [Default: './SIMP_ISO_STAGING']
+          - 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
@@ -47,6 +47,8 @@ module Simp::Rake::Build
           - 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
@@ -59,7 +61,7 @@ module Simp::Rake::Build
                       :do_checksum,
                       :key_name,
                       :packer_vars,
-                      :verbose] do |t, args|
+                     ] do |t, args|
           # set up data
           # --------------------------------------------------------------------------
 
@@ -69,8 +71,6 @@ module Simp::Rake::Build
             :output_dir  => '',
             :do_checksum => 'false',
             :key_name    => 'dev',
-            :packer_vars => 'true',
-            :verbose     => 'false',
           )
 
           # locals
@@ -82,8 +82,8 @@ module Simp::Rake::Build
           key_name         = args[:key_name]
           staging_dir      = ENV.fetch('SIMP_BUILD_staging_dir',
                                         File.expand_path( 'SIMP_ISO_STAGING', Dir.pwd ))
-          do_packer_vars   = (args.packer_vars == 'false' ? false : true)
-          verbose          = (args.verbose == 'false' ? false : true)
+          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
@@ -238,6 +238,8 @@ module Simp::Rake::Build
           puts '='*80
           puts
 
+          ENV['SIMP_ISO_verbose'] = 'yes' if verbose
+          ENV['SIMP_PKG_verbose'] = 'yes' if verbose
           Rake::Task['iso:build'].invoke(tarball,staging_dir,do_prune)
 
 

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

@@ -40,18 +40,11 @@ module Simp::Rake::Build
 
           verbose = args.verbose == 'false' ? false : true
 
-          # Grab all currently tracked submodules.
-          r10k = R10KHelper.new("Puppetfile.#{args[:method]}")
-          mod_list =  []
-          r10k.each_module do |mod|
-            path = mod[:path]
-              if Dir.exists?(path)
-                  mod_list.push(path)
-              end
-          end
+          load_puppetfile(args.method)
 
+          # Grab all currently tracked submodules.
           failed_mods = Parallel.map(
-            mod_list,
+            module_paths,
             :in_processes => 1,
             :progress => t.name
           ) do |mod|
@@ -64,8 +57,11 @@ module Simp::Rake::Build
                 puts "Cleaning Gemfile.lock from #{mod}" if verbose
                 rm('Gemfile.lock')
               end
-              # Any ruby code that opens a subshell will automatically use the current Bundler environment.
-              # Clean env will give bundler the environment present before Bundler is activated.
+              # Any ruby code that opens a subshell will automatically use the
+              # current Bundler environment.
+              #
+              # Clean env will give bundler the environment present before
+              # Bundler is activated.
               ::Bundler.with_clean_env do
                 out = %x(bundle #{args.action} 2>&1)
                 status = $?.success?

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

@@ -27,6 +27,8 @@ 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
@@ -57,7 +59,7 @@ module Simp::Rake::Build
                 end
 
                 unless exclude_pkgs.include?(pkg)
-                  rm(path)
+                  rm(path, :verbose => verbose)
                   prune_count += 1
                 end
               end
@@ -92,6 +94,9 @@ module Simp::Rake::Build
            directories. Default is the current directory.
        * :prune - Flag for whether unwanted packages should be pruned prior to
            building the ISO. Default is true.
+
+       ENV vars:
+         - Set `SIMP_ISO_verbose=yes` to report file operations as they happen.
            EOM
         task :build,[:tarball,:unpacked_dvds,:prune] do |t,args|
           args.with_defaults(:unpacked_dvds => "#{@run_dir}", :prune => 'true')
@@ -105,6 +110,8 @@ 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'))
@@ -152,7 +159,7 @@ module Simp::Rake::Build
 
               @simp_dvd_dirs.each do |clean_dir|
                 if File.directory?("#{dir}/#{clean_dir}")
-                  rm_rf("#{dir}/#{clean_dir}")
+                  rm_rf("#{dir}/#{clean_dir}", :verbose => verbose)
                 elsif File.file?("#{dir}/#{clean_dir}")
                   fail("Error: #{dir}/#{clean_dir} is a file, expecting directory!")
                 end
@@ -223,7 +230,7 @@ module Simp::Rake::Build
                   target_file = File.join(rpm_arch,File.basename(rpm))
                   rm_f(target_file) if File.exist?(target_file)
 
-                  cp(rpm,rpm_arch)
+                  cp(rpm,rpm_arch, :verbose => verbose)
                 end
 
                 fail("Could not find architecture '#{arch}' in the SIMP distribution") unless File.directory?(arch)
@@ -239,7 +246,7 @@ module Simp::Rake::Build
                         next if Pathname.new(source_rpm).realpath == Pathname.new(link_target).realpath
                       end
 
-                      ln_sf(source_rpm,link_target)
+                      ln_sf(source_rpm,link_target, :verbose => verbose)
                     end
                   end
 

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

@@ -7,6 +7,7 @@ module Simp::Rake; end
 module Simp::Rake::Build
 
   class Pkg < ::Rake::TaskLib
+    include Simp::Rake
     include Simp::Rake::Build::Constants
 
     def initialize( base_dir )
@@ -31,9 +32,11 @@ module Simp::Rake::Build
         ##############################################################################
 
         # Have to get things set up inside the proper namespace
-        task :prep do
+        task :prep,[:method] do |t,args|
+          args.with_defaults(:method => 'tracking')
+
           @build_dirs = {
-            :modules => get_module_dirs,
+            :modules => get_module_dirs(args[:method]),
             :aux => [
               "#{@build_dir}/GPGKEYS",
               "#{@src_dir}/puppet/bootstrap",
@@ -78,7 +81,8 @@ module Simp::Rake::Build
             ) do |dir|
               Dir.chdir(dir) do
                 begin
-                  sh %{rake clean[#{args.chroot}]}
+                  rake_flags = Rake.application.options.trace ? '--trace' : ''
+                  sh %{rake clean[#{args.chroot}] #{rake_flags}}
                 rescue Exception => e
                   raise Parallel::Kill
                 end
@@ -100,7 +104,8 @@ module Simp::Rake::Build
               :progress => t.name
             ) do |dir|
               Dir.chdir(dir) do
-                sh %{rake clobber[#{args.chroot}]}
+                rake_flags = Rake.application.options.trace ? '--trace' : ''
+                sh %{rake clobber[#{args.chroot}] #{rake_flags}}
               end
             end
           end
@@ -111,9 +116,13 @@ module Simp::Rake::Build
 
           If passed anything but 'dev', will fail if the directory is not present in
           the 'build/build_keys' directory.
+
+          ENV vars:
+            - Set `SIMP_PKG_verbose=yes` to report file operations as they happen.
         EOM
         task :key_prep,[:key] do |t,args|
           require 'securerandom'
+          _verbose = ENV.fetch('SIMP_PKG_verbose','no') == 'yes'
 
           args.with_defaults(:key => 'dev')
 
@@ -140,7 +149,7 @@ module Simp::Rake::Build
                 puts "Generating new GPG key"
 
                 Dir.glob('*').each do |todel|
-                  rm_rf(todel)
+                  rm_rf(todel, :verbose => _verbose)
                 end
 
                 expire_date = (DateTime.now + 14)
@@ -239,7 +248,7 @@ module Simp::Rake::Build
               dkfh = File.open("#{target_dir}/.dropped_keys",'w')
 
               rpm_build_keys.each do |gpgkey|
-                cp(gpgkey,target_dir)
+                cp(gpgkey,target_dir, :verbose => _verbose)
                 dkfh.puts(gpgkey)
               end
 
@@ -256,9 +265,13 @@ module Simp::Rake::Build
             * :chroot - The Mock chroot configuration to use. See the '--root' option in mock(1).
             * :docs - Build the docs. Set this to false if you wish to skip building the docs.
             * :key - The GPG key to sign the RPMs with. Defaults to 'dev'.
+
+            ENV vars:
+              - Set `SIMP_PKG_verbose=yes` to report file operations as they happen.
         EOM
         task :build,[:chroot,:docs,:key,:snapshot_release] => [:prep,:mock_prep,:key_prep] do |t,args|
           validate_in_mock_group?
+          _verbose = ENV.fetch('SIMP_PKG_verbose','no') == 'yes'
 
           args.with_defaults(:key => 'dev')
           args.with_defaults(:docs => true)
@@ -278,7 +291,7 @@ module Simp::Rake::Build
           Rake::Task['pkg:simp'].invoke(args.chroot,args.snapshot_release)
 
           # Prepare for the build!
-          rm_rf(output_dir)
+          rm_rf(output_dir, :verbose => _verbose)
 
           # Copy all the resulting files into the target output directory
           mkdir_p(output_dir)
@@ -299,19 +312,19 @@ module Simp::Rake::Build
 
               srpms.each do |srpm|
                 out_dir = "#{output_dir}/SRPMS"
-                mkdir_p(out_dir) unless File.directory?(out_dir)
+                mkdir_p(out_dir, :verbose => _verbose) unless File.directory?(out_dir)
 
                 if not uptodate?("#{out_dir}/#{File.basename(srpm)}",[srpm])
-                  cp(srpm,out_dir)
+                  cp(srpm,out_dir, :verbose => _verbose)
                 end
               end
 
               rpms.each do |rpm|
                 out_dir = "#{output_dir}/RPMS/#{rpm.split('.')[-2]}"
-                mkdir_p(out_dir) unless File.directory?(out_dir)
+                mkdir_p(out_dir, :verbose => _verbose) unless File.directory?(out_dir)
 
                 if not uptodate?("#{out_dir}/#{File.basename(rpm)}",[rpm])
-                  cp(rpm,out_dir)
+                  cp(rpm,out_dir, :verbose => _verbose)
                 end
               end
             end
@@ -325,14 +338,24 @@ module Simp::Rake::Build
 
             This also builds the simp-mit RPM due to its location.
             Building this environment requires a working Mock setup (http://fedoraproject.org/wiki/Projects/Mock)
+
             * :chroot - The Mock chroot configuration to use. See the '--root' option in mock(1).
+            * :method - The Puppetfile from which the repository information should be read. Defaults to 'tracking'
+
+            ENV vars:
+              - Set `SIMP_PKG_verbose=yes` to report file operations as they happen.
         EOM
-        task :modules,[:chroot] => [:prep,:mock_prep] do |t,args|
+        task :modules,[:chroot,:method] => [:prep,:mock_prep] do |t,args|
           build(args.chroot,@build_dirs[:modules],t)
         end
 
         desc <<-EOM
           Build simp config rubygem RPM.
+
+          * :method - The Puppetfile from which the repository information should be read. Defaults to 'tracking'
+
+          ENV vars:
+            - Set `SIMP_PKG_verbose=yes` to report file operations as they happen.
         EOM
         task :simp_cli,[:chroot] => [:prep,:mock_prep] do |t,args|
           build(args.chroot,@build_dirs[:simp_cli],t)
@@ -342,6 +365,9 @@ module Simp::Rake::Build
           Build the SIMP non-module RPMs.
 
             Building this environment requires a working Mock setup (http://fedoraproject.org/wiki/Projects/Mock)
+
+            ENV vars:
+              - Set `SIMP_PKG_verbose=yes` to report file operations as they happen.
             * :chroot - The Mock chroot configuration to use. See the '--root' option in mock(1).
         EOM
         task :aux,[:chroot] => [:prep,:mock_prep]  do |t,args|
@@ -353,6 +379,9 @@ module Simp::Rake::Build
 
             Building this environment requires a working Mock setup (http://fedoraproject.org/wiki/Projects/Mock)
             * :chroot - The Mock chroot configuration to use. See the '--root' option in mock(1).
+
+            ENV vars:
+              - Set `SIMP_PKG_verbose=yes` to report file operations as they happen.
         EOM
         task :doc,[:chroot] => [:prep,:mock_prep] do |t,args|
           build(args.chroot,@build_dirs[:doc],t)
@@ -364,6 +393,9 @@ module Simp::Rake::Build
             Building this environment requires a working Mock setup (http://fedoraproject.org/wiki/Projects/Mock)
             * :chroot - The Mock chroot configuration to use. See the '--root' option in mock(1).
             * :snapshot_release - Will add a define to the Mock to set snapshot_release to current date and time.
+
+            ENV vars:
+              - Set `SIMP_PKG_verbose=yes` to report file operations as they happen.
         EOM
         task :simp,[:chroot,:snapshot_release] => [:prep,:mock_prep] do |t,args|
           build(args.chroot,@build_dirs[:simp],t,false,args.snapshot_release)
@@ -468,6 +500,9 @@ module Simp::Rake::Build
               * :aux_dir     - Auxillary repo glob to use when assessing. Default #{@build_dir}/Ext_*.
                               Defaults to ''(empty) if :target_dir is not the system default.
 
+            ENV vars:
+              - Set `SIMP_PKG_verbose=yes` to report file operations as they happen.
+
         EOM
         task :repoclosure,[:target_dir,:aux_dir] => [:prep] do |t,args|
           default_target = @pkg_dirs[:simp]
@@ -478,6 +513,8 @@ module Simp::Rake::Build
             args.with_defaults(:aux_dir => '')
           end
 
+          _verbose = ENV.fetch('SIMP_PKG_verbose','no') == 'yes'
+
           yum_conf_template = <<-EOF
 [main]
 keepcache=0
@@ -514,7 +551,7 @@ protect=1
               Find.find(base_dir) do |path|
                 if (path =~ /.*\.rpm$/) and (path !~ /.*.src\.rpm$/)
                   sym_path = "#{temp_pkg_dir}/repos/base/#{File.basename(path)}"
-                  ln_s(path,sym_path) unless File.exists?(sym_path)
+                  ln_s(path,sym_path, :verbose => _verbose) unless File.exists?(sym_path)
                 end
               end
             end
@@ -523,7 +560,7 @@ protect=1
               Find.find(aux_dir) do |path|
                 if (path =~ /.*\.rpm$/) and (path !~ /.*.src\.rpm$/)
                   sym_path = "#{temp_pkg_dir}/repos/lookaside/#{File.basename(path)}"
-                  ln_s(path,sym_path) unless File.exists?(sym_path)
+                  ln_s(path,sym_path, :verbose => _verbose) unless File.exists?(sym_path)
                 end
               end
             end
@@ -583,12 +620,15 @@ protect=1
         # status bar.
         def build(chroot,dirs,task,add_to_autoreq=true,snapshot_release=false)
           validate_in_mock_group?
+          _verbose = ENV.fetch('SIMP_PKG_verbose','no') == 'yes'
 
           mock_pre_check(chroot)
 
           # Default package metadata for reference
           default_metadata = YAML.load(File.read("#{@src_dir}/build/package_metadata_defaults.yaml"))
 
+          failures = {}
+
           metadata = Parallel.map(
             Array(dirs),
             :in_processes => get_cpu_limit,
@@ -596,26 +636,66 @@ protect=1
           ) do |dir|
             result = []
 
-            Dir.chdir(dir) do
-              if File.exist?('Rakefile')
-                unique_build = (get_cpu_limit != 1)
-                %x{rake pkg:rpm[#{chroot},unique_build,#{snapshot_release}]}
-
-                # Glob all generated rpms, and add their metadata to a result array.
-                pkginfo = Hash.new
-                Dir.glob('dist/*.rpm') do |rpm|
-                  if not rpm =~ /.*.src.rpm/ then
-                    # get_info from each generated rpm, not the spec file, so macros in the
-                    # metadata have already been resolved in the mock chroot.
-                    result << Simp::RPM.get_info(rpm)
+            begin
+              build_attempt = 0
+              try_build = true
+              while(try_build) do
+                begin
+                  Dir.chdir(dir) do
+                    if File.exist?('Rakefile')
+                      unique_build = (get_cpu_limit != 1)
+                      rake_flags = Rake.application.options.trace ? '--trace' : ''
+                      output = %x{rake pkg:rpm[#{chroot},unique_build,#{snapshot_release}] #{rake_flags} 2>&1}
+                      raise(output) unless $?.success?
+
+                      # Glob all generated rpms, and add their metadata to a result array.
+                      pkginfo = Hash.new
+                      Dir.glob('dist/*.rpm') do |rpm|
+                        if not rpm =~ /.*.src.rpm/ then
+                          # get_info from each generated rpm, not the spec file, so macros in the
+                          # metadata have already been resolved in the mock chroot.
+                          result << Simp::RPM.get_info(rpm)
+                        end
+                      end
+                    else
+                      puts "Warning: Could not find Rakefile in '#{dir}'"
+                    end
+                  end
+                rescue Exception => e
+                  if build_attempt == 0
+                    # Run 'bundle' and try again
+                    ::Bundler.with_clean_env do
+                      out = %x(bundle install 2>&1)
+                      status = $?.success?
+                      puts out if _verbose
+                    end
+                  else
+                    build_attempt += 1
+                    try_build = false
+                    failures[dir] = e.to_s
+                    if _verbose
+                      stderr.puts(e.to_s)
+                    else
+                      stderr.puts("Error found in: #{File.basename(dir)}")
+                    end
                   end
                 end
-              else
-                puts "Warning: Could not find Rakefile in '#{dir}'"
+
+                try_build = false
               end
-            end
 
-            result
+              result
+            ensure
+              unless failures.empty?
+                errmsg = ['Error: Failures found during module build']
+                failures.keys.each do |dir|
+                  errmsg << ('* ' + dir)
+                  errmsg << (failures[dir].lines.map{|ln| ln = "    #{ln}}"})
+                end
+
+                raise errmsg
+              end
+            end
           end
 
           metadata.each do |mod|
@@ -657,19 +737,10 @@ protect=1
           end
         end
 
-        # Return a list of all puppet module directories with Rakefiles
-        def get_module_dirs
-          moddir = "#{@src_dir}/puppet/modules"
-
-          toret = []
-
-          Dir.glob("#{moddir}/*").map { |x| x = File.basename(x).chomp }.sort.each do |mod|
-            if File.exist?("#{moddir}/#{mod}/Rakefile")
-                toret << "#{moddir}/#{mod}"
-            end
-          end
-
-          toret
+        # Return an Array of all puppet module directories
+        def get_module_dirs(method='tracking')
+          load_puppetfile(method)
+          module_paths.select{|x| File.basename(File.dirname(x)) == 'modules'}
         end
 
         # Get a list of all of the mock configs available on the system.

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

@@ -32,6 +32,42 @@ module Simp::Rake::Build
         # Main tasks
         ##############################################################################
 
+        task :validate do |t,args|
+          rpm_dir = File.join(@base_dir,'build','SIMP','RPMS')
+          fail("Could not find output dir: '#{rpm_dir}'") unless File.directory?(rpm_dir)
+
+          required_rpms = {
+            'noarch' => [
+              'rubygem-simp-cli',
+              'simp',
+              'simp-bootstrap',
+              'simp-gpgkeys',
+              'simp-rsync',
+              'simp-utils'
+            ]
+          }
+
+          Dir.chdir(rpm_dir) do
+            failures = []
+            required_rpms.keys.each do |dir|
+              fail("Could not find directory '#{File.join(rpm_dir,dir)}'") unless File.directory?(dir)
+
+              Dir.chdir(dir) do
+                required_rpms[dir].each do |pkg|
+                  if Dir.glob("#{pkg}-[0-9]*.rpm").empty?
+                    failures << "  * #{pkg}"
+                  end
+                end
+              end
+            end
+
+            unless failures.empty?
+              msg = ['Error: Could not find the following packages:']
+              fail((msg + failures).join("\n"))
+            end
+          end
+        end
+
         desc <<-EOM
           Build the DVD tarball(s).
 
@@ -40,7 +76,7 @@ module Simp::Rake::Build
             * :docs - Whether or not to build the documentation
             * :snapshot_release - Append the timestamp to the SIMP tarball(s)
         EOM
-        task :build,[:chroot,:key,:docs,:snapshot_release] => ['pkg:build','pkg:checksig'] do |t,args|
+        task :build,[:chroot,:key,:docs,:snapshot_release] => ['pkg:build','pkg:checksig','tar:validate'] do |t,args|
           args.with_defaults(:docs => 'true')
 
           validate_in_mock_group?

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

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

data/spec/lib/simp/files/simp_build/src/build/simp.spec

@@ -0,0 +1,32 @@
+Name:           testpackage
+Version:        1
+Release:        0
+Summary:        dummy test package
+BuildArch:      noarch
+
+License:        Apache-2.0
+URL:            http://foo.bar
+
+%description
+A dummy package used to test Simp::RPM methods
+
+%prep
+exit 0
+
+%build
+exit 0
+
+
+%install
+exit 0
+
+%clean
+exit 0
+
+%files
+%doc
+
+
+%changelog
+* Wed Jun 10 2015 nobody
+- some comment

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

@@ -0,0 +1,17 @@
+require 'simp/rake/build/helpers'
+require 'spec_helper'
+
+describe Simp::Rake::Build::Helpers do
+  before :each do
+    dir        = File.expand_path( '../../files/simp_build', File.dirname( __FILE__ ) )
+    @obj = Simp::Rake::Build::Helpers.new( dir )
+  end
+
+  describe "#initialize" do
+    it "initialized (smoke test)" do
+      expect( @obj.class ).to eq Simp::Rake::Build::Helpers
+    end
+  end
+end
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 2.4.7
+  version: 2.5.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,368 +9,368 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '12.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '12.0'
 - !ruby/object:Gem::Dependency
   name: coderay
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: puppet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: puppet-lint
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: puppetlabs_spec_helper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: simp-rspec-puppet-facts
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: puppet-blacksmith
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
 - !ruby/object:Gem::Dependency
   name: simp-beaker-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: parallel_tests
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
 - !ruby/object:Gem::Dependency
   name: r10k
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
   name: pager
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: beaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: beaker-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.6
 - !ruby/object:Gem::Dependency
   name: gitlog-md
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
 - !ruby/object:Gem::Dependency
   name: pry-doc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 1.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: guard-shell
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 description: |2
@@ -380,9 +380,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -421,9 +421,11 @@ files:
 - spec/acceptance/nodesets/default.yml
 - spec/acceptance/pkg_rpm_spec.rb
 - spec/lib/simp/files/build/testpackage.spec
+- spec/lib/simp/files/simp_build/src/build/simp.spec
 - spec/lib/simp/files/testpackage-1-0.noarch.rpm
 - spec/lib/simp/files/testpackage-multi.spec
 - spec/lib/simp/files/testpackage.spec
+- spec/lib/simp/rake/build/helpers_spec.rb
 - spec/lib/simp/rake/helpers_spec.rb
 - spec/lib/simp/rake/pkg_spec.rb
 - spec/lib/simp/rake/pupmod/helpers_spec.rb
@@ -442,12 +444,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -457,4 +459,3 @@ signing_key:
 specification_version: 4
 summary: SIMP rake helpers
 test_files: []
-has_rdoc: