simp-rake-helpers 5.0.1 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b63691fdb25dc847e823ddf5b789d95a21157c8
-  data.tar.gz: bdeff0ea16573bd242e5ed55f545536ec133f3ee
+  metadata.gz: 83f68817cfe206fc61419b4944d535d1439bf6f2
+  data.tar.gz: f0fa84125ad440c1441dc54009d3eba64b986ab7
 SHA512:
-  metadata.gz: 6ee487a49c71d369b8bd84b869225341f47a819c7cc731b55c39d7d676bd3a1fc2240284cbb361d4e463b8cfb2b7eb23f9d7eaaddc16e5335cc17b864395b4f6
-  data.tar.gz: 257269601277edba230d67b20a89d3c5ab80924669eb7b2ffe265cb423fb156c203cc3942e14b7300bd1d853809b9e2ed275efbbb37a895aebc21cd36a587890
+  metadata.gz: 0a5570062e493e4bac9b0c84831a57471a7d79a09176748badba18fff24701373eec0ebbf473a06cdc60af97917af48820f409457e107ae977e6c6d763b49e75
+  data.tar.gz: b51d7180fba3ac1e15cf96eacb67cfb55466b92c0020696e7bd40517f0ecccc7a4a4bc6644fd42900c7d061827f4b08ff15bb28e35ad78cd501f07911205d033

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 5.0.2 / 2017-10-03
+* Determine the build/rpm_metadata/* files when the pkg:rpm
+  rake task is called, not when the rake object is constructed.
+  This is required for simp-doc RPM building.
+
 ### 5.0.1 / 2017-09-28
 * Removed rpmkeys and rpmspec from the required list of commands,
   as they are not present in CentOS 6 and are automatically

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

@@ -436,6 +436,13 @@ module Simp::Rake::Build
               - Set `SIMP_PKG_verbose=yes` to report file operations as they happen.
         EOM
         task :doc => [:prep] do |t,args|
+          # Need to make sure that the docs have the version updated
+          # appropriately prior to building
+
+          Dir.chdir(@build_dirs[:doc]) do
+            sh %{rake munge:prep}
+          end
+
           build(@build_dirs[:doc],t)
         end
 

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

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

data/lib/simp/rake/pkg.rb

@@ -54,6 +54,16 @@ module Simp::Rake
         'spec/fixtures/modules'
       ]
 
+      # This is only meant to be used to work around the case where particular
+      # packages need to ignore some set of artifacts that get updated out of
+      # band. This should not be set as a regular environment variable and
+      # should be fixed properly at some time in the future.
+      #
+      # Presently, this is used by simp-doc
+      if ENV['SIMP_INTERNAL_pkg_ignore']
+        @ignore_changes_list += ENV['SIMP_INTERNAL_pkg_ignore'].split(',')
+      end
+
       FileUtils.mkdir_p(@pkg_tmp_dir)
 
       local_spec = Dir.glob(File.join(@base_dir, 'build', '*.spec'))
@@ -71,15 +81,6 @@ module Simp::Rake
         FileUtils.chmod(0640, @spec_file)
       end
 
-      # The following are required to build successful RPMs using the new
-      # LUA-based RPM template
-
-      @puppet_module_info_files = [
-        Dir.glob(%(#{@base_dir}/build/rpm_metadata/*)),
-        %(#{@base_dir}/CHANGELOG),
-        %(#{@base_dir}/metadata.json)
-      ].flatten
-
       ::CLEAN.include( @pkg_dir )
 
       yield self if block_given?
@@ -226,7 +227,15 @@ module Simp::Rake
           Dir.chdir(@pkg_dir) do
 
             # Copy in the materials required for the module builds
-            @puppet_module_info_files.each do |f|
+            # The following are required to build successful RPMs using
+            # the new LUA-based RPM template
+            puppet_module_info_files = [
+              Dir.glob(%(#{@base_dir}/build/rpm_metadata/*)),
+              %(#{@base_dir}/CHANGELOG),
+              %(#{@base_dir}/metadata.json)
+            ].flatten
+
+            puppet_module_info_files.each do |f|
               if File.exist?(f)
                 FileUtils.cp_r(f, @rpm_srcdir)
               end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.2
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-28 00:00:00.000000000 Z
+date: 2017-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler