packaging 0.88.77 → 0.99.0

data/tasks/sign.rake

@@ -1,22 +1,62 @@
+def sign_rpm(rpm, sign_flags = nil)
+
+  # To enable support for wrappers around rpm and thus support for gpg-agent
+  # rpm signing, we have to be able to tell the packaging repo what binary to
+  # use as the rpm signing tool.
+  #
+  rpm_cmd = ENV['RPM'] || Pkg::Util::Tool.find_tool('rpm')
+
+  # If we're using the gpg agent for rpm signing, we don't want to specify the
+  # input for the passphrase, which is what '--passphrase-fd 3' does. However,
+  # if we're not using the gpg agent, this is required, and is part of the
+  # defaults on modern rpm. The fun part of gpg-agent signing of rpms is
+  # specifying that the gpg check command always return true
+  #
+  if Pkg::Util.boolean_value(ENV['RPM_GPG_AGENT'])
+    gpg_check_cmd = "--define '%__gpg_check_password_cmd /bin/true'"
+  else
+    input_flag = "--passphrase-fd 3"
+  end
+
+  # Try this up to 5 times, to allow for incorrect passwords
+  Pkg::Util::Execution.retry_on_fail(:times => 5) do
+    # This definition of %__gpg_sign_cmd is the default on modern rpm. We
+    # accept extra flags to override certain signing behavior for older
+    # versions of rpm, e.g. specifying V3 signatures instead of V4.
+    #
+    sh "#{rpm_cmd} #{gpg_check_cmd} --define '%_gpg_name #{Pkg::Util::Gpg.key}' --define '%__gpg_sign_cmd %{__gpg} gpg #{sign_flags} #{input_flag} --batch --no-verbose --no-armor --no-secmem-warning -u %{_gpg_name} -sbo %{__signature_filename} %{__plaintext_filename}' --addsign #{rpm}"
+  end
+
+end
+
+def sign_legacy_rpm(rpm)
+  sign_rpm(rpm, "--force-v3-sigs --digest-algo=sha1")
+end
+
+def rpm_has_sig(rpm)
+  %x(rpm -Kv #{rpm} | grep "#{Pkg::Util::Gpg.key.downcase}" &> /dev/null)
+  $?.success?
+end
+
+def sign_deb_changes(file)
+  # Lazy lazy lazy lazy lazy
+  sign_program = "-p'gpg --use-agent --no-tty'" if ENV['RPM_GPG_AGENT']
+  sh "debsign #{sign_program} --re-sign -k#{Pkg::Config.gpg_key} #{file}"
+end
+
 namespace :pl do
   desc "Sign the tarball, defaults to PL key, pass GPG_KEY to override or edit build_defaults"
   task :sign_tar do
     unless Pkg::Config.vanagon_project
-      tarballs_to_sign = Pkg::Util::Ship.collect_packages(['pkg/*.tar.gz'], ['signing_bundle', 'packaging-bundle'])
+      File.exist?("pkg/#{Pkg::Config.project}-#{Pkg::Config.version}.tar.gz") or fail "No tarball exists. Try rake package:tar?"
       Pkg::Util::Gpg.load_keychain if Pkg::Util::Tool.find_tool('keychain')
-      tarballs_to_sign.each do |file|
-        Pkg::Util::Gpg.sign_file file
-      end
+      Pkg::Util::Gpg.sign_file "pkg/#{Pkg::Config.project}-#{Pkg::Config.version}.tar.gz"
     end
   end
 
-  # If no directory to sign is specified assume "pkg"
-  $DEFAULT_DIRECTORY = "pkg"
-
   desc "Sign the Arista EOS swix packages, defaults to PL key, pass GPG_KEY to override or edit build_defaults"
-  task :sign_swix, :root_dir do |_t, args|
-    swix_dir = args.root_dir || $DEFAULT_DIRECTORY
-    packages = Dir["#{swix_dir}/**/*.swix"]
+  task :sign_swix do
+    packages = Dir["pkg/**/*.swix"]
     unless packages.empty?
       Pkg::Util::Gpg.load_keychain if Pkg::Util::Tool.find_tool('keychain')
       packages.each do |swix_package|
@@ -26,11 +66,10 @@ namespace :pl do
   end
 
   desc "Detach sign any solaris svr4 packages"
-  task :sign_svr4, :root_dir do |_t, args|
-    svr4_dir = args.root_dir || $DEFAULT_DIRECTORY
-    unless Dir["#{svr4_dir}/**/*.pkg.gz"].empty?
+  task :sign_svr4 do
+    unless Dir["pkg/**/*.pkg.gz"].empty?
       Pkg::Util::Gpg.load_keychain if Pkg::Util::Tool.find_tool('keychain')
-      Dir["#{svr4_dir}/**/*.pkg.gz"].each do |pkg|
+      Dir["pkg/**/*.pkg.gz"].each do |pkg|
         Pkg::Util::Gpg.sign_file pkg
       end
     end
@@ -38,38 +77,84 @@ namespace :pl do
 
   desc "Sign mocked rpms, Defaults to PL Key, pass GPG_KEY to override"
   task :sign_rpms, :root_dir do |t, args|
-    rpm_directory = args.root_dir || $DEFAULT_DIRECTORY
-    Pkg::Sign::Rpm.sign_all(rpm_directory)
+    rpm_dir = args.root_dir || "pkg"
+
+    all_rpms = Dir["#{rpm_dir}/**/*.rpm"]
+
+    v3_rpms = []
+    v4_rpms = []
+    all_rpms.each do |rpm|
+      platform_tag = Pkg::Paths.tag_from_artifact_path(rpm)
+      platform, version, _ = Pkg::Platforms.parse_platform_tag(platform_tag)
+
+      # We don't sign AIX rpms
+      next if platform_tag.include?('aix')
+
+      sig_type = Pkg::Platforms.signature_format_for_platform_version(platform, version)
+      case sig_type
+      when 'v3'
+        v3_rpms << rpm
+      when 'v4'
+        v4_rpms << rpm
+      else
+        fail "Cannot find signature type for package '#{rpm}'"
+      end
+    end
+
+    unless v3_rpms.empty?
+      puts "Signing old rpms..."
+      sign_legacy_rpm(v3_rpms.join(' '))
+    end
+
+    unless v4_rpms.empty?
+      puts "Signing modern rpms..."
+      sign_rpm(v4_rpms.join(' '))
+    end
+
+    # Now we hardlink them back in
+    Dir["#{rpm_dir}/**/*.noarch.rpm"].each do |rpm|
+      platform_tag = Pkg::Paths.tag_from_artifact_path(rpm)
+      platform, version, _ = Pkg::Platforms.parse_platform_tag(platform_tag)
+      supported_arches = Pkg::Platforms.arches_for_platform_version(platform, version)
+      cd File.dirname(rpm) do
+        noarch_rpm = File.basename(rpm)
+        supported_arches.each do |arch|
+          arch_dir = File.join('..', arch)
+          FileUtils.mkdir_p(arch_dir)
+          unless File.exist?(File.join(arch_dir, noarch_rpm))
+            FileUtils.ln(noarch_rpm, arch_dir, :force => true, :verbose => true)
+          end
+        end
+      end
+    end
   end
 
   desc "Sign ips package, uses PL certificates by default, update privatekey_pem, certificate_pem, and ips_inter_cert in build_defaults.yaml to override."
-  task :sign_ips, :root_dir do |_t, args|
-    ips_dir = args.root_dir || $DEFAULT_DIRECTORY
-    Pkg::Sign::Ips.sign(ips_dir) unless Dir["#{ips_dir}/**/*.p5p"].empty?
+  task :sign_ips do
+    Pkg::IPS.sign unless Dir['pkg/**/*.p5p'].empty?
   end
 
-  desc "Sign built gems, defaults to PL key, pass GPG_KEY to override or edit build_defaults"
-  task :sign_gem, :root_dir do |_t, args|
-    gems_dir = args.root_dir || $DEFAULT_DIRECTORY
-    gems = FileList["#{gems_dir}/*.gem"]
-    gems.each do |gem|
-      puts "signing gem #{gem}"
-      Pkg::Util::Gpg.sign_file(gem)
+  if Pkg::Config.build_gem
+    desc "Sign built gems, defaults to PL key, pass GPG_KEY to override or edit build_defaults"
+    task :sign_gem do
+      FileList["pkg/#{Pkg::Config.gem_name}-#{Pkg::Config.gemversion}*.gem"].each do |gem|
+        puts "signing gem #{gem}"
+        Pkg::Util::Gpg.sign_file(gem)
+      end
     end
   end
 
   desc "Check if all rpms are signed"
-  task :check_rpm_sigs, :root_dir do |_t, args|
-    rpm_dir = args.root_dir || $DEFAULT_DIRECTORY
-    signed = true
-    rpms = Dir["#{rpm_dir}/**/*.rpm"]
+  task :check_rpm_sigs do
+    signed = TRUE
+    rpms = Dir["pkg/**/*.rpm"]
     print 'Checking rpm signatures'
     rpms.each do |rpm|
-      if Pkg::Sign::Rpm.has_sig? rpm
+      if rpm_has_sig rpm
         print '.'
       else
         puts "#{rpm} is unsigned."
-        signed = false
+        signed = FALSE
       end
     end
     fail unless signed
@@ -77,15 +162,12 @@ namespace :pl do
   end
 
   desc "Sign generated debian changes files. Defaults to PL Key, pass GPG_KEY to override"
-  task :sign_deb_changes, :root_dir do |_t, args|
+  task :sign_deb_changes do
     begin
-      deb_dir = args.root_dir || $DEFAULT_DIRECTORY
-      change_files = Dir["#{deb_dir}/**/*.changes"]
+      change_files = Dir["pkg/**/*.changes"]
       unless change_files.empty?
         Pkg::Util::Gpg.load_keychain if Pkg::Util::Tool.find_tool('keychain')
-        change_files.each do |file|
-          Pkg::Sign::Deb.sign_changes(file)
-        end
+        sign_deb_changes("pkg/**/*.changes")
       end
     ensure
       Pkg::Util::Gpg.kill_keychain
@@ -93,27 +175,23 @@ namespace :pl do
   end
 
   desc "Sign OSX packages"
-  task :sign_osx, [:root_dir] => "pl:fetch" do |_t, args|
-    dmg_dir = args.root_dir || $DEFAULT_DIRECTORY
-    Pkg::Sign::Dmg.sign(dmg_dir) unless Dir["#{dmg_dir}/**/*.dmg"].empty?
+  task :sign_osx => "pl:fetch" do
+    Pkg::OSX.sign unless Dir['pkg/**/*.dmg'].empty?
   end
 
   desc "Sign MSI packages"
-  task :sign_msi, [:root_dir] => "pl:fetch" do |_t, args|
-    msi_dir = args.root_dir || $DEFAULT_DIRECTORY
-    Pkg::Sign::Msi.sign(msi_dir) unless Dir["#{msi_dir}/**/*.msi"].empty?
+  task :sign_msi => "pl:fetch" do
+    Pkg::MSI.sign unless Dir['pkg/**/*.msi'].empty?
   end
 
   ##
-  # This crazy piece of work establishes a remote repo on the signing
+  # This crazy piece of work establishes a remote repo on the distribution
   # server, ships our packages out to it, signs them, and brings them back.
   #
   namespace :jenkins do
     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')
-      root_dir = args.root_dir || $DEFAULT_DIRECTORY
-      Dir["#{root_dir}/*"].empty? and fail "There were no files found in #{root_dir}. Maybe you wanted to build/retrieve something first?"
+    task :sign_all => "pl:fetch" do
+      Dir["pkg/*"].empty? and fail "There were files found in pkg/. Maybe you wanted to build/retrieve something first?"
 
       # Because rpms and debs are laid out differently in PE under pkg/ they
       # have a different sign task to address this. Rather than create a whole
@@ -127,8 +205,7 @@ namespace :pl do
       signing_bundle = ENV['SIGNING_BUNDLE']
       rpm_sign_task = Pkg::Config.build_pe ? "pe:sign_rpms" : "pl:sign_rpms"
       deb_sign_task = Pkg::Config.build_pe ? "pe:sign_deb_changes" : "pl:sign_deb_changes"
-      sign_tasks    = [rpm_sign_task]
-      sign_tasks    << deb_sign_task unless Dir["#{root_dir}/**/*.changes"].empty?
+      sign_tasks    = [rpm_sign_task, deb_sign_task]
       sign_tasks    << "pl:sign_tar" if Pkg::Config.build_tar
       sign_tasks    << "pl:sign_gem" if Pkg::Config.build_gem
       sign_tasks    << "pl:sign_osx" if Pkg::Config.build_dmg || Pkg::Config.vanagon_project
@@ -136,19 +213,14 @@ namespace :pl do
       sign_tasks    << "pl:sign_svr4" if Pkg::Config.vanagon_project
       sign_tasks    << "pl:sign_ips" if Pkg::Config.vanagon_project
       sign_tasks    << "pl:sign_msi" if Pkg::Config.build_msi || Pkg::Config.vanagon_project
-      remote_repo   = Pkg::Util::Net.remote_unpack_git_bundle(Pkg::Config.signing_server, 'HEAD', nil, signing_bundle)
+      remote_repo   = Pkg::Util::Net.remote_bootstrap(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
-      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}")
-      Pkg::Util::Net.remote_execute(Pkg::Config.signing_server, "rm #{build_params}")
-      puts "Signed packages staged in #{root_dir}/ directory"
+      Pkg::Util::Net.rsync_to('pkg', Pkg::Config.signing_server, remote_repo)
+      Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.signing_server, "cd #{remote_repo} ; rake #{sign_tasks.join(' ')} PARAMS_FILE=#{build_params}")
+      Pkg::Util::Net.rsync_from("#{remote_repo}/pkg/", Pkg::Config.signing_server, "pkg/")
+      Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.signing_server, "rm -rf #{remote_repo}")
+      Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.signing_server, "rm #{build_params}")
+      puts "Signed packages staged in 'pkg/ directory"
     end
   end
 end

data/tasks/tar.rake

@@ -16,6 +16,12 @@ namespace :package do
     #
     tar.templates ||= Dir[File.join(Pkg::Config.project_root, "ext", "**", "*.erb")].select { |i| i !~ /ext\/packaging|ext\/osx/ }
 
+
+    # If the user has specified things to exclude via config file, they will be
+    # honored by the tar class, but we also always exclude the packaging repo.
+    #
+    tar.excludes << "ext/packaging"
+
     tar.pkg!
 
     puts "Wrote #{`pwd`.strip}/pkg/#{Pkg::Config.project}-#{Pkg::Config.version}.tar.gz"

data/templates/packaging.xml.erb

@@ -3,7 +3,8 @@
   <actions/>
   <description>&lt;p&gt;&#xd;
 Dynamically Created Packaging Job for a packaging repo-compatible project.&#xd;
-Intended to be triggered from within a project with the packaging gem installed.&#xd;
+Intended to be triggered from within a project with the packaging repo&#xd;
+bootstrapped.&#xd;
 &lt;/p&gt;&#xd;
 &lt;p&gt;&#xd;
 Three parameters are expected:&#xd;
@@ -36,7 +37,7 @@ pl:jenkins:uber_build NOTIFY=foo@puppetlabs.com&#xd;
   Successful completion of packaging will result in the automatic creation of&#xd;
   apt/yum repositories on the distribution server with the built packages.  To&#xd;
   generate client apt/yum repository config files for accessing these packages,&#xd;
-  check out the ref of the git sha that was packaged, and run `bundle exec rake&#xd;
+  check out the ref of the git sha that was packaged, and run `rake&#xd;
   pl:jenkins:(deb|rpm)_repo_configs`. Configuration files will be generated and&#xd;
   deposited locally in pkg/repo_configs.&#xd;
 &lt;/p&gt;&#xd;
@@ -66,7 +67,7 @@ pl:jenkins:uber_build NOTIFY=foo@puppetlabs.com&#xd;
         <% if Pkg::Config.final_mocks %>
           <% Pkg::Config.final_mocks.split(' ').each do |mock| %>&quot;pl_mock MOCK=<%= mock %>&quot;: &quot;rpm&quot;,<% end %>
         <% end %>
-        <% if Pkg::Config.build_tar then %>&quot;package_tar&quot;: &quot;tar&quot;,<% end %>
+        <% if Pkg::Config.build_tar then %>&quot;package_tar&quot;: &quot;rpm&quot;,<% end %>
         <% if Pkg::Config.build_gem then %>&quot;package_gem&quot;: &quot;gem&quot;,<% end %>
         <% if Pkg::Config.build_dmg then %>&quot;package_apple&quot;: &quot;dmg&quot;,<% end %>
 ];
@@ -145,16 +146,13 @@ pushd project
   pushd git_repo
 
     ### Clone the packaging repo
-    <% if ENV['PACKAGING_LOCATION'] && !ENV['PACKAGING_LOCATION'].empty? %>
-      export PACKAGING_LOCATION=&quot;<%= ENV['PACKAGING_LOCATION'] %>&quot;
-    <% end %>
-    bundle install --path .bundle/gems --binstubs .bundle/bin --retry 3
+    rake package:bootstrap
 
     ### Perform the build
-    bundle exec rake $command PARAMS_FILE=&quot;$WORKSPACE/BUILD_PROPERTIES&quot; --trace
+    rake $command PARAMS_FILE=&quot;$WORKSPACE/BUILD_PROPERTIES&quot; --trace
 
     ### Send the results
-    bundle exec rake pl:jenkins:ship[&quot;artifacts&quot;] PARAMS_FILE=&quot;$WORKSPACE/BUILD_PROPERTIES&quot; --trace
+    rake pl:jenkins:ship[&quot;artifacts&quot;] PARAMS_FILE=&quot;$WORKSPACE/BUILD_PROPERTIES&quot; --trace
 
   popd
 popd</command>

data/templates/repo.xml.erb

@@ -71,19 +71,16 @@ if [ $PACKAGE_BUILD_RESULT -eq 0 ] ; then
     pushd git_repo
 
       ### Clone the packaging repo
-      <% if ENV['PACKAGING_LOCATION'] && !ENV['PACKAGING_LOCATION'].empty? %>
-        export PACKAGING_LOCATION=&quot;<%= ENV['PACKAGING_LOCATION'] %>&quot;
-      <% end %>
-      bundle install --path .bundle/gems --binstubs .bundle/bin --retry 3
+      rake package:bootstrap --trace
 
       ### Run repo creation
 <% if Pkg::Config.final_mocks and not Pkg::Config.final_mocks.empty? %>
-      bundle exec rake PARAMS_FILE=../../BUILD_PROPERTIES pl:jenkins:rpm_repos --trace
+      rake PARAMS_FILE=../../BUILD_PROPERTIES pl:jenkins:rpm_repos --trace
 <% else %>
       echo "No mock/rpm targets found, skipping rpm repo creation"
 <% end %>
 <% if Pkg::Config.cows and not Pkg::Config.cows.empty? %>
-      bundle exec rake PARAMS_FILE=../../BUILD_PROPERTIES pl:jenkins:deb_repos --trace
+      rake PARAMS_FILE=../../BUILD_PROPERTIES pl:jenkins:deb_repos --trace
 <% else %>
       echo "No cow/deb targets found, skipping deb repo creation"
 <% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.88.77
+  version: 0.99.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-01 00:00:00.000000000 Z
+date: 2018-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -38,50 +38,22 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.24.1
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: artifactory
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-- !ruby/object:Gem::Dependency
-  name: release-metrics
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -94,20 +66,6 @@ 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
@@ -119,29 +77,22 @@ files:
 - README-Solaris.md
 - README.md
 - lib/packaging.rb
-- lib/packaging/archive.rb
 - lib/packaging/artifactory.rb
-- lib/packaging/artifactory/extensions.rb
 - lib/packaging/config.rb
 - lib/packaging/config/params.rb
-- lib/packaging/config/validations.rb
 - lib/packaging/deb.rb
 - lib/packaging/deb/repo.rb
 - lib/packaging/gem.rb
-- lib/packaging/metrics.rb
+- lib/packaging/ips.rb
+- lib/packaging/msi.rb
 - lib/packaging/nuget.rb
+- lib/packaging/osx.rb
 - lib/packaging/paths.rb
 - lib/packaging/platforms.rb
 - lib/packaging/repo.rb
 - lib/packaging/retrieve.rb
 - lib/packaging/rpm.rb
 - lib/packaging/rpm/repo.rb
-- lib/packaging/sign.rb
-- lib/packaging/sign/deb.rb
-- lib/packaging/sign/dmg.rb
-- lib/packaging/sign/ips.rb
-- lib/packaging/sign/msi.rb
-- lib/packaging/sign/rpm.rb
 - lib/packaging/tar.rb
 - lib/packaging/util.rb
 - lib/packaging/util/date.rb
@@ -162,6 +113,7 @@ files:
 - lib/packaging/util/version.rb
 - spec/fixtures/config/ext/build_defaults.yaml
 - spec/fixtures/config/ext/project_data.yaml
+- spec/fixtures/config/params.yaml
 - spec/fixtures/configs/components/test_file.json
 - spec/fixtures/configs/components/test_file_2.json
 - spec/fixtures/configs/components/test_file_not_tagged.json
@@ -172,13 +124,11 @@ files:
 - spec/lib/packaging/config_spec.rb
 - spec/lib/packaging/deb/repo_spec.rb
 - spec/lib/packaging/deb_spec.rb
-- spec/lib/packaging/gem_spec.rb
 - spec/lib/packaging/paths_spec.rb
 - spec/lib/packaging/platforms_spec.rb
 - spec/lib/packaging/repo_spec.rb
 - spec/lib/packaging/retrieve_spec.rb
 - spec/lib/packaging/rpm/repo_spec.rb
-- spec/lib/packaging/sign_spec.rb
 - spec/lib/packaging/tar_spec.rb
 - spec/lib/packaging/util/execution_spec.rb
 - spec/lib/packaging/util/file_spec.rb
@@ -198,7 +148,6 @@ files:
 - tasks/00_utils.rake
 - tasks/30_metrics.rake
 - tasks/apple.rake
-- tasks/archive.rake
 - tasks/build.rake
 - tasks/clean.rake
 - tasks/config.rake
@@ -237,8 +186,7 @@ files:
 - templates/packaging.xml.erb
 - templates/repo.xml.erb
 homepage: http://github.com/puppetlabs/packaging
-licenses:
-- Apache-2.0
+licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -248,40 +196,39 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Puppet Labs' packaging automation
 test_files:
-- spec/lib/packaging_spec.rb
-- spec/lib/packaging/sign_spec.rb
 - spec/lib/packaging/paths_spec.rb
-- spec/lib/packaging/artifactory_spec.rb
-- spec/lib/packaging/tar_spec.rb
-- spec/lib/packaging/deb_spec.rb
-- spec/lib/packaging/retrieve_spec.rb
-- spec/lib/packaging/deb/repo_spec.rb
-- spec/lib/packaging/platforms_spec.rb
+- spec/lib/packaging/config_spec.rb
 - spec/lib/packaging/util/execution_spec.rb
+- spec/lib/packaging/util/os_spec.rb
+- spec/lib/packaging/util/version_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/gpg_spec.rb
 - spec/lib/packaging/util/git_tag_spec.rb
-- spec/lib/packaging/util/misc_spec.rb
-- spec/lib/packaging/util/os_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/version_spec.rb
-- spec/lib/packaging/util/git_spec.rb
+- spec/lib/packaging/util/net_spec.rb
+- spec/lib/packaging/util/misc_spec.rb
 - spec/lib/packaging/util/ship_spec.rb
-- spec/lib/packaging/config_spec.rb
-- spec/lib/packaging/rpm/repo_spec.rb
 - spec/lib/packaging/repo_spec.rb
-- spec/lib/packaging/gem_spec.rb
+- spec/lib/packaging/tar_spec.rb
+- spec/lib/packaging/retrieve_spec.rb
+- spec/lib/packaging/platforms_spec.rb
+- spec/lib/packaging/deb_spec.rb
+- spec/lib/packaging/deb/repo_spec.rb
+- spec/lib/packaging/rpm/repo_spec.rb
+- spec/lib/packaging/artifactory_spec.rb
+- spec/lib/packaging_spec.rb