simp-rake-helpers 5.6.0 → 5.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70abf847eafa19896399cd59bd3ddbc44d402162386e0f478a8fd63fa82af301
-  data.tar.gz: fb120559d123dc6837d41e54aba7d42d3bbcb8cf4a17045434979a7aee147821
+  metadata.gz: 6599aea873a06ae3cfaf152334a7effee7fed04f32fa5161b424475a2e350de8
+  data.tar.gz: 7034e551215bf0636963264f2c483179368d3ca653498929b0e1b563253d6324
 SHA512:
-  metadata.gz: c69e50b92d1ccedaec0cff1b68dc08626897c4855874afae9363804afad5360e19fedafe9406d8fa251dbe0b973292cfb8fe2c8d2830b32437f05209fb8e02db
-  data.tar.gz: 016616668c198543c780383df7bf23c3edca2ce3cbba6d99266b150e759c35e60039d82741742b6fd7ddcb3cd1992ca1f97028b612948f9ad34f94455ce21e12
+  metadata.gz: f336088887b860878ced18d3391cf7b682cf0cdf460827bfb3525330fc41437a76dae20ed73e1a89875b8a63cc354288746e96cffff83be400d015e898d0972b
+  data.tar.gz: 709eb08291c9944c3d3929f872bff72dc36fff4603503945e0d33f2ba06ad4569e65ac933e4d7a1e4691a671372e660f84b26222f4ce049613b7c1ca561454a6

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### 5.6.1 / 2018-10-01
+* Ensure that modules do not contain symlinks per the standard Puppet guidance.
+* Do not try to only use the system cache for yum operations since this
+  silently causes all EL6 builds to be rebuilt and can't really work anyway
+  since there isn't a local cache unitl after yum runs. After yum runs, the
+  local cache will be preferred unless it has expired anyway.
+
 ### 5.6.0 / 2018-09-09
 * Add support for Beaker 4
 

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

@@ -18,6 +18,7 @@ module Simp::Rake::Build
 
       @verbose = ENV.fetch('SIMP_PKG_verbose','no') == 'yes'
       @rpm_build_metadata = 'last_rpm_build_metadata.yaml'
+      @rpm_dependency_file = File.join(@base_dir, 'build', 'rpm', 'dependencies.yaml')
 
       define_tasks
     end
@@ -748,11 +749,7 @@ protect=1
           result = false
 
 
-          rpm_dependency_file = File.join(@base_dir, 'build', 'rpm', 'dependencies.yaml')
-
-          if File.exist?(rpm_dependency_file)
-            rpm_metadata = YAML.load(File.read(rpm_dependency_file))
-          end
+          rpm_metadata = File.exist?(@rpm_dependency_file) ? YAML.load(File.read(@rpm_dependency_file)) : {}
 
           Dir.chdir(dir) do
             if File.exist?('metadata.json')
@@ -765,7 +762,7 @@ protect=1
               #   release qualifier from the 'dependencies.yaml';
               #   only created if release qualifier if specified in
               #   the 'dependencies.yaml'
-              Simp::Rake::Build::RpmDeps::generate_rpm_meta_files(dir, rpm_metadata) if rpm_metadata
+              Simp::Rake::Build::RpmDeps::generate_rpm_meta_files(dir, rpm_metadata)
 
               new_rpm = Simp::Rake::Pkg.new(Dir.pwd, opts[:unique_namespace], @simp_version)
               new_rpm_info = Simp::RPM.new(new_rpm.spec_file)
@@ -892,6 +889,8 @@ protect=1
           _verbose = ENV.fetch('SIMP_PKG_verbose','no') == 'yes'
           dbg_prefix = '  ' # prefix for debug messages
 
+          fail("Could not find RPM dependency file '#{@rpm_dependency_file}'") unless File.exist?(@rpm_dependency_file)
+
           begin
             yum_helper = Simp::YUM.new(
               Simp::YUM.generate_yum_conf(File.join(@distro_build_dir, 'yum_data'))

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

@@ -1,70 +1,160 @@
 %{lua:
 
+-- This RPM spec file can build
 --
--- 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
+-- ## Usage
+--
+-- ### pup_module_info_dir
+--
+-- When you build, you must define the macro 'pup_module_info_dir' so that rpm
+-- knows where to find preliminary information.
+--
+-- If 'pup_module_info_dir' isn't defined or available, rpm will look in
+-- '_sourcedir' for the files, falling back to the current directory as a last
+-- resort.
 --
 -- 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
+--     rpmbuild -D 'pup_module_info_dir /home/user/project/puppet_module' -ba SPECS/specfile.spec
+--
+-- ### relevant files
+--
+-- 'pup_module_info_dir' should be a directory that contains the following items:
 --
+--   * '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
+--   * '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 the number '0' hard-coded in
+--                                         this spec file.
+--   * 'CHANGELOG'                      <- optional RPM-formatted CHANGELOG to
+--                                         use in lieu of the minimal changelog
+--                                         entry auto-generated in this file.
+--   * 'build/rpm_metadata/custom/'     <- optional directory to place files to
+--                                         add custom scriptlets and triggers.
+--
+--
+
+local LUA_DEBUG = ((rpm.expand('%{lua_debug}') or '0') == '1')
+
+-- Print debugging info to STDERR (if LUA_DEBUG is true)
+function lua_stderr( msg )
+  if LUA_DEBUG then
+    -- io.stderr:write(tostring(msg):gsub("%f[^%z\n]","LUA #stderr#: "))
+    -- io.stderr:write(tostring(msg))
+    io.stderr:write(msg)
+  end
+end
+
 
-src_dir = rpm.expand('%{pup_module_info_dir}')
+local function get_src_dir()
+  local src_dir = rpm.expand('%{pup_module_info_dir}')
+  if src_dir:match('^%%') or (posix.stat(src_dir, 'type') ~= 'directory') then
+    lua_stderr("WARNING: -D pup_module_info_dir ("..tostring(src_dir)..") could not be used!\n")
+    lua_stderr("         falling back to src_dir = _sourcedir\n")
 
-if string.match(src_dir, '^%%') or (posix.stat(src_dir, 'type') ~= 'directory') then
-  src_dir = rpm.expand('%{_sourcedir}')
+    -- FIXME?: rpmlint considers the use of _sourcedir to be an Error:
+    --   (see: https://fedoraproject.org/wiki/Packaging:RPM_Source_Dir)
+    src_dir = rpm.expand('%{_sourcedir}')
 
-  if (posix.stat((src_dir .. "/metadata.json"), 'type') ~= 'regular') then
-    src_dir = './'
+    if (posix.stat((src_dir .. "/metadata.json"), 'type') ~= 'regular') then
+      lua_stderr("WARNING: couldn't find metadata.json in '"..tostring(src_dir).."'!\n")
+      lua_stderr("         falling back to src_dir = posix.getcwd() ("..posix.getcwd()..")\n")
+
+      src_dir = posix.getcwd()
+    end
   end
+  return src_dir
 end
 
+-- path to project directory / source files
+src_dir = get_src_dir()
+
+-- directory to look for customizations (e.g., scriptlets, triggers)
+custom_content_dir = src_dir .. "/build/rpm_metadata/custom/"
+
+-- list of custom content to inject into the spec file
+custom_content_table = {}
+
+-- list of scriptlets/triggers that have been declared (to avoid duplicates)
+declared_scriptlets_table = {}
+
+-- patterns to recognize scriptlet and trigger declarations
+--
+-- NOTE: Lua patterns are not regexes , and do not support alternation.
+--       So, we try to stay efficient by iterating through as few patterns as
+--       possible by short-ciruiting several matches.
+--       (e.g. '^%%pre' matches both '%pre' and '%pretrans')
+--
+SCRIPTLET_PATTERNS = {
+  '^%%pre',
+  '^%%post',
+  '^%%trigger'
+}
+
 -- These UNKNOWN entries should break the build if something bad happens
 
 package_name = "UNKNOWN"
 package_version = "UNKNOWN"
 module_license = "UNKNOWN"
 
---
 -- Default to 0
---
-
 package_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")
+lua_stderr("\n")
+lua_stderr("--------------------------------------------------------------------------------\n")
+lua_stderr("RPM/LUA build environment:\n")
+lua_stderr("------:\n")
+lua_stderr("LUA _VERSION       = '".._VERSION.."'\n")
+lua_stderr("posix.getcwd()     = '"..posix.getcwd().."'\n")
+lua_stderr("\n")
+lua_stderr("macros:\n")
+lua_stderr("------:\n")
+lua_stderr("'%{pup_module_info_dir}' = '"..rpm.expand('%{pup_module_info_dir}').."'\n")
+lua_stderr("_specdir           = '"..rpm.expand('%{_specdir}').."'\n")
+lua_stderr("_buildrootdir      = '"..rpm.expand('%{_buildrootdir}').."'\n")
+lua_stderr("buildroot          = '"..rpm.expand('%{buildroot}').."'\n")
+lua_stderr("RPM_BUILD_ROOT     = '"..rpm.expand('%{RPM_BUILD_ROOT}').."'\n")
+lua_stderr("\n")
+lua_stderr("local variables:\n")
+lua_stderr("------:\n")
+lua_stderr("src_dir            = '".. src_dir .."'\n")
+lua_stderr("custom_content_dir = '"..custom_content_dir.."'\n# ---\n")
+lua_stderr("--------------------------------------------------------------------------------\n")
+lua_stderr("\n")
 
-  -- 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)
+-- Pull the Relevant Metadata out of the Puppet module metadata.json.
+function read_metadata(src_dir)
+  local metadata = ''
+  local metadata_file = src_dir .. "/metadata.json"
+  local metadata_fh   = io.open(metadata_file,'r')
+  if metadata_fh then
+    metadata = metadata_fh: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': ".. metadata_file, 0)
+  end
+  return metadata
 end
 
+
+metadata = read_metadata(src_dir)
+
 -- This starts as an empty string so that we can build it later
 module_requires = ''
 
@@ -74,7 +164,7 @@ module_requires = ''
 
 -- Get the Module Name and put it in the correct format
 
-local name_match = string.match(metadata, '"name":%s+"(.-)"%s*,')
+local name_match = metadata:match('"name":%s+"(.-)"%s*,')
 
 module_author = ''
 module_name = ''
@@ -83,7 +173,7 @@ if name_match then
   package_name = ('pupmod-' .. name_match)
 
   local i = 0
-  for str in string.gmatch(name_match,'[^-]+') do
+  for str in name_match:gmatch('[^-]+') do
     if i == 0 then
       module_author = str
     else
@@ -106,7 +196,7 @@ end
 
 -- Get the Module Version
 
-local version_match = string.match(metadata, '"version":%s+"(.-)"%s*,')
+local version_match = metadata:match('"version":%s+"(.-)"%s*,')
 
 if version_match then
   package_version = version_match
@@ -120,7 +210,7 @@ end
 
 -- Get the Module License
 
-local license_match = string.match(metadata, '"license":%s+"(.-)"%s*,')
+local license_match = metadata:match('"license":%s+"(.-)"%s*,')
 
 if license_match then
   module_license = license_match
@@ -134,7 +224,7 @@ end
 
 -- Get the Module Summary
 
-local summary_match = string.match(metadata, '"summary":%s+"(.-)"%s*,')
+local summary_match = metadata:match('"summary":%s+"(.-)"%s*,')
 
 if summary_match then
   module_summary = summary_match
@@ -148,7 +238,7 @@ end
 
 -- Get the Module Source line for the URL string
 
-local source_match = string.match(metadata, '"source":%s+"(.-)"%s*,')
+local source_match = metadata:match('"source":%s+"(.-)"%s*,')
 
 if source_match then
   module_source = source_match
@@ -173,8 +263,8 @@ end
 
 if rel_file then
   for line in rel_file:lines() do
-    is_comment = string.match(line, "^%s*#")
-    is_blank = string.match(line, "^%s*$")
+    is_comment = line:match("^%s*#")
+    is_blank = line:match("^%s*$")
 
     if not (is_comment or is_blank) then
       package_release = line
@@ -197,7 +287,7 @@ 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: "))
+    valid_line = (line:match("^Requires: ") or line:match("^Obsoletes: ") or line:match("^Provides: "))
 
     if valid_line then
       module_requires = (module_requires .. "\n" .. line)
@@ -238,16 +328,10 @@ 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
+Requires(pre): simp-adapter >= 0.0.1
+Requires(preun): simp-adapter >= 0.0.1
+Requires(preun): simp-adapter >= 0.0.1
+Requires(postun): simp-adapter >= 0.0.1
 
 %{lua: print(module_requires)}
 
@@ -287,6 +371,9 @@ curdir=`pwd`
 dirname=`basename $curdir`
 cp -r ../$dirname %{buildroot}/%{prefix}/%{module_name}
 
+# Modules should *never* contain symlinks
+find %{buildroot} -type l -delete
+
 # Remove unnecessary assets
 rm -rf %{buildroot}/%{prefix}/%{module_name}/.git
 rm -f %{buildroot}/%{prefix}/%{module_name}/*.lock
@@ -300,29 +387,151 @@ rm -rf %{buildroot}/%{prefix}/%{module_name}/log
 
 mkdir -p %{buildroot}/%{prefix}
 
-%files
-%defattr(0640,root,root,0750)
-%{prefix}/%{module_name}
+%{lua:
+
+  -- returns true if 'scriptlet_name' has already been declared
+  function is_scriplet_declared(scriptlet_name, declared_scriptlets_table)
+    for _,name in ipairs(declared_scriptlets_table) do
+      if (name == scriptlet_name) then
+        return true
+      end
+    end
+    return false
+  end
 
-# 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
+  -- returns true if 'line' is a scriptlet or trigger header
+  function is_valid_scriptlet_header(line)
+    local match = false
+    for _, patt in ipairs(SCRIPTLET_PATTERNS) do
+      if line:match(patt) then
+        match = true
+        break
+      end
+    end
+    return match
+  end
 
-# 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
+  --
+  -- adds content to the custom_content_table
+  --
+  function define_custom_content(
+     content,
+     custom_content_table,
+     declared_scriptlets_table
+  )
+    lua_stderr("# evaluating extra content: \n".. (content:gsub("%f[^%z\n]","  | ")) .."\n")
+
+    if content then
+      local _content = ''
+      local recording = true
+
+      for line in content:gmatch("([^\n]*)\n?") do
+
+        -- skip duplicate scriptlets
+        if is_valid_scriptlet_header(line) then
+          local _line = line:gsub("^%s+",""):gsub("%s+$","")
+          if is_scriplet_declared(_line, declared_scriptlets_table) then
+            lua_stderr("WARNING: scriptlet '".._line..
+                       "' has already been declared (skipping scriptlet).\n")
+            recording = false
+          else
+            lua_stderr('+ "'.._line..'" is recognized as a scriptlet/trigger.\n')
+            recording = true
+            table.insert(declared_scriptlets_table, _line)
+          end
+        end
+
+        if recording then
+           _content = _content .. line .. "\n"
+        else
+           lua_stderr("  skipping line '"..line.."'\n")
+        end
+      end
+      table.insert(custom_content_table, _content )
+    end
+  end
 
-# 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
+  function load_custom_content_files(custom_content_dir, custom_content_table, declared_scriptlets_table)
+    if (posix.stat(custom_content_dir, 'type') == 'directory') then
+      for i,basename in pairs(posix.dir(custom_content_dir)) do
+        local file = custom_content_dir .. basename
+        -- only accept files that are not dot files (".filename")
+        if (basename:match('^[^%.]') and (posix.stat(file, 'type') == 'regular')) then
+          lua_stderr("INFO: found custom RPM spec file snippet: '" .. file .. "'\n")
+          local file_handle = io.open(file,'r')
+          if file_handle then
+            local _content = file_handle:read("*all")
+            define_custom_content(_content, custom_content_table, declared_scriptlets_table)
+          else
+            lua_stderr("WARNING: could not read '"..file.."'\n")
+          end
+          file_handle:close()
+        else
+          lua_stderr("WARNING: skipping invalid filename '"..basename.."'\n")
+        end
+      end
+    else
+      lua_stderr("WARNING: not found: " .. custom_content_dir .. "\n")
+    end
+  end
+
+  -- Declares default scriptlets for SIMP 6.X (referenced from 6.1.0)
+  --
+  --   In order to keep the package-maintained pupmod-*-* packages.
+  --   Packages notify /usr/local/sbin/simp_rpm_helper.
+  --   See: https://github.com/simp/simp-adapter/blob/master/src/sbin/simp_rpm_helper
+  --
+  -- This function should be called last
+  --
+  function declare_default_scriptlets(custom_content_table, declared_scriptlets_table)
+    local DEFAULT_SCRIPTLETS = {
+      ['pre']    = {upgrade = 2},
+      ['post']   = {upgrade = 2},
+      ['preun']  = {upgrade = 0},
+      ['postun'] = {upgrade = 0}
+    }
+    local rpm_dir = rpm.expand('%{prefix}/' .. module_name)
+
+    for name,data in pairs(DEFAULT_SCRIPTLETS) do
+      local content = ('%'..name.."\n"..
+        '# (default scriptlet for SIMP 6.x)\n'..
+        '# when $1 = 1, this is an install\n'..
+        '# when $1 = '.. data.upgrade ..', this is an upgrade\n'..
+        'if [ -x /usr/local/sbin/simp_rpm_helper ] ; then\n'..
+        '  /usr/local/sbin/simp_rpm_helper --rpm_dir='..
+        rpm_dir.." --rpm_section='"..name.."' --rpm_status=$1\n"..
+        'fi\n\n'
+      )
+
+      define_custom_content(content, custom_content_table, declared_scriptlets_table)
+    end
+  end
+
+
+  -- insert custom content (e.g., rpm_metadata/custom/*, scriptlets)
+  function print_extra_content( custom_content_table )
+    local extra_content = table.concat(custom_content_table, "\n") .. "\n"
+    lua_stderr("\n========== DYNAMIC CONTENT SUMMARY ========== (begin)\n" ..
+                rpm.expand( extra_content ) ..
+                "\n========== DYNAMIC CONTENT SUMMARY ========== (end)\n")
+    print(extra_content)
+  end
+
+
+  load_custom_content_files(
+    custom_content_dir,
+    custom_content_table,
+    declared_scriptlets_table
+  )
+  declare_default_scriptlets(custom_content_table, declared_scriptlets_table)
+  print_extra_content(custom_content_table)
+}
+
+
+%files
+%defattr(0640,root,root,0750)
+%{prefix}/%{module_name}
 
 %changelog
 %{lua:
@@ -345,7 +554,7 @@ default_lookup_table = {
 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
+  if first_line:match("^*%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

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

@@ -333,15 +333,6 @@ Requires(preun): simp-adapter >= 0.0.1
 Requires(preun): simp-adapter >= 0.0.1
 Requires(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)}
@@ -380,6 +371,9 @@ curdir=`pwd`
 dirname=`basename $curdir`
 cp -r ../$dirname %{buildroot}/%{prefix}/%{module_name}
 
+# Modules should *never* contain symlinks
+find %{buildroot} -type l -delete
+
 # Remove unnecessary assets
 rm -rf %{buildroot}/%{prefix}/%{module_name}/.git
 rm -f %{buildroot}/%{prefix}/%{module_name}/*.lock

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

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

data/lib/simp/rake/pkg.rb

@@ -9,6 +9,7 @@ require 'find'
 require 'simp/relchecks'
 require 'simp/rpm'
 require 'simp/rake/helpers/rpm_spec'
+require 'simp/rake/build/rpmdeps'
 
 module Simp; end
 module Simp::Rake
@@ -216,12 +217,17 @@ module Simp::Rake
       # :pkg:rpm
       # -----------------------------
       namespace :pkg do
+=begin
+        WARNING: THIS DOES NOT PULL FROM THE simp-core RPM DEPENDENCIES FILE
+        WARNING: YOU WILL PROBABLY NOT GET PROPER FULL SIMP RPMS FROM THIS TASK
+
         desc <<-EOM
         Build the #{@pkg_name} RPM.
 
             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
+=end
         task :rpm => [:tar] do |t,args|
           rpm_opts = [
             %(-D 'buildroot #{@pkg_dir}/rpmbuild/BUILDROOT'),
@@ -275,6 +281,9 @@ module Simp::Rake
 
             srpms = [@full_pkg_name + '.src.rpm']
             if require_rebuild?(srpms.first, @tar_dest)
+              # TODO: Uncomment this after revamping the tests to use a dependencies.yaml file
+              # Simp::Rake::Build::RpmDeps.generate_rpm_meta_files(@base_dir, {})
+
               # Need to build the SRPM so that we can get the build dependencies
               cmd = %(rpmbuild #{rpm_opts.join(' ')} -bs #{@spec_file} > logs/build.srpm.out 2> logs/build.srpm.err)
               puts "==== pkg:rpm SRPM BUILD:   #{cmd}" if @verbose

data/lib/simp/yum.rb

@@ -126,7 +126,7 @@ module Simp
     #
     # Returns nil if nothing found
     def available_package(rpm)
-      yum_output = %x(#{@@yum} -C list #{rpm} 2>/dev/null)
+      yum_output = %x(#{@@yum} list #{rpm} 2>/dev/null)
 
       found_rpm = nil
       if $?.success?

data/spec/acceptance/10_pkg_rpm_spec.rb

@@ -124,7 +124,7 @@ describe 'rake pkg:rpm' do
 
             comment 'produces RPM with appropriate dependencies'
             on host, %(rpm -qpR #{testpackage_rpm} | grep -q simp-adapter)
-            on host, %(rpm -qpR #{testpackage_rpm} | grep -q pupmod-simp-foo)
+            on host, %(rpm -qpR #{testpackage_rpm} | grep -q pupmod-simp-foo), :acceptable_exit_codes => [1]
             on host, %(rpm -qpR #{testpackage_rpm} | grep -q pupmod-simp-simplib)
             on host, %(rpm -qpR #{testpackage_rpm} | grep -q pupmod-puppetlabs-stdlib)
             on host, %(rpm -qp --provides #{testpackage_rpm} | grep -q -x 'pupmod-testpackage = 0.0.1-0')

data/spec/acceptance/files/testpackage/build/rpm_metadata/requires

@@ -1 +1,2 @@
-Requires: pupmod-simp-foo >= 1.2.3
+Requires: pupmod-simp-simplib >= 1.2.3
+Requires: pupmod-puppetlabs-stdlib >= 1.2.3

data/spec/acceptance/files/testpackage/metadata.json

@@ -9,6 +9,10 @@
   "issues_url":   "https://simp/project.atlassian.net",
   "tags": [ "simp", "test"],
   "dependencies": [
+    {
+      "name": "puppetlabs/stdlib",
+      "version_requirement": ">= 1.1.0"
+    },
     {
       "name": "simp/simplib",
       "version_requirement": ">= 1.1.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 5.6.0
+  version: 5.6.1
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-25 00:00:00.000000000 Z
+date: 2018-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simp-beaker-helpers