aggkit 0.2.6.8250 → 0.2.6.8329

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed42b42b8001ba82d6139bf6d94598e86bc87f34
-  data.tar.gz: 4ad91cf44ecd2e40a5fc4f7aeae3757c89a20171
+  metadata.gz: dda760666b51369b116244aa6cc3ead5f69afb41
+  data.tar.gz: 3df47be27d64b70300707667651893475a30ff92
 SHA512:
-  metadata.gz: c2cef1a46a08ea9a5f432d31324f2f422adaaa955a7abfe5e7265f19783d8741a63f7697adb499e241f00c991c0e5edee50747ec774d173ecbb27c9535023950
-  data.tar.gz: ab2a09f904b76b1229e2a7e2ecfa16e6dddef79b4d758ea51efd625dd8222f40e565e336c55e1fb8769d366b791dd5d8869f926a0905a64cb7ea1dd168c2dd53
+  metadata.gz: 63d4ab22451f3cc95e16653f49776cba230e194e8f580bc54828a7e10037ab761352e1dbfa7adccdf35cec1acd0a34586c04c0049961de28045e40584b17928b
+  data.tar.gz: a820f88d3be11610a7f8bff76c1c387c334d5892eede30c96f6a146071d5ac8e859eec9a114af9982a1ab1a7ac7930a17dc3edab17c3daaa7df731b6fa558641

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    aggkit (0.2.6.8250)
+    aggkit (0.2.6.8329)
       diplomat
       dotenv
       json

data/aggkit.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'dotenv'
   spec.add_dependency 'json'
   spec.add_dependency 'tty-tree'
+ 
   
 
   spec.add_development_dependency 'bundler', '~> 1.14'

data/bin/agg

@@ -5,6 +5,8 @@ require 'tty-tree'
 require 'aggkit/env'
 require 'json'
 
+UTIL = File.basename(__FILE__)
+
 @commands = {}
 
 @exec = (begin
@@ -20,13 +22,13 @@ require 'json'
 
 
 exmaple_usage = "
-  #{'agg env --list'.ljust(30)} - list avaibale environments
-  #{'agg <envname> --show'.ljust(30)} - show environment details
-  #{'agg <envname> exec -- cmd'.ljust(30)} - exec command in environment
+  #{"#{UTIL} env --list".ljust(30)} - list avaibale environments
+  #{"#{UTIL} <envname> --show".ljust(30)} - show environment details
+  #{"#{UTIL} <envname> exec -- cmd".ljust(30)} - exec command in environment
 "
 
 env_cmd_parser = OptionParser.new do |o|
-  o.banner = "Usage: agg env [options]"
+  o.banner = "Usage: #{UTIL} env [options]"
   o.on("-l", "--list", "list environments") do
     @opts[:list] = true
   end
@@ -36,7 +38,7 @@ env_cmd_parser = OptionParser.new do |o|
 end
 
 exec_cmd_parser = OptionParser.new do |o|
-  o.banner = "Usage: agg <envname> [options] exec [options] -- cmd"
+  o.banner = "Usage: #{UTIL} <envname> [options] exec [options] -- cmd"
   o.on('-p', '--pristine', "not include the parent processes' environment when exec child process") do
     @opts[:pristine] = true
   end
@@ -54,7 +56,7 @@ end
 }
 
 single_parser = OptionParser.new do |o|
-  o.banner = "Aggredator environment manager\nagg <envname> [options] [subcommand [options]]"
+  o.banner = "Aggredator environment manager\nUsage: #{UTIL} <envname> [options] [subcommand [options]]"
   
   o.on("-s", "--show", "show envname details") do
     @opts[:show] = true
@@ -64,6 +66,10 @@ single_parser = OptionParser.new do |o|
     @opts[:export] = true
   end
 
+  o.on("-r", "--release", "make release compose-result.yml(without build)") do
+    @opts[:release] = true
+  end
+
   o.on("-h", "--help", "show help") do
     puts o.help
     exit 0
@@ -74,7 +80,7 @@ single_parser = OptionParser.new do |o|
 end
 
 global_parser = OptionParser.new do |o|
-  o.banner = "Aggredator manager\nUsage: agg [envname] [options] [subcommand [options]]"
+  o.banner = "Aggredator manager\nUsage: #{UTIL} [envname] [options] [subcommand [options]]"
   
   o.on("-h", "--help", "show help") do
     puts o.help
@@ -144,6 +150,7 @@ def exec_command opts
   raise "envname not specified!" unless $env
   raise "cmd not specified!" unless @exec
 
+  $env.prepare release: @opts[:release]
   e = $env.environment
   e = ENV.to_h.merge(e) unless opts[:pristine]
 
@@ -161,6 +168,7 @@ if @commands[:single]
   if @opts[:show]
     raise "envname not specified!" unless $env
 
+    $env.prepare release: @opts[:release]
     puts JSON.pretty_generate($env.show)
     exit 0
   end
@@ -168,6 +176,7 @@ if @commands[:single]
   if @opts[:export]
     raise "envname not specified!" unless $env
 
+    $env.prepare release: @opts[:release]
     $env.environment.each_pair do |k, v|
       puts "export #{k.to_s}=\"#{v.to_s}\""
     end

data/bin/aggci

@@ -0,0 +1,90 @@
+#!/usr/bin/env ruby
+
+require 'optparse'
+require 'aggkit/ci'
+
+UTIL = File.basename(__FILE__)
+
+include Aggkit::Ci
+
+@opts = {
+  tag: ENV['CORE_TAG'] || ENV['CI_COMMIT_TAG'] || 'latest'
+}
+
+def parse_services services
+  [services].flatten.join(' ').split(/[,;| \n]/).map(&:strip).reject(&:empty?).uniq.sort
+end
+
+parser = OptionParser.new do |o|
+  o.banner = "Usage: #{UTIL} [options]"
+
+  o.on("--pull-cache services", 'Pull cache from docker regestry') do |services|
+    @opts[:pull] = parse_services(services)
+  end
+
+  o.on("--promote services", 'Promote service images to --stage') do |services|
+    @opts[:promote] = parse_services(services)
+  end
+
+  o.on("--promote-tag tag", 'Promote service images') do |tag|
+    @opts[:promotetag] = tag.to_s.strip
+  end
+
+  o.on("--stage stage", 'stage for image promotion Stages: dev, stge, tag') do |stage|
+    @opts[:stage] = stage.to_s.strip
+  end
+
+  o.on("--clean services", 'remove tags and images excluding last stable') do |services|
+    @opts[:clean] = parse_services(services)
+  end
+
+  o.on("--ssh-deploy env", 'ssh') do |env_and_server|
+    env, server = env_and_server.strip.split('@')
+    @opts[:deploy] = {env: env, server: server}
+  end
+
+  o.on("--tag tag=#{@opts[:tag].inspect}", 'Use tag as default tag for images') do |tag|
+    @opts[:tag] = tag.to_s.strip
+  end
+
+end
+parser.parse!
+
+if services = @opts[:pull]
+  raise "tag not defined" if @opts[:tag].to_s.empty?
+  pull_images_cache services, @opts[:tag]
+  exit 0
+elsif services = @opts[:promote]
+  raise "tag not defined" if @opts[:tag].to_s.empty?
+  raise "stage not defined" if @opts[:stage].to_s.empty?
+
+  case @opts[:stage]
+  when 'dev'
+    promote_services_to_dev!(services, @opts[:tag])
+  when 'stage'
+    promote_services_to_stage!(services, @opts[:tag])
+  when 'tag'
+    raise "promote-tag not defined" if @opts[:promotetag].to_s.empty?
+    promote_services_to_tag!(services, @opts[:tag], @opts[:promotetag])
+  else 
+    raise "invalid stage #{@opts[:stage].inspect} for promotion"
+  end
+
+  exit 0
+
+elsif services = @opts[:clean]
+  raise "tag not defined" if @opts[:tag].to_s.empty?
+  clean_services services, @opts[:tag]
+  exit 0
+
+elsif deploy = @opts[:deploy]
+  raise "tag not defined" if @opts[:tag].to_s.empty?
+  raise "stage not defined" if @opts[:stage].to_s.empty?
+  ssh_deploy 'service-fns', deploy[:env], deploy[:server], @opts[:tag], @opts[:stage]
+  exit 0
+end
+
+
+STDERR.puts parser.help
+exit 1
+

data/bin/aggmerge

@@ -11,6 +11,8 @@ if File.basename($PROGRAM_NAME) == File.basename(__FILE__)
 end
 
 
+@skipbuild = ARGV.join('')['--skip-build']
+
 class Hash
 
   def deep_dup
@@ -99,6 +101,23 @@ def process_compose_hash(yml, dirname, parent = {})
   yml
 end
 
+def remove_build_section hash
+  if hash.has_key?(:build) || hash.has_key?('build')
+    hash.delete(:build)
+    hash.delete('build')
+  end
+
+  hash.each_pair do |k, v|
+    if v.is_a?(Hash)
+      remove_build_section(v)
+    elsif v.is_a?(Array)
+      v.each do |vv|
+        remove_build_section(vv) if vv.is_a?(Hash)
+      end
+    end
+  end
+end
+
 if File.basename($PROGRAM_NAME) == File.basename(__FILE__)
   result = ENV['COMPOSE_FILE'].split(':').reduce({}) do |parent, file|
     yml = process_compose_hash(YAML.load(File.read(file)), File.dirname(file), parent)
@@ -109,6 +128,9 @@ if File.basename($PROGRAM_NAME) == File.basename(__FILE__)
     ret
   end
 
+
+  remove_build_section(result) if @skipbuild
+
   if ARGV[0].nil? || ARGV[0].strip == '-'
     puts YAML.dump(result)
   else

data/docker/run_tests.sh

@@ -2,6 +2,8 @@
 SELF=$(readlink -f $0)
 export ENV_ROOT=$(dirname "${SELF}")
 
+export COMPOSE_PROJECT_NAME=agg-aggkit-${CI_JOB_ID}
+
 trap '$ENV_ROOT/down.sh' EXIT
 
 cd $ENV_ROOT

data/lib/aggkit/ci.rb

@@ -0,0 +1,258 @@
+#!/usr/bin/env ruby
+
+require 'English'
+require 'tempfile'
+require 'json'
+require 'aggkit/env'
+
+module Aggkit
+
+  module Ci
+
+    def log_action action
+      puts " => #{action}"
+    end
+
+    def info message
+      puts " => #{message}"
+    end
+
+    def execute cmd
+      puts "  - executing: #{cmd}"
+      result = `#{cmd}`
+      puts result
+      if !$?.success?
+        raise "Execution failed cmd: #{cmd.inspect}"
+      end
+      result
+    end
+
+    #Уровни образов
+    # 1. Без модификатора - не протестирован, отсутсвует в репозитории.
+    # 2. С модификатором dev - протестирован автотестами, ДОЛЖЕН быть в репозитории.
+    # 3. С модификатором stage - протестирован руками, ДОЛЖЕН быть в репозитории(как и его предшественник dev).
+    # 4. С модификатором release - помечен для релиза, ДОЛЖЕН быть в репозитории(как и его предшественник dev и stage).
+
+    #Работа должна вестить ТОЛЬКО с workimage
+
+    # Базовое имя образа
+    # Например docker.rnds.pro/aggredator-mq
+    def baseimage service
+      raise "Service name invalid: #{service.inspect}" if service.to_s.length < 2
+      "docker.rnds.pro/aggredator-#{service}"
+    end
+
+
+    # Текущее имя образа без модификаторов продвижения, но с тегом
+    # Например docker.rnds.pro/aggredator-mq:7e6420b5
+    def workimage service, tag
+      raise "Service tag invalid: #{tag.inspect}" if tag.to_s.length < 2
+      "#{baseimage(service)}:#{tag}"
+    end
+
+    # Образ с модификатором версии
+    # Например docker.rnds.pro/aggredator-mq-dev:7e6420b5
+    def promotedimage service, stage, tag
+      raise "Service stage invalid: #{stage.inspect}" if stage.to_s.length < 2
+      raise "Service tag invalid: #{tag.inspect}" if tag.to_s.length < 2
+      "#{baseimage(service)}-#{stage}:#{tag}"
+    end
+
+    # Образ с модификатором протестированной автотестами версии
+    # Например docker.rnds.pro/aggredator-mq-dev:7e6420b5
+    def devimage service, tag
+      promotedimage(service, 'dev', tag)
+    end
+
+    # Образ с модификатором стабильной версии
+    # Например docker.rnds.pro/aggredator-mq-stage:7e6420b5
+    def stageimage service, tag
+      promotedimage(service, 'stage', tag)
+    end
+
+    # Образ с модификатором релизной версии
+    #Например docker.rnds.pro/aggredator-mq-release:7e6420b5
+    def releaseimage service, tag
+      promotedimage(service, 'release', tag)
+    end
+
+    # Протегировать образ тегом 
+    def tagimage! image, newimage, push: false, ignoreerror: false
+      log_action "Tag #{image.inspect} as #{newimage.inspect}"
+
+      if ignoreerror
+        execute("docker tag #{image} #{newimage} 2> /dev/null || true")
+      else
+        execute("docker tag #{image} #{newimage}")
+      end
+
+      if push
+        execute("docker push #{newimage}")
+      end
+
+      return newimage
+    end
+
+    #Удалить образ образ тегом 
+    def rmimage! image
+      log_action "Remove #{image.inspect}"
+      execute("docker rmi #{image} &> /dev/null || true")
+    end
+
+    def label! image, label, value
+      raise "Image label invalid: #{label.inspect}" if label.to_s.length < 2
+      raise "Image label value invalid: #{value.inspect}" if value.to_s.length < 2
+
+      execute("echo #{image} | docker build -t #{image} --label=\"#{label.to_s}=#{value.to_s}\" - ")
+    end
+
+    # Растегировать все модификатора образа сервиса и возможно удалить его
+    def untagservice service, tag
+      if tag != 'latest'
+        rmimage! workimage(service, tag)
+        rmimage! devimage(service, tag)
+        rmimage! stageimage(service, tag)
+        rmimage! releaseimage(service, tag)
+      end
+    end
+
+    # Продвинуть текущий образ сервиса по уровню - добавить модификатор и залить в репозиторий
+    def promote! service, tag, stage, fromstage: nil
+      fromimage = if fromstage
+        promotedimage(service, fromstage, tag)
+      else
+        workimage(service, tag)
+      end
+
+      toimage = promotedimage(service, stage, tag)
+
+      log_action "Promote #{fromimage} to #{toimage}"
+      return tagimage! fromimage, toimage, push: true
+    end
+
+    # Продвинуть текущий образ по уровню - добавить модификатор dev(протестировано) и залить в репозиторий
+    def promote_to_dev! service, tag
+      promote!(service, tag, 'dev')
+    end
+
+    # Продвинуть текущий образ по уровню - добавить модификатор stage(стабильно) и залить в репозиторий
+    def promote_to_stage! service, tag
+      promoted = tagimage!(devimage(service, tag), stageimage(service, tag), push: true)
+      # Тегируем этот образ как latest
+      return tagimage!(promoted, stageimage(service, 'latest'), push: true)
+    end
+
+    # Продвинуть стабильный образ до указанного тега
+    def promote_to_tag! service, tag, newtag
+      return tagimage!(devimage(service, tag), stageimage(service, newtag), push: true)
+    end
+
+    # Продвинуть список образов или упасть с ошибкой
+    def promote_services_to_dev! services, tag
+      [services].flatten.each do |service|
+        promote_to_dev!(service, tag)
+      end
+    end
+
+    # Продвинуть список образов или упасть с ошибкой
+    def promote_services_to_stage! services, tag
+      [services].flatten.each do |service|
+        promote_to_stage!(service, tag)
+      end
+    end
+
+    #Протегировать образы  до указанного тега
+    def promote_services_to_tag! services, tag, newtag
+      [services].flatten.each do |service|
+        promote_to_tag!(service, tag, newtag)
+      end
+    end
+
+
+
+    # Попытаться взять все модификаторы образов из репозитория
+    # Скачивает образы и тегирует их как workimage
+    def pull_images_cache services, tag
+      log_action "Puling images#{[services].flatten.inspect} from cache...."
+      [services].flatten.each do |service|
+        execute("docker pull #{devimage(service, tag)} 2> /dev/null || true")
+        execute("docker pull #{stageimage(service, tag)} 2> /dev/null || true")
+        execute("docker pull #{releaseimage(service, tag)} 2> /dev/null || true")
+        tagimage! devimage(service, tag), workimage(service, tag), ignoreerror: true
+        tagimage! stageimage(service, tag), workimage(service, tag), ignoreerror: true
+        tagimage! releaseimage(service, tag), workimage(service, tag), ignoreerror: true
+      end
+    end
+
+    #Растегировать все образы для дальнейшего удаления. Помечает как latest для поддержки кеширования docker
+    def clean_services services, tag
+      [services].flatten.each do |service|
+        tagimage! workimage(service, tag), workimage(service, 'latest'), ignoreerror: true
+        tagimage! devimage(service, tag), workimage(service, 'latest'), ignoreerror: true
+        tagimage! stageimage(service, tag), workimage(service, 'latest'), ignoreerror: true
+        tagimage! releaseimage(service, tag), workimage(service, 'latest'), ignoreerror: true
+        untagservice(service, tag)
+      end
+    end
+
+    def ssh_deploy services, env, sshserver, tag, stage
+      services = [services].flatten
+      log_action "Deploy [#{services.inspect}] tag:#{tag.inspect} stage:#{stage.inspect} to #{sshserver.inspect}"
+      with_ssh sshserver do |sockname|
+        env_config = JSON(`agg #{env} --show --release`)
+        envs = env_config['envs']
+        config_file = env_config['config_file'].to_s
+        envs['DOCKER_HOST'] = "unix://#{sockname}"
+        envs['CORE_TAG'] = tag
+        envs['CORE_SUFFIX'] = "-#{stage}"
+
+        localid = execute("docker info | grep ID").strip
+
+        Aggkit::Env.with_env(envs) do
+          remoteid = execute("docker info | grep ID").strip
+
+          if localid == remoteid
+            raise "Can't get access to remote Docker"
+          end
+
+          execute('docker-compose ps')
+          execute('docker-compose pull')
+
+          consul = execute('docker ps | grep consul').split(' ').first.strip
+          puts "CONSULT ID: #{consul}"
+
+          if !config_file.empty?
+            execute("docker exec -i #{consul} waiter.rb -t 20 --consul")
+            execute("docker exec -i #{consul} consul.rb --init --override --config - < #{config_file}")
+          end
+
+          execute('docker-compose up -d')
+
+          services.each do |service|
+            deployed = promotedimage(service, stage, tag)
+            current = promotedimage(service, stage, 'current')
+            tagimage! deployed, current
+            untagservice(service, tag)
+          end
+
+        end
+      end
+    end
+
+    def with_ssh server, user: 'root', &block
+      file = Tempfile.new
+      @ssh_sockname = file.path
+      file.unlink
+      @ssh_pid = spawn("ssh -NL #{@ssh_sockname}:/var/run/docker.sock root@#{server}")
+      sleep 5
+      yield(@ssh_sockname)
+    ensure
+      Process.kill(:SIGTERM, @ssh_pid)
+      sleep 5
+      Process.wait2(@ssh_pid, Process::WNOHANG)
+      FileUtils.rm_f(@ssh_sockname)
+    end
+
+  end
+
+end

data/lib/aggkit/env.rb

@@ -55,8 +55,10 @@ module Aggkit
       end
 
       @env_root = File.join(project_root, 'envs', @name)
+    end
 
-      @environment = prepare_environment
+    def prepare release: false
+      @environment = prepare_environment(release: release)
     end
 
     def with_env &block
@@ -87,12 +89,17 @@ module Aggkit
       [core_dot_file, project_dot_file, dot_file].compact.select{|f| File.exists?(f)}.uniq
     end
 
+    def config_file
+      [File.join(env_root, 'config.yml'), File.join(env_root, 'config.yaml')].compact.select{|f| File.exists?(f)}.uniq.first
+    end
+
     def show
       {
         name: name,
         project_root: project_root,
         core_root: core_root,
         envfiles: env_files,
+        config_file: config_file,
         envs: environment,
       }
     end
@@ -100,7 +107,7 @@ module Aggkit
 private
 
 
-    def prepare_environment
+    def prepare_environment release: false
       base_env = {
         'ENV_ROOT'      => env_root,
         'PROJECT_ROOT'  => project_root,
@@ -110,7 +117,7 @@ private
 
       dot_env = prepare_dot(base_env)
 
-      compose_env = prepare_compose(dot_env.merge(base_env))
+      compose_env = prepare_compose(dot_env.merge(base_env), release: release)
 
       dot_env.merge(base_env).merge(compose_env)
     end
@@ -121,7 +128,7 @@ private
       end
     end
 
-    def prepare_compose env
+    def prepare_compose env, release: false
       compose_files = if env['COMPOSE_FILE']
         env['COMPOSE_FILE']
       elsif File.exists?(File.join(env_root, "docker-compose.yml"))
@@ -133,8 +140,11 @@ private
       if compose_files
         result_file = File.join(env_root, "compose-result.yml")
         Env.with_env(env.merge('COMPOSE_FILE' => compose_files)) do
-          result_content = `merger.rb`
-          File.write(result_file, result_content)
+          if release
+            `aggmerge #{result_file} --skip-build`
+          else
+            `aggmerge #{result_file}`
+          end
         end
         {
           'COMPOSE_FILE' => result_file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aggkit
 version: !ruby/object:Gem::Version
-  version: 0.2.6.8250
+  version: 0.2.6.8329
 platform: ruby
 authors:
 - Godko Ivan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-06 00:00:00.000000000 Z
+date: 2019-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diplomat
@@ -101,15 +101,12 @@ email:
 - kinnalru@gmail.com
 executables:
 - agg
+- aggci
 - aggconsul
 - agglock
 - aggmerge
+- aggterm
 - aggwait
-- consul.rb
-- locker.rb
-- merger.rb
-- terminator.rb
-- waiter.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -124,15 +121,12 @@ files:
 - README.md
 - aggkit.gemspec
 - bin/agg
+- bin/aggci
 - bin/aggconsul
 - bin/agglock
 - bin/aggmerge
+- bin/aggterm
 - bin/aggwait
-- bin/consul.rb
-- bin/locker.rb
-- bin/merger.rb
-- bin/terminator.rb
-- bin/waiter.rb
 - docker/Dockerfile
 - docker/docker-compose.yml
 - docker/down.sh
@@ -165,6 +159,7 @@ files:
 - lib/aggkit/childprocess/windows/process.rb
 - lib/aggkit/childprocess/windows/process_builder.rb
 - lib/aggkit/childprocess/windows/structs.rb
+- lib/aggkit/ci.rb
 - lib/aggkit/env.rb
 - lib/aggkit/runner.rb
 - lib/aggkit/version.rb

data/bin/consul.rb

@@ -1,222 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'diplomat'
-require 'optparse'
-require 'English'
-require 'yaml'
-
-STDOUT.sync = true
-STDERR.sync = true
-
-@opts = {}
-
-@opts[:exec] = (begin
-                  ARGV.join(' ').split(' -- ')[1].strip
-                rescue StandardError
-                  nil
-                end)
-
-parser = OptionParser.new do |o|
-  o.banner = 'Usage: consul.rb [options] -- exec'
-
-  o.on('--consul url', 'Set up a custom Consul URL') do |url|
-    Diplomat.configure do |config|
-      config.url = url.strip
-    end
-  end
-
-  o.on('--token token', 'Connect into consul with custom access token (ACL)') do |token|
-    Diplomat.configure do |config|
-      config.acl_token = token.strip
-    end
-  end
-
-  o.on('--init [service]', 'Initialize Consul services from config') do |service|
-    @opts[:service] = service
-    @opts[:init] = true
-  end
-
-  o.on('--config file', 'Read service configulation from file') do |file|
-    @opts[:config] = file.strip
-  end
-
-  o.on('--upload', 'Upload files to variables') do
-    @opts[:upload] = true
-  end
-
-  o.on('--show [service]', 'Show service configulation from Consul') do |service|
-    @opts[:service] = service
-    @opts[:show] = true
-  end
-
-  o.on('--override', 'override existed keys') do
-    @opts[:override] = true
-  end
-
-  o.on('-d', '--dereference', 'dereference consul values in form of "consul://key/subkey"') do
-    @opts[:dereference] = true
-  end
-
-  o.on('--env prefix', 'export KV values from prefix as env varaibles') do |prefix|
-    @opts[:env] = (prefix + '/').gsub('//', '/')
-  end
-
-  o.on('--export', 'add export to --env output') do
-    @opts[:export] = true
-  end
-
-  o.on('--pristine', "not include the parent processes' environment when exec child process") do
-    @opts[:pristine] = true
-  end
-
-  o.on('--put path:value', 'put value to path') do |path|
-    @opts[:put] = path.strip
-  end
-
-  o.on('--get path', 'get value from') do |path|
-    @opts[:get] = path.strip
-  end
-end
-parser.parse!
-
-def die(message)
-  STDERR.puts "Error: #{message}"
-  exit 1
-end
-
-def key_to_consul(key)
-  key.downcase.gsub(/[^0-9a-z]/i, '_')
-end
-
-def key_to_env(key)
-  key.upcase.gsub(/[^0-9a-z]/i, '_')
-end
-
-def dereferenced_value(value)
-  if @opts[:dereference] && value && value[/^consul:\/\//]
-    reference_path = value.gsub(/^consul:\/\//, '')
-    dereferenced_value(Diplomat::Kv.get(reference_path))
-  else
-    value
-  end
-end
-
-if config = @opts[:config]
-  @opts[:config] = YAML.load(config == '-' ? STDIN.read : File.read(config))
-end
-
-if @opts[:init]
-  raise OptionParser::MissingArgument.new('config') unless @opts[:config]
-
-  services = if service = @opts[:service]
-               {
-                 service => @opts[:config][service]
-               }
-             else
-               @opts[:config]
-  end
-
-  services.each_pair do |service, config|
-    next unless config
-    next if service[/^\./] # skip hidden keys
-
-    path = "services/env/#{service}"
-    config.each_pair do |env, item|
-      key = "#{path}/#{key_to_consul(env)}"
-      value = if @opts[:upload] && item['file']
-                File.read(item['file'])
-              else
-                item['value'] || item['default'] || item['file']
-      end
-
-      empty = begin
-        Diplomat::Kv.get(key)
-        false
-      rescue Diplomat::KeyNotFound
-        true
-      end
-
-      Diplomat::Kv.put(key, value.to_s.strip) || die("Can't put #{key} to Consul") if empty || @opts[:override]
-    end
-  end
-
-  exit 0
-end
-
-if @opts[:show]
-  config = {}
-
-  path = if service = @opts[:service]
-           "services/env/#{service}/"
-         else
-           'services/env/'
-         end
-
-  answer = Diplomat::Kv.get(path, recurse: true, convert_to_hash: true) || die("Can't get #{path} from Consul")
-  answer['services']['env'].each_pair do |service, env|
-    cfg = config[service] ||= {}
-
-    env.each_pair do |key, value|
-      value = dereferenced_value(value)
-
-      cfg[key_to_env(key)] = {
-        env: key_to_env(key),
-        value: value
-      }
-    end
-  end
-
-  STDOUT.puts JSON.parse(config.to_json).to_yaml
-
-  exit 0
-end
-
-if put = @opts[:put]
-  path, *value = put.split(':').map(&:strip)
-  value = value.join(':')
-  value = File.read(value) if @opts[:upload] && value && File.exist?(value)
-
-  Diplomat::Kv.put(path, value.to_s.strip) || die("Can't put #{path} to Consul")
-
-  exit 0
-end
-
-if path = @opts[:get]
-  value = dereferenced_value(Diplomat::Kv.get(path))
-
-  STDOUT.puts value.to_s.strip
-
-  exit 0
-end
-
-if prefix = @opts[:env]
-  keys = begin
-    Diplomat::Kv.get(prefix, keys: true)
-  rescue Diplomat::KeyNotFound => e
-    []
-  rescue StandardError
-    die("Can't get keys at #{prefix} from Consul")
-  end
-
-  env = keys.reduce({}) do |e, key|
-    value = dereferenced_value(Diplomat::Kv.get(key))
-
-    e.merge(key_to_env(key.gsub(prefix, '')) => value)
-  end
-
-  if cmd = @opts[:exec]
-    env = ENV.to_h.merge(env) unless @opts[:pristine]
-
-    exec(env, cmd, unsetenv_others: true)
-  else
-    env.each_pair do |k, v|
-      STDOUT.puts "#{@opts[:export] ? 'export ' : ''}#{k}=\"#{v}\""
-    end
-  end
-
-
-  exit 0
-end
-
-STDOUT.puts parser.help
-exit 1

data/bin/locker.rb

@@ -1,71 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'optparse'
-require 'diplomat'
-
-@opts = {
-  url: 'http://localhost:8500',
-  timeout: 10,
-  ttl: 30 * 60
-}
-
-parser = OptionParser.new do |o|
-  o.banner = 'Usage: locker.rb [options]'
-
-  o.on("--consul url=#{@opts[:url]}", 'Set up a custom Consul URL') do |url|
-    Diplomat.configure do |config|
-      config.url = url.strip
-    end
-  end
-
-  o.on('--lock resource', 'resource name to lock with Consul') do |resource|
-    @opts[:lock] = resource.strip
-  end
-
-  o.on("--ttl seconds=#{@opts[:ttl]}", 'TTL to set when session created') do |seconds|
-    @opts[:ttl] = Integer(seconds.strip)
-  end
-
-  o.on('--unlock session', 'session name from previous call lock') do |session|
-    @opts[:unlock] = session.strip
-  end
-
-  o.on("--timeout seconds=#{@opts[:timeout]}", 'timeout to wait lock') do |seconds|
-    @opts[:timeout] = Integer(seconds.strip)
-  end
-end
-parser.parse!
-
-
-def lock(session, locker, timeout)
-  Timeout.timeout(timeout) do
-    return Diplomat::Lock.wait_to_acquire("resource/#{locker[:resource]}/lock", session, locker.to_json, 10)
-  end
-rescue Timeout::Error => e
-  false
-end
-
-
-if resource = @opts[:lock]
-  locker = {
-    Name: "#{resource}_locker_#{rand(999_999)}",
-    Behavior: 'delete',
-    TTL: "#{@opts[:ttl]}s",
-    resource: resource
-  }
-  sessionid = Diplomat::Session.create(locker)
-
-  if lock(sessionid, locker, @opts[:timeout])
-    puts sessionid
-    exit 0
-  else
-    STDERR.puts "Failed to lock resource: #{resource}"
-    exit 1
-  end
-
-elsif session = @opts[:unlock]
-  Diplomat::Session.destroy(session)
-else
-  STDERR.puts parser.help
-  exit 1
-end

data/bin/merger.rb

@@ -1,118 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'English'
-require 'yaml'
-
-if File.basename($PROGRAM_NAME) == File.basename(__FILE__)
-  unless ENV['COMPOSE_FILE']
-    STDERR.puts 'COMPOSE_FILE environment must point to one or more files'
-    exit 1
-  end
-end
-
-
-class Hash
-
-  def deep_dup
-    Marshal.load(Marshal.dump(self))
-  end
-
-end
-
-class Array
-
-  def deep_dup
-    Marshal.load(Marshal.dump(self))
-  end
-
-end
-
-
-
-def extend_hash(first, second)
-  raise ArgumentError.new('First and second args equal nil') if [first, second].all? &:nil?
-  return second if first.nil?
-  return first if second.nil?
-
-  first.each_pair do |fk, fv|
-    next unless second.key?(fk)
-
-    sv = second[fk]
-    raise "Types of values not match(#{fv.class}, #{sv.class})" if fv.class != sv.class
-
-    # Специальный случай потому что command не мерджится а заменяется
-    if fk == 'command'
-      first[fk] = sv
-    elsif fv.is_a? Hash
-      extend_hash(fv, sv)
-    elsif fv.is_a? Array
-      fv |= sv
-      first[fk] = fv
-    else
-      first[fk] = sv
-    end
-  end
-
-  second.each_pair do |sk, sv|
-    next if first.key?(sk)
-
-    first[sk] = sv
-  end
-
-  first
-end
-
-def process_compose_hash(yml, dirname, parent = {})
-  (yml['services'] || {}).each_pair do |name, service|
-    next unless ext = service['extends']
-    base = if ext.is_a? String
-             template = yml['services'][ext]
-             parent_service = (parent['services'] || {})[ext] || {}
-             extend_hash(parent_service.deep_dup, template)
-           elsif file = ext['file']
-             ENV.each_pair do |k, v|
-               file.gsub!("$#{k}", v)
-               file.gsub!("${#{k}}", v)
-             end
-
-             file_to_load = if File.exist?(dirname + '/' + file)
-                              dirname + '/' + file
-                            else
-                              file
-                    end
-
-             tmp = process_compose_hash(YAML.load(File.read(file_to_load)), File.dirname(file_to_load), service)
-
-             begin
-                 (tmp['services'][ext['service']] || {})
-               rescue StandardError
-                 {}
-               end
-           else
-             yml['services'][ext['service']]
-    end.deep_dup
-
-    service.delete 'extends'
-
-    yml['services'][name] = extend_hash(base, service)
-  end
-  yml
-end
-
-if File.basename($PROGRAM_NAME) == File.basename(__FILE__)
-  result = ENV['COMPOSE_FILE'].split(':').reduce({}) do |parent, file|
-    yml = process_compose_hash(YAML.load(File.read(file)), File.dirname(file), parent)
-    if yml['version'] && parent['version'] && yml['version'] != parent['version']
-      raise "version mismatch: #{file}"
-    end
-    ret = extend_hash(parent.deep_dup, yml)
-    ret
-  end
-
-  if ARGV[0].nil? || ARGV[0].strip == '-'
-    puts YAML.dump(result)
-  else
-    File.write(ARGV[0].strip, YAML.dump(result))
-  end
-
-end

data/bin/waiter.rb

@@ -1,262 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'optparse'
-require 'securerandom'
-require 'English'
-require 'openssl'
-require 'tempfile'
-require 'json'
-
-STDOUT.sync = true
-STDERR.sync = true
-
-TIMEOUT = 15
-INTERVAL = 3
-
-@opts = {}
-
-@opts[:exec] = (begin
-                  ARGV.join(' ').split(' -- ')[1].strip
-                rescue StandardError
-                  nil
-                end)
-@opts[:timeout] = TIMEOUT
-@opts[:interval] = INTERVAL
-@opts[:consul_addr] = 'http://localhost:8500'
-@opts[:consul_service_count] = 1
-
-
-OptionParser.new do |o|
-  o.banner = 'Usage: waiter.rb [options] -- exec'
-
-  o.on('--tcp host:port', 'Wait for tcp accepts on host:port') do |addr|
-    host, port = addr.split(':')
-    @opts[:tcp] = addr.strip
-    @opts[:host] = host.strip
-    @opts[:port] = port.strip
-  end
-
-  o.on('--db dbname', 'Wait for PG database exists. Using --tcp to conenct PG') do |db|
-    @opts[:db] = db.strip
-  end
-
-  o.on('--tb tablename', 'Wait for PG table exists. Using --tcp to conenct PG') do |tb|
-    @opts[:tb] = tb.strip
-  end
-
-  o.on('-f', '--file filename', 'Wait for file exists.') do |file|
-    @opts[:file] = file.strip
-  end
-
-  o.on("--consul-addr addr=#{@opts[:consul_addr]}", 'HTTP addres to connect to consul') do |addr|
-    @opts[:consul_addr] = addr.strip
-  end
-
-  o.on('--consul', 'Wait for local consul agent to be ready') do
-    @opts[:consul] = true
-  end
-
-  o.on('--consul-service service', 'Wait for service appear in consul') do |service|
-    @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('--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
-
-  o.on('--pass pass', 'password') do |pass|
-    @opts[:pass] = pass.strip
-  end
-
-  o.on('-t', '--timeout secs=15', 'Total timeout') do |timeout|
-    @opts[:timeout] = timeout.to_i
-  end
-
-  o.on('-i', '--interval secs=2', 'Interval between attempts') do |interval|
-    @opts[:interval] = interval.to_i
-  end
-
-  o.on('-q', '--quiet', 'Do not output any status messages') do
-    @opts[:quiet] = true
-  end
-end.parse!
-
-def log(message)
-  puts message unless @opts[:quiet]
-end
-
-@opts[:timeout] = @opts[:timeout].to_i
-@opts[:interval] = @opts[:interval].to_i
-
-if @opts[:db]
-  @pg = {}
-  @pg[:db] = "-d #{@opts[:db]}"
-  @pg[:user] = "-U #{@opts[:user]}" if @opts[:user]
-  @pg[:pass] = if @opts[:pass] && !@opts[:pass].empty?
-                 "PGPASSWORD=#{@opts[:pass]}"
-               else
-                 ''
-  end
-
-  @pg[:host] = "-h #{@opts[:host]}" if @opts[:host]
-  @pg[:port] = "-p #{@opts[:port]}" if @opts[:port]
-
-  @pg[:tb] = @opts[:tb] if @opts[:tb]
-end
-
-def wait_for(timeout)
-  starttime = Time.now
-  loop do
-    success = yield
-
-    return success if success
-
-    return false if (Time.now - starttime) > timeout
-    sleep @opts[:interval]
-  end
-
-  false
-end
-
-def complete!(success)
-  if success
-    if @opts[:exec]
-      exec @opts[:exec]
-    else
-      exit 0
-    end
-  end
-
-  STDERR.puts 'Operation timed out'
-  exit 1
-end
-
-def wait_for_consul
-  log('Waiting for consul...')
-  ret = wait_for @opts[:timeout] do
-    cmd = "consul operator raft list-peers -http-addr=#{@opts[:consul_addr]} > /dev/null 2>&1"
-    system(cmd)
-    $?.success?
-  end
-
-  yield(ret)
-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"
-    cmd += "&tag=#{@opts[:consul_tag]}" if @opts[:consul_tag]
-    result = `#{cmd}`
-    result = begin
-               JSON.parse(result)
-             rescue StandardError
-               []
-             end
-    result.count >= @opts[:consul_service_count]
-  end
-
-  yield(ret)
-end
-
-def wait_for_tcp
-  log("Waiting for TCP: #{@opts[:host]}:#{@opts[:port]}...")
-  ret = wait_for @opts[:timeout] do
-    cmd = "nc -z #{@opts[:host]} #{@opts[:port]} > /dev/null 2>&1"
-    system(cmd)
-    $?.success?
-  end
-
-  yield(ret)
-end
-
-def wait_for_db
-  log("Waiting for DB: pg://#{@opts[:user]}:#{@opts[:pass]}@#{@opts[:host]}:#{@opts[:port]}/#{@opts[:db]}...")
-  ret = wait_for @opts[:timeout] do
-    cmd = "#{@pg[:pass]} psql -lqt #{@pg[:user]} #{@pg[:host]} #{@pg[:port]} #{@pg[:db]} 2>/dev/null | cut -d \\| -f 1 | grep -qw #{@opts[:db]} > /dev/null 2>&1"
-    system(cmd)
-    $?.success?
-  end
-
-  yield(ret)
-end
-
-def wait_for_tb
-  log("Waiting for TABLE: pg://#{@opts[:user]}:#{@opts[:pass]}@#{@opts[:host]}:#{@opts[:port]}/#{@opts[:db]}##{@opts[:tb]}...")
-  ret = wait_for @opts[:timeout] do
-    cmd = "echo \"\\dt\" | psql -qt #{@pg[:user]} #{@pg[:pass]} #{@pg[:host]} #{@pg[:port]} #{@pg[:db]} 2>/dev/null | cut -d \\| -f 2 | grep -qw #{@pg[:tb]} > /dev/null 2>&1"
-    system(cmd)
-    $?.success?
-  end
-
-  yield(ret)
-end
-
-def wait_for_file(file = @opts[:file], timeout = @opts[:timeout])
-  log("Waiting for FILE: #{file}")
-  ret = wait_for timeout do
-    File.exist? file
-  end
-  yield(ret)
-end
-
-if @opts[:tb]
-  wait_for_tcp do |success|
-    if success
-      wait_for_db do |success|
-        if success
-          wait_for_tb do |success|
-            complete!(success)
-          end
-        end
-      end
-    end
-
-    complete!(false)
-  end
-end
-
-if @opts[:db]
-  wait_for_tcp do |success|
-    if success
-      wait_for_db do |success|
-        complete!(success)
-      end
-    end
-
-    complete!(false)
-  end
-end
-
-
-if @opts[:consul]
-  wait_for_consul do |success|
-    complete!(success)
-  end
-end
-
-if @opts[:consul_service]
-  wait_for_consul_service(@opts[:consul_service]) do |success|
-    complete!(success)
-  end
-end
-
-if @opts[:tcp]
-  wait_for_tcp do |success|
-    complete!(success)
-  end
-end
-
-if @opts[:file]
-  wait_for_file(@opts[:file], @opts[:timeout]) do |success|
-    complete!(success)
-  end
-end