aggkit 0.4.4.11050 → 0.4.4.12292

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e382cdb9cfb986897ccc243f7c91f544c4834531
-  data.tar.gz: 1443f0a041c67d7c0adf82837a946a8b026d16fa
+  metadata.gz: c7e60deba3fa62e58fca16ad17c510ad79184ac9
+  data.tar.gz: 52b36d4af259d772575b8b1f869b3ddc02ef7178
 SHA512:
-  metadata.gz: d6e652bf997f8de37bbc90b4e40fe94dcaf31aeb2806d98783a79d3c1ecc8602377c530e0b36fc79a4a779202a0af0f0b406bf777163e34ed6a0809ff0d7859f
-  data.tar.gz: d672dbe8d83d3354f72918927ed3b155a01ea0f5830faf33ca89497833ad5373ffc6e62710fdd6c36a308d09657967998a481215c077752c6d7a40539b60052f
+  metadata.gz: 543131a585b51005c7d40c31825f0bbfed6ae5e17903510bcc1afdd85f907f51cf84f3a9fa81be9a77f0035da019ff545119f17e3fe269ae86b3f29ba9fe3a74
+  data.tar.gz: 7404283ebc889e58b061dcf0179d6a9cfec1da120cf00214f59e4c8d817737cdbe78ae6e1e47e4588f7df20845d0a59362b0379b057314bd3109faffbb905b3e

data/Gemfile

@@ -9,6 +9,7 @@ group :test do
   gem 'rspec-retry'
   gem 'rspec-set'
   gem 'rspec_junit_formatter'
-  gem 'simplecov'
+  gem 'simplecov', require: false
+  gem 'simplecov-console', require: false
 end
 

data/Gemfile.lock

@@ -10,6 +10,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    ansi (1.5.0)
     awesome_print (1.8.0)
     diff-lcs (1.3)
     diplomat (2.0.5)
@@ -43,8 +44,15 @@ GEM
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
+    simplecov-console (0.5.0)
+      ansi
+      simplecov
+      terminal-table
     simplecov-html (0.10.2)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
     tty-tree (0.2.0)
+    unicode-display_width (1.6.0)
 
 PLATFORMS
   ruby
@@ -59,6 +67,7 @@ DEPENDENCIES
   rspec-set
   rspec_junit_formatter
   simplecov
+  simplecov-console
 
 BUNDLED WITH
    1.16.2

data/bin/aggexec

@@ -0,0 +1,71 @@
+#!/usr/bin/env ruby
+
+require 'aggkit'
+
+UTIL = File.basename(__FILE__)
+
+if ENV['CONSUL_HTTP_ADDR'].to_s.empty?
+  ENV['CONSUL_HTTP_ADDR'] = "http://#{ENV['CONSUL_HOST'] || 'localhost'}:8500"
+end
+
+@opts = {
+  consul:    ENV['CONSUL_HTTP_ADDR'],
+  depends:   [],
+  prefixes:  [],
+  templates: []
+}
+
+@opts[:exec] = (begin
+                  idx = ARGV.index {|a| a.strip == '--' } + 1
+                  ARGV[idx..-1]
+                rescue StandardError
+                  []
+                end)
+
+parser = Aggkit::OptionParser.new do |o|
+  o.banner = "Usage: #{UTIL} [options]"
+
+  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)
+    @opts[:consul] = ENV['CONSUL_HTTP_ADDR']
+  end
+
+  o.on('--depends=mq,db,router...', 'Set list of services to wait for ready before start') do |list|
+    @opts[:depends] += list.to_s.split(/[ ;,|]/).map(&:to_s).reject(&:empty?)
+  end
+
+  o.on('--prefix=kv/folder/path', 'Consul KV prefix to load envs from. Multiple prefixes are merged from left to right.') do |prefix|
+    @opts[:prefixes] << prefix.strip
+  end
+
+  o.on('--service=<SERVICE>', 'Showrtcut for --prefix=services/env/<SERVICE>. Multiple prefixes are merged from left to right.') do |service|
+    @opts[:prefixes] << "services/env/#{service}".strip
+  end
+
+  o.on('--templates=<FOLDER>', 'Folder for recursive ensubst *.in templates. Multiple prefixes are merged from left to right.') do |folder|
+    @opts[:templates] << folder.strip
+  end
+
+end
+parser.parse!
+
+@opts[:depends] = @opts[:depends].select(:present?)
+@opts[:prefixes] = @opts[:prefixes].select(:present?)
+@opts[:templates] = @opts[:templates].select(:present?)
+
+die 'exec script must be provided' if @opts[:exec].empty?
+
+# Wait for consul
+Aggkit::Consul.wait_for_consul(@opts[:consul])
+
+# Wait for dependencies
+@opts[:depends].each(&Aggkit::Consul.method(:wait_for_service).curry.call(@opts[:consul]))
+
+# Load env from consul
+@opts[:prefixes].each(&Aggkit::Consul.method(:load_envs_from_consul).curry.call(@opts[:consul]))
+
+# Preprocess template files
+Aggkit::Consul.envsubst(*@opts[:templates])
+
+exec(*@opts[:exec])
+

data/lib/aggkit/childprocess/abstract_io.rb

@@ -1,3 +1,4 @@
+#skip coverage
 module Aggkit
 module ChildProcess
   class AbstractIO

data/lib/aggkit/childprocess/abstract_process.rb

@@ -1,3 +1,4 @@
+#skip coverage
 module Aggkit
 module ChildProcess
   class AbstractProcess

data/lib/aggkit/childprocess/errors.rb

@@ -1,3 +1,4 @@
+#skip coverage
 module Aggkit
 module ChildProcess
   class Error < StandardError

data/lib/aggkit/childprocess/jruby.rb

@@ -1,3 +1,4 @@
+#skip coverage
 require 'java'
 require 'jruby'
 

data/lib/aggkit/childprocess/tools/generator.rb

@@ -1,3 +1,4 @@
+#skip coverage
 require 'fileutils'
 
 module Aggkit

data/lib/aggkit/childprocess/unix/fork_exec_process.rb

@@ -1,3 +1,4 @@
+#skip coverage
 module Aggkit
 module ChildProcess
   module Unix

data/lib/aggkit/childprocess/unix/io.rb

@@ -1,3 +1,4 @@
+#skip coverage
 module Aggkit
 module ChildProcess
   module Unix

data/lib/aggkit/childprocess/unix/lib.rb

@@ -1,3 +1,4 @@
+#skip coverage
 module Aggkit
 module ChildProcess
   module Unix

data/lib/aggkit/childprocess/unix/platform/i386-linux.rb

@@ -1,3 +1,4 @@
+#skip coverage
 module Aggkit
 module ChildProcess::Unix::Platform
   SIZEOF = {

data/lib/aggkit/childprocess/unix/platform/i386-solaris.rb

@@ -1,3 +1,4 @@
+#skip coverage
 module Aggkit
 module ChildProcess::Unix::Platform
   SIZEOF = {

data/lib/aggkit/childprocess/unix/platform/x86_64-linux.rb

@@ -1,3 +1,4 @@
+#skip coverage
 module Aggkit
 module ChildProcess::Unix::Platform
   SIZEOF = {

data/lib/aggkit/childprocess/unix/platform/x86_64-macosx.rb

@@ -1,3 +1,4 @@
+#skip coverage
 module Aggkit
 module ChildProcess::Unix::Platform
   SIZEOF = {

data/lib/aggkit/childprocess/unix/posix_spawn_process.rb

@@ -1,3 +1,4 @@
+#skip coverage
 require 'thread'
 
 module Aggkit

data/lib/aggkit/childprocess/unix/process.rb

@@ -1,3 +1,4 @@
+#skip coverage
 module Aggkit
 module ChildProcess
   module Unix

data/lib/aggkit/childprocess/unix.rb

@@ -1,3 +1,4 @@
+#skip coverage
 module Aggkit
 module ChildProcess
   module Unix

data/lib/aggkit/childprocess/version.rb

@@ -1,3 +1,4 @@
+#skip coverage
 module Aggkit
 module ChildProcess
   VERSION = '0.9.0'

data/lib/aggkit/childprocess/windows.rb

@@ -1,3 +1,4 @@
+#skip coverage
 require "ffi"
 require "rbconfig"
 

data/lib/aggkit/childprocess.rb

@@ -1,3 +1,4 @@
+#skip coverage
 require 'aggkit/childprocess/version'
 require 'aggkit/childprocess/errors'
 require 'aggkit/childprocess/abstract_process'

data/lib/aggkit/consul.rb

@@ -0,0 +1,62 @@
+#!/usr/bin/env ruby
+
+require 'English'
+
+module Aggkit
+
+  module Consul
+
+    def load_envs(string, env = ENV)
+      envs = Dotenv::Parser.new(string).call
+      envs.each_pair do |k, v|
+        env[k] = v
+      end
+      envs
+    end
+
+    def consul_addr addr_or_host
+      if addr_or_host['http']
+        addr_or_host
+      else
+        "http://#{addr_or_host}:8500"
+      end
+    end
+
+    def load_envs_from_consul(consul, prefix)
+      consul_http = consul_addr(consul)
+      envs = Aggkit::Exec.capture!("aggconsul --consul=#{consul_http} --env #{prefix} --pristine -d", "Can't load envs from #{prefix}")
+      load_envs(envs)
+    end
+
+    def wait_for_consul consul
+      consul_http = consul_addr(consul)
+      Aggkit::Exec.execute!("aggwait -t 30 -i 5 --consul-addr=#{consul_http} --consul", 'Timeout for consul service')
+    end
+
+    def wait_for_service consul, service
+      consul_http = consul_addr(consul)
+      Aggkit::Exec.execute!("aggwait -t 60 -i 5 --consul-addr=#{consul_http} --consul-service #{service}", "Timeout for #{service} service")
+    end
+
+    def envsubst(*paths)
+      paths = paths.flatten.map{|c| c.to_s.strip }.reject(&:empty?)
+      paths.each do |path|
+        Dir.glob("#{path}/**/*.in") do |templ|
+          envsubst_file(templ, templ.sub(/\.in$/, ''))
+        end
+      end
+    end
+
+    def envsubst_file(templ, output = nil)
+      output ||= templ.sub(/\.in$/, '')
+      Aggkit::Exec.die('filename must ends with .in or output must be provided') if output.strip == templ.strip
+      cmd = "cat '#{templ}' | envsubst > '#{output}'"
+      Aggkit::Exec.execute!(cmd, "envsubst failed: #{cmd}")
+    end
+
+    extend ::Aggkit::Consul
+
+  end
+
+end
+

data/lib/aggkit/exec.rb

@@ -0,0 +1,44 @@
+module Aggkit
+
+  module Exec
+
+    def error(message)
+      STDERR.puts "Error: #{message}"
+    end
+
+    def die(message, code: 1)
+      error(message)
+      exit!(code)
+    end
+
+    def capture(cmd)
+      puts "Capturing: #{cmd}"
+      io = IO.popen(cmd)
+      io.read.strip
+    ensure
+      io.close rescue nil
+    end
+
+    def capture!(cmd, error = nil)
+      output = capture(cmd)
+      error = error ? "#{error}: Execution failed" : 'Execution failed'
+      die(error) unless $?&.success?
+
+      output
+    rescue Exception => e
+      error = error ? "#{error}: #{e.inspect}" : "Execution failed: #{e.inspect}"
+      die(error)
+    end
+
+    def execute!(cmd, error = nil)
+      puts "Executing: #{cmd}"
+      error = error ? "#{error}: Execution failed" : 'Execution failed'
+      die(error) unless system(cmd)
+    end
+
+    extend ::Aggkit::Exec
+
+  end
+
+end
+

data/lib/aggkit.rb

@@ -6,6 +6,8 @@ require 'dotenv'
 require 'aggkit/version'
 require 'aggkit/option_parser'
 require 'aggkit/childprocess'
+require 'aggkit/exec'
+require 'aggkit/consul'
 require 'aggkit/watcher'
 require 'aggkit/runner'
 require 'aggkit/env'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aggkit
 version: !ruby/object:Gem::Version
-  version: 0.4.4.11050
+  version: 0.4.4.12292
 platform: ruby
 authors:
 - Godko Ivan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-29 00:00:00.000000000 Z
+date: 2019-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diplomat
@@ -103,6 +103,7 @@ executables:
 - agg
 - aggci
 - aggconsul
+- aggexec
 - agggen
 - agglock
 - aggmerge
@@ -127,6 +128,7 @@ files:
 - bin/agg
 - bin/aggci
 - bin/aggconsul
+- bin/aggexec
 - bin/agggen
 - bin/agglock
 - bin/aggmerge
@@ -167,7 +169,9 @@ files:
 - lib/aggkit/childprocess/windows/process_builder.rb
 - lib/aggkit/childprocess/windows/structs.rb
 - lib/aggkit/ci.rb
+- lib/aggkit/consul.rb
 - lib/aggkit/env.rb
+- lib/aggkit/exec.rb
 - lib/aggkit/option_parser.rb
 - lib/aggkit/runner.rb
 - lib/aggkit/version.rb