docker_toolkit 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d16607a50a2e8821a42816dcf9793576c67858acc80dcd99ae45a5240a43c1e1
-  data.tar.gz: 93efc51ea006962e6af5c9cc17f806b69b6e95a00c3c81907cc306db22558c3f
+  metadata.gz: 8d6d127fd4fbc93569238e201ee3400b5ce8949edc4d22e28fe9a4ff899c66ec
+  data.tar.gz: db197202c36f8a5afa0588818313288bcffbbbc2319c90be23922eacb3fb0e4d
 SHA512:
-  metadata.gz: 3bd5eed066256cb59744381a5ddef6e0b4a6936561c7b2e91201abacb10865f92c06889de54e6d481b3b36c10e67ceb182da3aee777be3237f2b8d353168b95a
-  data.tar.gz: f82e50fa54fa61268249f8c186984951a586bf57c35ce36ba0f314308075458dc18a82e9bc63c9b9fceb4cbfe3177273b76b800405aa2c6e9871d7d5f65010bf
+  metadata.gz: fb9cfb56bbdda94b81cdd5ba73d041a3bd12b411a2416869bf8a496848c26d13f9edfdbf9005a11e14a02211fbbeac24a3400b14d9e449840755efdd72800d13
+  data.tar.gz: 4fad8c01377d15968f83503210a17afb5ee39c34ab3b3ea684a9053cbcdf154e6463f37d647e7a23be38ba2c17591104e56d9762470304ac3ba733c1acb4928a

data/Gemfile.lock

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

data/README.md

@@ -2,3 +2,93 @@
 Helper tools for work with docker and consul
 
 [![Build Status](https://travis-ci.com/RnD-Soft/docker_toolkit.svg?branch=master)](https://travis-ci.com/RnD-Soft/docker_toolkit) [![Gem Version](https://badge.fury.io/rb/docker_toolkit.svg)](https://badge.fury.io/rb/docker_toolkit)
+
+## Scripts
+
+Some useful scripts to run inside or outside container
+
+### waiter.rb
+
+waiter.rb allows to wait many conditions:
+
+* tcp port opening
+* PostgreSQL database creation
+* PostgreSQL table creation
+* file creation
+* healthy Consul service 
+
+```
+Usage: waiter.rb [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
+    -f, --file filename              Wait for file exists.
+        --consul-addr addr=http://localhost:8500
+                                     HTTP addres to connect to consul
+        --consul                     Wait for local consul agent to be ready
+        --consul-service service     Wait for service appear in consul
+        --user user                  username
+        --pass pass                  password
+    -t, --timeout secs=15            Total timeout
+    -i, --interval secs=2            Interval between attempts
+    -q, --quiet                      Do not output any status messages
+```
+
+
+### consul.rb
+
+Helper to use Consul in 12Factor application. Inspired by https://github.com/hashicorp/envconsul:
+
+* export Consul key/value as environment variables
+* references in Consul key/value store
+* read config file and store values in Consul
+* read files and store it in Consul key/value  store
+
+```
+Usage: consul.rb [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
+        --config file                Read service configulation from file
+        --upload                     Upload files to variables
+        --show [service]             Show service configulation from Consul
+        --override                   override existed keys
+    -d, --dereference                dereference consul values in form of "consul://key/subkey"
+        --env prefix                 export KV values from prefix as env varaibles
+        --export                     add export to --env output
+        --pristine                   not include the parent processes' environment when exec child process
+        --put path:value             put value to path
+        --get path                   get value from
+```
+
+Example config.yml:
+```yaml
+.dbconfig: &dbconfig
+  DATABASE_HOST:
+    value: db
+  DATABASE_NAME:
+    value: dbname
+
+srv1: &srv1
+  <<: [*dbconfig]
+  LOG_LEVEL:
+    value: debug
+  CA_CERT:
+    file: /tmp/ca/cacert.pem
+  CLIENT_CERT:
+    value: consul://services/ca/private/cert.pem
+  CLIENT_KEY:
+    value: consul://services/ca/private/key.pem
+
+srv2:
+  <<: *srv1
+  CA_CERT:
+    value: consul://services/env/srv1/ca_cert
+```
+
+### merger.rb
+
+Merge docker-compose file of any version. Allow inheritance and extending services.
+```bash
+COMPOSE_FILE=file1.yml:file2.yml merger.rb > /tmp/result.yml
+```

data/lib/docker_toolkit/runner.rb

@@ -37,8 +37,8 @@ module DockerToolkit
       env[key]
     end
 
-    def envsubst *paths
-      paths = paths.flatten.map{|c| c.to_s.strip}.reject(&:empty?)
+    def envsubst(*paths)
+      paths = paths.flatten.map{|c| c.to_s.strip }.reject(&:empty?)
       paths.each do |path|
         Dir.glob("#{path}/**/*.in") do |templ|
           output = templ.sub(/\.in$/, '')
@@ -48,9 +48,9 @@ module DockerToolkit
       end
     end
 
-    def envsubst_file templ, output = nil
+    def envsubst_file(templ, output = nil)
       output ||= templ.sub(/\.in$/, '')
-      die("filename must ends with .in or output must be provided") if output.strip == templ.strip
+      die('filename must ends with .in or output must be provided') if output.strip == templ.strip
       cmd = "cat '#{templ}' | envsubst > '#{output}'"
       system(cmd) || die("envsubst failed: #{cmd}")
     end

data/lib/docker_toolkit/version.rb

@@ -1,5 +1,5 @@
 module DockerToolkit
 
-  VERSION = '0.1.12'.freeze
+  VERSION = '0.1.13'.freeze
 
 end

data/lib/docker_toolkit/watcher.rb

@@ -75,7 +75,7 @@ module DockerToolkit
         end
 
     def add(*cmd)
-      cmd = cmd.flatten.map{|c| c.to_s.strip}.reject(&:empty?)
+      cmd = cmd.flatten.map{|c| c.to_s.strip }.reject(&:empty?)
       process = ChildProcess.build(*cmd)
 
       rerr, werr = IO.pipe

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker_toolkit
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Godko Ivan
@@ -161,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Helper scripts for work with docker and consul