simp-rake-helpers 4.1.1 → 5.0.0

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

@@ -1,4 +1,5 @@
 require 'bundler'
+require 'simp/yum'
 require 'simp/rake'
 require 'simp/rake/build/constants'
 
@@ -112,28 +113,8 @@ module Simp::Rake::Build
           # Helpers
           ##############################################################################
 
-          # This is a complete hack to get around the fact that yumdownloader doesn't
-          # cache properly when setting TMPDIR.
-          def clean_yumdownloader_cache_dir
-            require 'etc'
-
-            tmp_dir = '/tmp'
-            tmp_dir = ENV['TMPDIR'] if ENV['TMPDIR']
-
-            Dir.glob("#{tmp_dir}/yum-#{Etc.getlogin}-*").each do |cache_dir|
-              cache_dir = File.expand_path(cache_dir)
-
-              puts "Cleaning Yumdownloader Cache Dir '#{cache_dir}'"
-              begin
-                rm_rf(cache_dir)
-              rescue Exception => e
-                puts "Could not remove cache Dir: #{e}"
-              end
-            end
-          end
-
           # Return the target directory
-          # Expects one argument wich is the 'arguments' hash to one of the tasks.
+          # Expects one argument which is the 'arguments' hash to one of the tasks.
           def get_target_dir(args)
             if $simp6
               return @build_base_dir
@@ -156,49 +137,11 @@ module Simp::Rake::Build
           end
 
           # Return where YUM finds the passed RPM
-          def get_rpm_source(rpm,yum_conf)
-            # Do we have what we need?
-
-            unless @have_yumdownloader
-              %x(yumdownloader --version > /dev/null 2>&1)
-
-              if $?.exitstatus == 127
-                fail("Error: Could not find 'yumdownloader'. Please install it and try again.")
-              end
-              @have_yumdownloader = true
-            end
-
-            source = nil
-
+          def get_rpm_source(rpm, yum_conf)
             puts("Looking up: #{rpm}")
-            sources = %x(yumdownloader -c #{yum_conf} --urls #{File.basename(rpm,'.rpm')} 2>/dev/null )
-
-            unless $?.success?
-              raise(SIMPBuildException,"Could not find a download source")
-            end
-
-            sources = sources.split("\n").grep(%r(\.rpm$))
-
-            if sources.empty?
-              raise(SIMPBuildException,'No Sources found')
-            else
-              native_sources = sources.grep(%r((#{@build_arch}|noarch)\.rpm$))
-
-              # One entry, one success
-              if native_sources.size == 1
-                source = native_sources.first
-              # More than one entry is no good.
-              elsif native_sources.size > 1
-                raise(SIMPBuildException,'More than one file found')
-              # The only entry found was for a non-native architecure
-              # This means that someone specified the arch explicitly at the
-              # command line and we should take it.
-              else
-                source = sources.first
-              end
-            end
+            yum_helper = Simp::YUM.new(yum_conf)
 
-            return source
+            return yum_helper.get_source(rpm, @build_arch)
           end
 
           # Snag an RPM via YUM.
@@ -206,35 +149,18 @@ module Simp::Rake::Build
           #
           # If passed a source, simply downloads the file into the packages directory
           def download_rpm(rpm, yum_conf, source=nil, distro_dir=Dir.pwd)
+            yum_helper = Simp::YUM.new(yum_conf)
+
             # We're doing this so that we can be 100% sure that we're pulling the RPM
             # from where the last command indicated. YUM can choose multiple sources
             # and we definitely want the one that we actually state!
-            source = get_rpm_source(rpm,yum_conf) unless source
+            source = yum_helper.get_source(rpm) unless source
 
             Dir.chdir('packages') do
               full_pkg = source.split('/').last
               unless File.exist?(full_pkg)
                 puts("Downloading: #{full_pkg}")
-                unless @use_yumdownloader
-                  %x(curl -L --max-redirs 10 -s -o "#{full_pkg}" -k "#{source}")
-                  if File.exist?(full_pkg) && !%x(file #{full_pkg}).include?('RPM')
-                    @use_yumdownloader = true
-                    FileUtils.rm(full_pkg)
-                  end
-                end
-
-                if @use_yumdownloader
-                  %x(yumdownloader -c #{yum_conf} #{File.basename(full_pkg,'.rpm')} 2>/dev/null )
-
-                  if File.exist?(full_pkg) && !%x(file #{full_pkg}).include?('RPM')
-                    @use_yumdownloader = true
-                    FileUtils.rm(full_pkg)
-                  end
-                end
-
-                unless $?.success?
-                  raise(SIMPBuildException,"Could not download")
-                end
+                yum_helper.download(full_pkg)
 
                 begin
                   validate_rpm(full_pkg)
@@ -251,7 +177,7 @@ module Simp::Rake::Build
           # Check to see if an RPM is actually a valid RPM
           # Optionally remove any invalid RPMS.
           #
-          # Returns true if the rm is valid raises a SIMPBuildException otherwise
+          # Returns true if the rpm is valid raises a SIMPBuildException otherwise
           def validate_rpm(rpm, clean=true)
             # Check to see if what we got is actually valid
             %x(rpm -K --nosignature "#{rpm}" 2>&1 > /dev/null)
@@ -270,57 +196,6 @@ module Simp::Rake::Build
             true
           end
 
-          # Create the YUM config file
-          #  * yum_tmp => The directory in which to store the YUM DB and any other
-          #  temporary files.
-          #
-          #  Returns the location of the YUM Configuration
-          def generate_yum_conf(distro_dir=Dir.pwd)
-            yum_conf_template = <<-EOM.gsub(/^\s+/,'')
-            [main]
-            keepcache = 1
-            persistdir = <%= yum_cache %>
-            logfile = <%= yum_logfile %>
-            exactarch = 1
-            obsoletes = 0
-            gpgcheck = 1
-            plugins = 1
-            reposdir = <%= repo_dirs.join(' ') %>
-            assumeyes = 1
-            EOM
-
-            yum_conf = nil
-            Dir.chdir(distro_dir) do
-              # Create the target directory
-              yum_tmp = File.join('packages','yum_tmp')
-              mkdir_p(yum_tmp) unless File.directory?(yum_tmp)
-
-              yum_cache = File.expand_path(File.join(yum_tmp,'yum_cache'))
-              mkdir_p(yum_cache) unless File.directory?(yum_cache)
-
-              yum_logfile = File.expand_path(File.join(yum_tmp,'yum.log'))
-
-              repo_dirs = []
-              # Add the global directory
-              repo_dirs << File.expand_path('../my_repos')
-              if File.directory?('my_repos')
-                # Add the local user repos if they exist
-                repo_dirs << File.expand_path('my_repos')
-              else
-                # Add the default Internet repos otherwise
-                repo_dirs << File.expand_path('repos')
-              end
-
-              # Create our YUM config file
-              yum_conf = File.join(yum_tmp,'yum.conf')
-              File.open(yum_conf,'w') do |fh|
-                fh.write(ERB.new(yum_conf_template,nil,'-').result(binding))
-              end
-            end
-
-            return File.absolute_path(yum_conf)
-          end
-
           def get_known_packages(target_dir=Dir.pwd)
             known_package_hash = {}
 
@@ -354,7 +229,7 @@ module Simp::Rake::Build
 
             Dir.chdir(target_dir) do
               Dir.glob('packages/*.rpm').each do |pkg|
-                downloaded_packages[Simp::RPM.get_info(pkg)[:name]] = { :rpm_name => File.basename(pkg) }
+                downloaded_packages[Simp::RPM.get_info(pkg)[:basename]] = { :rpm_name => File.basename(pkg) }
               end
             end
 
@@ -377,11 +252,12 @@ module Simp::Rake::Build
             Dir.chdir(target_dir) do
               unless File.exist?('packages.yaml') || File.directory?('packages')
                 fail <<-EOM
-        Error: Either 'pacakges.yaml' or the 'packages/' directory need to exist under '#{target_dir}
+        Error: Either 'packages.yaml' or the 'packages/' directory need to exist under '#{target_dir}
                 EOM
               end
 
-              yum_conf = generate_yum_conf
+              yum_helper = Simp::YUM.new(Simp::YUM.generate_yum_conf)
+              yum_conf = yum_helper.yum_conf
 
               known_package_hash = get_known_packages
               downloaded_package_hash = get_downloaded_packages
@@ -425,12 +301,12 @@ module Simp::Rake::Build
                   # Do we have a valid external source?
                   package_source = known_package_hash.find{|k,h| h[:rpm_name] == package_to_download}.last[:source]
                   if package_source && (package_source =~ %r(^[a-z]+://))
-                    download_rpm(package_to_download,yum_conf,package_source)
+                    download_rpm(package_to_download, yum_conf, package_source)
                   else
                     # If you get here, then you'll need to have an internal mirror of the
                     # repositories in question. This covers things like private RPMs as
                     # well as Commercial RPMs from Red Hat.
-                    download_rpm(package_to_download,yum_conf)
+                    download_rpm(package_to_download, yum_conf)
                   end
                 rescue SIMPBuildException => e
                   base_package_name = known_package_hash.find{|k,h| h[:rpm_name] == package_to_download}.first
@@ -459,7 +335,8 @@ module Simp::Rake::Build
                 downloaded_package_hash.keys.each do |key|
                   if downloaded_package_hash[key][:rpm_name] == package
                     begin
-                      rpm_source = get_rpm_source(package,yum_conf)
+                      rpm_source = yum_helper.get_source(package)
+                      #rpm_source = get_rpm_source(package,yum_conf)
                       known_package_hash[key] = downloaded_package_hash[key]
                       known_package_hash[key][:source] = rpm_source
                     rescue SIMPBuildException => e
@@ -547,9 +424,8 @@ module Simp::Rake::Build
                   # Don't obsolete yourself!
                   next unless new_pkg_info.basename == old_pkg_info.basename
 
-                  %x(rpmdev-vercmp #{new_pkg_info.full_version} #{old_pkg_info.full_version})
-                  exit_status = $?.exitstatus
-                  if exit_status == 11
+
+                  if new_pkg_info.newer?(old_pkg_info.rpm_name)
                     mkdir('obsolete') unless File.directory?('obsolete')
 
                     puts("Retiring #{old_pkg}") if verbose
@@ -724,7 +600,7 @@ module Simp::Rake::Build
 
           * :arch         - The architecture that you support. Default: x86_64
           EOM
-          task :fetch,[:pkg,:os,:os_version,:simp_version,:arch] => [:prep, :clean_cache, :scaffold] do |t,args|
+          task :fetch,[:pkg,:os,:os_version,:simp_version,:arch] => [:prep, :scaffold] do |t,args|
             args.with_defaults(:simp_version => @simp_version.split('-').first)
             args.with_defaults(:arch => @build_arch)
 
@@ -746,19 +622,10 @@ module Simp::Rake::Build
             Dir.chdir(get_target_dir(args)) do
               pkgs.each do |pkg|
                 # Pull down the RPM
-                update_rpm(pkg,generate_yum_conf,true)
+                update_rpm(pkg, Simp::YUM.generate_yum_conf, true)
               end
             end
           end
-
-          desc <<-EOM
-          Clean the Yumdownloader cache.
-
-          Use this if you're having strange issues fetching packages.
-          EOM
-          task :clean_cache do
-              clean_yumdownloader_cache_dir
-          end
         end
       end
     end

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

@@ -35,22 +35,14 @@ module Simp::Rake::Build
       def advanced_clean(type,args)
         fail "Type must be one of 'clean' or 'clobber'" unless ['clean','clobber'].include?(type)
 
-        validate_in_mock_group?
-
-        mock_dirs = Dir.glob("/var/lib/mock/*").map{|x| x = File.basename(x) }
-
-        unless ( mock_dirs.empty? or args.chroot )
-          $stderr.puts "Notice: You must pass a Mock chroot to erase a specified build root."
-        end
-
-        Rake::Task["pkg:#{type}"].invoke(args.chroot)
+        Rake::Task["pkg:#{type}"].invoke
       end
 
-      task :clobber,[:chroot] do |t,args|
+      task :clobber do |t,args|
         advanced_clean('clobber',args)
       end
 
-      task :clean,[:chroot] do |t,args|
+      task :clean do |t,args|
         advanced_clean('clean',args)
       end
     end

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

@@ -3,100 +3,38 @@ require 'rake/tasklib'
 module Simp::Rake; end
 module Simp::Rake::Build; end
 module Simp::Rake::Build::Constants
-  def os_build_metadata(distro=nil, version=nil, arch=nil)
-    unless @member_vars_initialized
-      init_member_vars(Dir.pwd)
-    end
-
-    metadata = nil
-
-    build_metadata_file = File.join(@distro_build_dir, 'build_metadata.yaml')
-
-    if File.exist?(build_metadata_file)
-      build_metadata = YAML.load_file(build_metadata_file)
-
-      if distro
-        begin
-          metadata_init = { 'distributions' => {} }
-          metadata = metadata_init.dup
-
-          if build_metadata['distributions'][distro]
-            if version && build_metadata['distributions'][distro][version]
-              metadata['distributions'][distro] = {}
-              metadata['distributions'][distro][version] = build_metadata['distributions'][distro][version].dup
-
-              if arch && build_metadata['distributions'][distro][version]['arch'].include?(arch)
-                metadata['distributions'][distro][version]['arch'] = Array(arch)
-              else
-                raise(NoMethodError)
-              end
-            else
-              metadata['distributions'][distro] = build_metadata['distributions'][distro].dup
-            end
-
-            # Build everything that we've selected
-            metadata['distributions'][distro].keys.each do |d|
-              metadata['distributions'][distro][d]['build'] = true
-            end
-          end
+  def init_member_vars( base_dir )
+    return if @member_vars_initialized
 
-          if metadata['distributions'].empty?
-            raise(NoMethodError)
-          end
-        rescue NoMethodError
-          $stderr.puts(%(Error: Could not find distribution for '#{ENV['SIMP_BUILD_distro']}'))
-          $stderr.puts(%(  Check #{File.expand_path(build_metadata_file)}))
-          exit(1)
-        end
-      else
-        metadata = build_metadata
-      end
-    end
+    require 'facter'
 
-    return metadata
-  end
+    $simp6 = true
+    $simp6_clean_dirs = []
 
-  def init_member_vars( base_dir )
-    return if @member_vars_initialized
+    @build_distro = Facter.fact('operatingsystem').value
+    @build_version = Facter.fact('operatingsystemmajrelease').value
+    @build_arch = Facter.fact('architecture').value
 
     @run_dir           = Dir.pwd
     @base_dir          = base_dir
-    @build_arch        = ENV['SIMP_BUILD_arch'] || %x{#{:facter} hardwaremodel 2>/dev/null}.chomp
     @build_dir         = File.join(@base_dir, 'build')
-    @dvd_dir           = File.join(@build_dir, 'DVD_Overlay')
     @target_dists      = ['CentOS', 'RedHat']
-    @dist_dir          = File.join(@build_dir, 'dist')
     @src_dir           = File.join(@base_dir, 'src')
-    @dvd_src           = File.join(@src_dir, 'DVD')
     @spec_dir          = File.join(@src_dir, 'build')
     @spec_file         = FileList[File.join(@spec_dir, '*.spec')]
-    @simp_version      = Simp::RPM.get_info(File.join(@spec_dir, 'simp.spec'))[:full_version]
+    @simp_version      = Simp::RPM.new(File.join(@src_dir, 'assets', 'simp', 'build', 'simp.spec')).full_version
     @simp_dvd_dirs     = ["SIMP","ks","Config"]
-    @distro_build_dir  = File.join(@build_dir,'distributions')
-    @os_build_metadata = nil
     @member_vars_initialized = true
 
-    if ENV['SIMP_BUILD_distro']
-      distro, version, arch = ENV['SIMP_BUILD_distro'].split(/,|\//)
+    @distro_build_dir = File.join(@build_dir, 'distributions', @build_distro, @build_version, @build_arch)
+    @dvd_src           = File.join(@distro_build_dir, 'DVD')
+    @dvd_dir           = File.join(@distro_build_dir, 'DVD_Overlay')
 
-      @os_build_metadata = os_build_metadata(distro, version, arch)
-    else
-      @os_build_metadata = os_build_metadata()
+    if File.exist?(File.join(@build_dir, 'distributions'))
+      @build_dir = @distro_build_dir
     end
 
-    if @os_build_metadata && !@os_build_metadata.empty?
-      $simp6 = true
-      $simp6_clean_dirs = []
-
-      @os_build_metadata['distributions'].keys.sort.each do |d|
-        @os_build_metadata['distributions'][d].keys.sort.each do |v|
-          next unless @os_build_metadata['distributions'][d][v]['build']
-          @os_build_metadata['distributions'][d][v]['arch'].sort.each do |a|
-            $simp6_clean_dirs << File.join(@distro_build_dir, d, v, a, 'SIMP')
-            $simp6_clean_dirs << File.join(@distro_build_dir, d, v, a, 'SIMP_ISO*')
-          end
-        end
-      end
-    end
+    @dist_dir = File.join(@build_dir, 'dist')
+    @rpm_dir  = "#{@build_dir}/SIMP/RPMS"
   end
 end

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

@@ -36,7 +36,14 @@ class R10KHelper
         end
 
         unless repo_status
-          untracked_files = %x(git ls-files -o -d --exclude-standard)
+          # Things that may be out of date but which should stop the updating
+          # of the git repo
+          our_exclusions=[
+            'build/rpm_metadata',
+            'dist/'
+          ]
+
+          untracked_files = %x(git ls-files -o -d --exclude-standard --exclude=#{our_exclusions.join(' --exclude=')})
 
           if $?.success?
             unless untracked_files.empty?

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

@@ -12,7 +12,6 @@ module Simp::Rake::Build
     def initialize( base_dir )
       init_member_vars( base_dir )
 
-      @mock = ENV['mock'] || '/usr/bin/mock'
       define_tasks
     end
 
@@ -94,6 +93,7 @@ module Simp::Rake::Build
           end
         end # End of prune_packages
 
+=begin
         desc <<-EOM
       Build the SIMP ISO(s).
        * :tarball - Path of the source tarball or directory containing the source
@@ -106,6 +106,7 @@ module Simp::Rake::Build
        ENV vars:
          - Set `SIMP_ISO_verbose=yes` to report file operations as they happen.
            EOM
+=end
         task :build,[:tarball,:unpacked_dvds,:prune] => [:prep] do |t,args|
           args.with_defaults(:unpacked_dvds => "#{@run_dir}", :prune => 'true')
 
@@ -320,22 +321,23 @@ module Simp::Rake::Build
           fail('Error: No ISO was built!') unless @simp_output_iso
         end
 
+=begin
         desc <<-EOM
         Build the source ISO.
           Note: The process clobbers the temporary and built files, rebuilds the
           tarball(s) and packages the source ISO. Therefore it will take a
           while.
             * :key - The GPG key to sign the RPMs with. Defaults to 'prod'.
-            * :chroot - An optional Mock Chroot. If this is passed, the tar:build task will be called.
         EOM
-        task :src,[:prep, :key,:chroot] do |t,args|
+=end
+        task :src,[:prep, :key] do |t,args|
           args.with_defaults(:key => 'prod')
 
-          if Dir.glob("#{@dvd_dir}/*.gz").empty? && !args.chroot
-            fail("Error: Could not find compiled source tarballs, please pass a chroot.")
+          if Dir.glob("#{@dvd_dir}/*.gz").empty?
+            fail("Error: Could not find compiled source tarballs")
           end
 
-          Rake::Task['tar:build'].invoke(args.chroot) if args.chroot
+          Rake::Task['tar:build']
 
           Dir.chdir(@base_dir) do
             File.basename(Dir.glob("#{@dvd_dir}/*.tar.gz").first,'.tar.gz') =~ /SIMP-DVD-[^-]+-(.+)/