docker_toolkit 0.1.20 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bf86f05ad92b1bc8a9d2c716f4d43ed623822704d6b2f7f2cb1cd450bba045b
-  data.tar.gz: 633486188aa3b061625e24d3e8b4b854a9e59b7ac2ca773a041ef6fef0b45c1c
+  metadata.gz: f203e1bb70de96bcdfdcb341bc0e4eb3466a2a2a8aa6ebc00653c9e26427674f
+  data.tar.gz: cbd053c7089875d83694327eea6bf0f7c19e6cb2912777fd6c7156f0bcf7d44f
 SHA512:
-  metadata.gz: 1b228ca1cee6f826eadf20eb7fc8b1eeae3dd7a50b5e2e636e130904a5811107fde91f211324378510113b2ffb9bfdd39926a240e5089c51b18dab55eeaf1211
-  data.tar.gz: 8cacc284e037a69dec8f61046c9b85cfdd0c2e02ca4399b6d4094d15293aff4bd4deed4b958b83ce564442a8bf0f11b049ad753ec44d0d01c042cc789e0dfa3e
+  metadata.gz: 64d05ccf038c5f4ed63de2c09071632065399f23f34bf3a6ad13d7ff7a877ee00d7c879596df4819a81676e910beb827fd9a4709f658d74c07f81825540cdce8
+  data.tar.gz: 38aac6414f3106ec403f8570314774c2de7d0b548400f9c6eb4d3ee53b382675253e1aa6788ec814ac63eb3283aabebac5974fd96effc70bf323c1c460dc3693

data/Gemfile.lock

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

data/bin/waiter.rb

@@ -64,7 +64,7 @@ OptionParser.new do |o|
     @opts[:consul_service_count] = count.to_i
   end
 
-  o.on("--consul-tag tag", 'Filter consul service by tag') do |tag|
+  o.on('--consul-tag tag', 'Filter consul service by tag') do |tag|
     @opts[:consul_tag] = tag.to_s
   end
 
@@ -156,7 +156,11 @@ def wait_for_consul_service(service)
     cmd = "curl -s #{@opts[:consul_addr]}/v1/health/service/#{service}?passing"
     cmd += "&tag=#{@opts[:consul_tag]}" if @opts[:consul_tag]
     result = `#{cmd}`
-    result = JSON.parse(result) rescue []
+    result = begin
+               JSON.parse(result)
+             rescue StandardError
+               []
+             end
     result.count >= @opts[:consul_service_count]
   end
 

data/lib/docker_toolkit/runner.rb

@@ -6,7 +6,7 @@ module DockerToolkit
 
   module Runner
 
-    def init_service service
+    def init_service(service)
       STDOUT.sync = true
       STDERR.sync = true
 
@@ -34,6 +34,11 @@ module DockerToolkit
       envs
     end
 
+    def load_envs_from_consul(consul, service)
+      envs = execute!("consul.rb --consul=http://#{consul}:8500 --env services/env/#{service} --pristine -d", "Can't load envs")
+      load_envs(envs)
+    end
+
     def execute(cmd)
       puts "Executing: #{cmd}"
       output = `#{cmd}`

data/lib/docker_toolkit/version.rb

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

data/lib/docker_toolkit/watcher.rb

@@ -109,7 +109,7 @@ module DockerToolkit
         stdout: rout,
         stderr: rerr,
         stdin: process.io.stdin,
-        termcmd: options[:termcmd],
+        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.20
+  version: 0.1.21
 platform: ruby
 authors:
 - Godko Ivan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-12 00:00:00.000000000 Z
+date: 2018-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diplomat