packaging 0.99.64 → 0.99.69

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 360cf557e7db16d19491fc6fb5698cdd727e7e9f322b37b1f3d3118997bf2d97
-  data.tar.gz: 1efaebf439461aa826e705d1cfb7744a97b1d62523046f54ce667208ca3723f9
+  metadata.gz: 71e257aa84acf0435e58d78b31433de51719e65ca165f92605cd6e1fd2852ec5
+  data.tar.gz: c39cd1db2db62f9a4764a0d4b08e659049164511469a00dd03801a5f526f74bc
 SHA512:
-  metadata.gz: cd903d1489e3ac5076ebcc80fd416056d1d73496da5fd3e71b6ede2ee6951989995eb7f8ca54fd1a0976b76d1864a7951ee5b19fb22de331dd51423c8b1ee875
-  data.tar.gz: 1eaa84fad5882bae156cd8382a10411e51a463b64efdc52c0b0c133d9eed88a1c86c67b6a47d313095d4c9d1ac9b1c6b331a272d811e5a1a66c9500d95686d16
+  metadata.gz: bde2a46ede42616104d3eb0ba76c86636e8153a7d49a270c2ac26b5c24e403209d20de4108b93faa6e18532b2b8436b5e2a96f0f5dad2586c6c1492a8b5f98bd
+  data.tar.gz: f1429e6bacb7653d6839fd82e19b52202a1e8f0454a82dc1d730811c1edf6f93b365eecebb9af5c61aeacd6184f32687ab3be4c3d2df4e6bd34972aebbda41cc

data/lib/packaging/artifactory.rb

@@ -502,7 +502,7 @@ module Pkg
     # @param local_path [String] local path to download tarballs to
     def download_final_pe_tarballs(pe_version, repo, remote_path, local_path)
       check_authorization
-      artifacts = Artifactory::Resource::Artifact.search(name: pe_version, repos: repo)
+      artifacts = Artifactory::Resource::Artifact.search(name: pe_version, repos: repo, exact_match: false)
       artifacts.each do |artifact|
         next unless artifact.download_uri.include? remote_path
         next if artifact.download_uri.include? "-rc"

data/lib/packaging/paths.rb

@@ -151,7 +151,7 @@ module Pkg::Paths
     when 'dmg'
       return File.join(prefix, 'mac', link)
     when 'msi'
-      return File.join(prefix, platform, link)
+      return File.join(prefix, platform_name, link)
     else
       raise "Error: Unknown package format '#{package_format}'"
     end
@@ -261,16 +261,33 @@ module Pkg::Paths
     end
   end
 
-  def remote_repo_base(platform_tag, nonfinal = false)
-    package_format = Pkg::Platforms.package_format_for_tag(platform_tag)
-    case package_format
+  def remote_repo_base(platform_tag = nil, nonfinal: false, package_format: nil)
+    if platform_tag.nil? && package_format.nil?
+      raise "Pkg::Paths.remote_repo_base must have `platform_tag` or `package_format` specified."
+    end
+
+    package_format ||= Pkg::Platforms.package_format_for_tag(platform_tag)
+
+    repo_base = case package_format
     when 'rpm'
       nonfinal ? Pkg::Config.nonfinal_yum_repo_path : Pkg::Config.yum_repo_path
     when 'deb'
       nonfinal ? Pkg::Config.nonfinal_apt_repo_path : Pkg::Config.apt_repo_path
+    when 'dmg'
+      nonfinal ? Pkg::Config.nonfinal_dmg_path : Pkg::Config.dmg_path
+    when 'swix'
+      nonfinal ? Pkg::Config.nonfinal_swix_path : Pkg::Config.swix_path
+    when 'msi'
+      nonfinal ? Pkg::Config.nonfinal_msi_path : Pkg::Config.msi_path
     else
       raise "Can't determine remote repo base path for package format '#{package_format}'."
     end
+
+    # normalize the path for things shipping to the downloads server
+    if repo_base.match(/^\/opt\/downloads\/\w+$/)
+      repo_base = '/opt/downloads'
+    end
+    repo_base
   end
 
   # This is where deb packages end up after freight repo updates
@@ -278,7 +295,7 @@ module Pkg::Paths
     fail "Can't determine path for non-debian platform #{platform_tag}." unless Pkg::Platforms.package_format_for_tag(platform_tag) == 'deb'
     platform, version, _ = Pkg::Platforms.parse_platform_tag(platform_tag)
     codename = Pkg::Platforms.codename_for_platform_version(platform, version)
-    return File.join(remote_repo_base(platform_tag, nonfinal), 'pool', codename, repo_name, project[0], project)
+    return File.join(remote_repo_base(platform_tag, nonfinal: nonfinal), 'pool', codename, repo_name, project[0], project)
   end
 
   def release_package_link_path(platform_tag, nonfinal = false)
@@ -286,10 +303,10 @@ module Pkg::Paths
     package_format = Pkg::Platforms.package_format_for_tag(platform_tag)
     case package_format
     when 'rpm'
-      return File.join(remote_repo_base(platform_tag, nonfinal), "#{repo_name(nonfinal)}-release-#{platform}-#{version}.noarch.rpm")
+      return File.join(remote_repo_base(platform_tag, nonfinal: nonfinal), "#{repo_name(nonfinal)}-release-#{platform}-#{version}.noarch.rpm")
     when 'deb'
       codename = Pkg::Platforms.codename_for_platform_version(platform, version)
-      return File.join(remote_repo_base(platform_tag, nonfinal), "#{repo_name(nonfinal)}-release-#{codename}.deb")
+      return File.join(remote_repo_base(platform_tag, nonfinal: nonfinal), "#{repo_name(nonfinal)}-release-#{codename}.deb")
     else
       warn "No release packages for package format '#{package_format}', skipping . . ."
       return nil

data/lib/packaging/platforms.rb

@@ -100,7 +100,7 @@ module Pkg
           repo: true,
         },
         '8' => {
-          architectures: ['x86_64'],
+          architectures: ['x86_64', 'aarch64'],
           source_architecture: 'SRPMS',
           package_format: 'rpm',
           source_package_formats: ['src.rpm'],
@@ -134,9 +134,22 @@ module Pkg
           signature_format: 'v4',
           repo: true,
         },
+        '32' => {
+          architectures: ['x86_64'],
+          source_architecture: 'SRPMS',
+          package_format: 'rpm',
+          source_package_formats: ['src.rpm'],
+          signature_format: 'v4',
+          repo: true,
+        },
       },
 
       'osx' => {
+        '10.13' => {
+          architectures: ['x86_64'],
+          package_format: 'dmg',
+          repo: false,
+        },
         '10.14' => {
           architectures: ['x86_64'],
           package_format: 'dmg',

data/lib/packaging/util/ship.rb

@@ -106,22 +106,11 @@ module Pkg::Util::Ship
 
   def ship_rpms(local_staging_directory, remote_path, opts = {})
     ship_pkgs(["#{local_staging_directory}/**/*.rpm", "#{local_staging_directory}/**/*.srpm"], Pkg::Config.yum_staging_server, remote_path, opts)
-
-    create_rolling_repo_link(Pkg::Platforms.generic_platform_tag('el'), Pkg::Config.yum_staging_server, remote_path, opts[:nonfinal])
   end
 
   def ship_debs(local_staging_directory, remote_path, opts = {})
     ship_pkgs(["#{local_staging_directory}/**/*.debian.tar.gz", "#{local_staging_directory}/**/*.orig.tar.gz" "#{local_staging_directory}/**/*.dsc", "#{local_staging_directory}/**/*.deb", "#{local_staging_directory}/**/*.changes"], Pkg::Config.apt_signing_server, remote_path, opts)
 
-    # We need to iterate through all the supported platforms here because of
-    # how deb repos are set up. Each codename will have its own link from the
-    # current versioned repo (e.g. puppet5) to the rolling repo. The one thing
-    # we don't care about is architecture, so we just grab the first supported
-    # architecture for the code name we're working with at the moment. [written
-    # by Melissa, copied by Molly]
-    Pkg::Platforms.codenames.each do |codename|
-      create_rolling_repo_link(Pkg::Platforms.codename_to_tags(codename)[0], Pkg::Config.apt_signing_server, remote_path, opts[:nonfinal])
-    end
   end
 
   def ship_svr4(local_staging_directory, remote_path, opts = {})
@@ -135,8 +124,6 @@ module Pkg::Util::Ship
   def ship_dmg(local_staging_directory, remote_path, opts = {})
     packages_have_shipped = ship_pkgs(["#{local_staging_directory}/**/*.dmg"], Pkg::Config.dmg_staging_server, remote_path, opts)
 
-    create_rolling_repo_link(Pkg::Platforms.generic_platform_tag('osx'), Pkg::Config.dmg_staging_server, remote_path, opts[:nonfinal])
-
     if packages_have_shipped
       Pkg::Platforms.platform_tags_for_package_format('dmg').each do |platform_tag|
         # Create the latest symlink for the current supported repo
@@ -147,14 +134,11 @@ module Pkg::Util::Ship
 
   def ship_swix(local_staging_directory, remote_path, opts = {})
     ship_pkgs(["#{local_staging_directory}/**/*.swix"], Pkg::Config.swix_staging_server, remote_path, opts)
-
-    create_rolling_repo_link(Pkg::Platforms.generic_platform_tag('eos'), Pkg::Config.swix_staging_server, remote_path, opts[:nonfinal])
   end
 
   def ship_msi(local_staging_directory, remote_path, opts = {})
     packages_have_shipped = ship_pkgs(["#{local_staging_directory}/**/*.msi"], Pkg::Config.msi_staging_server, remote_path, opts)
 
-    create_rolling_repo_link(Pkg::Platforms.generic_platform_tag('windows'), Pkg::Config.msi_staging_server, remote_path, opts[:nonfinal])
     if packages_have_shipped
       # Create the symlinks for the latest supported repo
       Pkg::Util::Net.remote_create_latest_symlink(Pkg::Config.project, Pkg::Paths.artifacts_path(Pkg::Platforms.generic_platform_tag('windows'), remote_path, opts[:nonfinal]), 'msi', arch: 'x64')
@@ -205,7 +189,35 @@ module Pkg::Util::Ship
 
     Pkg::Util::Net.remote_ssh_cmd(staging_server, command) unless command.nil?
   rescue => e
-    fail "Failed to create rolling repo link for '#{platform_tag}'.\n#{e}"
+    fail "Failed to create rolling repo link for '#{platform_tag}'.\n#{e}\n#{e.backtrace}"
+  end
+
+  # create all of the rolling repo links in one step
+  def create_rolling_repo_links(nonfinal = false)
+    yum_path = Pkg::Paths.remote_repo_base(nonfinal: nonfinal, package_format: 'rpm')
+    dmg_path = Pkg::Paths.remote_repo_base(nonfinal: nonfinal, package_format: 'dmg')
+    swix_path = Pkg::Paths.remote_repo_base(nonfinal: nonfinal, package_format: 'swix')
+    msi_path = Pkg::Paths.remote_repo_base(nonfinal: nonfinal, package_format: 'msi')
+
+    create_rolling_repo_link(Pkg::Platforms.generic_platform_tag('el'), Pkg::Config.yum_staging_server, yum_path, nonfinal)
+    create_rolling_repo_link(Pkg::Platforms.generic_platform_tag('osx'), Pkg::Config.dmg_staging_server, dmg_path, nonfinal)
+    create_rolling_repo_link(Pkg::Platforms.generic_platform_tag('eos'), Pkg::Config.swix_staging_server, swix_path, nonfinal)
+    create_rolling_repo_link(Pkg::Platforms.generic_platform_tag('windows'), Pkg::Config.msi_staging_server, msi_path, nonfinal)
+
+    # We need to iterate through all the supported platforms here because of
+    # how deb repos are set up. Each codename will have its own link from the
+    # current versioned repo (e.g. puppet5) to the rolling repo. The one thing
+    # we don't care about is architecture, so we just grab the first supported
+    # architecture for the code name we're working with at the moment. [written
+    # by Melissa, copied by Molly]
+
+    apt_path = Pkg::Config.apt_repo_staging_path
+    if nonfinal
+      apt_path = Pkg::Config.nonfinal_apt_repo_staging_path
+    end
+    Pkg::Platforms.codenames.each do |codename|
+      create_rolling_repo_link(Pkg::Platforms.codename_to_tags(codename)[0], Pkg::Config.apt_signing_server, apt_path, nonfinal)
+    end
   end
 
   def update_release_package_symlinks(local_staging_directory, nonfinal = false)
@@ -215,7 +227,7 @@ module Pkg::Util::Ship
       package_format = Pkg::Platforms.package_format_for_tag(platform_tag)
       case package_format
       when 'rpm'
-        remote_base = Pkg::Paths.artifacts_path(platform_tag, Pkg::Paths.remote_repo_base(platform_tag, nonfinal), nonfinal)
+        remote_base = Pkg::Paths.artifacts_path(platform_tag, Pkg::Paths.remote_repo_base(platform_tag, nonfinal: nonfinal), nonfinal)
       when 'deb'
         remote_base = Pkg::Paths.apt_package_base_path(platform_tag, Pkg::Paths.repo_name(nonfinal), Pkg::Config.project, nonfinal)
       else

data/spec/lib/packaging/paths_spec.rb

@@ -213,6 +213,7 @@ describe 'Pkg::Paths' do
     before :each do
       allow(Pkg::Config).to receive(:yum_repo_path).and_return('foo')
       allow(Pkg::Config).to receive(:apt_repo_path).and_return('bar')
+      allow(Pkg::Config).to receive(:dmg_path).and_return('/opt/downloads/mac')
       allow(Pkg::Config).to receive(:nonfinal_yum_repo_path).and_return('foo-nightly')
       allow(Pkg::Config).to receive(:nonfinal_apt_repo_path).and_return('bar-nightly')
     end
@@ -223,13 +224,21 @@ describe 'Pkg::Paths' do
       expect(Pkg::Paths.remote_repo_base('ubuntu-18.04-amd64')).to eq('bar')
     end
     it 'returns nonfinal_yum_repo_path for nonfinal rpms' do
-      expect(Pkg::Paths.remote_repo_base('fedora-31-x86_64', true)).to eq('foo-nightly')
+      expect(Pkg::Paths.remote_repo_base('fedora-31-x86_64', nonfinal: true)).to eq('foo-nightly')
     end
     it 'returns nonfinal_apt_repo_path for nonfinal debs' do
-      expect(Pkg::Paths.remote_repo_base('debian-9-amd64', true)).to eq('bar-nightly')
+      expect(Pkg::Paths.remote_repo_base('debian-9-amd64', nonfinal: true)).to eq('bar-nightly')
     end
+    it 'fails if neither tag nor package_format is provided' do
+      expect { Pkg::Paths.remote_repo_base }.to raise_error(/Pkg::Paths.remote_repo_base must have/)
+    end
+
+    it 'returns /opt/downloads if the path is /opt/downloads/<something>' do
+      expect(Pkg::Paths.remote_repo_base(package_format: 'dmg')).to eq('/opt/downloads')
+    end
+
     it 'fails for all other package formats' do
-      expect { Pkg::Paths.remote_repo_base('osx-10.14-x86_64') }.to raise_error(/Can't determine remote repo base path/)
+      expect { Pkg::Paths.remote_repo_base('solaris-11-i386') }.to raise_error(/Can't determine remote repo base path/)
     end
   end
 

data/tasks/gem.rake

@@ -150,10 +150,20 @@ namespace :package do
     Pkg::Config.gemversion = Pkg::Util::Version.extended_dot_version
     package_gem
   end
+
+  # PA-3356: temporary task to ship puppet 7 nightly gem
+  # TODO: PA-3358 - remove when puppet 7 is officialy out
+  task :puppet_7_nightly_gem => ["clean"] do
+    Pkg::Config.gemversion = Pkg::Util::Version.extended_dot_version.gsub(/6\.\d+\.\d+/, '7.0.0')
+    package_gem
+  end
 end
 
 # An alias task to simplify our remote logic in jenkins.rake
 namespace :pl do
   task :gem => "package:gem"
   task :nightly_gem => "package:nightly_gem"
+  # PA-3356: temporary task to ship puppet 7 nightly gem
+  # TODO: PA-3358 - remove when puppet 7 is officialy out
+  task :puppet_7_nightly_gem => "package:puppet_7_nightly_gem"
 end

data/tasks/ship.rake

@@ -265,6 +265,25 @@ namespace :pl do
 
       Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.gem_host, command)
     end
+
+    # PA-3356: temporary task to link puppet 7 nightly gem
+    # TODO: PA-3358 - remove when puppet 7 is officialy out
+    desc "Remotely link puppet 7 nightly shipped gems to latest versions on #{Pkg::Config.gem_host}"
+    task link_puppet_7_nightly_shipped_gems_to_latest: 'pl:fetch' do
+      Pkg::Config.gemversion = Pkg::Util::Version.extended_dot_version.gsub(/6\.\d+\.\d+/, '7.0.0')
+
+      remote_path = Pkg::Config.nonfinal_gem_path
+      gems = FileList['pkg/*.gem'].map! { |path| path.gsub!('pkg/', '') }
+      command = %(cd #{remote_path}; )
+
+      command += gems.map! do |gem_name|
+        %(sudo ln -sf #{gem_name} #{gem_name.gsub(Pkg::Config.gemversion, 'latest')})
+      end.join(';')
+
+      command += %(; sync)
+
+      Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.gem_host, command)
+    end
   end
 
   desc "Ship mocked rpms to #{Pkg::Config.yum_staging_server}"
@@ -368,46 +387,26 @@ namespace :pl do
 
   desc "ship apple dmg to #{Pkg::Config.dmg_staging_server}"
   task ship_dmg: 'pl:fetch' do
-    # TODO: realistically, this shouldn't be here. This block needs to be
-    # removed, but only when we can successfully modify all instances of
-    # this to be set to '/opt/downloads'. In the meantime, we need to write
-    # this terrible workaround to ensure backward compatibility.
-    #
-    # I'm so sorry
-    # ~MAS 2017-08-14
-    if Pkg::Config.dmg_path == "/opt/downloads/mac"
-      path = "/opt/downloads"
-    else
-      path = Pkg::Config.dmg_path
-    end
+    path = Pkg::Paths.remote_repo_base(package_format: 'dmg')
     Pkg::Util::Ship.ship_dmg('pkg', path)
   end
 
   desc "ship nightly apple dmgs to #{Pkg::Config.dmg_staging_server}"
   task ship_nightly_dmg: 'pl:fetch' do
-    Pkg::Util::Ship.ship_dmg('pkg', Pkg::Config.nonfinal_dmg_path, nonfinal: true)
+    path = Pkg::Paths.remote_repo_base(package_format: 'dmg', nonfinal: true)
+    Pkg::Util::Ship.ship_dmg('pkg', path, nonfinal: true)
   end
 
   desc "ship Arista EOS swix packages and signatures to #{Pkg::Config.swix_staging_server}"
   task ship_swix: 'pl:fetch' do
-    # TODO: realistically, this shouldn't be here. This block needs to be
-    # removed, but only when we can successfully modify all instances of
-    # this to be set to '/opt/downloads'. In the meantime, we need to write
-    # this terrible workaround to ensure backward compatibility.
-    #
-    # I'm so sorry
-    # ~MAS 2017-08-14
-    if Pkg::Config.swix_path == "/opt/downloads/eos"
-      path = "/opt/downloads"
-    else
-      path = Pkg::Config.swix_path
-    end
+    path = Pkg::Paths.remote_repo_base(package_format: 'swix')
     Pkg::Util::Ship.ship_swix('pkg', path)
   end
 
   desc "ship nightly Arista EOS swix packages and signatures to #{Pkg::Config.swix_staging_server}"
   task ship_nightly_swix: 'pl:fetch' do
-    Pkg::Util::Ship.ship_swix('pkg', Pkg::Config.nonfinal_swix_path, nonfinal: true)
+    path = Pkg::Paths.remote_repo_base(package_format: 'swix', nonfinal: true)
+    Pkg::Util::Ship.ship_swix('pkg', path, nonfinal: true)
   end
 
   desc "ship tarball and signature to #{Pkg::Config.tar_staging_server}"
@@ -429,24 +428,14 @@ namespace :pl do
 
   desc "Ship MSI packages to #{Pkg::Config.msi_staging_server}"
   task ship_msi: 'pl:fetch' do
-    # TODO: realistically, this shouldn't be here. This block needs to be
-    # removed, but only when we can successfully modify all instances of
-    # this to be set to '/opt/downloads'. In the meantime, we need to write
-    # this terrible workaround to ensure backward compatibility.
-    #
-    # I'm so sorry
-    # ~MAS 2017-08-14
-    if Pkg::Config.msi_path == "/opt/downloads/windows"
-      path = "/opt/downloads"
-    else
-      path = Pkg::Config.msi_path
-    end
+    path = Pkg::Paths.remote_repo_base(package_format: 'msi')
     Pkg::Util::Ship.ship_msi('pkg', path, excludes: ["#{Pkg::Config.project}-x(86|64).msi"])
   end
 
   desc "Ship nightly MSI packages to #{Pkg::Config.msi_staging_server}"
   task ship_nightly_msi: 'pl:fetch' do
-    Pkg::Util::Ship.ship_msi('pkg', Pkg::Config.nonfinal_msi_path, excludes: ["#{Pkg::Config.project}-x(86|64).msi"], nonfinal: true)
+    path = Pkg::Paths.remote_repo_base(package_format: 'msi', nonfinal: true)
+    Pkg::Util::Ship.ship_msi('pkg', path, excludes: ["#{Pkg::Config.project}-x(86|64).msi"], nonfinal: true)
   end
 
   desc "Add #{Pkg::Config.project} version #{Pkg::Config.ref} to release-metrics"
@@ -546,6 +535,16 @@ namespace :pl do
         puts " * #{err}"
       end
     end
+
+    desc 'Create the rolling repo links'
+    task create_repo_links: 'pl:fetch' do
+      Pkg::Util::Ship.create_rolling_repo_links
+    end
+
+    desc 'Create rolling repo links for nightlies'
+    task create_nightly_repo_links: 'pl:fetch' do
+      Pkg::Util::Ship.create_rolling_repo_links(true)
+    end
   end
 
   # It is odd to namespace this ship task under :jenkins, but this task is

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.99.64
+  version: 0.99.69
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
+date: 2020-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.1.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.1.5
 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
@@ -245,28 +259,28 @@ signing_key:
 specification_version: 4
 summary: Puppet Labs' packaging automation
 test_files:
+- spec/lib/packaging/artifactory_spec.rb
 - spec/lib/packaging/sign_spec.rb
-- spec/lib/packaging/paths_spec.rb
+- spec/lib/packaging/platforms_spec.rb
+- spec/lib/packaging/rpm/repo_spec.rb
 - spec/lib/packaging/repo_spec.rb
-- spec/lib/packaging/deb_spec.rb
-- spec/lib/packaging/deb/repo_spec.rb
+- spec/lib/packaging/config_spec.rb
 - spec/lib/packaging/gem_spec.rb
-- spec/lib/packaging/artifactory_spec.rb
-- spec/lib/packaging/tar_spec.rb
-- spec/lib/packaging/util/version_spec.rb
 - spec/lib/packaging/util/execution_spec.rb
-- spec/lib/packaging/util/os_spec.rb
-- spec/lib/packaging/util/ship_spec.rb
+- spec/lib/packaging/util/gpg_spec.rb
 - spec/lib/packaging/util/git_spec.rb
+- spec/lib/packaging/util/jenkins_spec.rb
 - spec/lib/packaging/util/rake_utils_spec.rb
 - spec/lib/packaging/util/net_spec.rb
-- spec/lib/packaging/util/file_spec.rb
-- spec/lib/packaging/util/jenkins_spec.rb
-- spec/lib/packaging/util/misc_spec.rb
 - spec/lib/packaging/util/git_tag_spec.rb
-- spec/lib/packaging/util/gpg_spec.rb
-- spec/lib/packaging/rpm/repo_spec.rb
+- spec/lib/packaging/util/misc_spec.rb
+- spec/lib/packaging/util/ship_spec.rb
+- spec/lib/packaging/util/file_spec.rb
+- spec/lib/packaging/util/version_spec.rb
+- spec/lib/packaging/util/os_spec.rb
+- spec/lib/packaging/paths_spec.rb
+- spec/lib/packaging/deb_spec.rb
 - spec/lib/packaging/retrieve_spec.rb
-- spec/lib/packaging/platforms_spec.rb
-- spec/lib/packaging/config_spec.rb
+- spec/lib/packaging/tar_spec.rb
+- spec/lib/packaging/deb/repo_spec.rb
 - spec/lib/packaging_spec.rb