ndr_dev_support 7.3.3 → 7.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 075d6598048f0b0288649a9ea1c071c33abb11481bdc93dbc7db4cf678ea033c
-  data.tar.gz: d95c2dc791de40932ccf0720b96e9f6ca252842dbe45cb1b02f6344d3a6bdd79
+  metadata.gz: 326090ab3bd97631ff34098e27fd2ac5bda6c72bc90dc9674d7d33a2620c4674
+  data.tar.gz: da332e6b58df3db660c9a9f83f7749126401476199870048abe87b42fe8d3460
 SHA512:
-  metadata.gz: 6772091bb99f0f1f70c4d36049789244bcf4f1e1e386510c3e9c603a32d43cbc1fbdb3b78a044e4c973623ce4a29601f4987a95a7b4bc7c884879988bc523845
-  data.tar.gz: 24fcca3b39d2adee7fc8964fd80a404ed60ed6b4a563a06a91ef40c6cae3f0cb4945e8be9f92539b73e16741214ad1500a944280a130baec4f7ebe3bd8d893f9
+  metadata.gz: 7899387fcbac802148d2beb3359b9da669ba57fa2e76f26a48c1a90e0d1f4d4ec231a5d018a6d6d8ef3e39fc427e42f2cc86dc39ef2b1d14261efd2a66cfb503
+  data.tar.gz: c45075ad3d39dc1a708751d8fdee5395085b4ad0612cc3dfad2ecb85f2e4ee965ffb990cd88631729f716a53f4c688cff57676d504f55b6eec82da214da4507a

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 ## [Unreleased]
 *no unreleased changes*
 
+## 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/ndr_model.rb

@@ -164,8 +164,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 +182,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.4'
 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.4
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-08-01 00:00:00.000000000 Z
+date: 2025-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry