ndr_dev_support 7.3.4 → 7.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 326090ab3bd97631ff34098e27fd2ac5bda6c72bc90dc9674d7d33a2620c4674
-  data.tar.gz: da332e6b58df3db660c9a9f83f7749126401476199870048abe87b42fe8d3460
+  metadata.gz: 5a9657d61fe9727e7023491944d7005896e9c4a41b47c5a79a017b6989a125a8
+  data.tar.gz: 8175fd01914592c8ea9dfdb364a02de49622ca56a7fe85626f07318f5cf7377f
 SHA512:
-  metadata.gz: 7899387fcbac802148d2beb3359b9da669ba57fa2e76f26a48c1a90e0d1f4d4ec231a5d018a6d6d8ef3e39fc427e42f2cc86dc39ef2b1d14261efd2a66cfb503
-  data.tar.gz: c45075ad3d39dc1a708751d8fdee5395085b4ad0612cc3dfad2ecb85f2e4ee965ffb990cd88631729f716a53f4c688cff57676d504f55b6eec82da214da4507a
+  metadata.gz: 44f9c9ba5543eee3b9b506026eacdaf5f3a9a6513dde51629e457e9de489cb87bad909661891bd0eeb179e4e95fbc6b88c222661fc9c4ecd2c9a278493b486b3
+  data.tar.gz: 274c6fe966a87ea07060aea1fef879b6c98d6644dfb7a740dfcdee417354379d77a31af5acfdfb0caff4b20ba144be13047126e80f04f7ca83b92ff1d417ab83

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 ## [Unreleased]
 *no unreleased changes*
 
+## 7.3.5 / 2025-10-16
+### Fixed
+* Capistrano: Do not include macOS extended attributes in tar files
+
 ## 7.3.4 / 2025-09-26
 ### Fixed
 * Capistrano: deploy:preinstall should fix up installed gem permissions

data/lib/ndr_dev_support/capistrano/macos_bsdtar.rb

@@ -0,0 +1,33 @@
+require 'capistrano/recipes/deploy/strategy/copy'
+
+# Do not include macOS extended attributes in capistrano tar files
+#
+# Without this, the system default tar (bsdtar) creates AppleDouble files with a
+# ._ prefix, and the linux default tar (gnutar) generates many warnings such as:
+# tar: Ignoring unknown extended header keyword 'LIBARCHIVE.xattr.com.apple.provenance'
+#
+# This fix works because we compress files only locally, for capistrano deployments.
+# If we were compressing files remotely too, we would instead need to selectively
+# redefine behaviour for local tar usage vs remote usage, e.g. by adding a
+# :copy_local_tar_options variable, similar to :copy_local_tar
+module CopyMacosTarSupport
+  private
+
+  def compress(directory, file)
+    if compression.compress_command[0] == 'tar' && local_tar_is_macos_bsdtar?
+      return macos_bsdtar_compress(directory, file)
+    end
+
+    super
+  end
+
+  def local_tar_is_macos_bsdtar?
+    RUBY_PLATFORM =~ /darwin/ && system('tar --version | grep -q ^bsdtar')
+  end
+
+  def macos_bsdtar_compress(directory, file)
+    compression.compress_command + [file, '--no-xattr', '--no-mac-metadata', directory]
+  end
+end
+
+Capistrano::Deploy::Strategy::Copy.prepend(CopyMacosTarSupport)

data/lib/ndr_dev_support/capistrano/ndr_model.rb

@@ -4,6 +4,7 @@ require 'rainbow'
 require_relative 'assets'
 require_relative 'deploy_secrets'
 require_relative 'install_ruby'
+require_relative 'macos_bsdtar'
 require_relative 'preinstall'
 require_relative 'restart'
 require_relative 'revision_logger'

data/lib/ndr_dev_support/version.rb

@@ -2,5 +2,5 @@
 # This defines the NdrDevSupport version. If you change it, rebuild and commit the gem.
 # Use "rake build" to build the gem, see rake -T for all bundler rake tasks (and our own).
 module NdrDevSupport
-  VERSION = '7.3.4'
+  VERSION = '7.3.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_dev_support
 version: !ruby/object:Gem::Version
-  version: 7.3.4
+  version: 7.3.5
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-09-26 00:00:00.000000000 Z
+date: 2025-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -411,6 +411,7 @@ files:
 - lib/ndr_dev_support/capistrano/assets.rb
 - lib/ndr_dev_support/capistrano/deploy_secrets.rb
 - lib/ndr_dev_support/capistrano/install_ruby.rb
+- lib/ndr_dev_support/capistrano/macos_bsdtar.rb
 - lib/ndr_dev_support/capistrano/ndr_model.rb
 - lib/ndr_dev_support/capistrano/preinstall.rb
 - lib/ndr_dev_support/capistrano/restart.rb
@@ -487,7 +488,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: NDR Developer Support library