ndr_dev_support 7.3.4 → 7.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 326090ab3bd97631ff34098e27fd2ac5bda6c72bc90dc9674d7d33a2620c4674
-  data.tar.gz: da332e6b58df3db660c9a9f83f7749126401476199870048abe87b42fe8d3460
+  metadata.gz: 589fcf9c03c62ecbeecffbfe9020e87a7a1d5deec59506eef8129592504ae1c7
+  data.tar.gz: 8e99fb0d7c43f670c8684fdd11e570df00d69895e18f16194dd70a4f1afd6047
 SHA512:
-  metadata.gz: 7899387fcbac802148d2beb3359b9da669ba57fa2e76f26a48c1a90e0d1f4d4ec231a5d018a6d6d8ef3e39fc427e42f2cc86dc39ef2b1d14261efd2a66cfb503
-  data.tar.gz: c45075ad3d39dc1a708751d8fdee5395085b4ad0612cc3dfad2ecb85f2e4ee965ffb990cd88631729f716a53f4c688cff57676d504f55b6eec82da214da4507a
+  metadata.gz: 768b8c51a8653ce8866a322fcb2bcf7548bb42a4ce8d133b5e397f961bb143c0b8f2820eb9e5a67d211bb6304d125359ea8f210456604cc4d1d0e62374c50545
+  data.tar.gz: ff1eb7652b61497650afd78d9fb9bd0a8f366b6bcc972240f6c07f6e4529015e0fede07f4787eb965acd848348cbb966ddcd17c1566cc0fb57b9172cc10141f2

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 ## [Unreleased]
 *no unreleased changes*
 
+## 7.3.6 / 2026-01-13
+### Added
+* Support Rails 8.1, Ruby 4.0
+* capistrano: Support bundler 4 with capistrano 2
+
+## 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/bundler_deployment.rb

@@ -0,0 +1,100 @@
+# Support capistrano 2 with old (< 4) and new (>= 4) bundler versions
+#
+# Add "require 'ndr_dev_support/capistrano/ndr_model'" in your Capistrano deploy.rb,
+# but remove calls to "require 'bundler/capistrano'", and
+# Bundler will be activated after each new deployment.
+
+unless defined?(Bundler::Deployment)
+  # Redefine deployment helpers for Capistrano 2, previously defined in bundler < 4
+  # cf. https://blog.rubygems.org/2025/12/03/upgrade-to-rubygems-bundler-4.html
+  # Code copied from bundler 2 source files bundler/deployment.rb and bundler/capistrano.rb
+  # then modified to support bundler >= 2
+  # rubocop:disable Style/Documentation, Metrics/AbcSize, Metrics/MethodLength, Style/StringLiterals, Style/SymbolArray, Style/RaiseArgs, Layout/EmptyLineAfterGuardClause, Style/StringLiteralsInInterpolation, Style/Lambda
+  module Bundler
+    class Deployment
+      def self.define_task(context, task_method = :task, opts = {}) # rubocop:disable Metrics/CyclomaticComplexity
+        if defined?(Capistrano) && context.is_a?(Capistrano::Configuration)
+          context_name = "capistrano"
+          role_default = "{:except => {:no_release => true}}"
+          error_type = ::Capistrano::CommandError
+        else
+          context_name = "vlad"
+          role_default = "[:app]"
+          error_type = ::Rake::CommandFailedError
+        end
+
+        roles = context.fetch(:bundle_roles, false)
+        opts[:roles] = roles if roles
+
+        context.send :namespace, :bundle do
+          send :desc, <<-DESC
+            Install the current Bundler environment. By default, gems will be \
+            installed to the shared/bundle path. Gems in the development and \
+            test group will not be installed. The install command is executed \
+            with the --deployment and --quiet flags. If the bundle cmd cannot \
+            be found then you can override the bundle_cmd variable to specify \
+            which one it should use. The base path to the app is fetched from \
+            the :latest_release variable. Set it for custom deploy layouts.
+
+            You can override any of these defaults by setting the variables shown below.
+
+            N.B. bundle_roles must be defined before you require 'bundler/#{context_name}' \
+            in your deploy.rb file.
+
+              set :bundle_gemfile,  "Gemfile"
+              set :bundle_dir,      File.join(fetch(:shared_path), 'bundle')
+              set :bundle_flags,    "--deployment --quiet"
+              set :bundle_without,  [:development, :test]
+              set :bundle_with,     [:mysql]
+              set :bundle_cmd,      "bundle" # e.g. "/opt/ruby/bin/bundle"
+              set :bundle_roles,    #{role_default} # e.g. [:app, :batch]
+          DESC
+          send task_method, :install, opts do
+            bundle_cmd     = context.fetch(:bundle_cmd, "bundle")
+            bundle_flags   = context.fetch(:bundle_flags, "--deployment --quiet")
+            bundle_dir     = context.fetch(:bundle_dir, File.join(context.fetch(:shared_path), "bundle"))
+            bundle_gemfile = context.fetch(:bundle_gemfile, "Gemfile")
+            bundle_without = [*context.fetch(:bundle_without, [:development, :test])].compact
+            bundle_with    = [*context.fetch(:bundle_with, [])].compact
+            app_path = context.fetch(:latest_release)
+            if app_path.to_s.empty?
+              raise error_type.new("Cannot detect current release path - make sure you have deployed at least once.")
+            end
+            # Separate out flags that need to be sent to `bundle config` with Bundler 4
+            if bundle_flags.include?('--deployment')
+              bundle_flags = bundle_flags.split(/ /).grep_v('--deployment').join(' ')
+              config_settings = ['deployment true']
+            else
+              config_settings = []
+            end
+
+            args = ["--gemfile #{File.join(app_path, bundle_gemfile)}"]
+            config_settings << "path #{bundle_dir}" unless bundle_dir.to_s.empty?
+            args << bundle_flags.to_s
+            config_settings << "without #{bundle_without.join(" ")}" unless bundle_without.empty?
+            config_settings << "with #{bundle_with.join(" ")}" unless bundle_with.empty?
+
+            bundle_cmds = config_settings.collect do |settings|
+              "#{bundle_cmd} config set --local #{settings}"
+            end + ["#{bundle_cmd} install #{args.join(" ")}"]
+            run "cd #{app_path} && #{bundle_cmds.join(' && ')}"
+          end
+        end
+      end
+    end
+  end
+
+  # Capistrano task for Bundler.
+  require "capistrano/version"
+
+  if defined?(Capistrano::Version) && Gem::Version.new(Capistrano::Version).release >= Gem::Version.new("3.0")
+    raise "For Capistrano 3.x integration, please use https://github.com/capistrano/bundler"
+  end
+
+  Capistrano::Configuration.instance(:must_exist).load do
+    before "deploy:finalize_update", "bundle:install"
+    Bundler::Deployment.define_task(self, :task, except: { no_release: true })
+    set :rake, lambda { "#{fetch(:bundle_cmd, "bundle")} exec rake" }
+  end
+  # rubocop:enable Style/Documentation, Metrics/AbcSize, Metrics/MethodLength, Style/StringLiterals, Style/SymbolArray, Style/RaiseArgs, Layout/EmptyLineAfterGuardClause, Style/StringLiteralsInInterpolation, Style/Lambda
+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

@@ -2,8 +2,10 @@ require 'rainbow'
 
 # Discrete bits of functionality we use automatically:
 require_relative 'assets'
+require_relative 'bundler_deployment'
 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.6'
 end

data/ndr_dev_support.gemspec

@@ -44,7 +44,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'show_me_the_cookies'
 
   # CI server dependencies:
-  spec.add_dependency 'activesupport', '>= 6.1', '< 8.1'
+  spec.add_dependency 'activesupport', '>= 7.0', '< 8.2'
   spec.add_dependency 'brakeman', '>= 4.7.1'
   spec.add_dependency 'bundler-audit'
   spec.add_dependency 'github-linguist'

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ndr_dev_support
 version: !ruby/object:Gem::Version
-  version: 7.3.4
+  version: 7.3.6
 platform: ruby
 authors:
 - NCRS Development Team
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-09-26 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -212,20 +211,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
 - !ruby/object:Gem::Dependency
   name: brakeman
   requirement: !ruby/object:Gem::Requirement
@@ -409,8 +408,10 @@ files:
 - lib/minitest/rake_ci_plugin.rb
 - lib/ndr_dev_support.rb
 - lib/ndr_dev_support/capistrano/assets.rb
+- lib/ndr_dev_support/capistrano/bundler_deployment.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
@@ -472,7 +473,6 @@ homepage: https://github.com/NHSDigital/ndr_dev_support
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -487,8 +487,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: NDR Developer Support library
 test_files: []