aggkit 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c156f847b57ffb06d37850c4119c7503da301329100855a826db70827aad4d48
-  data.tar.gz: 91bc2e8238ae3075be4cf2dd095ac2369a7cf0d917903c149fda4f38c4ed8074
+  metadata.gz: 69e17d1ded80e27c4244257dc58e1afc16a42dca6c77f25a5f8d1197f8eb2268
+  data.tar.gz: 77d0b795fc18f949a6192b90977d8d039615ea673cda1265f6306406bfeadb61
 SHA512:
-  metadata.gz: d875af24df50d76c408d15bf827f3173fb506d2e4fb1e6d932f8d220c1fda159b2a70e087a38809ce1febb57a5582205bd46879596d643b4c28456fc7bf7be84
-  data.tar.gz: 8970df7a2b695a6b8eb45e6a672e69d6e45e498ae15c83bf3a6b8e8eaafc78c756af6014acf0d0689d5f13e2ca64ebbcc51841fb79448de6e0ce46ae2c858012
+  metadata.gz: 0df85c38a96fbb362d9e2affc50675691bdce2dd42c605e3de27bbc6cf2c3aad0faacdc3071f7f7b63a4f085843fcb033bcaab1a9c72c04258f597f8d92b9eb4
+  data.tar.gz: abc055cf5ed28dfc5e75d0d81a8584131f1748a3daf23817a377e110d24c16367692c273e37dfad6b0d6003a3d90fbbb910f8ea99b16d3c800f93646adfa4f95

data/Gemfile

@@ -3,9 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in aggredator.gemspec
 gemspec
 
-gem 'diplomat', git: 'https://github.com/RnD-Soft/diplomat.git', branch: 'master'
-
-
 group :test do
   gem 'awesome_print'
   gem 'rspec'

data/bin/aggconsul

@@ -8,7 +8,13 @@ require 'yaml'
 STDOUT.sync = true
 STDERR.sync = true
 
-@opts = {}
+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']
+}
 
 @opts[:exec] = (begin
                   ARGV.join(' ').split(' -- ')[1].strip
@@ -19,10 +25,14 @@ STDERR.sync = true
 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
+  o.on('--consul url', 'Set up a custom Consul URL') do |consul|
+    if consul.to_s['http']
+      ENV['CONSUL_HTTP_ADDR'] = consul.to_s
+    else
+      ENV['CONSUL_HTTP_ADDR'] = "http://#{consul.to_s}:8500"
     end
+    
+    @opts[:consul] = ENV['CONSUL_HTTP_ADDR']
   end
 
   o.on('--token token', 'Connect into consul with custom access token (ACL)') do |token|
@@ -79,6 +89,10 @@ parser = OptionParser.new do |o|
 end
 parser.parse!
 
+Diplomat.configure do |config|
+  config.url = @opts[:consul]
+end
+
 def die(message)
   STDERR.puts "Error: #{message}"
   exit 1

data/bin/aggwrap

@@ -54,10 +54,14 @@ STDOUT.sync
 
 UTIL = File.basename(__FILE__)
 
+if ENV['CONSUL_HTTP_ADDR'].to_s.empty?
+  ENV['CONSUL_HTTP_ADDR'] = "http://#{ENV['CONSUL_HOST'] || 'localhost'}:8500"
+end
+
 @opts = {
   service: ENV['AGGREDATOR_SERVICE'],
   id:      SecureRandom.hex(8),
-  consul:  ENV['CONSUL_HTTP_ADDR'] || ENV['CONSUL_HOST'] || 'localhost'
+  consul:  ENV['CONSUL_HTTP_ADDR'],
 }
 
 @opts[:exec] = (begin
@@ -79,10 +83,13 @@ parser = Aggkit::OptionParser.new do |o|
   end
 
   o.on("--consul=#{@opts[:consul]}", 'Set consul host. CONSUL_HOST env used when missed') do |consul|
-    @opts[:consul] = consul.to_s
-    Diplomat.configure do |config|
-      config.url = @opts[:consul]
+    if consul.to_s['http']
+      ENV['CONSUL_HTTP_ADDR'] = consul.to_s
+    else
+      ENV['CONSUL_HTTP_ADDR'] = "http://#{consul.to_s}:8500"
     end
+    
+    @opts[:consul] = ENV['CONSUL_HTTP_ADDR']
   end
 
   o.on('--http <PORT>', 'Create TTL consul check and pass http result to it') do |port|
@@ -107,6 +114,11 @@ die 'service name must be provided' if @opts[:service].to_s.empty?
 
 die 'script must be provided' if @opts[:exec].empty?
 
+    
+Diplomat.configure do |config|
+  config.url = @opts[:consul]
+end
+
 SERVICE_ID = "#{@opts[:service]}_#{@opts[:id]}".freeze
 
 @service = {

data/lib/aggkit/runner.rb

@@ -36,7 +36,12 @@ module Aggkit
     end
 
     def load_envs_from_consul(consul, service)
-      envs = execute!("aggconsul --consul=http://#{consul}:8500 --env services/env/#{service} --pristine -d", "Can't load envs")
+      consul_http = consul['http']
+        consul
+      else
+        "http://#{consul}:8500"
+      end
+      envs = execute!("aggconsul --consul=#{consul_http} --env services/env/#{service} --pristine -d", "Can't load envs")
       load_envs(envs)
     end
 

data/lib/aggkit/version.rb

@@ -1,6 +1,6 @@
 module Aggkit
 
-  VERSION = '0.3.6'.freeze
+  VERSION = '0.3.7'.freeze
 
 end
 

metadata

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