aggkit 0.4.0.9116 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 844a18ca83b6410264ca53fc074af96faefb2daa
-  data.tar.gz: 61b02b6cfed3fc5607ebb4815bff46eae875627c
+SHA256:
+  metadata.gz: de3b3e58fad75455718b669cb92d79fa8f1e786f403291e6692ce381ba8ac8c3
+  data.tar.gz: 9ee14a7a2d706199556dac49acc1e52273f1bd574de7122022295d5991cdd560
 SHA512:
-  metadata.gz: d5f65efc47c2b7ca7c2ff80406ae497e92f454d1ec5bb5a43ce3b45889613dbd75bcf5524c3ef7227aa01a550e593e7d9d8d236c651be147973dfe17829613b4
-  data.tar.gz: 0b29500dcc20687233669362853244fab6acfeaa9ae2cc4aff1b009b8e753b6aa9102e9909153acd9d330c15f8b228656074295d4c42c1a215f864e1175d9681
+  metadata.gz: 791214ae9804d7bb28332c6aa5c5c8eb4d244ac5464a1a83250a6a9ae2fb400c261720cb1cb9e2b43401f2ce2eee15ea692b8966ee9632e87ffccddfad03ef54
+  data.tar.gz: 9b8f555454809b7198ff16a6cf13195eb64e99447ec2577f3856a5ffe41cc6d3c127562d0583eaa79c1604da601d8896ba8e6813d456b5adb3ec6324c31b4fd7

data/Gemfile.lock

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

data/bin/aggmerge

@@ -122,8 +122,7 @@ def remove_build_section(hash)
 end
 
 if File.basename($PROGRAM_NAME) == File.basename(__FILE__)
-  # version в базовом хэше для того чтобы первым попасть в итоговый файл.
-  result = ENV['COMPOSE_FILE'].split(':').reduce({'version' => nil}) do |parent, 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}"

data/bin/aggstart

@@ -12,7 +12,8 @@ end
   service:    ENV['AGGREDATOR_SERVICE'],
   consul:     ENV['CONSUL_HTTP_ADDR'],
   consulconf: [],
-  depends:    []
+  depends:    [],
+  watch:      true,
 }
 
 @opts[:exec] = (begin
@@ -51,6 +52,10 @@ parser = Aggkit::OptionParser.new do |o|
   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('--[no-]watch', 'use exec instead of watcher') do |watch|
+    @opts[:watch] = watch
+  end
 end
 parser.parse!
 
@@ -68,27 +73,37 @@ ENV['NODE_NAME'] = @opts[:node_name]
 
 init_service @opts[:service], @opts
 
-envsubst '/home/app/consul'
+envsubst '/home/app/consul' rescue nil
 
-Aggkit::Watcher.new.exec do |watcher|
-  if @opts[:consulconf]
-    configs = @opts[:consulconf].map do |folder|
-      "-config-dir #{folder}"
-    end.join(' ').strip
-
-    watcher.add "consul agent #{configs} -node #{@opts[:node_name]}".split
-  end
 
+def init_and_wait
   execute!("aggwait -t 20 --consul-addr=#{@opts[:consul]} --consul", 'Timeout for consul service')
-
   load_envs_from_consul(@opts[:consul], @opts[:service])
 
   @opts[:depends].each do |service|
     execute!("aggwait -t 60 --consul-addr=#{@opts[:consul]} --consul-service #{service}", "Timeout for #{service} service")
   end
-
   sleep 2
+end
 
-  watcher.add @opts[:exec]
+if @opts[:watch]
+  Aggkit::Watcher.new.exec do |watcher|
+    if @opts[:consulconf]
+      configs = @opts[:consulconf].map do |folder|
+        "-config-dir #{folder}"
+      end.join(' ').strip
+
+      watcher.add *%W{"consul agent #{configs} -node #{@opts[:node_name]}}
+      @opts[:consul] = ENV['CONSUL_HTTP_ADDR'] = 'localhost'
+    end
+
+    init_and_wait
+    watcher.add *@opts[:exec]
+  end
+else
+  init_and_wait
+  exec *@opts[:exec]
 end
 
+
+

data/lib/aggkit/version.rb

@@ -1,6 +1,6 @@
 module Aggkit
 
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.4.1'.freeze
 
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aggkit
 version: !ruby/object:Gem::Version
-  version: 0.4.0.9116
+  version: 0.4.1
 platform: ruby
 authors:
 - Godko Ivan
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Helper scripts for work with docker and consul in Aggredator