eac_tools 0.55.3 → 0.55.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (30) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +41 -34
  3. data/lib/eac_tools/version.rb +1 -1
  4. data/sub/aranha-parsers/lib/aranha/parsers/html/node/default/numeric_support.rb +65 -6
  5. data/sub/aranha-parsers/lib/aranha/parsers/version.rb +1 -1
  6. data/sub/avm/avm.gemspec +3 -4
  7. data/sub/avm/lib/avm/docker/image.rb +3 -8
  8. data/sub/avm/lib/avm/scms/base.rb +7 -0
  9. data/sub/avm/lib/avm/version.rb +1 -1
  10. data/sub/avm-eac_generic_base0/avm-eac_generic_base0.gemspec +2 -2
  11. data/sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/file_formats/base.rb +6 -0
  12. data/sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/version.rb +1 -1
  13. data/sub/avm-eac_redmine_base0/avm-eac_redmine_base0.gemspec +5 -5
  14. data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/docker_image.rb +0 -1
  15. data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/version.rb +1 -1
  16. data/sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/docker_image/Dockerfile.template +0 -4
  17. data/sub/avm-eac_ubuntu_base0/avm-eac_ubuntu_base0.gemspec +2 -2
  18. data/sub/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/version.rb +1 -1
  19. data/sub/avm-eac_ubuntu_base0/template/avm/eac_ubuntu_base0/docker_image/Dockerfile.template +1 -0
  20. data/sub/avm-git/avm-git.gemspec +4 -4
  21. data/sub/avm-git/lib/avm/git/scms/git_sub_base/commit.rb +29 -0
  22. data/sub/avm-git/lib/avm/git/scms/git_sub_base/interval.rb +28 -0
  23. data/sub/avm-git/lib/avm/git/scms/git_sub_base.rb +10 -1
  24. data/sub/avm-git/lib/avm/git/version.rb +1 -1
  25. data/sub/eac_docker/lib/eac_docker/images/templatized.rb +5 -1
  26. data/sub/eac_docker/lib/eac_docker/version.rb +1 -1
  27. data/sub/eac_git/eac_git.gemspec +1 -1
  28. data/sub/eac_git/lib/eac_git/local/remote.rb +1 -1
  29. data/sub/eac_git/lib/eac_git/version.rb +1 -1
  30. metadata +34 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a5d1418c152dd790a2e5831c10b72496700195606bb8d15f69a2e4a36939b420
4
- data.tar.gz: '0959271a81984ccfd30ffe65aaa5537770720443b02511a5c7a3b6464cde0003'
3
+ metadata.gz: 3253c050b8f81f650cfd1ec944cc11f7af824f4510cd3675780abd8dcce14a3d
4
+ data.tar.gz: a56630daf972f0a82ecadb8b714bdcd0cde14e0d8c9e705d7a795b0e922c7267
5
5
  SHA512:
6
- metadata.gz: 1f781a034585d43fbf20d9c367e3b3a4f8a0eb4f608143469c267a30bc609c61ac9ee5b406cb24cc2c881a618b7acc79620a53832545b1897763c69a19e850d4
7
- data.tar.gz: bfeda693a8d2af8d1741249374cd1536475a5230196c1dd69988871616be4bfc12d319e566086f8974cdc9dd3242f95c35a01b3111e617088ed8911da9f4a11e
6
+ metadata.gz: 4f2f8c718124fb9bb75cac9cc7b80b8d6bee231feb584cb48679a04a36fa43b165388826905178d98c4480a3159329936e278ae4498c3f1cf77d35b8f3cd6c64
7
+ data.tar.gz: a0610099510bfeb32c86dcec8024441c13a91cdcab4609dd86b24d94fb2df6e0ae9d07d7d8cb6100ba8151543218b0dd3a3f6f8f098c9c8fd1f15825fc337306
data/Gemfile.lock CHANGED
@@ -1,28 +1,29 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- eac_tools (0.55.3)
5
- avm (~> 0.63)
4
+ eac_tools (0.55.5)
5
+ avm (~> 0.64, >= 0.64.1)
6
6
  avm-eac_asciidoctor_base0 (~> 0.15)
7
- avm-eac_generic_base0 (~> 0.10)
7
+ avm-eac_generic_base0 (~> 0.11)
8
8
  avm-eac_latex_base0 (~> 0.3)
9
9
  avm-eac_php_base0 (~> 0.4, >= 0.4.1)
10
10
  avm-eac_postgresql_base0 (~> 0.2, >= 0.2.3)
11
11
  avm-eac_python_base0 (~> 0.2, >= 0.2.1)
12
12
  avm-eac_rails_base0 (~> 0.9)
13
13
  avm-eac_rails_base1 (~> 0.8)
14
- avm-eac_redmine_base0 (~> 0.18)
14
+ avm-eac_redmine_base0 (~> 0.18, >= 0.18.1)
15
15
  avm-eac_redmine_plugin_base0 (~> 0.4)
16
16
  avm-eac_ruby_base1 (~> 0.29, >= 0.29.2)
17
17
  avm-eac_webapp_base0 (~> 0.13, >= 0.13.1)
18
18
  avm-eac_wordpress_base0 (~> 0.3)
19
+ avm-git (~> 0.13)
19
20
  avm-tools (~> 0.145, >= 0.145.1)
20
21
  eac_ruby_utils (~> 0.112)
21
22
 
22
23
  PATH
23
24
  remote: sub/aranha-parsers
24
25
  specs:
25
- aranha-parsers (0.16.0)
26
+ aranha-parsers (0.17.0)
26
27
  activesupport (>= 4.0.0)
27
28
  addressable (~> 2.8, >= 2.8.1)
28
29
  eac_ruby_utils (~> 0.112)
@@ -46,9 +47,9 @@ PATH
46
47
  PATH
47
48
  remote: sub/avm-eac_generic_base0
48
49
  specs:
49
- avm-eac_generic_base0 (0.10.0)
50
- avm (~> 0.61)
51
- eac_ruby_utils (~> 0.110, >= 0.110.1)
50
+ avm-eac_generic_base0 (0.11.0)
51
+ avm (~> 0.64, >= 0.64.1)
52
+ eac_ruby_utils (~> 0.112)
52
53
 
53
54
  PATH
54
55
  remote: sub/avm-eac_latex_base0
@@ -99,15 +100,15 @@ PATH
99
100
  PATH
100
101
  remote: sub/avm-eac_redmine_base0
101
102
  specs:
102
- avm-eac_redmine_base0 (0.18.0)
103
- avm (~> 0.57)
104
- avm-eac_generic_base0 (~> 0.8)
103
+ avm-eac_redmine_base0 (0.18.1)
104
+ avm (~> 0.64, >= 0.64.1)
105
+ avm-eac_generic_base0 (~> 0.11)
105
106
  avm-eac_rails_base1 (~> 0.8)
106
- avm-eac_ubuntu_base0 (~> 0.3)
107
+ avm-eac_ubuntu_base0 (~> 0.4, >= 0.4.1)
107
108
  curb (~> 0.9, >= 0.9.11)
108
109
  eac_fs (~> 0.16)
109
- eac_rest (~> 0.6, >= 0.6.1)
110
- eac_ruby_utils (~> 0.109)
110
+ eac_rest (~> 0.7, >= 0.7.2)
111
+ eac_ruby_utils (~> 0.112)
111
112
 
112
113
  PATH
113
114
  remote: sub/avm-eac_redmine_plugin_base0
@@ -128,9 +129,9 @@ PATH
128
129
  PATH
129
130
  remote: sub/avm-eac_ubuntu_base0
130
131
  specs:
131
- avm-eac_ubuntu_base0 (0.4.0)
132
- avm (~> 0.57)
133
- eac_ruby_utils (~> 0.109)
132
+ avm-eac_ubuntu_base0 (0.4.1)
133
+ avm (~> 0.64)
134
+ eac_ruby_utils (~> 0.112)
134
135
  eac_templates (~> 0.3, >= 0.3.2)
135
136
 
136
137
  PATH
@@ -165,12 +166,12 @@ PATH
165
166
  PATH
166
167
  remote: sub/avm-git
167
168
  specs:
168
- avm-git (0.12.0)
169
- avm (~> 0.61)
169
+ avm-git (0.13.0)
170
+ avm (~> 0.64)
170
171
  avm-files (~> 0.6)
171
- eac_git (~> 0.14)
172
- eac_ruby_utils (~> 0.110, >= 0.110.1)
173
- git (~> 1.13, >= 1.13.1)
172
+ eac_git (~> 0.14, >= 0.14.1)
173
+ eac_ruby_utils (~> 0.112)
174
+ git (~> 1.17, >= 1.17.2)
174
175
 
175
176
  PATH
176
177
  remote: sub/avm-tools
@@ -193,13 +194,13 @@ PATH
193
194
  PATH
194
195
  remote: sub/avm
195
196
  specs:
196
- avm (0.63.0)
197
- aranha-parsers (~> 0.16)
197
+ avm (0.64.1)
198
+ aranha-parsers (~> 0.17)
198
199
  eac_cli (~> 0.30, >= 0.30.1)
199
200
  eac_config (~> 0.12)
200
- eac_docker (~> 0.6)
201
+ eac_docker (~> 0.7)
201
202
  eac_fs (~> 0.16)
202
- eac_git (~> 0.14)
203
+ eac_git (~> 0.14, >= 0.14.1)
203
204
  eac_ruby_utils (~> 0.112)
204
205
  eac_templates (~> 0.3, >= 0.3.2)
205
206
  filesize (~> 0.2)
@@ -224,7 +225,7 @@ PATH
224
225
  PATH
225
226
  remote: sub/eac_docker
226
227
  specs:
227
- eac_docker (0.6.0)
228
+ eac_docker (0.7.0)
228
229
  eac_ruby_utils (~> 0.112)
229
230
  eac_templates (~> 0.3, >= 0.3.2)
230
231
 
@@ -239,8 +240,8 @@ PATH
239
240
  PATH
240
241
  remote: sub/eac_git
241
242
  specs:
242
- eac_git (0.14.0)
243
- eac_ruby_utils (~> 0.107)
243
+ eac_git (0.14.1)
244
+ eac_ruby_utils (~> 0.112)
244
245
  parseconfig (~> 1.1, >= 1.1.2)
245
246
 
246
247
  PATH
@@ -265,7 +266,7 @@ PATH
265
266
  GEM
266
267
  remote: https://rubygems.org/
267
268
  specs:
268
- activesupport (6.1.7.2)
269
+ activesupport (6.1.7.3)
269
270
  concurrent-ruby (~> 1.0, >= 1.0.2)
270
271
  i18n (>= 1.6, < 2)
271
272
  minitest (>= 5.1)
@@ -282,7 +283,13 @@ GEM
282
283
  parslet (~> 2.0)
283
284
  curb (0.9.11)
284
285
  diff-lcs (1.5.0)
285
- eac_rest (0.7.1)
286
+ eac_envs-http (0.1.0)
287
+ eac_fs (~> 0.16)
288
+ eac_ruby_utils (~> 0.112)
289
+ faraday (~> 2.7, >= 2.7.4)
290
+ faraday-multipart (~> 1.0, >= 1.0.4)
291
+ eac_rest (0.7.2)
292
+ eac_envs-http (~> 0.1)
286
293
  eac_fs (~> 0.16)
287
294
  eac_ruby_utils (~> 0.112)
288
295
  faraday (~> 2.7, >= 2.7.4)
@@ -310,7 +317,7 @@ GEM
310
317
  faraday-retry (2.1.0)
311
318
  faraday (~> 2.0)
312
319
  filesize (0.2.0)
313
- git (1.17.2)
320
+ git (1.18.0)
314
321
  addressable (~> 2.8)
315
322
  rchardet (~> 1.8)
316
323
  hpricot (0.8.6)
@@ -334,7 +341,7 @@ GEM
334
341
  parslet (2.0.0)
335
342
  public_suffix (5.0.1)
336
343
  racc (1.6.2)
337
- rack (3.0.5)
344
+ rack (3.0.7)
338
345
  rainbow (3.1.1)
339
346
  rchardet (1.8.0)
340
347
  rexml (3.2.5)
@@ -348,7 +355,7 @@ GEM
348
355
  rspec-expectations (3.12.2)
349
356
  diff-lcs (>= 1.2.0, < 2.0)
350
357
  rspec-support (~> 3.12.0)
351
- rspec-mocks (3.12.3)
358
+ rspec-mocks (3.12.4)
352
359
  diff-lcs (>= 1.2.0, < 2.0)
353
360
  rspec-support (~> 3.12.0)
354
361
  rspec-support (3.12.0)
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module EacTools
4
- VERSION = '0.55.3'
4
+ VERSION = '0.55.5'
5
5
  end
@@ -9,6 +9,34 @@ module Aranha
9
9
  module Node
10
10
  class Default < ::Aranha::Parsers::Html::Node::Base
11
11
  module NumericSupport
12
+ # @param node [Nokogiri::XML::Element]
13
+ # @param xpath [String]
14
+ # @return [Float]
15
+ def decimal_comma_value(node, xpath)
16
+ parse_decimal_comma(node, xpath, true)
17
+ end
18
+
19
+ # @param node [Nokogiri::XML::Element]
20
+ # @param xpath [String]
21
+ # @return [Float, nil]
22
+ def decimal_comma_optional_value(node, xpath)
23
+ parse_decimal_comma(node, xpath, false)
24
+ end
25
+
26
+ # @param node [Nokogiri::XML::Element]
27
+ # @param xpath [String]
28
+ # @return [Float]
29
+ def decimal_dot_value(node, xpath)
30
+ parse_decimal_dot(node, xpath, true)
31
+ end
32
+
33
+ # @param node [Nokogiri::XML::Element]
34
+ # @param xpath [String]
35
+ # @return [Float, nil]
36
+ def decimal_dot_optional_value(node, xpath)
37
+ parse_decimal_dot(node, xpath, false)
38
+ end
39
+
12
40
  def integer_value(node, xpath)
13
41
  r = string_value(node, xpath)
14
42
  return nil if r.blank?
@@ -33,12 +61,20 @@ module Aranha
33
61
  parse_float(node, xpath, false)
34
62
  end
35
63
 
64
+ # @deprecated Use {#decimal_dot_value} instead.
65
+ # @param node [Nokogiri::XML::Element]
66
+ # @param xpath [String]
67
+ # @return [Float]
36
68
  def us_decimal_value(node, xpath)
37
- parse_us_decimal(node, xpath, true)
69
+ decimal_dot_value(node, xpath)
38
70
  end
39
71
 
72
+ # @deprecated Use {#decimal_dot_optional_value} instead.
73
+ # @param node [Nokogiri::XML::Element]
74
+ # @param xpath [String]
75
+ # @return [Float, nil]
40
76
  def us_decimal_optional_value(node, xpath)
41
- parse_us_decimal(node, xpath, false)
77
+ decimal_dot_optional_value(node, xpath)
42
78
  end
43
79
 
44
80
  private
@@ -53,15 +89,38 @@ module Aranha
53
89
  end
54
90
  end
55
91
 
56
- def parse_us_decimal(node, xpath, required)
92
+ # @param node [Nokogiri::XML::Element]
93
+ # @param xpath [String]
94
+ # @param required [Boolean]
95
+ # @param separator [String]
96
+ # @param delimiter [String]
97
+ # @return [Float, nil]
98
+ def parse_decimal(node, xpath, required, separator, delimiter)
57
99
  s = string_value(node, xpath)
58
- m = /\d+(?:[\.\,](\d+))?/.match(s)
100
+ m = /\d+(?:[#{::Regexp.quote(separator + delimiter)}](\d+))?/.match(s)
59
101
  if m
60
- m[0].delete(',').to_f
102
+ m[0].delete(delimiter).to_f
61
103
  elsif required
62
- raise "US decimal value not found in \"#{s}\""
104
+ raise "decimal [Separator=\"#{separator}, Delimiter=\"#{delimiter}\"] value not " \
105
+ "found in \"#{s}\""
63
106
  end
64
107
  end
108
+
109
+ # @param node [Nokogiri::XML::Element]
110
+ # @param xpath [String]
111
+ # @param required [Boolean]
112
+ # @return [Float, nil]
113
+ def parse_decimal_dot(node, xpath, required)
114
+ parse_decimal(node, xpath, required, '.', ',')
115
+ end
116
+
117
+ # @param node [Nokogiri::XML::Element]
118
+ # @param xpath [String]
119
+ # @param required [Boolean]
120
+ # @return [Float, nil]
121
+ def parse_decimal_comma(node, xpath, required)
122
+ parse_decimal(node, xpath, required, ',', '.')
123
+ end
65
124
  end
66
125
  end
67
126
  end
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Aranha
4
4
  module Parsers
5
- VERSION = '0.16.0'
5
+ VERSION = '0.17.0'
6
6
  end
7
7
  end
data/sub/avm/avm.gemspec CHANGED
@@ -12,19 +12,18 @@ Gem::Specification.new do |s|
12
12
 
13
13
  s.files = Dir['{lib}/**/*']
14
14
 
15
- s.add_dependency 'aranha-parsers', '~> 0.16'
15
+ s.add_dependency 'aranha-parsers', '~> 0.17'
16
16
  s.add_dependency 'eac_cli', '~> 0.30', '>= 0.30.1'
17
17
  s.add_dependency 'eac_config', '~> 0.12'
18
- s.add_dependency 'eac_docker', '~> 0.6'
18
+ s.add_dependency 'eac_docker', '~> 0.7'
19
19
  s.add_dependency 'eac_fs', '~> 0.16'
20
- s.add_dependency 'eac_git', '~> 0.14'
20
+ s.add_dependency 'eac_git', '~> 0.14', '>= 0.14.1'
21
21
  s.add_dependency 'eac_ruby_utils', '~> 0.112'
22
22
  s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.2'
23
23
  s.add_dependency 'filesize', '~> 0.2'
24
24
  s.add_dependency 'htmlbeautifier', '~> 1.4', '>= 1.4.2'
25
25
  s.add_dependency 'minitar', '~> 0.9'
26
26
 
27
- s.add_development_dependency 'aranha-parsers', '~> 0.14', '~> 0.14.1'
28
27
  s.add_development_dependency 'avm-eac_ruby_base1', '~> 0.24'
29
28
  s.add_development_dependency 'avm-git', '~> 0.7'
30
29
  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
@@ -1,6 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require 'avm/version'
4
+ require 'avm/entries/jobs/with_variables_source'
4
5
  require 'eac_ruby_utils/core_ext'
5
6
  require 'eac_docker/images/templatized'
6
7
  require 'eac_docker/registry'
@@ -8,6 +9,8 @@ require 'eac_docker/registry'
8
9
  module Avm
9
10
  module Docker
10
11
  class Image < ::EacDocker::Images::Templatized
12
+ prepend ::Avm::Entries::Jobs::WithVariablesSource
13
+
11
14
  DEFAULT_REGISTRY_NAME = 'local'
12
15
 
13
16
  class << self
@@ -41,14 +44,6 @@ module Avm
41
44
  ::EacDocker::Executables.docker.command.append(['push', tag]).system!
42
45
  end
43
46
 
44
- def read_entry(path, options = {})
45
- method = path.gsub('.', '_')
46
- return send(method) if respond_to?(path, true)
47
- return instance.read_entry(path, options) if respond_to?(:instance)
48
-
49
- raise "Method \"#{method}\" not found for entry \"#{path}\""
50
- end
51
-
52
47
  def run(instance)
53
48
  run_run(instance) if container_exist?(instance)
54
49
  end
@@ -29,6 +29,13 @@ module Avm
29
29
  self.class.name.demodulize
30
30
  end
31
31
 
32
+ # @return [Pathname]
33
+ def relative_path_from_parent_scm
34
+ parent_scm.if_present(nil) do |v|
35
+ path.relative_path_from(v.path)
36
+ end
37
+ end
38
+
32
39
  # @return [Enumerable<Avm::Scms::Base>]
33
40
  def subs
34
41
  raise_abstract_method __method__
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Avm
4
- VERSION = '0.63.0'
4
+ VERSION = '0.64.1'
5
5
  end
@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
12
12
 
13
13
  s.files = Dir['{lib,locale}/**/*']
14
14
 
15
- s.add_dependency 'avm', '~> 0.61'
16
- s.add_dependency 'eac_ruby_utils', '~> 0.110', '>= 0.110.1'
15
+ s.add_dependency 'avm', '~> 0.64', '>= 0.64.1'
16
+ s.add_dependency 'eac_ruby_utils', '~> 0.112'
17
17
 
18
18
  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
19
19
  end
@@ -18,6 +18,12 @@ module Avm
18
18
  files.each { |file| file_apply(file) }
19
19
  end
20
20
 
21
+ # @param file [Pathname]
22
+ # @return [Boolean]
23
+ def match?(file)
24
+ super(file) || !file.exist?
25
+ end
26
+
21
27
  def file_apply(file)
22
28
  file.write(string_apply(file.read))
23
29
  end
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacGenericBase0
5
- VERSION = '0.10.0'
5
+ VERSION = '0.11.0'
6
6
  end
7
7
  end
@@ -12,14 +12,14 @@ Gem::Specification.new do |s|
12
12
 
13
13
  s.files = Dir['{lib,locale,template}/**/*']
14
14
 
15
- s.add_dependency 'avm', '~> 0.57'
16
- s.add_dependency 'avm-eac_generic_base0', '~> 0.8'
15
+ s.add_dependency 'avm', '~> 0.64', '>= 0.64.1'
16
+ s.add_dependency 'avm-eac_generic_base0', '~> 0.11'
17
17
  s.add_dependency 'avm-eac_rails_base1', '~> 0.8'
18
- s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
18
+ s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.4', '>= 0.4.1'
19
19
  s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
20
20
  s.add_dependency 'eac_fs', '~> 0.16'
21
- s.add_dependency 'eac_rest', '~> 0.6', '>= 0.6.1'
22
- s.add_dependency 'eac_ruby_utils', '~> 0.109'
21
+ s.add_dependency 'eac_rest', '~> 0.7', '>= 0.7.2'
22
+ s.add_dependency 'eac_ruby_utils', '~> 0.112'
23
23
 
24
24
  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
25
25
  end
@@ -11,7 +11,6 @@ module Avm
11
11
  class DockerImage < ::Avm::Instances::DockerImage
12
12
  enable_simple_cache
13
13
 
14
- BASE_IMAGE = 'ubuntu:20.04'
15
14
  INSTALLER_TARGET_TASK_WITH_WEB_PATH_BLANK = 'redmine_as_apache_base'
16
15
  INSTALLER_TARGET_TASK_WITH_WEB_PATH_PRESENT = 'redmine_as_apache_path'
17
16
  REDMINE_SOURCE_HOST_SUBPATH = 'redmine_source'
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacRedmineBase0
5
- VERSION = '0.18.0'
5
+ VERSION = '0.18.1'
6
6
  end
7
7
  end
@@ -1,9 +1,5 @@
1
1
  FROM '%%base_image%%'
2
2
  USER root
3
- RUN apt-get update -y
4
- RUN DEBIAN_FRONTEND=noninteractive apt-get install -y sudo tzdata git apt-utils
5
- RUN ln -fs /usr/share/zoneinfo/America/Sao_Paulo /etc/localtime
6
- RUN dpkg-reconfigure --frontend noninteractive tzdata
7
3
 
8
4
  # Redmine / Código-fonte
9
5
  RUN echo '%%redmine_source_git_id%%' '%%redmine_user_home%%/redmine_source_git_id'
@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
12
12
 
13
13
  s.files = Dir['{lib,template}/**/*']
14
14
 
15
- s.add_dependency 'avm', '~> 0.57'
16
- s.add_dependency 'eac_ruby_utils', '~> 0.109'
15
+ s.add_dependency 'avm', '~> 0.64'
16
+ s.add_dependency 'eac_ruby_utils', '~> 0.112'
17
17
  s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.2'
18
18
 
19
19
  s.add_development_dependency 'avm-eac_ubuntu_base0'
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacUbuntuBase0
5
- VERSION = '0.4.0'
5
+ VERSION = '0.4.1'
6
6
  end
7
7
  end
@@ -1,6 +1,7 @@
1
1
  FROM ubuntu:20.04
2
2
 
3
3
  # Base system update
4
+ ENV DEBIAN_FRONTEND=noninteractive
4
5
  RUN apt-get update -y
5
6
  RUN apt-get dist-upgrade -y
6
7
 
@@ -12,11 +12,11 @@ Gem::Specification.new do |s|
12
12
 
13
13
  s.files = Dir['{lib,locale}/**/*']
14
14
 
15
- s.add_dependency 'avm', '~> 0.61'
15
+ s.add_dependency 'avm', '~> 0.64'
16
16
  s.add_dependency 'avm-files', '~> 0.6'
17
- s.add_dependency 'eac_git', '~> 0.14'
18
- s.add_dependency 'eac_ruby_utils', '~> 0.110', '>= 0.110.1'
19
- s.add_dependency 'git', '~> 1.13', '>= 1.13.1'
17
+ s.add_dependency 'eac_git', '~> 0.14', '>= 0.14.1'
18
+ s.add_dependency 'eac_ruby_utils', '~> 0.112'
19
+ s.add_dependency 'git', '~> 1.17', '>= 1.17.2'
20
20
 
21
21
  s.add_development_dependency 'aranha-parsers', '~> 0.8', '>= 0.8.5'
22
22
  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'
@@ -0,0 +1,29 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'avm/scms/commit'
4
+ require 'avm/git/scms/git/commit'
5
+ require 'eac_ruby_utils/core_ext'
6
+
7
+ module Avm
8
+ module Git
9
+ module Scms
10
+ class GitSubBase < ::Avm::Scms::Base
11
+ class Commit < ::Avm::Scms::Commit
12
+ common_constructor :scm, :parent_commit do
13
+ # parent_commit.assert_argument(::Avm::Git::Scms::Git::Commit, 'parent_commit')
14
+ end
15
+
16
+ delegate :deploy_to_env_path, :fixup?, :id, :merge_with, :reword, :scm_file?, :subject,
17
+ :to_s, to: :parent_commit
18
+
19
+ # @return [Array<Pathname>]
20
+ def changed_files
21
+ parent_commit.changed_files.map do |cf|
22
+ cf.relative_path_from(scm.relative_path_from_parent_scm)
23
+ end
24
+ end
25
+ end
26
+ end
27
+ end
28
+ end
29
+ end
@@ -0,0 +1,28 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'avm/git/scms/git_sub_base/commit'
4
+ require 'avm/scms/base'
5
+ require 'avm/scms/interval'
6
+ require 'eac_ruby_utils/core_ext'
7
+
8
+ module Avm
9
+ module Git
10
+ module Scms
11
+ class GitSubBase < ::Avm::Scms::Base
12
+ class Interval < ::Avm::Scms::Interval
13
+ # @return [Array<Avm::Git::Scms::GitSubBase::Commit>]
14
+ def commits
15
+ parent_interval.commits.map do |parent_commit|
16
+ Avm::Git::Scms::GitSubBase::Commit.new(scm, parent_commit)
17
+ end
18
+ end
19
+
20
+ # @return [Avm::Git::Scms::Git::Interval]
21
+ def parent_interval
22
+ scm.parent_scm.interval(from, to)
23
+ end
24
+ end
25
+ end
26
+ end
27
+ end
28
+ end
@@ -9,8 +9,17 @@ module Avm
9
9
  class GitSubBase < ::Avm::Scms::Base
10
10
  enable_abstract_methods
11
11
 
12
- delegate :changed_files, :commit_if_change, :current_milestone_base_commit, :interval,
12
+ delegate :changed_files, :commit_if_change, :current_milestone_base_commit,
13
13
  :head_commit, :reset_and_commit, :run_commit, to: :parent_scm
14
+
15
+ # @param from [Avm::Git::Scms::Git::Commit]
16
+ # @param to [Avm::Git::Scms::Git::Commit]
17
+ # @return [Avm::Git::Scms::GitSubBase::Interval]
18
+ def interval(from, to)
19
+ ::Avm::Git::Scms::GitSubBase::Interval.new(self, from, to)
20
+ end
21
+
22
+ require_sub __FILE__
14
23
  end
15
24
  end
16
25
  end
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module Git
5
- VERSION = '0.12.0'
5
+ VERSION = '0.13.0'
6
6
  end
7
7
  end
@@ -35,8 +35,12 @@ module EacDocker
35
35
 
36
36
  protected
37
37
 
38
+ def variables_source
39
+ self
40
+ end
41
+
38
42
  def write_in_provide_dir
39
- template.apply(self, provide_dir)
43
+ template.apply(variables_source, provide_dir)
40
44
  end
41
45
 
42
46
  private
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module EacDocker
4
- VERSION = '0.6.0'
4
+ VERSION = '0.7.0'
5
5
  end
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
12
12
 
13
13
  s.files = Dir['{lib,vendor}/**/*']
14
14
 
15
- s.add_dependency 'eac_ruby_utils', '~> 0.107'
15
+ s.add_dependency 'eac_ruby_utils', '~> 0.112'
16
16
  s.add_dependency 'parseconfig', '~> 1.1', '>= 1.1.2'
17
17
 
18
18
  s.add_development_dependency 'aranha-parsers', '~> 0.8', '>= 0.8.2'
@@ -6,7 +6,7 @@ require 'eac_ruby_utils/core_ext'
6
6
  module EacGit
7
7
  class Local
8
8
  class Remote
9
- NO_SUCH_REMOTE_CODE = 128
9
+ NO_SUCH_REMOTE_CODE = 512
10
10
 
11
11
  enable_simple_cache
12
12
  include ::EacGit::RemoteLike
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module EacGit
4
- VERSION = '0.14.0'
4
+ VERSION = '0.14.1'
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: eac_tools
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.55.3
4
+ version: 0.55.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Put here the authors
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-03-12 00:00:00.000000000 Z
11
+ date: 2023-03-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: avm
@@ -16,14 +16,20 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '0.63'
19
+ version: '0.64'
20
+ - - ">="
21
+ - !ruby/object:Gem::Version
22
+ version: 0.64.1
20
23
  type: :runtime
21
24
  prerelease: false
22
25
  version_requirements: !ruby/object:Gem::Requirement
23
26
  requirements:
24
27
  - - "~>"
25
28
  - !ruby/object:Gem::Version
26
- version: '0.63'
29
+ version: '0.64'
30
+ - - ">="
31
+ - !ruby/object:Gem::Version
32
+ version: 0.64.1
27
33
  - !ruby/object:Gem::Dependency
28
34
  name: avm-eac_asciidoctor_base0
29
35
  requirement: !ruby/object:Gem::Requirement
@@ -44,14 +50,14 @@ dependencies:
44
50
  requirements:
45
51
  - - "~>"
46
52
  - !ruby/object:Gem::Version
47
- version: '0.10'
53
+ version: '0.11'
48
54
  type: :runtime
49
55
  prerelease: false
50
56
  version_requirements: !ruby/object:Gem::Requirement
51
57
  requirements:
52
58
  - - "~>"
53
59
  - !ruby/object:Gem::Version
54
- version: '0.10'
60
+ version: '0.11'
55
61
  - !ruby/object:Gem::Dependency
56
62
  name: avm-eac_latex_base0
57
63
  requirement: !ruby/object:Gem::Requirement
@@ -161,6 +167,9 @@ dependencies:
161
167
  - - "~>"
162
168
  - !ruby/object:Gem::Version
163
169
  version: '0.18'
170
+ - - ">="
171
+ - !ruby/object:Gem::Version
172
+ version: 0.18.1
164
173
  type: :runtime
165
174
  prerelease: false
166
175
  version_requirements: !ruby/object:Gem::Requirement
@@ -168,6 +177,9 @@ dependencies:
168
177
  - - "~>"
169
178
  - !ruby/object:Gem::Version
170
179
  version: '0.18'
180
+ - - ">="
181
+ - !ruby/object:Gem::Version
182
+ version: 0.18.1
171
183
  - !ruby/object:Gem::Dependency
172
184
  name: avm-eac_redmine_plugin_base0
173
185
  requirement: !ruby/object:Gem::Requirement
@@ -236,6 +248,20 @@ dependencies:
236
248
  - - "~>"
237
249
  - !ruby/object:Gem::Version
238
250
  version: '0.3'
251
+ - !ruby/object:Gem::Dependency
252
+ name: avm-git
253
+ requirement: !ruby/object:Gem::Requirement
254
+ requirements:
255
+ - - "~>"
256
+ - !ruby/object:Gem::Version
257
+ version: '0.13'
258
+ type: :runtime
259
+ prerelease: false
260
+ version_requirements: !ruby/object:Gem::Requirement
261
+ requirements:
262
+ - - "~>"
263
+ - !ruby/object:Gem::Version
264
+ version: '0.13'
239
265
  - !ruby/object:Gem::Dependency
240
266
  name: avm-tools
241
267
  requirement: !ruby/object:Gem::Requirement
@@ -922,6 +948,8 @@ files:
922
948
  - sub/avm-git/lib/avm/git/scms/git/milestones.rb
923
949
  - sub/avm-git/lib/avm/git/scms/git/run_commit.rb
924
950
  - sub/avm-git/lib/avm/git/scms/git_sub_base.rb
951
+ - sub/avm-git/lib/avm/git/scms/git_sub_base/commit.rb
952
+ - sub/avm-git/lib/avm/git/scms/git_sub_base/interval.rb
925
953
  - sub/avm-git/lib/avm/git/scms/git_subrepo.rb
926
954
  - sub/avm-git/lib/avm/git/scms/git_subtree.rb
927
955
  - sub/avm-git/lib/avm/git/scms/provider.rb