simp-rake-helpers 2.3.2 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce25412c6f102f127038c0ff8493905dfe4f1a54
-  data.tar.gz: 4396a2d08526f13478e4d51b2c7402fb82111753
+  metadata.gz: bf37e26d7fd61c248ece71b5e56c632b38ff3237
+  data.tar.gz: fa3621dc06beb969d539fa96005f56d4d9c576f6
 SHA512:
-  metadata.gz: 30be844d17330402b66b8f852d65113bbcbcd1d676667e869e65bdbc5b22ce00900ab96d81103fd5fe595e63acf28a5f0ca1d9285e49ad2b1a4d16a7f5cf514f
-  data.tar.gz: 9fb77e3056d3510bc5b1182735341f62a4e7ba07347f3c83eeb0e5c5a54d90ef4daee4a1c5dce85113284046fa26841ae2bbc63b9ef9bcda3580f6a7271b1247
+  metadata.gz: 56d8d61349d574a4c289aa2535d8e1be5ad97ffcb57b5df32864884828698476682a3d7363e089f7ba8c18992cf5da10dafb4771c661fe8f33f4bfae62e1dbca
+  data.tar.gz: 4d255776d04b43274c6805d26142ee2b1c3cadbcc9cbcbf2081b45b3e6779d52c8d9facd07934e6052ea42bd4622c9c9c62bf353733df0665a78c42f9fa67861

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 2.4.0 / 2016-06-29
+* Add a Lua-based RPM template to the build stack allowing us to build *any*
+  Puppet module as an RPM without forking.
+
 ### 2.3.2 / 2016-06-29
 * Force a useful failure on repoclosure issues
 

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

@@ -598,36 +598,18 @@ protect=1
 
             Dir.chdir(dir) do
               if File.exist?('Rakefile')
-                # Read the package metadata file and proceed accordingly.
-                module_metadata = default_metadata
-                if File.exist?('build/package_metadata.yaml')
-                  module_metadata.merge!(YAML.load(File.read('build/package_metadata.yaml')))
-                end
-
-                # @simp_version should be set in the main Rakefile
-                build_module = false
-                Array(module_metadata['valid_versions']).each do |version_regex|
-                  build_module = Regexp.new("^#{version_regex}$").match(@simp_version)
-                  break if build_module
-                end
-
-                if build_module
-                  unique_build = (get_cpu_limit != 1)
-                  %x{rake pkg:rpm[#{chroot},unique_build,#{snapshot_release}]}
-
-                  # 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.
-                      pkginfo = Simp::RPM.get_info(rpm)
-                      result << [pkginfo,module_metadata]
-                    end
+                unique_build = (get_cpu_limit != 1)
+                %x{rake pkg:rpm[#{chroot},unique_build,#{snapshot_release}]}
+
+                # 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.
+                  pkginfo = Simp::RPM.get_info(rpm)
+                  result << [pkginfo,module_metadata]
                   end
-                else
-                  puts "Warning: #{Simp::RPM.get_info(Dir.glob('build/*.spec').first)[:name]} is not \
-      valid against SIMP version #{@simp_version.gsub("%{?snapshot_release}","")} and will not be built."
                 end
               else
                 puts "Warning: Could not find Rakefile in '#{dir}'"

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

@@ -0,0 +1,300 @@
+module Simp; end
+module Simp::Rake; end
+module Simp::Rake::Helpers; end
+module Simp::Rake::Helpers::RPM_Spec
+
+  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
+--
+
+src_dir = rpm.expand('%{pup_module_info_dir}')
+if string.match(src_dir, '^%%') or (posix.stat(src_dir, 'type') ~= 'directory') then
+  src_dir = './'
+end
+
+-- These UNKNOWN entries should break the build if something bad happens
+
+module_name = "UNKNOWN"
+module_version = "UNKNOWN"
+module_license = "UNKNOWN"
+
+-- Default to 0
+module_release = '0'
+
+}
+
+%{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")
+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*,')
+
+if name_match then
+  local i = 0
+  for str in string.gmatch(name_match,'[^-]+') do
+    if i ~= 0 then
+      if i == 1 then
+        module_name = str
+      else
+        module_name = (module_name .. '-' .. str)
+      end
+    end
+
+    i = i+1
+  end
+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
+  module_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
+
+local rel_file = io.open(src_dir .. "/build/rpm_metadata/release", "r")
+if rel_file then
+  for line in rel_file:lines() do
+    is_comment = string.match(line, "^%s*#")
+    is_blank = string.match(line, "^%s*$")
+
+    if not (is_comment or is_blank) then
+      module_release = line
+      break
+    end
+  end
+end
+
+}
+
+%{lua:
+
+-- Next, the Requirements
+local req_file = io.open(src_dir .. "/build/rpm_metadata/requires", "r")
+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 pupmod-%{module_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(module_version)}
+Release:   %{lua: print(module_release)}
+License:   %{lua: print(module_license)}
+Group:     Applications/System
+Source:    %{base_name}-%{version}-%{release}.tar.gz
+URL:       %{lua: print(module_source)}
+BuildRoot: %{_tmppath}/%{base_name}-%{version}-%{release}-buildroot
+BuildArch: noarch
+
+%if "%{variant}" == "pe"
+Requires: pe-puppet
+%else
+Requires: puppet
+%endif
+
+%{lua: print(module_requires)}
+
+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 = module_version,
+  release = module_release,
+  name = module_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
+  end
+end

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

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

data/lib/simp/rake/pkg.rb

@@ -7,6 +7,7 @@ require 'rake/tasklib'
 require 'fileutils'
 require 'find'
 require 'simp/rpm'
+require 'simp/rake/helpers/rpm_spec'
 
 module Simp; end
 module Simp::Rake
@@ -41,14 +42,28 @@ module Simp::Rake
     def initialize( base_dir, unique_name=nil )
       @base_dir            = base_dir
       @pkg_name            = File.basename(@base_dir)
-      @spec_file           = Dir.glob("#{@base_dir}/build/*.spec").first
-      @pkg_dir             = "#{@base_dir}/dist"
+      @pkg_dir             = File.join(@base_dir, 'dist')
+      @pkg_tmp_dir         = File.join(@pkg_dir, 'tmp')
       @exclude_list        = [ File.basename(@pkg_dir) ]
       @clean_list          = []
       @ignore_changes_list = []
       @chroot_name         = unique_name
       @mock_root_dir       = ENV.fetch('SIMP_BUILD_MOCK_root','/var/lib/mock')
 
+      local_spec = Dir.glob(File.join(@base_dir, 'build', '*.spec'))
+      unless local_spec.empty?
+        @spec_file = local_spec.first
+      else
+        FileUtils.mkdir_p(@pkg_tmp_dir) unless File.directory?(@pkg_tmp_dir)
+
+        @spec_tempfile = File.open(File.join(@pkg_tmp_dir, "#{@pkg_name}.spec"), 'w')
+        @spec_tempfile.write(Simp::Rake::Helpers::RPM_Spec.template)
+        @spec_tempfile.flush
+
+        @spec_file = @spec_tempfile.path
+        FileUtils.chmod(0640, @spec_file)
+      end
+
       # The following are required to build successful RPMs using the new
       # LUA-based RPM template
 
@@ -96,12 +111,17 @@ module Simp::Rake
         if chroot
           @chroot_name = @chroot_name || "#{@spec_info[:name]}__#{ENV.fetch( 'USER', 'USER' )}"
           mock_cmd = mock_pre_check( chroot, @chroot_name, unique ) + " --root #{chroot}"
-
           # Need to do this in case there is already a directory in /tmp
           rand_dirname = (0...10).map { ('a'..'z').to_a[rand(26)] }.join
           rand_tmpdir = %(/tmp/#{rand_dirname}_tmp)
 
+          # Hack to work around the fact that we have conflicting '-D' entries
+          # TODO: Refactor this
+          mock_cmd = mock_cmd.split(/-D '.*?'/).join
+          mock_cmd = "#{mock_cmd} -D 'pup_module_info_dir #{rand_tmpdir}'"
+
           sh %Q(#{mock_cmd} --chroot 'mkdir -p #{rand_tmpdir}')
+          sh %Q(#{mock_cmd} --chroot 'sed -i /pup_module_info_dir/d ~/.rpmmacros')
 
           @puppet_module_info_files .each do |copy_in|
             if File.exist?(copy_in)
@@ -125,6 +145,11 @@ module Simp::Rake
         @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"
+
+        if @tar_dest =~ /UNKNOWN/
+          fail("Error: Could not determine package information from 'metadata.json'. Got '#{File.basename(@tar_dest)}'")
+        end
+
         @variants       = (ENV['SIMP_BUILD_VARIANTS'].to_s.split(',') + ['default'])
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.4.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-29 00:00:00.000000000 Z
+date: 2016-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -408,6 +408,7 @@ files:
 - lib/simp/rake/build/vermap.yaml
 - lib/simp/rake/fixtures.rb
 - lib/simp/rake/helpers.rb
+- lib/simp/rake/helpers/rpm_spec.rb
 - lib/simp/rake/helpers/version.rb
 - lib/simp/rake/pkg.rb
 - lib/simp/rake/pupmod/helpers.rb