aggkit 0.3.1.8768 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: da7e110db65fee090004aa89ebe7b9e51d61b29d
-  data.tar.gz: a23634dedbc61ead7fdf2fd82db903d54a9db349
+SHA256:
+  metadata.gz: 6791e59023a468170166128cafab8d1f55f699a842c5ddfc95c11db3643120a7
+  data.tar.gz: dcda7014d58af1a2c9efcb2cee00fd9d0512c0dcd41b0ec3356bf5f2c8d5ccaa
 SHA512:
-  metadata.gz: fc6a2f04341e21addd3188c4902802edf68c25740c55e6986f4c2fd8005e54b2c8bf1bd34aa6404d6c3a5d458810f0e6a4e1c87f040c001d9fcd572a12ee4ff7
-  data.tar.gz: 5cd039ed3153e03b5f1c8eec26d3058df0d28128a6709155334424215bdc5508f2fc290737bf698309fed4c0b509eb4142b63e21d4f5cf1329d97b3b6a718f64
+  metadata.gz: cd8d1d90dbb6d6d76589b4aa238e00e661dae5402fd2c8f791273b7f1ae0542a82d23ca97409b7aa9c05e914dd8dbe9e3b35fc6ef7e76e2a6d5649e5c3f2bff8
+  data.tar.gz: 1bce235ef0eecfc515224ebc201cb063b51a442df7abffbc81e542a4d638e3abd887f74c6fd8d28751764dced313333e4cd0795a72756e823640c1d6aa6bd29f

data/.rubocop.yml

@@ -4,7 +4,7 @@ AllCops:
     - 'storage/**/*'
     - 'docker/**/*'
     - 'lib/aggkit/childprocess/**/*'
-    - 'lib/aggkit/childprocess,rb'
+    - 'lib/aggkit/childprocess.rb'
     
 
 Security/YAMLLoad:
@@ -36,7 +36,9 @@ Style/Documentation:
 Style/Lambda:
   Enabled: false
   
-  
+Style/RedundantSelf:
+  Enabled: false
+
 Style/RaiseArgs:
   EnforcedStyle: compact
 
@@ -45,6 +47,12 @@ Style/SpecialGlobalVars:
     
 Metrics/LineLength:
   Max: 100
+  IgnoredPatterns: ['(\A|\s)#']
+
+Layout/TrailingBlankLines:
+  Enabled: true
+  AutoCorrect: true
+  EnforcedStyle: final_blank_line
 
 #Layout/IndentationWidth:
 #  Enabled: true
@@ -55,9 +63,24 @@ Metrics/LineLength:
   
 #Layout/ElseAlignment:
 #  Enabled: false
+
+Layout/MultilineOperationIndentation:
+  EnforcedStyle: indented
+
+Layout/RescueEnsureAlignment:
+  Enabled: false
   
-#Layout/EndAlignment:
-#  Enabled: false
+Layout/EndAlignment:
+  Enabled: true
+  EnforcedStyleAlignWith:  variable
+  AutoCorrect: true
+
+Layout/AlignHash:
+  EnforcedColonStyle: table
+  EnforcedHashRocketStyle: table
+
+Style/BracesAroundHashParameters:
+  EnforcedStyle: context_dependent
   
 #Lint/AssignmentInCondition:
 #  Enabled: false

data/Gemfile

@@ -3,6 +3,8 @@ 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'
@@ -10,3 +12,4 @@ group :test do
   gem 'rspec-retry'
   gem 'rspec-set'
 end
+

data/Gemfile.lock

@@ -1,7 +1,15 @@
+GIT
+  remote: https://github.com/RnD-Soft/diplomat.git
+  revision: 9e90b9317b0572c881342599024b18aec67e5c29
+  branch: master
+  specs:
+    diplomat (2.0.4)
+      faraday (~> 0.9)
+
 PATH
   remote: .
   specs:
-    aggkit (0.3.1.8768)
+    aggkit (0.3.4)
       diplomat
       dotenv
       json
@@ -12,13 +20,10 @@ GEM
   specs:
     awesome_print (1.8.0)
     diff-lcs (1.3)
-    diplomat (2.0.2)
-      faraday (~> 0.9)
-      json
-    dotenv (2.6.0)
+    dotenv (2.7.1)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    json (2.1.0)
+    json (2.2.0)
     multipart-post (2.0.0)
     rake (10.5.0)
     rspec (3.8.0)
@@ -46,6 +51,7 @@ DEPENDENCIES
   aggkit!
   awesome_print
   bundler (~> 1.14)
+  diplomat!
   rake (~> 10.0)
   rspec
   rspec-retry

data/aggkit.gemspec

@@ -31,9 +31,10 @@ 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'
   spec.add_development_dependency 'rake', '~> 10.0'
 end
+

data/bin/agg

@@ -29,10 +29,10 @@ exmaple_usage = "
 
 env_cmd_parser = OptionParser.new do |o|
   o.banner = "Usage: #{UTIL} env [options]"
-  o.on("-l", "--list", "list environments") do
+  o.on('-l', '--list', 'list environments') do
     @opts[:list] = true
   end
-  o.on("-t", "--tree", "print as tree") do
+  o.on('-t', '--tree', 'print as tree') do
     @opts[:tree] = true
   end
 end
@@ -42,48 +42,51 @@ exec_cmd_parser = OptionParser.new do |o|
   o.on('-p', '--pristine', "not include the parent processes' environment when exec child process") do
     @opts[:pristine] = true
   end
-  o.on('--cd', "cd to envroot") do
+  o.on('--cd', 'cd to envroot') do
     @opts[:cd] = true
   end
+  o.on('--wrap', 'wrap in docker-compose down -v and logs') do
+    @opts[:wrap] = true
+  end
 end
 
-@single_subcommands ||= { 
+@single_subcommands ||= {
   'exec' => exec_cmd_parser
 }
 
-@global_subcommands ||= { 
+@global_subcommands ||= {
   'env' => env_cmd_parser
 }
 
 single_parser = OptionParser.new do |o|
   o.banner = "Aggredator environment manager\nUsage: #{UTIL} <envname> [options] [subcommand [options]]"
-  
-  o.on("-s", "--show", "show envname details") do
+
+  o.on('-s', '--show', 'show envname details') do
     @opts[:show] = true
   end
 
-  o.on("-e", "--export", "show variable for export") do
+  o.on('-e', '--export', 'show variable for export') do
     @opts[:export] = true
   end
 
-  o.on("-r", "--release", "make release compose-result.yml(without build)") do
+  o.on('-r', '--release', 'make release compose-result.yml(without build)') do
     @opts[:release] = true
   end
 
-  o.on("-h", "--help", "show help") do
+  o.on('-h', '--help', 'show help') do
     puts o.help
     exit 0
   end
 
-  o.separator ""
+  o.separator ''
   o.separator "Subcommands: #{@single_subcommands.keys.join(', ')}"
 end
 
 global_parser = OptionParser.new do |o|
   o.banner = "Aggredator manager\nUsage: #{UTIL} [envname] [options] [subcommand [options]]"
-  
-  o.on("--resolve=address", "resolve hostname or IP to IP") do |address|
-    resolved = `getent hosts #{address.to_s.strip}`.split.first.to_s
+
+  o.on('--resolve=address', 'resolve hostname or IP to IP') do |address|
+    resolved = `getent ahosts #{address.to_s.strip}`.split.first.to_s
     if resolved.empty?
       puts address.to_s.strip
     else
@@ -92,24 +95,21 @@ global_parser = OptionParser.new do |o|
     exit 0
   end
 
-  o.on("-h", "--help", "show help") do
+  o.on('-h', '--help', 'show help') do
     puts o.help
     exit 0
   end
 
-  o.separator ""
+  o.separator ''
   o.separator "Subcommands: #{@global_subcommands.keys.join(', ')}"
 
-  o.separator ""
+  o.separator ''
   o.separator "Examples:\n#{exmaple_usage}"
 end
 
 begin
-  if Aggkit::Env.list.include?(ARGV.first)
-    $env = Aggkit::Env.new(ARGV.shift)
-  end
-rescue => e
-
+  $env = Aggkit::Env.new(ARGV.shift) if Aggkit::Env.list.include?(ARGV.first)
+rescue StandardError => e
 end
 
 if $env
@@ -127,7 +127,7 @@ end
 
 
 if command = ARGV.shift
-  if @subcommands.has_key?(command)
+  if @subcommands.key?(command)
     $parser = @subcommands[command]
     @commands[command.to_sym] = true
     $parser.parse!
@@ -139,7 +139,7 @@ if command = ARGV.shift
 end
 
 
-def env_command opts
+def env_command(opts)
   if opts[:list]
     envs = Aggkit::Env.list
     # if opts[:tree]
@@ -154,22 +154,40 @@ def env_command opts
     #   puts data
     #   puts TTY::Tree.new(data.first).render
     # else
-      puts envs
+    puts envs
     # end
     exit 0
   end
 end
 
-def exec_command opts
-  raise "envname not specified!" unless $env
-  raise "cmd not specified!" unless @exec
+def wrap_with_compose(cmd)
+  system('docker-compose down -v || true')
+
+  system(cmd)
+  result = $?
+  system('docker-compose logs') unless result.success?
+  result.exitstatus
+ensure
+  system('docker-compose down -v || true')
+end
 
-  $env.prepare release: @opts[:release]
+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]
 
   Dir.chdir $env.env_root if opts[:cd]
-  exec(e, @exec, unsetenv_others: true)
+
+  if opts[:wrap]
+    Aggkit::Env.with_env(e) do
+      exit(wrap_with_compose(@exec))
+    end
+  else
+    exec(e, @exec, unsetenv_others: true)
+  end
 end
 
 if @commands[:global]
@@ -180,7 +198,7 @@ if @commands[:single]
   exec_command(@opts) if @commands[:exec]
 
   if @opts[:show]
-    raise "envname not specified!" unless $env
+    raise 'envname not specified!' unless $env
 
     $env.prepare release: @opts[:release]
     puts JSON.pretty_generate($env.show)
@@ -188,11 +206,11 @@ if @commands[:single]
   end
 
   if @opts[:export]
-    raise "envname not specified!" unless $env
+    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}\""
+      puts "export #{k}=\"#{v}\""
     end
     exit 0
   end
@@ -201,3 +219,4 @@ end
 
 STDOUT.puts $parser.help
 exit 1
+

data/bin/aggci

@@ -11,69 +11,70 @@ include Aggkit::Ci
   tag: ENV['CORE_TAG'] || ENV['CI_COMMIT_TAG'] || 'latest'
 }
 
-def parse_services services
+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|
+  o.on('--pull-cache services', 'Pull cache from docker regestry') do |services|
     @opts[:pull] = parse_services(services)
   end
 
-  o.on("--push-cache services", 'Push cache to docker regestry') do |services|
+  o.on('--push-cache services', 'Push cache to docker regestry') do |services|
     @opts[:push] = parse_services(services)
   end
 
-  o.on("--promote services", 'Promote service images to --stage') do |services|
+  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|
+  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|
+  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|
+  o.on('--clean services', 'remove tags and images excluding last stable') do |services|
     @opts[:clean] = parse_services(services)
   end
 
-  o.on("--services services", 'list or services to process') do |services|
+  o.on('--services services', 'list or services to process') do |services|
     @opts[:services] = parse_services(services)
   end
 
-  o.on("--ssh-deploy env", 'ssh') do |env_and_server|
+  o.on('--ssh-deploy env', 'ssh') do |env_and_server|
     env, server = env_and_server.strip.split('@')
-    @opts[:deploy] = {env: env, server: server}
+    @opts[:deploy] = { env: env, server: server }
   end
 
-  o.on("--ssh-core-deploy env", 'ssh') do |env_and_server|
+  o.on('--ssh-core-deploy env', 'ssh') do |env_and_server|
     env, server = env_and_server.strip.split('@')
-    @opts[:core_deploy] = {env: env, server: server}
+    @opts[:core_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?
+  raise 'tag not defined' if @opts[:tag].to_s.empty?
+
   pull_images_cache services, @opts[:tag]
   exit 0
 elsif services = @opts[:push]
-  raise "tag not defined" if @opts[:tag].to_s.empty?
+  raise 'tag not defined' if @opts[:tag].to_s.empty?
+
   push_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?
+  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'
@@ -81,32 +82,36 @@ elsif services = @opts[:promote]
   when 'stage'
     promote_services_to_stage!(services, @opts[:tag])
   when 'tag'
-    raise "promote-tag not defined" if @opts[:promotetag].to_s.empty?
+    raise 'promote-tag not defined' if @opts[:promotetag].to_s.empty?
+
     promote_services_to_tag!(services, @opts[:tag], @opts[:promotetag])
-  else 
+  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?
+  raise 'tag not defined' if @opts[:tag].to_s.empty?
+
   clean_services services, @opts[:tag]
   exit 0
 
 elsif deploy = @opts[:deploy]
   @opts[:services] ||= []
-  raise "tag not defined" if @opts[:tag].to_s.empty?
-  raise "stage not defined" if @opts[:stage].to_s.empty?
-  raise "services not defined" if @opts[:services].empty?
+  raise 'tag not defined' if @opts[:tag].to_s.empty?
+  raise 'stage not defined' if @opts[:stage].to_s.empty?
+  raise 'services not defined' if @opts[:services].empty?
+
   ssh_deploy @opts[:services], deploy[:env], deploy[:server], @opts[:tag], @opts[:stage]
   exit 0
 
 elsif deploy = @opts[:core_deploy]
   @opts[:services] ||= []
-  raise "tag not defined" if @opts[:tag].to_s.empty?
-  raise "stage not defined" if @opts[:stage].to_s.empty?
-  raise "services not defined" if @opts[:services].empty?
+  raise 'tag not defined' if @opts[:tag].to_s.empty?
+  raise 'stage not defined' if @opts[:stage].to_s.empty?
+  raise 'services not defined' if @opts[:services].empty?
+
   ssh_core_deploy @opts[:services], deploy[:env], deploy[:server], @opts[:tag], @opts[:stage]
   exit 0
 end

data/bin/aggconsul

@@ -93,8 +93,8 @@ def key_to_env(key)
 end
 
 def dereferenced_value(value)
-  if @opts[:dereference] && value && value[/^consul:\/\//]
-    reference_path = value.gsub(/^consul:\/\//, '')
+  if @opts[:dereference] && value && value[%r{^consul://}]
+    reference_path = value.gsub(%r{^consul://}, '')
     dereferenced_value(Diplomat::Kv.get(reference_path))
   else
     value
@@ -109,11 +109,11 @@ if @opts[:init]
   raise OptionParser::MissingArgument.new('config') unless @opts[:config]
 
   services = if service = @opts[:service]
-               {
-                 service => @opts[:config][service]
-               }
-             else
-               @opts[:config]
+    {
+      service => @opts[:config][service]
+    }
+  else
+    @opts[:config]
   end
 
   services.each_pair do |service, config|
@@ -124,9 +124,9 @@ if @opts[:init]
     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']
+        File.read(item['file'])
+      else
+        item['value'] || item['default'] || item['file']
       end
 
       empty = begin
@@ -147,10 +147,10 @@ if @opts[:show]
   config = {}
 
   path = if service = @opts[:service]
-           "services/env/#{service}/"
-         else
-           'services/env/'
-         end
+    "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|
@@ -160,7 +160,7 @@ if @opts[:show]
       value = dereferenced_value(value)
 
       cfg[key_to_env(key)] = {
-        env: key_to_env(key),
+        env:   key_to_env(key),
         value: value
       }
     end
@@ -220,3 +220,4 @@ end
 
 STDOUT.puts parser.help
 exit 1
+