ndr_dev_support 7.3.2 → 7.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb40a54108485d9f25a6cc88323fb474f6fd1b7ba7af787939dc8270bf7ceaf2
-  data.tar.gz: 8120053e06f2443829e917fda979987e9b09e8c568e75781876b338dbfa53ebb
+  metadata.gz: 326090ab3bd97631ff34098e27fd2ac5bda6c72bc90dc9674d7d33a2620c4674
+  data.tar.gz: da332e6b58df3db660c9a9f83f7749126401476199870048abe87b42fe8d3460
 SHA512:
-  metadata.gz: 8685d5ff16b7c3ba001490bc5897647266bef21cfa94b80eaff77678953052afa9b04c4cbedd2fa5ae7652f7fcd5d08ef0f15f12107527608a5d5c601cfdcb9c
-  data.tar.gz: 7c9c95bb049feccf7516c49bc4e2240d43e5aadc8596cbda484163e5fa25f8e4902fd8176c38b9f1be2bee1b3776307701eb369fa0b4b0f0dfdeb189fb1cf0d5
+  metadata.gz: 7899387fcbac802148d2beb3359b9da669ba57fa2e76f26a48c1a90e0d1f4d4ec231a5d018a6d6d8ef3e39fc427e42f2cc86dc39ef2b1d14261efd2a66cfb503
+  data.tar.gz: c45075ad3d39dc1a708751d8fdee5395085b4ad0612cc3dfad2ecb85f2e4ee965ffb990cd88631729f716a53f4c688cff57676d504f55b6eec82da214da4507a

data/CHANGELOG.md

@@ -1,6 +1,22 @@
 ## [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
+* rake bundle:update should package gems for all platforms
+
+## Changed
+* Drop support for Ruby 3.0
+
 ## 7.3.2 / 2025-05-01
 ### Fixed
 * Capistrano: Add missing `tmpdir` requirement to deploy application secrets

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.2'
+  VERSION = '7.3.4'
 end

data/lib/tasks/audit_bundle.rake

@@ -138,11 +138,12 @@ namespace :bundle do
     end
 
     # Retrieve binary gems for platforms listed in Gemfile.lock
-    platforms = `bundle platform`.split("\n").grep(/^[*] x86_64-/).collect { |s| s[2..] }
     Dir.chdir('vendor/cache') do
+      platforms = `bundle platform`.split("\n").grep(/^[*] x86_64-/).collect { |s| s[2..] }
       platforms.each do |platform|
         system("gem fetch #{gem} --version=#{new_gem_version2} --platform=#{platform}")
       end
+      system('bundle package --all-platforms')
     end if Dir.exist?('vendor/cache')
 
     if gem == 'webpacker'
@@ -206,7 +207,7 @@ namespace :bundle do
 
       $ ( git rm #{files_to_git_rm.join(' ')}
           git add #{files_to_git_add.join(' ')}
-          git commit -m '# Bump #{gem} to #{new_gem_version2}'
+          git commit -m 'Bump #{gem} to #{new_gem_version2}'
         )
     MSG
   end

data/ndr_dev_support.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 3.0'
+  spec.required_ruby_version = '>= 3.1'
 
   spec.add_dependency 'pry'
 
@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   # Rubocop dependencies:
   spec.add_dependency 'parser'
   spec.add_dependency 'rainbow'
-  spec.add_dependency 'rubocop', '~> 1.7'
+  spec.add_dependency 'rubocop', '~> 1.72'
   spec.add_dependency 'rubocop-rails', '~> 2.9'
   spec.add_dependency 'rubocop-rake', '~> 0.5'
   spec.add_dependency 'unicode-display_width', '>= 1.3.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_dev_support
 version: !ruby/object:Gem::Version
-  version: 7.3.2
+  version: 7.3.4
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-05-01 00:00:00.000000000 Z
+date: 2025-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.72'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.72'
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
@@ -480,7 +480,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="