simp-rake-helpers 2.5.7 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3af5c2d69049d0ec9ed9f1457925e1d55810eaf0
-  data.tar.gz: 9925c108a4385aced09a7b16256d5e6b2f8f5ea5
+  metadata.gz: 3dc63bb56b51334e5e5a31fa9a6d843889174561
+  data.tar.gz: 7eee12246c9f05e1c2af04ab158ee2c6bcb8e266
 SHA512:
-  metadata.gz: 7b4f5665e1b0e4a5582dae97387d673801d96a559f26c9789da82bc2beded56a4a88e549efb6430e732fd99b94b5416e6ebd6a911cb7e0c941c933255975032f
-  data.tar.gz: 61ce0762187cf81d2cdedec906da7a3fa31ca8f21a71318a675bb82952b3e042f27ab3bb005bba4e855af656eb2965cd46319bc64b3254d6e5639c5821da25c4
+  metadata.gz: fa82d78040ca5e394ef902e09552099810267729b4c285a464ce80c6f05b07031bcf20f6cabf5d6bb935c8f689ec01c7722410670bdaf2b796f255c05c4e3012
+  data.tar.gz: 1cb550b16bc737f5ee25e2fffd23b3fdedf466ce4b5e73f68275be40a47527c277c03417a03491573a21a7fa2cd7f2daaa032efc296ba27d202eeece057c6225

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### 3.0.0 / 2016-09-22
+* Updated the RPM spec template to handle the new SIMP 6 requirements
+
 ### 2.5.6 / 2016-09-22
 * Added thread safe failure checks
 * Will raise an error when building the modules if one or more fails

data/README.md

@@ -131,7 +131,9 @@ specification.
 It is likely that you will want to declare your dependencies in your RPM. To do
 this, you can create a `build/rpm_metadata` directory at the root of your
 project. A file named `requires` in the `build/rpm_metadata` directory will be
-used to declare the dependencies of the RPM.
+used to declare the dependencies of the RPM. A file named `release` in the
+`build/rpm_metadata` directory will be used to declare the RPM release
+number.
 
 The following directives may be declared in the `requires` file:
   * Provides

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

@@ -145,7 +145,7 @@ module Simp::Rake::Build
 
               # NOTE: RHEL7 discs claim [general] section is deprecated.
               if sections.include?('general')
-                h = Hash[ ini.get_section('general').entries ]
+                h = Hash[ ini.get_section('general').entries.map{|k,v| [k,v]} ]
                 arch      = h.fetch('arch', arch).strip
                 baseosver = h.fetch('version', baseosver).strip
                 baseosver += '.0' if (baseosver.count('.') < 1)
@@ -153,7 +153,13 @@ module Simp::Rake::Build
               # ------------------------------------
 
               # Skip if SIMP version doesn't match target base OS version
-              next unless vermap[simpver.split('.').first].eql?(baseosver.split('.').first)
+              unless Array(vermap[simpver.split('.').first]).include?(baseosver.split('.').first)
+                if verbose
+                  warn("Could not find SIMP version mapping for #{simpver} for Base OS #{baseosver}")
+                end
+
+                next
+              end
 
               mkrepo = baseosver.split('.').first == '5' ? 'createrepo -s sha -p' : 'createrepo -p'
 
@@ -288,6 +294,9 @@ module Simp::Rake::Build
               system(mkisofs_cmd.join(' '))
             end
           end # End of tarfiles loop
+
+          # If we got here and didn't generate any ISOs, something went horribly wrong
+          fail('Error: No ISO was built!') unless @simp_output_iso
         end
 
         desc <<-EOM

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

@@ -39,15 +39,19 @@ module Simp::Rake::Build
             :modules => get_module_dirs(args[:method]),
             :aux => [
               "#{@build_dir}/GPGKEYS",
-              "#{@src_dir}/puppet/bootstrap",
               "#{@src_dir}/rsync",
-              "#{@src_dir}/utils"
+              # Anything in here gets built!
+              "#{@src_dir}/assets/*"
             ],
             :doc => "#{@src_dir}/doc",
             :simp_cli => "#{@src_dir}/rubygems/simp_cli",
             :simp => "#{@src_dir}",
           }
 
+          @build_dirs[:aux].map!{|dir| dir = Dir.glob(dir)}
+          @build_dirs[:aux].flatten!
+          @build_dirs[:aux].delete_if{|f| !File.directory?(f)}
+
           @pkg_dirs = {
             :simp => "#{@build_dir}/SIMP",
             :ext  => "#{@build_dir}/Ext_*"
@@ -86,7 +90,7 @@ module Simp::Rake::Build
               Dir.chdir(dir) do
                 begin
                   rake_flags = Rake.application.options.trace ? '--trace' : ''
-                  sh %{rake clean[#{args.chroot}] #{rake_flags}}
+                  %x{rake clean[#{args.chroot}] #{rake_flags}}
                   clean_failures_lock.synchronize do
                     clean_failures << dir unless $?.success?
                   end
@@ -292,12 +296,12 @@ module Simp::Rake::Build
 
           check_dvd_env
 
-          Rake::Task['pkg:modules'].invoke(args.chroot)
+          Rake::Task['pkg:simp_cli'].invoke(args.chroot)
           Rake::Task['pkg:aux'].invoke(args.chroot)
           if "#{args.docs}" == 'true'
             Rake::Task['pkg:doc'].invoke(args.chroot)
           end
-          Rake::Task['pkg:simp_cli'].invoke(args.chroot)
+          Rake::Task['pkg:modules'].invoke(args.chroot)
 
           # The main SIMP RPM must be built last!
           Rake::Task['pkg:simp'].invoke(args.chroot,args.snapshot_release)
@@ -326,8 +330,8 @@ module Simp::Rake::Build
                 out_dir = "#{output_dir}/SRPMS"
                 mkdir_p(out_dir, :verbose => _verbose) unless File.directory?(out_dir)
 
-                if not uptodate?("#{out_dir}/#{File.basename(srpm)}",[srpm])
-                  cp(srpm,out_dir, :verbose => _verbose)
+                unless uptodate?("#{out_dir}/#{File.basename(srpm)}",[srpm])
+                  cp(srpm, out_dir, :verbose => _verbose)
                 end
               end
 
@@ -335,8 +339,8 @@ module Simp::Rake::Build
                 out_dir = "#{output_dir}/RPMS/#{rpm.split('.')[-2]}"
                 mkdir_p(out_dir, :verbose => _verbose) unless File.directory?(out_dir)
 
-                if not uptodate?("#{out_dir}/#{File.basename(rpm)}",[rpm])
-                  cp(rpm,out_dir, :verbose => _verbose)
+                unless uptodate?("#{out_dir}/#{File.basename(rpm)}",[rpm])
+                  cp(rpm, out_dir, :verbose => _verbose)
                 end
               end
             end
@@ -516,6 +520,7 @@ module Simp::Rake::Build
 
             ENV vars:
               - Set `SIMP_PKG_verbose=yes` to report file operations as they happen.
+              - Set `SIMP_PKG_repoclose_pe=yes` to enable repoclosure on PE-related RPMs.
 
         EOM
         task :repoclosure,[:target_dir,:aux_dir] => [:prep] do |t,args|
@@ -528,6 +533,7 @@ module Simp::Rake::Build
           end
 
           _verbose = ENV.fetch('SIMP_PKG_verbose','no') == 'yes'
+          _repoclose_pe = ENV.fetch('SIMP_PKG_repoclose_pe','no') == 'yes'
 
           yum_conf_template = <<-EOF
 [main]
@@ -537,6 +543,9 @@ obsoletes=1
 gpgcheck=0
 plugins=1
 installonly_limit=5
+<% unless #{_repoclose_pe} -%>
+exclude=*-pe-*
+<% end -%>
 
 <% repo_files.each do |repo| -%>
 include=file://<%= repo %>
@@ -641,76 +650,62 @@ protect=1
           # Default package metadata for reference
           default_metadata = YAML.load(File.read("#{@src_dir}/build/package_metadata_defaults.yaml"))
 
-          failures = {}
-
           metadata = Parallel.map(
+            # Allow for shell globs
             Array(dirs),
             :in_processes => get_cpu_limit,
             :progress => task.name
           ) do |dir|
             result = []
 
-            begin
-              build_attempt = 0
-              try_build = true
-              while(try_build) do
+            fail("Could not find directory #{dir}") unless Dir.exist?(dir)
+
+            Dir.chdir(dir) do
+              if File.exist?('Rakefile')
+
+                unique_build = (get_cpu_limit != 1)
+
+                rake_flags = Rake.application.options.trace ? '--trace' : ''
+                cmd = %{rake pkg:rpm[#{chroot},unique_build,#{snapshot_release}] #{rake_flags} 2>&1}
                 begin
+                  if _verbose
+                    $stderr.puts("Running 'rake pkg:rpm'")
+                  end
 
-                  fail("Could not find directory #{dir}") unless Dir.exist?(dir)
-
-                  Dir.chdir(dir) do
-                    if File.exist?('Rakefile')
-                      unique_build = (get_cpu_limit != 1)
-                      rake_flags = Rake.application.options.trace ? '--trace' : ''
-                      output = %x{rake pkg:rpm[#{chroot},unique_build,#{snapshot_release}] #{rake_flags} 2>&1}
-                      raise(output) unless $?.success?
-
-                      # Glob all generated rpms, and add their metadata to a result array.
-                      pkginfo = Hash.new
-                      Dir.glob('dist/*.rpm') do |rpm|
-                        if not rpm =~ /.*.src.rpm/ then
-                          # get_info from each generated rpm, not the spec file, so macros in the
-                          # metadata have already been resolved in the mock chroot.
-                          result << Simp::RPM.get_info(rpm)
-                        end
-                      end
-                    else
-                      puts "Warning: Could not find Rakefile in '#{dir}'"
-                    end
+                  ::Bundler.with_clean_env do
+                    %x{#{cmd}}
                   end
-                rescue Exception => e
-                  if build_attempt == 0
-                    # Run 'bundle' and try again
-                    ::Bundler.with_clean_env do
-                      out = %x(bundle install 2>&1)
-                      status = $?.success?
-                      puts out if _verbose
-                    end
-                  else
-                    build_attempt += 1
-                    try_build = false
-                    failures[dir] = e.to_s
-                    if _verbose
-                      stderr.puts(e.to_s)
-                    else
-                      stderr.puts("Error found in: #{File.basename(dir)}")
-                    end
+                rescue
+                  if _verbose
+                    $stderr.puts("First 'rake pkg:rpm' attempt failed, running bundle and trying again.")
+                  end
+
+                  ::Bundler.with_clean_env do
+                    %x{bundle install}
+                    %x{#{cmd}}
                   end
                 end
 
-                try_build = false
-              end
+                tarballs = Dir.glob('dist/*.tar.gz')
+                srpms = Dir.glob('dist/*.src.rpm')
+                rpms = (Dir.glob('dist/*.rpm') - srpms)
 
-              result
-            ensure
-              unless failures.empty?
-                errmsg = ['Error: Failures found during module build']
-                failures.keys.each do |dir|
-                  errmsg << ('* ' + dir)
-                  errmsg << (failures[dir].lines.map{|ln| ln = "    #{ln}}"})
+                # Not all items generate tarballs
+                tarballs.each do |pkg|
+                  raise("Empty Tarball '#{pkg}' generated for #{dir}") if (File.stat(pkg).size == 0)
                 end
-
-                raise errmsg
+                raise("No SRPMs generated for #{dir}") if srpms.empty?
+                raise("No RPMs generated for #{dir}") if rpms.empty?
+
+                # Glob all generated rpms, and add their metadata to a result array.
+                pkginfo = Hash.new
+                rpms.each do |rpm|
+                  # get_info from each generated rpm, not the spec file, so macros in the
+                  # metadata have already been resolved in the mock chroot.
+                  result << Simp::RPM.get_info(rpm)
+                end
+              else
+                puts "Warning: Could not find Rakefile in '#{dir}'"
               end
             end
           end
@@ -719,7 +714,7 @@ protect=1
             # Each module could generate multiple rpms, each with its own metadata.
             # Iterate over them to add all built rpms to autorequires.
             mod.each do |module_pkginfo|
-              next unless (module_pkginfo)
+              next unless (module_pkginfo && module_pkginfo.is_a?(Hash))
 
               # Set up the autorequires
               if add_to_autoreq

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

@@ -25,6 +25,9 @@ module Simp::Rake::Build
           fail("Could not find simp main RPM in output directory!") unless simp_rpm
           simp_version = File.basename(simp_rpm).gsub(".noarch.rpm","").gsub("simp-","")
 
+          # For picking up the correct RPM template
+          ENV['SIMP_BUILD_version'] ||= simp_version
+
           return simp_version
         end
 

data/lib/simp/rake/build/vermap.yaml

@@ -1,4 +1,5 @@
 ---
+"6": ["6","7"]
 "5": "7"
 "4": "6"
 "2": "5"

data/lib/simp/rake/helpers/rpm_spec.rb

@@ -1,382 +1,20 @@
 module Simp; end
 module Simp::Rake; end
 class Simp::Rake::Helpers
-  module Simp::Rake::Helpers::RPM_Spec
-
+  module Simp::Rake::Helpers::RPMSpec
     def self.template
-      return <<-EOF
-%{lua:
-
---
--- When you build you must to pass this along so that we know how
--- to get the preliminary information.
--- This directory should hold the following items:
---   * 'build' directory
---   * 'CHANGELOG' <- The RPM formatted Changelog
---   * 'metadata.json'
---
--- Example:
---   rpmbuild -D 'pup_module_info_dir /home/user/project/puppet_module' -ba SPECS/specfile.spec
---
--- If this is not found, we will look in %{_sourcedir} for the files and fall
--- back to the current directory
---
-
-src_dir = rpm.expand('%{pup_module_info_dir}')
-
-if string.match(src_dir, '^%%') or (posix.stat(src_dir, 'type') ~= 'directory') then
-  src_dir = rpm.expand('%{_sourcedir}')
-
-  if (posix.stat((src_dir .. "/metadata.json"), 'type') ~= 'regular') then
-    src_dir = './'
-  end
-end
-
--- These UNKNOWN entries should break the build if something bad happens
-
-package_name = "UNKNOWN"
-package_version = "UNKNOWN"
-module_license = "UNKNOWN"
-
---
--- Default to 2016
--- This was done due to the change in naming scheme across all of the modules.
---
-
-package_release = '2016'
-
-}
-
-%{lua:
--- Pull the Relevant Metadata out of the Puppet module metadata.json.
-
-metadata = ''
-metadata_file = io.open(src_dir .. "/metadata.json","r")
-if metadata_file then
-  metadata = metadata_file:read("*all")
-
-  -- Ignore the first curly brace
-  metadata = metadata:gsub("{}?", '|', 1)
-
-  -- Ignore all keys that are below the first level
-  metadata = metadata:gsub("{.-}", '')
-  metadata = metadata:gsub("%[.-%]", '')
-end
-
--- This starts as an empty string so that we can build it later
-module_requires = ''
-
-}
-
-%{lua:
-
--- Get the Module Name and put it in the correct format
-
-local name_match = string.match(metadata, '"name":%s+"(.-)"%s*,')
-
-module_author = ''
-module_name = ''
-
-if name_match then
-  package_name = ('pupmod-' .. name_match)
-
-  local i = 0
-  for str in string.gmatch(name_match,'[^-]+') do
-    if i == 0 then
-      module_author = str
-    else
-      if module_name == '' then
-        module_name = str
+      simp_version = ENV.fetch('SIMP_BUILD_version', @simp_version)
+      if simp_version
+        simp_main_version = simp_version.split('.').first
       else
-        module_name = (module_name .. '-' .. str)
+        simp_main_version = 'default'
       end
-    end
-
-    i = i+1
-  end
-else
-  print("Error: Could not find valid package name in 'metadata.json'")
-end
-
-}
-
-%{lua:
-
--- Get the Module Version
--- This will not be processed at all
-
-local version_match = string.match(metadata, '"version":%s+"(.-)"%s*,')
-
-if version_match then
-  package_version = version_match
-end
-
-}
-
-%{lua:
-
--- Get the Module License
--- This will not be processed at all
-
-local license_match = string.match(metadata, '"license":%s+"(.-)"%s*,')
-
-if license_match then
-  module_license = license_match
-end
-
-}
-
-%{lua:
-
--- Get the Module Summary
--- This will not be processed at all
-
-local summary_match = string.match(metadata, '"summary":%s+"(.-)"%s*,')
-
-if summary_match then
-  module_summary = summary_match
-end
-
-}
-
-%{lua:
-
--- Get the Module Source line for the URL string
--- This will not be processed at all
-
-local source_match = string.match(metadata, '"source":%s+"(.-)"%s*,')
-
-if source_match then
-  module_source = source_match
-end
-
-}
-
-%{lua:
-
--- Snag the RPM-specific items out of the 'build/rpm_metadata' directory
-
--- First, the Release Number
-
-rel_file = io.open(src_dir .. "/build/rpm_metadata/release", "r")
-
-if not rel_file then
-  -- Need this for the SRPM case
-  rel_file = io.open(src_dir .. "/release", "r")
-end
 
-if rel_file then
-  for line in rel_file:lines() do
-    is_comment = string.match(line, "^%s*#")
-    is_blank = string.match(line, "^%s*$")
+      template_file = File.join(File.dirname(__FILE__), 'rpm_spec', 'assets', "simp#{simp_main_version}.spec")
 
-    if not (is_comment or is_blank) then
-      package_release = line
-      break
-    end
-  end
-end
-
-}
-
-%{lua:
-
--- Next, the Requirements
-req_file = io.open(src_dir .. "/build/rpm_metadata/requires", "r")
-
-if not req_file then
-  -- Need this for the SRPM case
-  req_file = io.open(src_dir .. "/requires", "r")
-end
-
-if req_file then
-  for line in req_file:lines() do
-    valid_line = (string.match(line, "^Requires: ") or string.match(line, "^Obsoletes: ") or string.match(line, "^Provides: "))
-
-    if valid_line then
-      module_requires = (module_requires .. "\\n" .. line)
-    end
-  end
-end
-}
-
-%define module_name %{lua: print(module_name)}
-%define base_name %{lua: print(package_name)}
-
-%{lua:
--- Determine which Variant we are going to build
-
-local variant = rpm.expand("%{_variant}")
-local variant_version = nil
-
-local foo = ""
-
-local i = 0
-for str in string.gmatch(variant,'[^-]+') do
-  if i == 0 then
-    variant = str
-  elseif i == 1 then
-    variant_version = str
-  else
-    break
-  end
-
-  i = i+1
-end
-
-rpm.define("variant " .. variant)
-
-if variant == "pe" then
-  rpm.define("puppet_user pe-puppet")
-else
-  rpm.define("puppet_user puppet")
-end
-
-if variant == "pe" then
-  if variant_version and ( rpm.vercmp(variant_version,'4') >= 0 ) then
-    rpm.define("_sysconfdir /etc/puppetlabs/code")
-  else
-    rpm.define("_sysconfdir /etc/puppetlabs/puppet")
-  end
-elseif variant == "p4" then
-  rpm.define("_sysconfdir /etc/puppetlabs/code")
-else
-  rpm.define("_sysconfdir /etc/puppet")
-end
-}
-
-Summary:   %{module_name} Puppet Module
-%if 0%{?_variant:1}
-Name:      %{base_name}-%{variant}
-%else
-Name:      %{base_name}
-%endif
-
-Version:   %{lua: print(package_version)}
-Release:   %{lua: print(package_release)}
-License:   %{lua: print(module_license)}
-Group:     Applications/System
-Source0:    %{base_name}-%{version}-%{release}.tar.gz
-Source1:   %{lua: print("metadata.json")}
-%{lua:
-  -- Include our sources as appropriate
-  changelog = io.open(src_dir .. "/CHANGELOG","r")
-  if changelog then
-    print("Source2: " .. "CHANGELOG\\n")
-  end
+      raise "Error: Could not find template for SIMP version #{simp_version}" unless File.exist?(template_file)
 
-  if rel_file then
-    print("Source3: " .. "release\\n")
-  end
-  if req_file then
-    print("Source4: " .. "requires\\n")
-  end
-}
-URL:       %{lua: print(module_source)}
-BuildRoot: %{_tmppath}/%{base_name}-%{version}-%{release}-buildroot
-BuildArch: noarch
-
-%if "%{variant}" == "pe"
-Requires: pe-puppet >= 3.8.6
-%else
-Requires: puppet >= 3.8.6
-%endif
-
-%if ("%{base_name}" != "pupmod-simp-simplib") && ("%{base_name}" != "pupmod-puppetlabs-stdlib")
-Requires: pupmod-simp-simplib >= 1.2.6
-%endif
-
-%if "%{base_name}" != "pupmod-puppetlabs-stdlib"
-Requires: pupmod-puppetlabs-stdlib >= 4.9.0
-Requires: pupmod-puppetlabs-stdlib < 6.0.0
-%endif
-
-%{lua: print(module_requires)}
-
-Provides: pupmod-%{lua: print(module_name)} = %{lua: print(package_version .. "-" .. package_release)}
-Obsoletes: pupmod-%{lua: print(module_name)} < %{lua: print(package_version .. "-" .. package_release)}
-
-%{lua:
-
-  -- This is a workaround for the 'simp-rsync' real RPM conflict but is
-  -- required by some external modules.
-  -- This should be removed when SIMP 6 is stable
-
-  author_rpm_name = module_author .. "-" .. module_name
-
-  if author_rpm_name ~= 'simp-rsync' then
-    print("Provides: " .. author_rpm_name .. " = " .. package_version .. "-" .. package_release .. "\\n")
-    print("Obsoletes: " .. author_rpm_name .. " < " .. package_version .. "-" .. package_release ..  "\\n")
-  end
-}
-
-Prefix: %{_sysconfdir}/environments/simp/modules
-
-%description
-%{lua: print(module_summary)}
-
-%prep
-%setup -q -n %{base_name}-%{version}
-
-%build
-
-%install
-[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
-
-mkdir -p %{buildroot}/%{prefix}
-
-rm -rf .git
-rm -f *.lock
-rm -rf spec/fixtures/modules
-rm -rf dist
-rm -rf junit
-rm -rf log
-
-curdir=`pwd`
-dirname=`basename $curdir`
-cp -r ../$dirname %{buildroot}/%{prefix}/%{module_name}
-
-%clean
-[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
-
-mkdir -p %{buildroot}/%{prefix}
-
-%files
-%defattr(0640,root,%{puppet_user},0750)
-%{prefix}/%{module_name}
-
-%changelog
-%{lua:
--- Finally, the CHANGELOG
-
--- A default CHANGELOG in case we cannot find a real one
-
-default_changelog = [===[
-* $date Auto Changelog <auto@no.body> - $version-$release
-- Latest release of $name
-]===]
-
-default_lookup_table = {
-  date = os.date("%a %b %d %Y"),
-  version = package_version,
-  release = package_release,
-  name = package_name
-}
-
-changelog = io.open(src_dir .. "/CHANGELOG","r")
-if changelog then
-  first_line = changelog:read()
-  if string.match(first_line, "^*%s+%a%a%a%s+%a%a%a%s+%d%d?%s+%d%d%d%d%s+.+") then
-    changelog:seek("set",0)
-    print(changelog:read("*all"))
-  else
-    print((default_changelog:gsub('$(%w+)', default_lookup_table)))
-  end
-else
-  print((default_changelog:gsub('$(%w+)', default_lookup_table)))
-end
-}
-      EOF
+      return File.read(template_file)
     end
   end
 end