simp-rake-helpers 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ade6e1ae8a744fa8b543ed966cb67ed411ab41c0
-  data.tar.gz: ec51fff88f43b136d2932a655f8f39e2a2344510
+  metadata.gz: 2e0cc6b7460a766fa108056633ba7a765fd5962e
+  data.tar.gz: 052d02767af95ba15bca7b6f09f62cecef8ea5e8
 SHA512:
-  metadata.gz: 34978e726b9a3378f5ecb2e5b943eb010c6b45722b48bb8ab388404786a7f538359af9ffd751b0aff84daa4f753f19c062ff8e0293a2659267358c402701d55b
-  data.tar.gz: 0464603d53ab8e63fa4cc0d130fecafd5a68ce41343ea66e4a1c86448d98232d6762e2ac58901656d6af65797d564c687727d9119ce652d2c32a7be899f694a2
+  metadata.gz: b36f615ed3578ac0faad8ea57a3ea63bbffb4138a09425b66860a18cbf6393f2b7603ef53458bb3abd0ed4d9a10f157e959c3097ffe34e7b4015bb3c7745f1a2
+  data.tar.gz: 4e1afb4dc8fd6214ea1bf1fba6d80bcc958f3a0e8b412f9f469688714e42653afe0765bab0291f7f34a2c6cebc3df489e6f524d1a5bc74826c7dd78eec6fe86e

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 1.0.7 / 2015-06-27
+* Ensure that the 'Release' variable doesn't pick up anything that's dynamic in
+  nature.
+* Optimized the build check code. Sped up pretty much everything.
+
 ### 1.0.6 / 2015-06-24
 * Cleanup gemspec
 * Fixed bugs in the RPM signing code regarding fetching the username and

data/lib/simp/rake/helpers.rb

@@ -2,6 +2,6 @@ module Simp; end
 module Simp::Rake; end
 
 class Simp::Rake::Helpers
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
   require 'simp/rake/pkg'
 end

data/lib/simp/rake/pkg.rb

@@ -6,6 +6,7 @@ require 'rake/clean'
 require 'rake/tasklib'
 require 'fileutils'
 require 'find'
+require 'simp/rpm'
 
 module Simp; end
 module Simp::Rake
@@ -61,7 +62,6 @@ module Simp::Rake
        define
     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
@@ -106,23 +106,29 @@ module Simp::Rake
         # -----------------------------
         desc <<-EOM
         Build the #{@pkg_name} tar package
-            * :snapshot_release - Add snapshot_release (date and time) to rpm version, rpm spec file must have macro for this to work.
+            * :snapshot_release - Add snapshot_release (date and time) to rpm
+                                  version, rpm spec file must have macro for
+                                  this to work.
         EOM
         task :tar,[:snapshot_release] => [@pkg_dir] do |t,args|
           args.with_defaults(:snapshot_release => false)
 
           l_date = ''
-          if args.snapshot_release == 'true' then
+          if args.snapshot_release == 'true'
             l_date = '.' + "#{TIMESTAMP}"
             @tar_dest = "#{@pkg_dir}/#{@full_pkg_name}#{l_date}.tar.gz"
           end
-          Dir.chdir("#{@base_dir}/..") do
-            Find.find(@pkg_name) do |path|
+
+          target_dir = File.basename(@base_dir)
+
+          Dir.chdir(%(#{@base_dir}/..)) do
+            Find.find(target_dir) do |path|
               Find.prune if path =~ /^\.git/
               Find.prune if path == "#{@pkg_name}/#{File.basename(@pkg_dir)}"
               Find.prune if @ignore_changes_list.include?(path)
-              if path == @pkg_name and not uptodate?(@tar_dest,[path]) then
-                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}}
+              next if File.directory?(path)
+              unless uptodate?(@tar_dest,[path])
+                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})
                 break
               end
             end
@@ -131,7 +137,6 @@ module Simp::Rake
       end
     end
 
-
     def define_pkg_srpm
       namespace :pkg do
         desc <<-EOM
@@ -148,24 +153,24 @@ module Simp::Rake
           args.with_defaults(:snapshot_release => false)
 
           l_date = ''
-          if args.snapshot_release == 'true' then
+          if args.snapshot_release == 'true'
             l_date = '.' + "#{TIMESTAMP}"
             mocksnap = "-D 'snapshot_release #{l_date}'"
             @tar_dest = "#{@pkg_dir}/#{@full_pkg_name}#{l_date}.tar.gz"
           end
 
           mock_cmd = mock_pre_check( args.chroot, @chroot_name, args.unique )
-          output = "#{@full_pkg_name}#{l_date}.src.rpm"
-          if not uptodate?("#{@pkg_dir}/#{output}",[@tar_dest]) then
-            cmd = %Q{#{mock_cmd} --no-clean --root #{args.chroot} #{mocksnap} --buildsrpm --spec #{@spec_file} --source #{@pkg_dir}}
+
+          srpms = Dir.glob(%(#{@pkg_dir}/#{@full_pkg_name}#{l_date}.*src.rpm))
+
+          if require_rebuild?(@tar_dest,srpms)
+            cmd = %Q(#{mock_cmd} --no-clean --root #{args.chroot} #{mocksnap} --buildsrpm --spec #{@spec_file} --source #{@pkg_dir})
             sh cmd
           end
         end
       end
     end
 
-
-
     def define_pkg_rpm
       namespace :pkg do
         desc <<-EOM
@@ -182,19 +187,25 @@ module Simp::Rake
           args.with_defaults(:snapshot_release => false)
 
           l_date = ''
-          if args.snapshot_release == 'true' then
+          if args.snapshot_release == 'true'
             l_date = '.' + "#{TIMESTAMP}"
             mocksnap = "-D 'snapshot_release #{l_date}'"
             @tar_dest = "#{@pkg_dir}/#{@full_pkg_name}#{l_date}.tar.gz"
           end
 
-          mock_cmd = mock_pre_check( args.chroot, @chroot_name, args.unique )
           Rake::Task['pkg:srpm'].invoke(args.chroot,args.unique,args.snapshot_release)
 
-          output = "#{@full_pkg_name}#{l_date}.#{@spec_info[:arch]}.rpm"
-          if not uptodate?("#{@pkg_dir}/#{output}",[@tar_dest]) then
-            cmd = %Q{#{mock_cmd} --root #{args.chroot} #{mocksnap} #{@pkg_dir}/#{@full_pkg_name}#{l_date}.src.rpm}
-            sh cmd
+          mock_cmd = mock_pre_check(args.chroot, @chroot_name, args.unique)
+
+          rpms = Dir.glob(%(#{@pkg_dir}/#{@full_pkg_name}#{l_date}*.rpm))
+          srpms = rpms.select{|x| x =~ /src\.rpm$/}
+          rpms = (rpms - srpms)
+
+          srpms.each do |srpm|
+            if require_rebuild?(srpm,rpms)
+              cmd = %Q(#{mock_cmd} --root #{args.chroot} #{mocksnap} #{srpm})
+              sh cmd
+            end
           end
         end
       end
@@ -211,7 +222,7 @@ module Simp::Rake
           args.with_defaults(:unique => false)
 
           mock_cmd = mock_pre_check( args.chroot, @chroot_name, args.unique, false )
-          cmd = %Q{#{mock_cmd} --scrub=all}
+          cmd = %Q(#{mock_cmd} --scrub=all)
           sh cmd
         end
 
@@ -224,37 +235,29 @@ module Simp::Rake
     # ------------------------------------------------------------------------------
     # Pull the main RPM information out of the package spec file.
     def Pkg.get_info(specfile)
-      info = Hash.new
-      info[:arch] = %x{uname -i}
-
-      if File.readable?(specfile) then
-        File.open(specfile).each do |line|
-          if line =~ /^\s*Version:\s+(.*)\s*/ then
-            info[:version] = $1
-            next
-          elsif line =~ /^\s*Release:\s+(.*)\s*/ then
-            info[:release] = $1
-            next
-          elsif line =~ /^\s*Name:\s+(.*)\s*/ then
-            info[:name] = $1
-            next
-          elsif line =~ /^\s*Buildarch:\s+(.*)\s*/ then
-            info[:arch] = $1
-            next
-          end
-        end
-      else
-        raise "Error: unable to read the spec file '#{specfile}'"
-      end
-      return info
+      return Simp::RPM.get_info(specfile)
     end
 
-
     # Get a list of all of the mock configs available on the system.
     def Pkg.get_mock_configs
       Dir.glob('/etc/mock/*.cfg').sort.map{ |x| x = File.basename(x,'.cfg')}
     end
 
+    # Return True if any of the 'output_files' are older than the 'src_file'
+    def require_rebuild?(src_file,output_files)
+      require_rebuild = false
+      require_rebuild = true if output_files.empty?
+      unless require_rebuild
+        output_files.each do |outfile|
+          unless uptodate?(outfile,Array(src_file))
+            require_rebuild = true
+            break
+          end
+        end
+      end
+
+      require_rebuild
+    end
 
     # Run some pre-checks to make sure that mock will work properly.
     #
@@ -265,18 +268,18 @@ module Simp::Rake
     # Returns a String that contains the appropriate mock command.
     def mock_pre_check( chroot, unique_ext, unique=false, init=true )
 
-      raise %Q{unique_ext must be a String ("#{unique_ext}" = #{unique_ext.class})} if not unique_ext.is_a? String
+      raise %Q(unique_ext must be a String ("#{unique_ext}" = #{unique_ext.class})) unless unique_ext.is_a? String
 
       mock = ENV['mock'] || '/usr/bin/mock'
       raise(Exception,"Could not find mock on your system, exiting") unless File.executable?('/usr/bin/mock')
 
       mock_configs = Pkg.get_mock_configs
-      if not chroot then
+      unless chroot
         raise(Exception,
           "Error: No mock chroot provided. Your choices are:\n  #{mock_configs.join("\n  ")}"
         )
       end
-      if not mock_configs.include?(chroot) then
+      unless mock_configs.include?(chroot)
         raise(Exception,
           "Error: Invalid mock chroot provided. Your choices are:\n  #{mock_configs.join("\n  ")}"
         )
@@ -287,16 +290,16 @@ module Simp::Rake
 
       mock_cmd =  "#{mock} --quiet"
       mock_cmd += " --uniqueext=#{unique_ext}" if unique
-      mock_cmd += " --offline"               if mock_offline
+      mock_cmd += ' --offline'                 if mock_offline
 
       initialized = is_mock_initialized( mock_cmd, chroot)
 
-      if init and not initialized then
-        sh %Q{#{mock_cmd} --root #{chroot} --init ##{unique_ext} }
+      unless initialized && init
+        sh %Q(#{mock_cmd} --root #{chroot} --init ##{unique_ext} )
       else
         # Remove any old build cruft from the mock directory.
         # This is kludgy but WAY faster than rebuilding them all, even with a cache.
-        sh %Q{#{mock_cmd} --root #{chroot} --chroot "/bin/rm -rf /builddir/build/BUILDROOT /builddir/build/*/*"}
+        sh %Q(#{mock_cmd} --root #{chroot} --chroot "/bin/rm -rf /builddir/build/BUILDROOT /builddir/build/*/*")
       end
 
       mock_cmd + " --no-clean --no-cleanup-after --resultdir=#{@pkg_dir} --disable-plugin=package_state"

data/lib/simp/rpm.rb

@@ -20,6 +20,8 @@ module Simp
     # [basename] The name of the package (as it would be queried in yum)
     # [version] The version of the package
     # [release] The release version of the package
+    #   * NOTE: If this is a 'spec' file, it will stop on the first '%'
+    #           encountered!
     # [full_version] The full version of the package: [version]-[release]
     # [name] The full name of the package: [basename]-[full_version]
     def initialize(rpm_source)
@@ -62,7 +64,8 @@ module Simp
               info[:version] = $1
               next
             elsif line =~ /^\s*Release:\s+(.*)\s*/
-              info[:release] = $1
+              # We don't want anything after the first '%'
+              info[:release] = $1.split('%').first
               next
             elsif line =~ /^\s*Name:\s+(.*)\s*/
               info[:name] = $1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler