ndr_dev_support 6.0.4 → 6.1.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +11 -1
- data/lib/ndr_dev_support/daemon/stoppable.rb +5 -0
- data/lib/ndr_dev_support/version.rb +1 -1
- data/lib/tasks/ci/prometheus.rake +5 -3
- data/ndr_dev_support.gemspec +5 -4
- metadata +11 -11
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 67a32537a9f42f905530b37c03c4e98ddd4aa8436833e1ce38e4443701f8216d
|
4
|
+
data.tar.gz: cd6489387c3d8bd0af51b26e4315dcfd57b1592a46dda39e7e2e1e5f161d519d
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: cf21a7b0849c34190f27024df4a1e50c11bc635681cba4dc4a3e6708c37a0b81400ef5810badf125cd65044cfc69eab543d2c531a378db5e0853eeba57ed4012
|
7
|
+
data.tar.gz: 229c84f00339e8435b75d2048e8d849092f50ce79e1a0d8f1964d575e89ec74e26b1b975d768ae422811d609b84a503d7014dcef95274ab626fd6c441e1212af
|
data/CHANGELOG.md
CHANGED
@@ -1,5 +1,15 @@
|
|
1
1
|
## [Unreleased]
|
2
|
-
*
|
2
|
+
* No unreleased changes
|
3
|
+
|
4
|
+
## 6.1.0 / 2022-04-28
|
5
|
+
### Fixed
|
6
|
+
* CI: support Ruby 3.0
|
7
|
+
|
8
|
+
### Changed
|
9
|
+
* Allow Ctrl-C to cleanly interrupt an idle daemon
|
10
|
+
* Drop support for Ruby 2.6
|
11
|
+
|
12
|
+
## 6.0.5 / unreleased
|
3
13
|
|
4
14
|
## 6.0.4 / 2022-03-14
|
5
15
|
### Fixed
|
@@ -105,7 +105,12 @@ module NdrDevSupport
|
|
105
105
|
|
106
106
|
number_of_mini_sleeps.times do
|
107
107
|
return if should_stop?
|
108
|
+
|
108
109
|
sleep(LITTLE_SLEEP)
|
110
|
+
rescue Interrupt
|
111
|
+
# Ctrl-C should stop cleanly if used while the process is snoozing
|
112
|
+
@should_stop = true
|
113
|
+
return
|
109
114
|
end
|
110
115
|
end
|
111
116
|
end
|
@@ -38,15 +38,17 @@ namespace :ci do
|
|
38
38
|
if prometheus.exist?(name)
|
39
39
|
prometheus.get(name)
|
40
40
|
else
|
41
|
-
|
41
|
+
labels = (label_set.keys + [:project]).uniq
|
42
|
+
prometheus.gauge(name, docstring: docstring, labels: labels,
|
43
|
+
preset_labels: { project: project })
|
42
44
|
end
|
43
|
-
gauge.set(
|
45
|
+
gauge.set(value, labels: label_set)
|
44
46
|
else
|
45
47
|
raise "Unknown metric type (#{metric.inspect})"
|
46
48
|
end
|
47
49
|
end
|
48
50
|
|
49
|
-
client = Prometheus::Client::Push.new("rake-ci-#{project}",
|
51
|
+
client = Prometheus::Client::Push.new(job: "rake-ci-#{project}", gateway: gateway)
|
50
52
|
|
51
53
|
begin
|
52
54
|
client.add(prometheus)
|
data/ndr_dev_support.gemspec
CHANGED
@@ -12,12 +12,13 @@ Gem::Specification.new do |spec|
|
|
12
12
|
spec.homepage = 'https://github.com/PublicHealthEngland/ndr_dev_support'
|
13
13
|
spec.license = 'MIT'
|
14
14
|
|
15
|
-
spec.files = `git ls-files -z`.split("\x0").
|
15
|
+
spec.files = `git ls-files -z`.split("\x0").
|
16
|
+
reject { |f| f.match(%r{^(\.github|test|spec|features)/}) }
|
16
17
|
spec.bindir = 'exe'
|
17
18
|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
|
18
19
|
spec.require_paths = ['lib']
|
19
20
|
|
20
|
-
spec.required_ruby_version = '>= 2.
|
21
|
+
spec.required_ruby_version = '>= 2.7'
|
21
22
|
|
22
23
|
spec.add_dependency 'pry'
|
23
24
|
|
@@ -28,8 +29,8 @@ Gem::Specification.new do |spec|
|
|
28
29
|
spec.add_dependency 'parser'
|
29
30
|
spec.add_dependency 'rainbow'
|
30
31
|
spec.add_dependency 'rubocop', '~> 1.7'
|
31
|
-
spec.add_dependency 'rubocop-rake', '~> 0.5'
|
32
32
|
spec.add_dependency 'rubocop-rails', '~> 2.9'
|
33
|
+
spec.add_dependency 'rubocop-rake', '~> 0.5'
|
33
34
|
spec.add_dependency 'unicode-display_width', '>= 1.3.3'
|
34
35
|
|
35
36
|
# Integration test dependencies:
|
@@ -46,7 +47,7 @@ Gem::Specification.new do |spec|
|
|
46
47
|
spec.add_dependency 'brakeman', '>= 4.7.1'
|
47
48
|
spec.add_dependency 'bundler-audit'
|
48
49
|
spec.add_dependency 'github-linguist'
|
49
|
-
spec.add_dependency 'prometheus-client', '~> 0.
|
50
|
+
spec.add_dependency 'prometheus-client', '~> 4.0.0'
|
50
51
|
spec.add_dependency 'rugged'
|
51
52
|
spec.add_dependency 'simplecov'
|
52
53
|
spec.add_dependency 'with_clean_rbenv'
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ndr_dev_support
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 6.0
|
4
|
+
version: 6.1.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- NCRS Development Team
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-
|
11
|
+
date: 2022-04-28 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: pry
|
@@ -81,33 +81,33 @@ dependencies:
|
|
81
81
|
- !ruby/object:Gem::Version
|
82
82
|
version: '1.7'
|
83
83
|
- !ruby/object:Gem::Dependency
|
84
|
-
name: rubocop-
|
84
|
+
name: rubocop-rails
|
85
85
|
requirement: !ruby/object:Gem::Requirement
|
86
86
|
requirements:
|
87
87
|
- - "~>"
|
88
88
|
- !ruby/object:Gem::Version
|
89
|
-
version: '
|
89
|
+
version: '2.9'
|
90
90
|
type: :runtime
|
91
91
|
prerelease: false
|
92
92
|
version_requirements: !ruby/object:Gem::Requirement
|
93
93
|
requirements:
|
94
94
|
- - "~>"
|
95
95
|
- !ruby/object:Gem::Version
|
96
|
-
version: '
|
96
|
+
version: '2.9'
|
97
97
|
- !ruby/object:Gem::Dependency
|
98
|
-
name: rubocop-
|
98
|
+
name: rubocop-rake
|
99
99
|
requirement: !ruby/object:Gem::Requirement
|
100
100
|
requirements:
|
101
101
|
- - "~>"
|
102
102
|
- !ruby/object:Gem::Version
|
103
|
-
version: '
|
103
|
+
version: '0.5'
|
104
104
|
type: :runtime
|
105
105
|
prerelease: false
|
106
106
|
version_requirements: !ruby/object:Gem::Requirement
|
107
107
|
requirements:
|
108
108
|
- - "~>"
|
109
109
|
- !ruby/object:Gem::Version
|
110
|
-
version: '
|
110
|
+
version: '0.5'
|
111
111
|
- !ruby/object:Gem::Dependency
|
112
112
|
name: unicode-display_width
|
113
113
|
requirement: !ruby/object:Gem::Requirement
|
@@ -282,14 +282,14 @@ dependencies:
|
|
282
282
|
requirements:
|
283
283
|
- - "~>"
|
284
284
|
- !ruby/object:Gem::Version
|
285
|
-
version: 0.
|
285
|
+
version: 4.0.0
|
286
286
|
type: :runtime
|
287
287
|
prerelease: false
|
288
288
|
version_requirements: !ruby/object:Gem::Requirement
|
289
289
|
requirements:
|
290
290
|
- - "~>"
|
291
291
|
- !ruby/object:Gem::Version
|
292
|
-
version: 0.
|
292
|
+
version: 4.0.0
|
293
293
|
- !ruby/object:Gem::Dependency
|
294
294
|
name: rugged
|
295
295
|
requirement: !ruby/object:Gem::Requirement
|
@@ -481,7 +481,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
481
481
|
requirements:
|
482
482
|
- - ">="
|
483
483
|
- !ruby/object:Gem::Version
|
484
|
-
version: '2.
|
484
|
+
version: '2.7'
|
485
485
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
486
486
|
requirements:
|
487
487
|
- - ">="
|