daemontools 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5703423d017dfd15356942bfb9c15b1bf90a0066e0ee3cb44d6465c0028a926
-  data.tar.gz: f7cb58a362f20b50c777a935b9468d7ca290b6d1f9c655321dc37d0b3103b069
+  metadata.gz: c22463b5a826586d0334a8f8d42f3e9d5dca647c5075073e3039770be063e515
+  data.tar.gz: a9d89cdc0cb3d1bbdf0bd81dc2261a31a3d87fa7f1cec48d67ee7780a5fe5aa8
 SHA512:
-  metadata.gz: 990027123b11e7049fe904a19ac9fe30ae0fdbd6823a61d3640d0e9506f95daec95d6d7fa09878ef18d8fcf89a1d5682aec99591eb35e6134a16a4901cdfd27c
-  data.tar.gz: 5d668f9a9bcd887332110e549e738a29bbfcce6e696cf45c57fa27545d5d54a3d2f91116562cefdeb81dc26d349b423ae1fd69e4688a4a23caf1510d2a9343b0
+  metadata.gz: 71c1a4bf680ac3cdef9be0767e3eabb7e2314fd4e3874c0dced95b028683b512df8c8c968b60d7d71e052fd397658fce097acd44bf8918506c7e9c9a3feb2200
+  data.tar.gz: aed7e1991483a5f2f521f4c9cfe93af72c3e274710b172dd98baf9b80ef08aba74add43192e4947b4c8e7a392b8bb10ff96bb78007ee10a5bfcbe95df5477bd1

data/fixtures/new_services.rb

@@ -31,3 +31,7 @@ end
 service :service_new_2, :roles => [:new_role] do
   command1 "service_new_2 arg1"
 end
+
+service :service4, :roles => [:role_renamed] do
+  command3 "script/service4 argument1"
+end

data/fixtures/old_services.rb

@@ -35,3 +35,7 @@ end
 service :deleted_service_3, :roles => [:role_deleted] do
   command3 "script/deleted_service_3 argument1"
 end
+
+service :service4, :roles => [:role_to_rename] do
+  command3 "script/service4 argument1"
+end

data/fixtures/stubs/service_builder_stub.rb

@@ -6,8 +6,8 @@ module Daemontools
       true
     end
 
-    def delete_services(service_names, role)
-      find_services_by_name(service_names, role).map(&:first)
+    def delete_services(service_names)
+      service_names
     end
   end
 end

data/fixtures/stubs/service_remover_stub.rb

@@ -5,9 +5,7 @@ module Daemontools
     def remove_unused_services
       return if @deleted_services.empty?
 
-      @deleted_services.map do |role, services|
-        @previous_builder.delete_services(services, role)
-      end
+      @previous_builder.delete_services(@deleted_services)
     end
   end
 end

data/lib/daemontools/service_builder.rb

@@ -72,9 +72,8 @@ module Daemontools
       @delete_command = cmd.empty? ? nil : cmd
     end
 
-    def delete_services(service_names, role)
-      services = find_services_by_name(service_names, role)
-      services.each { |service| Daemontools.delete(service[0], @delete_command) }
+    def delete_services(services)
+      services.each { |service| Daemontools.delete(service, @delete_command) }
     end
 
     def find_services_by_name(service_names, role)

data/lib/daemontools/service_remover.rb

@@ -15,22 +15,21 @@ module Daemontools
     def remove_unused_services
       return if @deleted_services.empty?
 
-      @deleted_services.each do |role, services|
-        puts "Delete services #{services} for role #{role}"
-        @previous_builder.delete_services(services, role)
-      end
+      puts "Services for delete: #{@deleted_services.join(', ')}"
+      @previous_builder.delete_services(@deleted_services)
     end
 
     private
 
     def find_services_changes(old_services, new_services)
-      @deleted_services = {}
-      @roles.each do |role|
-        old_role_services = (old_services[role] || []).map(&:first)
-        new_role_services = (new_services[role] || []).map(&:first)
-        services_for_del = old_role_services - new_role_services
-        @deleted_services[role] = services_for_del unless services_for_del.empty?
-      end
+      old_services_for_server = services_for_roles(old_services, @roles)
+      new_services_for_server = services_for_roles(new_services, @roles)
+      @deleted_services = old_services_for_server - new_services_for_server
+    end
+
+    # Extracting service names for roles from config
+    def services_for_roles(services, roles)
+      services.values_at(*roles).flatten(1).compact.map(&:first).compact.uniq
     end
   end
 end

data/lib/daemontools/version.rb

@@ -1,3 +1,3 @@
 module Daemontools
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/spec/service_delete_spec.rb

@@ -14,18 +14,22 @@ RSpec.describe Daemontools::Remover, '#initialize' do
 
     remover = Daemontools::RemoverStub.new(roles, old_builder, new_builder)
     deleted = remover.deleted_services
-    deleted_roles = %i[role_with_deleted role_with_modifies role_deleted]
+    deleted_services = %i[deleted_service_1 deleted_service_2 deleted_service_3]
 
     context 'Check roles where services were deleted' do
       it 'Number of roles for deleted services must be equal to length of deleted roles' do
-        expect(deleted.keys.size).to eq deleted_roles.length
+        expect(deleted.size).to eq deleted_services.length
       end
 
-      deleted.each_key do |role|
-        it "Should contain #{role}" do
-          expect(deleted_roles.include?(role)).to eq true
+      deleted.each do |service_name|
+        it "Should contain #{service_name}" do
+          expect(deleted_services.include?(service_name)).to eq true
         end
       end
+
+      it 'Include service from renamed role' do
+        expect(deleted_services.include?('service4')).to eq false
+      end
     end
 
     context 'Removing unused services' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daemontools
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - sh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-03 00:00:00.000000000 Z
+date: 2022-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler