eac_tools 0.75.1 → 0.76.0
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.
- checksums.yaml +4 -4
- data/Gemfile +5 -5
- data/Gemfile.lock +67 -49
- data/lib/eac_tools/version.rb +1 -1
- data/sub/avm-eac_redmine_base0/Gemfile +2 -2
- data/sub/avm-eac_redmine_base0/avm-eac_redmine_base0.gemspec +8 -6
- data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base/install.rb +9 -0
- data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/docker_image.rb +1 -1
- data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/rest_api/entity_base.rb +2 -2
- data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/sources/core_update.rb +1 -1
- data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/version.rb +1 -1
- data/sub/avm-eac_redmine_base0/spec/lib/avm/eac_redmine_base0/instances/apache_host_spec.rb +3 -3
- data/sub/avm-eac_redmine_base0/spec/lib/avm/eac_redmine_base0/instances/base/gitolite_spec.rb +1 -1
- data/sub/avm-eac_redmine_base0/spec/rubocop_spec.rb +1 -1
- data/sub/avm-eac_redmine_base0/spec/spec_helper.rb +2 -2
- data/sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/deploy/config/install.sh.template +3 -0
- data/sub/avm-eac_ruby_base1/avm-eac_ruby_base1.gemspec +1 -1
- data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/incompatible_parser/line_buffer.rb +4 -0
- data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/incompatible_parser/line_factory.rb +3 -1
- data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/incompatible_parser/ruby_requirement.rb +16 -0
- data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/version.rb +1 -1
- data/sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/bundler/incompatible_parser_spec_files/3.source.out +0 -0
- data/sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/bundler/incompatible_parser_spec_files/3.target.yaml +305 -0
- data/sub/avm-git/avm-git.gemspec +4 -3
- data/sub/avm-git/lib/avm/git/commit/diff_tree_line.rb +1 -1
- data/sub/avm-git/lib/avm/git/launcher/base/underlying.rb +3 -5
- data/sub/avm-git/lib/avm/git/scms/git/commit_dirty.rb +1 -0
- data/sub/avm-git/lib/avm/git/version.rb +1 -1
- data/sub/avm-git/spec/lib/avm/git/scms/git/commit/deploy_spec.rb +3 -3
- data/sub/eac_cli/eac_cli.gemspec +1 -1
- data/sub/eac_cli/lib/eac_cli/runner_with/output_item/base_formatter.rb +15 -0
- data/sub/eac_cli/lib/eac_cli/runner_with/output_item/csv_formatter.rb +23 -0
- data/sub/eac_cli/lib/eac_cli/runner_with/output_item/yaml_formatter.rb +18 -0
- data/sub/eac_cli/lib/eac_cli/runner_with/output_item.rb +42 -0
- data/sub/eac_cli/lib/eac_cli/version.rb +1 -1
- data/sub/eac_envs-http/eac_envs-http.gemspec +2 -2
- data/sub/eac_envs-http/lib/eac_envs/http/response/statuses.rb +1 -1
- data/sub/eac_envs-http/lib/eac_envs/http/version.rb +1 -1
- data/sub/eac_rest/eac_rest.gemspec +2 -2
- data/sub/eac_rest/lib/eac_rest/api.rb +2 -14
- data/sub/eac_rest/lib/eac_rest/entity/data.rb +44 -0
- data/sub/eac_rest/lib/eac_rest/entity/fetching.rb +20 -0
- data/sub/eac_rest/lib/eac_rest/entity.rb +1 -32
- data/sub/eac_rest/lib/eac_rest/helper.rb +34 -0
- data/sub/eac_rest/lib/eac_rest/response.rb +2 -0
- data/sub/eac_rest/lib/eac_rest/version.rb +1 -1
- data/sub/eac_ruby_utils/eac_ruby_utils.gemspec +1 -1
- data/sub/eac_ruby_utils/lib/eac_ruby_utils/module_ancestors_variable.rb +1 -1
- data/sub/eac_ruby_utils/lib/eac_ruby_utils/version.rb +1 -1
- metadata +23 -19
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 26c4dec02b4e9099e1e2d672dad279f190f1a1500f5a205b21602ca4597915cf
|
4
|
+
data.tar.gz: 94629dc17596d2861990e246dc81e4b8e516c263eb1934a89626e6da4d041e06
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 116efefb9e97caa1faba7e278cbf33a1aade6be6cd660b991bf98b855c7d4444eedcd76d44d87ecfb12ec6f7292a21d2f14c9c0fce21c802ce1c5ddb16508fc7
|
7
|
+
data.tar.gz: b130eed3248da5569b94920e540a5bac73dd1f5855ffaf4d9a63b15d3183c2dee37ddc1e6623ed729498c5adebe6bb5a78d612b3419696747804f99a0cd71b87
|
data/Gemfile
CHANGED
@@ -4,11 +4,11 @@ source 'https://rubygems.org'
|
|
4
4
|
|
5
5
|
gemspec
|
6
6
|
|
7
|
-
|
8
|
-
next unless
|
7
|
+
Dir["#{File.join(__dir__, 'sub')}/*"].each do |dir|
|
8
|
+
next unless File.exist?(File.join(dir, "#{File.basename(dir)}.gemspec"))
|
9
9
|
|
10
|
-
gem
|
10
|
+
gem File.basename(dir), path: dir, require: false
|
11
11
|
end
|
12
12
|
|
13
|
-
local_gemfile =
|
14
|
-
eval_gemfile local_gemfile if
|
13
|
+
local_gemfile = File.join(File.dirname(__FILE__), 'Gemfile.local')
|
14
|
+
eval_gemfile local_gemfile if File.exist?(local_gemfile)
|
data/Gemfile.lock
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
eac_tools (0.
|
4
|
+
eac_tools (0.76.0)
|
5
5
|
avm (~> 0.79)
|
6
6
|
avm-eac_asciidoctor_base0 (~> 0.19)
|
7
7
|
avm-eac_generic_base0 (~> 0.12)
|
@@ -11,14 +11,14 @@ PATH
|
|
11
11
|
avm-eac_python_base0 (~> 0.2, >= 0.2.1)
|
12
12
|
avm-eac_rails_base0 (~> 0.10, >= 0.10.3)
|
13
13
|
avm-eac_rails_base1 (~> 0.9, >= 0.9.3)
|
14
|
-
avm-eac_redmine_base0 (~> 0.
|
14
|
+
avm-eac_redmine_base0 (~> 0.21)
|
15
15
|
avm-eac_redmine_plugin_base0 (~> 0.4)
|
16
|
-
avm-eac_ruby_base1 (~> 0.31, >= 0.31.
|
16
|
+
avm-eac_ruby_base1 (~> 0.31, >= 0.31.2)
|
17
17
|
avm-eac_webapp_base0 (~> 0.18, >= 0.18.2)
|
18
18
|
avm-eac_wordpress_base0 (~> 0.3, >= 0.3.1)
|
19
|
-
avm-git (~> 0.13, >= 0.13.
|
19
|
+
avm-git (~> 0.13, >= 0.13.4)
|
20
20
|
avm-tools (~> 0.154)
|
21
|
-
eac_ruby_utils (~> 0.119, >= 0.119.
|
21
|
+
eac_ruby_utils (~> 0.119, >= 0.119.2)
|
22
22
|
|
23
23
|
PATH
|
24
24
|
remote: sub/avm-eac_asciidoctor_base0
|
@@ -86,15 +86,15 @@ PATH
|
|
86
86
|
PATH
|
87
87
|
remote: sub/avm-eac_redmine_base0
|
88
88
|
specs:
|
89
|
-
avm-eac_redmine_base0 (0.
|
90
|
-
avm (~> 0.
|
89
|
+
avm-eac_redmine_base0 (0.21.0)
|
90
|
+
avm (~> 0.79)
|
91
91
|
avm-eac_generic_base0 (~> 0.12)
|
92
|
-
avm-eac_rails_base1 (~> 0.
|
93
|
-
avm-eac_ubuntu_base0 (~> 0.
|
92
|
+
avm-eac_rails_base1 (~> 0.9, >= 0.9.3)
|
93
|
+
avm-eac_ubuntu_base0 (~> 0.5)
|
94
94
|
curb (~> 0.9, >= 0.9.11)
|
95
95
|
eac_fs (~> 0.16)
|
96
|
-
eac_rest (~> 0.
|
97
|
-
eac_ruby_utils (~> 0.
|
96
|
+
eac_rest (~> 0.10)
|
97
|
+
eac_ruby_utils (~> 0.119, >= 0.119.2)
|
98
98
|
|
99
99
|
PATH
|
100
100
|
remote: sub/avm-eac_redmine_plugin_base0
|
@@ -106,11 +106,11 @@ PATH
|
|
106
106
|
PATH
|
107
107
|
remote: sub/avm-eac_ruby_base1
|
108
108
|
specs:
|
109
|
-
avm-eac_ruby_base1 (0.31.
|
109
|
+
avm-eac_ruby_base1 (0.31.2)
|
110
110
|
aranha-parsers (~> 0.21)
|
111
111
|
avm (~> 0.79)
|
112
112
|
avm-eac_generic_base0 (~> 0.12)
|
113
|
-
eac_envs-http (~> 0.4)
|
113
|
+
eac_envs-http (~> 0.4, >= 0.4.1)
|
114
114
|
eac_ruby_utils (~> 0.119, >= 0.119.1)
|
115
115
|
|
116
116
|
PATH
|
@@ -153,11 +153,11 @@ PATH
|
|
153
153
|
PATH
|
154
154
|
remote: sub/avm-git
|
155
155
|
specs:
|
156
|
-
avm-git (0.13.
|
157
|
-
avm (~> 0.
|
156
|
+
avm-git (0.13.4)
|
157
|
+
avm (~> 0.79)
|
158
158
|
avm-files (~> 0.6, >= 0.6.2)
|
159
159
|
eac_git (~> 0.14, >= 0.14.1)
|
160
|
-
eac_ruby_utils (~> 0.
|
160
|
+
eac_ruby_utils (~> 0.119, >= 0.119.1)
|
161
161
|
git (~> 1.18)
|
162
162
|
|
163
163
|
PATH
|
@@ -197,10 +197,10 @@ PATH
|
|
197
197
|
PATH
|
198
198
|
remote: sub/eac_cli
|
199
199
|
specs:
|
200
|
-
eac_cli (0.
|
200
|
+
eac_cli (0.37.0)
|
201
201
|
colorize (~> 0.8, >= 0.8.1)
|
202
202
|
eac_config (~> 0.14)
|
203
|
-
eac_ruby_utils (~> 0.119)
|
203
|
+
eac_ruby_utils (~> 0.119, >= 0.119.1)
|
204
204
|
|
205
205
|
PATH
|
206
206
|
remote: sub/eac_config
|
@@ -219,10 +219,10 @@ PATH
|
|
219
219
|
PATH
|
220
220
|
remote: sub/eac_envs-http
|
221
221
|
specs:
|
222
|
-
eac_envs-http (0.4.
|
222
|
+
eac_envs-http (0.4.1)
|
223
223
|
eac_fs (~> 0.16)
|
224
|
-
eac_ruby_utils (~> 0.
|
225
|
-
faraday (~> 2.7, >= 2.7.
|
224
|
+
eac_ruby_utils (~> 0.119, >= 0.119.1)
|
225
|
+
faraday (~> 2.7, >= 2.7.10)
|
226
226
|
faraday-follow_redirects (~> 0.3)
|
227
227
|
faraday-gzip (~> 0.1)
|
228
228
|
faraday-multipart (~> 1.0, >= 1.0.4)
|
@@ -246,10 +246,10 @@ PATH
|
|
246
246
|
PATH
|
247
247
|
remote: sub/eac_rest
|
248
248
|
specs:
|
249
|
-
eac_rest (0.
|
250
|
-
eac_envs-http (~> 0.4)
|
249
|
+
eac_rest (0.10.0)
|
250
|
+
eac_envs-http (~> 0.4, >= 0.4.1)
|
251
251
|
eac_fs (~> 0.16)
|
252
|
-
eac_ruby_utils (~> 0.
|
252
|
+
eac_ruby_utils (~> 0.119, >= 0.119.1)
|
253
253
|
|
254
254
|
PATH
|
255
255
|
remote: sub/eac_ruby_base0
|
@@ -263,9 +263,9 @@ PATH
|
|
263
263
|
PATH
|
264
264
|
remote: sub/eac_ruby_utils
|
265
265
|
specs:
|
266
|
-
eac_ruby_utils (0.119.
|
266
|
+
eac_ruby_utils (0.119.2)
|
267
267
|
activesupport (>= 4, < 7)
|
268
|
-
addressable (~> 2.8, >= 2.8.
|
268
|
+
addressable (~> 2.8, >= 2.8.5)
|
269
269
|
bundler
|
270
270
|
filesize (~> 0.2)
|
271
271
|
net-ssh (~> 4.2)
|
@@ -280,13 +280,13 @@ PATH
|
|
280
280
|
GEM
|
281
281
|
remote: https://rubygems.org/
|
282
282
|
specs:
|
283
|
-
activesupport (6.1.7.
|
283
|
+
activesupport (6.1.7.6)
|
284
284
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
285
285
|
i18n (>= 1.6, < 2)
|
286
286
|
minitest (>= 5.1)
|
287
287
|
tzinfo (~> 2.0)
|
288
288
|
zeitwerk (~> 2.3)
|
289
|
-
addressable (2.8.
|
289
|
+
addressable (2.8.5)
|
290
290
|
public_suffix (>= 2.0.2, < 6.0)
|
291
291
|
aranha-parsers (0.21.0)
|
292
292
|
activesupport (>= 4.0.0)
|
@@ -297,6 +297,7 @@ GEM
|
|
297
297
|
ofx-parser (~> 1.1)
|
298
298
|
asciidoctor (2.0.20)
|
299
299
|
ast (2.4.2)
|
300
|
+
base64 (0.1.1)
|
300
301
|
clipboard (1.3.6)
|
301
302
|
colorize (0.8.1)
|
302
303
|
concurrent-ruby (1.2.2)
|
@@ -304,13 +305,14 @@ GEM
|
|
304
305
|
parslet (~> 2.0)
|
305
306
|
curb (0.9.11)
|
306
307
|
diff-lcs (1.5.0)
|
307
|
-
eac_ruby_gem_support (0.
|
308
|
-
eac_ruby_utils (~> 0.119)
|
308
|
+
eac_ruby_gem_support (0.8.0)
|
309
|
+
eac_ruby_utils (~> 0.119, >= 0.119.2)
|
309
310
|
rspec (~> 3.12)
|
310
|
-
rubocop (~>
|
311
|
-
rubocop-rails
|
312
|
-
rubocop-rspec
|
313
|
-
faraday (2.7.
|
311
|
+
rubocop (~> 1.56.3)
|
312
|
+
rubocop-rails
|
313
|
+
rubocop-rspec
|
314
|
+
faraday (2.7.11)
|
315
|
+
base64
|
314
316
|
faraday-net_http (>= 2.0, < 3.1)
|
315
317
|
ruby2_keywords (>= 0.0.4)
|
316
318
|
faraday-follow_redirects (0.3.0)
|
@@ -331,18 +333,20 @@ GEM
|
|
331
333
|
htmlbeautifier (1.4.2)
|
332
334
|
i18n (1.14.1)
|
333
335
|
concurrent-ruby (~> 1.0)
|
336
|
+
json (2.6.3)
|
337
|
+
language_server-protocol (3.17.0.3)
|
334
338
|
minitar (0.9)
|
335
|
-
minitest (5.
|
339
|
+
minitest (5.20.0)
|
336
340
|
multipart-post (2.3.0)
|
337
341
|
net-ssh (4.2.0)
|
338
|
-
nokogiri (1.15.
|
342
|
+
nokogiri (1.15.4-x86_64-linux)
|
339
343
|
racc (~> 1.4)
|
340
344
|
ofx-parser (1.1.0)
|
341
345
|
hpricot (>= 0.6)
|
342
346
|
os (1.1.4)
|
343
347
|
parallel (1.23.0)
|
344
348
|
parseconfig (1.1.2)
|
345
|
-
parser (3.2.2.
|
349
|
+
parser (3.2.2.4)
|
346
350
|
ast (~> 2.4.1)
|
347
351
|
racc
|
348
352
|
parslet (2.0.0)
|
@@ -351,7 +355,8 @@ GEM
|
|
351
355
|
rack (3.0.8)
|
352
356
|
rainbow (3.1.1)
|
353
357
|
rchardet (1.8.0)
|
354
|
-
|
358
|
+
regexp_parser (2.8.2)
|
359
|
+
rexml (3.2.6)
|
355
360
|
rouge (3.30.0)
|
356
361
|
rspec (3.12.0)
|
357
362
|
rspec-core (~> 3.12.0)
|
@@ -366,26 +371,39 @@ GEM
|
|
366
371
|
diff-lcs (>= 1.2.0, < 2.0)
|
367
372
|
rspec-support (~> 3.12.0)
|
368
373
|
rspec-support (3.12.1)
|
369
|
-
rubocop (
|
374
|
+
rubocop (1.56.4)
|
375
|
+
base64 (~> 0.1.1)
|
376
|
+
json (~> 2.3)
|
377
|
+
language_server-protocol (>= 3.17.0)
|
370
378
|
parallel (~> 1.10)
|
371
|
-
parser (>= 2.
|
379
|
+
parser (>= 3.2.2.3)
|
372
380
|
rainbow (>= 2.2.2, < 4.0)
|
373
|
-
|
381
|
+
regexp_parser (>= 1.8, < 3.0)
|
382
|
+
rexml (>= 3.2.5, < 4.0)
|
383
|
+
rubocop-ast (>= 1.28.1, < 2.0)
|
374
384
|
ruby-progressbar (~> 1.7)
|
375
|
-
unicode-display_width (>=
|
376
|
-
rubocop-
|
385
|
+
unicode-display_width (>= 2.4.0, < 3.0)
|
386
|
+
rubocop-ast (1.29.0)
|
387
|
+
parser (>= 3.2.1.0)
|
388
|
+
rubocop-capybara (2.19.0)
|
389
|
+
rubocop (~> 1.41)
|
390
|
+
rubocop-factory_bot (2.24.0)
|
391
|
+
rubocop (~> 1.33)
|
392
|
+
rubocop-rails (2.21.2)
|
377
393
|
activesupport (>= 4.2.0)
|
378
394
|
rack (>= 1.1)
|
379
|
-
rubocop (>=
|
380
|
-
rubocop-rspec (
|
381
|
-
rubocop (
|
395
|
+
rubocop (>= 1.33.0, < 2.0)
|
396
|
+
rubocop-rspec (2.24.1)
|
397
|
+
rubocop (~> 1.33)
|
398
|
+
rubocop-capybara (~> 2.17)
|
399
|
+
rubocop-factory_bot (~> 2.22)
|
382
400
|
ruby-filemagic (0.7.3)
|
383
401
|
ruby-progressbar (1.13.0)
|
384
402
|
ruby2_keywords (0.0.5)
|
385
403
|
tzinfo (2.0.6)
|
386
404
|
concurrent-ruby (~> 1.0)
|
387
|
-
unicode-display_width (
|
388
|
-
zeitwerk (2.6.
|
405
|
+
unicode-display_width (2.5.0)
|
406
|
+
zeitwerk (2.6.12)
|
389
407
|
zlib (2.1.1)
|
390
408
|
|
391
409
|
PLATFORMS
|
@@ -418,7 +436,7 @@ DEPENDENCIES
|
|
418
436
|
eac_git!
|
419
437
|
eac_rest!
|
420
438
|
eac_ruby_base0!
|
421
|
-
eac_ruby_gem_support (~> 0.
|
439
|
+
eac_ruby_gem_support (~> 0.8.0)
|
422
440
|
eac_ruby_utils!
|
423
441
|
eac_templates!
|
424
442
|
eac_tools!
|
data/lib/eac_tools/version.rb
CHANGED
@@ -4,5 +4,5 @@ source 'https://rubygems.org'
|
|
4
4
|
|
5
5
|
gemspec
|
6
6
|
|
7
|
-
local_gemfile =
|
8
|
-
eval_gemfile local_gemfile if
|
7
|
+
local_gemfile = File.join(File.dirname(__FILE__), 'Gemfile.local')
|
8
|
+
eval_gemfile local_gemfile if File.exist?(local_gemfile)
|
@@ -12,14 +12,16 @@ Gem::Specification.new do |s|
|
|
12
12
|
|
13
13
|
s.files = Dir['{lib,locale,template}/**/*']
|
14
14
|
|
15
|
-
s.
|
15
|
+
s.required_ruby_version = '>= 2.7.0'
|
16
|
+
|
17
|
+
s.add_dependency 'avm', '~> 0.79'
|
16
18
|
s.add_dependency 'avm-eac_generic_base0', '~> 0.12'
|
17
|
-
s.add_dependency 'avm-eac_rails_base1', '~> 0.
|
18
|
-
s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.
|
19
|
+
s.add_dependency 'avm-eac_rails_base1', '~> 0.9', '>= 0.9.3'
|
20
|
+
s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.5'
|
19
21
|
s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
|
20
22
|
s.add_dependency 'eac_fs', '~> 0.16'
|
21
|
-
s.add_dependency 'eac_rest', '~> 0.
|
22
|
-
s.add_dependency 'eac_ruby_utils', '~> 0.
|
23
|
+
s.add_dependency 'eac_rest', '~> 0.10'
|
24
|
+
s.add_dependency 'eac_ruby_utils', '~> 0.119', '>= 0.119.2'
|
23
25
|
|
24
|
-
s.add_development_dependency 'eac_ruby_gem_support', '~> 0.
|
26
|
+
s.add_development_dependency 'eac_ruby_gem_support', '~> 0.8.0'
|
25
27
|
end
|
@@ -8,6 +8,15 @@ module Avm
|
|
8
8
|
module Instances
|
9
9
|
class Base < ::Avm::EacRailsBase1::Instances::Base
|
10
10
|
module Install
|
11
|
+
INSTALL_EXTRA_KEY = 'install.extra'
|
12
|
+
DEFAULT_INSTALL_EXTRA = ''
|
13
|
+
|
14
|
+
# @return [String]
|
15
|
+
def auto_install_extra
|
16
|
+
inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, INSTALL_EXTRA_KEY) ||
|
17
|
+
DEFAULT_INSTALL_EXTRA
|
18
|
+
end
|
19
|
+
|
11
20
|
def run_installer
|
12
21
|
::EacRubyUtils::Ruby.on_clean_environment do
|
13
22
|
installer_command.system!
|
@@ -21,8 +21,8 @@ module Avm
|
|
21
21
|
|
22
22
|
response.body_data
|
23
23
|
rescue ::JSON::ParserError
|
24
|
-
raise "\"#{response.url}\" returned invalid JSON: \"#{response.body_str}\"" \
|
25
|
-
|
24
|
+
raise "\"#{response.url}\" returned invalid JSON: \"#{response.body_str}\" " \
|
25
|
+
"(Status: #{response.status})"
|
26
26
|
end
|
27
27
|
|
28
28
|
def fetch_data(url_suffix)
|
@@ -96,7 +96,7 @@ module Avm
|
|
96
96
|
if source_path.children.empty?
|
97
97
|
infom 'No content left in source directory'
|
98
98
|
else
|
99
|
-
fatal_error 'Found entries in source directory: ' +
|
99
|
+
fatal_error 'Found entries in source directory: ' + # rubocop:disable Style/StringConcatenation
|
100
100
|
source_path.children.map { |c| c.basename.to_path }.join(', ')
|
101
101
|
end
|
102
102
|
end
|
@@ -3,11 +3,11 @@
|
|
3
3
|
require 'avm/eac_redmine_base0/instances/apache_host'
|
4
4
|
require 'avm/eac_redmine_base0/instances/base'
|
5
5
|
|
6
|
-
RSpec.describe
|
6
|
+
RSpec.describe Avm::EacRedmineBase0::Instances::ApacheHost do
|
7
7
|
describe '#no_ssl_site_content' do
|
8
|
-
let(:instance) {
|
8
|
+
let(:instance) { Avm::EacRedmineBase0::Instances::Base.by_id('stub-app_0') }
|
9
9
|
let(:apache_host) { described_class.new(instance) }
|
10
|
-
let(:fixtures_dir) {
|
10
|
+
let(:fixtures_dir) { Pathname.new('apache_host_spec_files').expand_path(__dir__) }
|
11
11
|
let(:expected_content) { fixtures_dir.join('apache_host_spec_no_ssl_content.conf').read }
|
12
12
|
|
13
13
|
before do
|
data/sub/avm-eac_redmine_base0/spec/lib/avm/eac_redmine_base0/instances/base/gitolite_spec.rb
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
|
3
3
|
require 'avm/eac_redmine_base0/instances/base'
|
4
4
|
|
5
|
-
RSpec.describe
|
5
|
+
RSpec.describe Avm::EacRedmineBase0::Instances::Base, '#gitolite' do
|
6
6
|
include_examples 'entries_values', __FILE__, {
|
7
7
|
'app_0' => {
|
8
8
|
'gitolite.username' => 'git',
|
@@ -1,5 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
require 'eac_ruby_utils/rspec/default_setup'
|
4
|
-
|
5
|
-
|
4
|
+
EacRubyUtils::Rspec.default_setup_create(File.expand_path('..', __dir__))
|
5
|
+
EacRubyUtils::Rspec.default_setup.stub_eac_config_node
|
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
|
|
15
15
|
s.add_dependency 'aranha-parsers', '~> 0.21'
|
16
16
|
s.add_dependency 'avm', '~> 0.79'
|
17
17
|
s.add_dependency 'avm-eac_generic_base0', '~> 0.12'
|
18
|
-
s.add_dependency 'eac_envs-http', '~> 0.4'
|
18
|
+
s.add_dependency 'eac_envs-http', '~> 0.4', '>= 0.4.1'
|
19
19
|
s.add_dependency 'eac_ruby_utils', '~> 0.119', '>= 0.119.1'
|
20
20
|
|
21
21
|
s.add_development_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.1'
|
data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/incompatible_parser/line_factory.rb
CHANGED
@@ -4,13 +4,15 @@ require 'eac_ruby_utils/core_ext'
|
|
4
4
|
require 'avm/eac_ruby_base1/bundler/incompatible_parser/depends_on'
|
5
5
|
require 'avm/eac_ruby_base1/bundler/incompatible_parser/gem_conflict'
|
6
6
|
require 'avm/eac_ruby_base1/bundler/incompatible_parser/in_gemfile'
|
7
|
+
require 'avm/eac_ruby_base1/bundler/incompatible_parser/ruby_requirement'
|
8
|
+
require 'avm/eac_ruby_base1/bundler/incompatible_parser/version_requirement'
|
7
9
|
|
8
10
|
module Avm
|
9
11
|
module EacRubyBase1
|
10
12
|
module Bundler
|
11
13
|
class IncompatibleParser
|
12
14
|
class LineFactory
|
13
|
-
TYPES = [GemConflict, InGemfile, DependsOn, VersionRequirement].freeze
|
15
|
+
TYPES = [GemConflict, InGemfile, DependsOn, RubyRequirement, VersionRequirement].freeze
|
14
16
|
|
15
17
|
enable_simple_cache
|
16
18
|
common_constructor :content do
|
data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/incompatible_parser/ruby_requirement.rb
ADDED
@@ -0,0 +1,16 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'eac_ruby_utils/core_ext'
|
4
|
+
require 'avm/eac_ruby_base1/bundler/incompatible_parser/line_parser_base'
|
5
|
+
|
6
|
+
module Avm
|
7
|
+
module EacRubyBase1
|
8
|
+
module Bundler
|
9
|
+
class IncompatibleParser
|
10
|
+
class RubyRequirement < ::Avm::EacRubyBase1::Bundler::IncompatibleParser::LineParserBase
|
11
|
+
LINE_PARSER = /\Aruby/.to_parser { |_m| new }
|
12
|
+
end
|
13
|
+
end
|
14
|
+
end
|
15
|
+
end
|
16
|
+
end
|