aggkit 0.4.91.21460 → 0.4.91.77503

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85bf25ce943e64b3c06008e05eeb9fbae99e9e57640d630c929f042126da0610
-  data.tar.gz: b5bbd577d16a586ebd768ebdc7ed0f6bbc5e99b218f0dcec5ac51fdb77d0e0df
+  metadata.gz: e4e8274f4d5243f3a64f488bd81e67a541bdfae904a506adcfa88298506b8b8b
+  data.tar.gz: dbf92cfff676c8dacf8b9d417ec2da656ef70e25c6cafe79e91435c6c93eabd3
 SHA512:
-  metadata.gz: 5cb6116f61a6f8828ba7f6eb3fe37289da61676bf89674955fe94b25a240c188430280be32199a4e3f8ba5a0609c9ef1093e8c77860cb9af5347c6aa9b15d174
-  data.tar.gz: 8e519d2aac6935545298fb17d2c565e6125161f90dbe8a19a9329e223ab062f9bc8ee22c8a3eacacc92dd7790e14faa62a11d349be2a90c916ca8e02d385ad1a
+  metadata.gz: 4078cf58d447c770651d7d0dab5656f92121c5131bfb4fde55a5fef8f43dd30bfc0a5ecca34f1a1233aa349ca9c73d46fe1439438bfb97775e7a3672db424ea6
+  data.tar.gz: ff7b6c2144a65d95fb242de9c185236d1d92decd423ef37880c09034a0f39a4d705531715c2120d96c6c0d23014d817356cea6d3f57839b0f95cd9c69c982c47

data/.gitlab-ci.yml

@@ -39,30 +39,30 @@ build:
     paths:
       - ./*.gem
 
-test-2.1:
-  image: rnds/ruby:2.3.0-test
-  stage: tests
-  variables:
-    RUBY_VERSION: '2.1'
-  script:
-    - docker/run_tests.sh 
-    - cp docker/rspec* .
-  artifacts:
-    reports:
-      junit: rspec*.xml
+# test-2.1:
+#   image: rnds/ruby:2.3.0-test
+#   stage: tests
+#   variables:
+#     RUBY_VERSION: '2.1'
+#   script:
+#     - docker/run_tests.sh 
+#     - cp docker/rspec* .
+#   artifacts:
+#     reports:
+#       junit: rspec*.xml
 
 
-test-2.5:
-  image: rnds/ruby:2.3.0-test
-  stage: tests
-  variables:
-    RUBY_VERSION: '2.5'
-  script:
-    - docker/run_tests.sh 
-    - cp docker/rspec* .
-  artifacts:
-    reports:
-      junit: rspec*.xml
+# test-2.5:
+#   image: rnds/ruby:2.3.0-test
+#   stage: tests
+#   variables:
+#     RUBY_VERSION: '2.5'
+#   script:
+#     - docker/run_tests.sh 
+#     - cp docker/rspec* .
+#   artifacts:
+#     reports:
+#       junit: rspec*.xml
 
 
 pronto:

data/.rubocop.yml

@@ -48,11 +48,11 @@ Style/RescueModifier:
 Style/SpecialGlobalVars:
   Enabled: false
     
-Metrics/LineLength:
+Layout/LineLength:
   Max: 100
   IgnoredPatterns: ['(\A|\s)#']
 
-Layout/TrailingBlankLines:
+Layout/TrailingEmptyLines:
   Enabled: true
   AutoCorrect: true
   EnforcedStyle: final_blank_line
@@ -82,13 +82,10 @@ Layout/EndAlignment:
   EnforcedStyleAlignWith:  variable
   AutoCorrect: true
 
-Layout/AlignHash:
+Layout/HashAlignment:
   EnforcedColonStyle: table
   EnforcedHashRocketStyle: table
 
-Style/BracesAroundHashParameters:
-  EnforcedStyle: context_dependent
-  
 #Lint/AssignmentInCondition:
 #  Enabled: false
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    aggkit (0.4.91.21460)
+    aggkit (0.4.91.77503)
       diplomat
       dotenv
       json
@@ -12,15 +12,36 @@ GEM
   specs:
     ansi (1.5.0)
     awesome_print (1.8.0)
-    deep_merge (1.2.1)
+    deep_merge (1.2.2)
     diff-lcs (1.3)
-    diplomat (2.2.5)
-      deep_merge (~> 1.0, >= 1.0.1)
-      faraday (~> 0.9)
+    diplomat (2.6.2)
+      deep_merge (~> 1.2)
+      faraday (>= 0.9, < 2.0)
     docile (1.3.1)
-    dotenv (2.7.5)
-    faraday (0.17.1)
+    dotenv (2.7.6)
+    faraday (1.10.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.3)
       multipart-post (>= 1.2, < 3)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
     json (2.2.0)
     multipart-post (2.1.1)
     rake (10.5.0)
@@ -42,6 +63,7 @@ GEM
     rspec-support (3.8.0)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
+    ruby2_keywords (0.0.5)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -53,7 +75,7 @@ GEM
     simplecov-html (0.10.2)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    tty-tree (0.3.0)
+    tty-tree (0.4.0)
     unicode-display_width (1.6.0)
 
 PLATFORMS

data/bin/aggconsul

@@ -150,7 +150,7 @@ if @opts[:init]
 
     path = "services/env/#{service}"
     config.each_pair do |env, item|
-      key = "#{path}/#{key_to_consul(env)}"
+      key = "#{path}/#{key_to_consul(env).upcase}"
       value = if @opts[:upload] && item['file']
         File.read(item['file'])
       else

data/bin/aggwrap

@@ -43,6 +43,10 @@ parser = Aggkit::OptionParser.new do |o|
     @opts[:service] = service.to_s
   end
 
+  o.on('--component <NAME>', 'Set service COMPONENT. AGGREDATOR_COMPONENT env used when missed') do |component|
+    @opts[:component] = component.to_s
+  end
+
   o.on('--tags=tag1,tag2...', 'Set list of tags for service') do |list|
     @opts[:tags] += list.to_s.split(/[ ;,|]/).map(&:to_s).reject(&:empty?)
   end

data/lib/aggkit/ci.rb

@@ -35,15 +35,15 @@ module Aggkit
     # Работа должна вестить ТОЛЬКО с workimage
 
     # Базовое имя образа
-    # Например docker.rnds.pro/aggredator-mq
+    # Например harbor.rnds.pro/aggredator/mq
     def baseimage(service)
       raise "Service name invalid: #{service.inspect}" if service.to_s.length < 2
 
-      "docker.rnds.pro/aggredator-#{service}"
+      "harbor.rnds.pro/aggredator/#{service}"
     end
 
     # Текущее имя образа без модификаторов продвижения, но с тегом
-    # Например docker.rnds.pro/aggredator-mq:7e6420b5
+    # Например harbor.rnds.pro/aggredator/mq:7e6420b5
     def workimage(service, tag)
       raise "Service tag invalid: #{tag.inspect}" if tag.to_s.length < 2
 
@@ -51,7 +51,7 @@ module Aggkit
     end
 
     # Образ с модификатором версии
-    # Например docker.rnds.pro/aggredator-mq-dev:7e6420b5
+    # Например harbor.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
@@ -60,19 +60,19 @@ module Aggkit
     end
 
     # Образ с модификатором протестированной автотестами версии
-    # Например docker.rnds.pro/aggredator-mq-dev:7e6420b5
+    # Например harbor.rnds.pro/aggredator/mq-dev:7e6420b5
     def devimage(service, tag)
       promotedimage(service, 'dev', tag)
     end
 
     # Образ с модификатором стабильной версии
-    # Например docker.rnds.pro/aggredator-mq-stage:7e6420b5
+    # Например harbor.rnds.pro/aggredator/mq-stage:7e6420b5
     def stageimage(service, tag)
       promotedimage(service, 'stage', tag)
     end
 
     # Образ с модификатором релизной версии
-    # Например docker.rnds.pro/aggredator-mq-release:7e6420b5
+    # Например harbor.rnds.pro/aggredator/mq-release:7e6420b5
     def releaseimage(service, tag)
       promotedimage(service, 'release', tag)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aggkit
 version: !ruby/object:Gem::Version
-  version: 0.4.91.21460
+  version: 0.4.91.77503
 platform: ruby
 authors:
 - Godko Ivan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-25 00:00:00.000000000 Z
+date: 2022-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diplomat