daemontools 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1194e2ccd6aec2798db9597a91a8ff982752be9174cf4a48f3ef83af1e14fb6a
-  data.tar.gz: e10ac3fc9c169034077b10bb85a523cdaded4d0b8c9832906c01f2cd1e96876d
+  metadata.gz: f5703423d017dfd15356942bfb9c15b1bf90a0066e0ee3cb44d6465c0028a926
+  data.tar.gz: f7cb58a362f20b50c777a935b9468d7ca290b6d1f9c655321dc37d0b3103b069
 SHA512:
-  metadata.gz: 8fba606a33024d89ece9a27b3c931bee6fcdcbc7ab841d5a238e16a21d338b6c68a56091ca53c058f7bc159a2a77f0c4a3119bec3604e143524a76244b7fef39
-  data.tar.gz: 1c5569f2376e70a46f726695d6ac0347133c6158881c4de1d62e2bb3384682b852a4cfe647dc3e26f98a5102d812d0ec9923309c50e5a33ee29d040e5dd29f42
+  metadata.gz: 990027123b11e7049fe904a19ac9fe30ae0fdbd6823a61d3640d0e9506f95daec95d6d7fa09878ef18d8fcf89a1d5682aec99591eb35e6134a16a4901cdfd27c
+  data.tar.gz: 5d668f9a9bcd887332110e549e738a29bbfcce6e696cf45c57fa27545d5d54a3d2f91116562cefdeb81dc26d349b423ae1fd69e4688a4a23caf1510d2a9343b0

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/lib/daemontools/version.rb

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

metadata

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