docker_toolkit 0.1.25 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44fc48c8b8bf21989b9be9bb59601c1f53a81db9c33bb1948f80c6b9583b77f6
-  data.tar.gz: c6f049c3a6dbc2a550608b1b82d1446a83c9edfff9b0a603e7c7a53b74ce3869
+  metadata.gz: c8561f65ea626741850e599d9d29cb4f5cb8c24e87ef146d07a834f2bcf4d13a
+  data.tar.gz: 3a89ccb8404355d91a3070213b3dd1ba66e92f04351cdd0e84d4202877a56640
 SHA512:
-  metadata.gz: 0604dac84255d0d23836b7d9dac8687fe462f88948b6434de96febc0dd098c045bba1a1c7a2accff90a10c9fd6f832b7c1dbe3fbeaca4d58764c2825d2994a62
-  data.tar.gz: 63209b9d5b7cd31a5c03cce3e946ff0596dd1c796d5684f189ec5c1d04280ae700888713d59d65ab7f41bfa00d4d1f212c886c5a74b5a364257df59655bbbbe1
+  metadata.gz: 560591c6ddb48aa696cf9e0157d73c0248b9abbb2e347b31c6af45781ea29cf58de26462cc94dbb636a4d769fad1c8819076c374f52216565c13cb0601d75c9a
+  data.tar.gz: f7c50dbf342b5e7a6ca14c1f46656028475106d03d9e29bcec72a3797e5e84e5f4db1d0fc081a0f7d64f224261d94fd236c3507186dd8d3ba5cc1819b18b6647

data/Gemfile.lock

@@ -1,23 +1,25 @@
 PATH
   remote: .
   specs:
-    docker_toolkit (0.1.25)
-      diplomat
-      dotenv
-      json
+    docker_toolkit (0.2.0)
+      aggkit
 
 GEM
   remote: https://rubygems.org/
   specs:
+    aggkit (0.4.0.9107)
+      diplomat
+      dotenv
+      json
+      tty-tree
     awesome_print (1.8.0)
     diff-lcs (1.3)
-    diplomat (2.0.2)
+    diplomat (2.0.5)
       faraday (~> 0.9)
-      json
-    dotenv (2.5.0)
-    faraday (0.15.3)
+    dotenv (2.7.1)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    json (2.1.0)
+    json (2.2.0)
     multipart-post (2.0.0)
     rake (10.5.0)
     rspec (3.8.0)
@@ -36,6 +38,7 @@ GEM
       rspec-core (> 3.3)
     rspec-set (0.1.3)
     rspec-support (3.8.0)
+    tty-tree (0.2.0)
 
 PLATFORMS
   ruby

data/bin/waiter.rb

@@ -101,9 +101,9 @@ if @opts[:db]
   @pg[:db] = "-d #{@opts[:db]}"
   @pg[:user] = "-U #{@opts[:user]}" if @opts[:user]
   @pg[:pass] = if @opts[:pass] && !@opts[:pass].empty?
-                 "-W #{@opts[:pass]}"
+                 "PGPASSWORD=#{@opts[:pass]}"
                else
-                 '-w'
+                 ''
   end
 
   @pg[:host] = "-h #{@opts[:host]}" if @opts[:host]
@@ -181,7 +181,7 @@ end
 def wait_for_db
   log("Waiting for DB: pg://#{@opts[:user]}:#{@opts[:pass]}@#{@opts[:host]}:#{@opts[:port]}/#{@opts[:db]}...")
   ret = wait_for @opts[:timeout] do
-    cmd = "psql -lqt #{@pg[:user]} #{@pg[:pass]} #{@pg[:host]} #{@pg[:port]} #{@pg[:db]} 2>/dev/null | cut -d \\| -f 1 | grep -qw #{@opts[:db]} > /dev/null 2>&1"
+    cmd = "#{@pg[:pass]} psql -lqt #{@pg[:user]} #{@pg[:host]} #{@pg[:port]} #{@pg[:db]} 2>/dev/null | cut -d \\| -f 1 | grep -qw #{@opts[:db]} > /dev/null 2>&1"
     system(cmd)
     $?.success?
   end

data/docker_toolkit.gemspec

@@ -26,9 +26,7 @@ Gem::Specification.new do |spec|
   end
 
 
-  spec.add_dependency 'diplomat'
-  spec.add_dependency 'dotenv'
-  spec.add_dependency 'json'
+  spec.add_dependency 'aggkit'
 
   spec.add_development_dependency 'bundler', '~> 1.14'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/docker_toolkit/version.rb

@@ -1,5 +1,5 @@
 module DockerToolkit
 
-  VERSION = '0.1.25'.freeze
+  VERSION = '0.2.0'.freeze
 
 end

data/lib/docker_toolkit/watcher.rb

@@ -1,238 +1,8 @@
 #!/usr/bin/env ruby
 require 'English'
+require 'aggkit'
+require 'aggkit/watcher'
 
 module DockerToolkit
-
-  class Watcher
-
-
-    def initialize
-      @lock = Mutex.new
-
-      @procs = []
-      @code = 0
-      @crashed = false
-      @threads = []
-      @who = nil
-      @stopping = false
-      end
-
-    def stop_all
-      @stopping = true
-
-      terminating = @procs.reject do |meta|
-        meta[:handled] || meta[:process].exited?
-      end
-
-      terminating.each do |meta|
-        begin
-          meta[:stdin].close
-        rescue StandardError
-          nil
-        end
-        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|
-        begin
-          meta[:process].poll_for_exit(5)
-        rescue ChildProcess::TimeoutError
-          meta[:process].stop(1)
-          meta[:stdout].close
-          meta[:stderr].close
-        end
-      end
-
-      unless @crashed
-        meta = @procs.detect do |meta|
-          meta[:process].crashed?
-        end
-
-        if meta
-          @crashed = true
-          @code = meta[:process].exit_code
-          @who = meta[:cmd]
-        end
-      end
-
-      @procs.each do |meta|
-        begin
-        meta[:stdout].close
-      rescue StandardError
-        nil
-      end
-        begin
-        meta[:stderr].close
-      rescue StandardError
-        nil
-      end
-      end
-
-      Thread.new do
-        sleep 2
-        @threads.each(&:terminate)
-      end
-        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)
-
-      rerr, werr = IO.pipe
-      rout, wout = IO.pipe
-
-      process.io.stdout = wout
-      process.io.stderr = werr
-      process.duplex = true
-
-      meta = {
-        cmd: cmd,
-        process: process,
-        stdout: rout,
-        stderr: rerr,
-        stdin: process.io.stdin,
-        termcmd: options[:termcmd]
-      }
-
-      @threads << Thread.new(meta[:stdout], STDOUT) do |io, out|
-        loop do
-          break unless synchro_readline(io, out)
-        end
-      end
-
-      @threads << Thread.new(meta[:stderr], STDERR) do |io, out|
-        loop do
-          break unless synchro_readline(io, out)
-        end
-      end
-
-      log "Starting #{meta[:cmd]}"
-      meta[:pid] = meta[:process].start.pid
-
-      @procs.push(meta)
-      meta
-    end
-
-    def synchro_readline(io, out)
-      str = io.gets
-      @lock.synchronize{ out.puts str }
-      true
-    rescue StandardError => e
-      false
-    end
-
-    def log(msg)
-      puts "[watcher]: #{msg}"
-    end
-
-    def error(msg)
-      STDERR.puts "[watcher]: Error: #{msg}"
-    end
-
-    def exec
-      %w[EXIT QUIT].each do |sig|
-        trap(sig) do
-          stop_all
-        end
-      end
-
-
-      %w[INT TERM].each do |sig|
-        trap(sig) do
-          log "Catch #{sig}: try exits gracefully.."
-          stop_all
-        end
-      end
-
-      trap('CLD') do |*_args|
-        unhandled = @procs.reject do |meta|
-          meta[:handled] || !meta[:process].exited?
-        end
-
-        completed = unhandled.any? do |meta|
-          log 'Child finished'
-          log "  Process[#{meta[:pid]}]: #{meta[:cmd]}"
-          log "    status: #{meta[:process].crashed? ? 'crashed' : 'exited'}"
-          log "    code:   #{meta[:process].exit_code}"
-
-          meta[:handled] = true
-          begin
-            meta[:stdin].close
-          rescue StandardError
-            nil
-          end
-          begin
-            meta[:stdout].close
-          rescue StandardError
-            nil
-          end
-          begin
-            meta[:stderr].close
-          rescue StandardError
-            nil
-          end
-
-          if !@crashed && meta[:process].crashed?
-            @crashed = true
-            @code = meta[:process].exit_code
-            @who = meta[:cmd]
-          end
-
-          unless @stopping
-            log 'Try exits gracefully..'
-            stop_all
-          end
-
-          true
-        end
-
-        unless completed  
-          pid, status = Process.waitpid2(-1, Process::WNOHANG) rescue nil
-          if status
-            log "Subprocess finished: #{status.inspect}"
-          end
-        end
-
-      end
-
-      begin
-        yield(self)
-      rescue StandardError => e
-        @crashed = true
-        @code = 1
-        error e.inspect
-        error e.backtrace.last(20).join("\n")
-        log 'Try exits gracefully..'
-        stop_all
-      end
-
-      @threads.map(&:join)
-
-      @code = [@code || 0, 1].max if @crashed
-
-      exit(@code || 0)
-    end
-
-
-
-  end
-
+  Watcher = Aggkit::Watcher
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker_toolkit
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.2.0
 platform: ruby
 authors:
 - Godko Ivan
@@ -9,38 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-08 00:00:00.000000000 Z
+date: 2019-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: diplomat
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: dotenv
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
+  name: aggkit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="