simp-rake-helpers 5.25.0 → 6.0.0

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

@@ -1,231 +1,227 @@
 #!/usr/bin/rake -T
+# frozen_string_literal: true
 
 require 'simp/rake/build/constants'
 
 module Simp; end
 module Simp::Rake; end
-module Simp::Rake::Build
 
-  class Tar < ::Rake::TaskLib
-    include Simp::Rake::Build::Constants
+class Simp::Rake::Build::Tar < Rake::TaskLib
+  include Simp::Rake::Build::Constants
 
-    def initialize( base_dir )
-      init_member_vars( base_dir )
+  def initialize(base_dir)
+    init_member_vars(base_dir)
 
-      define_tasks
-    end
+    define_tasks
+  end
 
-    # define rake tasks
-    def define_tasks
-      namespace :tar do
-        task :prep do
-          if $simp6
-            @build_dir = $simp6_build_dir || @distro_build_dir
-            @dvd_src = File.join(@build_dir, File.basename(@dvd_src))
-          end
+  # define rake tasks
+  def define_tasks
+    namespace :tar do
+      task :prep do
+        if $simp6
+          @build_dir = $simp6_build_dir || @distro_build_dir
+          @dvd_src = File.join(@build_dir, File.basename(@dvd_src))
+        end
 
-          if $tarball_tgt
-            @dvd_dir = File.dirname($tarball_tgt)
-          end
+        if $tarball_tgt
+          @dvd_dir = File.dirname($tarball_tgt)
         end
+      end
 
-        def get_simp_version
-          simp_rpm = Dir.glob("#{@build_dir}/SIMP/RPMS/*/simp-[0-9]*.rpm").max_by {|f| File.mtime(f)}
-          fail("Could not find simp main RPM in output directory!") unless simp_rpm
+      def get_simp_version
+        simp_rpm = Dir.glob("#{@build_dir}/SIMP/RPMS/*/simp-[0-9]*.rpm").max_by { |f| File.mtime(f) }
+        raise('Could not find simp main RPM in output directory!') unless simp_rpm
 
-          simp_version = Simp::RPM.new(simp_rpm).full_version
+        simp_version = Simp::RPM.new(simp_rpm).full_version
 
-          # For picking up the correct RPM template
-          ENV['SIMP_BUILD_version'] ||= simp_version
+        # For picking up the correct RPM template
+        ENV['SIMP_BUILD_version'] ||= simp_version
 
-          return simp_version
-        end
+        simp_version
+      end
 
-        ##############################################################################
-        # Main tasks
-        ##############################################################################
-
-        task :validate => [:prep] do |t,args|
-          required_rpms = {
-            'noarch' => [
-              'rubygem-simp-cli',
-              'simp',
-              'simp-gpgkeys',
-              'simp-utils',
-              'simp-vendored-r10k'
-            ]
-          }
-
-          simp_version = get_simp_version
-
-          if Gem::Version.new(simp_version) < Gem::Version.new('6.4.0')
-            required_rpms['noarch'] << 'simp-rsync'
-          else
-            required_rpms['noarch'] << 'simp-rsync-skeleton'
-            required_rpms['noarch'] << 'simp-environment-skeleton'
-            required_rpms['noarch'] << 'simp-selinux-policy'
-          end
+      ##############################################################################
+      # Main tasks
+      ##############################################################################
+
+      task :validate => [:prep] do |_t, _args|
+        required_rpms = {
+          'noarch' => [
+            'rubygem-simp-cli',
+            'simp',
+            'simp-gpgkeys',
+            'simp-utils',
+            'simp-vendored-r10k',
+          ]
+        }
+
+        simp_version = get_simp_version
+
+        if Gem::Version.new(simp_version) < Gem::Version.new('6.4.0')
+          required_rpms['noarch'] << 'simp-rsync'
+        else
+          required_rpms['noarch'] << 'simp-rsync-skeleton'
+          required_rpms['noarch'] << 'simp-environment-skeleton'
+          required_rpms['noarch'] << 'simp-selinux-policy'
+        end
 
-          rpm_dir = File.join(@build_dir,'SIMP','RPMS')
-          fail("Could not find directory '#{rpm_dir}'") unless File.directory?(rpm_dir)
+        rpm_dir = File.join(@build_dir, 'SIMP', 'RPMS')
+        raise("Could not find directory '#{rpm_dir}'") unless File.directory?(rpm_dir)
 
-          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(rpm_dir) do
+          failures = []
+          required_rpms.each_key do |dir|
+            raise("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
+            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:'] +
-                failures +
-                ['Did "dist/logs/last_rpm_build_metadata.yaml" get generated in the build directory?']
+          unless failures.empty?
+            msg = ['Error: Could not find the following packages:'] +
+                  failures +
+                  ['Did "dist/logs/last_rpm_build_metadata.yaml" get generated in the build directory?']
 
-              fail(msg.join("\n"))
-            end
+            raise(msg.join("\n"))
           end
         end
+      end
 
-=begin
-        desc <<-EOM
-          Build the DVD tarball(s).
-
-            * :key - What key to use for signing the RPMs
-            * :docs - Whether or not to build the documentation
-        EOM
-=end
-        task :build,[:key,:docs] => ['pkg:build','pkg:checksig','tar:validate'] do |t,args|
-          args.with_defaults(:docs => 'true')
-
-          if $tarball_tgt
-            target_dists = ['simp6']
-          else
-            target_dists = @target_dists
+      #         desc <<-EOM
+      #           Build the DVD tarball(s).
+      #
+      #             * :key - What key to use for signing the RPMs
+      #             * :docs - Whether or not to build the documentation
+      #         EOM
+      task :build, [:key, :docs] => ['pkg:build', 'pkg:checksig', 'tar:validate'] do |t, args|
+        args.with_defaults(:docs => 'true')
+
+        target_dists = if $tarball_tgt
+                         ['simp6']
+                       else
+                         @target_dists
+                       end
+
+        Parallel.map(
+          target_dists,
+          :in_processes => get_cpu_limit,
+          :process => t.name,
+        ) do |dist|
+          base_dir = if $tarball_tgt
+                       "#{@dvd_dir}/staging"
+                     else
+                       "#{@dvd_dir}/#{dist}/staging"
+                     end
+
+          destdir = "#{base_dir}/SIMP"
+
+          # Build the staging area
+          remove_entry_secure(destdir) if File.exist?(destdir)
+
+          mkdir_p(destdir)
+
+          Simp::RPM.copy_wo_vcs(@dvd_src, '.', base_dir)
+
+          # Copy in the GPG Public Keys from @build_dir
+          mkdir_p("#{destdir}/GPGKEYS")
+          ln(Dir.glob("#{@build_dir}/GPGKEYS/RPM-GPG-KEY*"), "#{destdir}/GPGKEYS", { :force => true })
+
+          # Copy in the GPG Public Keys packaged by simp-gpgkeys
+          simp_gpgkeys = File.join(@src_dir, 'assets', 'gpgkeys', 'GPGKEYS')
+          if Dir.exist?(simp_gpgkeys)
+            ln(Dir.glob("#{simp_gpgkeys}/RPM-GPG-KEY*"), "#{destdir}/GPGKEYS", { :force => true })
           end
 
-          Parallel.map(
-            target_dists,
-            :in_processes => get_cpu_limit,
-            :process => t.name
-          ) do |dist|
-            if $tarball_tgt
-              base_dir = "#{@dvd_dir}/staging"
-            else
-              base_dir = "#{@dvd_dir}/#{dist}/staging"
-            end
-
-            destdir = "#{base_dir}/SIMP"
-
-            # Build the staging area
-            remove_entry_secure(destdir) if File.exist?(destdir)
+          # Copy in the auto-build RPMs
+          Dir.chdir("#{@build_dir}/SIMP/RPMS") do
+            Dir.glob('*').each do |type|
+              dest_type = type
+              next unless File.directory?(type)
 
-            mkdir_p(destdir)
-
-            Simp::RPM.copy_wo_vcs(@dvd_src,".",base_dir)
+              if %r{i.*86}.match?(type)
+                dest_type = 'i386'
+              end
 
-            # Copy in the GPG Public Keys from @build_dir
-            mkdir_p("#{destdir}/GPGKEYS")
-            ln(Dir.glob("#{@build_dir}/GPGKEYS/RPM-GPG-KEY*"), "#{destdir}/GPGKEYS", { :force => true })
+              mkdir_p("#{destdir}/#{dest_type}")
 
-            # Copy in the GPG Public Keys packaged by simp-gpgkeys
-            simp_gpgkeys = File.join(@src_dir, 'assets', 'gpgkeys', 'GPGKEYS')
-            if Dir.exist?(simp_gpgkeys)
-              ln(Dir.glob("#{simp_gpgkeys}/RPM-GPG-KEY*"), "#{destdir}/GPGKEYS", { :force => true })
+              Dir.chdir(type) do
+                ln(Dir.glob("*.#{type}.rpm"), "#{destdir}/#{dest_type}", { :force => true })
+              end
             end
+          end
 
-            # Copy in the auto-build RPMs
-            Dir.chdir("#{@build_dir}/SIMP/RPMS") do
-              Dir.glob('*').each do |type|
-                dest_type = type
-                if File.directory?(type)
-                  if type =~ /i.*86/
-                    dest_type = 'i386'
-                  end
-
-                  mkdir_p("#{destdir}/#{dest_type}")
+          next unless args.docs.casecmp('true').zero?
 
-                  Dir.chdir(type) do
-                    ln(Dir.glob("*.#{type}.rpm"), "#{destdir}/#{dest_type}", { :force => true })
-                  end
-                end
-              end
+          # Finally, the PDF docs if they exist.
+          pdfs = Dir.glob("#{@src_dir}/doc/pdf/*")
+          if pdfs.empty?
+            # If we don't have PDFs in the directory, yank them out of the
+            # RPM itself!
+            simp_doc_rpm = Dir.glob("#{@build_dir}/SIMP/RPMS/*/simp-doc*.rpm").last
+            unless simp_doc_rpm
+              raise(StandardError, 'Error: Could not find simp-doc*.rpm in the build, something went very wrong')
             end
 
-            if args.docs.casecmp('true') == 0
-              # Finally, the PDF docs if they exist.
-              pdfs = Dir.glob("#{@src_dir}/doc/pdf/*")
-              unless pdfs.empty?
-                pdfs.each do |pdf|
-                  cp(pdf,base_dir)
-                end
-              else
-                # If we don't have PDFs in the directory, yank them out of the
-                # RPM itself!
-                simp_doc_rpm = Dir.glob("#{@build_dir}/SIMP/RPMS/*/simp-doc*.rpm").last
-                unless simp_doc_rpm
-                  raise(StandardError,"Error: Could not find simp-doc*.rpm in the build, something went very wrong")
-                end
-
-                Dir.mktmpdir do |dir|
-                  Dir.chdir(dir) do
-                    %x{rpm2cpio #{simp_doc_rpm} | cpio -u --quiet --warning none -ivd ./usr/share/doc/simp-*/pdf/SIMP*.pdf 2>&1 > /dev/null}
-                    pdf_docs = Dir.glob("usr/share/doc/simp-*/pdf/*.pdf")
+            Dir.mktmpdir do |dir|
+              Dir.chdir(dir) do
+                `rpm2cpio #{simp_doc_rpm} | cpio -u --quiet --warning none -ivd ./usr/share/doc/simp-*/pdf/SIMP*.pdf 2>&1 > /dev/null`
+                pdf_docs = Dir.glob('usr/share/doc/simp-*/pdf/*.pdf')
 
-                    if pdf_docs.empty?
-                      raise(StandardError,"Error: Could not find any PDFs in the simp-doc RPM, aborting.")
-                    end
+                if pdf_docs.empty?
+                  raise(StandardError, 'Error: Could not find any PDFs in the simp-doc RPM, aborting.')
+                end
 
-                    pdf_docs.each do |pdf|
-                      cp(pdf,base_dir)
-                    end
-                  end
+                pdf_docs.each do |pdf|
+                  cp(pdf, base_dir)
                 end
               end
             end
+          else
+            pdfs.each do |pdf|
+              cp(pdf, base_dir)
+            end
           end
+        end
+
+        # FIXME: this is a horribad way of sharing with `build:auto`
+        $simp_tarballs = {}
 
-          # FIXME: this is a horribad way of sharing with `build:auto`
-          $simp_tarballs = {}
+        target_dists = if $tarball_tgt
+                         ['simp6']
+                       else
+                         @target_dists
+                       end
 
+        target_dists.each do |dist|
           if $tarball_tgt
-            target_dists = ['simp6']
+            dvd_tarball = File.basename($tarball_tgt)
+            base_dir = "#{@dvd_dir}/staging"
           else
-            target_dists = @target_dists
+            base_dir = "#{@dvd_dir}/#{dist}/staging"
+            dvd_name = ['SIMP', 'DVD', dist, get_simp_version]
+            dvd_tarball = "#{dvd_name.join('-')}.tar.gz"
           end
 
-          target_dists.each do |dist|
-            if $tarball_tgt
-              dvd_tarball = File.basename($tarball_tgt)
-              base_dir = "#{@dvd_dir}/staging"
-            else
-              base_dir = "#{@dvd_dir}/#{dist}/staging"
-              dvd_name = [ 'SIMP', 'DVD', dist, get_simp_version ]
-              dvd_tarball = "#{dvd_name.join('-')}.tar.gz"
-            end
+          mkdir_p(base_dir)
 
-            mkdir_p(base_dir)
-
-            Dir.chdir(base_dir) do
-              sh %{tar --owner 0 --group 0 --exclude-vcs --mode=u=rwX,g=rX,o=rX -cpzf "../#{dvd_tarball}" ./*}
-              unless $tarball_tgt
-                mv("../#{dvd_tarball}",@dvd_dir)
-              end
+          Dir.chdir(base_dir) do
+            sh %(tar --owner 0 --group 0 --exclude-vcs --mode=u=rwX,g=rX,o=rX -cpzf "../#{dvd_tarball}" ./*)
+            unless $tarball_tgt
+              mv("../#{dvd_tarball}", @dvd_dir)
             end
-
-            puts "Package DVD: #{@dvd_dir}/#{dvd_tarball}"
-            $simp_tarballs[dist] = "#{@dvd_dir}/#{dvd_tarball}"
-            rm_rf(base_dir)
           end
+
+          puts "Package DVD: #{@dvd_dir}/#{dvd_tarball}"
+          $simp_tarballs[dist] = "#{@dvd_dir}/#{dvd_tarball}"
+          rm_rf(base_dir)
         end
       end
     end
   end
 end
-

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

@@ -1,127 +1,125 @@
+# frozen_string_literal: true
+
 require 'ruby-progressbar'
 require 'simp/rake/build/constants'
 
 module Simp; end
 module Simp::Rake; end
-module Simp::Rake::Build
 
-  class Unpack < ::Rake::TaskLib
-    include Simp::Rake::Build::Constants
+class Simp::Rake::Build::Unpack < Rake::TaskLib
+  include Simp::Rake::Build::Constants
 
-    def initialize( base_dir )
-      init_member_vars( base_dir )
+  def initialize(base_dir)
+    init_member_vars(base_dir)
 
-      define_tasks
-    end
+    define_tasks
+  end
 
-    def define_tasks
-      #!/usr/bin/rake -T
-
-=begin
-      desc "Unpack an ISO. Unpacks either a RHEL or CentOS ISO into
-      <targetdir>/<RHEL|CentOS><version>-<arch>.
-       * :iso_path - Full path to the ISO image to unpack.
-       * :merge - If true, then automatically merge any existing
-         directories. Defaults to prompting.
-       * :targetdir - The parent directory for the to-be-created directory
-         containing the unpacked ISO. Defaults to the current directory.
-       * :isoinfo - The isoinfo executable to use to extract stuff from the ISO.
-         Defaults to 'isoinfo'.
-       * :version - optional override for the <version> number (e.g., '7.0' instead of '7')
-       * :exclude_repos - Don't unpack repos or packages when true
-
-      "
-=end
-      task :unpack,[:iso_path, :merge, :targetdir, :isoinfo, :version, :exclude_repos] do |t,args|
-        args.with_defaults(
-          :iso_path      => '',
-          :isoinfo       => 'isoinfo',
-          :targetdir     => Dir.pwd,
-          :merge         => false,
-          :version       => false,
-          :exclude_repos => false,
-        )
-
-        iso_path      = args.iso_path
-        iso_info      = which(args.isoinfo)
-        targetdir     = args.targetdir
-        merge         = args.merge
-        version       = args.version
-        exclude_repos = args.exclude_repos
-
-        # Checking for valid arguments
-        File.exist?(args.iso_path) or
-          fail "Error: You must provide the full path and filename of the ISO image."
-
-        %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('-')
-
-        # Mappings of ISO name to target directory name.
-        # This is a hash of hashes to provide room for growth.
-        dvd_map = {
-          # RHEL structure as provided from RHN:
-          #   rhel-server-<version>-<arch>-<whatever>
-          'rhel' => {
-            'baseos'  => 'RedHat',
-            'version' => version || pieces[2],
-            'arch'    => pieces[3]
-          },
-          # CentOS structure as provided from the CentOS website:
-          #   CentOS-<version>-<arch>-<whatever>
-          'CentOS' => {
-            'baseos'  => 'CentOS',
-            'version' => version || pieces[1],
-            'arch'    => pieces[2]
-          }
+  def define_tasks
+    # !/usr/bin/rake -T
+
+    #       desc "Unpack an ISO. Unpacks either a RHEL or CentOS ISO into
+    #       <targetdir>/<RHEL|CentOS><version>-<arch>.
+    #        * :iso_path - Full path to the ISO image to unpack.
+    #        * :merge - If true, then automatically merge any existing
+    #          directories. Defaults to prompting.
+    #        * :targetdir - The parent directory for the to-be-created directory
+    #          containing the unpacked ISO. Defaults to the current directory.
+    #        * :isoinfo - The isoinfo executable to use to extract stuff from the ISO.
+    #          Defaults to 'isoinfo'.
+    #        * :version - optional override for the <version> number (e.g., '7.0' instead of '7')
+    #        * :exclude_repos - Don't unpack repos or packages when true
+    #
+    #       "
+    task :unpack, [:iso_path, :merge, :targetdir, :isoinfo, :version, :exclude_repos] do |_t, args|
+      args.with_defaults(
+        :iso_path => '',
+        :isoinfo => 'isoinfo',
+        :targetdir => Dir.pwd,
+        :merge => false,
+        :version => false,
+        :exclude_repos => false,
+      )
+
+      iso_path      = args.iso_path
+      iso_info      = which(args.isoinfo)
+      targetdir     = args.targetdir
+      merge         = args.merge
+      version       = args.version
+      exclude_repos = args.exclude_repos
+
+      # Checking for valid arguments
+      File.exist?(args.iso_path) or
+        raise 'Error: You must provide the full path and filename of the ISO image.'
+
+      `file --keep-going '#{iso_path}'`.split(':')[1..].to_s.include?('ISO') or
+        raise 'Error: The file provided is not a valid ISO.'
+
+      pieces = File.basename(iso_path, '.iso').split('-')
+
+      # Mappings of ISO name to target directory name.
+      # This is a hash of hashes to provide room for growth.
+      dvd_map = {
+        # RHEL structure as provided from RHN:
+        #   rhel-server-<version>-<arch>-<whatever>
+        'rhel' => {
+          'baseos' => 'RedHat',
+          'version' => version || pieces[2],
+          'arch' => pieces[3]
+        },
+        # CentOS structure as provided from the CentOS website:
+        #   CentOS-<version>-<arch>-<whatever>
+        'CentOS' => {
+          'baseos' => 'CentOS',
+          'version' => version || pieces[1],
+          'arch' => pieces[2]
         }
-
-        # Determine the target directory
-        map = dvd_map[pieces[0]]
-        map.nil? and fail "Error: Could not find a mapping for '#{iso_path}'."
-        out_dir = "#{File.expand_path(targetdir)}/#{map['baseos']}#{map['version']}-#{map['arch']}"
-
-        # Attempt a merge
-        if File.exist?(out_dir) and merge.to_s.strip == 'false'
-          puts "Directory '#{out_dir}' already exists! Would you like to merge? [Yn]?"
-          unless $stdin.gets.strip.match(/^(y.*|$)/i)
-            puts "Skipping #{iso_path}"
-            next
-          end
+      }
+
+      # Determine the target directory
+      map = dvd_map[pieces[0]]
+      map.nil? and raise "Error: Could not find a mapping for '#{iso_path}'."
+      out_dir = "#{File.expand_path(targetdir)}/#{map['baseos']}#{map['version']}-#{map['arch']}"
+
+      # Attempt a merge
+      if File.exist?(out_dir) && (merge.to_s.strip == 'false')
+        puts "Directory '#{out_dir}' already exists! Would you like to merge? [Yn]?"
+        unless $stdin.gets.strip.match?(%r{^(y.*|$)}i)
+          puts "Skipping #{iso_path}"
+          next
         end
+      end
 
-        puts "Target dir: #{out_dir}"
-        mkdir_p(out_dir)
+      puts "Target dir: #{out_dir}"
+      mkdir_p(out_dir)
 
-        # Unpack the ISO
-        iso_toc = %x{#{iso_info} -Rf -i #{iso_path}}.split("\n")
-        iso_toc.each do |iso_entry|
-          iso_toc.delete(File.dirname(iso_entry))
-        end
+      # Unpack the ISO
+      iso_toc = `#{iso_info} -Rf -i #{iso_path}`.split("\n")
+      iso_toc.each do |iso_entry|
+        iso_toc.delete(File.dirname(iso_entry))
+      end
 
-        progress = ProgressBar.create(:title => 'Unpacking', :total => iso_toc.size)
-
-        iso_toc.each do |iso_entry|
-          target = "#{out_dir}#{iso_entry}"
-          unless File.exist?(target)
-            if exclude_repos && target =~ %r{\.rpm$|repodata|repomd.xml}
-              puts "  [exclude_repos] SKIPPING repo/package file: #{target}"
-              next
-            end
-            FileUtils.mkdir_p(File.dirname(target))
-            system("#{iso_info} -R -x #{iso_entry} -i #{iso_path} > #{target}")
-          end
-          if progress
-            progress.increment
-          else
-            print "#"
+      progress = ProgressBar.create(:title => 'Unpacking', :total => iso_toc.size)
+
+      iso_toc.each do |iso_entry|
+        target = "#{out_dir}#{iso_entry}"
+        unless File.exist?(target)
+          if exclude_repos && target =~ %r{\.rpm$|repodata|repomd.xml}
+            puts "  [exclude_repos] SKIPPING repo/package file: #{target}"
+            next
           end
+          FileUtils.mkdir_p(File.dirname(target))
+          system("#{iso_info} -R -x #{iso_entry} -i #{iso_path} > #{target}")
+        end
+        if progress
+          progress.increment
+        else
+          print '#'
         end
-
-        # The repodata directory needs to exist (but not be copied) for el7 distros
-        FileUtils.mkdir("#{out_dir}/repodata") if version.start_with?('7')
       end
+
+      # The repodata directory needs to exist (but not be copied) for el7 distros
+      FileUtils.mkdir("#{out_dir}/repodata") if version.start_with?('7')
     end
   end
 end