simp-rake-helpers 5.25.0 → 6.0.0

data/lib/simp/rake/pkg.rb

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 # This file provided many common build-related tasks and helper methods from
 # the SIMP Rakefile ecosystem.
 
+require 'English'
 require 'rake'
 require 'rake/clean'
 require 'rake/tasklib'
@@ -12,519 +15,502 @@ require 'simp/rake/helpers/rpm_spec'
 require 'simp/rake/build/rpmdeps'
 
 module Simp; end
-module Simp::Rake
-  class Pkg < ::Rake::TaskLib
-
-    include Simp::Rake::Helpers::RPMSpec
-
-    # path to the project's directory.  Usually `File.dirname(__FILE__)`
-    attr_accessor :base_dir
-
-    # the name of the package.  Usually `File.basename(@base_dir)`
-    attr_accessor :pkg_name
-
-    # path to the project's RPM specfile
-    attr_accessor :spec_file
-
-    # path to the directory to place generated assets (e.g., rpm, tar.gz)
-    attr_accessor :pkg_dir
-
-    # array of items to exclude from the tarball
-    attr_accessor :exclude_list
-
-    # array of items to additionally clean
-    attr_accessor :clean_list
-
-    # array of items to ignore when checking if the tarball needs to be rebuilt
-    attr_accessor :ignore_changes_list
-
-    attr_reader   :spec_info
-
-    def initialize( base_dir, unique_namespace = nil, simp_version=nil )
-      @base_dir            = base_dir
-      @pkg_name            = File.basename(@base_dir)
-      @pkg_dir             = File.join(@base_dir, 'dist')
-      @pkg_tmp_dir         = File.join(@pkg_dir, 'tmp')
-      @exclude_list        = [ File.basename(@pkg_dir) ]
-      @clean_list          = []
-      @ignore_changes_list = [
-        'Gemfile.lock',
-        'dist/logs',
-        'dist/tmp',
-        'dist/*.rpm',
-        'dist/rpmbuild',
-        'spec/fixtures/modules'
-      ]
-      @verbose = ENV.fetch('SIMP_RAKE_PKG_verbose','no') == 'yes'
-
-      # This is only meant to be used to work around the case where particular
-      # packages need to ignore some set of artifacts that get updated out of
-      # band. This should not be set as a regular environment variable and
-      # should be fixed properly at some time in the future.
-      #
-      # Presently, this is used by simp-doc
-      if ENV['SIMP_INTERNAL_pkg_ignore']
-        @ignore_changes_list += ENV['SIMP_INTERNAL_pkg_ignore'].split(',')
-      end
 
-      FileUtils.mkdir_p(@pkg_tmp_dir, verbose: @verbose)
+class Simp::Rake::Pkg < Rake::TaskLib
+  include Simp::Rake::Helpers::RPMSpec
+
+  # path to the project's directory.  Usually `File.dirname(__FILE__)`
+  attr_accessor :base_dir
+
+  # the name of the package.  Usually `File.basename(@base_dir)`
+  attr_accessor :pkg_name
+
+  # path to the project's RPM specfile
+  attr_accessor :spec_file
+
+  # path to the directory to place generated assets (e.g., rpm, tar.gz)
+  attr_accessor :pkg_dir
+
+  # array of items to exclude from the tarball
+  attr_accessor :exclude_list
+
+  # array of items to additionally clean
+  attr_accessor :clean_list
+
+  # array of items to ignore when checking if the tarball needs to be rebuilt
+  attr_accessor :ignore_changes_list
+
+  attr_reader   :spec_info
+
+  def initialize(base_dir, unique_namespace = nil, simp_version = nil)
+    @base_dir            = base_dir
+    @pkg_name            = File.basename(@base_dir)
+    @pkg_dir             = File.join(@base_dir, 'dist')
+    @pkg_tmp_dir         = File.join(@pkg_dir, 'tmp')
+    @exclude_list        = [File.basename(@pkg_dir)]
+    @clean_list          = []
+    @ignore_changes_list = [
+      'Gemfile.lock',
+      'dist/logs',
+      'dist/tmp',
+      'dist/*.rpm',
+      'dist/rpmbuild',
+      'spec/fixtures/modules',
+    ]
+    @verbose = ENV.fetch('SIMP_RAKE_PKG_verbose', 'no') == 'yes'
+
+    # This is only meant to be used to work around the case where particular
+    # packages need to ignore some set of artifacts that get updated out of
+    # band. This should not be set as a regular environment variable and
+    # should be fixed properly at some time in the future.
+    #
+    # Presently, this is used by simp-doc
+    if ENV['SIMP_INTERNAL_pkg_ignore']
+      @ignore_changes_list += ENV['SIMP_INTERNAL_pkg_ignore'].split(',')
+    end
 
-      local_spec = Dir.glob(File.join(@base_dir, 'build', '*.spec'))
-      unless local_spec.empty?
-        @spec_file = local_spec.first
-      else
-        @spec_tempfile = File.open(File.join(@pkg_tmp_dir, "#{@pkg_name}.spec"), 'w')
-        @spec_tempfile.write(rpm_template(simp_version))
+    FileUtils.mkdir_p(@pkg_tmp_dir, verbose: @verbose)
 
-        @spec_file = @spec_tempfile.path
+    local_spec = Dir.glob(File.join(@base_dir, 'build', '*.spec'))
+    if local_spec.empty?
+      @spec_tempfile = File.open(File.join(@pkg_tmp_dir, "#{@pkg_name}.spec"), 'w')
+      @spec_tempfile.write(rpm_template(simp_version))
 
-        @spec_tempfile.flush
-        @spec_tempfile.close
+      @spec_file = @spec_tempfile.path
 
-        FileUtils.chmod(0640, @spec_file, verbose: @verbose)
-      end
+      @spec_tempfile.flush
+      @spec_tempfile.close
 
-      ::CLEAN.include( @pkg_dir )
+      FileUtils.chmod(0o640, @spec_file, verbose: @verbose)
+    else
+      @spec_file = local_spec.first
+    end
 
-      yield self if block_given?
+    ::CLEAN.include(@pkg_dir)
 
-      ::CLEAN.include( @clean_list )
+    yield self if block_given?
 
-      if unique_namespace
-        namespace unique_namespace.to_sym do
-          define
-        end
-      else
+    ::CLEAN.include(@clean_list)
+
+    if unique_namespace
+      namespace unique_namespace.to_sym do
         define
       end
+    else
+      define
     end
+  end
 
-    def define
-      # For the most part, we don't want to hear Rake's noise, unless it's an error
-      # TODO: Make this configurable
-      verbose(false)
-
-      define_clean
-      define_clobber
-      define_pkg_tar
-      define_pkg_rpm
-      define_pkg_check_rpm_changelog
-      define_pkg_check_version
-      define_pkg_compare_latest_tag
-      define_pkg_create_tag_changelog
-      task :default => 'pkg:tar'
-
-      Rake::Task['pkg:tar']
-      Rake::Task['pkg:rpm']
-
-      self
-    end
+  def define
+    # For the most part, we don't want to hear Rake's noise, unless it's an error
+    # TODO: Make this configurable
+    verbose(false)
+
+    define_clean
+    define_clobber
+    define_pkg_tar
+    define_pkg_rpm
+    define_pkg_check_rpm_changelog
+    define_pkg_check_version
+    define_pkg_compare_latest_tag
+    define_pkg_create_tag_changelog
+    task :default => 'pkg:tar'
+
+    Rake::Task['pkg:tar']
+    Rake::Task['pkg:rpm']
+
+    self
+  end
 
-    # Ensures that the correct file names are used across the board.
-    def initialize_spec_info
-      unless @spec_info
-        # This gets the resting spec file and allows us to pull out the name
-        @spec_info ||= Simp::RPM.new(@spec_file)
-        @spec_info_dir ||= @base_dir
+  # Ensures that the correct file names are used across the board.
+  def initialize_spec_info
+    return if @spec_info
 
-        @dir_name ||= "#{@spec_info.basename}-#{@spec_info.version}"
-        @full_pkg_name ||= "#{@dir_name}-#{@spec_info.release}"
+    # This gets the resting spec file and allows us to pull out the name
+    @spec_info ||= Simp::RPM.new(@spec_file)
+    @spec_info_dir ||= @base_dir
 
-        _rpmbuild_srcdir = `rpm -E '%{_sourcedir}'`.strip
+    @dir_name ||= "#{@spec_info.basename}-#{@spec_info.version}"
+    @full_pkg_name ||= "#{@dir_name}-#{@spec_info.release}"
 
-        unless File.exist?(_rpmbuild_srcdir)
-          sh 'rpmdev-setuptree'
-        end
+    _rpmbuild_srcdir = `rpm -E '%{_sourcedir}'`.strip
 
-        @rpm_srcdir ||= "#{@pkg_dir}/rpmbuild/SOURCES"
-        FileUtils.mkdir_p(@rpm_srcdir, verbose: @verbose)
+    unless File.exist?(_rpmbuild_srcdir)
+      sh 'rpmdev-setuptree'
+    end
 
-        @tar_dest ||= "#{@pkg_dir}/#{@full_pkg_name}.tar.gz"
+    @rpm_srcdir ||= "#{@pkg_dir}/rpmbuild/SOURCES"
+    FileUtils.mkdir_p(@rpm_srcdir, verbose: @verbose)
 
-        if @full_pkg_name =~ /UNKNOWN/
-          fail("Error: Could not determine package information from 'metadata.json'. Got '#{@full_pkg_name}'")
-        end
-      end
-    end
+    @tar_dest ||= "#{@pkg_dir}/#{@full_pkg_name}.tar.gz"
 
-    def define_clean
-      desc <<-EOM
+    return unless @full_pkg_name.include?('UNKNOWN')
+
+    raise("Error: Could not determine package information from 'metadata.json'. Got '#{@full_pkg_name}'")
+  end
+
+  def define_clean
+    desc <<-EOM
       Clean build artifacts for #{@pkg_name}
-      EOM
-      task :clean do |t,args|
-        # this is provided by 'rake/clean' and the ::CLEAN constant
-      end
+    EOM
+    task :clean do |t, args|
+      # this is provided by 'rake/clean' and the ::CLEAN constant
     end
+  end
 
-    def define_clobber
-      desc <<-EOM
+  def define_clobber
+    desc <<-EOM
       Clobber build artifacts for #{@pkg_name}
-      EOM
-      task :clobber do |t,args|
-      end
+    EOM
+    task :clobber do |_t, _args|
+      # no-op placeholder
     end
+  end
 
-    def define_pkg_tar
-      namespace :pkg do
-        directory @pkg_dir
+  def define_pkg_tar
+    namespace :pkg do
+      directory @pkg_dir
 
-        task :initialize_spec_info => [@pkg_dir] do |t,args|
-          initialize_spec_info
-        end
+      task :initialize_spec_info => [@pkg_dir] do |_t, _args|
+        initialize_spec_info
+      end
 
-        # :pkg:tar
-        # -----------------------------
-        desc <<-EOM
+      # :pkg:tar
+      # -----------------------------
+      desc <<-EOM
         Build the #{@pkg_name} tar package.
-        EOM
-        task :tar => [:initialize_spec_info] do |t,args|
-          target_dir = File.basename(@base_dir)
+      EOM
+      task :tar => [:initialize_spec_info] do |_t, _args|
+        target_dir = File.basename(@base_dir)
 
-          Dir.chdir(%(#{@base_dir}/..)) do
-            require_rebuild = false
+        Dir.chdir(%(#{@base_dir}/..)) do
+          require_rebuild = false
 
-            if File.exist?(@tar_dest)
-              Find.find(target_dir) do |path|
-                filename = File.basename(path)
+          if File.exist?(@tar_dest)
+            Find.find(target_dir) do |path|
+              filename = File.basename(path)
 
-                Find.prune if filename =~ /^\./
-                Find.prune if ((filename == File.basename(@pkg_dir)) && File.directory?(path))
+              Find.prune if %r{^\.}.match?(filename)
+              Find.prune if (filename == File.basename(@pkg_dir)) && File.directory?(path)
 
-                to_ignore = @ignore_changes_list.map{|x| x = Dir.glob(File.join(@base_dir, x))}.flatten
-                Find.prune if to_ignore.include?(File.expand_path(path))
+              to_ignore = @ignore_changes_list.map { |x| Dir.glob(File.join(@base_dir, x)) }.flatten
+              Find.prune if to_ignore.include?(File.expand_path(path))
 
-                next if File.directory?(path)
+              next if File.directory?(path)
 
-                if require_rebuild?(@tar_dest, path)
-                  require_rebuild = true
-                  break
-                end
+              if require_rebuild?(@tar_dest, path)
+                require_rebuild = true
+                break
               end
-            else
-              require_rebuild = true
             end
+          else
+            require_rebuild = true
+          end
 
-            if require_rebuild
-              sh %Q(tar --owner 0 --group 0 --exclude-vcs --exclude=#{@exclude_list.join(' --exclude=')} --transform='s/^#{@pkg_name}/#{@dir_name}/' -cpzf "#{@tar_dest}" #{@pkg_name})
-            end
+          if require_rebuild
+            sh %(tar --owner 0 --group 0 --exclude-vcs --exclude=#{@exclude_list.join(' --exclude=')} --transform='s/^#{@pkg_name}/#{@dir_name}/' -cpzf "#{@tar_dest}" #{@pkg_name})
           end
         end
       end
     end
+  end
 
-    def define_pkg_rpm
-
-      # :pkg:rpm
-      # -----------------------------
-      namespace :pkg do
-=begin
-        WARNING: THIS DOES NOT PULL FROM THE simp-core RPM DEPENDENCIES FILE
-        WARNING: YOU WILL PROBABLY NOT GET PROPER FULL SIMP RPMS FROM THIS TASK
-
-        desc <<-EOM
-        Build the #{@pkg_name} RPM.
-
-            By default, the package will be built to support a SIMP-6.X file structure.
-            To build the package for a different version of SIMP, export SIMP_BUILD_version=<5.X,4.X>
-        EOM
-=end
-        task :rpm => [:tar] do |t,args|
-          rpm_opts = [
-            %(-D 'buildroot #{@pkg_dir}/rpmbuild/BUILDROOT'),
-            %(-D 'builddir #{@pkg_dir}/rpmbuild/BUILD'),
-            %(-D '_sourcedir #{@rpm_srcdir}'),
-            %(-D '_rpmdir #{@pkg_dir}'),
-            %(-D '_srcrpmdir #{@pkg_dir}'),
-            %(-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')
-          rpm_opts << "-D 'pup_module_info_dir #{@base_dir}'"
-          Dir.chdir(@pkg_dir) do
-
-            # Copy in the materials required for the module builds
-            # The following are required to build successful RPMs using
-            # the new LUA-based RPM template
-            puppet_module_info_files = [
-              Dir.glob(%(#{@base_dir}/build/rpm_metadata/**)),
-              %(#{@base_dir}/CHANGELOG),
-              %(#{@base_dir}/metadata.json)
-            ].flatten
-
-            if @verbose
-              puts "==== pkg:rpm: @base_dir: #{@base_dir}"
-              puts "==== pkg:rpm: rpm_opts:\n #{rpm_opts.map{|x| "\n  #{x}"}.join}"
-              puts "==== pkg:rpm: puppet_module_info_files: #{puppet_module_info_files.map{|x| "\n  #{x}"}.join}"
-            end
+  def define_pkg_rpm
+    # :pkg:rpm
+    # -----------------------------
+    namespace :pkg do
+      #         WARNING: THIS DOES NOT PULL FROM THE simp-core RPM DEPENDENCIES FILE
+      #         WARNING: YOU WILL PROBABLY NOT GET PROPER FULL SIMP RPMS FROM THIS TASK
+      #
+      #         desc <<-EOM
+      #         Build the #{@pkg_name} RPM.
+      #
+      #             By default, the package will be built to support a SIMP-6.X file structure.
+      #             To build the package for a different version of SIMP, export SIMP_BUILD_version=<5.X,4.X>
+      #         EOM
+      task :rpm => [:tar] do |_t, _args|
+        rpm_opts = [
+          %(-D 'buildroot #{@pkg_dir}/rpmbuild/BUILDROOT'),
+          %(-D 'builddir #{@pkg_dir}/rpmbuild/BUILD'),
+          %(-D '_sourcedir #{@rpm_srcdir}'),
+          %(-D '_rpmdir #{@pkg_dir}'),
+          %(-D '_srcrpmdir #{@pkg_dir}'),
+          %(-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'
+        rpm_opts << "-D 'pup_module_info_dir #{@base_dir}'"
+        Dir.chdir(@pkg_dir) do
+          # Copy in the materials required for the module builds
+          # The following are required to build successful RPMs using
+          # the new LUA-based RPM template
+          puppet_module_info_files = [
+            Dir.glob(%(#{@base_dir}/build/rpm_metadata/**)),
+            %(#{@base_dir}/CHANGELOG),
+            %(#{@base_dir}/metadata.json),
+          ].flatten
+
+          if @verbose
+            puts "==== pkg:rpm: @base_dir: #{@base_dir}"
+            puts "==== pkg:rpm: rpm_opts:\n #{rpm_opts.map { |x| "\n  #{x}" }.join}"
+            puts "==== pkg:rpm: puppet_module_info_files: #{puppet_module_info_files.map { |x| "\n  #{x}" }.join}"
+          end
 
-            puppet_module_info_files.each do |f|
-              if File.exist?(f)
-                FileUtils.cp_r(f, @rpm_srcdir, verbose: @verbose)
-              end
+          puppet_module_info_files.each do |f|
+            if File.exist?(f)
+              FileUtils.cp_r(f, @rpm_srcdir, verbose: @verbose)
             end
+          end
 
-            # Link in any misc artifacts that got dumped into 'dist' by other code
-            extra_deps = Dir.glob("*")
-            extra_deps.delete_if{|x| x =~ /(\.rpm$|(^(rpmbuild|logs|tmp$)))/}
+          # Link in any misc artifacts that got dumped into 'dist' by other code
+          extra_deps = Dir.glob('*')
+          extra_deps.delete_if { |x| x =~ %r{(\.rpm$|(^(rpmbuild|logs|tmp$)))} }
 
-            Dir.chdir(@rpm_srcdir) do
-              extra_deps.each do |dep|
-                unless File.exist?(dep)
-                  FileUtils.cp_r("../../#{dep}", dep, verbose: @verbose)
-                end
+          Dir.chdir(@rpm_srcdir) do
+            extra_deps.each do |dep|
+              unless File.exist?(dep)
+                FileUtils.cp_r("../../#{dep}", dep, verbose: @verbose)
               end
             end
+          end
 
-            FileUtils.mkdir_p('logs', verbose: @verbose)
-            FileUtils.mkdir_p('rpmbuild/BUILDROOT', verbose: @verbose)
-            FileUtils.mkdir_p('rpmbuild/BUILD', verbose: @verbose)
+          FileUtils.mkdir_p('logs', verbose: @verbose)
+          FileUtils.mkdir_p('rpmbuild/BUILDROOT', verbose: @verbose)
+          FileUtils.mkdir_p('rpmbuild/BUILD', verbose: @verbose)
 
-            srpms = [@full_pkg_name + '.src.rpm']
-            if require_rebuild?(srpms.first, @tar_dest)
-              # TODO: Uncomment this after revamping the tests to use a dependencies.yaml file
-              # Simp::Rake::Build::RpmDeps.generate_rpm_meta_files(@base_dir, {})
+          srpms = ["#{@full_pkg_name}.src.rpm"]
+          if require_rebuild?(srpms.first, @tar_dest)
+            # TODO: Uncomment this after revamping the tests to use a dependencies.yaml file
+            # Simp::Rake::Build::RpmDeps.generate_rpm_meta_files(@base_dir, {})
 
-              # Need to build the SRPM so that we can get the build dependencies
-              cmd = %(rpmbuild #{rpm_opts.join(' ')} -bs #{@spec_file} > logs/build.srpm.out 2> logs/build.srpm.err)
-              puts "==== pkg:rpm SRPM BUILD:   #{cmd}" if @verbose
-              %x(#{cmd})
+            # Need to build the SRPM so that we can get the build dependencies
+            cmd = %(rpmbuild #{rpm_opts.join(' ')} -bs #{@spec_file} > logs/build.srpm.out 2> logs/build.srpm.err)
+            puts "==== pkg:rpm SRPM BUILD:   #{cmd}" if @verbose
+            `#{cmd}`
 
-              srpms = File.read('logs/build.srpm.out').scan(%r(Wrote:\s+(.*\.rpm))).flatten
+            srpms = File.read('logs/build.srpm.out').scan(%r{Wrote:\s+(.*\.rpm)}).flatten
 
-              if srpms.empty?
-                raise <<-EOM
+            if srpms.empty?
+              raise <<-EOM
   Could not create SRPM for '#{@spec_info.basename}
     Error: #{File.read('logs/build.srpm.err')}
-                EOM
-              end
+              EOM
+            end
+          end
+
+          # Collect the built, or downloaded, RPMs
+          rpms = []
+
+          @spec_info.packages
+          expected_rpms = @spec_info.packages.map do |f|
+            latest_rpm = Dir.glob("#{f}-#{@spec_info.version}*.rpm").grep_v(%r{\.src\.rpm$}).map { |x|
+              # Convert them to objects
+              Simp::RPM.new(x)
+            }.max_by do |x|
+              # Sort by the full version of the package and return the one
+              # with the highest version
+              Gem::Version.new(x.full_version)
             end
 
-            # Collect the built, or downloaded, RPMs
-            rpms = []
-
-            @spec_info.packages
-            expected_rpms = @spec_info.packages.map{|f|
-              latest_rpm = Dir.glob("#{f}-#{@spec_info.version}*.rpm").select{|x|
-                # Get all local RPMs that are not SRPMs
-                x !~ /\.src\.rpm$/
-              }.map{|x|
-                # Convert them to objects
-                x = Simp::RPM.new(x)
-              }.sort_by{|x|
-                # Sort by the full version of the package and return the one
-                # with the highest version
-                Gem::Version.new(x.full_version)
-              }.last
-
-              if latest_rpm && (
-                  Gem::Version.new(latest_rpm.full_version) >=
-                  Gem::Version.new(@spec_info.full_version)
+            if latest_rpm && (
+                Gem::Version.new(latest_rpm.full_version) >=
+                Gem::Version.new(@spec_info.full_version)
               )
-                f = latest_rpm.rpm_name
-              else
-                f = "#{f}-#{@spec_info.full_version}-#{@spec_info.arch}.rpm"
-              end
-            }
+              latest_rpm.rpm_name
+            else
+              "#{f}-#{@spec_info.full_version}-#{@spec_info.arch}.rpm"
+            end
+          end
 
-            if expected_rpms.empty? || require_rebuild?(expected_rpms, srpms)
+          if expected_rpms.empty? || require_rebuild?(expected_rpms, srpms)
 
-              expected_rpms_data = expected_rpms.map{ |f|
-                if File.exist?(f)
-                  f = Simp::RPM.new(f)
-                else
-                  f = nil
-                end
-              }
+            expected_rpms_data = expected_rpms.map do |f|
+              if File.exist?(f)
+                Simp::RPM.new(f)
+              else
+                nil
+              end
+            end
 
-              require_rebuild = true
+            require_rebuild = true
 
-              # We need to rebuild if not *all* of the expected RPMs are present
-              unless expected_rpms_data.include?(nil)
-                # If all of the RPMs are signed, we do not need a rebuild
-                require_rebuild = !expected_rpms_data.compact.select{|x| !x.signature}.empty?
-              end
+            # We need to rebuild if not *all* of the expected RPMs are present
+            unless expected_rpms_data.include?(nil)
+              # If all of the RPMs are signed, we do not need a rebuild
+              require_rebuild = !expected_rpms_data.compact.reject { |x| x.signature }.empty?
+            end
 
-              if !require_rebuild
-                # We found all expected RPMs and they all had valid signatures
-                #
-                # Record the existing RPM metadata in the output file
-                rpms = expected_rpms
-              else
-                # Try a build
-                cmd = %(rpmbuild #{rpm_opts.join(' ')} --rebuild #{srpms.first} > logs/build.rpm.out 2> logs/build.rpm.err)
-                puts "==== pkg:rpm: #{cmd}" if @verbose
-                _result = %x(#{cmd})
-                puts _result if @verbose
-
-                # If the build failed, it was probably due to missing dependencies
-                unless $?.success?
-                  # Find the RPM build dependencies
-                  rpm_build_deps = %x(rpm -q -R -p #{srpms.first}).strip.split("\n")
-
-                  # RPM stuffs this in every time
-                  rpm_build_deps.delete_if {|x| x =~ /^rpmlib/}
-
-                  # See if we have the ability to install things
-                  unless Process.uid == 0
-                    unless %x(sudo -ln) =~ %r(NOPASSWD:\s+(ALL|yum( install)?))
-                      raise <<-EOM
+            if require_rebuild
+              # Try a build
+              cmd = %(rpmbuild #{rpm_opts.join(' ')} --rebuild #{srpms.first} > logs/build.rpm.out 2> logs/build.rpm.err)
+              puts "==== pkg:rpm: #{cmd}" if @verbose
+              _result = `#{cmd}`
+              puts _result if @verbose
+
+              # If the build failed, it was probably due to missing dependencies
+              unless $CHILD_STATUS.success?
+                # Find the RPM build dependencies
+                rpm_build_deps = `rpm -q -R -p #{srpms.first}`.strip.split("\n")
+
+                # RPM stuffs this in every time
+                rpm_build_deps.delete_if { |x| x =~ %r{^rpmlib} }
+
+                # See if we have the ability to install things
+                if Process.uid != 0 && `sudo -ln` !~ %r{NOPASSWD:\s+(ALL|yum( install)?)}
+                  raise <<-EOM
     Please install the following dependencies and try again:
-    #{rpm_build_deps.map{|x| x = "  * #{x}"}.join("\n")}
-    EOM
-                    end
-                  end
-
-                  rpm_build_deps.map! do |rpm|
-                    if rpm =~ %r((.*)\s+(?:<=|=|==)\s+(.+))
-                      rpm = "#{$1}-#{$2}"
-                    end
+    #{rpm_build_deps.map { |x| "  * #{x}" }.join("\n")}
+                  EOM
+                end
 
-                    rpm.strip
+                rpm_build_deps.map! do |rpm|
+                  if rpm =~ %r{(.*)\s+(?:<=|=|==)\s+(.+)}
+                    rpm = "#{::Regexp.last_match(1)}-#{::Regexp.last_match(2)}"
                   end
 
-                  yum_install_cmd = %(yum -y install '#{rpm_build_deps.join("' '")}')
-                  unless Process.uid == 0
-                    yum_install_cmd = 'sudo ' + yum_install_cmd
-                  end
-                  puts "==== pkg:rpm: #{yum_install_cmd}" if @verbose
+                  rpm.strip
+                end
+
+                yum_install_cmd = %(yum -y install '#{rpm_build_deps.join("' '")}')
+                unless Process.uid.zero?
+                  yum_install_cmd = "sudo #{yum_install_cmd}"
+                end
+                puts "==== pkg:rpm: #{yum_install_cmd}" if @verbose
 
-                  install_output = %x(#{yum_install_cmd} 2>&1)
+                install_output = `#{yum_install_cmd} 2>&1`
 
-                  if !$?.success? || (install_output =~ %r((N|n)o package))
-                    raise <<-EOM
+                if !$CHILD_STATUS.success? || (install_output =~ %r{(N|n)o package})
+                  raise <<-EOM
     Could not run #{yum_install_cmd}
       Error: #{install_output}
-                    EOM
-                  end
+                  EOM
                 end
+              end
 
-                # Try it again!
-                #
-                # If this doesn't work, something we can't fix automatically is wrong
-                cmd = %(rpmbuild #{rpm_opts.join(' ')} --rebuild #{srpms.first} > logs/build.rpm.out 2> logs/build.rpm.err)
-                puts "==== pkg:rpm: #{cmd}" if @verbose
-                %x(#{cmd})
+              # Try it again!
+              #
+              # If this doesn't work, something we can't fix automatically is wrong
+              cmd = %(rpmbuild #{rpm_opts.join(' ')} --rebuild #{srpms.first} > logs/build.rpm.out 2> logs/build.rpm.err)
+              puts "==== pkg:rpm: #{cmd}" if @verbose
+              `#{cmd}`
 
-                rpms = File.read('logs/build.rpm.out').scan(%r(Wrote:\s+(.*\.rpm))).flatten - srpms
+              rpms = File.read('logs/build.rpm.out').scan(%r{Wrote:\s+(.*\.rpm)}).flatten - srpms
 
-                if rpms.empty?
-                  raise <<-EOM
+              if rpms.empty?
+                raise <<-EOM
     Could not create RPM for '#{@spec_info.basename}
       Error: #{File.read('logs/build.rpm.err')}
-                  EOM
-                end
+                EOM
               end
+            else
+              # We found all expected RPMs and they all had valid signatures
+              #
+              # Record the existing RPM metadata in the output file
+              rpms = expected_rpms
+            end
 
-              # Prevent overwriting the last good metadata file
-              raise %(Could not find any valid RPMs for '#{@spec_info.basename}') if rpms.empty?
+            # Prevent overwriting the last good metadata file
+            raise %(Could not find any valid RPMs for '#{@spec_info.basename}') if rpms.empty?
 
-              Simp::RPM.create_rpm_build_metadata(File.expand_path(@base_dir), srpms, rpms)
-            end
+            Simp::RPM.create_rpm_build_metadata(File.expand_path(@base_dir), srpms, rpms)
           end
         end
       end
     end
+  end
 
-   def define_pkg_check_rpm_changelog
-      # :pkg:check_rpm_changelog
-      # -----------------------------
-      namespace :pkg do
-        desc <<-EOM
+  def define_pkg_check_rpm_changelog
+    # :pkg:check_rpm_changelog
+    # -----------------------------
+    namespace :pkg do
+      desc <<-EOM
         Check the #{@pkg_name} RPM changelog using the 'rpm' command.
 
         This task will fail if 'rpm' detects any changelog problems,
         such as changelog entries not being in reverse chronological
         order.
-        EOM
-        task :check_rpm_changelog, [:verbose] do |t,args|
-          if args[:verbose].to_s == 'true'
-            verbose = true
-          else
-            verbose = false
-          end
-          Simp::RelChecks::check_rpm_changelog(@base_dir, @spec_file, verbose)
-        end
+      EOM
+      task :check_rpm_changelog, [:verbose] do |_t, args|
+        verbose = args[:verbose].to_s == 'true'
+        Simp::RelChecks.check_rpm_changelog(@base_dir, @spec_file, verbose)
       end
     end
+  end
 
-    def define_pkg_check_version
-      namespace :pkg do
-        # :pkg:check_version
-        # -----------------------------
-        desc <<-EOM
+  def define_pkg_check_version
+    namespace :pkg do
+      # :pkg:check_version
+      # -----------------------------
+      desc <<-EOM
         Ensure that #{@pkg_name} has a properly updated version number.
-        EOM
-        task :check_version do |t,args|
-          require 'json'
-
-          # Get the current version
-          if File.exist?('metadata.json')
-            mod_version = JSON.load(File.read('metadata.json'))['version'].strip
-            success_msg = "#{@pkg_name}: Version #{mod_version} up to date"
-
-            # If we have no tags, we need a new version
-            if %x(git tag).strip.empty?
-              puts "#{@pkg_name}: New Version Required"
-            else
-              # See if the module is newer than all tags
-              matching_tag = %x(git tag --points-at HEAD).strip.split("\n").first
+      EOM
+      task :check_version do |_t, _args|
+        require 'json'
 
-              if matching_tag.nil? || matching_tag.empty?
-                # We don't have a matching release
-                # Get the closest tag
-                nearest_tag = %x(git describe --abbrev=0 --tags).strip
+        # Get the current version
+        if File.exist?('metadata.json')
+          mod_version = JSON.parse(File.read('metadata.json'))['version'].strip
+          success_msg = "#{@pkg_name}: Version #{mod_version} up to date"
 
-                if mod_version == nearest_tag
-                  puts "#{@pkg_name}: Error: metadata.json needs to be updated past #{mod_version}"
-                else
-                  # Check the CHANGELOG Version
-                  if File.exist?('CHANGELOG')
-                    changelog = File.read('CHANGELOG')
-                    changelog_version = nil
-
-                    # Find the first date line
-                    changelog.each_line do |line|
-                      if line =~ /\*.*(\d+\.\d+\.\d+)(-\d+)?\s*$/
-                        changelog_version = $1
-                        break
-                      end
-                    end
-
-                    if changelog_version
-                      if changelog_version == mod_version
-                        puts success_msg
-                      else
-                        puts "#{@pkg_name}: Error: CHANGELOG version #{changelog_version} out of date for version #{mod_version}"
-                      end
-                    else
-                      puts "#{@pkg_name}: Error: No CHANGELOG version found"
-                    end
-                  else
-                    puts "#{@pkg_name}: Warning: No CHANGELOG found"
+          # If we have no tags, we need a new version
+          if `git tag`.strip.empty?
+            puts "#{@pkg_name}: New Version Required"
+          else
+            # See if the module is newer than all tags
+            matching_tag = `git tag --points-at HEAD`.strip.split("\n").first
+
+            if matching_tag.nil? || matching_tag.empty?
+              # We don't have a matching release
+              # Get the closest tag
+              nearest_tag = `git describe --abbrev=0 --tags`.strip
+
+              if mod_version == nearest_tag
+                puts "#{@pkg_name}: Error: metadata.json needs to be updated past #{mod_version}"
+              elsif File.exist?('CHANGELOG')
+                # Check the CHANGELOG Version
+                changelog = File.read('CHANGELOG')
+                changelog_version = nil
+
+                # Find the first date line
+                changelog.each_line do |line|
+                  if line =~ %r{\*.*(\d+\.\d+\.\d+)(-\d+)?\s*$}
+                    changelog_version = ::Regexp.last_match(1)
+                    break
                   end
                 end
-              else
-                if mod_version != matching_tag
-                  puts "#{@pkg_name}: Error: Tag #{matching_tag} does not match version #{mod_version}"
+
+                if changelog_version
+                  if changelog_version == mod_version
+                    puts success_msg
+                  else
+                    puts "#{@pkg_name}: Error: CHANGELOG version #{changelog_version} out of date for version #{mod_version}"
+                  end
                 else
-                  puts success_msg
+                  puts "#{@pkg_name}: Error: No CHANGELOG version found"
                 end
+              else
+                puts "#{@pkg_name}: Warning: No CHANGELOG found"
               end
+            elsif mod_version != matching_tag
+              puts "#{@pkg_name}: Error: Tag #{matching_tag} does not match version #{mod_version}"
+            else
+              puts success_msg
             end
-          else
-            puts "#{@pkg_name}: No metadata.json found"
           end
+        else
+          puts "#{@pkg_name}: No metadata.json found"
         end
       end
     end
+  end
 
-    def define_pkg_compare_latest_tag
-      namespace :pkg do
-        desc <<-EOM
+  def define_pkg_compare_latest_tag
+    namespace :pkg do
+      desc <<-EOM
         Compare to latest tag.
           ARGS:
             * :tags_source => Set to the remote from which the tags for this
@@ -552,24 +538,20 @@ module Simp::Rake
           - rakelib directory
           - spec directory
           - doc directory
-        EOM
-        task :compare_latest_tag, [:tags_source, :verbose] do |t,args|
-          tags_source = args[:tags_source].nil? ? 'origin' : args[:tags_source]
-          if args[:verbose].to_s == 'true'
-            verbose = true
-          else
-            verbose = false
-          end
-          Simp::RelChecks::compare_latest_tag(@base_dir, tags_source, verbose)
-        end
+      EOM
+      task :compare_latest_tag, [:tags_source, :verbose] do |_t, args|
+        tags_source = args[:tags_source].nil? ? 'origin' : args[:tags_source]
+        verbose = args[:verbose].to_s == 'true'
+        Simp::RelChecks.compare_latest_tag(@base_dir, tags_source, verbose)
       end
     end
+  end
 
-    def define_pkg_create_tag_changelog
-      namespace :pkg do
-        # :pkg:create_tag_changelog
-        # -----------------------------
-        desc <<-EOM
+  def define_pkg_create_tag_changelog
+    namespace :pkg do
+      # :pkg:create_tag_changelog
+      # -----------------------------
+      desc <<-EOM
         Generate an appropriate changelog for an annotated tag from a
         component's CHANGELOG or RPM spec file.
 
@@ -623,32 +605,27 @@ module Simp::Rake
             - The weekday for a changelog entry for the latest version
               does not match the date specified.
 
-        EOM
-        task :create_tag_changelog, [:verbose] => [:check_rpm_changelog] do |t,args|
-          if args[:verbose].to_s == 'true'
-            verbose = true
-          else
-            verbose = false
-          end
-          puts Simp::RelChecks::create_tag_changelog(@base_dir, verbose)
-        end
+      EOM
+      task :create_tag_changelog, [:verbose] => [:check_rpm_changelog] do |_t, args|
+        verbose = args[:verbose].to_s == 'true'
+        puts Simp::RelChecks.create_tag_changelog(@base_dir, verbose)
       end
     end
+  end
 
-    # ------------------------------------------------------------------------------
-    # helper methods
-    # ------------------------------------------------------------------------------
-    # Return True if any of the 'old' Array are newer than the 'new' Array
-    def require_rebuild?(new, old)
-      return true if ( Array(old).empty? || Array(new).empty?)
-
-      Array(new).each do |new_file|
-        return true unless File.exist?(new_file)
+  # ------------------------------------------------------------------------------
+  # helper methods
+  # ------------------------------------------------------------------------------
+  # Return True if any of the 'old' Array are newer than the 'new' Array
+  def require_rebuild?(new, old)
+    return true if Array(old).empty? || Array(new).empty?
 
-        return true unless uptodate?(new_file, Array(old))
-      end
+    Array(new).each do |new_file|
+      return true unless File.exist?(new_file)
 
-      return false
+      return true unless uptodate?(new_file, Array(old))
     end
+
+    false
   end
 end