simp-rake-helpers 2.4.6 → 2.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61c8ed45126f431116f002d450f2d141cb7f077f
-  data.tar.gz: e1bdd52db3327f71cf02022a0df16d3367fcb1e3
+  metadata.gz: e3c3b2c1a47ba2ce959ba6e31716fd3dcc288dd3
+  data.tar.gz: 8222f40ce96eab1ec4e4477f5d140de3cdb4cead
 SHA512:
-  metadata.gz: a284f6b12c684b2d6dc1db95b37d6bd00ebf89bb5632255617168c604f278d43c898e548827c550b5aa4e25e61e783469a55e1072bf0b04b749f501ef1828eb9
-  data.tar.gz: e57d9448a0e8cc815c3e4472a8dcbcf620ea693604c8467e59c56d7920dbb25a8eed43aa02f83bca3e67621f6465eda5e1e2456058c6970758fedf1c9aedae91
+  metadata.gz: c5f7b59e386f9cead4d67a12a11d328079de00a2482ef0209dd83a1c1224327fa7a0e5c499512d56292e99f6e1fb5503e2a2fbdd5509cd85b875c80ca99b280b
+  data.tar.gz: a031834da602e106f958bd0724ea441ab8d29a87e8ba1b2fc7d50448e1226016b753136b24a34bd94a1fec7824f3fd7efb7ff804b66f9e953ba0ec745bd6431b

data/CHANGELOG.md

@@ -1,4 +1,7 @@
-### 2.4.6 / 2016-08-03
+### 2.4.7 / 2016-08-14
+* Removed unecessary `deps:checkout` warnings from fresh (empty) checkouts
+
+### 2.4.6 / 2016-08-11
 * Fix a broken method call between `r10k` 2.4.0 and `R10KHelper.new()`
 * Add `:insync` status to acceptable module statuses for `deps:checkout`
 

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

@@ -201,7 +201,13 @@ module Simp::Rake::Build
             unless mod[:status] == :unknown
               # Since r10k is destructive, we're enumerating all valid states
               # here
-              if [:absent, :mismatched, :outdated, :insync].include?(mod[:r10k_module].status)
+              if [
+                  :absent,
+                  :mismatched,
+                  :outdated,
+                  :insync,
+                  :dirty
+              ].include?(mod[:r10k_module].status)
                 unless mod[:r10k_cache].synced?
                   mod[:r10k_cache].sync
                 end

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

@@ -18,10 +18,18 @@ class Simp::Rake::Helpers
 -- 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 = './'
+  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
@@ -30,8 +38,11 @@ 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.
+--
+
 package_release = '2016'
 
 }
@@ -233,7 +244,22 @@ Version:   %{lua: print(package_version)}
 Release:   %{lua: print(package_release)}
 License:   %{lua: print(module_license)}
 Group:     Applications/System
-Source:    %{base_name}-%{version}-%{release}.tar.gz
+Source0:    %{base_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")
+  end
+
+  if rel_file then
+    print("Source3: " .. "build/rpm_metadata/release")
+  end
+  if req_file then
+    print("Source4: " .. "build/rpm_metadata/requires")
+  end
+}
 URL:       %{lua: print(module_source)}
 BuildRoot: %{_tmppath}/%{base_name}-%{version}-%{release}-buildroot
 BuildArch: noarch

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

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

data/lib/simp/rake/pkg.rb

@@ -58,9 +58,12 @@ module Simp::Rake
 
         @spec_tempfile = File.open(File.join(@pkg_tmp_dir, "#{@pkg_name}.spec"), 'w')
         @spec_tempfile.write(Simp::Rake::Helpers::RPM_Spec.template)
-        @spec_tempfile.flush
 
         @spec_file = @spec_tempfile.path
+
+        @spec_tempfile.flush
+        @spec_tempfile.close
+
         FileUtils.chmod(0640, @spec_file)
       end
 
@@ -105,7 +108,7 @@ module Simp::Rake
     def initialize_spec_info(chroot, unique)
       unless @spec_info
         # This gets the resting spec file and allows us to pull out the name
-        @spec_info   = Simp::RPM.get_info( @spec_file )
+        @spec_info   = Simp::RPM.get_info(@spec_file)
         @spec_info_dir = @base_dir
 
         if chroot
@@ -121,9 +124,8 @@ module Simp::Rake
           mock_cmd = "#{mock_cmd} -D 'pup_module_info_dir #{rand_tmpdir}'"
 
           sh %Q(#{mock_cmd} --chroot 'mkdir -p #{rand_tmpdir}')
-          sh %Q(#{mock_cmd} --chroot 'sed -i /pup_module_info_dir/d ~/.rpmmacros')
 
-          @puppet_module_info_files .each do |copy_in|
+          @puppet_module_info_files.each do |copy_in|
             if File.exist?(copy_in)
               sh %Q(#{mock_cmd} --copyin #{copy_in} #{rand_tmpdir})
             end
@@ -137,8 +139,6 @@ module Simp::Rake
           }
 
           @spec_info = Simp::RPM.get_info(@spec_file, info_hash)
-
-          @spec_info_dir = rand_tmpdir
         end
 
         @dir_name       = "#{@spec_info[:name]}-#{@spec_info[:version]}"
@@ -264,8 +264,15 @@ module Simp::Rake
 
             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)
-              cmd = %Q(#{mock_cmd} --no-clean --root #{args.chroot} #{mocksnap} --buildsrpm --spec #{@spec_file} --sources #{@pkg_dir})
+            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)
+              end
+
+              cmd = %Q(#{mock_cmd} --root #{args.chroot} #{mocksnap} --buildsrpm --spec #{@spec_file} --sources #{@pkg_dir})
               if suffix
                 cmd += %( -D "_variant #{variant}")
               end
@@ -387,7 +394,6 @@ module Simp::Rake
       require_rebuild
     end
 
-
     # Run some pre-checks to make sure that mock will work properly.
     #
     # chroot   = name of mock chroot to use
@@ -418,7 +424,8 @@ module Simp::Rake
       # 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} -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
 

data/spec/lib/simp/rpm_spec.rb

@@ -41,7 +41,7 @@ describe Simp::RPM do
       expect( info.fetch( :version ) ).to eq '1'
     end
 
-    it "extracts coreect information from the first entry from a multi-package .spec file" do
+    it "extracts correct information from the first entry from a multi-package .spec file" do
       info = Simp::RPM.get_info(@m_spec_file)
       expect( info.fetch( :name    ) ).to eq 'testpackage-multi-1'
       expect( info.fetch( :version ) ).to eq '1'

metadata

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