ndr_dev_support 7.3.3 → 7.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 075d6598048f0b0288649a9ea1c071c33abb11481bdc93dbc7db4cf678ea033c
-  data.tar.gz: d95c2dc791de40932ccf0720b96e9f6ca252842dbe45cb1b02f6344d3a6bdd79
+  metadata.gz: 5a9657d61fe9727e7023491944d7005896e9c4a41b47c5a79a017b6989a125a8
+  data.tar.gz: 8175fd01914592c8ea9dfdb364a02de49622ca56a7fe85626f07318f5cf7377f
 SHA512:
-  metadata.gz: 6772091bb99f0f1f70c4d36049789244bcf4f1e1e386510c3e9c603a32d43cbc1fbdb3b78a044e4c973623ce4a29601f4987a95a7b4bc7c884879988bc523845
-  data.tar.gz: 24fcca3b39d2adee7fc8964fd80a404ed60ed6b4a563a06a91ef40c6cae3f0cb4945e8be9f92539b73e16741214ad1500a944280a130baec4f7ebe3bd8d893f9
+  metadata.gz: 44f9c9ba5543eee3b9b506026eacdaf5f3a9a6513dde51629e457e9de489cb87bad909661891bd0eeb179e4e95fbc6b88c222661fc9c4ecd2c9a278493b486b3
+  data.tar.gz: 274c6fe966a87ea07060aea1fef879b6c98d6644dfb7a740dfcdee417354379d77a31af5acfdfb0caff4b20ba144be13047126e80f04f7ca83b92ff1d417ab83

data/CHANGELOG.md

@@ -1,6 +1,18 @@
 ## [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
+* Support Ruby 3.4
+
+### Added
+* Capistrano: cleanup bundled gems for old ruby versions.
+
 ## 7.3.3 / 2025-07-31
 ### Fixed
 * Update rubocop version dependency

data/lib/ndr_dev_support/capistrano/install_ruby.rb

@@ -97,7 +97,29 @@ Capistrano::Configuration.instance(:must_exist).load do
         fi
       SHELL
     end
+
+    desc <<~DESC
+      Cleanup bundled gems for old ruby versions.
+
+      Deletes shared bundle files that no longer match any installed releases.
+
+      This interacts reasonably with deploy:preinstall:
+      When deploy:preinstall installs new .rbenv and new shared bundled gems, this
+      will not delete them. If an older ruby version is then deployed, this removes
+      the new version's installed bundle, but leaves the .rbenv installation.
+    DESC
+    task :cleanup_unused_bundles do
+      # For ruby X.Y.Z, bundled gems are in .../shared/bundle/ruby/X.Y.0
+      # Generates e.g.
+      # find_options="-not ( -name DUMMY -or -name 3.1.0 -or -name 3.2.0 )"
+      # and then removes e.g. shared/bundle/ruby/3.0.0
+      run "find_options=\"-not ( -name DUMMY `grep -ho '^[0-9]*[.][0-9]*' " \
+          "#{releases_path}/*/.ruby-version | sed -e 's/.*/-or -name &.0/'` ) \"; " \
+          "find #{File.join(shared_path, 'bundle/ruby/*')} -maxdepth 0 $find_options " \
+          "-exec echo rm -rf '{}' ';' -exec rm -rf '{}' ';'"
+    end
   end
 
   before 'bundle:install', 'ndr_dev_support:install_ruby'
+  after 'deploy:finalize_update', 'ndr_dev_support:cleanup_unused_bundles'
 end

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'
@@ -164,8 +165,12 @@ Capistrano::Configuration.instance(:must_exist).load do
         # already there:
         run "rm -rf #{File.join(release_path, path)} && ln -s #{File.join(shared_path, path)} #{File.join(release_path, path)}"
       end
+    end
+
+    after 'deploy:finalize_update', 'ndr_dev_support:filesystem_tweaks'
 
-      # Make the shared/bundle/ directory writeable by deployers:
+    desc 'Make the shared/bundle/ directory writeable by deployers'
+    task :bundle_permissions do
       # We already set group permissions correctly in the bundle directory, but some gem installs
       # ignore these permissions, so we need to fix them up.
       # Set deployer group for everything created by this user
@@ -178,7 +183,8 @@ Capistrano::Configuration.instance(:must_exist).load do
           '-not -perm -0064 -print0 |xargs -r0 chmod g+rw,o+r'
     end
 
-    after 'deploy:finalize_update', 'ndr_dev_support:filesystem_tweaks'
+    # Ensure we have fixed the bundle permissions before potentially aborting
+    before 'ndr_dev_support:check_preinstall', 'ndr_dev_support:bundle_permissions'
   end
 end
 

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.3'
+  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.3
+  version: 7.3.5
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-08-01 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