aggkit 0.4.4.12292 → 0.4.4.12293

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7e60deba3fa62e58fca16ad17c510ad79184ac9
-  data.tar.gz: 52b36d4af259d772575b8b1f869b3ddc02ef7178
+  metadata.gz: 330e0e63f8b3fb0f59ff1b3906cc34dbb7277d5c
+  data.tar.gz: a7f1657a0353c8ede9b8e53a85e785980b76645d
 SHA512:
-  metadata.gz: 543131a585b51005c7d40c31825f0bbfed6ae5e17903510bcc1afdd85f907f51cf84f3a9fa81be9a77f0035da019ff545119f17e3fe269ae86b3f29ba9fe3a74
-  data.tar.gz: 7404283ebc889e58b061dcf0179d6a9cfec1da120cf00214f59e4c8d817737cdbe78ae6e1e47e4588f7df20845d0a59362b0379b057314bd3109faffbb905b3e
+  metadata.gz: 3117d8862c4e4cf7928a396dccd4773fd0cea712f60c6a3c0284d4cc06d1bc7ec31ad20689a433ffb556dff531c7d426d5e43dcf5f99b6cb1d54f0d796202e81
+  data.tar.gz: 4700b1dd3be7e1eee5356acbb744910b3839598bc8df57383bc17e506923950788021ecf333995b6cae48ab6ea164cd01aa8311918309148ba6dad776dc06d2c

data/README.md

@@ -9,9 +9,28 @@ Helper tools for work with docker and consul
 
 Some useful scripts to run inside or outside container
 
-### waiter.rb
+### aggexec
 
-waiter.rb allows to wait many conditions:
+aggexec to start process in context of consul:
+
+* load environment variables from Consul KV
+* preprocess template files with loaded environment variables
+* wait for healty status of consul services
+
+```
+Usage: aggexec [options] -- exec
+        --consul=http://localhost:8500
+                                     Set consul http address. CONSUL_HTTP_ADDR env can be used instead
+        --depends=mq,db,router...    Set list of services to wait for ready before start
+        --prefix=kv/folder/path      Consul KV prefix to load envs from. Multiple prefixes are merged from left to right.
+        --service=<SERVICE>          Showrtcut for --prefix=services/env/<SERVICE>. Multiple prefixes are merged from left to right.
+        --templates=<FOLDER>         Folder for recursive ensubst *.in templates. Multiple prefixes are merged from left to right.
+```
+
+
+### aggwait
+
+aggwait allows to wait many conditions:
 
 * tcp port opening
 * PostgreSQL database creation
@@ -20,7 +39,7 @@ waiter.rb allows to wait many conditions:
 * healthy Consul service 
 
 ```
-Usage: waiter.rb [options] -- exec
+Usage: aggwait [options] -- exec
         --tcp host:port              Wait for tcp accepts on host:port
         --db dbname                  Wait for PG database exists. Using --tcp to conenct PG
         --tb tablename               Wait for PG table exists. Using --tcp to conenct PG
@@ -29,10 +48,12 @@ 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-tag tag             User tag to filter services in consul
+        --consul-service-count count=1
+                                     Wait for this count of service appear in consul
+        --consul-tag tag             Filter consul service by tag
         --user user                  username
         --pass pass                  password
+        --docker=SOCKET              wait for docker available
     -t, --timeout secs=15            Total timeout
     -i, --interval secs=2            Interval between attempts
     -q, --quiet                      Do not output any status messages
@@ -49,7 +70,7 @@ Helper to use Consul in 12Factor application. Inspired by https://github.com/has
 * read files and store it in Consul key/value  store
 
 ```
-Usage: consul.rb [options] -- exec
+Usage: aggconsul [options] -- exec
         --consul url                 Set up a custom Consul URL
         --token token                Connect into consul with custom access token (ACL)
         --init [service]             Initialize Consul services from config

data/bin/aggconsul

@@ -16,6 +16,8 @@ end
   consul: ENV['CONSUL_HTTP_ADDR']
 }
 
+UTIL = File.basename(__FILE__)
+
 @opts[:exec] = (begin
                   ARGV.join(' ').split(' -- ')[1].strip
                 rescue StandardError
@@ -23,7 +25,7 @@ end
                 end)
 
 parser = OptionParser.new do |o|
-  o.banner = 'Usage: consul.rb [options] -- exec'
+  o.banner = "Usage: #{UTIL} [options] -- exec"
 
   o.on('--consul url', 'Set up a custom Consul URL') do |consul|
     ENV['CONSUL_HTTP_ADDR'] = if consul.to_s['http']

data/bin/aggexec

@@ -23,7 +23,7 @@ end
                 end)
 
 parser = Aggkit::OptionParser.new do |o|
-  o.banner = "Usage: #{UTIL} [options]"
+  o.banner = "Usage: #{UTIL} [options] -- exec"
 
   o.on("--consul=#{@opts[:consul]}", 'Set consul http address. CONSUL_HTTP_ADDR env can be used instead') do |consul|
     ENV['CONSUL_HTTP_ADDR'] = Aggkit::Consul.consul_addr(consul)

data/bin/aggwait

@@ -15,6 +15,8 @@ INTERVAL = 3
 
 @opts = {}
 
+UTIL = File.basename(__FILE__)
+
 if ENV['CONSUL_HTTP_ADDR'].to_s.empty?
   ENV['CONSUL_HTTP_ADDR'] = "http://#{ENV['CONSUL_HOST'] || 'localhost'}:8500"
 end
@@ -31,7 +33,7 @@ end
 
 
 OptionParser.new do |o|
-  o.banner = 'Usage: waiter.rb [options] -- exec'
+  o.banner = "Usage: #{UTIL} [options] -- exec"
 
   o.on('--tcp host:port', 'Wait for tcp accepts on host:port') do |addr|
     host, port = addr.split(':')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aggkit
 version: !ruby/object:Gem::Version
-  version: 0.4.4.12292
+  version: 0.4.4.12293
 platform: ruby
 authors:
 - Godko Ivan