ndr_dev_support 6.1.1 → 6.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35fef5ec91f5db4578a83b30f719011734cf4ee3cbb14ca9e99c30893e3f5e9f
-  data.tar.gz: 9480e1be5513b83c6213d54d2b8ef1e6ed13ca9d90162be41ad17af105df355c
+  metadata.gz: 665f148ac622b9f75c0150d8b1d6770aaeaaf5c9d1bb561c5a1d34a3f9b8bf2d
+  data.tar.gz: af2bd48cfef10426450978b40071f134d40af2524edec37cf380b5ffa820a409
 SHA512:
-  metadata.gz: 4db7ec6d1b673f3c10e11040c11e600ddadc2d8657a837d231bfa3216668ce8254479ed4af8f1d1b4024afa9f3252158546db499153d28098631629d06420b65
-  data.tar.gz: 4719a51ea6c3c7eb52e83a5e5c943813b0698e5d3d1ddabba01fd36b1ae7770858cd7c21c697279e8a7865f9965570eae7512997ec410f9b26e03c6572e9760d
+  metadata.gz: 706873fa19d231e950bec7f26a74946a5c19d9d594930b5fe6b64e0b4be12545254b2371c82067a7ed0b420153ac050f449980c84c3eb15b8a2a58940e6a64ab
+  data.tar.gz: a20045257bbd629bca137e8b8724549836c2c484e05d1074b245dbdf56c607608cfd572141619c4bfe18786ae8645581ebe6777ed0068bd849e1bb8d97d95306

data/CHANGELOG.md

@@ -1,6 +1,18 @@
 ## [Unreleased]
 * No unreleased changes
 
+## 6.1.4 / 2022-06-16
+### Added
+* Add warning when upgrading webpacker
+
+## 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
+
 ## 6.1.1 / 2022-04-29
 ### Fixed
 * CI: fix crashes when brakeman parsing fails

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.1'
+  VERSION = '6.1.4'
 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)
@@ -108,14 +112,49 @@ namespace :bundle do
       exit 1
     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[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
+      platforms.each do |platform|
+        system("gem fetch #{gem} --version=#{new_gem_version2} --platform=#{platform}")
+      end
+    end if Dir.exist?('vendor/cache')
+
+    if gem == 'webpacker'
+      puts 'TODO: update package.json and yarn.lock with bin/rails webpacker:install'
+      puts '      and git add / git remove files in vendor/npm-packages-offline-cache'
+    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[1]
-
     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.
@@ -132,7 +171,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.1
+  version: 6.1.4
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-29 00:00:00.000000000 Z
+date: 2022-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry