ndr_dev_support 6.1.2 → 6.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a58e21dc2fa2f9a5fa7227b70cd0c6bdd769adb379df912c02e56675cea01b37
-  data.tar.gz: 1b8d2ed30881f8e810ec995f32fbbf1db1528e43a8d983f34f2dd0c0afbdc6ad
+  metadata.gz: 538f2514db4fc9b6227cbb94aa9d72521b7c0a36ee24e6a711e9bc1d369fbc57
+  data.tar.gz: 9f939ecd79212a0d8818d2c718d71b7f95e148bf86671c2c349d32f8e5675cb7
 SHA512:
-  metadata.gz: f81704490c03a2075c031c1e428259083404cff81c9fce8c051bb80744a94a8e4a3b066ce09f88ce69e5e9cc0870f389e29b11223401977e626da0b4b061bac3
-  data.tar.gz: 1cebef3b8ee8e41c38577b8639618300332cf77a87c937aa9e575c30d4305748143325f5f9a90674c921d6c6eb86fe5a5245fa7df8c61c97c22bcec96eff1172
+  metadata.gz: 6b13169c99faddabcce0a28bdafb78ca5c7c899e1affc263df976030dcfef3a991742aaab569e80ab763726c9d525cd1f792a45b8bf0daed91bae60e404a4aa9
+  data.tar.gz: df4d686cd9d8e2de66c6bdfc070a4221baff52c6fe5bf4ca064f9f94dd4ab30311848e15f5f955b82d1d3c16f0845ac07afbba93c6a4d4b77226b217928226ab

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 ## [Unreleased]
 * No unreleased changes
 
+## 6.1.3 / 2022-05-25
+### Fixed
+* bundle:update should update secondary gem lock files
+
 ## 6.1.2 / 2022-05-24
 ### Fixed
 * bundle:update should fetch binary gems for all bundled platforms

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.1.2'
+  VERSION = '6.1.3'
 end

data/lib/tasks/audit_bundle.rake

@@ -11,6 +11,10 @@ namespace :bundle do
     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.
+
+    If a secondary Gemfile is present in the same directory, e.g. Gemfile.monterey,
+    and it defines constants such as BUNDLER_OVERRIDE_PUMA=true, then this task
+    will attempt to update the secondary lock file, e.g. Gemfile.monterey.lock too.
   USAGE
   task(:update) do
     unless %w[git git-svn].include?(repository_type)
@@ -111,6 +115,28 @@ namespace :bundle do
     gem_list = Bundler.with_unbundled_env { `bundle exec gem list ^#{gem}$` }
     new_gem_version2 = gem_list.match(/ \(([0-9.]+)( [a-z0-9_-]*)?\)$/).to_a[1]
 
+    # Update secondary Gemfile.lock to keep vendored gems in sync
+    secondary_gemfiles = `git ls-tree --name-only HEAD Gemfile.*`.split("\n").grep_v(/[.]lock$/)
+    secondary_gemfiles.each do |secondary_gemfile|
+      gem_re = /^BUNDLER_OVERRIDE_([^ =]*) *=/
+      secondary_gems = File.readlines(secondary_gemfile).grep(gem_re).
+                       collect { |s| gem_re.match(s)[1].downcase }
+      if secondary_gems.empty?
+        puts "Warning: cannot update #{secondary_gemfile}.lock - no BUNDLER_OVERRIDE_... entries"
+        next
+      end
+      puts "Updating #{secondary_gemfile}.lock"
+      FileUtils.cp('Gemfile.lock', "#{secondary_gemfile}.lock")
+      Bundler.with_unbundled_env do
+        system("BUNDLE_GEMFILE=#{secondary_gemfile} bundle update --quiet \
+                --conservative --minor #{secondary_gems.join(' ')}")
+      end
+      system('git checkout -q vendor/cache/')
+      system('git clean -q -f vendor/cache')
+      Bundler.with_unbundled_env { system('bundle install --local --quiet 2> /dev/null') }
+      puts "Finished updating #{secondary_gemfile}.lock"
+    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
@@ -140,7 +166,9 @@ namespace :bundle do
     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 config/code_safety.yml| \
+    secondary_lockfiles = secondary_gemfiles.collect { |s| "#{s}.lock" }
+    files_to_git_add = `git status Gemfile Gemfile.lock #{secondary_gemfiles.join(' ')} \
+                          #{secondary_lockfiles.join(' ')} code_safety.yml config/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' | \

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_dev_support
 version: !ruby/object:Gem::Version
-  version: 6.1.2
+  version: 6.1.3
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-24 00:00:00.000000000 Z
+date: 2022-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry