packaging 0.99.48 → 0.99.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9b1ac8c003ac90a5214eed7c8ba0452b2d264b093a1e33918951821e77abc1c
-  data.tar.gz: dffd6a141ca0c206e56a3a5f9d92f3d5fd43db33df13955485afb5598d020575
+  metadata.gz: 68bf2734bf72e5f9bad6d03c640d28ce516c05b1a5163b20ebf385676e829ae6
+  data.tar.gz: f54bbad1bd7b25f0e92cd7527de1e03513b557fa4e31db0751f23cd9139d30a6
 SHA512:
-  metadata.gz: ad5e4b3b0f541647b482692c8bca84ab17772a9875c569793f9dd2ec0aeeac6912ec7cc93ac49d417defc3a8c4e863d0975e91aa9b968d33cfdacadcdeada80c
-  data.tar.gz: 7c4c851417fb6fec73fd833a6cd753f29847cc9a097d5a972fadae0482a76a5073e7073405307af2099db23ffb6458b6b7fd758015cb36c924f4aedc39371cfc
+  metadata.gz: 272b2c612425b4ee0226063c54d7bbbfeb5d5de4162050eb716c3acff4f65282741c528ab9f7290e4a987dae436c268632c7d7556eba9bea77c9feb05f9fc1c2
+  data.tar.gz: 5995160e79dbf3258fe5e212cd646bee4f9f9bdfc19acdb4780c02f3acea628408f504fbffbca42b7e4ff98600893a37a87d0ecb6e90834c0e4b68f3a73f6109

data/lib/packaging/artifactory.rb

@@ -366,7 +366,7 @@ module Pkg
           name: artifact_name, :artifactory_uri => @artifactory_uri)
 
         if artifact_search_results.empty?
-          raise "Error: could not find PKG=#{pkg} at REF=#{git_ref} for #{platform_tag}"
+          raise "Error: could not find PKG=#{pkg} at REF=#{ref} for #{platform_tag}"
         end
         artifact_to_promote = artifact_search_results[0]
 
@@ -415,10 +415,13 @@ module Pkg
         packages.each do |name, info|
           artifact_to_download = Artifactory::Resource::Artifact.checksum_search(md5: "#{info["md5"]}", repos: ["rpm_enterprise__local", "debian_enterprise__local"]).first
           if artifact_to_download.nil?
-            raise "Error: what the hell, could not find package #{info["filename"]} with md5sum #{info["md5"]}"
+            filename = info["filename"] || info["name"]
+            raise "Error: what the hell, could not find package #{filename} with md5sum #{info["md5"]}"
           else
-            puts "downloading #{artifact_to_download.download_uri}"
-            artifact_to_download.download("#{staging_directory}/#{dist}", filename: "#{info["filename"]}")
+            full_staging_path = "#{staging_directory}/#{dist}"
+            filename = info['filename'] || File.basename(artifact_to_download.download_uri)
+            puts "downloading #{artifact_to_download.download_uri} to #{File.join(full_staging_path, filename)}"
+            artifact_to_download.download(full_staging_path, filename: filename)
           end
         end
       end
@@ -557,7 +560,11 @@ module Pkg
       final_tarballs.each do |artifact|
         next unless artifact.download_uri.include? remote_path
         next if artifact.download_uri.include? "-rc"
-        artifact.copy("#{repo}/#{target_path}")
+        filename = File.basename(artifact.download_uri)
+        # Artifactory does NOT like when you use `File.join`, so let's concatenate!
+        full_target_path = "#{repo}/#{target_path}/#{filename}"
+        puts "INFO: Copying #{filename} to #{full_target_path} . . ."
+        artifact.copy(full_target_path)
       end
     end
 
@@ -571,18 +578,20 @@ module Pkg
         packages.each do |name, info|
           artifact = Artifactory::Resource::Artifact.checksum_search(md5: "#{info["md5"]}", repos: ["rpm_enterprise__local", "debian_enterprise__local"]).first
           if artifact.nil?
-            raise "Error: what the hell, could not find package #{info["filename"]} with md5sum #{info["md5"]}"
+            filename = info["filename"] || info["name"]
+            raise "Error: what the hell, could not find package #{filename} with md5sum #{info["md5"]}"
           end
           begin
-            artifact_target_path = "#{artifact.repo}/#{target_path}/#{dist}/#{info["filename"]}"
+            filename = info["filename"] || File.basename(artifact.download_uri)
+            artifact_target_path = "#{artifact.repo}/#{target_path}/#{dist}/#{filename}"
             puts "Copying #{artifact.download_uri} to #{artifact_target_path}"
             artifact.copy(artifact_target_path)
           rescue Artifactory::Error::HTTPError
             STDERR.puts "Could not copy #{artifact_target_path}. Source and destination are the same. Skipping..."
           end
-          if File.extname(info["filename"]) == '.deb'
-            copied_artifact_search = Artifactory::Resource::Artifact.pattern_search(repo: 'debian_enterprise__local', pattern: "#{target_path}/*/#{info["filename"]}")
-            fail "Error: what the hell, could not find just-copied package #{info["filename"]} under debian_enterprise__local/#{target_path}" if copied_artifact_search.nil?
+          if File.extname(filename) == '.deb'
+            copied_artifact_search = Artifactory::Resource::Artifact.pattern_search(repo: 'debian_enterprise__local', pattern: "#{target_path}/*/#{filename}")
+            fail "Error: what the hell, could not find just-copied package #{filename} under debian_enterprise__local/#{target_path}" if copied_artifact_search.nil?
             copied_artifact = copied_artifact_search.first
             properties = { 'deb.component' => Pkg::Paths.debian_component_from_path(target_path) }
             copied_artifact.properties(properties)

data/lib/packaging/platforms.rb

@@ -217,6 +217,14 @@ module Pkg
           signature_format: 'v4',
           repo: true,
         },
+        '31' => {
+          architectures: ['x86_64'],
+          source_architecture: 'SRPMS',
+          package_format: 'rpm',
+          source_package_formats: ['src.rpm'],
+          signature_format: 'v4',
+          repo: true,
+        },
       },
 
       'osx' => {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.99.48
+  version: 0.99.49
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-12 00:00:00.000000000 Z
+date: 2019-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec