simp-rake-helpers 3.0.1 → 3.0.2

data/lib/simp/rake/helpers/assets/Gemfile

@@ -0,0 +1,11 @@
+# ------------------------------------------------------------------------------
+# Environment variables:
+#   SIMP_GEM_SERVERS | a space/comma delimited list of rubygem servers
+# ------------------------------------------------------------------------------
+# NOTE: SIMP Puppet rake tasks support ruby 2.0 and ruby 2.1
+# ------------------------------------------------------------------------------
+gem_sources   = ENV.key?('SIMP_GEM_SERVERS') ? ENV['SIMP_GEM_SERVERS'].split(/[, ]+/) : ['https://rubygems.org']
+
+gem_sources.each { |gem_source| source gem_source }
+
+gem 'simp-rake-helpers', '~> 3.0'

data/lib/simp/rake/helpers/assets/rpm_spec/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/rpm_spec.rb

@@ -6,8 +6,8 @@ class Simp::Rake::Helpers
 
     include Simp::Rake::Build::Constants
 
-    def self.template
-      simp_version = ENV.fetch('SIMP_BUILD_version', @simp_version)
+    def rpm_template(simp_version=nil)
+      simp_version = ENV.fetch('SIMP_BUILD_version', simp_version)
 
       if simp_version
         simp_main_version = simp_version.split('.').first
@@ -15,7 +15,7 @@ class Simp::Rake::Helpers
         simp_main_version = 'default'
       end
 
-      template_file = File.join(File.dirname(__FILE__), 'rpm_spec', 'assets', "simp#{simp_main_version}.spec")
+      template_file = File.join(File.dirname(__FILE__), 'assets', 'rpm_spec', "simp#{simp_main_version}.spec")
 
       raise "Error: Could not find template for SIMP version #{simp_version}" unless File.exist?(template_file)
 

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

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

data/lib/simp/rake/pkg.rb

@@ -13,6 +13,8 @@ module Simp; end
 module Simp::Rake
   class Pkg < ::Rake::TaskLib
 
+    include Simp::Rake::Helpers::RPMSpec
+
     # path to the project's directory.  Usually `File.dirname(__FILE__)`
     attr_accessor :base_dir
 
@@ -36,7 +38,7 @@ module Simp::Rake
 
     attr_reader   :spec_info
 
-    def initialize( base_dir, unique_name=nil )
+    def initialize( base_dir, unique_name=nil, unique_namespace=nil, simp_version=nil )
       @base_dir            = base_dir
       @pkg_name            = File.basename(@base_dir)
       @pkg_dir             = File.join(@base_dir, 'dist')
@@ -53,7 +55,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::RPMSpec.template)
+        @spec_tempfile.write(rpm_template(simp_version))
 
         @spec_file = @spec_tempfile.path
 
@@ -79,7 +81,13 @@ module Simp::Rake
 
       ::CLEAN.include( @clean_list )
 
-      define
+      if unique_namespace
+        namespace unique_namespace.to_sym do
+          define
+        end
+      else
+        define
+      end
     end
 
     def define
@@ -109,7 +117,13 @@ module Simp::Rake
 
         if chroot
           @chroot_name = @chroot_name || "#{@spec_info[:name]}__#{ENV.fetch( 'USER', 'USER' )}"
+
+          if ENV['SIMP_PKG_rand_name'] && (ENV['SIMP_PKG_rand_name'] != 'no')
+            @chroot_name = @chroot_name + '__' + Time.now.strftime('%s%L')
+          end
+
           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)
@@ -174,7 +188,7 @@ module Simp::Rake
           args.with_defaults(:chroot => nil)
           args.with_defaults(:unique => false)
 
-          initialize_spec_info(args.chroot, args.unique)
+          initialize_spec_info(args[:chroot], args[:unique])
         end
 
         # :pkg:tar
@@ -186,12 +200,12 @@ module Simp::Rake
                                   this to work.
         EOM
         task :tar,[:chroot,:unique,:snapshot_release] => [:initialize_spec_info] do |t,args|
-          args.with_defaults(:snapshot_release => false)
+          args.with_defaults(:snapshot_release => 'false')
           args.with_defaults(:chroot => nil)
-          args.with_defaults(:unique => false)
+          args.with_defaults(:unique => 'false')
 
           l_date = ''
-          if args.snapshot_release == 'true'
+          if args[:snapshot_release] == 'true'
             l_date = '.' + "#{TIMESTAMP}"
             @tar_dest = "#{@pkg_dir}/#{@full_pkg_name}#{l_date}.tar.gz"
           end
@@ -236,34 +250,22 @@ 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.
-
-                     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.
-=end
+            By default, the package will be built to support a SIMP-6.X file structure.
+            To build the package for a different version of SIMP, export SIMP_BUILD_version=<5.X,4.X>
+       EOM
         task :srpm,[:chroot,:unique,:snapshot_release] => [:tar] do |t,args|
-          args.with_defaults(:unique => false)
-          args.with_defaults(:snapshot_release => false)
+          args.with_defaults(:unique => 'false')
+          args.with_defaults(:snapshot_release => 'false')
 
           l_date = ''
-          if args.snapshot_release == 'true'
+          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 )
+          mock_cmd = mock_pre_check( args[:chroot], @chroot_name, args[:unique] )
 
           srpms = Dir.glob(%(#{@pkg_dir}/#{@spec_info[:name]}-#{@spec_info[:version]}-#{@spec_info[:release]}#{l_date}.*src.rpm))
 
@@ -281,7 +283,7 @@ module Simp::Rake
               end
             end
 
-            cmd = %Q(#{mock_cmd} --root #{args.chroot} #{mocksnap} --buildsrpm --spec #{@spec_file} --sources #{@pkg_dir})
+            cmd = %Q(#{mock_cmd} --root #{args[:chroot]} #{mocksnap} --buildsrpm --spec #{@spec_file} --sources #{@pkg_dir})
 
             sh cmd
           end
@@ -300,36 +302,21 @@ module Simp::Rake
             * :snapshot_release - Add snapshot_release (date and time) to rpm version.
                         Rpm spec file must have macro for this to work.
 
+            By default, the package will be built to support a SIMP-6.X file structure.
+            To build the package for a different version of SIMP, export SIMP_BUILD_version=<5.X,4.X>
         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.
-
-                     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.
-=end
-        task :rpm,[:chroot,:unique,:snapshot_release] do |t,args|
-          args.with_defaults(:unique => false)
-          args.with_defaults(:snapshot_release => false)
+        task :rpm,[:chroot,:unique,:snapshot_release] => [:srpm] do |t,args|
+          args.with_defaults(:unique => 'false')
+          args.with_defaults(:snapshot_release => 'false')
 
           l_date = ''
-          if args.snapshot_release == 'true'
+          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
 
-          Rake::Task['pkg:srpm'].invoke(args.chroot,args.unique,args.snapshot_release)
-
-          mock_cmd = mock_pre_check(args.chroot, @chroot_name, args.unique)
+          mock_cmd = mock_pre_check(args[:chroot], @chroot_name, args[:unique])
 
           rpms = Dir.glob(%(#{@pkg_dir}/#{@spec_info[:name]}-#{@spec_info[:version]}-#{@spec_info[:release]}#{l_date}.*rpm))
           srpms = rpms.select{|x| x =~ /src\.rpm$/}
@@ -340,7 +327,7 @@ module Simp::Rake
             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})
+              cmd = %Q(#{mock_cmd} --root #{args[:chroot]} #{mocksnap} #{srpm})
 
               sh cmd
             end
@@ -348,7 +335,7 @@ module Simp::Rake
 
           # remote chroot unless told not to (saves LOTS of space during ISO builds)
           unless ENV['SIMP_RAKE_MOCK_cleanup'] == 'no'
-            cmd = %Q(#{mock_cmd} --root #{args.chroot} --clean)
+            cmd = %Q(#{mock_cmd} --root #{args[:chroot]} --clean)
             sh cmd
           end
         end
@@ -365,7 +352,7 @@ module Simp::Rake
         task :scrub,[:chroot,:unique] do |t,args|
           args.with_defaults(:unique => false)
 
-          mock_cmd = mock_pre_check( args.chroot, @chroot_name, args.unique, false )
+          mock_cmd = mock_pre_check( args[:chroot], @chroot_name, args[:unique], false )
           cmd = %Q(#{mock_cmd} --scrub=all)
           sh cmd
         end
@@ -422,18 +409,18 @@ module Simp::Rake
           "Error: No mock chroot provided. Your choices are:\n  #{mock_configs.join("\n  ")}"
         )
       end
+
       unless mock_configs.include?(chroot)
         raise(Exception,
           "Error: Invalid mock chroot provided. Your choices are:\n  #{mock_configs.join("\n  ")}"
         )
       end
 
-      raise %Q(unique_ext must be a String ("#{unique_ext}" = #{unique_ext.class})) unless unique_ext.is_a? String
+      raise %Q(unique_ext must be a String ("#{unique_ext}" = #{unique_ext.class})) unless unique_ext.is_a?(String)
 
       # if true, restrict yum to the chroot's local yum cache (defaults to false)
       mock_offline = ENV.fetch( 'SIMP_RAKE_MOCK_OFFLINE', 'N' ).chomp.index( %r{^(1|Y|true|yes)$} ) || false
 
-      #mock_cmd =  "#{mock} -D 'pup_module_info_dir #{@spec_info_dir}' --quiet"
       mock_cmd =  "#{mock} --quiet"
       mock_cmd += " --uniqueext=#{unique_ext}" if unique
       mock_cmd += ' --offline'                 if mock_offline