aggkit 0.4.91.29907 → 0.4.91.77503

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/.gitlab-ci.yml +22 -22
  3. data/.rubocop.yml +3 -6
  4. data/Gemfile.lock +29 -7
  5. data/lib/aggkit/ci.rb +7 -7
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 306d10f6649342e72743b02b893488f190355ff9ab57f069cd77d40605748531
4
- data.tar.gz: 002ce72e56bdd610be4d7155c68ecf7db00c24d7bc4fe51c8a3db89436c17ac7
3
+ metadata.gz: e4e8274f4d5243f3a64f488bd81e67a541bdfae904a506adcfa88298506b8b8b
4
+ data.tar.gz: dbf92cfff676c8dacf8b9d417ec2da656ef70e25c6cafe79e91435c6c93eabd3
5
5
  SHA512:
6
- metadata.gz: 11388891c31cbce87113f7b8f9284a11d49a1dac4be16bec9947406821896834e446ad970b1c0433511143c89b40481a2d3b82c6cee2c218a920c7c93d96a814
7
- data.tar.gz: 24c99fd894302f1c46448475b9a00a74371c64f792e2c9364d1814911dd32876c87aae4cd0f2e154166c67789fe5cc39b3a9fae477642ce73df8b81bcd22df33
6
+ metadata.gz: 4078cf58d447c770651d7d0dab5656f92121c5131bfb4fde55a5fef8f43dd30bfc0a5ecca34f1a1233aa349ca9c73d46fe1439438bfb97775e7a3672db424ea6
7
+ data.tar.gz: ff7b6c2144a65d95fb242de9c185236d1d92decd423ef37880c09034a0f39a4d705531715c2120d96c6c0d23014d817356cea6d3f57839b0f95cd9c69c982c47
data/.gitlab-ci.yml CHANGED
@@ -39,30 +39,30 @@ build:
39
39
  paths:
40
40
  - ./*.gem
41
41
 
42
- test-2.1:
43
- image: rnds/ruby:2.3.0-test
44
- stage: tests
45
- variables:
46
- RUBY_VERSION: '2.1'
47
- script:
48
- - docker/run_tests.sh
49
- - cp docker/rspec* .
50
- artifacts:
51
- reports:
52
- junit: rspec*.xml
42
+ # test-2.1:
43
+ # image: rnds/ruby:2.3.0-test
44
+ # stage: tests
45
+ # variables:
46
+ # RUBY_VERSION: '2.1'
47
+ # script:
48
+ # - docker/run_tests.sh
49
+ # - cp docker/rspec* .
50
+ # artifacts:
51
+ # reports:
52
+ # junit: rspec*.xml
53
53
 
54
54
 
55
- test-2.5:
56
- image: rnds/ruby:2.3.0-test
57
- stage: tests
58
- variables:
59
- RUBY_VERSION: '2.5'
60
- script:
61
- - docker/run_tests.sh
62
- - cp docker/rspec* .
63
- artifacts:
64
- reports:
65
- junit: rspec*.xml
55
+ # test-2.5:
56
+ # image: rnds/ruby:2.3.0-test
57
+ # stage: tests
58
+ # variables:
59
+ # RUBY_VERSION: '2.5'
60
+ # script:
61
+ # - docker/run_tests.sh
62
+ # - cp docker/rspec* .
63
+ # artifacts:
64
+ # reports:
65
+ # junit: rspec*.xml
66
66
 
67
67
 
68
68
  pronto:
data/.rubocop.yml CHANGED
@@ -48,11 +48,11 @@ Style/RescueModifier:
48
48
  Style/SpecialGlobalVars:
49
49
  Enabled: false
50
50
 
51
- Metrics/LineLength:
51
+ Layout/LineLength:
52
52
  Max: 100
53
53
  IgnoredPatterns: ['(\A|\s)#']
54
54
 
55
- Layout/TrailingBlankLines:
55
+ Layout/TrailingEmptyLines:
56
56
  Enabled: true
57
57
  AutoCorrect: true
58
58
  EnforcedStyle: final_blank_line
@@ -82,13 +82,10 @@ Layout/EndAlignment:
82
82
  EnforcedStyleAlignWith: variable
83
83
  AutoCorrect: true
84
84
 
85
- Layout/AlignHash:
85
+ Layout/HashAlignment:
86
86
  EnforcedColonStyle: table
87
87
  EnforcedHashRocketStyle: table
88
88
 
89
- Style/BracesAroundHashParameters:
90
- EnforcedStyle: context_dependent
91
-
92
89
  #Lint/AssignmentInCondition:
93
90
  # Enabled: false
94
91
 
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- aggkit (0.4.91.29907)
4
+ aggkit (0.4.91.77503)
5
5
  diplomat
6
6
  dotenv
7
7
  json
@@ -12,15 +12,36 @@ GEM
12
12
  specs:
13
13
  ansi (1.5.0)
14
14
  awesome_print (1.8.0)
15
- deep_merge (1.2.1)
15
+ deep_merge (1.2.2)
16
16
  diff-lcs (1.3)
17
- diplomat (2.3.3)
18
- deep_merge (~> 1.0, >= 1.0.1)
19
- faraday (>= 0.9, < 2.0.0)
17
+ diplomat (2.6.2)
18
+ deep_merge (~> 1.2)
19
+ faraday (>= 0.9, < 2.0)
20
20
  docile (1.3.1)
21
- dotenv (2.7.5)
22
- faraday (1.0.1)
21
+ dotenv (2.7.6)
22
+ faraday (1.10.0)
23
+ faraday-em_http (~> 1.0)
24
+ faraday-em_synchrony (~> 1.0)
25
+ faraday-excon (~> 1.1)
26
+ faraday-httpclient (~> 1.0)
27
+ faraday-multipart (~> 1.0)
28
+ faraday-net_http (~> 1.0)
29
+ faraday-net_http_persistent (~> 1.0)
30
+ faraday-patron (~> 1.0)
31
+ faraday-rack (~> 1.0)
32
+ faraday-retry (~> 1.0)
33
+ ruby2_keywords (>= 0.0.4)
34
+ faraday-em_http (1.0.0)
35
+ faraday-em_synchrony (1.0.0)
36
+ faraday-excon (1.1.0)
37
+ faraday-httpclient (1.0.1)
38
+ faraday-multipart (1.0.3)
23
39
  multipart-post (>= 1.2, < 3)
40
+ faraday-net_http (1.0.1)
41
+ faraday-net_http_persistent (1.2.0)
42
+ faraday-patron (1.0.0)
43
+ faraday-rack (1.0.0)
44
+ faraday-retry (1.0.3)
24
45
  json (2.2.0)
25
46
  multipart-post (2.1.1)
26
47
  rake (10.5.0)
@@ -42,6 +63,7 @@ GEM
42
63
  rspec-support (3.8.0)
43
64
  rspec_junit_formatter (0.4.1)
44
65
  rspec-core (>= 2, < 4, != 2.12.0)
66
+ ruby2_keywords (0.0.5)
45
67
  simplecov (0.16.1)
46
68
  docile (~> 1.1)
47
69
  json (>= 1.8, < 3)
data/lib/aggkit/ci.rb CHANGED
@@ -35,15 +35,15 @@ module Aggkit
35
35
  # Работа должна вестить ТОЛЬКО с workimage
36
36
 
37
37
  # Базовое имя образа
38
- # Например docker.rnds.pro/aggredator-mq
38
+ # Например harbor.rnds.pro/aggredator/mq
39
39
  def baseimage(service)
40
40
  raise "Service name invalid: #{service.inspect}" if service.to_s.length < 2
41
41
 
42
- "docker.rnds.pro/aggredator-#{service}"
42
+ "harbor.rnds.pro/aggredator/#{service}"
43
43
  end
44
44
 
45
45
  # Текущее имя образа без модификаторов продвижения, но с тегом
46
- # Например docker.rnds.pro/aggredator-mq:7e6420b5
46
+ # Например harbor.rnds.pro/aggredator/mq:7e6420b5
47
47
  def workimage(service, tag)
48
48
  raise "Service tag invalid: #{tag.inspect}" if tag.to_s.length < 2
49
49
 
@@ -51,7 +51,7 @@ module Aggkit
51
51
  end
52
52
 
53
53
  # Образ с модификатором версии
54
- # Например docker.rnds.pro/aggredator-mq-dev:7e6420b5
54
+ # Например harbor.rnds.pro/aggredator/mq-dev:7e6420b5
55
55
  def promotedimage(service, stage, tag)
56
56
  raise "Service stage invalid: #{stage.inspect}" if stage.to_s.length < 2
57
57
  raise "Service tag invalid: #{tag.inspect}" if tag.to_s.length < 2
@@ -60,19 +60,19 @@ module Aggkit
60
60
  end
61
61
 
62
62
  # Образ с модификатором протестированной автотестами версии
63
- # Например docker.rnds.pro/aggredator-mq-dev:7e6420b5
63
+ # Например harbor.rnds.pro/aggredator/mq-dev:7e6420b5
64
64
  def devimage(service, tag)
65
65
  promotedimage(service, 'dev', tag)
66
66
  end
67
67
 
68
68
  # Образ с модификатором стабильной версии
69
- # Например docker.rnds.pro/aggredator-mq-stage:7e6420b5
69
+ # Например harbor.rnds.pro/aggredator/mq-stage:7e6420b5
70
70
  def stageimage(service, tag)
71
71
  promotedimage(service, 'stage', tag)
72
72
  end
73
73
 
74
74
  # Образ с модификатором релизной версии
75
- # Например docker.rnds.pro/aggredator-mq-release:7e6420b5
75
+ # Например harbor.rnds.pro/aggredator/mq-release:7e6420b5
76
76
  def releaseimage(service, tag)
77
77
  promotedimage(service, 'release', tag)
78
78
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: aggkit
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.91.29907
4
+ version: 0.4.91.77503
5
5
  platform: ruby
6
6
  authors:
7
7
  - Godko Ivan
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2020-05-13 00:00:00.000000000 Z
12
+ date: 2022-02-24 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: diplomat