packaging 0.108.1 → 0.109.0

data/tasks/fetch.rake

@@ -15,8 +15,8 @@ end
 team_data_branch = Pkg::Config.team
 
 if Pkg::Config.build_pe
-  project_data_branch = 'pe-' + project_data_branch unless project_data_branch =~ /^pe-/
-  team_data_branch = 'pe-' + team_data_branch unless team_data_branch =~ /^pe-/
+  project_data_branch = "pe-#{project_data_branch}" unless project_data_branch =~ /^pe-/
+  team_data_branch = "pe-#{team_data_branch}" unless team_data_branch =~ /^pe-/
 end
 
 # The pl:fetch task pulls down two files from the build-data repo that contain additional

data/tasks/mock.rake

@@ -158,11 +158,11 @@ def mock_template(mock_config)
   # for example, pupent-3.4-el5-i386.cfg would become pupent-el5-i386 while pupent-el7-x86_64 would remain unmodified.
   template = mock_config.sub(/([^-]*)-\d\.\d-([^-]*)-([^-]*)/, '\1-\2-\3')
   template_location = File.join(File::SEPARATOR, "etc", "mock", "#{template}.cfg.erb")
-  if File.exists?(template_location)
+  if File.exist?(template_location)
     return template, Pkg::Util::File.erb_file(template_location, nil, false, { :binding => binding })
-  else
-    return mock_config
   end
+
+  return mock_config
 end
 
 # Determine the appropriate rpm macro definitions based on the mock config name

data/tasks/nightly_repos.rake

@@ -75,13 +75,14 @@ namespace :pl do
       mkdir("pkg")
 
       Dir.chdir("pkg") do
-        if versioning == 'ref'
+        case versioning
+        when 'ref'
           local_target = File.join(Pkg::Config.project, Pkg::Config.ref)
-        elsif versioning == 'version'
+        when 'version'
           local_target = File.join(Pkg::Config.project, Pkg::Util::Version.dot_version)
         end
 
-        FileUtils.mkdir_p([local_target, Pkg::Config.project + "-latest"])
+        FileUtils.mkdir_p([local_target, "#{Pkg::Config.project}-latest"])
 
         # Rake task dependencies with arguments are nuts, so we just directly
         # invoke them here.  We want the signed_* directories staged as
@@ -106,7 +107,7 @@ namespace :pl do
         # names stay the same between runs. Their contents have the ref
         # stripped off and the project replaced by $project-latest. Then the
         # repos directory is a symlink to the last pushed ref's repos.
-        FileUtils.cp_r(File.join(local_target, "repo_configs"), Pkg::Config.project + "-latest", { :preserve => true })
+        FileUtils.cp_r(File.join(local_target, "repo_configs"), "#{Pkg::Config.project}-latest", { :preserve => true })
 
         # Now we need to remove the ref and replace $project with
         # $project-latest so that it will work as a pinned latest repo
@@ -114,7 +115,7 @@ namespace :pl do
         Dir.glob("#{Pkg::Config.project}-latest/repo_configs/**/*").select { |t_config| File.file?(t_config) }.each do |config|
           new_contents = File.read(config)
           new_contents.gsub!(%r{#{Pkg::Config.ref}/}, "")
-          new_contents.gsub!(%r{#{Pkg::Config.project}/}, Pkg::Config.project + "-latest/")
+          new_contents.gsub!(%r{#{Pkg::Config.project}/}, "#{Pkg::Config.project}-latest/")
           new_contents.gsub!(Pkg::Config.ref, "latest")
 
           File.open(config, "w") { |file| file.puts new_contents }
@@ -136,7 +137,7 @@ namespace :pl do
         end
 
         # Make a latest symlink for the project
-        FileUtils.ln_sf(File.join("..", local_target, "repos"), File.join(Pkg::Config.project + "-latest"), :verbose => true)
+        FileUtils.ln_sf(File.join("..", local_target, "repos"), File.join("#{Pkg::Config.project}-latest"), :verbose => true)
       end
     end
 
@@ -231,10 +232,11 @@ namespace :pl do
       versioning = args.versioning or fail ":versioning is a required argument for #{t}"
       pe_version = args.pe_version or fail ":pe_version is a required argument for #{t}"
 
-      if versioning == 'ref'
+      case versioning
+      when 'ref'
         version_string = Pkg::Config.ref
-      elsif versioning == 'version'
-        version_string =  Pkg::Util::Version.dot_version
+      when 'version'
+        version_string = Pkg::Util::Version.dot_version
       end
 
       pa_source = File.join(remote_dir, Pkg::Config.project)

data/tasks/rpm.rake

@@ -15,7 +15,7 @@ def prep_rpm_build_dir
   if $?.success?
     sh "tar -C #{temp} -xzf #{File.join(temp, tarball)} #{Pkg::Config.project}-#{Pkg::Config.version}/ext/redhat/#{Pkg::Config.project}.spec"
     cp("#{temp}/#{Pkg::Config.project}-#{Pkg::Config.version}/ext/redhat/#{Pkg::Config.project}.spec", "#{temp}/SPECS/")
-  elsif File.exists?("ext/redhat/#{Pkg::Config.project}.spec.erb")
+  elsif File.exist?("ext/redhat/#{Pkg::Config.project}.spec.erb")
     Pkg::Util::File.erb_file("ext/redhat/#{Pkg::Config.project}.spec.erb", "#{temp}/SPECS/#{Pkg::Config.project}.spec", nil, :binding => Pkg::Config.get_binding)
   else
     fail "Could not locate redhat spec ext/redhat/#{Pkg::Config.project}.spec or ext/redhat/#{Pkg::Config.project}.spec.erb"
@@ -30,7 +30,7 @@ def build_rpm(buildarg = "-bs")
   rpm_old_version = '--define "_source_filedigest_algorithm 1" --define "_binary_filedigest_algorithm 1" \
      --define "_binary_payload w9.gzdio" --define "_source_payload w9.gzdio" \
      --define "_default_patch_fuzz 2"'
-  args = rpm_define + ' ' + rpm_old_version
+  args = "#{rpm_define} #{rpm_old_version}"
   FileUtils.mkdir_p('pkg/srpm')
   if buildarg == '-ba'
     FileUtils.mkdir_p('pkg/rpm')
@@ -63,4 +63,3 @@ namespace :package do
     build_rpm("-ba")
   end
 end
-

data/tasks/ship.rake

@@ -680,8 +680,10 @@ namespace :pl do
         end
 
         # Don't deploy if the package already exists
-        if artifactory.package_exists_on_artifactory?(artifact)
-          warn "Attempt to upload '#{artifact}' failed. Package already exists."
+        existing_artifacts = artifactory.artifact_paths(artifact)
+        unless existing_artifacts.empty?
+          warn "Uploading '#{artifact}' to Artifactory refused. Artifact already exists here: ",
+               existing_artifacts.join(', ')
           next
         end
 

data/tasks/sign.rake

@@ -78,18 +78,16 @@ namespace :pl do
 
   desc "Sign generated debian changes files. Defaults to PL Key, pass GPG_KEY to override"
   task :sign_deb_changes, :root_dir do |_t, args|
-    begin
-      deb_dir = args.root_dir || $DEFAULT_DIRECTORY
-      change_files = Dir["#{deb_dir}/**/*.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
+    deb_dir = args.root_dir || $DEFAULT_DIRECTORY
+    change_files = Dir["#{deb_dir}/**/*.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
-    ensure
-      Pkg::Util::Gpg.kill_keychain
     end
+  ensure
+    Pkg::Util::Gpg.kill_keychain
   end
 
   desc "Sign OSX packages"

data/tasks/z_data_dump.rake

@@ -37,10 +37,11 @@ namespace :pl do
     # We want a string that is the from "@<param name>"
     if param = args.param
       getter = param.dup
-      if param[0] == ':'
+      case param[0]
+      when ':'
         getter = param[1..-1]
         param[0] = "@"
-      elsif param[0] == "@"
+      when "@"
         getter = param[1..-1]
       else
         param.insert(0, "@")
@@ -62,4 +63,3 @@ namespace :pl do
     end
   end
 end
-

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.108.1
+  version: 0.109.0
 platform: ruby
 authors:
-- Puppet Labs
+- Puppet By Perforce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-04 00:00:00.000000000 Z
+date: 2023-02-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: debug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   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
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: apt_stage_artifacts
   requirement: !ruby/object:Gem::Requirement
@@ -70,14 +84,14 @@ dependencies:
   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
 - !ruby/object:Gem::Dependency
@@ -136,9 +150,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         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
+description: Packaging automation for Puppet FOSS projects
+email: release@puppet.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -293,30 +306,30 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Puppet Labs' packaging automation
+summary: Puppet by Perforce packaging automation
 test_files:
 - spec/lib/packaging_spec.rb
-- spec/lib/packaging/sign_spec.rb
-- spec/lib/packaging/artifactory_spec.rb
-- spec/lib/packaging/retrieve_spec.rb
-- spec/lib/packaging/config_spec.rb
-- spec/lib/packaging/rpm/repo_spec.rb
-- spec/lib/packaging/deb_spec.rb
-- spec/lib/packaging/repo_spec.rb
-- spec/lib/packaging/gem_spec.rb
-- spec/lib/packaging/deb/repo_spec.rb
-- spec/lib/packaging/tar_spec.rb
 - spec/lib/packaging/paths_spec.rb
-- spec/lib/packaging/platforms_spec.rb
-- spec/lib/packaging/util/jenkins_spec.rb
+- spec/lib/packaging/rpm/repo_spec.rb
 - spec/lib/packaging/util/ship_spec.rb
-- spec/lib/packaging/util/version_spec.rb
 - spec/lib/packaging/util/os_spec.rb
-- spec/lib/packaging/util/git_tag_spec.rb
-- spec/lib/packaging/util/rake_utils_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/file_spec.rb
+- spec/lib/packaging/util/rake_utils_spec.rb
+- spec/lib/packaging/util/execution_spec.rb
 - spec/lib/packaging/util/net_spec.rb
+- spec/lib/packaging/util/version_spec.rb
 - spec/lib/packaging/util/misc_spec.rb
-- spec/lib/packaging/util/execution_spec.rb
-- spec/lib/packaging/util/git_spec.rb
+- spec/lib/packaging/util/gpg_spec.rb
+- spec/lib/packaging/util/git_tag_spec.rb
+- spec/lib/packaging/deb/repo_spec.rb
+- spec/lib/packaging/retrieve_spec.rb
+- spec/lib/packaging/gem_spec.rb
+- spec/lib/packaging/config_spec.rb
+- spec/lib/packaging/repo_spec.rb
+- spec/lib/packaging/deb_spec.rb
+- spec/lib/packaging/platforms_spec.rb
+- spec/lib/packaging/artifactory_spec.rb
+- spec/lib/packaging/tar_spec.rb
+- spec/lib/packaging/sign_spec.rb