docker_toolkit 0.1.19 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc743640766da2fbed5f66e532fa6a41b1581d731d65e32cda14bfccff399491
-  data.tar.gz: 44004a6a32b55a6c4cb7d764dd03d4c4961c1b38389811c64f688523f161b090
+  metadata.gz: 0bf86f05ad92b1bc8a9d2c716f4d43ed623822704d6b2f7f2cb1cd450bba045b
+  data.tar.gz: 633486188aa3b061625e24d3e8b4b854a9e59b7ac2ca773a041ef6fef0b45c1c
 SHA512:
-  metadata.gz: b03174458ba29be5cbefa222aab71b565ce0cdea16ba3a4e3bc188aa849e14eea7d251e0a609660b1c5575e0a4edc9c3dfd5008a4027944af10308f7f856285a
-  data.tar.gz: 8524574068f9289bbbd377f11b0877fbe8994b5e2eae2b1ce78bcd90059703bd56e8d8bb7c1204ba068646273fc7f704cb249a0bbadf749e1b3ab6e931dc56ea
+  metadata.gz: 1b228ca1cee6f826eadf20eb7fc8b1eeae3dd7a50b5e2e636e130904a5811107fde91f211324378510113b2ffb9bfdd39926a240e5089c51b18dab55eeaf1211
+  data.tar.gz: 8cacc284e037a69dec8f61046c9b85cfdd0c2e02ca4399b6d4094d15293aff4bd4deed4b958b83ce564442a8bf0f11b049ad753ec44d0d01c042cc789e0dfa3e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    docker_toolkit (0.1.19)
+    docker_toolkit (0.1.20)
       diplomat
       dotenv
       json

data/lib/docker_toolkit/version.rb

@@ -1,5 +1,5 @@
 module DockerToolkit
 
-  VERSION = '0.1.19'.freeze
+  VERSION = '0.1.20'.freeze
 
 end

data/lib/docker_toolkit/watcher.rb

@@ -30,7 +30,18 @@ module DockerToolkit
         rescue StandardError
           nil
         end
-        ::Process.kill 'TERM', meta[:process].pid
+        if meta[:termcmd].is_a? String
+          log "Terminating by #{meta[:termcmd].gsub('%PID%', meta[:process].pid.to_s)}..."
+          output = `#{meta[:termcmd].gsub('%PID%', meta[:process].pid.to_s)}`
+          if $?.success?
+            log "ok: #{output}"
+          else
+            log "Error: #{output}"
+            ::Process.kill 'TERM', meta[:process].pid
+          end
+        else
+          ::Process.kill 'TERM', meta[:process].pid
+        end
       end
 
       terminating.each do |meta|
@@ -75,6 +86,13 @@ module DockerToolkit
         end
 
     def add(*cmd)
+      options = cmd.last
+      if options.is_a? Hash
+        cmd.pop
+      else
+        options = {}
+      end
+
       cmd = cmd.flatten.map{|c| c.to_s.strip }.reject(&:empty?)
       process = ChildProcess.build(*cmd)
 
@@ -90,7 +108,8 @@ module DockerToolkit
         process: process,
         stdout: rout,
         stderr: rerr,
-        stdin: process.io.stdin
+        stdin: process.io.stdin,
+        termcmd: options[:termcmd],
       }
 
       @threads << Thread.new(meta[:stdout], STDOUT) do |io, out|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker_toolkit
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.20
 platform: ruby
 authors:
 - Godko Ivan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-22 00:00:00.000000000 Z
+date: 2018-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diplomat
@@ -161,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Helper scripts for work with docker and consul