packaging 0.109.2 → 0.109.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21fbe7adf35d302cad689b2f4ca536f499c6d805e33da1ec091c7b7dcd672ffc
-  data.tar.gz: dccc381590b0cec0ad69b413b2c9680c1d95fe6bbcd041073e179faae9693134
+  metadata.gz: 763f416372eab86acfcb1ce21c3f0cd519db708bdd34d6323c44fc5ff4ade8f9
+  data.tar.gz: 428db33628cbaddde9017048c067e224682b1c97c9235af05c8923e5983c3881
 SHA512:
-  metadata.gz: 81e93d2e4375be0ead7790a7cef9bb17e395b0e4ada9ee67926e5f422e24cfdc079cb5a51f3fc5bac87bccc1b6520cf09355eb99796be2df118ae352c8204daa
-  data.tar.gz: 5083b56f76a63f2c2e825a45ee87fdeac1ed2d19cd4adfa7046f8133339cd1212d0377878ca3dede7d984a3506c64b421b7aafb0c4ea71e16a890d79e2bab2a7
+  metadata.gz: 793b50af9892164876bd3b873d36c6bc797dea847501c2819993f0178df43835d611f55fbc61d557fa991e66d31c4d21fb2dcd2cfcc36a97e8a231015483ff1e
+  data.tar.gz: 877c87ed7fe102d2dfa1fc658a7d9952c1206678a92c7b915bbfcfdab982e8234f56ccba8e18a10e30e1b7945b3559d33ace6d713baf503ae2ff1bd0d5c53d18

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)

data/lib/packaging/sign/dmg.rb

@@ -32,6 +32,14 @@ module Pkg::Sign::Dmg
 
       dmg_basenames = dmgs.map { |d| File.basename(d, '.dmg') }.join(' ')
 
+      # (See: RE-15379) Refactor opportunity; we really shouldn't do this this way.
+      # When it works, it's fine, but diagnosing problems when we or Apple change
+      # the details is a pain. We should either have a script on the signing machine
+      # that does this work OR we should ship a script to the signing directory that
+      # can be modified/repeated when problems arise.
+      #
+      # Note especially, the '-size 200m' hack in the 'hdiutil create' command. This
+      # is useful but arbitrary at the moment and could cause problems in the future.
       sign_package_command = %W[
         for dmg in #{dmg_basenames}; do
           /usr/bin/hdiutil attach #{remote_working_directory}/$dmg.dmg
@@ -55,7 +63,7 @@ module Pkg::Sign::Dmg
 
           /usr/bin/hdiutil detach #{dmg_mount_point} -quiet ;
           /bin/rm #{remote_working_directory}/$dmg.dmg ;
-          /usr/bin/hdiutil create -volname $dmg
+          /usr/bin/hdiutil create -volname $dmg -size 200m
             -srcfolder #{signed_items_directory}/ #{remote_working_directory}/$dmg.dmg ;
           /bin/rm #{signed_items_directory}/* ;
         done

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.109.2
+  version: 0.109.4
 platform: ruby
 authors:
 - Puppet By Perforce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-08 00:00:00.000000000 Z
+date: 2023-03-20 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