docker_toolkit 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d935e4bd836ceca9cb0917d1faec74ffd91119169e9a3df7d5d361fd0b7fec0
-  data.tar.gz: 987ae5d719e8f65c7e66a80fbf2ab98879187964a8de0de0733463460dbed6d3
+  metadata.gz: 8c4b61f2f778550a54b6624e8cf0ca452dbbcdc9ef5898d1f1d1ff613f3d35b0
+  data.tar.gz: c88fcd9cca74e20499d497a98f1642c4d70675d7bad603ae46d847f236784ec5
 SHA512:
-  metadata.gz: 86d0413625caf52c980135b33189fcfaa37e191e0d5e930a332b3c5e4874ed77b8ea5d3e271136a38bdc97b3a3c2930e702574d70cd8acd4748373dd5bd834b4
-  data.tar.gz: 9e53104e56f7fada1adc7aa7b5015f3cab50119c688da2ca59a5048652b595af7f379f9525a3c569526809f36921fbf8159e811eca6d0db6a793e56a85b17137
+  metadata.gz: cbba6fd41edf1c4b9139cd2d41ce0da4576dc4dda28f04352d18c39797426751af59f6a4bcce8498df0bbacc87703f6e1b95c6634fd43d77505268762945790c
+  data.tar.gz: cbe40ccf9cf5c8a05602db56f47291bd65030ad8f3592723415c5ce1caca2f03691579fb47c2268b0aeefed0eb0ad67b2472ee568cf652d8322fe476b006cb1a

data/Gemfile.lock

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

data/README.md

@@ -27,6 +27,7 @@ Usage: waiter.rb [options] -- exec
                                      HTTP addres to connect to consul
         --consul                     Wait for local consul agent to be ready
         --consul-service service     Wait for service appear in consul
+        --consul-service-count count  Wait for this count services appear in consul
         --user user                  username
         --pass pass                  password
     -t, --timeout secs=15            Total timeout

data/bin/waiter.rb

@@ -22,6 +22,7 @@ INTERVAL = 3
 @opts[:timeout] = TIMEOUT
 @opts[:interval] = INTERVAL
 @opts[:consul_addr] = 'http://localhost:8500'
+@opts[:consul_service_count] = 1
 
 
 OptionParser.new do |o|
@@ -58,6 +59,10 @@ OptionParser.new do |o|
     @opts[:consul_service] = service
   end
 
+  o.on("--consul-service-count count=#{@opts[:consul_service_count]}", 'Wait for this count of service appear in consul') do |count|
+    @opts[:consul_service_count] = count.to_i
+  end
+
   o.on('--user user', 'username') do |user|
     @opts[:user] = user.strip
   end
@@ -143,9 +148,9 @@ end
 def wait_for_consul_service(service)
   log("Waiting for consul service #{service}...")
   ret = wait_for @opts[:timeout] do
-    cmd = "curl -s #{@opts[:consul_addr]}/v1/health/service/#{service}?passing | wc -c"
-    bytes = `#{cmd}`.to_i
-    bytes > 10
+    cmd = "curl -s #{@opts[:consul_addr]}/v1/health/service/#{service}?passing"
+    result = JSON.parse(`#{cmd}`) rescue []
+    result.count >= @opts[:consul_service_count]
   end
 
   yield(ret)

data/lib/docker_toolkit/version.rb

@@ -1,5 +1,5 @@
 module DockerToolkit
 
-  VERSION = '0.1.16'.freeze
+  VERSION = '0.1.17'.freeze
 
 end

metadata

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