simp-rake-helpers 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efe677e7e859802df732b13dd3835d71b6c05dd0
-  data.tar.gz: 488113e4842dea057ae1d719625505674c6474bc
+  metadata.gz: 01573252cbc7924049d14097e74487ef074840b4
+  data.tar.gz: 12952176495abd2d8a263e1bdd77db70bafa23b9
 SHA512:
-  metadata.gz: 42c8e4e9b38aff156a4ff5aa493f03e4f5a1a1192fc10839dc5bc55b9469b526a278df8160fd3e9f1692c0a060923201d49346ad1bcb060ec6e26fde013ecb2b
-  data.tar.gz: 0ca86b3f3c265d513dde50e16ad09543a91b6a544aa219d0acc3162403050ff3cfad28c5ef4a5e62d961b7aacf063d3d015c9e17a50c7aabd42d6568d02efb8c
+  metadata.gz: 897dea358f2b4348d5282a9cd6a270e8e03ce84b13276785539a9902f889960b7b76a20af49537cf6e4c31b3e167f072c8def1bd2e7affa7e1e38424d6919099
+  data.tar.gz: 15bb0923cfa63e241a8f3cbe3b14fc8a2ef777f2b2bd34acfa6b3177cb44f06c0222c3ac59541fec605912bc98073460204407e2270a9665c96371c8001b45aa

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 3.0.2 / 2016-11-02
+* Added a lot more parallel capability
+* Added a 'pkg:single' task for building single RPMs from the top level
+* Added the ability to build puppet module RPM packages without requiring a fork
+
 ### 3.0.1 / 2016-10-28
 * Updated to provide backwards compatibility for SIMP 4 and 5
 

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

@@ -186,7 +186,7 @@ module Simp::Rake::Build
           else
             puts
             puts '='*80
-            puts "#### Running tar:build in all repos"
+            puts "#### Running tar:build"
             puts '='*80
             $simp_tarballs = {}
             Rake::Task['tar:build'].invoke(target_data['mock'],key_name,do_docs)

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

@@ -38,9 +38,9 @@ module Simp::Rake::Build
           args.with_defaults(:verbose => 'false')
           args.with_defaults(:method => 'tracking')
 
-          verbose = args.verbose == 'false' ? false : true
+          verbose = args[:verbose] == 'false' ? false : true
 
-          load_puppetfile(args.method)
+          load_puppetfile(args[:method])
 
           # Grab all currently tracked submodules.
           failed_mods = []
@@ -69,7 +69,7 @@ module Simp::Rake::Build
               # Clean env will give bundler the environment present before
               # Bundler is activated.
               ::Bundler.with_clean_env do
-                out = %x(bundle #{args.action} 2>&1)
+                out = %x(bundle #{args[:action]} 2>&1)
                 status = $?.success?
                 puts out if verbose
                 failed_mod_lock.synchronize do
@@ -80,7 +80,7 @@ module Simp::Rake::Build
           end
 
           failed_mods.compact!
-          fail(%(The following modules failed bundle #{args.action}:\n  * #{failed_mods.sort.join("\n  *")})) unless failed_mods.empty?
+          fail(%(The following modules failed bundle #{args[:action]}:\n  * #{failed_mods.sort.join("\n  *")})) unless failed_mods.empty?
         end
 
         namespace :yum do
@@ -114,19 +114,19 @@ module Simp::Rake::Build
           # Return the target directory
           # Expects one argument wich is the 'arguments' hash to one of the tasks.
           def get_target_dir(args)
-            fail("Error: You must specify 'os'") unless args.os
-            fail("Error: You must specify 'os_version'") unless args.os_version
-            fail("Error: You must specify both major and minor version for the OS") unless args.os_version =~ /^.+\..+$/
-            fail("Error: You must specify 'simp_version'") unless args.simp_version
-            fail("Error: You must specify 'arch'") unless args.arch
+            fail("Error: You must specify 'os'") unless args[:os]
+            fail("Error: You must specify 'os_version'") unless args[:os_version]
+            fail("Error: You must specify both major and minor version for the OS") unless args[:os_version] =~ /^.+\..+$/
+            fail("Error: You must specify 'simp_version'") unless args[:simp_version]
+            fail("Error: You must specify 'arch'") unless args[:arch]
 
             # Yes, this is a kluge but the amount of variable passing that would need
             # to be done to support this is silly.
-            @build_arch = args.arch
+            @build_arch = args[:arch]
 
             return File.join(
               @base_dir,
-              "SIMP#{args.simp_version}_#{args.os}#{args.os_version}_#{args.arch}"
+              "SIMP#{args[:simp_version]}_#{args[:os]}#{args[:os_version]}_#{args[:arch]}"
             )
           end
 
@@ -692,19 +692,19 @@ module Simp::Rake::Build
             args.with_defaults(:simp_version => @simp_version.split('-').first)
             args.with_defaults(:arch => @build_arch)
 
-            fail("Error: You must specify 'pkg'") unless args.pkg
+            fail("Error: You must specify 'pkg'") unless args[:pkg]
 
             pkgs = []
             # Handle the output of build:yum_diff
-            if File.readable?(args.pkg)
-              File.read(args.pkg).each_line do |line|
+            if File.readable?(args[:pkg])
+              File.read(args[:pkg]).each_line do |line|
                 if line =~ /\s+~\s+(.*)/
                   pkgs << $1.split(/-\d+/).first
                 end
               end
             else
               # Handle the default case
-              pkgs = [args.pkg]
+              pkgs = [args[:pkg]]
             end
 
             Dir.chdir(get_target_dir(args)) do

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

@@ -172,6 +172,7 @@ module Simp::Rake::Build
 
     def initialize( base_dir )
       @base_dir = base_dir
+      @verbose = ENV.fetch('SIMP_PKG_verbose','no') == 'yes'
       define_tasks
     end
 
@@ -192,37 +193,66 @@ module Simp::Rake::Build
 
           r10k_helper = R10KHelper.new("Puppetfile.#{args[:method]}")
 
-          r10k_helper.each_module do |mod|
-            unless File.directory?(mod[:path])
-              FileUtils.mkdir_p(mod[:path])
-            end
+          r10k_issues = Parallel.map(
+            Array(r10k_helper.modules),
+            :in_processes => get_cpu_limit,
+            :progress => 'Submodule Checkout'
+          ) do |mod|
+            issues = []
 
-            # Only for known modules...
-            unless mod[:status] == :unknown
-              # Since r10k is destructive, we're enumerating all valid states
-              # here
-              if [
-                  :absent,
-                  :mismatched,
-                  :outdated,
-                  :insync,
-                  :dirty
-              ].include?(mod[:r10k_module].status)
-                unless mod[:r10k_cache].synced?
-                  mod[:r10k_cache].sync
-                end
+            Dir.chdir(@base_dir) do
+              unless File.directory?(mod[:path])
+                FileUtils.mkdir_p(mod[:path])
+              end
 
-                if mod[:status] == :known
-                  mod[:r10k_module].sync
+              # Only for known modules...
+              unless mod[:status] == :unknown
+                # Since r10k is destructive, we're enumerating all valid states
+                if [
+                    :absent,
+                    :mismatched,
+                    :outdated,
+                    :insync,
+                    :dirty
+                ].include?(mod[:r10k_module].status)
+                  unless mod[:r10k_cache].synced?
+                    mod[:r10k_cache].sync
+                  end
+
+                  if mod[:status] == :known
+                    mod[:r10k_module].sync
+                  else
+                    # If we get here, the module was dirty and should be skipped
+                    issues << "#{mod[:name]}: Skipped - #{mod[:status]}"
+                    next
+                  end
                 else
-                  # If we get here, the module was dirty and should be skipped
-                  puts "#{mod[:name]}: Skipping - #{mod[:status]}"
-                  next
+                  issues << "#{mod[:name]}: Skipped - Unknown status type #{mod[:r10k_module].status}"
                 end
-              else
-                puts "#{mod[:name]}: Skipping - Unknown status type #{mod[:r10k_module].status}"
               end
             end
+
+            issues
+          end
+
+          r10k_issues.flatten!
+
+          unless r10k_issues.empty?
+            $stderr.puts('='*80)
+
+            unless @verbose
+              $stderr.puts('Warning: Some repositories were skipped!')
+              $stderr.puts('  * If this is a fresh build, this could be an issue')
+              $stderr.puts('  * This is expected if re-running a build')
+              $stderr.puts('  * Run with SIMP_PKG_verbose=yes for full details')
+            else
+              $stderr.puts("R10k Checkout Issues:")
+              r10k_issues.each do |issue|
+                $stderr.puts("  * #{issue}")
+              end
+            end
+
+            $stderr.puts('='*80)
           end
         end
 

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

@@ -1,5 +1,6 @@
 #!/usr/bin/rake -T
 
+require 'simp/rake/pkg'
 require 'simp/rake/build/constants'
 
 module Simp; end
@@ -65,16 +66,56 @@ module Simp::Rake::Build
           chown_everything = ENV.fetch( 'SIMP_RAKE_CHOWN_EVERYTHING', 'Y' ).chomp.index( %r{^(1|Y|true|yes)$}i ) || false
 
           verbose(true) do
-            next if not chown_everything
-            # Set the permissions properly for mock to dig through your source
-            # directories.
-            chown_R(nil,'mock',@base_dir)
-            # Ruby >= 1.9.3 chmod_R('g+rXs',@base_dir)
+            next unless chown_everything
+
+            dirs_to_mod = []
+            files_to_mod = []
+
             Find.find(@base_dir) do |path|
+              Find.prune if File.symlink?(path)
+              Find.prune if (File.basename(path) == '.git')
+              Find.prune if (File.basename(path) =~ /^\..*cache/)
+
+              safe_path = Shellwords.escape(path)
+
+              mock_gid = Etc.getgrnam('mock').gid
+
+              file_stat = File.stat(path)
+
+              file_mode = file_stat.mode.to_s(2)[-12..-1].scan(/.{3}/)
+              file_group_perms = file_mode[-2]
+              file_group_read = (file_group_perms[0] == '1')
+              file_group_execute = (file_group_perms[2] == '1')
+              file_sgid = (file_mode[-4][1] == '1')
+
               if File.directory?(path)
-                %x{chmod g+rXs #{Shellwords.escape(path)}}
+                if (mock_gid != file_stat.gid) ||
+                    !file_group_read ||!file_group_execute || !file_sgid
+                  dirs_to_mod << safe_path
+                end
+              else
+                if (mock_gid != file_stat.gid) || !file_group_read
+                  files_to_mod << safe_path
+                end
               end
             end
+
+            # Set the permissions properly for mock to dig through your source
+            Parallel.map(
+              dirs_to_mod,
+              :in_processes => get_cpu_limit,
+              :progress => 'Set "mock" dir perms'
+            ) do |dir|
+              %x{chgrp 'mock' #{dir} && chmod g+rXs #{dir}}
+            end
+
+            Parallel.map(
+              files_to_mod,
+              :in_processes => get_cpu_limit,
+              :progress => 'Set "mock" file perms'
+            ) do |file|
+              %x{chgrp 'mock' #{file} && chmod g+r #{file}}
+            end
           end
         end
 
@@ -93,7 +134,7 @@ module Simp::Rake::Build
               Dir.chdir(dir) do
                 begin
                   rake_flags = Rake.application.options.trace ? '--trace' : ''
-                  %x{rake clean[#{args.chroot}] #{rake_flags}}
+                  %x{rake clean[#{args[:chroot]}] #{rake_flags}}
                   clean_failures_lock.synchronize do
                     clean_failures << dir unless $?.success?
                   end
@@ -111,7 +152,7 @@ module Simp::Rake::Build
             fail(%(Error: The following directories had failures in #{task.name}:\n  * #{clean_failures.join("\n  * ")}))
           end
 
-          %x{mock -r #{args.chroot} --scrub=all} if args.chroot
+          %x{mock -r #{args[:chroot]} --scrub=all} if args[:chroot]
         end
 
         task :clobber,[:chroot] => [:prep] do |t,args|
@@ -124,7 +165,7 @@ module Simp::Rake::Build
             ) do |dir|
               Dir.chdir(dir) do
                 rake_flags = Rake.application.options.trace ? '--trace' : ''
-                sh %{rake clobber[#{args.chroot}] #{rake_flags}}
+                sh %{rake clobber[#{args[:chroot]}] #{rake_flags}}
               end
             end
           end
@@ -147,7 +188,7 @@ module Simp::Rake::Build
 
           Dir.chdir("#{@build_dir}/build_keys") {
             if (args.key != 'dev')
-              fail("Could not find GPG keydir '#{args.key}' in '#{Dir.pwd}'") unless File.directory?(args.key)
+              fail("Could not find GPG keydir '#{args[:key]}' in '#{Dir.pwd}'") unless File.directory?(args[:key])
             end
 
             mkdir('dev') unless File.directory?('dev')
@@ -234,7 +275,7 @@ module Simp::Rake::Build
                       gpg_agent_socket = gpg_agent_info[0]
                       gpg_agent_pid = gpg_agent_info[1].strip.to_i
 
-                      if not File.exist? (%(#{Dir.pwd}/#{File.basename(gpg_agent_socket)})) then
+                      unless File.exist?(%(#{Dir.pwd}/#{File.basename(gpg_agent_socket)}))
                         ln_s(gpg_agent_socket,%(#{Dir.pwd}/#{File.basename(gpg_agent_socket)}))
                       end
                     end
@@ -257,7 +298,7 @@ module Simp::Rake::Build
               end
             }
 
-            Dir.chdir(args.key) {
+            Dir.chdir(args[:key]) {
               rpm_build_keys = Dir.glob('RPM-GPG-KEY-*')
               target_dir = '../../GPGKEYS'
 
@@ -293,21 +334,21 @@ module Simp::Rake::Build
           _verbose = ENV.fetch('SIMP_PKG_verbose','no') == 'yes'
 
           args.with_defaults(:key => 'dev')
-          args.with_defaults(:docs => true)
+          args.with_defaults(:docs => 'true')
 
           output_dir = @pkg_dirs[:simp]
 
           check_dvd_env
 
-          Rake::Task['pkg:simp_cli'].invoke(args.chroot)
-          Rake::Task['pkg:aux'].invoke(args.chroot)
+          Rake::Task['pkg:simp_cli'].invoke(args[:chroot])
+          Rake::Task['pkg:aux'].invoke(args[:chroot])
           if "#{args.docs}" == 'true'
-            Rake::Task['pkg:doc'].invoke(args.chroot)
+            Rake::Task['pkg:doc'].invoke(args[:chroot])
           end
-          Rake::Task['pkg:modules'].invoke(args.chroot)
+          Rake::Task['pkg:modules'].invoke(args[:chroot])
 
           # The main SIMP RPM must be built last!
-          Rake::Task['pkg:simp'].invoke(args.chroot,args.snapshot_release)
+          Rake::Task['pkg:simp'].invoke(args[:chroot],args[:snapshot_release])
 
           # Prepare for the build!
           rm_rf(output_dir, :verbose => _verbose)
@@ -349,13 +390,12 @@ module Simp::Rake::Build
             end
           end
 
-          Rake::Task['pkg:signrpms'].invoke(args.key)
+          Rake::Task['pkg:signrpms'].invoke(args[:key])
         end
 
         desc <<-EOM
           Build the Puppet module RPMs.
 
-            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).
@@ -365,7 +405,47 @@ module Simp::Rake::Build
               - Set `SIMP_PKG_verbose=yes` to report file operations as they happen.
         EOM
         task :modules,[:chroot,:method] => [:prep,:mock_prep] do |t,args|
-          build(args.chroot,@build_dirs[:modules],t)
+          build(args[:chroot],@build_dirs[:modules],t)
+        end
+
+        desc <<-EOM
+          Build a single Puppet Module RPM.
+
+            Building this environment requires a working Mock setup (http://fedoraproject.org/wiki/Projects/Mock)
+
+            * :name   - The path, or name, of the module to build. If a name is
+                        given, the Puppetfile.<method> will be used to find the
+                        module.
+                        Note: This is the *short* name. So, to build
+                        puppetlabs-stdlib, you would just enter 'stdlib'
+            * :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 :single,[:name,:chroot,:method] => [:prep, :mock_prep] do |t,args|
+          fail("You must pass :name to '#{t.name}'") unless args[:name]
+
+          mod_path = File.absolute_path(args[:name])
+
+          if args[:name].include?('/')
+            fail("'#{args[:name]}' does not exist!") unless File.directory?(mod_path)
+          else
+            load_puppetfile(args[:method])
+            local_module = puppetfile.modules.select{|m| m[:name] == args[:name]}.first
+
+            unless local_module
+              fail("'#{args[:name]}' was not found in the Puppetfile")
+            end
+
+            mod_path = local_module[:path]
+          end
+
+          ENV['SIMP_PKG_rand_name'] = 'yes'
+          build(args[:chroot], Array(mod_path), t)
+
+          puts("Your packages can be found in '#{mod_path}/dist'")
         end
 
         desc <<-EOM
@@ -377,7 +457,7 @@ module Simp::Rake::Build
             - 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)
+          build(args[:chroot], @build_dirs[:simp_cli], t)
         end
 
         desc <<-EOM
@@ -390,7 +470,7 @@ module Simp::Rake::Build
             * :chroot - The Mock chroot configuration to use. See the '--root' option in mock(1).
         EOM
         task :aux,[:chroot] => [:prep,:mock_prep]  do |t,args|
-          build(args.chroot,@build_dirs[:aux],t)
+          build(args[:chroot],@build_dirs[:aux],t)
         end
 
         desc <<-EOM
@@ -403,7 +483,7 @@ module Simp::Rake::Build
               - 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)
+          build(args[:chroot],@build_dirs[:doc],t)
         end
 
         desc <<-EOM
@@ -417,7 +497,7 @@ module Simp::Rake::Build
               - 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)
+          build(args[:chroot],@build_dirs[:simp],t,false,args[:snapshot_release])
         end
 
         desc "Sign the RPMs."
@@ -426,11 +506,11 @@ module Simp::Rake::Build
 
           args.with_defaults(:key => 'dev')
           args.with_defaults(:rpm_dir => "#{@build_dir}/SIMP/*RPMS")
-          args.with_default(:force => false)
+          args.with_default(:force => 'false')
 
-          force = (args.force.to_s == 'false' ? false : true)
+          force = (args[:force].to_s == 'false' ? false : true)
 
-          rpm_dirs = Dir.glob(args.rpm_dir)
+          rpm_dirs = Dir.glob(args[:rpm_dir])
           to_sign = []
 
           rpm_dirs.each do |rpm_dir|
@@ -447,7 +527,7 @@ module Simp::Rake::Build
           ) do |rpm|
             rpminfo = %x{rpm -qip #{rpm} 2>/dev/null}.split("\n")
             if (force || !rpminfo.grep(/Signature\s+:\s+\(none\)/).empty?)
-              Simp::RPM.signrpm(rpm,"#{@build_dir}/build_keys/#{args.key}")
+              Simp::RPM.signrpm(rpm,"#{@build_dir}/build_keys/#{args[:key]}")
             end
           end
         end
@@ -464,9 +544,9 @@ module Simp::Rake::Build
             args.with_defaults(:rpm_dir => @pkg_dirs[:ext])
             args.with_defaults(:key_dir => "#{@build_dir}/GPGKEYS")
 
-            rpm_dirs = Dir.glob(args.rpm_dir)
+            rpm_dirs = Dir.glob(args[:rpm_dir])
 
-            fail("Could not find files at #{args.rpm_dir}!") if rpm_dirs.empty?
+            fail("Could not find files at #{args[:rpm_dir]}!") if rpm_dirs.empty?
 
             temp_gpg_dir = Dir.mktmpdir
 
@@ -475,7 +555,7 @@ module Simp::Rake::Build
             sh %{#{rpm_cmd} --initdb}
 
             # Only import thngs that look like GPG keys...
-            Dir.glob("#{args.key_dir}/*").each do |key|
+            Dir.glob("#{args[:key_dir]}/*").each do |key|
               next if File.directory?(key) or not File.readable?(key)
 
               File.read(key).each_line do |line|
@@ -529,7 +609,7 @@ module Simp::Rake::Build
         task :repoclosure,[:target_dir,:aux_dir] => [:prep] do |t,args|
           default_target = @pkg_dirs[:simp]
           args.with_defaults(:target_dir => default_target)
-          if args.target_dir == default_target
+          if args[:target_dir] == default_target
             args.with_defaults(:aux_dir => @pkg_dirs[:ext])
           else
             args.with_defaults(:aux_dir => '')
@@ -564,7 +644,7 @@ gpgcheck=0
 protect=1
   EOF
 
-          fail("#{args.target_dir} does not exist!") unless File.directory?(args.target_dir)
+          fail("#{args[:target_dir]} does not exist!") unless File.directory?(args[:target_dir])
 
           begin
             temp_pkg_dir = Dir.mktmpdir
@@ -573,7 +653,7 @@ protect=1
             mkdir_p("#{temp_pkg_dir}/repos/lookaside")
             mkdir_p("#{temp_pkg_dir}/repodata")
 
-            Dir.glob(args.target_dir).each do |base_dir|
+            Dir.glob(args[:target_dir]).each do |base_dir|
               Find.find(base_dir) do |path|
                 if (path =~ /.*\.rpm$/) and (path !~ /.*.src\.rpm$/)
                   sym_path = "#{temp_pkg_dir}/repos/base/#{File.basename(path)}"
@@ -582,7 +662,7 @@ protect=1
               end
             end
 
-            Dir.glob(args.aux_dir).each do |aux_dir|
+            Dir.glob(args[:aux_dir]).each do |aux_dir|
               Find.find(aux_dir) do |path|
                 if (path =~ /.*\.rpm$/) and (path !~ /.*.src\.rpm$/)
                   sym_path = "#{temp_pkg_dir}/repos/lookaside/#{File.basename(path)}"
@@ -648,11 +728,11 @@ protect=1
           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"))
 
+          reenable_lock = Mutex.new
+
           metadata = Parallel.map(
             # Allow for shell globs
             Array(dirs),
@@ -664,39 +744,66 @@ protect=1
             fail("Could not find directory #{dir}") unless Dir.exist?(dir)
 
             Dir.chdir(dir) do
-              if File.exist?('Rakefile')
+              built_rpm = false
+              unique_build = (get_cpu_limit != 1).to_s
+
+              if _verbose
+                $stderr.puts("Running 'rake pkg:rpm' on #{File.basename(dir)}")
+              end
+
+              # We're building a module, override anything down there
+              if File.exist?('metadata.json')
+                unique_namespace = (0...24).map{ (65 + rand(26)).chr }.join.downcase
+
+                Simp::Rake::Pkg.new(Dir.pwd, nil, unique_namespace, @simp_version)
 
-                unique_build = (get_cpu_limit != 1)
+                Rake::Task["#{unique_namespace}:pkg:rpm"].invoke(chroot, unique_build, snapshot_release)
+
+                built_rpm = true
+
+              # We're building one of the extra assets and should honor its Rakefile
+              elsif File.exist?('Rakefile')
 
                 rake_flags = Rake.application.options.trace ? '--trace' : ''
 
-                cmd = %{SIMP_BUILD_version=#{@simp_version} rake pkg:rpm[#{chroot},unique_build,#{snapshot_release}] #{rake_flags} 2>&1}
-                begin
-                  if _verbose
-                    $stderr.puts("Running 'rake pkg:rpm'")
-                  end
+                cmd = %{SIMP_BUILD_version=#{@simp_version} rake pkg:rpm[#{chroot},#{unique_build},#{snapshot_release}] #{rake_flags} 2>&1}
 
+                build_success = true
+                begin
                   ::Bundler.with_clean_env do
                     %x{#{cmd}}
+                    build_success = $?.success?
                   end
+
+                  built_rpm = true
                 rescue
+                  build_success = false
+                end
+
+                unless build_success
                   if _verbose
                     $stderr.puts("First 'rake pkg:rpm' attempt failed, running bundle and trying again.")
                   end
 
                   ::Bundler.with_clean_env do
-                    %x{bundle install}
+                    %x{bundle install --with development}
                     %x{#{cmd}}
                   end
                 end
+              else
+                puts "Warning: '#{dir}' could not be built via Rake"
+              end
 
+              if built_rpm
                 tarballs = Dir.glob('dist/*.tar.gz')
                 srpms = Dir.glob('dist/*.src.rpm')
                 rpms = (Dir.glob('dist/*.rpm') - srpms)
 
                 # Not all items generate tarballs
                 tarballs.each do |pkg|
-                  raise("Empty Tarball '#{pkg}' generated for #{dir}") if (File.stat(pkg).size == 0)
+                  if (File.stat(pkg).size == 0)
+                    raise("Empty Tarball '#{pkg}' generated for #{dir}")
+                  end
                 end
                 raise("No SRPMs generated for #{dir}") if srpms.empty?
                 raise("No RPMs generated for #{dir}") if rpms.empty?
@@ -713,8 +820,10 @@ protect=1
 
                   result << metadata
                 end
-              else
-                puts "Warning: Could not find Rakefile in '#{dir}'"
+              end
+
+              if _verbose
+                $stderr.puts("Finshed 'rake pkg:rpm' on #{File.basename(dir)}")
               end
             end
 
@@ -763,51 +872,9 @@ protect=1
         # 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.
-        def get_mock_configs
-          Dir.glob('/etc/mock/*.cfg').sort.map{ |x| x = File.basename(x,'.cfg')}
-        end
-
-        # Run some pre-checks to make sure that mock will work properly.
-        # Pass init=false if you do not want the function to initialize.
-        #
-        # Returns 'true' if the space is already initialized.
-        # FIXME: unique_name doesn't work
-        # FIXME: unique_name is never called
-        # FIXME: which is fortunate, because PKGNAME is never defined
-        def mock_pre_check(chroot,unique_name=false,init=true)
-          which('mock') || raise(Exception, 'Could not find mock on your system, exiting')
-
-          mock_configs = get_mock_configs
-
-          if not chroot
-            fail("Error: No mock chroot provided. Your choices are:\n#{mock_configs.join("\n  ")}"
-            )
-          end
-          if not mock_configs.include?(chroot)
-            fail("Error: Invalid mock chroot provided. Your choices are:\n#{mock_configs.join("\n  ")}"
-            )
-          end
-
-          # Allow for building all modules in parallel.
-          @mock = "#{@mock} --uniqueext=#{PKGNAME}" if unique_name
-
-          # A simple test to see if the chroot is initialized
-          %x{#{@mock} -q --root #{chroot} --chroot "test -d /tmp" --quiet &> /dev/null}
-          initialized = $?.success?
-
-          if init and not initialized
-            cmd = %{#{@mock} --root #{chroot} --init}
-            sh cmd
-          end
-
-          initialized
+          module_paths.select{|x| File.basename(File.dirname(x)) == 'modules'}.sort
         end
       end
     end
   end
 end
-