simp-rake-helpers 5.11.6 → 5.12.3

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

@@ -26,7 +26,7 @@ module Simp::Rake::Build
       namespace :iso do
         task :prep do
           if $simp6
-            @build_dir = $simp6_build_dir
+            @build_dir = $simp6_build_dir || @distro_build_dir
           end
         end
 
@@ -120,6 +120,9 @@ module Simp::Rake::Build
             end
           end
 
+          reposync_location = File.join(@build_dir,'yum_data','reposync')
+          reposync_active = !Dir.glob(File.join(reposync_location, '**', 'repomd.xml')).empty?
+
           tarfiles = File.directory?(tarball) ?
             Dir.glob("#{tarball}/*.tar.gz") : [tarball]
           vermap = YAML::load_file( File.join( File.dirname(__FILE__), 'vermap.yaml'))
@@ -171,6 +174,7 @@ module Simp::Rake::Build
               unless Array(vermap[simpver.split('.').first]).include?(baseosver.split('.').first)
                 if verbose
                   warn("Could not find SIMP version mapping for #{simpver} for Base OS #{baseosver}")
+                  warn("Do you need to update vermap.yaml in the Gem?")
                 end
 
                 next
@@ -186,34 +190,53 @@ module Simp::Rake::Build
                 end
               end
 
-              # Prune unwanted packages
-              begin
-                system("tar --no-same-permissions -C #{dir} -xzf #{tball} *simp_pkglist.txt")
-              rescue
-                # Does not matter if the command fails
-              end
+              # If we've pulled in reposync directories, we expect them to
+              # completely overwrite the directory of the same name in the
+              # target ISO so no pruning is required
+              #
+              # Note: CASE MATTERS on the directory names
+              if reposync_active
+                repos_to_overwrite = Dir.glob(File.join(reposync_location, '*'))
+                  .delete_if{|x| !File.directory?(x)}
+                  .map{|x| File.basename(x)}
+
+                repos_to_overwrite.each do |repo|
+                  src = File.join(reposync_location, repo)
+                  target = File.join(dir, repo)
+
+                  rm_rf(target, :verbose => verbose) if File.directory?(target)
+                  cp_r(src, dir, :verbose => verbose)
+                end
+              else
+                # Prune unwanted packages
+                begin
+                  system("tar --no-same-permissions -C #{dir} -xzf #{tball} *simp_pkglist.txt")
+                rescue
+                  # Does not matter if the command fails
+                end
 
-              pkglist_file = ENV.fetch(
-                'SIMP_PKGLIST_FILE',
-                File.join(dir,"#{baseosver.split('.').first}-simp_pkglist.txt")
-              )
-
-              puts
-              puts '-'*80
-              puts "### Pruning packages not in file '#{pkglist_file}'"
-              puts
-              puts '   (override this with `SIMP_PKGLIST_FILE=<file>`)'
-              puts
-              puts '-'*80
-              puts
-
-              if (args.prune.casecmp("false") != 0) && File.exist?(pkglist_file)
-                exclude_pkgs = Array.new
-                File.read(pkglist_file).each_line do |line|
-                  next if line =~ /^(\s+|#.*)$/
-                  exclude_pkgs.push(line.chomp)
+                pkglist_file = ENV.fetch(
+                  'SIMP_PKGLIST_FILE',
+                  File.join(dir,"#{baseosver.split('.').first}-simp_pkglist.txt")
+                )
+
+                puts
+                puts '-'*80
+                puts "### Pruning packages not in file '#{pkglist_file}'"
+                puts
+                puts '   (override this with `SIMP_PKGLIST_FILE=<file>`)'
+                puts
+                puts '-'*80
+                puts
+
+                if (args.prune.casecmp("false") != 0) && File.exist?(pkglist_file)
+                  exclude_pkgs = Array.new
+                  File.read(pkglist_file).each_line do |line|
+                    next if line =~ /^(\s+|#.*)$/
+                    exclude_pkgs.push(line.chomp)
+                  end
+                  prune_packages(dir,['SIMP'],exclude_pkgs,mkrepo)
                 end
-                prune_packages(dir,['SIMP'],exclude_pkgs,mkrepo)
               end
 
               # Add the SIMP code
@@ -230,13 +253,14 @@ module Simp::Rake::Build
                   yum_dep_location = File.join(@build_dir,'yum_data',simp_dep_src,'packages')
                 end
 
+                yum_dep_rpms = Dir.glob(File.join(yum_dep_location,'*.rpm'))
+
                 unless File.directory?(yum_dep_location)
-                  fail("Could not find dependency directory at #{yum_dep_location}")
+                  fail("Could not find dependency directory at #{yum_dep_location}") unless reposync_active
                 end
 
-                yum_dep_rpms = Dir.glob(File.join(yum_dep_location,'*.rpm'))
                 if yum_dep_rpms.empty?
-                  fail("Could not find any dependency RPMs at #{yum_dep_location}")
+                  fail("Could not find any dependency RPMs at #{yum_dep_location}") unless reposync_active
                 end
 
                 # Add any one-off RPMs that you might want to add to your own build
@@ -261,7 +285,9 @@ module Simp::Rake::Build
                   cp(rpm,rpm_arch, :verbose => verbose)
                 end
 
-                fail("Could not find architecture '#{arch}' in the SIMP distribution") unless File.directory?(arch)
+                ln_s('noarch', arch, :verbose => verbose) if (!File.directory?(arch) && File.directory?('noarch'))
+                fail("Could not find architecture '#{arch}' in the SIMP distribution") unless (File.directory?(arch) || File.symlink?(arch))
+
                 # Get everything set up properly...
                 Dir.chdir(arch) do
                   Dir.glob('../*') do |rpm_dir|

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

@@ -1,7 +1,6 @@
 #!/usr/bin/rake -T
 
 require 'simp/yum'
-require 'simp/local_gpg_signing_key.rb'
 require 'simp/rake/pkg'
 require 'simp/rake/build/constants'
 require 'simp/rake/build/rpmdeps'
@@ -17,9 +16,18 @@ module Simp::Rake::Build
     def initialize( base_dir )
       init_member_vars( base_dir )
 
+      @cpu_limit = get_cpu_limit
       @verbose = ENV.fetch('SIMP_PKG_verbose','no') == 'yes'
       @rpm_build_metadata = 'last_rpm_build_metadata.yaml'
       @rpm_dependency_file = File.join(@base_dir, 'build', 'rpm', 'dependencies.yaml')
+      @build_keys_dir = ENV.fetch('SIMP_PKG_build_keys_dir', File.join(@base_dir, '.dev_gpgkeys'))
+      @long_gpg_socket_err_msg = <<~EOM
+        If the problem is 'socket name <xxx> is too long', use SIMP_PKG_build_keys_dir
+        to override
+        #{@build_keys_dir}
+        with a shorter path. The socket name must be < 108 characters.
+
+      EOM
 
       define_tasks
     end
@@ -35,7 +43,7 @@ module Simp::Rake::Build
 
           # This doesn't get caught for things like 'rake clean'
           if $simp6 && $simp6_build_dir
-            @build_dir = $simp6_build_dir
+            @build_dir = $simp6_build_dir || @distro_build_dir
             @dvd_src = File.join(@build_dir, File.basename(@dvd_src))
           end
 
@@ -66,7 +74,7 @@ module Simp::Rake::Build
           @build_dirs.each_pair do |k,dirs|
             Parallel.map(
               Array(dirs),
-              :in_processes => get_cpu_limit,
+              :in_processes => @cpu_limit,
               :progress => t.name
             ) do |dir|
               Dir.chdir(dir) do
@@ -95,7 +103,7 @@ module Simp::Rake::Build
           @build_dirs.each_pair do |k,dirs|
             Parallel.map(
               Array(dirs),
-              :in_processes => get_cpu_limit,
+              :in_processes => @cpu_limit,
               :progress => t.name
             ) do |dir|
               Dir.chdir(dir) do
@@ -109,36 +117,49 @@ module Simp::Rake::Build
         desc <<-EOM
           Prepare a GPG signing key to sign build packages
 
-            * :key - the name of the directory under build/build_keys to
-                     prepare (defaults to 'dev')
+            * :key - the name of the build keys subdirectory to prepare
+              (defaults to 'dev')
+
+              - The default build keys directory is
+                `#{@build_keys_dir}`
+
 
           When :key is `dev`, a temporary signing key is created, if needed:
 
-            - A 14-day `dev` key will be created if none exists, including:
-              - The `<build_dir>/build_keys/dev/` dir
-              - gpgagent assets to create/update the key
+            * A 14-day `dev` key will be created if none exists or the existing
+              key has expired.  This includes creating
+              - A `dev` directory in the build keys directory
+              - gpg-agent assets to create/update the key within that `dev`
+                directory
 
           When :key is *not* `dev`, the logic is much stricter:
 
-            - You must already have create `<build_dir>/build_keys/<:key>/`
-              directoy, and placed a valid GPG signing key inside
+            - You must already have created the `<:key>` subdirectory within
+              the build keys directory and placed a valid GPG signing key and
+              requisite gpg-agent assets to access the key within the directory.
             - If the directory or key are missing, the task will fail.
 
           ENV vars:
             - Set `SIMP_PKG_verbose=yes` to report file operations as they happen.
+            - Set `SIMP_PKG_build_keys_dir` to override the default build keys path.
         EOM
         task :key_prep,[:key] => [:prep] do |t,args|
           args.with_defaults(:key => 'dev')
           key = args.key
-          build_keys_dir = File.join(@build_dir, 'build_keys')
-          key_dir = File.join(build_keys_dir,key)
+          key_dir = File.join(@build_keys_dir,key)
           dvd_dir = @dvd_src
 
-          FileUtils.mkdir_p build_keys_dir
+          FileUtils.mkdir_p @build_keys_dir
 
-          Dir.chdir(build_keys_dir) do
+          Dir.chdir(@build_keys_dir) do
             if key == 'dev'
-              Simp::LocalGpgSigningKey.new(key_dir,{verbose: @verbose}).ensure_key
+              require 'simp/local_gpg_signing_key'
+
+              begin
+                Simp::LocalGpgSigningKey.new(key_dir,{verbose: @verbose}).ensure_key
+              rescue Exception => e
+                raise("#{e.message}\n\n#{@long_gpg_socket_err_msg}")
+              end
             else
               unless File.directory?(key_dir)
                 fail("Could not find GPG keydir '#{key_dir}' in '#{Dir.pwd}'")
@@ -356,41 +377,79 @@ module Simp::Rake::Build
           Sign a set of RPMs.
 
             Signs any unsigned RPMs in the specified directory
-              * :key - The key directory to use under #{@build_dir}/build_keys
-                * Defaults to #{File.join(File.dirname(@rpm_dir), '*RPMS')}
+              * :key - The key directory to use under the build keys directory
+                * key defaults to 'dev'
+                * build keys directory defaults to
+                  `#{@build_keys_dir}`
               * :rpm_dir - A directory containing RPM files to sign. Will recurse!
-                * Defaults to 'dev'
+                * Defaults to #{File.join(File.dirname(@rpm_dir), '*RPMS')}
               * :force - Force rpms that are already signed to be resigned
                 * Defaults to 'false', can be enabled with 'true'
+              * :digest_algo - Digest algorithm to be used when signing the RPMs
+                * Defaults to 'sha256'
+
+          ENV vars:
+            * Set `SIMP_RPM_verbose=yes` to report RPM operations as they happen.
+            * Set `SIMP_PKG_build_keys_dir` to override the default build keys path.
+            * Set `SIMP_PKG_rpmsign_timeout` to override the maximum time in seconds
+              to wait for an individual RPM signing operation to complete.
+              - Defaults to 60 seconds.
         EOM
-        task :signrpms,[:key,:rpm_dir,:force] => [:prep,:key_prep] do |t,args|
-          which('rpmsign') || raise(StandardError, 'Could not find rpmsign on your system. Exiting.')
+        task :signrpms,[:key,:rpm_dir,:force,:digest_algo] => [:prep,:key_prep] do |t,args|
+          require 'simp/rpm_signer'
 
           args.with_defaults(:key => 'dev')
           args.with_defaults(:rpm_dir => File.join(File.dirname(@rpm_dir), '*RPMS'))
           args.with_defaults(:force => 'false')
+          args.with_defaults(:digest_algo => 'sha256')
 
           force = (args[:force].to_s == 'false' ? false : true)
+          timeout = ENV['SIMP_PKG_rpmsign_timeout'] ? ENV['SIMP_PKG_rpmsign_timeout'].to_i : 60
+
+          opts = {
+            :digest_algo        => args[:digest_algo],
+            :force              => force,
+            :max_concurrent     => @cpu_limit,
+            :progress_bar_title => t.name,
+            :timeout_seconds    => timeout,
+            :verbose            => @verbose
+          }
 
-          rpm_dirs = Dir.glob(args[:rpm_dir])
-          to_sign = []
+          results = nil
+          begin
+            results = Simp::RpmSigner.sign_rpms(
+              args[:rpm_dir],
+              File.join(@build_keys_dir, args[:key]),
+              opts
+            )
+          rescue Exception => e
+            raise("#{e.message}\n\n#{@long_gpg_socket_err_msg}")
+          end
 
-          rpm_dirs.each do |rpm_dir|
-            Find.find(rpm_dir) do |rpm|
-              next unless File.readable?(rpm)
-              to_sign << rpm if rpm =~ /\.rpm$/
+          if results
+            successes = results.select { |rpm,status| status == :signed }
+            failures = results.select { |rpm,status| status == :unsigned }
+            already_signed = results.select { |rpm,status| status == :skipped_already_signed }
+
+            if opts[:verbose]
+              puts
+              puts 'Summary'
+              puts '======='
+              puts "# RPMs already signed:      #{already_signed.size}"
+              puts "# RPMs successfully signed: #{successes.size}"
+              puts "# RPM signing failures:     #{failures.size}"
+              puts
             end
-          end
 
-          Parallel.map(
-            to_sign,
-            :in_processes => get_cpu_limit,
-            :progress => t.name
-          ) do |rpm|
-            rpm_info = Simp::RPM.new(rpm)
-
-            if force || !rpm_info.signature
-              Simp::RPM.signrpm(rpm, "#{@build_dir}/build_keys/#{args[:key]}")
+            if !failures.empty?
+              if ((results.size - already_signed.size) == (failures.size))
+                detail = already_signed.empty? ? '' : 'unsigned '
+                raise("ERROR: Failed to sign all #{detail}RPMs in #{args[:rpm_dir]}")
+              else
+                err_msg = "ERROR: Failed to sign some RPMs in #{args[:rpm_dir]}:\n"
+                err_msg += "  #{failures.keys.join("\n  ")}"
+                raise(err_msg)
+              end
             end
           end
         end
@@ -446,7 +505,9 @@ module Simp::Rake::Build
                 $stderr.puts "pkg:checksig: Warning no GPG keys found in #{key_dirs_tried}"
               end
             end
-            public_keys += Dir.glob(File.join(@build_dir, 'build_keys', '*', 'RPM-GPG-KEY*'))
+
+            # be sure to include any development keys packaged with the DVD
+            public_keys += Dir.glob(File.join(@dvd_src, 'RPM-GPG-KEY*'))
 
             # Only import thngs that look like GPG keys...
             public_keys.each do |key|
@@ -464,8 +525,9 @@ module Simp::Rake::Build
             rpm_dirs.each do |rpm_dir|
               Find.find(rpm_dir) do |path|
                 if (path =~ /.*\.rpm$/)
-                  result = %x{#{rpm_cmd} --checksig #{path}}.strip
-                  if result !~ /:.*\(\S+\).* OK$/
+                  %x{#{rpm_cmd} --checksig #{path}}.strip
+                  result = $?
+                  unless result && (result.exitstatus == 0)
                     bad_rpms << path.split(/\s/).first
                   end
                 end
@@ -544,23 +606,19 @@ protect=1
               mkdir_p('repos/lookaside')
               mkdir_p('repodata')
 
-              Dir.glob(args[:target_dir]).each do |base_dir|
-                Find.find(base_dir) do |path|
-                  if (path =~ /.*\.rpm$/) and (path !~ /.*.src\.rpm$/)
-                    sym_path = "repos/base/#{File.basename(path)}"
-                    ln_s(path,sym_path, :verbose => @verbose) unless File.exists?(sym_path)
-                  end
-                end
+              Dir.glob(File.join(args[:target_dir], '**', '*.rpm'))
+                .delete_if{|x| x =~ /\.src\.rpm$/}
+                .each do |path|
+                  sym_path = "repos/base/#{File.basename(path)}"
+                  ln_s(path,sym_path, :verbose => @verbose) unless File.exists?(sym_path)
               end
 
               if args[: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 = "repos/lookaside/#{File.basename(path)}"
-                      ln_s(path,sym_path, :verbose => @verbose) unless File.exists?(sym_path)
-                    end
-                  end
+                Dir.glob(File.join(args[:aux_dir], '**', '*.rpm'))
+                  .delete_if{|x| x =~ /\.src\.rpm$/}
+                  .each do |path|
+                    sym_path = "repos/lookaside/#{File.basename(path)}"
+                    ln_s(path,sym_path, :verbose => @verbose) unless File.exists?(sym_path)
                 end
               end
 
@@ -585,7 +643,11 @@ protect=1
                 file.write(ERB.new(yum_conf_template,nil,'-').result(binding))
               end
 
-              cmd = 'repoclosure -c repodata -n -t -r base -l lookaside -c yum.conf'
+              if which('dnf')
+                cmd = 'repoclosure -c base.conf --disablerepo=* --enablerepo=base'
+              else
+                cmd = 'repoclosure -c repodata -n -t -r base -l lookaside -c yum.conf'
+              end
 
               if ENV['SIMP_BUILD_verbose'] == 'yes'
                 puts
@@ -862,7 +924,7 @@ protect=1
           Parallel.map(
             # Allow for shell globs
             Array(dirs),
-            :in_processes => get_cpu_limit,
+            :in_processes => @cpu_limit,
             :progress => task.name
           ) do |dir|
             fail("Could not find directory #{dir}") unless Dir.exist?(dir)

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

@@ -17,7 +17,7 @@ module Simp::Rake::Build
       namespace :spec do
         task :prep do
           if $simp6
-            @build_dir = $simp6_build_dir
+            @build_dir = $simp6_build_dir || @distro_build_dir
           end
         end
 

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

@@ -20,7 +20,7 @@ module Simp::Rake::Build
       namespace :tar do
         task :prep do
           if $simp6
-            @build_dir = $simp6_build_dir
+            @build_dir = $simp6_build_dir || @distro_build_dir
             @dvd_src = File.join(@build_dir, File.basename(@dvd_src))
           end
 

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

@@ -50,7 +50,7 @@ module Simp::Rake::Build
         File.exist?(args.iso_path) or
           fail "Error: You must provide the full path and filename of the ISO image."
 
-        %x{file #{iso_path}}.split(":")[1..-1].to_s =~ /ISO/ or
+        %x{file --keep-going '#{iso_path}'}.split(":")[1..-1].to_s =~ /ISO/ or
           fail "Error: The file provided is not a valid ISO."
 
         pieces = File.basename(iso_path,'.iso').split('-')

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

@@ -21,7 +21,7 @@ module Simp::Rake::Build
       namespace :upload do
         task :prep do
           if $simp6
-            @build_dir = $simp6_build_dir
+            @build_dir = $simp6_build_dir || @distro_build_dir
           end
         end
 

data/lib/simp/rake/build/vermap.yaml

@@ -1,5 +1,5 @@
 ---
-"6": ["6","7"]
+"6": ["6","7","8"]
 "5": "7"
 "4": "6"
 "2": "5"

data/lib/simp/rake/helpers/assets/rpm_spec/simp6.spec

@@ -106,8 +106,8 @@ package_name = "UNKNOWN"
 package_version = "UNKNOWN"
 module_license = "UNKNOWN"
 
--- Default to 0
-package_release = 0
+-- Default to 1
+package_release = 1
 
 lua_stderr("\n")
 lua_stderr("--------------------------------------------------------------------------------\n")
@@ -202,7 +202,7 @@ end
 --    only accepts release in SemVer \d+\.\d+\.\d+ release format)
 --
 --    This code will remove a '-rc0' style prerelease string from the RPM
---     Version, and use it as the default RPM Release (instead of '-0')
+--     Version, and use it as the default RPM Release (instead of '-1')
 
 local version_match = metadata:match('"version":%s+"(.-)"%s*,'):gsub('-.*','')
 if version_match then

data/lib/simp/rake/helpers/assets/rpm_spec/simpdefault.spec

@@ -106,8 +106,8 @@ package_name = "UNKNOWN"
 package_version = "UNKNOWN"
 module_license = "UNKNOWN"
 
--- Default to 0
-package_release = 0
+-- Default to 1
+package_release = 1
 
 lua_stderr("\n")
 lua_stderr("--------------------------------------------------------------------------------\n")
@@ -202,7 +202,7 @@ end
 --    only accepts release in SemVer \d+\.\d+\.\d+ release format)
 --
 --    This code will remove a '-rc0' style prerelease string from the RPM
---     Version, and use it as the default RPM Release (instead of '-0')
+--     Version, and use it as the default RPM Release (instead of '-1')
 
 local version_match = metadata:match('"version":%s+"(.-)"%s*,'):gsub('-.*','')
 if version_match then

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

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

data/lib/simp/rake/helpers.rb

@@ -20,8 +20,8 @@ class Simp::Rake::Helpers
     invalid_commands = Array.new
 
     Array(required_commands).each do |command|
-      unless Facter::Core::Execution.which(command)
-        invalid_commands << command
+      unless Array(command).find { |x| Facter::Core::Execution.which(x) }
+        invalid_commands << Array(command).join(' or ')
       end
     end
 

data/lib/simp/rake/pkg.rb

@@ -235,7 +235,11 @@ module Simp::Rake
             %(-D '_sourcedir #{@rpm_srcdir}'),
             %(-D '_rpmdir #{@pkg_dir}'),
             %(-D '_srcrpmdir #{@pkg_dir}'),
-            %(-D '_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm')
+            %(-D '_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'),
+
+            # needed on EL8 to disable the aggressive brp_mangle_shebangs script
+            # that results in invalid script shebangs; does nothing in EL7
+            %(-D '__brp_mangle_shebangs /usr/bin/true')
           ]
           rpm_opts << '-v' if @verbose
           rpm_opts << "-D 'lua_debug 1'" if (ENV.fetch('SIMP_RAKE_PKG_LUA_verbose','no') =='yes')

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

@@ -290,6 +290,7 @@ class Simp::Rake::Pupmod::Helpers < ::Rake::TaskLib
     # That will give Travis a way of warning us if the changelog
     # will prevent the rpm from building.
     task :changelog_annotation, [:quiet] do |t,args|
+      warning('DEPRECATED: use pkg:create_tag_changelog')
       quiet = true if args[:quiet].to_s == 'true'
       puts changelog_annotation( quiet )
     end
@@ -332,6 +333,7 @@ class Simp::Rake::Pupmod::Helpers < ::Rake::TaskLib
       - doc directory
     EOM
     task :compare_latest_tag, [:tags_source, :ignore_owner, :verbose] do |t,args|
+      warning('DEPRECATED: use pkg:compare_latest_tag')
       require 'json'
 
       tags_source = args[:tags_source].nil? ? 'origin' : args[:tags_source]

data/lib/simp/rake/rubygem.rb

@@ -49,7 +49,11 @@ module Simp::Rake
         task :install_gem => [:clean, :gem] do
           Dir.chdir @rakefile_dir
           Dir.glob("dist/#{@package}*.gem") do |pkg|
-            sh %Q{bundle exec gem install --no-ri --no-rdoc #{pkg}}
+            if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.6')
+              sh %Q{bundle exec gem install --no-document #{pkg}}
+            else
+              sh %Q{bundle exec gem install --no-ri --no-rdoc #{pkg}}
+            end
           end
         end
       end

data/lib/simp/rake.rb

@@ -9,9 +9,12 @@ module Simp::Rake
   require 'parallel'
   require 'tempfile'
   require 'facter'
+  require 'simp/command_utils'
   require 'simp/rpm'
   require 'simp/rake/pkg'
 
+  include Simp::CommandUtils
+
   attr_reader(:puppetfile)
   attr_reader(:module_paths)
 
@@ -96,23 +99,6 @@ module Simp::Rake
     exec pager rescue exec "/bin/sh", "-c", pager
   end
 
-  def which(cmd, fail=false)
-    @which_cache ||= {}
-
-    if @which_cache.has_key?(cmd)
-      command = @which_cache[cmd]
-    else
-      command = Facter::Core::Execution.which(cmd)
-      @which_cache[cmd] = command
-    end
-
-    msg = "Warning: Command #{cmd} not found on the system."
-
-    fail ? raise(msg) : warn(msg) unless command
-
-    command
-  end
-
   def help
     run_pager