simp-rake-helpers 2.5.7 → 3.0.0

data/lib/simp/rake/helpers/rpm_spec/assets/simpdefault.spec

@@ -0,0 +1,356 @@
+%{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/rpm_metadata/requires' <- optional list of 'Requires', 'Provides',
+--      and 'Obsoletes' to supplement those auto-generated in this spec file
+--   * 'build/rpm_metadata/release' <- optional RPM release number to use in
+--      lieu of number hard-coded in this spec file
+--   * 'CHANGELOG' <- optional RPM formatted Changelog to use in lieu of minimal,
+--      changelog entry auto-generated in this spec file
+--   * 'metadata.json' <- required file that must contain the following metadata:
+--     - 'name' - package name
+--     - 'version' - package version
+--     - 'license' - package license
+--     - 'summary' - package summary
+--     - 'source' - package source
+--
+-- 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.
+-- The '.1' bump is there for the SIMP 6 path changes
+--
+
+package_release = '2016.1'
+
+}
+
+%{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("%[.-%]", '')
+else
+  error("Could not open 'metadata.json'", 0)
+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
+      else
+        module_name = (module_name .. '-' .. str)
+      end
+    end
+
+    i = i+1
+  end
+else
+  error("Could not find valid package name in 'metadata.json'", 0)
+end
+
+}
+
+%{lua:
+
+-- Get the Module Version
+
+local version_match = string.match(metadata, '"version":%s+"(.-)"%s*,')
+
+if version_match then
+  package_version = version_match
+else
+  error("Could not find valid package version in 'metadata.json'", 0)
+end
+
+}
+
+%{lua:
+
+-- Get the Module License
+
+local license_match = string.match(metadata, '"license":%s+"(.-)"%s*,')
+
+if license_match then
+  module_license = license_match
+else
+  error("Could not find valid package license in 'metadata.json'", 0)
+end
+
+}
+
+%{lua:
+
+-- Get the Module Summary
+
+local summary_match = string.match(metadata, '"summary":%s+"(.-)"%s*,')
+
+if summary_match then
+  module_summary = summary_match
+else
+  error("Could not find valid package summary in 'metadata.json'", 0)
+end
+
+}
+
+%{lua:
+
+-- Get the Module Source line for the URL string
+
+local source_match = string.match(metadata, '"source":%s+"(.-)"%s*,')
+
+if source_match then
+  module_source = source_match
+else
+  error("Could not find valid package source in 'metadata.json'", 0)
+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*$")
+
+    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 package_name %{lua: print(package_name)}
+
+Summary:   %{module_name} Puppet Module
+Name:      %{package_name}
+
+Version:   %{lua: print(package_version)}
+Release:   %{lua: print(package_release)}
+License:   %{lua: print(module_license)}
+Group:     Applications/System
+Source0:   %{package_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
+
+  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}/%{package_name}-%{version}-%{release}-buildroot
+BuildArch: noarch
+
+Requires(pre,preun,post,postun): simp-adapter >= 0.0.1
+
+%if ("%{package_name}" != "pupmod-simp-simplib") && ("%{package_name}" != "pupmod-puppetlabs-stdlib")
+Requires: pupmod-simp-simplib >= 1.2.6
+%endif
+
+%if "%{package_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: /usr/share/simp/modules
+
+%description
+%{lua: print(module_summary)}
+
+%prep
+%setup -q -n %{package_name}-%{version}
+
+%build
+
+%install
+[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
+
+mkdir -p %{buildroot}/%{prefix}
+
+curdir=`pwd`
+dirname=`basename $curdir`
+cp -r ../$dirname %{buildroot}/%{prefix}/%{module_name}
+rm -rf %{buildroot}/%{prefix}/%{module_name}/.git
+rm -f %{buildroot}/%{prefix}/*.lock
+rm -rf %{buildroot}/%{prefix}/spec/fixtures/modules
+rm -rf %{buildroot}/%{prefix}/dist
+rm -rf %{buildroot}/%{prefix}/junit
+rm -rf %{buildroot}/%{prefix}/log
+
+%clean
+[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
+
+mkdir -p %{buildroot}/%{prefix}
+
+%files
+%defattr(0640,root,root,0750)
+%{prefix}/%{module_name}
+
+# when $1 = 1, this is an install
+# when $1 = 2, this is an upgrade
+%pre
+/usr/local/sbin/simp_rpm_helper --rpm_dir=%{prefix}/%{module_name} --rpm_section='pre' --rpm_status=$1
+
+# when $1 = 1, this is an install
+# when $1 = 2, this is an upgrade
+%post
+/usr/local/sbin/simp_rpm_helper --rpm_dir=%{prefix}/%{module_name} --rpm_section='post' --rpm_status=$1
+
+# when $1 = 1, this is the uninstall of the previous version during an upgrade
+# when $1 = 0, this is the uninstall of the only version during an erase
+%preun
+/usr/local/sbin/simp_rpm_helper --rpm_dir=%{prefix}/%{module_name} --rpm_section='preun' --rpm_status=$1
+
+# when $1 = 1, this is the uninstall of the previous version during an upgrade
+# when $1 = 0, this is the uninstall of the only version during an erase
+%postun
+/usr/local/sbin/simp_rpm_helper --rpm_dir=%{prefix}/%{module_name} --rpm_section='postun' --rpm_status=$1
+
+%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
+}

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

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

data/lib/simp/rake/pkg.rb

@@ -31,9 +31,6 @@ module Simp::Rake
     # array of items to additionally clean
     attr_accessor :clean_list
 
-    # directory that contains all the mock chroots
-    attr_accessor :mock_root_dir
-
     # array of items to ignore when checking if the tarball needs to be rebuilt
     attr_accessor :ignore_changes_list
 
@@ -48,7 +45,6 @@ module Simp::Rake
       @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?
@@ -57,7 +53,7 @@ module Simp::Rake
         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.write(Simp::Rake::Helpers::RPMSpec.template)
 
         @spec_file = @spec_tempfile.path
 
@@ -149,8 +145,6 @@ module Simp::Rake
         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
 
@@ -205,15 +199,27 @@ module Simp::Rake
           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)
-              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
+            require_rebuild = false
+            if File.exist?(@tar_dest)
+              Find.find(target_dir) do |path|
+                filename = File.basename(path)
+                Find.prune if filename =~ /^\./
+                Find.prune if ((filename == File.basename(@pkg_dir)) && File.directory?(path))
+                Find.prune if ((filename == 'spec') && File.directory?(path))
+                Find.prune if @ignore_changes_list.include?(path)
+
+                next if File.directory?(path)
+                unless uptodate?(@tar_dest,[path])
+                  require_rebuild = true
+                  break
+                end
               end
+            else
+              require_rebuild = true
+            end
+
+            if require_rebuild
+              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})
             end
           end
         end
@@ -230,7 +236,9 @@ module Simp::Rake
                         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.
-
+       EOM
+=begin
+ This functionality has been (temporarily?) removed.
         Environment Variables
           SIMP_BUILD_VARIANTS - A comma delimted list of the target versions of Puppet/PE to build toward.
 
@@ -243,7 +251,7 @@ module Simp::Rake
 
                      NOTE: Different RPM spec files may have different
                      behaviors based on the value passed.
-        EOM
+=end
         task :srpm,[:chroot,:unique,:snapshot_release] => [:tar] do |t,args|
           args.with_defaults(:unique => false)
           args.with_defaults(:snapshot_release => false)
@@ -257,33 +265,25 @@ module Simp::Rake
 
           mock_cmd = mock_pre_check( args.chroot, @chroot_name, args.unique )
 
-          @variants.each do |variant|
-            if variant != 'default'
-              suffix = "-#{variant}"
-            end
-
-            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) || require_rebuild?("#{@base_dir}/metadata.json")
+          srpms = Dir.glob(%(#{@pkg_dir}/#{@spec_info[:name]}-#{@spec_info[:version]}-#{@spec_info[:release]}#{l_date}.*src.rpm))
 
-              @puppet_module_info_files.each do |file|
-                next unless File.exist?(file)
+          if require_rebuild?(srpms, @tar_dest)
 
-                Find.find(file) do |path|
-                  next if File.directory?(path)
+            @puppet_module_info_files.each do |file|
+              next unless File.exist?(file)
 
-                  tgt_file = File.join(@pkg_dir, File.basename(path))
-                  FileUtils.rm_rf(tgt_file) if File.exist?(tgt_file)
-                  FileUtils.cp(path, @pkg_dir) if File.exist?(path)
-                end
-              end
+              Find.find(file) do |path|
+                next if File.directory?(path)
 
-              cmd = %Q(#{mock_cmd} --root #{args.chroot} #{mocksnap} --buildsrpm --spec #{@spec_file} --sources #{@pkg_dir})
-              if suffix
-                cmd += %( -D "_variant #{variant}")
+                tgt_file = File.join(@pkg_dir, File.basename(path))
+                FileUtils.rm_rf(tgt_file) if File.exist?(tgt_file)
+                FileUtils.cp(path, @pkg_dir) if File.exist?(path)
               end
-              sh cmd
             end
+
+            cmd = %Q(#{mock_cmd} --root #{args.chroot} #{mocksnap} --buildsrpm --spec #{@spec_file} --sources #{@pkg_dir})
+
+            sh cmd
           end
         end
       end
@@ -300,6 +300,9 @@ module Simp::Rake
             * :snapshot_release - Add snapshot_release (date and time) to rpm version.
                         Rpm spec file must have macro for this to work.
 
+        EOM
+=begin
+ This functionality has been (temporarily?) removed.
         Environment Variables
           SIMP_BUILD_VARIANTS - A comma delimted list of the target versions of Puppet/PE to build toward.
 
@@ -312,7 +315,7 @@ module Simp::Rake
 
                      NOTE: Different RPM spec files may have different
                      behaviors based on the value passed.
-        EOM
+=end
         task :rpm,[:chroot,:unique,:snapshot_release] do |t,args|
           args.with_defaults(:unique => false)
           args.with_defaults(:snapshot_release => false)
@@ -328,23 +331,18 @@ module Simp::Rake
 
           mock_cmd = mock_pre_check(args.chroot, @chroot_name, args.unique)
 
-          @variants.each do |variant|
-            if variant != 'default'
-              suffix = "-#{variant}"
-            end
+          rpms = Dir.glob(%(#{@pkg_dir}/#{@spec_info[:name]}-#{@spec_info[:version]}-#{@spec_info[:release]}#{l_date}.*rpm))
+          srpms = rpms.select{|x| x =~ /src\.rpm$/}
+          rpms = (rpms - srpms)
 
-            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|
+            dirname = File.dirname(srpm)
+            basename = File.basename(srpm,'.src.rpm')
+            rpm = File.join(dirname, basename, 'rpm')
+            if require_rebuild?(rpm, srpm)
+              cmd = %Q(#{mock_cmd} --root #{args.chroot} #{mocksnap} #{srpm})
 
-            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
+              sh cmd
             end
           end
 
@@ -384,20 +382,25 @@ module Simp::Rake
       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)
+    # Return True if any of the 'old' Array are newer than the 'new' Array
+    def require_rebuild?(new, old)
       require_rebuild = false
-      require_rebuild = true if output_files.empty?
+      require_rebuild = true if ( Array(old).empty? || Array(new).empty?)
       unless require_rebuild
-        output_files.each do |outfile|
-          unless uptodate?(outfile,Array(src_file))
+        Array(new).each do |new_file|
+          unless File.exist?(new_file)
+            require_rebuild = true
+            break
+          end
+
+          unless uptodate?(new_file, Array(old))
             require_rebuild = true
             break
           end
         end
       end
 
-      require_rebuild
+      return require_rebuild
     end
 
     # Run some pre-checks to make sure that mock will work properly.