ndr_dev_support 6.1.0 → 6.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67a32537a9f42f905530b37c03c4e98ddd4aa8436833e1ce38e4443701f8216d
-  data.tar.gz: cd6489387c3d8bd0af51b26e4315dcfd57b1592a46dda39e7e2e1e5f161d519d
+  metadata.gz: 538f2514db4fc9b6227cbb94aa9d72521b7c0a36ee24e6a711e9bc1d369fbc57
+  data.tar.gz: 9f939ecd79212a0d8818d2c718d71b7f95e148bf86671c2c349d32f8e5675cb7
 SHA512:
-  metadata.gz: cf21a7b0849c34190f27024df4a1e50c11bc635681cba4dc4a3e6708c37a0b81400ef5810badf125cd65044cfc69eab543d2c531a378db5e0853eeba57ed4012
-  data.tar.gz: 229c84f00339e8435b75d2048e8d849092f50ce79e1a0d8f1964d575e89ec74e26b1b975d768ae422811d609b84a503d7014dcef95274ab626fd6c441e1212af
+  metadata.gz: 6b13169c99faddabcce0a28bdafb78ca5c7c899e1affc263df976030dcfef3a991742aaab569e80ab763726c9d525cd1f792a45b8bf0daed91bae60e404a4aa9
+  data.tar.gz: df4d686cd9d8e2de66c6bdfc070a4221baff52c6fe5bf4ca064f9f94dd4ab30311848e15f5f955b82d1d3c16f0845ac07afbba93c6a4d4b77226b217928226ab

data/CHANGELOG.md

@@ -1,6 +1,18 @@
 ## [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
+
+## 6.1.1 / 2022-04-29
+### Fixed
+* CI: fix crashes when brakeman parsing fails
+
 ## 6.1.0 / 2022-04-28
 ### Fixed
 * CI: support Ruby 3.0

data/code_safety.yml

@@ -11,7 +11,7 @@ file safety:
   ".github/workflows/test.yml":
     comments:
     reviewed_by: brian.shand
-    safe_revision: 65d59fe9bba9dc7d404f92b54a115b14e6697af9
+    safe_revision: c911246250d5387264d5a926c2572f98db58be6e
   ".gitignore":
     comments:
     reviewed_by: josh.pencheon
@@ -27,7 +27,7 @@ file safety:
   CHANGELOG.md:
     comments:
     reviewed_by: brian.shand
-    safe_revision: 25fcab1b2df9476bfa294085a46073b218785c19
+    safe_revision: 5d47f0c8574b6fbc69f9144ce508f169b95cd90c
   CODE_OF_CONDUCT.md:
     comments:
     reviewed_by: timgentry
@@ -126,8 +126,8 @@ file safety:
     safe_revision: 3fdf010a91bd9927ef34e3df66b8a4bbbd20315a
   lib/ndr_dev_support/daemon/stoppable.rb:
     comments:
-    reviewed_by: josh.pencheon
-    safe_revision: 07ba05e9dd59eeac187b5fe730ee653baa1a2732
+    reviewed_by: brian.shand
+    safe_revision: ff47991823556a6936a7457b4a1eb9373851ee57
   lib/ndr_dev_support/integration_testing.rb:
     comments:
     reviewed_by: josh.pencheon
@@ -231,7 +231,7 @@ file safety:
   lib/ndr_dev_support/version.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: 25fcab1b2df9476bfa294085a46073b218785c19
+    safe_revision: 5d47f0c8574b6fbc69f9144ce508f169b95cd90c
   lib/tasks/audit_bundle.rake:
     comments:
     reviewed_by: brian.shand
@@ -275,8 +275,8 @@ file safety:
     safe_revision: f828113894a16581d0aa181504c799e661f8401d
   lib/tasks/ci/prometheus.rake:
     comments:
-    reviewed_by: josh.pencheon
-    safe_revision: 2d1b9d19acafebe6ca5f995bf15243abe2847eec
+    reviewed_by: brian.shand
+    safe_revision: b30f609f1978015522eb8f60b2a81730d4b7de62
   lib/tasks/ci/redmine.rake:
     comments:
     reviewed_by: josh.pencheon
@@ -308,7 +308,7 @@ file safety:
   ndr_dev_support.gemspec:
     comments:
     reviewed_by: brian.shand
-    safe_revision: 65d59fe9bba9dc7d404f92b54a115b14e6697af9
+    safe_revision: c911246250d5387264d5a926c2572f98db58be6e
   test/daemon/ci_server_test.rb:
     comments:
     reviewed_by: josh.pencheon

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.0'
+  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)
@@ -108,14 +112,44 @@ 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 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 +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' | \

data/lib/tasks/ci/brakeman.rake

@@ -32,7 +32,24 @@ namespace :ci do
 
       brakeman = NdrDevSupport::RakeCI::BrakemanHelper.new
       brakeman.commit = @commit
-      brakeman.run(strict: true)
+      begin
+        brakeman.run(strict: true)
+      rescue StandardError => e
+        warn <<~MESSAGE
+          Error: Brakeman failed with #{e.class}: #{e}
+          There is probably a ruby syntax error in one of the files. To find it, run:
+          $ brakeman -I --debug
+          For the full backtrace, run
+          $ rake ci:brakeman --trace
+        MESSAGE
+        @attachments << {
+          color: 'danger',
+          title: 'Brakeman Error',
+          text: 'Brakeman run failed. Run brakeman -I --debug',
+          footer: 'bundle exec rake ci:brakeman:strict'
+        }
+        next
+      end
 
       @metrics.concat(brakeman.metrics)
       @attachments.concat(brakeman.attachments)

metadata

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