packaging 0.105.0 → 0.106.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 296bfdcecf936f80297894792d9b9a1bb3a83a422a61e4976aca3916dd6c9a2b
-  data.tar.gz: 0c76c4482d82367cef9d988fc1e31080f718322e4eab1fe9a5176f4544c8a3ce
+  metadata.gz: 193d585363a1423508a90e96a1b3df94e8152e74c1dd72083f5b589b5b143501
+  data.tar.gz: 22492fe7cebbcda8a61742c5d1c1b88073d2b170a392c3f639ef01968a9ad456
 SHA512:
-  metadata.gz: 071534bcce41eb8b11517d21592399a9f94c45b20a70259aa5a13c4bf3ec5bfd6cab5e517698e6f8884736a932a62d0212d945cb97ad549bdf8c80242f594f8e
-  data.tar.gz: 532cca35cd6eeea218c8a6cdcdf00f0802f0c0ae33fc009f6f42bd7c39056f45b147abaf971879e2f5532541e1d08c0c6267425d32aa69dad9c11f036697c183
+  metadata.gz: edc24fcef7b4c1fcc6d63796628a094d3d1d299cc0d29b761af91146c11dfa8627af60b49ee368d15366b324f1d163af013796c6137ea5de08e035d3633811a4
+  data.tar.gz: 297b0577830caeef96526ee289d5d2c31da95237f3d57af53af8a650387a936e3ba1064c790bf1a9b9269f21b859a031f91e30ad49e43cd121d014e193d8123e

data/README.md

@@ -433,18 +433,18 @@ build_doc: false
 build_msi:
   puppet_for_the_win:
     ref: 'origin/master'
-    repo: 'git://github.com/puppetlabs/puppet_for_the_win.git'
+    repo: 'https://github.com/puppetlabs/puppet_for_the_win.git'
   facter:
     ref: 'refs/tags/2.1.0'
-    repo: 'git://github.com/puppetlabs/facter.git'
+    repo: 'https://github.com/puppetlabs/facter.git'
   hiera:
     ref: 'refs/tags/1.3.4'
-    repo: 'git://github.com/puppetlabs/hiera.git'
+    repo: 'https://github.com/puppetlabs/hiera.git'
   sys:
     ref:
       x86: 'origin/1.9.3-x86'
       x64: 'origin/2.0.0-x64'
-    repo: 'git://github.com/puppetlabs/puppet-win32-ruby.git'
+    repo: 'https://github.com/puppetlabs/puppet-win32-ruby.git'
 # Whether to present the Solaris 11 IPS packaging tasks
 # This requires suitable IPS packaging artifacts in the project in ext/ips
 build_ips: false

data/lib/packaging/archive.rb

@@ -3,12 +3,12 @@ module Pkg::Archive
 
   # Array of base paths for foss artifacts on weth
   def base_paths
-    [Pkg::Config.yum_repo_path, Pkg::Config.apt_repo_staging_path, Pkg::Config.apt_repo_path, '/opt/downloads'].compact.freeze
+    [Pkg::Config.yum_repo_path, Pkg::Config.apt_repo_staging_path, Pkg::Config.apt_repo_path, '/opt/downloads'].compact
   end
 
   # Array of paths for temporarily staging artifacts before syncing to release-archives on s3
   def archive_paths
-    [Pkg::Config.yum_archive_path, Pkg::Config.apt_archive_path, Pkg::Config.freight_archive_path, Pkg::Config.downloads_archive_path, '/opt/tmp-apt'].compact.freeze
+    [Pkg::Config.yum_archive_path, Pkg::Config.apt_archive_path, Pkg::Config.freight_archive_path, Pkg::Config.downloads_archive_path, '/opt/tmp-apt'].compact
   end
 
   # Move yum directories from repo path to archive staging path

data/lib/packaging/artifactory/extensions.rb

@@ -46,6 +46,7 @@ module ArtifactoryExtensions
       unless repo_uri.include?('/api/storage/')
         # rubocop:disable Style/PercentLiteralDelimiters
         repo_uri.sub!(%r(/#{params[:repo]}$), "/api/storage/#{params[:repo]}")
+        # rubocop:enable Style/PercentLiteralDelimiters
       end
       response['files'].map do |file_path|
         from_url("#{repo_uri}/#{file_path}", client: client)

data/lib/packaging/artifactory.rb

@@ -5,13 +5,11 @@ require 'digest'
 require 'packaging/artifactory/extensions'
 
 module Pkg
-
   # The Artifactory class
   # This class provides automation to access the artifactory repos maintained
   # by the Release Engineering team at Puppet. It has the ability to both push
   # artifacts to the repos, and to retrieve them back from the repos.
   class ManageArtifactory
-
     # The Artifactory property that the artifactCleanup user plugin
     # {https://github.com/jfrog/artifactory-user-plugins/tree/master/cleanup/artifactCleanup}
     # uses to tell it to not clean a particular artifact
@@ -233,8 +231,8 @@ module Pkg
     # @return [String] The contents of the YAML file
     def retrieve_yaml_data(pkg, ref)
       yaml_url = "#{@artifactory_uri}/#{DEFAULT_REPO_TYPE}/#{DEFAULT_REPO_BASE}/#{pkg}/#{ref}/#{ref}.yaml"
-      open(yaml_url) { |f| f.read }
-    rescue
+      URI.open(yaml_url, &:read)
+    rescue StandardError
       raise "Failed to load YAML data for #{pkg} at #{ref} from #{yaml_url}!"
     end
 
@@ -245,7 +243,7 @@ module Pkg
     #   project_version, and platform_tag
     def package_name(platform_data, platform_tag)
       return File.basename(platform_data[platform_tag][:artifact])
-    rescue
+    rescue StandardError
       fail_message = <<-DOC
   Package name could not be found from loaded yaml data. Either this package
   does not exist, or '#{platform_tag}' is not present in this dataset.
@@ -267,7 +265,7 @@ module Pkg
       packages.flatten!
       packages.reject! { |package| package.nil? || package.empty? }
       packages.map { |package| File.basename(package) }
-    rescue
+    rescue StandardError
       fail_message = <<-DOC
   Package name could not be found from loaded yaml data. Either this package
   does not exist, or '#{platform_tag}' is not present in this dataset.
@@ -294,13 +292,14 @@ module Pkg
     def promote_package(pkg, ref, platform_tag, repository, debian_component = nil)
       # load package metadata
       yaml_content = retrieve_yaml_data(pkg, ref)
-      yaml_data = YAML::load(yaml_content)
+      yaml_data = YAML::safe_load(yaml_content, [Symbol])
 
       # get the artifact name
       artifact_names = all_package_names(yaml_data[:platform_data], platform_tag)
       artifact_names.each do |artifact_name|
         artifact_search_results = Artifactory::Resource::Artifact.search(
-          name: artifact_name, :artifactory_uri => @artifactory_uri)
+          name: artifact_name, :artifactory_uri => @artifactory_uri
+        )
 
         if artifact_search_results.empty?
           raise "Error: could not find PKG=#{pkg} at REF=#{ref} for #{platform_tag}"
@@ -332,10 +331,10 @@ module Pkg
           if e.message =~ /(destination and source are the same|user doesn't have permissions to override)/i
             puts "Skipping promotion of #{artifact_name}; it has already been promoted"
           else
-            puts "#{e.message}"
+            puts e.message.to_s
             raise e
           end
-        rescue => e
+        rescue StandardError => e
           puts "Something went wrong promoting #{artifact_name}!"
           raise e
         end
@@ -352,17 +351,21 @@ module Pkg
     #        Used to specify which subdirectories packages will be downloaded from.
     def download_packages(staging_directory, manifest, remote_path = '')
       check_authorization
-      download_repositories = %w(rpm_enterprise__local debian_enterprise__local)
+      download_repositories = %w[rpm_enterprise__local debian_enterprise__local]
       manifest.each do |dist, packages|
+        if packages.nil?
+          warn "Package list for #{dist} is empty, skipping"
+          next
+        end
         packages.each do |name, info|
           package_file_name = info['filename']
           puts format(
-                 "Searching Artifactory [%s]%s for %s (md5: %s)",
+            "Searching Artifactory [%s]%s for %s (md5: %s)",
                  download_repositories.join(', '),
                  remote_path.empty? ? '' : "/#{remote_path}",
                  package_file_name,
                  info['md5']
-               )
+          )
           artifacts = Artifactory::Resource::Artifact.checksum_search(
             md5: info['md5'],
             repos: download_repositories,
@@ -418,14 +421,15 @@ module Pkg
       check_authorization
       ship_paths.each do |path|
         Dir.foreach(local_tarball_directory) do |pe_tarball|
-          next if pe_tarball == '.' || pe_tarball == ".."
+          next if ['.', '..'].include?(pe_tarball)
           begin
             puts "Uploading #{pe_tarball} to #{target_repo}/#{path}#{pe_tarball}"
             artifact = Artifactory::Resource::Artifact.new(
-              local_path: "#{local_tarball_directory}/#{pe_tarball}")
+              local_path: "#{local_tarball_directory}/#{pe_tarball}"
+            )
             artifact.upload(target_repo, "#{path}#{pe_tarball}")
           rescue Errno::EPIPE
-            STDERR.puts "Warning: Could not upload #{pe_tarball} to #{target_repo}/#{path}. Skipping."
+            warn "Warning: Could not upload #{pe_tarball} to #{target_repo}/#{path}. Skipping."
             next
           end
         end
@@ -449,7 +453,7 @@ module Pkg
       begin
         puts "Uploading #{local_path} to #{target_repo}/#{full_upload_path} . . ."
         artifact.upload(target_repo, full_upload_path, properties, headers)
-      rescue Artifactory::Error::HTTPError => e
+      rescue Artifactory::Error::HTTPError
         fail "Error: Upload failed. Ensure path #{target_path} exists in the #{target_repo} repository."
       end
     end
@@ -584,7 +588,7 @@ module Pkg
       begin
         artifact.copy(artifactory_target_path)
       rescue Artifactory::Error::HTTPError
-        STDERR.puts "Could not copy #{artifactory_target_path}. Source and destination are the same. Skipping..."
+        warn "Could not copy #{artifactory_target_path}. Source and destination are the same. Skipping..."
       end
 
       if File.extname(filename) == '.deb'
@@ -606,9 +610,9 @@ module Pkg
         puts "Copying #{dist} packages..."
         packages.each do |name, info|
           filename = info["filename"]
-          artifact = Artifactory::Resource::Artifact.checksum_search(md5: "#{info["md5"]}", repos: ["rpm_enterprise__local", "debian_enterprise__local"], name: filename).first
+          artifact = Artifactory::Resource::Artifact.checksum_search(md5: (info['md5']).to_s, repos: ["rpm_enterprise__local", "debian_enterprise__local"], name: filename).first
           if artifact.nil?
-            raise "Error: what the hell, could not find package #{filename} with md5sum #{info["md5"]}"
+            raise "Error: what the hell, could not find package #{filename} with md5sum #{info['md5']}"
           end
           copy_artifact(artifact, artifact.repo, "#{target_path}/#{dist}/#{filename}")
         end
@@ -640,7 +644,7 @@ module Pkg
         packages.each do |package_name, info|
           next unless package_name == package
           filename = info["filename"]
-          artifacts = Artifactory::Resource::Artifact.checksum_search(md5: "#{info["md5"]}", repos: repos, name: filename)
+          artifacts = Artifactory::Resource::Artifact.checksum_search(md5: (info['md5']).to_s, repos: repos, name: filename)
           artifacts.each do |artifact|
             next unless artifact.download_uri.include? remote_path
             puts "Removing reverted package #{artifact.download_uri}"
@@ -658,7 +662,7 @@ module Pkg
     def purge_copied_pe_tarballs(tarball_path, pe_repo)
       check_authorization
       Dir.foreach("#{tarball_path}/") do |pe_tarball|
-        next if pe_tarball == '.' || pe_tarball == ".."
+        next if ['.', '..'].include?(pe_tarball)
         md5 = Digest::MD5.file("#{tarball_path}/#{pe_tarball}").hexdigest
         artifacts_to_delete = Artifactory::Resource::Artifact.checksum_search(md5: md5, repos: pe_repo, name: pe_tarball)
         next if artifacts_to_delete.nil?
@@ -668,7 +672,7 @@ module Pkg
             artifact.delete
           end
         rescue Artifactory::Error::HTTPError
-          STDERR.puts "Error: cannot remove #{pe_tarball}, do you have the right permissions?"
+          warn "Error: cannot remove #{pe_tarball}, do you have the right permissions?"
         end
       end
     end