docker_toolkit 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c4b61f2f778550a54b6624e8cf0ca452dbbcdc9ef5898d1f1d1ff613f3d35b0
-  data.tar.gz: c88fcd9cca74e20499d497a98f1642c4d70675d7bad603ae46d847f236784ec5
+  metadata.gz: 2e506b5bda30e8b2af3f83b98321384feb54f23008546802c67fc20fecdb19cb
+  data.tar.gz: 13628761544fbccbb6fc59ef47ba8e06730f2020913dd341cf380d52c59bbdee
 SHA512:
-  metadata.gz: cbba6fd41edf1c4b9139cd2d41ce0da4576dc4dda28f04352d18c39797426751af59f6a4bcce8498df0bbacc87703f6e1b95c6634fd43d77505268762945790c
-  data.tar.gz: cbe40ccf9cf5c8a05602db56f47291bd65030ad8f3592723415c5ce1caca2f03691579fb47c2268b0aeefed0eb0ad67b2472ee568cf652d8322fe476b006cb1a
+  metadata.gz: fadbd3a24e4280cf5c347574dd711b85f4701a2a6c687caf9310b6039890488b7b6e2fed065e0ee18b972c8c3358930b3e6006b72ba71b86ec573a7578a7900a
+  data.tar.gz: '09b7f73b9f6842b5e3b57532f732c75a71e22d18e05ee33f23ae5338102ca7a077b0eb95dcc9498c0534e7ca4ec1652c75ba6a00b7019910e282788204f5b2d2'

data/README.md

@@ -27,7 +27,8 @@ 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
+        --consul-service-count count Wait for this count services appear in consul
+        --consul-tag tag             User tag to filter services in consul
         --user user                  username
         --pass pass                  password
     -t, --timeout secs=15            Total timeout

data/bin/waiter.rb

@@ -5,6 +5,7 @@ require 'securerandom'
 require 'English'
 require 'openssl'
 require 'tempfile'
+require 'json'
 
 STDOUT.sync = true
 STDERR.sync = true
@@ -63,6 +64,10 @@ OptionParser.new do |o|
     @opts[:consul_service_count] = count.to_i
   end
 
+  o.on("--consul-tag tag", 'Filter consul service by tag') do |tag|
+    @opts[:consul_tag] = tag.to_s
+  end
+
   o.on('--user user', 'username') do |user|
     @opts[:user] = user.strip
   end
@@ -149,7 +154,9 @@ 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"
-    result = JSON.parse(`#{cmd}`) rescue []
+    cmd += "&tag=#{@opts[:consul_tag]}" if @opts[:consul_tag]
+    result = `#{cmd}`
+    result = JSON.parse(result) rescue []
     result.count >= @opts[:consul_service_count]
   end
 

data/lib/docker_toolkit/version.rb

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

metadata

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