simp-rake-helpers 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ac44b8dfa44bfa0bde4f0752f8698c347ad93bd
-  data.tar.gz: e425013cffa3024ad3538d3679119c2f4f4855f7
+  metadata.gz: 94dfd5a4fce17cf18dcbcd3954850a62bc22a95f
+  data.tar.gz: ff422c250c7161ce2a4a6effca2dab2aab108262
 SHA512:
-  metadata.gz: 8927124043e3a9494ec35b679c2b8a2dd1a594b0bdc26c8c9f262684e26ceeeb04351eda37256dcf88bf5940f7ac286c996ec7a6da5672b3b236e7b757644839
-  data.tar.gz: f09399ce4a60cd02aa848d87668d417c64fd22d3400f60dbaa1f6b6f3cd91ab220a06616173fe2ab45909e51ec4eb0229524260578f1bef062d0ede804d74dd6
+  metadata.gz: a157149981567ad24a45eca17f0f19b90699fdd9e365a8543b808f75dac25609b19095a66f610c983d41826e605cfca2a8f75e6bec25cb5acba3fe77f81373f1
+  data.tar.gz: 5b51f064fbdc28b2915b595993e43d4c87f1c87f4992473935cc1df7f8a6b917244df7ba843085761056f98aa9b7b7b8689065a58d45efb26d8b0db97023f8a6

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 2.5.1 / 2016-08-30
+* Fixed the RPM spec template so that it properly picks up the requires and
+  release files
+* This is a bit of a mess and needs to be completely refactored in the future
+
 ### 2.4.7 / 2016-08-14
 * Removed unecessary `deps:checkout` warnings from fresh (empty) checkouts
 

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

@@ -158,7 +158,13 @@ end
 
 -- First, the Release Number
 
-local rel_file = io.open(src_dir .. "/build/rpm_metadata/release", "r")
+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*#")
@@ -176,7 +182,13 @@ end
 %{lua:
 
 -- Next, the Requirements
-local req_file = io.open(src_dir .. "/build/rpm_metadata/requires", "r")
+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: "))
@@ -235,7 +247,7 @@ end
 
 Summary:   %{module_name} Puppet Module
 %if 0%{?_variant:1}
-Name:      %{base_name}-%{_variant}
+Name:      %{base_name}-%{variant}
 %else
 Name:      %{base_name}
 %endif
@@ -250,14 +262,14 @@ Source1:   %{lua: print("metadata.json")}
   -- Include our sources as appropriate
   changelog = io.open(src_dir .. "/CHANGELOG","r")
   if changelog then
-    print("Source2: " .. "CHANGELOG")
+    print("Source2: " .. "CHANGELOG\\n")
   end
 
   if rel_file then
-    print("Source3: " .. "build/rpm_metadata/release")
+    print("Source3: " .. "release\\n")
   end
   if req_file then
-    print("Source4: " .. "build/rpm_metadata/requires")
+    print("Source4: " .. "requires\\n")
   end
 }
 URL:       %{lua: print(module_source)}

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.0'
+  VERSION = '2.5.1'
 end

data/lib/simp/rake/pkg.rb

@@ -267,9 +267,15 @@ module Simp::Rake
             if require_rebuild?(@tar_dest,srpms) || require_rebuild?("#{@base_dir}/metadata.json")
 
               @puppet_module_info_files.each do |file|
-                tgt_file = File.join(@pkg_dir, File.basename(file))
-                FileUtils.rm_rf(tgt_file) if File.exist?(tgt_file)
-                FileUtils.cp_r(file, @pkg_dir) if File.exist?(file)
+                next unless File.exist?(file)
+
+                Find.find(file) do |path|
+                  next if File.directory?(path)
+
+                  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
 
               cmd = %Q(#{mock_cmd} --root #{args.chroot} #{mocksnap} --buildsrpm --spec #{@spec_file} --sources #{@pkg_dir})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler