docker_toolkit 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37e19e4995dbe0cc868b51fdae6fc18b69d26e12c85a68b8364113e19b7efdf8
-  data.tar.gz: 243fb2286022970786e1cdde0bffafacf35f6d5b9dd33fb9c1f1ea1b433e5626
+  metadata.gz: 230ac560d5572314c74c9bb672fa96705409d5c599c65f25e8ff7085e485e19e
+  data.tar.gz: b85ee60c82658dd39f1be73a4005b478ba3fda5f263ef1d63371eae6aa3292fb
 SHA512:
-  metadata.gz: 0553be938e83e0d9359181234499cf1cb10cf0fe0152eab1d29c8bd33f805810da1a8eb67bc0dd0e302cacd73a1eaa02f023c82827b66cc92efc5f7e21a91d20
-  data.tar.gz: 38a0e77028d94411d4da7ceccf40a34f8b2fa87f4147842e95cbc0340b211733af572e8e817d8f4ec281557d83f80db5cf53917fd9a2b9837744916bfe61a628
+  metadata.gz: 4567251c79471403d0093224d99d57d650bbb2cbb2113487c7cc3ad3d127d75fb59c8f00486bdcd72806ee51a3a8e4074bf182828f2ebbd1c1a2c655edd8e814
+  data.tar.gz: 5140b439d81a523f9a50ab538027ecf439f7074f5b89426175c65334d39093005a5f76a5ffce611173bae8d8398f1b91acd264cdcf8181d6de6b1125908608cd

data/.rubocop.yml

@@ -3,6 +3,12 @@ AllCops:
   Exclude:
     - 'storage/**/*'
     - 'docker/**/*'
+    - 'lib/docker_toolkit/childprocess/**/*'
+    - 'lib/docker_toolkit/childprocess,rb'
+    
+
+Security/YAMLLoad:
+  Enabled: false
 
 Style/AsciiComments:
   Enabled: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    docker_toolkit (0.1.3)
+    docker_toolkit (0.1.4)
       diplomat
       json
 

data/bin/consul.rb

@@ -102,7 +102,7 @@ def dereferenced_value(value)
 end
 
 if config = @opts[:config]
-  @opts[:config] = YAML.safe_load(config == '-' ? STDIN.read : File.read(config), [], [], true)
+  @opts[:config] = YAML.load(config == '-' ? STDIN.read : File.read(config))
 end
 
 if @opts[:init]

data/bin/merger.rb

@@ -76,9 +76,9 @@ def process_compose_hash(yml, dirname, parent = {})
              end
 
              tmp = if File.exist?(dirname + '/' + file)
-                     YAML.safe_load(File.read(dirname + '/' + file))
+                     YAML.load(File.read(dirname + '/' + file))
                    else
-                     YAML.safe_load(File.read(file))
+                     YAML.load(File.read(file))
              end
 
              begin
@@ -99,7 +99,7 @@ end
 
 if File.basename($PROGRAM_NAME) == File.basename(__FILE__)
   result = ENV['COMPOSE_FILE'].split(':').reduce({}) do |parent, file|
-    yml = process_compose_hash(YAML.safe_load(File.read(file)), File.dirname(file), parent)
+    yml = process_compose_hash(YAML.load(File.read(file)), File.dirname(file), parent)
     if yml['version'] && parent['version'] && yml['version'] != parent['version']
       raise "version mismatch: #{file}"
     end

data/bin/terminator.rb

@@ -11,6 +11,13 @@ STDERR.sync = true
   term_code: 0
 }
 
+def log(msg)
+  puts "[terminator]: #{msg}"
+end
+
+log "started: #{ARGV.inspect}"
+
+
 parser = OptionParser.new do |o|
   o.banner = 'Usage: term.rb [options]'
 
@@ -33,24 +40,32 @@ parser = OptionParser.new do |o|
   o.on('--kill', 'SIGKILL self') do
     @opts[:kill] = true
   end
-
 end
 parser.parse!
 
-def log msg
-  puts "[terminator]: #{msg}"
-end
+
 
 
 %w[INT TERM].each do |sig|
   trap(sig) do
+    log "signal: #{sig}. exit: #{@opts[:term_code]}"
     exit(@opts[:term_code])
   end
-end 
+end
 
+log 'sleep...'
 sleep @opts[:sleep]
 
-::Process.kill('KILL', $$) if @opts[:kill]
-::Process.kill('TERM', $$) if @opts[:term]
+log 'go'
+if @opts[:kill]
+  log 'kill self'
+  ::Process.kill('KILL', $PROCESS_ID)
+end
+
+if @opts[:term]
+  log 'term self'
+  ::Process.kill('TERM', $PROCESS_ID)
+end
 
-exit @opts[:code]
+log "normal exit with: #{@opts[:code]}"
+exit @opts[:code]

data/lib/docker_toolkit/childprocess.rb

@@ -2,16 +2,19 @@ require 'docker_toolkit/childprocess/version'
 require 'docker_toolkit/childprocess/errors'
 require 'docker_toolkit/childprocess/abstract_process'
 require 'docker_toolkit/childprocess/abstract_io'
-require "fcntl"
+require 'fcntl'
 require 'logger'
 
 module DockerToolkit
 
-module ChildProcess
+  module ChildProcess
+
+
+    @posix_spawn = false
+
+    class << self
 
-  @posix_spawn = false
 
-  class << self
     attr_writer :logger
 
     def new(*args)
@@ -27,13 +30,13 @@ module ChildProcess
       when :windows
         Windows::Process.new(args)
       else
-        raise Error, "unsupported platform #{platform_name.inspect}"
+        raise Error.new("unsupported platform #{platform_name.inspect}")
       end
     end
-    alias_method :build, :new
+    alias build new
 
     def logger
-      return @logger if defined?(@logger) and @logger
+      return @logger if defined?(@logger) && @logger
 
       @logger = Logger.new($stderr)
       @logger.level = $DEBUG ? Logger::DEBUG : Logger::INFO
@@ -42,9 +45,9 @@ module ChildProcess
     end
 
     def platform
-      if RUBY_PLATFORM == "java"
+      if RUBY_PLATFORM == 'java'
         :jruby
-      elsif defined?(RUBY_ENGINE) && RUBY_ENGINE == "ironruby"
+      elsif defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ironruby'
         :ironruby
       else
         os
@@ -82,7 +85,7 @@ module ChildProcess
         raise ChildProcess::MissingPlatformError
       end
 
-      require "childprocess/unix/lib"
+      require 'childprocess/unix/lib'
       require 'childprocess/unix/posix_spawn_process'
 
       true
@@ -95,13 +98,11 @@ module ChildProcess
     # Set this to true to enable experimental use of posix_spawn.
     #
 
-    def posix_spawn=(bool)
-      @posix_spawn = bool
-    end
+    attr_writer :posix_spawn
 
     def os
-      @os ||= (
-        require "rbconfig"
+      @os ||= begin
+        require 'rbconfig'
         host_os = RbConfig::CONFIG['host_os'].downcase
 
         case host_os
@@ -120,30 +121,30 @@ module ChildProcess
         when /aix/
           :aix
         else
-          raise Error, "unknown os: #{host_os.inspect}"
+          raise Error.new("unknown os: #{host_os.inspect}")
         end
-      )
+      end
     end
 
     def arch
-      @arch ||= (
+      @arch ||= begin
         host_cpu = RbConfig::CONFIG['host_cpu'].downcase
         case host_cpu
         when /i[3456]86/
           if workaround_older_macosx_misreported_cpu?
             # Workaround case: older 64-bit Darwin Rubies misreported as i686
-            "x86_64"
+            'x86_64'
           else
-            "i386"
+            'i386'
           end
         when /amd64|x86_64/
-          "x86_64"
+          'x86_64'
         when /ppc|powerpc/
-          "powerpc"
+          'powerpc'
         else
           host_cpu
         end
-      )
+      end
     end
 
     #
@@ -167,38 +168,42 @@ module ChildProcess
       elsif windows?
         Windows::Lib.dont_inherit file
       else
-        raise Error, "not sure how to set close-on-exec for #{file.inspect} on #{platform_name.inspect}"
+        raise Error.new("not sure how to set close-on-exec for #{file.inspect} on #{platform_name.inspect}")
       end
     end
 
-    private
+      private
 
-    def warn_once(msg)
-      @warnings ||= {}
+      def warn_once(msg)
+        @warnings ||= {}
 
-      unless @warnings[msg]
-        @warnings[msg] = true
-        logger.warn msg
+        unless @warnings[msg]
+          @warnings[msg] = true
+          logger.warn msg
+        end
       end
-    end
 
-    # Workaround: detect the situation that an older Darwin Ruby is actually
-    # 64-bit, but is misreporting cpu as i686, which would imply 32-bit.
-    #
-    # @return [Boolean] `true` if:
-    #   (a) on Mac OS X
-    #   (b) actually running in 64-bit mode
-    def workaround_older_macosx_misreported_cpu?
-      os == :macosx && is_64_bit?
-    end
+      # Workaround: detect the situation that an older Darwin Ruby is actually
+      # 64-bit, but is misreporting cpu as i686, which would imply 32-bit.
+      #
+      # @return [Boolean] `true` if:
+      #   (a) on Mac OS X
+      #   (b) actually running in 64-bit mode
+      def workaround_older_macosx_misreported_cpu?
+        os == :macosx && is_64_bit?
+      end
+
+      # @return [Boolean] `true` if this Ruby represents `1` in 64 bits (8 bytes).
+      def is_64_bit?
+        1.size == 8
+      end
+
+
+    end # class << self
 
-    # @return [Boolean] `true` if this Ruby represents `1` in 64 bits (8 bytes).
-    def is_64_bit?
-      1.size == 8
-    end
 
-  end # class << self
 end # ChildProcess
+
 end # DockerToolkit
 
 require 'jruby' if DockerToolkit::ChildProcess.jruby?

data/lib/docker_toolkit/version.rb

@@ -1,5 +1,5 @@
 module DockerToolkit
 
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.1.4'.freeze
 
 end

data/lib/docker_toolkit/watcher.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker_toolkit
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Godko Ivan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-10 00:00:00.000000000 Z
+date: 2018-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diplomat