packaging 0.109.2 → 0.109.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21fbe7adf35d302cad689b2f4ca536f499c6d805e33da1ec091c7b7dcd672ffc
-  data.tar.gz: dccc381590b0cec0ad69b413b2c9680c1d95fe6bbcd041073e179faae9693134
+  metadata.gz: d4b1debe2d5b8b3f8eba5525251ff49b861c3934c892ee2e0d022bb6b35fbecb
+  data.tar.gz: 4ccf51e8c80d24ff4ed5cba8422d06e8c33eb96dd5d136cad7e47f5863abfa99
 SHA512:
-  metadata.gz: 81e93d2e4375be0ead7790a7cef9bb17e395b0e4ada9ee67926e5f422e24cfdc079cb5a51f3fc5bac87bccc1b6520cf09355eb99796be2df118ae352c8204daa
-  data.tar.gz: 5083b56f76a63f2c2e825a45ee87fdeac1ed2d19cd4adfa7046f8133339cd1212d0377878ca3dede7d984a3506c64b421b7aafb0c4ea71e16a890d79e2bab2a7
+  metadata.gz: d95cf48ac1b357e1fdd25872db2b123fe7ca542508689e58beab6757b367acc1a323660dc182c99baefc4aea1858236c215c72f6113879a0eb923241d9e2d9a8
+  data.tar.gz: d976fe3c0f19f81fd261232716b121def43096ceecfb9393c005922e69d7bb7a06e1d6ff7ab7b4e9efdf2d0026cc1b0d4d0209f42a5243d5530f886ca7292d9b

data/lib/packaging/gem.rb

@@ -48,7 +48,7 @@ module Pkg::Gem
       gem_push_command = "gem push #{file}"
       gem_push_command << " --host #{options[:host]}" if options[:host]
       gem_push_command << " --key #{options[:key]}" if options[:key]
-      Pkg::Util::Execution.capture3(gem_push_command)
+      Pkg::Util::Execution.capture3(gem_push_command, true)
     rescue StandardError => e
       puts "###########################################"
       puts "#  Publishing to rubygems failed. Make sure your .gem/credentials"
@@ -56,7 +56,15 @@ module Pkg::Gem
       puts "###########################################"
       puts
       puts e
-      raise e
+      # There appears to be a race condition where the rubygems versions api will not
+      # be updated in time between builders attempting to push a gem. We want to avoid
+      # failing here due to gem already being pushed, so if we identify this error
+      # we can just log it and move on. NOTE: the gem push documentation does not
+      # appear to provide a distinct error code for this kind of error so we rely on
+      # string matching the stdout/stderr from the Pkg::Uti::execution method.
+      unless e.message.match(/Repushing of gem versions is not allowed/)
+        raise e
+      end
     end
 
     def ship_to_internal_mirror(file)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.109.2
+  version: 0.109.3
 platform: ruby
 authors:
 - Puppet By Perforce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-08 00:00:00.000000000 Z
+date: 2023-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debug
@@ -308,28 +308,28 @@ signing_key:
 specification_version: 4
 summary: Puppet by Perforce packaging automation
 test_files:
-- spec/lib/packaging_spec.rb
+- spec/lib/packaging/gem_spec.rb
 - spec/lib/packaging/paths_spec.rb
+- spec/lib/packaging/platforms_spec.rb
 - spec/lib/packaging/rpm/repo_spec.rb
+- spec/lib/packaging/util/git_tag_spec.rb
+- spec/lib/packaging/util/version_spec.rb
+- spec/lib/packaging/util/net_spec.rb
 - spec/lib/packaging/util/ship_spec.rb
 - spec/lib/packaging/util/os_spec.rb
-- spec/lib/packaging/util/git_spec.rb
+- spec/lib/packaging/util/gpg_spec.rb
 - spec/lib/packaging/util/jenkins_spec.rb
-- spec/lib/packaging/util/file_spec.rb
+- spec/lib/packaging/util/git_spec.rb
+- spec/lib/packaging/util/misc_spec.rb
 - spec/lib/packaging/util/rake_utils_spec.rb
+- spec/lib/packaging/util/file_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/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/tar_spec.rb
 - spec/lib/packaging/config_spec.rb
-- spec/lib/packaging/repo_spec.rb
+- spec/lib/packaging/deb/repo_spec.rb
+- spec/lib/packaging/sign_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
+- spec/lib/packaging/repo_spec.rb
+- spec/lib/packaging/retrieve_spec.rb
+- spec/lib/packaging_spec.rb