daemontools 0.2.3 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51ec59b970afb5438e6231bc5e74560bee203cbaeb1b924e60cddc08895212b7
-  data.tar.gz: 0acf0fae125f5b7264a6361242a57c9148e1549b1c386dbd12d718af9123edf1
+  metadata.gz: c22463b5a826586d0334a8f8d42f3e9d5dca647c5075073e3039770be063e515
+  data.tar.gz: a9d89cdc0cb3d1bbdf0bd81dc2261a31a3d87fa7f1cec48d67ee7780a5fe5aa8
 SHA512:
-  metadata.gz: 8214be8777a4304c4b659b863e72490de3e600de75af202de5ae397ce9043cea57d6be2baf4174a744e20cbf9400c472fa9e4a956246d560502283eae3b5d288
-  data.tar.gz: f1743d13227de5737c2bc91054732ad07052320ba2dcd221c4c8a77b34ffdf19043bce147143f10f9625046819f7e20e910c9cea416cb3774995071cd0d8c157
+  metadata.gz: 71c1a4bf680ac3cdef9be0767e3eabb7e2314fd4e3874c0dced95b028683b512df8c8c968b60d7d71e052fd397658fce097acd44bf8918506c7e9c9a3feb2200
+  data.tar.gz: aed7e1991483a5f2f521f4c9cfe93af72c3e274710b172dd98baf9b80ef08aba74add43192e4947b4c8e7a392b8bb10ff96bb78007ee10a5bfcbe95df5477bd1

data/bin/daemontools-gen

@@ -10,13 +10,22 @@ puts "Building svc services for roles #{roles} .."
 old_path = ARGV[2] || ''
 new_path = ARGV[3] || ''
 
-if old_path.empty? || new_path.empty?
-  builder = Daemontools::Builder.new("#{Dir.pwd}/config/services.rb")
-  builder.gen(roles, environment)
-else
+def need_remove_old_services?(old_path, new_path)
+  # If no new path there is no reason to try remove old services
+  return false if new_path.nil? || new_path.empty?
+  # If no old path there is no reason to try remove old services
+  return false if old_path.nil? || old_path.empty?
+  # Check if config files are exists
+  File.exist?("#{old_path}/config/services.rb") && File.exist?("#{new_path}/config/services.rb")
+end
+
+if need_remove_old_services?(old_path, new_path)
   previous_builder = Daemontools::Builder.new("#{old_path}/config/services.rb")
   current_builder = Daemontools::Builder.new("#{new_path}/config/services.rb")
   remover = Daemontools::Remover.new(roles, previous_builder, current_builder)
   remover.remove_unused_services
   current_builder.gen(roles, environment)
+else
+  builder = Daemontools::Builder.new("#{Dir.pwd}/config/services.rb")
+  builder.gen(roles, environment)
 end

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.3"
+  VERSION = "0.2.7"
 end

data/lib/daemontools.rb

@@ -6,15 +6,20 @@ require 'erb'
 
 module Daemontools
   class << self
-    attr_accessor :svc_root, :log_root
+    attr_accessor :svc_root, :log_root, :tmp_root
   end
   @svc_root = '/etc/service'
   @log_root = '/var/log/svc'
+  @tmp_root = '/tmp'
 
   def self.exists?(name)
     check_service_exists(name, false)
   end
 
+  def self.tmp_exists?(name)
+    Dir.exists?("#{@tmp_root}/daemontools_service_#{name}")
+  end
+
   def self.status(name)
     check_service_exists(name)
     r = `sudo svstat #{@path} 2>&1`
@@ -57,6 +62,29 @@ module Daemontools
     true
   end
 
+  def self.add_empty_tmp(name)
+    path = "#{@tmp_root}/daemontools_service_#{name}"
+    Dir.mkdir(path) unless Dir.exists?(path)
+    true
+  end
+
+  def self.move_tmp(name)
+    tmp_path = "#{@tmp_root}/daemontools_service_#{name}"
+    svc_path = "#{@svc_root}/#{name}"
+
+    r = `mv #{tmp_path} #{svc_path}`
+    raise r if $?.exitstatus != 0
+    raise r if ! r.empty?
+
+    now = Time.now.to_f
+    while `sudo svstat #{svc_path} 2>&1`.match(/unable to open/i)
+      raise "Timeout wait for svc add service" if Time.now.to_f - now > 10
+      sleep 0.1
+    end
+
+    true
+  end
+
   def self.add(name, command, options = {})
     @name = name
     @command = command
@@ -91,7 +119,7 @@ module Daemontools
   end
 
   def self.delete(name, rm_cmd = nil)
-    check_service_exists(name)
+    return false unless exists?(name)
     stop(name)
     cmd = rm_cmd.nil? ? "sudo rm -rf #{@path} 2>&1" : "#{rm_cmd} #{@path}"
     r = `#{cmd}`

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.3
+  version: 0.2.7
 platform: ruby
 authors:
 - sh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-31 00:00:00.000000000 Z
+date: 2022-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler