ndr_dev_support 6.0.4 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c974533f2670deb4a3c97be7fcc5e979441873e779dd30db443b1e3813aee8eb
-  data.tar.gz: 62927ddd9ce5a70f3870543aa6e15734489bca3449eccf5d8b18e3e145c79fae
+  metadata.gz: 67a32537a9f42f905530b37c03c4e98ddd4aa8436833e1ce38e4443701f8216d
+  data.tar.gz: cd6489387c3d8bd0af51b26e4315dcfd57b1592a46dda39e7e2e1e5f161d519d
 SHA512:
-  metadata.gz: b0960ae0595c55f024ec201113772e225087398cb24f30b63728d08712cbd2d80570a161b60b20f91f45de5948b977ed5bd647b6af783bcbb3d791390743ab40
-  data.tar.gz: 1e6a5753db64d820f8499170662a0677065ee3222257cc959bb688efeb5508d34c351c686be8272938b093ba3ac9a7423704732a3b347e0f83c4c385687dae57
+  metadata.gz: cf21a7b0849c34190f27024df4a1e50c11bc635681cba4dc4a3e6708c37a0b81400ef5810badf125cd65044cfc69eab543d2c531a378db5e0853eeba57ed4012
+  data.tar.gz: 229c84f00339e8435b75d2048e8d849092f50ce79e1a0d8f1964d575e89ec74e26b1b975d768ae422811d609b84a503d7014dcef95274ab626fd6c441e1212af

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 ## [Unreleased]
-* no unreleased changes
+* No unreleased changes
+
+## 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

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.4'
+  VERSION = '6.1.0'
 end

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.4
+  version: 6.1.0
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-14 00:00:00.000000000 Z
+date: 2022-04-28 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:
   - - ">="