ndr_dev_support 6.0.0 → 6.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d2619e04b75d121a98f4b49e15bcb35152b7bae2ff03586ac2eb9609c9a2008
-  data.tar.gz: c6cfff26810411f1744c40ee9496c4dc3ced957521a5b983a43d294748bdddd3
+  metadata.gz: 0ddf993378e5cd98d65313341b0af15677fb8934c42eebb91875d49b66b1ff27
+  data.tar.gz: fceda29b2a92b42b2d480926e9079c6f0f7cf2cfb42c6d7c1263fc58308a7bc1
 SHA512:
-  metadata.gz: 8fa1e81dcdebb916400971a58eae24f940a91962c571fbebfbf37d0ec7e8caaf9f66f8052d58b73ece5302b80c36c4b1037daeee48f645bf44d39241d3b07cf0
-  data.tar.gz: 7d5ebe7e388660c72e1cde750b0e44be824cb26b2261d885de258f663c1b86fefd475263bc5580aee7498f460374d6053595080ecddfc611b3292ea5c42d0c0d
+  metadata.gz: 22b80f92debe98a7092b9b7a1322792142e459e33b8d2cdc7dbaecbcbd3f4e8fa1757eeb033c0d1c98b36c5f2411130b6f7aa7a6c4a4ec13f06bf20436746290
+  data.tar.gz: be6721ab8d9ea0e37035cd593748f6d15ce7f958cf5fe5e934c13db2c9a8b61c7dbc751c1b217b47f18c9b3950272496af013190fd7e81f752367839d1b9af55

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 ## [Unreleased]
-*no unreleased changes*
+* no unreleased changes
+
+## 6.0.3 / 2022-03-14
+### Added
+* Add `bundle:update` rake task to update bundled gem files
+
+## 6.0.2 / 2022-01-14
+### Fixed
+* Support Rails 7, Ruby 3.1
+
+## 6.0.1 / 2021-07-09
+### Fixed
+* Fix ruby warnings in CI plugin
+* Remove inconsistent trailing whitespace in code_safety.yml
 
 ## 6.0.0 / 2021-02-25
 ### Changed

data/code_safety.yml

@@ -1,339 +1,347 @@
 ---
 file safety:
   ".github/CODEOWNERS":
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: ae4a81930ad3ab1b858474bc73b714aeed0f83a8
   ".github/workflows/lint.yml":
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 0ce43640c417e174054f903fd82043948ebe8ccb
   ".github/workflows/test.yml":
-    comments: 
-    reviewed_by: joshpencheon
-    safe_revision: 366ef1122fa4502c25cba9e508c565989545ef25
+    comments:
+    reviewed_by: brian.shand
+    safe_revision: 65d59fe9bba9dc7d404f92b54a115b14e6697af9
   ".gitignore":
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 38266fd047417ecb4d5e6de71746f40495fc9de9
   ".hound.yml":
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: c03d4ff0dd037a2798563d464d0daeca1189debe
   ".rubocop.yml":
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 6211cff0ce44645ed3752723b5b0ee65f24c66aa
   CHANGELOG.md:
-    comments: 
-    reviewed_by: joshpencheon
-    safe_revision: 0edd51580039e7ebf99ce629d26c8d61656dfc5f
+    comments:
+    reviewed_by: brian.shand
+    safe_revision: 5943e1a2ef7095e44858806ad16713cffc67c31b
   CODE_OF_CONDUCT.md:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: c59a45986f8b6d087c8c21b1e889f31f7346da17
   Gemfile:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: c59a45986f8b6d087c8c21b1e889f31f7346da17
   LICENSE.txt:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: c59a45986f8b6d087c8c21b1e889f31f7346da17
   README.md:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: a18f35895baebb1b0971043b3b3f666bb4eb9b5c
   Rakefile:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: a601dbd139132f50eb22b1c88d5eda14a465a7c2
   bin/console:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 3377bef3131bbe58acaa82083fcb27c9c6d1e2b0
   bin/setup:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: c59a45986f8b6d087c8c21b1e889f31f7346da17
   config/rubocop/ndr.yml:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 05476acacadfa0ad7404f3c37cf3c17c4e0ba11b
   gemfiles/Gemfile.rails52:
-    comments: 
+    comments:
     reviewed_by: joshpencheon
     safe_revision: f25001ef74c44ab727eef5cb29cef9a54525d36f
   gemfiles/Gemfile.rails60:
-    comments: 
+    comments:
     reviewed_by: joshpencheon
     safe_revision: f25001ef74c44ab727eef5cb29cef9a54525d36f
   gemfiles/Gemfile.rails61:
-    comments: 
+    comments:
     reviewed_by: joshpencheon
     safe_revision: f25001ef74c44ab727eef5cb29cef9a54525d36f
+  gemfiles/Gemfile.rails70:
+    comments:
+    reviewed_by: brian.shand
+    safe_revision: 65d59fe9bba9dc7d404f92b54a115b14e6697af9
   lib/minitest/rake_ci.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 26efe45f35f211e7cb7a04967c51c0b6d116321e
   lib/minitest/rake_ci_plugin.rb:
-    comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 958ef09c5cf50bb50348e6bff949e3e5989254f9
+    comments:
+    reviewed_by: brian.shand
+    safe_revision: 5cb6964bee8c7a7856193232f6b06653235a8309
   lib/ndr_dev_support.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 6211cff0ce44645ed3752723b5b0ee65f24c66aa
   lib/ndr_dev_support/capistrano/assets.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 74a4cd909afaf2ee8bcabdd252b2383b1474b6d4
   lib/ndr_dev_support/capistrano/ndr_model.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 57271c07e44808d8809e1fa11227a8c2e91a14bf
   lib/ndr_dev_support/capistrano/restart.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: a2b7c20eb58572c213f77677b36aa2f7e6db747e
   lib/ndr_dev_support/capistrano/revision_logger.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: a2b7c20eb58572c213f77677b36aa2f7e6db747e
   lib/ndr_dev_support/capistrano/ruby_version.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: a2b7c20eb58572c213f77677b36aa2f7e6db747e
   lib/ndr_dev_support/capistrano/standalone_gems.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: eec7079a777c84f61b05c236df60195d4ddcf488
   lib/ndr_dev_support/capistrano/svn_cache.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 2baa360b06290775a961a7573fe08edd18f8312e
   lib/ndr_dev_support/capistrano/sysadmin_scripts.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: a2b7c20eb58572c213f77677b36aa2f7e6db747e
   lib/ndr_dev_support/daemon/ci_server.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 3fdf010a91bd9927ef34e3df66b8a4bbbd20315a
   lib/ndr_dev_support/daemon/stoppable.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 07ba05e9dd59eeac187b5fe730ee653baa1a2732
   lib/ndr_dev_support/integration_testing.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 5b427cb12907bc87e5e0cb754dcaa524fdbfb1b9
   lib/ndr_dev_support/integration_testing/drivers/chrome.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: f1a32b1f2d1851b87a883dbf8620aa0e921e436c
   lib/ndr_dev_support/integration_testing/drivers/chrome_headless.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: '0409b687d31202b2a4281ebfb7b0c330cc78d904'
   lib/ndr_dev_support/integration_testing/drivers/firefox.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: f1a32b1f2d1851b87a883dbf8620aa0e921e436c
   lib/ndr_dev_support/integration_testing/drivers/poltergeist.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: f1a32b1f2d1851b87a883dbf8620aa0e921e436c
   lib/ndr_dev_support/integration_testing/drivers/switchable.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: e9b74559d28e7520c0376d1bec4a2566aae14b05
   lib/ndr_dev_support/integration_testing/dsl.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: f1a32b1f2d1851b87a883dbf8620aa0e921e436c
   lib/ndr_dev_support/integration_testing/flakey_tests.rb:
-    comments: 
+    comments:
     reviewed_by: joshpencheon
     safe_revision: 9fc4527cbc132218533cec8d696bd2aadd4a2291
   lib/ndr_dev_support/rake_ci/brakeman_helper.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 053c9834ca5d402a1f8dc8d09257dc7075a5ec06
   lib/ndr_dev_support/rake_ci/commit_cop.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: '01682912c2fc526b0bc29e2836de0aea31c65b12'
   lib/ndr_dev_support/rake_ci/commit_cop/concerns/deputisable.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: a3f5b7d3709f7e340f2f7e81dab026a63b21e3ff
   lib/ndr_dev_support/rake_ci/commit_cop/migration_without_structure_dump.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: a3f5b7d3709f7e340f2f7e81dab026a63b21e3ff
   lib/ndr_dev_support/rake_ci/commit_cop/missing_associated_test_file.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: '01682912c2fc526b0bc29e2836de0aea31c65b12'
   lib/ndr_dev_support/rake_ci/commit_cop/modified_migration.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: a3f5b7d3709f7e340f2f7e81dab026a63b21e3ff
   lib/ndr_dev_support/rake_ci/commit_cop/renamed_migration.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: a3f5b7d3709f7e340f2f7e81dab026a63b21e3ff
   lib/ndr_dev_support/rake_ci/concerns/commit_metadata_persistable.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: fd9fc5dd275a2285549984688d1d3744a628fd73
   lib/ndr_dev_support/rake_ci/redmine/ticket_resolver.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 788b8fc31952a6fb640101df96a370b21d269249
   lib/ndr_dev_support/rake_ci/simple_cov_helper.rb:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: 678403f777614189ab89aafa1cb1eafbcf48763c
   lib/ndr_dev_support/rubocop/executor.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 1d8a97dc5dd2e58bfd689d5e2c94e077a4ca0649
   lib/ndr_dev_support/rubocop/inject.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 1d8a97dc5dd2e58bfd689d5e2c94e077a4ca0649
   lib/ndr_dev_support/rubocop/range_augmenter.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 136936265a5b79f0eca1bc7e58c607a2492e57a5
   lib/ndr_dev_support/rubocop/range_finder.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 1d8a97dc5dd2e58bfd689d5e2c94e077a4ca0649
   lib/ndr_dev_support/rubocop/reporter.rb:
-    comments: 
+    comments:
     reviewed_by: joshpencheon
     safe_revision: 0c1489e51848d8e7a0903128ea934064c0ab254e
   lib/ndr_dev_support/slack_message_publisher.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: ad38e92c6e56b9d81fdab10681d8f2924eeadf5a
   lib/ndr_dev_support/tasks.rb:
-    comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 2154aa7f32e731933ff6091b8f42b2b014028a6a
+    comments:
+    reviewed_by: brian.shand
+    safe_revision: 93f9ed210c6a19eee4884ea8a906067c65ee67f6
   lib/ndr_dev_support/version.rb:
-    comments: 
-    reviewed_by: joshpencheon
-    safe_revision: 0edd51580039e7ebf99ce629d26c8d61656dfc5f
+    comments:
+    reviewed_by: brian.shand
+    safe_revision: 5943e1a2ef7095e44858806ad16713cffc67c31b
+  lib/tasks/audit_bundle.rake:
+    comments:
+    reviewed_by: brian.shand
+    safe_revision: 93f9ed210c6a19eee4884ea8a906067c65ee67f6
   lib/tasks/audit_code.rake:
     comments: Identical to the version reviewed by josh.pencheon when contained within
       ndr_support
-    reviewed_by: josh.pencheon
-    safe_revision: cc586e0bcb9b636a4aab19198dfc99171ef49f50
+    reviewed_by: brian.shand
+    safe_revision: 0d1c9d3e7192ad9e6c979d8d772ca49fc91f93cb
   lib/tasks/ci/brakeman.rake:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: fe7dfc7f1775e8b85ae6968e8f475b9e930addf7
   lib/tasks/ci/bundle_audit.rake:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: ddcf7de0bf1f5fb17cc28e2460009e162ff8917c
   lib/tasks/ci/commit_cop.rake:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: a3f5b7d3709f7e340f2f7e81dab026a63b21e3ff
   lib/tasks/ci/dependencies.rake:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 2f22aa6cc2f86b84e0bf2247e73bed205930db5a
   lib/tasks/ci/housekeep.rake:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: 3dfcdb6c76fbccc44a331986673d63282f87f2fa
   lib/tasks/ci/linguist.rake:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: 00cd6c2f71612a467ee88ad53c21e08f073871d5
   lib/tasks/ci/minitest.rake:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 12aad1254186ee9ce0fde263bf8dccf46cdfebe2
   lib/tasks/ci/notes.rake:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: f828113894a16581d0aa181504c799e661f8401d
   lib/tasks/ci/prometheus.rake:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 2d1b9d19acafebe6ca5f995bf15243abe2847eec
   lib/tasks/ci/redmine.rake:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 12aad1254186ee9ce0fde263bf8dccf46cdfebe2
   lib/tasks/ci/rugged.rake:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 15543b915771dfe2ed81b8b326bdd3ab2cb5b562
   lib/tasks/ci/server.rake:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: fe8682a3300a322c5f6b9a17dce471f11fa5e307
   lib/tasks/ci/simplecov.rake:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 6240a84dc859af0623328f8667b93299c8eae257
   lib/tasks/ci/slack.rake:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 6cb22447594ebf450fc60deb90fd223c8067ff18
   lib/tasks/ci/stats.rake:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 137be2205f283d444286c47502387487bb1b7015
   lib/tasks/rubocop.rake:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 9f33cc3f6fed0c24cb215befa1beaa4bc03e81ef
   ndr_dev_support.gemspec:
-    comments: 
-    reviewed_by: joshpencheon
-    safe_revision: 9fc4527cbc132218533cec8d696bd2aadd4a2291
+    comments:
+    reviewed_by: brian.shand
+    safe_revision: 65d59fe9bba9dc7d404f92b54a115b14e6697af9
   test/daemon/ci_server_test.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: cdd176f2e90284e11899c5c6eea1032f9b785b74
   test/integration_testing/flakey_tests_test.rb:
-    comments: 
+    comments:
     reviewed_by: joshpencheon
     safe_revision: 9fc4527cbc132218533cec8d696bd2aadd4a2291
   test/ndr_dev_support_test.rb:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: 26a8907a7a8a6b0d836aa12ca0335fa40be12240
   test/rake_ci/commit_cop/migration_without_structure_dump_test.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: a3f5b7d3709f7e340f2f7e81dab026a63b21e3ff
   test/rake_ci/commit_cop/missing_associated_test_file_test.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: '01682912c2fc526b0bc29e2836de0aea31c65b12'
   test/rake_ci/commit_cop/modified_migration_test.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: a3f5b7d3709f7e340f2f7e81dab026a63b21e3ff
   test/rake_ci/commit_cop/renamed_migration_test.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: a3f5b7d3709f7e340f2f7e81dab026a63b21e3ff
   test/rake_ci/redmine/ticket_resolver_test.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 12aad1254186ee9ce0fde263bf8dccf46cdfebe2
   test/test_helper.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: cdd176f2e90284e11899c5c6eea1032f9b785b74

data/gemfiles/Gemfile.rails70

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec path: '..'
+
+gem 'activesupport', '~> 7.0.0'

data/lib/minitest/rake_ci_plugin.rb

@@ -57,7 +57,7 @@ module Minitest
       save_current_commit_data(hash)
     end
 
-    def commit
+    redefine_method :commit do
       return @commit if @commit
 
       repo = Rugged::Repository.new('.')

data/lib/ndr_dev_support/tasks.rb

@@ -1,4 +1,5 @@
 load 'tasks/audit_code.rake'
+load 'tasks/audit_bundle.rake'
 load 'tasks/ci/brakeman.rake'
 load 'tasks/ci/bundle_audit.rake'
 load 'tasks/ci/commit_cop.rake'

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 = '6.0.0'.freeze
+  VERSION = '6.0.3'
 end

data/lib/tasks/audit_bundle.rake

@@ -0,0 +1,170 @@
+# A rake task to update the bundled version of a gem
+
+# Assumes constant SAFETY_FILE and function repository_type are defined in another rake task.
+
+namespace :bundle do
+  desc <<~USAGE
+    Update to a later version of a gem interactively.
+
+    Usage: bundle:update gem=rails [version=6.0.4.7]
+
+    Updates the bundled gem (e.g. rails) version to e.g. 6.0.4.7
+    and provides instructions for committing changes.
+    It will attempt to modify a hardcoded version in the Gemfile if necessary.
+  USAGE
+  task(:update) do
+    unless %w[git git-svn].include?(repository_type)
+      warn 'Error: Requires a git working copy. Aborting.'
+      exit 1
+    end
+
+    gem = ENV['gem']
+    if gem.blank? || gem !~ /\A[a-zA-Z0-9_.-]+\z/
+      warn "Error: missing or invalid required 'gem' parameter. Aborting.\n\n"
+      system('rake -D bundle:update')
+      exit 1
+    end
+
+    gem_list = Bundler.with_unbundled_env { `bundle exec gem list ^#{gem}$` }
+    # Needs to match e.g. "nokogiri (1.12.5 x86_64-darwin)"
+    old_gem_version = gem_list.match(/ \(([0-9.]+)( [a-z0-9_-]*)?\)$/).to_a&.second
+    unless old_gem_version
+      warn <<~MSG.chomp
+        Cannot determine gem version for gem=#{gem}. Aborting. Output from bundle exec gem list:
+        #{gem_list}
+      MSG
+      exit 1
+    end
+    puts "Old #{gem} version from bundle: #{old_gem_version}"
+
+    new_gem_version = ENV['version'].presence
+    if new_gem_version && new_gem_version !~ /\A[0-9.a-zA-Z-]+\z/
+      warn "Error: invalid 'version' parameter. Aborting.\n\n"
+      system('rake -D bundle:update')
+      exit 1
+    end
+
+    unless Bundler.with_unbundled_env { system('bundle check 2> /dev/null') }
+      warn('Error: bundle check fails before doing anything.')
+      warn('Please clean up the Gemfile before running this. Aborting.')
+      exit 1
+    end
+
+    if gem == 'rails'
+      # If updating Rails and using activemodel-caution, prompt to put
+      # activemodel-caution gem in place, unless it's already installed for this rails version.
+      activemodel_caution = Bundler.
+                            with_unbundled_env { `bundle exec gem list activemodel-caution` }.
+                            match?(/^activemodel-caution \([0-9.]+\)$/)
+      if activemodel_caution && new_gem_version
+        file_pattern = "activemodel-caution-#{new_gem_version}*.gem"
+        unless Dir.glob("vendor/cache/#{file_pattern}").any? ||
+               Bundler.with_unbundled_env do
+                 `gem list ^activemodel-caution$ -i -v #{new_gem_version}`
+               end.match?(/^true$/)
+          warn("Error: missing #{file_pattern} file in vendor/cache")
+          warn('Copy this file to vendor/cache, then run this command again.')
+          exit 1
+        end
+      end
+    end
+
+    related_gems = if gem == 'rails'
+                     gem_list2 = Bundler.with_unbundled_env do
+                       `bundle exec gem list`
+                     end
+                     gem_list2.split("\n").
+                       grep(/[ (]#{old_gem_version}(.0)*[,)]/).
+                       collect { |row| row.split.first }
+                   else
+                     [gem]
+                   end
+    puts "Gems to update: #{related_gems.join(' ')}"
+
+    if new_gem_version
+      puts 'Tweaking Gemfile for new gem version'
+      cmd = ['sed', '-i', '.bak', '-E']
+      related_gems.each do |rgem|
+        cmd += ['-e', "s/(gem '(#{rgem})', '(~> )?)#{old_gem_version}(')/\\1#{new_gem_version}\\4/"]
+      end
+      cmd += %w[Gemfile]
+      system(*cmd)
+      File.delete('Gemfile.bak')
+
+      system('git diff Gemfile')
+    end
+
+    cmd = "bundle update --conservative --minor #{related_gems.join(' ')}"
+    puts "Running: #{cmd}"
+    Bundler.with_unbundled_env do
+      system(cmd)
+    end
+
+    unless Bundler.with_unbundled_env { system('bundle check 2> /dev/null') }
+      warn <<~MSG
+        Error: bundle check fails after trying to update Rails version. Aborting.
+        You will need to check your working copy, especially Gemfile, Gemfile.lock, vendor/cache
+      MSG
+      exit 1
+    end
+
+    if File.exist?(SAFETY_FILE)
+      # Remove references to unused files in code_safety.yml
+      system('rake audit:tidy_code_safety_file')
+    end
+
+    gem_list = Bundler.with_unbundled_env { `bundle exec gem list ^#{gem}$` }
+    new_gem_version2 = gem_list.match(/ \(([0-9.]+)( [a-z0-9_-]*)?\)$/).to_a&.second
+
+    if new_gem_version && new_gem_version != new_gem_version2
+      puts <<~MSG
+        Error: Tried to update gem #{gem} to version #{new_gem_version} but ended up at version #{new_gem_version2}. Aborting.
+        You will need to check your working copy, especially Gemfile, Gemfile.lock, vendor/cache
+        Try running:
+           bundle exec rake bundle:update gem=#{gem} version=#{new_gem_version2}
+      MSG
+      exit 1
+    end
+
+    # At this point, we have successfully updated all the local files.
+    # All that remains is to set up a branch, if necessary, and inform the user what to commit.
+
+    puts "Looking for changed files using git status\n\n"
+    files_to_git_rm = `git status vendor/cache/|grep 'deleted: ' | \
+                       grep -o ': .*' | sed -e 's/^: *//'`.split("\n")
+    files_to_git_add = `git status Gemfile Gemfile.lock code_safety.yml|grep 'modified: ' | \
+                        grep -o ': .*' | sed -e 's/^: *//'`.split("\n")
+    files_to_git_add += `git status vendor/cache|expand|grep '^\s*vendor/cache' | \
+                         sed -e 's/^ *//'`.split("\n")
+
+    if files_to_git_rm.empty? && files_to_git_add.empty?
+      puts <<~MSG
+        No changes were made. Please manually update the Gemfile, run
+          bundle update --conservative --minor #{related_gems.join(' ')}
+      MSG
+      puts '  rake audit:tidy_code_safety_file' if File.exist?(SAFETY_FILE)
+      puts <<~MSG
+        then run tests and git rm / git add any changes
+        including vendor/cache Gemfile Gemfile.lock code_safety.yml
+        then git commit
+      MSG
+      exit
+    end
+
+    if repository_type == 'git'
+      # Check out a fresh branch, if a git working copy (but not git-svn)
+      branch_name = "#{gem}_#{new_gem_version2.gsub('.', '_')}"
+      system('git', 'checkout', '-b', branch_name) # Create a new git branch
+    end
+
+    puts <<~MSG
+      Gemfile updated. Please use "git status" and "git diff" to check the local changes,
+      manually add any additional platform-specific gems required (e.g. for nokogiri),
+      re-run tests locally, then run the following to commit the changes:
+
+      $ git rm #{files_to_git_rm.join(' ')}
+      $ git add #{files_to_git_add.join(' ')}
+      $ git commit -m '# Bump #{gem} to #{new_gem_version2}'
+    MSG
+  end
+end

data/lib/tasks/audit_code.rake

@@ -30,8 +30,12 @@ def update_safety_file(file_safety)
   File.open(SAFETY_FILE, 'w') do |file|
     # Consistent file diffs, as ruby preserves Hash insertion order since v1.9
     list = {}
-    list['file safety'] = Hash[file_safety.sort]
-    YAML.dump(list, file) # Save changes before checking latest revisions
+    list['file safety'] = file_safety.sort.to_h
+    # Remove inconsistent whitespace which old libyaml version introduces at the ends of lines
+    # https://github.com/yaml/libyaml/issues/46
+    yaml = YAML.dump(list).gsub(/^( *[a-z_]*:) $/, '\1')
+    yaml = YAML.dump(list) unless YAML.safe_load(yaml) == list
+    file << yaml # Save changes before checking latest revisions
   end
 end
 

data/ndr_dev_support.gemspec

@@ -42,7 +42,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'webdrivers', '>= 3.9'
 
   # CI server dependencies:
-  spec.add_dependency 'activesupport', '< 7'
+  spec.add_dependency 'activesupport', '< 7.1'
   spec.add_dependency 'brakeman', '>= 4.7.1'
   spec.add_dependency 'bundler-audit'
   spec.add_dependency 'github-linguist'
@@ -56,5 +56,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'mocha'
-  spec.add_development_dependency 'rake', '~> 12.3', '>= 12.3.3'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_dev_support
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.3
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-25 00:00:00.000000000 Z
+date: 2022-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: brakeman
   requirement: !ruby/object:Gem::Requirement
@@ -378,9 +378,6 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 12.3.3
@@ -388,9 +385,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 12.3.3
@@ -416,6 +410,7 @@ files:
 - gemfiles/Gemfile.rails52
 - gemfiles/Gemfile.rails60
 - gemfiles/Gemfile.rails61
+- gemfiles/Gemfile.rails70
 - lib/minitest/rake_ci.rb
 - lib/minitest/rake_ci_plugin.rb
 - lib/ndr_dev_support.rb
@@ -455,6 +450,7 @@ files:
 - lib/ndr_dev_support/slack_message_publisher.rb
 - lib/ndr_dev_support/tasks.rb
 - lib/ndr_dev_support/version.rb
+- lib/tasks/audit_bundle.rake
 - lib/tasks/audit_code.rake
 - lib/tasks/ci/brakeman.rake
 - lib/tasks/ci/bundle_audit.rake
@@ -492,7 +488,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: NDR Developer Support library