ndr_dev_support 6.1.2 → 6.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a58e21dc2fa2f9a5fa7227b70cd0c6bdd769adb379df912c02e56675cea01b37
-  data.tar.gz: 1b8d2ed30881f8e810ec995f32fbbf1db1528e43a8d983f34f2dd0c0afbdc6ad
+  metadata.gz: f9b372449b95e60ead7c4da7289b8d98de92a18c894fb79c14391fcf3d6370fe
+  data.tar.gz: 8847e9f85ba14c6268c49a1ee031411833674bcd506966b3a54aae03f283d95f
 SHA512:
-  metadata.gz: f81704490c03a2075c031c1e428259083404cff81c9fce8c051bb80744a94a8e4a3b066ce09f88ce69e5e9cc0870f389e29b11223401977e626da0b4b061bac3
-  data.tar.gz: 1cebef3b8ee8e41c38577b8639618300332cf77a87c937aa9e575c30d4305748143325f5f9a90674c921d6c6eb86fe5a5245fa7df8c61c97c22bcec96eff1172
+  metadata.gz: a5217032e0347fd837e0cf31f3dce1c173bf701a6c1f1b8f2c28762b37239c75bf01884e6c0de629c1668198aa978a278d4dc629fb8efdd070b60d84e0a6e230
+  data.tar.gz: 9b6f2ef06634b6fbe67cef8b196c55167456c8ab4cc513ab38c09ab0261c5ba13922da46bae3d3e4875c52ffa8396dcd1cbe204700ae63e0df49e38336eccca2

data/CHANGELOG.md

@@ -1,6 +1,18 @@
 ## [Unreleased]
 * No unreleased changes
 
+## 6.1.5 / 2022-06-24
+### Fixed
+* audit:code should allow special characters in filenames
+
+## 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

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.5'
 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,12 +115,39 @@ 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
       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)
@@ -140,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' | \

data/lib/tasks/audit_code.rake

@@ -1,6 +1,7 @@
 require 'csv'
 require 'pathname'
 require 'yaml'
+require 'shellwords'
 
 SAFETY_FILE =
   if File.exist?('code_safety.yml')
@@ -338,7 +339,8 @@ def get_last_changed_revision(repo, fname)
     %x[git log -n 1 -- "#{fname}"].split("\n").first[7..-1]
   when 'git-svn', 'svn'
     begin
-      svn_info = %x[svn info -r head "#{repo}/#{fname}"]
+      dest = "#{repo}/#{fname}@"
+      svn_info = %x[svn info -r head #{Shellwords.escape(dest)}]
     rescue
       puts 'we have an error in the svn info line'
     end
@@ -376,9 +378,10 @@ def capture_file_diffs(repo, fname, safe_revision, repolatest)
   cmd =
     case repository_type
     when 'git'
-      cmd = ['git', '--no-pager', 'diff', '--color', '-b', "#{safe_revision}..#{repolatest}", fname]
+      ['git', '--no-pager', 'diff', '--color', '-b', "#{safe_revision}..#{repolatest}", fname]
     when 'git-svn', 'svn'
-      cmd = ['svn', 'diff', '-r', "#{safe_revision.to_i}:#{repolatest.to_i}", '-x', '-b', "#{repo}/#{fname}"]
+      ['svn', 'diff', '-r', "#{safe_revision.to_i}:#{repolatest.to_i}", '-x', '-b',
+       "#{repo}/#{fname}@"]
     end
 
   stdout_and_err_str, _status = Open3.capture2e(*cmd)

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.5
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-24 00:00:00.000000000 Z
+date: 2022-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry