ndr_dev_support 6.0.3 → 6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ddf993378e5cd98d65313341b0af15677fb8934c42eebb91875d49b66b1ff27
-  data.tar.gz: fceda29b2a92b42b2d480926e9079c6f0f7cf2cfb42c6d7c1263fc58308a7bc1
+  metadata.gz: 35fef5ec91f5db4578a83b30f719011734cf4ee3cbb14ca9e99c30893e3f5e9f
+  data.tar.gz: 9480e1be5513b83c6213d54d2b8ef1e6ed13ca9d90162be41ad17af105df355c
 SHA512:
-  metadata.gz: 22b80f92debe98a7092b9b7a1322792142e459e33b8d2cdc7dbaecbcbd3f4e8fa1757eeb033c0d1c98b36c5f2411130b6f7aa7a6c4a4ec13f06bf20436746290
-  data.tar.gz: be6721ab8d9ea0e37035cd593748f6d15ce7f958cf5fe5e934c13db2c9a8b61c7dbc751c1b217b47f18c9b3950272496af013190fd7e81f752367839d1b9af55
+  metadata.gz: 4db7ec6d1b673f3c10e11040c11e600ddadc2d8657a837d231bfa3216668ce8254479ed4af8f1d1b4024afa9f3252158546db499153d28098631629d06420b65
+  data.tar.gz: 4719a51ea6c3c7eb52e83a5e5c943813b0698e5d3d1ddabba01fd36b1ae7770858cd7c21c697279e8a7865f9965570eae7512997ec410f9b26e03c6572e9760d

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 ## [Unreleased]
-* no unreleased changes
+* No unreleased changes
+
+## 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
+
+### Changed
+* Allow Ctrl-C to cleanly interrupt an idle daemon
+* Drop support for Ruby 2.6
+
+## 6.0.5 / unreleased
+
+## 6.0.4 / 2022-03-14
+### Fixed
+* bundle:update should commit code_safety.yml changes.
 
 ## 6.0.3 / 2022-03-14
 ### Added

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: 5943e1a2ef7095e44858806ad16713cffc67c31b
+    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,11 +231,11 @@ file safety:
   lib/ndr_dev_support/version.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: 5943e1a2ef7095e44858806ad16713cffc67c31b
+    safe_revision: 5d47f0c8574b6fbc69f9144ce508f169b95cd90c
   lib/tasks/audit_bundle.rake:
     comments:
     reviewed_by: brian.shand
-    safe_revision: 93f9ed210c6a19eee4884ea8a906067c65ee67f6
+    safe_revision: 9682c3eb39a98d5a5256732af647a8bd7750826b
   lib/tasks/audit_code.rake:
     comments: Identical to the version reviewed by josh.pencheon when contained within
       ndr_support
@@ -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/daemon/stoppable.rb

@@ -105,7 +105,12 @@ module NdrDevSupport
 
         number_of_mini_sleeps.times do
           return if should_stop?
+
           sleep(LITTLE_SLEEP)
+        rescue Interrupt
+          # Ctrl-C should stop cleanly if used while the process is snoozing
+          @should_stop = true
+          return
         end
       end
     end

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.3'
+  VERSION = '6.1.1'
 end

data/lib/tasks/audit_bundle.rake

@@ -27,7 +27,7 @@ namespace :bundle do
 
     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
+    old_gem_version = gem_list.match(/ \(([0-9.]+)( [a-z0-9_-]*)?\)$/).to_a[1]
     unless old_gem_version
       warn <<~MSG.chomp
         Cannot determine gem version for gem=#{gem}. Aborting. Output from bundle exec gem list:
@@ -114,7 +114,7 @@ namespace :bundle do
     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
+    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
@@ -132,7 +132,8 @@ 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|grep 'modified: ' | \
+    files_to_git_add = `git status Gemfile Gemfile.lock 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' | \
                          sed -e 's/^ *//'`.split("\n")

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)

data/lib/tasks/ci/prometheus.rake

@@ -38,15 +38,17 @@ namespace :ci do
             if prometheus.exist?(name)
               prometheus.get(name)
             else
-              prometheus.gauge(name, docstring, project: project)
+              labels = (label_set.keys + [:project]).uniq
+              prometheus.gauge(name, docstring: docstring, labels: labels,
+                                     preset_labels: { project: project })
             end
-          gauge.set(label_set, value)
+          gauge.set(value, labels: label_set)
         else
           raise "Unknown metric type (#{metric.inspect})"
         end
       end
 
-      client = Prometheus::Client::Push.new("rake-ci-#{project}", nil, gateway)
+      client = Prometheus::Client::Push.new(job: "rake-ci-#{project}", gateway: gateway)
 
       begin
         client.add(prometheus)

data/ndr_dev_support.gemspec

@@ -12,12 +12,13 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/PublicHealthEngland/ndr_dev_support'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(\.github|test|spec|features)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").
+                       reject { |f| f.match(%r{^(\.github|test|spec|features)/}) }
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.6'
+  spec.required_ruby_version = '>= 2.7'
 
   spec.add_dependency 'pry'
 
@@ -28,8 +29,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'parser'
   spec.add_dependency 'rainbow'
   spec.add_dependency 'rubocop', '~> 1.7'
-  spec.add_dependency 'rubocop-rake', '~> 0.5'
   spec.add_dependency 'rubocop-rails', '~> 2.9'
+  spec.add_dependency 'rubocop-rake', '~> 0.5'
   spec.add_dependency 'unicode-display_width', '>= 1.3.3'
 
   # Integration test dependencies:
@@ -46,7 +47,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'brakeman', '>= 4.7.1'
   spec.add_dependency 'bundler-audit'
   spec.add_dependency 'github-linguist'
-  spec.add_dependency 'prometheus-client', '~> 0.9.0'
+  spec.add_dependency 'prometheus-client', '~> 4.0.0'
   spec.add_dependency 'rugged'
   spec.add_dependency 'simplecov'
   spec.add_dependency 'with_clean_rbenv'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_dev_support
 version: !ruby/object:Gem::Version
-  version: 6.0.3
+  version: 6.1.1
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-14 00:00:00.000000000 Z
+date: 2022-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -81,33 +81,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rake
+  name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '2.9'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rails
+  name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: unicode-display_width
   requirement: !ruby/object:Gem::Requirement
@@ -282,14 +282,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
@@ -481,7 +481,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="