packaging 0.105.0 → 0.106.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 296bfdcecf936f80297894792d9b9a1bb3a83a422a61e4976aca3916dd6c9a2b
-  data.tar.gz: 0c76c4482d82367cef9d988fc1e31080f718322e4eab1fe9a5176f4544c8a3ce
+  metadata.gz: eb8f591fe70bfaa1b456f862d1898608ac697a17fd6875f03bf9ccc3a70aca0f
+  data.tar.gz: 5d14a9da028019e933ffe9b723170d222bd7684aeacc85081f7002ac683739d6
 SHA512:
-  metadata.gz: 071534bcce41eb8b11517d21592399a9f94c45b20a70259aa5a13c4bf3ec5bfd6cab5e517698e6f8884736a932a62d0212d945cb97ad549bdf8c80242f594f8e
-  data.tar.gz: 532cca35cd6eeea218c8a6cdcdf00f0802f0c0ae33fc009f6f42bd7c39056f45b147abaf971879e2f5532541e1d08c0c6267425d32aa69dad9c11f036697c183
+  metadata.gz: bd7b31167dcd20809a694b8366493be1e2ab67138d97c90ad283ca4852ecca37c6726642bb20e9ac83a0b97d606a780825e4133d9cffa357e602ea0d1e96d779
+  data.tar.gz: ab8c6af7044c77070b5568023beb9962506622cb90d472d07d795deb8d6b99abea94cf29077e6e5ee71990f20aa1d0672dab83a7c1192a9845c580407a4f3259

data/tasks/ship.rake

@@ -640,14 +640,18 @@ namespace :pl do
 
   # 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
-    # The equivalent to invoking this task is calling Pkg::Util::Ship.ship_to_artifactory(local_directory, target)
     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 " \
@@ -655,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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.105.0
+  version: 0.106.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-06 00:00:00.000000000 Z
+date: 2022-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry-byebug
@@ -296,27 +296,27 @@ specification_version: 4
 summary: Puppet Labs' packaging automation
 test_files:
 - spec/lib/packaging_spec.rb
-- spec/lib/packaging/artifactory_spec.rb
-- spec/lib/packaging/deb_spec.rb
-- spec/lib/packaging/retrieve_spec.rb
+- spec/lib/packaging/platforms_spec.rb
+- spec/lib/packaging/tar_spec.rb
 - spec/lib/packaging/rpm/repo_spec.rb
-- spec/lib/packaging/deb/repo_spec.rb
-- spec/lib/packaging/config_spec.rb
+- spec/lib/packaging/artifactory_spec.rb
+- spec/lib/packaging/gem_spec.rb
 - spec/lib/packaging/paths_spec.rb
-- spec/lib/packaging/tar_spec.rb
-- spec/lib/packaging/repo_spec.rb
 - spec/lib/packaging/sign_spec.rb
-- spec/lib/packaging/platforms_spec.rb
-- spec/lib/packaging/util/version_spec.rb
-- spec/lib/packaging/util/os_spec.rb
-- spec/lib/packaging/util/misc_spec.rb
-- spec/lib/packaging/util/git_spec.rb
-- spec/lib/packaging/util/jenkins_spec.rb
-- spec/lib/packaging/util/execution_spec.rb
-- spec/lib/packaging/util/git_tag_spec.rb
+- spec/lib/packaging/config_spec.rb
 - spec/lib/packaging/util/gpg_spec.rb
-- spec/lib/packaging/util/file_spec.rb
+- spec/lib/packaging/util/jenkins_spec.rb
 - spec/lib/packaging/util/net_spec.rb
+- spec/lib/packaging/util/git_tag_spec.rb
 - spec/lib/packaging/util/rake_utils_spec.rb
+- spec/lib/packaging/util/os_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/ship_spec.rb
-- spec/lib/packaging/gem_spec.rb
+- spec/lib/packaging/util/version_spec.rb
+- spec/lib/packaging/util/file_spec.rb
+- spec/lib/packaging/deb_spec.rb
+- spec/lib/packaging/repo_spec.rb
+- spec/lib/packaging/retrieve_spec.rb
+- spec/lib/packaging/deb/repo_spec.rb