ndr_dev_support 7.2.4 → 7.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e5760933886f19bcab8185f70ff16ff54d49b86ad1f71a877d96c76e04525ed
-  data.tar.gz: c323d25d9fed68097242f6e3888c8eb1637bde1b6ec59e0c118667f88b33430e
+  metadata.gz: c06a8a245b57d89e1b5696c4c6594c5aabb1aef5d44acf9a603289ec59aa06ad
+  data.tar.gz: 69d2c65b9b2e15d61a93838461f67db0ae96408471cdca4c3babda50cdd9a9b0
 SHA512:
-  metadata.gz: 494704abc8b128a67f258695a8e2364de7700f98757eb351c2d68cde3543348eeb20d8defcc05f67d865b0fcb39c828f49a0cdb825e5f958a871d8618fbbda71
-  data.tar.gz: 0defdea96cdd6ba105a5527bd403847ff7ab9196543aac1ea4ed6279928b7c8527c164ee18fd4b8e287926490e75fb9e2e816d50b8e42995d8b9f584e9c95ae9
+  metadata.gz: b1df7d973de876c9f649680ab5743a046a5f429205e2ea90ec9e69b71c400ef62907338ab19c0d63e3fb5898d3672cefe1b5548dfa4cefebf276a3ebdbef8ac1
+  data.tar.gz: 99119b43fee9c4968ef4401075db0f62b2823572909288939ab7122cbef9e34bc3d898475371138d53e5485c35b338e8e806b1c4cffe602be5df47086e640ae3

data/CHANGELOG.md

@@ -1,8 +1,17 @@
 ## [Unreleased]
 *no unreleased changes*
 
+## 7.2.5 / 2024-10-24
+### Changed
+* Capistrano: fix up installed gem permissions after deployment.
+* Capistrano: identify errors when installing out-of-bundle gems.
+* Allow either hash `EnforcedShorthandSyntax` style
+
+### Added
+* `deploy:setup` creates more of the "NDR model" shared directories
+
 ## 7.2.4 / 2024-05-01
-## Changed
+### Changed
 * Change default browser for integration tests to new headless Chrome
 * Support old chrome headless driver
 * Reduce the number of releases kept on application servers

data/config/rubocop/ndr.yml

@@ -145,3 +145,5 @@ Rails/SkipsModelValidations:
   # avoiding them is not helpful/practical.
   Enabled: false
 
+Style/HashSyntax:
+  EnforcedShorthandSyntax: either

data/lib/ndr_dev_support/capistrano/ndr_model.rb

@@ -71,9 +71,15 @@ Capistrano::Configuration.instance(:must_exist).load do
 
       fetch(:shared_paths, []).each do |path|
         full_path = File.join(shared_path, path)
+        parent_dir = File.dirname(full_path)
+
+        if /^n$/ =~ capture("test -e #{parent_dir} && echo 'y' || echo 'n'")
+          run "mkdir -p #{parent_dir}"
+          logger.info "Created shared '#{parent_dir}'"
+        end
 
         if /^n$/ =~ capture("test -e #{full_path} && echo 'y' || echo 'n'")
-          warn Rainbow("Warning: shared '#{path}' is not yet present!").red
+          logger.important "Warning: shared '#{path}' is not yet present!"
         end
       end
     end
@@ -147,6 +153,18 @@ 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
+
+      # Make the shared/bundle/ directory writeable by deployers:
+      # 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
+      run "find #{File.join(shared_path, 'bundle')} -group #{fetch(:user)} -print0 |xargs -r0 chgrp -h deployer"
+      # Set group sticky and group / world bits on directories created by this user
+      run "find #{File.join(shared_path, 'bundle')} -user #{fetch(:user)} -type d " \
+          '-not -perm -2075 -print0 |xargs -r0 chmod g+rwxs,o+rx'
+      # Add group writeable and readable and world readable bits to all files created by this user
+      run "find #{File.join(shared_path, 'bundle')} -user #{fetch(:user)} -type f " \
+          '-not -perm -0064 -print0 |xargs -r0 chmod g+rw,o+r'
     end
 
     after 'deploy:finalize_update', 'ndr_dev_support:filesystem_tweaks'

data/lib/ndr_dev_support/capistrano/standalone_gems.rb

@@ -21,15 +21,18 @@ Capistrano::Configuration.instance(:must_exist).load do
           'gem install'
         end
 
+      # TODO: Add `gem install bundler`, move this to before bundle:install instead of after
+
       # Extract the current version requirements for each of the gems from the lockfile,
       # and then check they're installed. If not, install them from the vendored cache.
       run <<~CMD if gem_list.any?
+        set -e;
         export RBENV_VERSION=`cat "#{latest_release}/.ruby-version"`;
         cat "#{latest_release}/Gemfile.lock" | egrep "^    (#{gem_list.join('|')}) " | tr -d '()' | \
         while read gem ver; do
           gem list -i "$gem" --version "$ver" > /dev/null || \
           #{gem_install} "#{latest_release}/vendor/cache/$gem-$ver.gem" \
-            --ignore-dependencies --conservative --no-document;
+            --ignore-dependencies --conservative --no-document --local;
         done
       CMD
     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.2.4'
+  VERSION = '7.2.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_dev_support
 version: !ruby/object:Gem::Version
-  version: 7.2.4
+  version: 7.2.5
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-01 00:00:00.000000000 Z
+date: 2024-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -470,7 +470,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.3.27
 signing_key:
 specification_version: 4
 summary: NDR Developer Support library