aggkit 0.4.8.19806 → 0.4.9.19910

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0746cb8e1d46fa1f4becb1caf02210127697d40bc245aa2f5292933cddaf4352
-  data.tar.gz: a29ab236147f39ebdc47d1fef0a243b2edcd7a4016bd06566106c3e99e994470
+  metadata.gz: b657b5dea23eb5fbff2e12ee3b2cc60b6b38fd08c8dacd0228617f686e43ed32
+  data.tar.gz: 372f667ba11d9eca4a6f99384d740a8d873e5d2b9a50929387dffe803a1f599d
 SHA512:
-  metadata.gz: b5981c2c7d7706cd39c24060bef5e6caf24faafe53f3265da97d8c003e2141241295b3c8e7eaad5d1f6072fb94fe6821b8cbfd810a3cbfe49ab904e6043a4b37
-  data.tar.gz: a5d83805be2b6fe4ac18f6ae9276a008590f4fc2bf6f91016d7613c0e01ae45f430c3bec6b3dda49966a163409bfc495d7fbe0afeabdd56fb11b29bea4905bcf
+  metadata.gz: 445208a0a5b4f92701cbca89ce00d34be699abf292fe76242ec4039297d73841585c9eb4085d91c943af501a61e52f00f5758eb3b23e69beb3586e11f59f4a1e
+  data.tar.gz: b1489233760caea865521f3af563a5201461cf5b6c67fa164ddd6f77bd04589f6d43a21758b49215d686c74d5329a8f78ef646d10986d33a84b2d56d8f4bc8ee

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    aggkit (0.4.8.19806)
+    aggkit (0.4.9.19910)
       diplomat
       dotenv
       json
@@ -19,7 +19,7 @@ GEM
       faraday (~> 0.9)
     docile (1.3.1)
     dotenv (2.7.5)
-    faraday (0.17.0)
+    faraday (0.17.1)
       multipart-post (>= 1.2, < 3)
     json (2.2.0)
     multipart-post (2.1.1)

data/bin/aggexec

@@ -36,7 +36,7 @@ parser = Aggkit::OptionParser.new do |o|
     @opts[:consul_port] = port.to_s.strip
   end
 
-  o.on('--depends=mq,db,router...', 'Set list of services to wait for ready before start') do |list|
+  o.on('--depends=mq,db,router...', 'Set list of services to wait for ready before start. Service can be [<tag>@]<service> form') do |list|
     @opts[:depends] += list.to_s.split(/[ ;,|]/).map(&:to_s).reject(&:empty?)
   end
 

data/bin/aggwait

@@ -68,15 +68,15 @@ OptionParser.new do |o|
     @opts[:consul] = true
   end
 
-  o.on('--consul-service service', 'Wait for service appear in consul') do |service|
-    @opts[:consul_service] = service
+  o.on('--consul-service service', 'Wait for service appear in consul. can be [<tag>@]<service>') do |service|
+    @opts[:consul_service] = service.strip
   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('--consul-tag tag', 'Filter consul service by tag') do |tag|
+  o.on('--consul-tag tag', 'DEPRECATED. Filter consul service by tag') do |tag|
     @opts[:consul_tag] = tag.to_s
   end
 
@@ -171,11 +171,20 @@ def wait_for_consul
   yield(ret)
 end
 
-def wait_for_consul_service(service)
-  log("Waiting for consul service #{service}...")
+def wait_for_consul_service(tag_with_service)
+  tag, service = tag_with_service.split('@')
+  if service.nil?
+    service = tag
+    tag = nil
+  end
+
+  tag ||= @opts[:consul_tag]
+
+  log("Waiting for consul service #{service}#{tag ? " with tag #{tag}" : ''}...")
   ret = wait_for @opts[:timeout] do
-    cmd = "curl -s #{@opts[:consul_addr]}/v1/health/service/#{service}?passing"
-    cmd += "&tag=#{@opts[:consul_tag]}" if @opts[:consul_tag]
+    tag_query = tag ? "&tag=#{tag}" : ''
+    cmd = "curl -s \"#{@opts[:consul_addr]}/v1/health/service/#{service}?passing#{tag_query}\""
+
     result = `#{cmd}`
     result = begin
                JSON.parse(result)

data/lib/aggkit/version.rb

@@ -1,6 +1,6 @@
 module Aggkit
 
-  VERSION = '0.4.8'.freeze
+  VERSION = '0.4.9'.freeze
 
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aggkit
 version: !ruby/object:Gem::Version
-  version: 0.4.8.19806
+  version: 0.4.9.19910
 platform: ruby
 authors:
 - Godko Ivan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-27 00:00:00.000000000 Z
+date: 2019-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diplomat