daemontools 0.2.6 → 0.2.8
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/fixtures/new_services.rb +4 -0
- data/fixtures/old_services.rb +4 -0
- data/fixtures/stubs/service_builder_stub.rb +2 -2
- data/fixtures/stubs/service_remover_stub.rb +1 -3
- data/lib/daemontools/service_builder.rb +2 -3
- data/lib/daemontools/service_remover.rb +10 -11
- data/lib/daemontools/version.rb +1 -1
- data/lib/daemontools.rb +1 -0
- data/spec/service_delete_spec.rb +9 -5
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: '088f99d7ee5b8816c0966f1a3d6f21e9877c27486ae41bd3b8b3673a8f6cb436'
|
4
|
+
data.tar.gz: 3feb328381a172969861003b8cd4a5915eb26725242f1ee14ca9d0617e3582cc
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4d8d8f56cf833668fedb16f7bac6d8df99ab0ffd001d0d13487b6859ed029a3ee2394514721bc8e967942f9cfe3d5a0f2acb888438af9216349878d8042e9c43
|
7
|
+
data.tar.gz: 4373911d28e58fe56120bafddcfb159f1df066eb4adcdcbe45f646c207fa991497e9354b1e64e1637eafed176042fc07ba861e3ea492b4727e5805dc08c57552
|
data/fixtures/new_services.rb
CHANGED
data/fixtures/old_services.rb
CHANGED
@@ -5,9 +5,7 @@ module Daemontools
|
|
5
5
|
def remove_unused_services
|
6
6
|
return if @deleted_services.empty?
|
7
7
|
|
8
|
-
@deleted_services
|
9
|
-
@previous_builder.delete_services(services, role)
|
10
|
-
end
|
8
|
+
@previous_builder.delete_services(@deleted_services)
|
11
9
|
end
|
12
10
|
end
|
13
11
|
end
|
@@ -72,9 +72,8 @@ module Daemontools
|
|
72
72
|
@delete_command = cmd.empty? ? nil : cmd
|
73
73
|
end
|
74
74
|
|
75
|
-
def delete_services(
|
76
|
-
services
|
77
|
-
services.each { |service| Daemontools.delete(service[0], @delete_command) }
|
75
|
+
def delete_services(services)
|
76
|
+
services.each { |service| Daemontools.delete(service, @delete_command) }
|
78
77
|
end
|
79
78
|
|
80
79
|
def find_services_by_name(service_names, role)
|
@@ -15,22 +15,21 @@ module Daemontools
|
|
15
15
|
def remove_unused_services
|
16
16
|
return if @deleted_services.empty?
|
17
17
|
|
18
|
-
@deleted_services.
|
19
|
-
|
20
|
-
@previous_builder.delete_services(services, role)
|
21
|
-
end
|
18
|
+
puts "Services for delete: #{@deleted_services.join(', ')}"
|
19
|
+
@previous_builder.delete_services(@deleted_services)
|
22
20
|
end
|
23
21
|
|
24
22
|
private
|
25
23
|
|
26
24
|
def find_services_changes(old_services, new_services)
|
27
|
-
|
28
|
-
@roles
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
25
|
+
old_services_for_server = services_for_roles(old_services, @roles)
|
26
|
+
new_services_for_server = services_for_roles(new_services, @roles)
|
27
|
+
@deleted_services = old_services_for_server - new_services_for_server
|
28
|
+
end
|
29
|
+
|
30
|
+
# Extracting service names for roles from config
|
31
|
+
def services_for_roles(services, roles)
|
32
|
+
services.values_at(*roles).flatten(1).compact.map(&:first).compact.uniq
|
34
33
|
end
|
35
34
|
end
|
36
35
|
end
|
data/lib/daemontools/version.rb
CHANGED
data/lib/daemontools.rb
CHANGED
data/spec/service_delete_spec.rb
CHANGED
@@ -14,18 +14,22 @@ RSpec.describe Daemontools::Remover, '#initialize' do
|
|
14
14
|
|
15
15
|
remover = Daemontools::RemoverStub.new(roles, old_builder, new_builder)
|
16
16
|
deleted = remover.deleted_services
|
17
|
-
|
17
|
+
deleted_services = %i[deleted_service_1 deleted_service_2 deleted_service_3]
|
18
18
|
|
19
19
|
context 'Check roles where services were deleted' do
|
20
20
|
it 'Number of roles for deleted services must be equal to length of deleted roles' do
|
21
|
-
expect(deleted.
|
21
|
+
expect(deleted.size).to eq deleted_services.length
|
22
22
|
end
|
23
23
|
|
24
|
-
deleted.
|
25
|
-
it "Should contain #{
|
26
|
-
expect(
|
24
|
+
deleted.each do |service_name|
|
25
|
+
it "Should contain #{service_name}" do
|
26
|
+
expect(deleted_services.include?(service_name)).to eq true
|
27
27
|
end
|
28
28
|
end
|
29
|
+
|
30
|
+
it 'Include service from renamed role' do
|
31
|
+
expect(deleted_services.include?('service4')).to eq false
|
32
|
+
end
|
29
33
|
end
|
30
34
|
|
31
35
|
context 'Removing unused services' do
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: daemontools
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.2.
|
4
|
+
version: 0.2.8
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- sh
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2022-11-11 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|