simp-rake-helpers 5.8.2 → 5.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 861762a4c3b19940cac28b557ddb67eb274cd7a76883ba0f821f875fd3695703
-  data.tar.gz: 3acfca7603041d856b19aa3ac1b59fb1de2627269fc5ff4d6f875b7f6f3de90e
+  metadata.gz: 54d1377b43fb4f767b3446a80fcbb490a073426d699b927a0b1a65d4a8290f35
+  data.tar.gz: 0f87a6cdfbaa27f9f1743474f41dca4a0bfccf661277820386d72265278200b0
 SHA512:
-  metadata.gz: 20498ab8d23127912ee6007fefb67d0ece0878f406fee095dbbadac8e9b3aef0540481e47a943e11d4513499d7cf53907135e99580884b1dc86bbfdc0694cc1c
-  data.tar.gz: 86c51a0432acadcdca3f4550e02b74e433cfd68b14aa910f1195f1371427216bbd8d5f30d88e861e66eb4dc3580fd8081c898cdb740bff3fed0cbe6debb20c28
+  metadata.gz: 64c1768cd854505513de05cbacc326096ef733965b0897ed874c16ade248c5ca7252cf13026d49efa86c9d31cfb074c700a87d74627313f94a9dd9171bbc7531
+  data.tar.gz: 393d0d037e9a88ab10f02f2159f002d35fcc5bde21497e0ce3283e7495ab68bf4b138fd50c5c1814ec2f78aca6115147c6cf37b29c9228def09fbe511ac85338

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### 5.8.3 / 2019-05-15
+* Fix the package check to handle building different versions of SIMP
+
 ### 5.8.2 / 2019-05-02
 * Update the list of packages to check for before building
   the tar file.

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

@@ -157,15 +157,16 @@ module Simp::Rake::Build
             source = yum_helper.get_source(rpm) unless source
 
             Dir.chdir('packages') do
-              full_pkg = source.split('/').last
-              unless File.exist?(full_pkg)
-                puts("Downloading: #{full_pkg}")
-                yum_helper.download(source)
+              unless File.exist?(rpm)
+                puts("Downloading: #{rpm}")
+                downloaded_rpm = yum_helper.download(source)
+
+                raise(SIMPBuildException,"#{rpm} could not be downloaded") unless downloaded_rpm
 
                 begin
-                  validate_rpm(full_pkg)
+                  validate_rpm(downloaded_rpm)
                 rescue SIMPBuildException
-                  rm(full_pkg) if File.exist?(full_pkg)
+                  rm(rpm) if File.exist?(rpm)
                   raise(SIMPBuildException,"#{rpm} could not be downloaded")
                 end
               end

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

@@ -51,13 +51,20 @@ module Simp::Rake::Build
               'rubygem-simp-cli',
               'simp',
               'simp-gpgkeys',
-              'simp-rsync-skeleton',
-              'simp-environment-skeleton',
-              'simp-environment-selinux-policy',
               'simp-utils'
             ]
           }
 
+          simp_version = get_simp_version
+
+          if Gem::Version.new(simp_version) < Gem::Version.new('6.4.0')
+            required_rpms['noarch'] << 'simp-rsync'
+          else
+            required_rpms['noarch'] << 'simp-rsync-skeleton'
+            required_rpms['noarch'] << 'simp-environment-skeleton'
+            required_rpms['noarch'] << 'simp-environment-selinux-policy'
+          end
+
           rpm_dir = File.join(@build_dir,'SIMP','RPMS')
           fail("Could not find directory '#{rpm_dir}'") unless File.directory?(rpm_dir)
 

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

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

data/lib/simp/yum.rb

@@ -140,11 +140,17 @@ module Simp
     end
 
     def get_sources(rpm)
-      sources = %x(#{@@yumdownloader} --urls #{File.basename(rpm,'.rpm')} 2>/dev/null).split("\n").grep(%r(\.rpm$))
+      Dir.mktmpdir do |dir|
+        output = %x(#{@@yumdownloader} --urls #{File.basename(rpm,'.rpm')} 2>/dev/null).lines
+        sources = output.grep(%r(\.rpm$))
 
-      raise(Error, "No sources found for '#{rpm}'") if sources.empty?
+        unless (output.grep(/Error/).empty? || sources.empty?)
+          err_msg = "\n-- YUMDOWNLOADER ERROR --\n" + output.join("\n")
+          raise(Error, "No sources found for '#{rpm}'" + err_msg)
+        end
 
-      return sources
+        return sources
+      end
     end
 
     def get_source(rpm, arch=nil)
@@ -163,6 +169,10 @@ module Simp
     end
 
     def download(rpm, opts={:target_dir => nil})
+      rpm.strip!
+
+      downloaded_rpm_name = nil
+
       target_dir = Dir.pwd
 
       if opts[:target_dir]
@@ -176,9 +186,9 @@ module Simp
             # In case someone passed a path
             rpm_name = rpm.split(File::SEPARATOR).last
 
-            #FIXME Should really report stderr output so user can
-            # diagnose the problem
-            %x(#{@@yumdownloader} #{File.basename(rpm_name, '.rpm')} 2>/dev/null)
+            err_msg = %x(#{@@yumdownloader} #{File.basename(rpm_name, '.rpm')} 2>/dev/null)
+
+            downloaded_rpm_name = rpm_name
           else
             # If passed a URL, curl it and fall back to yumdownloader
             rpm_name = rpm.split('/').last
@@ -190,12 +200,25 @@ module Simp
               # Fall back on yumdownloader
               FileUtils.rm_f(rpm_name)
 
-              %x(#{@@yumdownloader} #{File.basename(rpm_name, '.rpm')} 2> /dev/null)
+              err_msg = %x(#{@@yumdownloader} #{File.basename(rpm_name, '.rpm')} 2>/dev/null)
             end
+
+            # We might get a filename that doesn't make sense so we need to
+            # move the file appropriately
+            rpm_info = Simp::RPM.new(rpm_name)
+
+            unless File.exist?(rpm_info.rpm_name)
+              FileUtils.mv(rpm_name, rpm_info.rpm_name)
+            end
+
+            downloaded_rpm_name = rpm_info.rpm_name
           end
 
           rpms = Dir.glob('*.rpm')
-          raise(Error, "Could not find any remote RPMs for #{rpm}") if rpms.empty?
+
+          err_msg = ''
+          err_msg = "\n-- ERROR MESSAGE --\n" + err_msg if err_msg
+          raise(Error, "Could not find any remote RPMs for #{rpm}" + err_msg) if rpms.empty?
 
           # Copy over all of the RPMs
           rpms.each do |new_rpm|
@@ -204,6 +227,8 @@ module Simp
           end
         end
       end
+
+      return downloaded_rpm_name
     end
   end
 end

data/spec/acceptance/20_pkg_rpm_upgrade_spec.rb

@@ -91,9 +91,6 @@ describe 'rake pkg:rpm + component upgrade scenarios' do
     copy_host_files_into_build_user_homedir(hosts)
 
     comment 'ensure the Puppet AIO is installed'
-#FIXME Should install Puppet 5
-    ENV['PUPPET_INSTALL_TYPE'] ||= 'agent'
-    ENV['PUPPET_INSTALL_VERSION'] ||= '1.10.6'
     run_puppet_install_helper_on(hosts)
 
     comment 'configure puppet agent to look like a Puppet server for simp_rpm_helper'

data/spec/acceptance/nodesets/default.yml

@@ -120,3 +120,8 @@ HOSTS:
 CONFIG:
   log_level: verbose
   type:      aio
+<% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
+  puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
+<% else -%>
+  puppet_collection: puppet5
+<% end -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 5.8.2
+  version: 5.8.3
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-03 00:00:00.000000000 Z
+date: 2019-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simp-beaker-helpers
@@ -568,7 +568,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: SIMP rake helpers