packaging 0.104.0 → 0.106.1

data/tasks/nightly_repos.rake

@@ -21,11 +21,11 @@ namespace :pl do
       remote_repo   = Pkg::Util::Net.remote_unpack_git_bundle(signing_server, 'HEAD', nil, signing_bundle)
       build_params  = Pkg::Util::Net.remote_buildparams(signing_server, Pkg::Config)
       Pkg::Util::Net.rsync_to('repos', signing_server, remote_repo)
-      rake_command = <<-DOC
-cd #{remote_repo} ;
-#{Pkg::Util::Net.remote_bundle_install_command}
-bundle exec rake pl:jenkins:sign_repos GPG_KEY=#{Pkg::Util::Gpg.key} PARAMS_FILE=#{build_params}
-DOC
+      rake_command = <<~DOC
+        cd #{remote_repo} ;
+        #{Pkg::Util::Net.remote_bundle_install_command}
+        bundle exec rake pl:jenkins:sign_repos GPG_KEY=#{Pkg::Util::Gpg.key} PARAMS_FILE=#{build_params}
+      DOC
       Pkg::Util::Net.remote_execute(signing_server, rake_command)
       Pkg::Util::Net.rsync_from("#{remote_repo}/repos/", signing_server, target)
       Pkg::Util::Net.remote_execute(signing_server, "rm -rf #{remote_repo}")
@@ -54,7 +54,7 @@ DOC
     end
 
     # This task should be invoked after prepare_signed_repos, so that there are repos to pack up.
-    task :pack_signed_repo, [:path_to_repo, :name_of_archive, :versioning] => ["pl:fetch"] do |t, args|
+    task :pack_signed_repo, %i[path_to_repo name_of_archive versioning] => ["pl:fetch"] do |t, args|
       # path_to_repo should be relative to ./pkg
       path_to_repo = args.path_to_repo or fail ":path_to_repo is a required argument for #{t}"
       name_of_archive = args.name_of_archive or fail ":name_of_archive is a required argument for #{t}"
@@ -62,13 +62,13 @@ DOC
       Pkg::Repo.create_signed_repo_archive(path_to_repo, name_of_archive, versioning)
     end
 
-    task :pack_all_signed_repos_individually, [:name_of_archive, :versioning] => ["pl:fetch"] do |t, args|
+    task :pack_all_signed_repos_individually, %i[name_of_archive versioning] => ["pl:fetch"] do |t, args|
       name_of_archive = args.name_of_archive or fail ":name_of_archive is a required argument for #{t}"
       versioning = args.versioning or fail ":versioning is a required argument for #{t}"
       Pkg::Repo.create_all_repo_archives(name_of_archive, versioning)
     end
 
-    task :prepare_signed_repos, [:target_host, :target_prefix, :versioning] => ["clean", "pl:fetch"] do |t, args|
+    task :prepare_signed_repos, %i[target_host target_prefix versioning] => ["clean", "pl:fetch"] do |t, args|
       target_host = args.target_host or fail ":target_host is a required argument to #{t}"
       target_prefix = args.target_prefix or fail ":target_prefix is a required argument for #{t}"
       versioning = args.versioning or fail ":versioning is a required argument for #{t}"
@@ -140,7 +140,7 @@ DOC
       end
     end
 
-    task :deploy_signed_repos, [:target_host, :target_basedir, :foss_only] => "pl:fetch" do |t, args|
+    task :deploy_signed_repos, %i[target_host target_basedir foss_only] => "pl:fetch" do |t, args|
       target_host = args.target_host or fail ":target_host is a required argument to #{t}"
       target_basedir = args.target_basedir or fail ":target_basedir is a required argument to #{t}"
       include_paths = []
@@ -158,11 +158,11 @@ DOC
 
       # Get the directories together - we need to figure out which bits to ship based on the include_path
       # First we get the build itself
-      Pkg::Util::Execution.capture3(%(find #{include_paths.map { |path| "pkg/#{Pkg::Config.project}/**/#{path}" }.join(' ') } | sort > include_file))
+      Pkg::Util::Execution.capture3(%(find #{include_paths.map { |path| "pkg/#{Pkg::Config.project}/**/#{path}" }.join(' ')} | sort > include_file))
       Pkg::Util::Execution.capture3(%(mkdir -p tmp && tar -T include_file -cf - | (cd ./tmp && tar -xf -)))
 
       # Then we find grab the appropriate meta-data only
-      Pkg::Util::Execution.capture3(%(find #{include_paths.map { |path| "pkg/#{Pkg::Config.project}-latest/#{path}" unless path.include? "repos" }.join(' ') } | sort > include_file_latest))
+      Pkg::Util::Execution.capture3(%(find #{include_paths.map { |path| "pkg/#{Pkg::Config.project}-latest/#{path}" unless path.include? 'repos' }.join(' ')} | sort > include_file_latest))
 
       #include /repos in the include_file_latest so we correctly include the symlink in the final file list to ship
       Pkg::Util::Execution.capture3(%(echo "pkg/#{Pkg::Config.project}-latest/repos" >> include_file_latest))
@@ -173,7 +173,7 @@ DOC
         # First we ship the latest and clean up any repo-configs that are no longer valid with --delete-after
         Pkg::Util::Net.rsync_to("#{Pkg::Config.project}-latest", target_host, target_basedir, extra_flags: ["--delete-after", "--keep-dirlinks"])
         # Then we ship the sha version with default rsync flags
-        Pkg::Util::Net.rsync_to("#{Pkg::Config.project}", target_host, target_basedir)
+        Pkg::Util::Net.rsync_to(Pkg::Config.project.to_s, target_host, target_basedir)
       end
 
       puts "'#{Pkg::Config.ref}' of '#{Pkg::Config.project}' has been shipped to '#{target_host}:#{target_basedir}'"
@@ -225,7 +225,7 @@ DOC
     #        a github ref. Valid values are 'version' and 'ref'
     # @param pe_version the PE-version to deploy to.
     #        ex: 2015.2
-    task :link_signed_repos, [:target_host, :remote_dir, :versioning, :pe_version] => ["pl:fetch"] do |t, args|
+    task :link_signed_repos, %i[target_host remote_dir versioning pe_version] => ["pl:fetch"] do |t, args|
       target_host = args.target_host or fail ":target_host is a required argument for #{t}"
       remote_dir = args.remote_dir or fail ":remote_dir is a required argument for #{t}"
       versioning = args.versioning or fail ":versioning is a required argument for #{t}"
@@ -255,7 +255,7 @@ DOC
       Pkg::Util::RakeUtils.invoke_task("pl:jenkins:generate_signed_repos", 'nightly')
     end
 
-    task :deploy_nightly_repos, [:target_host, :target_basedir] => ["pl:fetch"] do |t, args|
+    task :deploy_nightly_repos, %i[target_host target_basedir] => ["pl:fetch"] do |t, args|
       target_host = args.target_host or fail ":target_host is a required argument to #{t}"
       target_basedir = args.target_basedir or fail ":target_basedir is a required argument to #{t}"
       Pkg::Util::RakeUtils.invoke_task("pl:jenkins:prepare_signed_repos", target_host, 'nightly', 'ref')

data/tasks/pe_ship.rake

@@ -74,7 +74,6 @@ if Pkg::Config.build_pe
             Rake::Task["pe:remote:apt"].reenable
             Rake::Task["pe:remote:apt"].invoke(target_path, dist)
           end
-
         end
       end
 
@@ -111,19 +110,15 @@ if Pkg::Config.build_pe
           end
 
           unless Dir["pkg/pe/deb/#{dist}/*_all.deb"].empty?
-            Pkg::Platforms.arches_for_codename(dist).each do |arch|
-              Pkg::Util::Net.rsync_to("pkg/pe/deb/#{dist}/*_all.deb", Pkg::Config.apt_host, "#{base_path}/#{dist}-#{arch}/")
+            Pkg::Platforms.arches_for_codename(dist).each do |a|
+              Pkg::Util::Net.rsync_to("pkg/pe/deb/#{dist}/*_all.deb", Pkg::Config.apt_host, "#{base_path}/#{dist}-#{a}/")
             end
           end
 
-          unless Dir["pkg/pe/deb/#{dist}/*"].select { |i| i !~ /^.*\.deb$/ }.empty?
+          unless Dir["pkg/pe/deb/#{dist}/*"].reject { |i| i =~ /^.*\.deb$/ }.empty?
             # Ship source files to source dir, e.g. 'squeeze-source'
             Pkg::Util::Net.rsync_to("pkg/pe/deb/#{dist}/*", Pkg::Config.apt_host, "#{base_path}/#{dist}-source", extra_flags: ["--exclude '*.deb'", "--ignore-existing"])
           end
-
-          files = Dir["pkg/pe/deb/#{dist}/*{_#{arch},all}.deb"].map { |f| "#{archive_path}/#{File.basename(f)}" }
-
-          files += Dir["pkg/pe/deb/#{dist}/*"].select { |f| f !~ /^.*\.deb$/ }.map { |f| "#{base_path}/#{dist}-source/#{File.basename(f)}" }
         end
       end
       # If this is not a feature branch or release branch, we need to link the
@@ -137,14 +132,13 @@ if Pkg::Config.build_pe
     namespace :remote do
       desc "Update remote rpm repodata for PE on #{Pkg::Config.yum_host}"
       task :update_yum_repo => "pl:fetch" do
-
         # Paths to the repos.
         repo_base_path = Pkg::Config.yum_target_path
 
         # This entire command is going to be passed across SSH, but it's unwieldy on a
         # single line. By breaking it into a series of concatenated strings, we can maintain
         # a semblance of formatting and structure (nevermind readability).
-        command  = %(for dir in #{repo_base_path}/{#{rpm_family_and_version.join(",")}}-*; do)
+        command  = %(for dir in #{repo_base_path}/{#{rpm_family_and_version.join(',')}}-*; do)
         command += %(  sudo createrepo --checksum=sha --checkts --update --delta-workers=0 --quiet --database --update $dir; )
         command += %(done; )
         command += %(sync)
@@ -159,7 +153,7 @@ if Pkg::Config.build_pe
         incoming_dir or fail "Adding packages to apt repo requires an incoming directory"
         Pkg::Util::RakeUtils.invoke_task("pl:fetch")
 
-        cmd = <<-eos
+        cmd = <<-COMMAND
           if ! flock --wait 1200 /opt/tools/aptly/db/LOCK --command /bin/true; then
             echo "Unable to acquire aptly lock, giving up" 1>&2
             exit 1
@@ -170,12 +164,12 @@ if Pkg::Config.build_pe
           else
             aptly publish repo -gpg-key=\"8BBEB79B\" #{Pkg::Config::pe_version}-#{dist} #{Pkg::Config::pe_version}
           fi
-        eos
+        COMMAND
         stdout, stderr = Pkg::Util::Net.remote_execute(
-                  Pkg::Config.apt_host,
+          Pkg::Config.apt_host,
                   cmd,
                   { capture_output: true }
-                )
+        )
 
         output = stdout.to_s + stderr.to_s
 
@@ -190,7 +184,6 @@ if Pkg::Config.build_pe
 
         puts "Cleaning up apt repo 'incoming' dir on #{Pkg::Config.apt_host}"
         Pkg::Util::Net.remote_execute(Pkg::Config.apt_host, "rm -r #{incoming_dir}")
-
       end
 
       # Throw more tires on the fire
@@ -200,7 +193,7 @@ if Pkg::Config.build_pe
         repo_base_path = Pkg::Config.yum_target_path
         feature_repo_path = Pkg::Config.yum_target_path(true)
         pkgs = FileList['pkg/pe/rpm/**/*.rpm'].select { |path| path.gsub!('pkg/pe/rpm/', '') }
-        command  = %(for pkg in #{pkgs.join(' ')}; do)
+        command = %(for pkg in #{pkgs.join(' ')}; do)
         command += %(  sudo ln -f "#{repo_base_path}/$( dirname ${pkg} )/$( basename ${pkg} )" "#{feature_repo_path}/$( dirname ${pkg} )/" ; )
         command += %(done; )
         command += %(sync)
@@ -214,7 +207,7 @@ if Pkg::Config.build_pe
         base_path = Pkg::Config.apt_target_path
         feature_base_path = Pkg::Config.apt_target_path(true)
         pkgs = FileList["pkg/pe/deb/**/*.deb"].select { |path| path.gsub!('pkg/pe/deb/', '') }
-        command  = %(for pkg in #{pkgs.join(' ')}; do)
+        command = %(for pkg in #{pkgs.join(' ')}; do)
         command += %(  sudo ln -f "#{base_path}/$( dirname ${pkg} )-amd64/$( basename ${pkg} )" "#{feature_base_path}/$( dirname ${pkg} )-amd64/" ; )
         command += %(done; )
         command += %(sync)

data/tasks/retrieve.rake

@@ -13,7 +13,7 @@
 namespace :pl do
   namespace :jenkins do
     desc "Retrieve packages from the distribution server\. Check out commit to retrieve"
-    task :retrieve, [:remote_target, :local_target] => 'pl:fetch' do |t, args|
+    task :retrieve, %i[remote_target local_target] => 'pl:fetch' do |t, args|
       unless Pkg::Config.project
         fail "You must set the 'project' in build_defaults.yaml or with the 'PROJECT_OVERRIDE' environment variable."
       end
@@ -37,7 +37,7 @@ if Pkg::Config.build_pe
   namespace :pe do
     namespace :jenkins do
       desc "Retrieve packages from the distribution server\. Check out commit to retrieve"
-      task :retrieve, [:remote_target, :local_target] => 'pl:fetch' do |t, args|
+      task :retrieve, %i[remote_target local_target] => 'pl:fetch' do |t, args|
         unless Pkg::Config.project
           fail "You must set the 'project' in build_defaults.yaml or with the 'PROJECT_OVERRIDE' environment variable."
         end

data/tasks/rpm.rake

@@ -47,7 +47,7 @@ def build_rpm(buildarg = "-bs")
   puts
   output = FileList['pkg/*/*.rpm']
   puts "Wrote:"
-  output.each do | line |
+  output.each do |line|
     puts line
   end
 end

data/tasks/rpm_repos.rake

@@ -11,6 +11,7 @@
 #
 namespace :pl do
   namespace :jenkins do
+    # The equivalent to invoking this task is calling Pkg::Util::Repo.rpm_repos
     desc "Create yum repositories of built RPM packages for this SHA on the distribution server"
     task :rpm_repos => "pl:fetch" do
       Pkg::Rpm::Repo.create_remote_repos

data/tasks/ship.rake

@@ -123,7 +123,7 @@ namespace :pl do
     end
 
     desc "Update remote ips repository on #{Pkg::Config.ips_host}"
-    task :update_ips_repo  => 'pl:fetch' do
+    task :update_ips_repo => 'pl:fetch' do
       if Dir['pkg/ips/pkgs/**/*'].empty? && Dir['pkg/solaris/11/**/*'].empty?
         $stdout.puts "Error: there aren't any p5p packages in pkg/ips/pkgs or pkg/solaris/11."
         next
@@ -132,11 +132,11 @@ namespace :pl do
       source_dir = 'pkg/solaris/11/'
       source_dir = 'pkg/ips/pkgs/' unless Dir['pkg/ips/pkgs/**/*'].empty?
 
-      tmpdir, _ = Pkg::Util::Net.remote_execute(
-                Pkg::Config.ips_host,
+      tmpdir, = Pkg::Util::Net.remote_execute(
+        Pkg::Config.ips_host,
                 'mktemp -d -p /var/tmp',
                 { capture_output: true }
-              )
+      )
       tmpdir.chomp!
 
       Pkg::Util::Net.rsync_to(source_dir, Pkg::Config.ips_host, tmpdir)
@@ -372,7 +372,8 @@ namespace :pl do
   desc "Ship nightly debs to #{Pkg::Config.apt_signing_server}"
   task ship_nightly_debs: 'pl:fetch' do
     Pkg::Util::Ship.ship_debs(
-      'pkg', Pkg::Config.nonfinal_apt_repo_staging_path, chattr: false, nonfinal: true)
+      'pkg', Pkg::Config.nonfinal_apt_repo_staging_path, chattr: false, nonfinal: true
+    )
   end
 
   ## This is the new-style apt stager
@@ -635,18 +636,22 @@ namespace :pl do
         puts " * #{err}"
       end
     end
-
   end
 
   # It is odd to namespace this ship task under :jenkins, but this task is
   # intended to be a component of the jenkins-based build workflow even if it
-  # doesn't interact with jenkins directly. The :target argument is so that we
-  # can invoke this task with a subdirectory of the standard distribution
-  # server path. That way we can separate out built artifacts from
-  # signed/actually shipped artifacts e.g. $path/shipped/ or $path/artifacts.
+  # doesn't interact with jenkins directly.
+
+  # The :target argument is so that we can invoke this task with a
+  # subdirectory of the standard distribution server path. That way we
+  # can separate out built artifacts from signed/actually shipped
+  # artifacts: $path/shipped or $path/artifacts.
+
   namespace :jenkins do
     desc 'ship pkg directory contents to artifactory'
     task :ship_to_artifactory, :local_dir do |_t, args|
+      # The equivalent to invoking this task is calling
+      # Pkg::Util::Ship.ship_to_artifactory(local_directory, target)
       Pkg::Util::RakeUtils.invoke_task('pl:fetch')
       unless Pkg::Config.project
         fail "Error: 'project' must be set in build_defaults.yaml or " \
@@ -654,9 +659,15 @@ namespace :pl do
       end
 
       artifactory = Pkg::ManageArtifactory.new(Pkg::Config.project, Pkg::Config.ref)
-
       local_dir = args.local_dir || 'pkg'
-      Dir.glob("#{local_dir}/**/*").reject { |e| File.directory? e }.each do |artifact|
+
+      # Artifactory generates its own 'sha1' files. Shipping them confuses Artifactory
+      # terribly.
+      shippable = Dir.glob("#{local_dir}/**/*").reject do |e|
+        File.directory?(e) || File.extname(e) == '.sha1'
+      end
+
+      shippable.each do |artifact|
         # Always deploy yamls and jsons
         if artifact.end_with?('.yaml', '.json')
           artifactory.deploy_package(artifact)
@@ -673,6 +684,7 @@ namespace :pl do
       end
     end
 
+    # The equivalent to invoking this task is calling Pkg::Util::Ship.ship(local_directory, target)
     desc 'Ship "pkg" directory contents to distribution server'
     task :ship, :target, :local_dir do |_t, args|
       Pkg::Util::RakeUtils.invoke_task('pl:fetch')

data/tasks/sign.rake

@@ -107,8 +107,8 @@ namespace :pl do
   ##
   # This crazy piece of work establishes a remote repo on the signing
   # server, ships our packages out to it, signs them, and brings them back.
-  #
   namespace :jenkins do
+    # The equivalent to invoking this task is calling Pkg::Util::Sign.sign_all(root_directory)
     desc "Sign all locally staged packages on #{Pkg::Config.signing_server}"
     task :sign_all, :root_dir do |_t, args|
       Pkg::Util::RakeUtils.invoke_task('pl:fetch')
@@ -139,11 +139,11 @@ namespace :pl do
       remote_repo   = Pkg::Util::Net.remote_unpack_git_bundle(Pkg::Config.signing_server, 'HEAD', nil, signing_bundle)
       build_params  = Pkg::Util::Net.remote_buildparams(Pkg::Config.signing_server, Pkg::Config)
       Pkg::Util::Net.rsync_to(root_dir, Pkg::Config.signing_server, remote_repo)
-      rake_command = <<-DOC
-cd #{remote_repo} ;
-#{Pkg::Util::Net.remote_bundle_install_command}
-bundle exec rake #{sign_tasks.map { |task| task + "[#{root_dir}]" }.join(" ")} PARAMS_FILE=#{build_params}
-DOC
+      rake_command = <<~DOC
+        cd #{remote_repo} ;
+        #{Pkg::Util::Net.remote_bundle_install_command}
+        bundle exec rake #{sign_tasks.map { |task| task + "[#{root_dir}]" }.join(' ')} PARAMS_FILE=#{build_params}
+      DOC
       Pkg::Util::Net.remote_execute(Pkg::Config.signing_server, rake_command)
       Pkg::Util::Net.rsync_from("#{remote_repo}/#{root_dir}/", Pkg::Config.signing_server, "#{root_dir}/")
       Pkg::Util::Net.remote_execute(Pkg::Config.signing_server, "rm -rf #{remote_repo}")

data/tasks/tar.rake

@@ -1,7 +1,6 @@
 namespace :package do
   desc "Create a source tar archive"
   task :tar => [:clean] do
-
     if Pkg::Config.pre_tar_task
       Pkg::Util::RakeUtils.invoke_task(Pkg::Config.pre_tar_task)
     end
@@ -14,11 +13,11 @@ namespace :package do
     # by the tar class. Otherwise, we load what we consider to be the "default"
     # set, which is default for historical purposes.
     #
-    tar.templates ||= Dir[File.join(Pkg::Config.project_root, "ext", "**", "*.erb")].select { |i| i !~ /ext\/packaging|ext\/osx/ }
+    tar.templates ||= Dir[File.join(Pkg::Config.project_root, "ext", "**", "*.erb")].reject { |i| i =~ /ext\/packaging|ext\/osx/ }
 
     tar.pkg!
 
-    puts "Wrote #{`pwd`.strip}/pkg/#{Pkg::Config.project}-#{Pkg::Config.version}.tar.gz"
+    puts "Wrote #{%x(pwd).strip}/pkg/#{Pkg::Config.project}-#{Pkg::Config.version}.tar.gz"
   end
 end
 

data/tasks/update.rake

@@ -5,8 +5,8 @@ namespace :package do
       remote = Pkg::Config.packaging_url.split(' ')[0]
       branch = Pkg::Config.packaging_url.split(' ')[1].split('=')[1]
       if branch.nil? or remote.nil?
-        $stderr.puts "Couldn't parse the packaging repo URL from 'ext/build_defaults.yaml'."
-        $stderr.puts "Normally this is a string in the format git@github.com:<User>/<packaging_repo> --branch=<branch>"
+        warn "Couldn't parse the packaging repo URL from 'ext/build_defaults.yaml'."
+        warn "Normally this is a string in the format git@github.com:<User>/<packaging_repo> --branch=<branch>"
       else
         Pkg::Util::Git.pull(remote, branch)
       end

data/tasks/vendor_gems.rake

@@ -8,7 +8,7 @@ if Pkg::Config.pre_tar_task
       require 'bundler'
 
       class UI
-        LEVELS = %w(silent error warn confirm info debug)
+        LEVELS = %w[silent error warn confirm info debug]
 
         def warn(message, newline = nil)
           puts message
@@ -30,15 +30,13 @@ if Pkg::Config.pre_tar_task
           puts message
         end
 
-        def confirm(message, newline = nil)
-        end
+        def confirm(message, newline = nil); end
 
         def debug?
           true
         end
 
-        def ask(message)
-        end
+        def ask(message); end
 
         def quiet?
           false
@@ -54,12 +52,12 @@ if Pkg::Config.pre_tar_task
         end
 
         def silence
-          old_level, @level = @level, "silent"
+          old_level = @level
+          @level = "silent"
           yield
         ensure
           @level = old_level
         end
-
       end
 
       class RGProxy < ::Gem::SilentUI

data/tasks/version.rake

@@ -24,8 +24,8 @@ namespace :package do
   end
 
   # A set of tasks for printing the version
-  [:version, :rpmversion, :rpmrelease, :debversion, :release].each do |task|
-    task "#{task}" do
+  %i[version rpmversion rpmrelease debversion release].each do |task|
+    task task.to_s do
       $stdout.puts Pkg::Config.instance_variable_get("@#{task}")
     end
   end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.104.0
+  version: 0.106.1
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-16 00:00:00.000000000 Z
+date: 2022-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,47 +25,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.49'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.49'
 - !ruby/object:Gem::Dependency
   name: apt_stage_artifacts
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: csv
   requirement: !ruby/object:Gem::Requirement
@@ -109,33 +109,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.1.5
 - !ruby/object:Gem::Dependency
-  name: release-metrics
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: release-metrics
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '0'
 description: Packaging automation written in Rake and Ruby. Easily build native packages
   for most platforms with a few data files and git.
 email: info@puppetlabs.com
@@ -188,8 +188,10 @@ files:
 - lib/packaging/util/os.rb
 - lib/packaging/util/platform.rb
 - lib/packaging/util/rake_utils.rb
+- lib/packaging/util/repo.rb
 - lib/packaging/util/serialization.rb
 - lib/packaging/util/ship.rb
+- lib/packaging/util/sign.rb
 - lib/packaging/util/tool.rb
 - lib/packaging/util/version.rb
 - lib/packaging/util/windows.rb
@@ -293,28 +295,28 @@ signing_key:
 specification_version: 4
 summary: Puppet Labs' packaging automation
 test_files:
-- spec/lib/packaging/repo_spec.rb
-- spec/lib/packaging/gem_spec.rb
+- spec/lib/packaging_spec.rb
+- spec/lib/packaging/retrieve_spec.rb
+- spec/lib/packaging/paths_spec.rb
+- spec/lib/packaging/platforms_spec.rb
+- spec/lib/packaging/config_spec.rb
 - spec/lib/packaging/tar_spec.rb
-- spec/lib/packaging/util/rake_utils_spec.rb
+- spec/lib/packaging/repo_spec.rb
+- spec/lib/packaging/artifactory_spec.rb
+- spec/lib/packaging/deb_spec.rb
+- spec/lib/packaging/deb/repo_spec.rb
 - spec/lib/packaging/util/git_spec.rb
-- spec/lib/packaging/util/gpg_spec.rb
-- spec/lib/packaging/util/execution_spec.rb
 - spec/lib/packaging/util/version_spec.rb
-- spec/lib/packaging/util/net_spec.rb
-- spec/lib/packaging/util/git_tag_spec.rb
 - spec/lib/packaging/util/os_spec.rb
-- spec/lib/packaging/util/ship_spec.rb
+- spec/lib/packaging/util/execution_spec.rb
 - spec/lib/packaging/util/file_spec.rb
+- spec/lib/packaging/util/git_tag_spec.rb
+- spec/lib/packaging/util/rake_utils_spec.rb
+- spec/lib/packaging/util/ship_spec.rb
 - spec/lib/packaging/util/jenkins_spec.rb
+- spec/lib/packaging/util/net_spec.rb
 - spec/lib/packaging/util/misc_spec.rb
+- spec/lib/packaging/util/gpg_spec.rb
 - spec/lib/packaging/rpm/repo_spec.rb
-- spec/lib/packaging/paths_spec.rb
-- spec/lib/packaging/platforms_spec.rb
-- spec/lib/packaging/deb_spec.rb
 - spec/lib/packaging/sign_spec.rb
-- spec/lib/packaging/retrieve_spec.rb
-- spec/lib/packaging/artifactory_spec.rb
-- spec/lib/packaging/deb/repo_spec.rb
-- spec/lib/packaging/config_spec.rb
-- spec/lib/packaging_spec.rb
+- spec/lib/packaging/gem_spec.rb