simp-rake-helpers 1.0.12 → 1.0.13

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjAxMDc4MmVmNzM4ZWVmNDMzYjI2ZmU5ODA0OGMyMjkwMzIwOTViMw==
+    NGQ2NWYwNDBiMTViOTk4NDQyNGQ5ZTMwNDk3ZDYwMWUzNWU1OGMxZA==
   data.tar.gz: !binary |-
-    NTVmNzdmZGVhMjdhYzEzNGY1YTBjODEyMTNlYmZkYmJlNTM1YjU4Yw==
+    ODkzYzlhOWRjNDc4MjMxMDJjZWUzMWZmMTgxOWNhODM3MjgwMzAyMA==
 SHA512:
   metadata.gz: !binary |-
-    NmVjMWZhZGM3YjEwZmNjYmRlZmNhMmM0YTA3ZDVmNzAxNTNkNDU2M2RjMGM3
-    ZmM4NDFkNjkyOTU3OWYwZjY3NzFhYzA4ZTRjZGRkNWYzMDM0MDQxYTY0MzNm
-    ZTNiNWQ3ZDM1MzM3MjIzODhlNGE3NGZiNDhmY2YwOTdjZDY1ZTM=
+    ZTBiYWY0OTBiODcyZjg5Yjk4YjNkNWI5OTc4Yzc0ODE5ODAwYjk5M2I3ZWE1
+    ODMzMTc1MGU0NGIyNGI4ZjQ3ZWFjMTA4OWZiMmNiYjcyNGExYTQwMjk3Y2Ey
+    MGJlZGVkYzYzOTRhMjM3NmUxNmJkZjExYzY0YjBkNjc1MjdkYmM=
   data.tar.gz: !binary |-
-    MWExNWM4NTA5MGViNGEzNGViNzEzMWUwZmIzODc2OTkwOThkYzYzOTY1NTg0
-    NGVkM2Q0NTk1OWViOGJjMmZiOGFkYjZhYTExNWQ5NDVjZTZhOGVjNmFkODdk
-    MDRjZDlhNWU2MjQ5MzQ3MmUyYjlkN2IwZTM0NGYxNTc4NjJiZmI=
+    Y2EwMTI1NWE1ZjVjZTU4ODkyYjAzMDA1ZTFlZWVlN2FhNTE1ZDc3OGYwODBm
+    OTRhOTFiMGUyMmNjOGY0M2VhNTNkYTU3MmUxNmNhNTA0OTBiODhlNmUwZDU5
+    MDQ5Nzg3NjJhN2Q4OTI5ZTA3ZDIxMTk1ZTdiNDEzMTJiYTk1NjY=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 1.0.13 / 2016-02-10
+* Ensure that all rake tasks can run on EL6 systems
+* Update the processing of RPM spec files to properly handle macros in target builds
+
 ### 1.0.12 / 2015-11-13
 * Ensure that openssl, openssl-devel, and vim-enhanced are installed in mock by
   default

data/Rakefile

@@ -38,7 +38,7 @@ namespace :pkg do
   task :gem => :chmod do
     Dir.chdir @rakefile_dir
     Dir['*.gemspec'].each do |spec_file|
-      cmd = %Q{SIMP_RPM_BUILD=1 bundle exec gem build "#{spec_file}"}
+      cmd = %Q{SIMP_RPM_BUILD=0 bundle exec gem build "#{spec_file}"}
       sh cmd
       FileUtils.mkdir_p 'dist'
       FileUtils.mv Dir.glob("#{@package}*.gem"), 'dist/'

data/lib/simp/rake/helpers.rb

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

data/lib/simp/rake/pkg.rb

@@ -52,13 +52,6 @@ module Simp::Rake
 
        ::CLEAN.include( @clean_list )
 
-       @spec_info      = Pkg.get_info( @spec_file )
-       @chroot_name    = @chroot_name || "#{@spec_info[:name]}__#{ENV.fetch( 'USER', 'USER' )}"
-       @dir_name       = "#{@spec_info[:name]}-#{@spec_info[:version]}"
-       @mfull_pkg_name = "#{@dir_name}-#{@spec_info[:release]}"
-       @full_pkg_name  = @mfull_pkg_name.gsub("%{?snapshot_release}","")
-       @tar_dest = "#{@pkg_dir}/#{@full_pkg_name}.tar.gz"
-
        define
     end
 
@@ -77,6 +70,37 @@ module Simp::Rake
       self
     end
 
+    # Initialize the mock space if passed and retrieve the spec info from that
+    # space directly.
+    #
+    # Ensures that the correct file names are used across the board.
+    def initialize_spec_info(chroot, unique)
+      unless @spec_info
+        spec_file = @spec_file
+
+        # This gets the resting spec file and allows us to pull out the name
+        @spec_info   = Simp::RPM.get_info( spec_file )
+        @chroot_name = @chroot_name || "#{@spec_info[:name]}__#{ENV.fetch( 'USER', 'USER' )}"
+
+        if chroot
+          mock_cmd = mock_pre_check( chroot, @chroot_name, unique ) + " --root #{chroot}"
+
+          sh %Q(#{mock_cmd} --copyin #{spec_file} /tmp)
+          info_hash = {
+            :command    => %Q(#{mock_cmd} --shell),
+            :rpm_extras => %(--specfile /tmp/#{File.basename(spec_file)} )
+          }
+
+          @spec_info = Simp::RPM.get_info(spec_file, info_hash)
+        end
+
+        @dir_name       = "#{@spec_info[:name]}-#{@spec_info[:version]}"
+        @mfull_pkg_name = "#{@dir_name}-#{@spec_info[:release]}"
+        @full_pkg_name  = @mfull_pkg_name.gsub("%{?snapshot_release}","")
+        @tar_dest       = "#{@pkg_dir}/#{@full_pkg_name}.tar.gz"
+        @variants       = (ENV['SIMP_BUILD_VARIANTS'].to_s.split(',') + ['default'])
+      end
+    end
 
     def define_clean
       desc <<-EOM
@@ -87,8 +111,6 @@ module Simp::Rake
       end
     end
 
-
-
     def define_clobber
       desc <<-EOM
       Clobber build artifacts for #{@pkg_name} (except for mock)
@@ -105,13 +127,19 @@ module Simp::Rake
         # :pkg:tar
         # -----------------------------
         desc <<-EOM
-        Build the #{@pkg_name} tar package
+        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.
         EOM
-        task :tar,[:snapshot_release] => [@pkg_dir] do |t,args|
+        task :tar,[:chroot,:unique,:snapshot_release] => [@pkg_dir] do |t,args|
           args.with_defaults(:snapshot_release => false)
+          args.with_defaults(:unique => false)
+          args.with_defaults(:chroot => nil)
+
+          if args.chroot
+            initialize_spec_info(args.chroot, args.unique)
+          end
 
           l_date = ''
           if args.snapshot_release == 'true'
@@ -140,13 +168,26 @@ module Simp::Rake
     def define_pkg_srpm
       namespace :pkg do
         desc <<-EOM
-        Build the #{@pkg_name} SRPM
+        Build the #{@pkg_name} SRPM.
           Building RPMs requires a working Mock setup (http://fedoraproject.org/wiki/Projects/Mock)
             * :chroot - The Mock chroot configuration to use. See the '--root' option in mock(1)."
             * :unique - Whether or not to build the SRPM in a unique Mock environment.
                         This can be very useful for parallel builds of all modules.
             * :snapshot_release - Add snapshot_release (date and time) to rpm version.
                         Rpm spec file must have macro for this to work.
+
+        Environment Variables
+          SIMP_BUILD_VARIANTS - A comma delimted list of the target versions of Puppet/PE to build toward.
+
+                     Currently supported are 'pe', 'p4', 'pe-2015'.
+
+                     These will build for Puppet Enterprise, Puppet 4, and
+                     Puppet Enterprise 2015+ respectively.
+
+                     Anything after a dash '-' will be considered a VERSION.
+
+                     NOTE: Different RPM spec files may have different
+                     behaviors based on the value passed.
         EOM
         task :srpm,[:chroot,:unique,:snapshot_release] => [:tar] do |t,args|
           args.with_defaults(:unique => false)
@@ -161,11 +202,20 @@ module Simp::Rake
 
           mock_cmd = mock_pre_check( args.chroot, @chroot_name, args.unique )
 
-          srpms = Dir.glob(%(#{@pkg_dir}/#{@full_pkg_name}#{l_date}.*src.rpm))
+          @variants.each do |variant|
+            if variant != 'default'
+              suffix = "-#{variant}"
+            end
 
-          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
+            srpms = Dir.glob(%(#{@pkg_dir}/#{@spec_info[:name]}#{suffix}-#{@spec_info[:version]}-#{@spec_info[:release]}#{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})
+              if suffix
+                cmd += %( -D "_variant #{variant}")
+              end
+              sh cmd
+            end
           end
         end
       end
@@ -174,13 +224,26 @@ module Simp::Rake
     def define_pkg_rpm
       namespace :pkg do
         desc <<-EOM
-        Build the #{@pkg_name} RPM
+        Build the #{@pkg_name} RPM.
           Building RPMs requires a working Mock setup (http://fedoraproject.org/wiki/Projects/Mock)
             * :chroot - The Mock chroot configuration to use. See the '--root' option in mock(1)."
             * :unique - Whether or not to build the RPM in a unique Mock environment.
                         This can be very useful for parallel builds of all modules.
             * :snapshot_release - Add snapshot_release (date and time) to rpm version.
                         Rpm spec file must have macro for this to work.
+
+        Environment Variables
+          SIMP_BUILD_VARIANTS - A comma delimted list of the target versions of Puppet/PE to build toward.
+
+                     Currently supported are 'pe', 'p4', 'pe-2015'.
+
+                     These will build for Puppet Enterprise, Puppet 4, and
+                     Puppet Enterprise 2015+ respectively.
+
+                     Anything after a dash '-' will be considered a VERSION.
+
+                     NOTE: Different RPM spec files may have different
+                     behaviors based on the value passed.
         EOM
         task :rpm,[:chroot,:unique,:snapshot_release] do |t,args|
           args.with_defaults(:unique => false)
@@ -197,14 +260,23 @@ module Simp::Rake
 
           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)
+          @variants.each do |variant|
+            if variant != 'default'
+              suffix = "-#{variant}"
+            end
 
-          srpms.each do |srpm|
-            if require_rebuild?(srpm,rpms)
-              cmd = %Q(#{mock_cmd} --root #{args.chroot} #{mocksnap} #{srpm})
-              sh cmd
+            rpms = Dir.glob(%(#{@pkg_dir}/#{@spec_info[:name]}#{suffix}-#{@spec_info[:version]}-#{@spec_info[:release]}#{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})
+                if suffix
+                  cmd += %( -D "_variant #{variant}")
+                end
+                sh cmd
+              end
             end
           end
         end
@@ -216,7 +288,7 @@ module Simp::Rake
         # :pkg:scrub
         # -----------------------------
         desc <<-EOM
-        Scrub the #{@pkg_name} mock build directory
+        Scrub the #{@pkg_name} mock build directory.
         EOM
         task :scrub,[:chroot,:unique] do |t,args|
           args.with_defaults(:unique => false)
@@ -233,11 +305,6 @@ module Simp::Rake
     # ------------------------------------------------------------------------------
     # helper methods
     # ------------------------------------------------------------------------------
-    # Pull the main RPM information out of the package spec file.
-    def Pkg.get_info(specfile)
-      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')}

data/lib/simp/rpm.rb

@@ -3,6 +3,7 @@ module Simp
   class Simp::RPM
     require 'expect'
     require 'pty'
+    require 'rake'
 
     @@gpg_keys = Hash.new
     attr_accessor :basename, :version, :release, :full_version, :name, :sources, :verbose
@@ -52,27 +53,31 @@ module Simp
 
     # Parses information, such as the version, from the given specfile or RPM
     # into a hash.
-    def self.get_info(rpm_source)
-      info = Hash.new
+    #
+    # Can take an optional mock hash that should have the following structure:
+    # {
+    #   :command    => The actual mock command to run
+    #   :rpm_extras => Extra arguments to pass to RPM. This will probably be a
+    #                  reference to the spec file itself
+    # }
+    def self.get_info(rpm_source, mock_hash=nil)
+      info    = Hash.new
+      rpm_cmd = "rpm -q --queryformat '%{NAME} %{VERSION} %{RELEASE}\n'"
+
+      if mock_hash
+        rpm_cmd = mock_hash[:command] + ' ' + '"' + rpm_cmd + ' ' + mock_hash[:rpm_extras] + '"'
+      end
+
       if File.readable?(rpm_source)
         if rpm_source.split('.').last == 'rpm'
-          rpm_info = %x(rpm -q --queryformat '%{NAME} %{VERSION} %{RELEASE}' -p #{rpm_source} 2>/dev/null)
-          info[:name],info[:version],info[:release] = rpm_info.split(' ')
+          rpm_info = %x(#{rpm_cmd} -p #{rpm_source} 2>/dev/null)
+        elsif mock_hash
+          rpm_info = %x(#{rpm_cmd})
         else
-          File.open(rpm_source).each do |line|
-            if line =~ /^\s*Version:\s+(.*)\s*/
-              info[:version] = $1
-              next
-            elsif line =~ /^\s*Release:\s+(.*)\s*/
-              # We don't want anything after the first '%'
-              info[:release] = $1.split('%').first
-              next
-            elsif line =~ /^\s*Name:\s+(.*)\s*/
-              info[:name] = $1
-              next
-            end
-          end
+          rpm_info = %x(#{rpm_cmd} --specfile #{rpm_source} 2>/dev/null)
         end
+
+        info[:name],info[:version],info[:release] = rpm_info.split("\n").first.split(' ')
       else
         raise "Error: unable to read '#{rpm_source}'"
       end
@@ -189,7 +194,7 @@ module Simp
             end
             Process.wait(pid)
           end
-  
+
           raise "Failure running #{signcommand}" unless $?.success?
         rescue Exception => e
           puts "Error occured while attempting to sign #{rpm}, skipping."

data/spec/lib/simp/files/build/testpackage.spec

@@ -1,37 +1,32 @@
 Name:           testpackage
 Version:        1
-Release:        0%{?dist}
-Summary:        a test package
+Release:        0
+Summary:        dummy test package
+BuildArch:      noarch
 
 License:        Apache-2.0
-URL:
-Source0:
-
-BuildRequires:
-Requires:
+URL:            http://foo.bar
 
 %description
-
+A dummy package used to test Simp::RPM methods
 
 %prep
-%setup -q
-
+exit 0
 
 %build
-%configure
-make %{?_smp_mflags}
+exit 0
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%make_install
+exit 0
 
+%clean
+exit 0
 
 %files
 %doc
 
 
-
 %changelog
 * Wed Jun 10 2015 nobody
 - some comment

data/spec/lib/simp/files/testpackage-multi.spec

@@ -0,0 +1,40 @@
+Name:           testpackage-multi-1
+Version:        1
+Release:        0
+Summary:        dummy test package #2
+BuildArch:      noarch
+
+License:        Apache-2.0
+URL:            http://foo.bar
+
+%description
+A dummy package used to test Simp::RPM methods
+
+%prep
+exit 0
+
+%build
+exit 0
+
+
+%install
+exit 0
+
+%clean
+exit 0
+
+%files
+%doc
+
+
+%package testpackage-multi-2
+Summary:        dummy test package #2
+License:        Apache-2.0
+
+%description testpackage-multi-2
+A dummy package used to test Simp::RPM methods
+
+
+%changelog
+* Wed Jun 10 2015 nobody
+- some comment

data/spec/lib/simp/files/testpackage.spec

@@ -1,37 +1,32 @@
 Name:           testpackage
 Version:        1
-Release:        0%{?dist}
-Summary:        a test package
+Release:        0
+Summary:        dummy test package
+BuildArch:      noarch
 
 License:        Apache-2.0
-URL:
-Source0:
-
-BuildRequires:
-Requires:
+URL:            http://foo.bar
 
 %description
-
+A dummy package used to test Simp::RPM methods
 
 %prep
-%setup -q
-
+exit 0
 
 %build
-%configure
-make %{?_smp_mflags}
+exit 0
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%make_install
+exit 0
 
+%clean
+exit 0
 
 %files
 %doc
 
 
-
 %changelog
 * Wed Jun 10 2015 nobody
 - some comment

data/spec/lib/simp/rpm_spec.rb

@@ -3,15 +3,29 @@ require 'spec_helper'
 
 describe Simp::RPM do
   before :all do
-    dir        = File.expand_path( 'files', File.dirname( __FILE__ ) )
-    @spec_file = File.join( dir, 'testpackage.spec' )
-    @obj = Simp::RPM.new( @spec_file )
+    dir          = File.expand_path( 'files', File.dirname( __FILE__ ) )
+    @spec_file   = File.join( dir, 'testpackage.spec' )
+    @spec_obj    = Simp::RPM.new( @spec_file )
+    @m_spec_file = File.join( dir, 'testpackage-multi.spec' )
+    @m_spec_obj  = Simp::RPM.new( @spec_file )
+    @rpm_file    = File.join( dir, 'testpackage-1-0.noarch.rpm' )
+    @rpm_obj     = Simp::RPM.new( @spec_file )
   end
 
   describe "#initialize" do
-    it "initializes (smoke test)" do
-      expect( @obj.class ).to eq Simp::RPM
+
+    it "initializes w/RPM (smoke test)" do
+      expect( @rpm_obj.class ).to eq Simp::RPM
+    end
+
+    it "initializes w/spec file (smoke test)" do
+      expect( @spec_obj.class ).to eq Simp::RPM
     end
+
+    it "initializes w/multi-package spec file (smoke test)" do
+      expect( @m_spec_obj.class ).to eq Simp::RPM
+    end
+
   end
 
   describe ".get_info" do
@@ -20,5 +34,17 @@ describe Simp::RPM do
       expect( info.fetch( :name    ) ).to eq 'testpackage'
       expect( info.fetch( :version ) ).to eq '1'
     end
+
+    it "extracts correct information from an .rpm file" do
+      info = Simp::RPM.get_info(@rpm_file)
+      expect( info.fetch( :name    ) ).to eq 'testpackage'
+      expect( info.fetch( :version ) ).to eq '1'
+    end
+
+    it "extracts coreect information from the first entry from a multi-package .spec file" do
+      info = Simp::RPM.get_info(@m_spec_file)
+      expect( info.fetch( :name    ) ).to eq 'testpackage-multi-1'
+      expect( info.fetch( :version ) ).to eq '1'
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-14 00:00:00.000000000 Z
+date: 2016-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -251,6 +251,8 @@ files:
 - lib/simp/rake/pkg.rb
 - lib/simp/rpm.rb
 - spec/lib/simp/files/build/testpackage.spec
+- spec/lib/simp/files/testpackage-1-0.noarch.rpm
+- spec/lib/simp/files/testpackage-multi.spec
 - spec/lib/simp/files/testpackage.spec
 - spec/lib/simp/rake/helpers_spec.rb
 - spec/lib/simp/rake/pkg_spec.rb