eac_tools 0.65.0 → 0.66.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +45 -39
- data/lib/eac_tools/version.rb +1 -1
- data/sub/aranha-parsers/aranha-parsers.gemspec +4 -4
- data/sub/aranha-parsers/lib/aranha/parsers/base.rb +10 -5
- data/sub/aranha-parsers/lib/aranha/parsers/html/base.rb +14 -0
- data/sub/aranha-parsers/lib/aranha/parsers/html/node/default/string_support.rb +6 -6
- data/sub/aranha-parsers/lib/aranha/parsers/html/node/default.rb +16 -2
- data/sub/aranha-parsers/lib/aranha/parsers/version.rb +1 -1
- data/sub/avm/avm.gemspec +3 -3
- data/sub/avm/lib/avm/data/clearer.rb +18 -0
- data/sub/avm/lib/avm/data/package/clear.rb +23 -0
- data/sub/avm/lib/avm/data/package/dump.rb +0 -10
- data/sub/avm/lib/avm/data/package.rb +8 -1
- data/sub/avm/lib/avm/docker/runner.rb +0 -4
- data/sub/avm/lib/avm/instances/base/auto_values/data.rb +1 -2
- data/sub/avm/lib/avm/instances/base.rb +10 -0
- data/sub/avm/lib/avm/version.rb +1 -1
- data/sub/avm-eac_ruby_base1/avm-eac_ruby_base1.gemspec +4 -3
- data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/launcher_stereotypes/base/publish.rb +8 -9
- data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/version.rb +1 -1
- data/sub/avm-eac_webapp_base0/avm-eac_webapp_base0.gemspec +3 -3
- data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/base.rb +0 -10
- data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/version.rb +1 -1
- data/sub/avm-tools/avm-tools.gemspec +3 -3
- data/sub/avm-tools/lib/avm/tools/runner/instance/data/clear.rb +18 -0
- data/sub/avm-tools/lib/avm/tools/runner/instance/data/dump.rb +1 -5
- data/sub/avm-tools/lib/avm/tools/runner/instance/data/unit/clear.rb +1 -5
- data/sub/avm-tools/lib/avm/tools/runner/instance/data/unit.rb +5 -0
- data/sub/avm-tools/lib/avm/tools/runner/instance/data.rb +5 -0
- data/sub/avm-tools/lib/avm/tools/runner/launcher.rb +0 -1
- data/sub/avm-tools/lib/avm/tools/runner/launcher_stereotypes/list.rb +0 -1
- data/sub/avm-tools/lib/avm/tools/runner_with/instance_data_clear.rb +20 -0
- data/sub/avm-tools/lib/avm/tools/runner_with.rb +11 -0
- data/sub/avm-tools/lib/avm/tools/version.rb +1 -1
- data/sub/eac_cli/eac_cli.gemspec +1 -1
- data/sub/eac_cli/lib/eac_cli/runner/context.rb +9 -6
- data/sub/eac_cli/lib/eac_cli/runner/instance_methods.rb +3 -3
- data/sub/eac_cli/lib/eac_cli/version.rb +1 -1
- data/sub/eac_cli/spec/lib/eac_cli/runner_with/subcommands_spec.rb +10 -1
- data/sub/eac_envs-http/Gemfile +8 -0
- data/sub/eac_envs-http/eac_envs-http.gemspec +25 -0
- data/sub/eac_envs-http/lib/eac_envs/http/error.rb +8 -0
- data/sub/eac_envs-http/lib/eac_envs/http/request/body_field.rb +51 -0
- data/sub/eac_envs-http/lib/eac_envs/http/request/body_field_value.rb +32 -0
- data/sub/eac_envs-http/lib/eac_envs/http/request/body_fields.rb +39 -0
- data/sub/eac_envs-http/lib/eac_envs/http/request/faraday_connection.rb +75 -0
- data/sub/eac_envs-http/lib/eac_envs/http/request.rb +58 -0
- data/sub/eac_envs-http/lib/eac_envs/http/response/body.rb +57 -0
- data/sub/eac_envs-http/lib/eac_envs/http/response/headers.rb +41 -0
- data/sub/eac_envs-http/lib/eac_envs/http/response/links.rb +28 -0
- data/sub/eac_envs-http/lib/eac_envs/http/response/statuses.rb +21 -0
- data/sub/eac_envs-http/lib/eac_envs/http/response.rb +30 -0
- data/sub/eac_envs-http/lib/eac_envs/http/rspec/echo_server/request_processor.rb +42 -0
- data/sub/eac_envs-http/lib/eac_envs/http/rspec/echo_server/webrick_servlet.rb +22 -0
- data/sub/eac_envs-http/lib/eac_envs/http/rspec/echo_server.rb +63 -0
- data/sub/eac_envs-http/lib/eac_envs/http/rspec.rb +11 -0
- data/sub/eac_envs-http/lib/eac_envs/http/version.rb +7 -0
- data/sub/{avm-tools/lib/avm/projects.rb → eac_envs-http/lib/eac_envs/http.rb} +2 -2
- data/sub/eac_envs-http/spec/lib/eac_envs/http/request/body_fields_spec.rb +47 -0
- data/sub/eac_envs-http/spec/lib/eac_envs/http/request_spec.rb +68 -0
- data/sub/eac_envs-http/spec/lib/eac_envs/http/request_spec_files/get.source.yaml +5 -0
- data/sub/eac_envs-http/spec/lib/eac_envs/http/request_spec_files/get.target.yaml +9 -0
- data/sub/eac_envs-http/spec/lib/eac_envs/http/request_spec_files/get_with_auth.source.yaml +8 -0
- data/sub/eac_envs-http/spec/lib/eac_envs/http/request_spec_files/get_with_auth.target.yaml +10 -0
- data/sub/eac_envs-http/spec/lib/eac_envs/http/request_spec_files/post_array_body.source.yaml +10 -0
- data/sub/eac_envs-http/spec/lib/eac_envs/http/request_spec_files/post_array_body.target.yaml +11 -0
- data/sub/eac_envs-http/spec/lib/eac_envs/http/request_spec_files/post_string_body.source.yaml +4 -0
- data/sub/eac_envs-http/spec/lib/eac_envs/http/request_spec_files/post_string_body.target.yaml +11 -0
- data/sub/eac_envs-http/spec/lib/eac_envs/http/request_spec_files/put_hash_body.source.yaml +6 -0
- data/sub/eac_envs-http/spec/lib/eac_envs/http/request_spec_files/put_hash_body.target.yaml +11 -0
- data/sub/eac_envs-http/spec/lib/eac_envs/http/request_spec_files/put_with_file.source.yaml +5 -0
- data/sub/eac_envs-http/spec/lib/eac_envs/http/request_spec_files/put_with_file.target.yaml +13 -0
- data/sub/eac_envs-http/spec/lib/eac_envs/http/request_spec_files/root.source.yaml +2 -0
- data/sub/eac_envs-http/spec/lib/eac_envs/http/request_spec_files/root.target.yaml +9 -0
- data/sub/eac_envs-http/spec/rubocop_spec.rb +3 -0
- data/sub/eac_envs-http/spec/spec_helper/request_builder.rb +61 -0
- data/sub/eac_envs-http/spec/spec_helper.rb +7 -0
- data/sub/eac_ruby_utils/lib/eac_ruby_utils/envs/executable.rb +14 -2
- data/sub/eac_ruby_utils/lib/eac_ruby_utils/version.rb +1 -1
- metadata +59 -12
- data/sub/avm-tools/lib/avm/projects/stereotypes.rb +0 -15
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 8c536775fa8861ae479a017b51548aac1edb4ca67540603a84a5ba6a622650e8
|
4
|
+
data.tar.gz: 7466f8bcd0714b00a722cca444360ea32e7431d6797d4d2f3047ad91e97d135f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 74e066ea30d9e2b053b997284cfc00a8b94d61f5d6b0341a0038174e002e9a1645a426921f8905a3d316de9c2c1bc8706aa9013edfad48a956b6cf9b99a919e2
|
7
|
+
data.tar.gz: 50ba5e89a300b4e96c9de017a81537ad4d5f31cb84104f869b0d276120cff2e182c1b0c0a52ea81816a7e7e99b9f6dcd4b89a25040881326aeb463676a1c593d
|
data/Gemfile.lock
CHANGED
@@ -1,8 +1,8 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
eac_tools (0.
|
5
|
-
avm (~> 0.
|
4
|
+
eac_tools (0.66.0)
|
5
|
+
avm (~> 0.72)
|
6
6
|
avm-eac_asciidoctor_base0 (~> 0.19)
|
7
7
|
avm-eac_generic_base0 (~> 0.12)
|
8
8
|
avm-eac_latex_base0 (~> 0.3, >= 0.3.1)
|
@@ -13,22 +13,22 @@ PATH
|
|
13
13
|
avm-eac_rails_base1 (~> 0.8, >= 0.8.4)
|
14
14
|
avm-eac_redmine_base0 (~> 0.20, >= 0.20.1)
|
15
15
|
avm-eac_redmine_plugin_base0 (~> 0.4)
|
16
|
-
avm-eac_ruby_base1 (~> 0.30, >= 0.30.
|
17
|
-
avm-eac_webapp_base0 (~> 0.17)
|
16
|
+
avm-eac_ruby_base1 (~> 0.30, >= 0.30.3)
|
17
|
+
avm-eac_webapp_base0 (~> 0.17, >= 0.17.1)
|
18
18
|
avm-eac_wordpress_base0 (~> 0.3, >= 0.3.1)
|
19
19
|
avm-git (~> 0.13, >= 0.13.2)
|
20
|
-
avm-tools (~> 0.
|
21
|
-
eac_ruby_utils (~> 0.
|
20
|
+
avm-tools (~> 0.148)
|
21
|
+
eac_ruby_utils (~> 0.116)
|
22
22
|
|
23
23
|
PATH
|
24
24
|
remote: sub/aranha-parsers
|
25
25
|
specs:
|
26
|
-
aranha-parsers (0.
|
26
|
+
aranha-parsers (0.18.0)
|
27
27
|
activesupport (>= 4.0.0)
|
28
|
-
addressable (~> 2.8, >= 2.8.
|
29
|
-
eac_envs-http (~> 0.3)
|
30
|
-
eac_ruby_utils (~> 0.
|
31
|
-
nokogiri (~> 1.14, >= 1.14.
|
28
|
+
addressable (~> 2.8, >= 2.8.4)
|
29
|
+
eac_envs-http (~> 0.3, >= 0.3.1)
|
30
|
+
eac_ruby_utils (~> 0.116)
|
31
|
+
nokogiri (~> 1.14, >= 1.14.4)
|
32
32
|
ofx-parser (~> 1.1)
|
33
33
|
|
34
34
|
PATH
|
@@ -117,11 +117,12 @@ PATH
|
|
117
117
|
PATH
|
118
118
|
remote: sub/avm-eac_ruby_base1
|
119
119
|
specs:
|
120
|
-
avm-eac_ruby_base1 (0.30.
|
121
|
-
aranha-parsers (~> 0.
|
122
|
-
avm (~> 0.
|
120
|
+
avm-eac_ruby_base1 (0.30.3)
|
121
|
+
aranha-parsers (~> 0.18)
|
122
|
+
avm (~> 0.71)
|
123
123
|
avm-eac_generic_base0 (~> 0.12)
|
124
|
-
|
124
|
+
eac_envs-http (~> 0.3, >= 0.3.2)
|
125
|
+
eac_ruby_utils (~> 0.116)
|
125
126
|
|
126
127
|
PATH
|
127
128
|
remote: sub/avm-eac_ubuntu_base0
|
@@ -134,13 +135,13 @@ PATH
|
|
134
135
|
PATH
|
135
136
|
remote: sub/avm-eac_webapp_base0
|
136
137
|
specs:
|
137
|
-
avm-eac_webapp_base0 (0.17.
|
138
|
-
avm (~> 0.
|
138
|
+
avm-eac_webapp_base0 (0.17.1)
|
139
|
+
avm (~> 0.72)
|
139
140
|
avm-eac_generic_base0 (~> 0.12)
|
140
|
-
avm-eac_postgresql_base0 (~> 0.5)
|
141
|
+
avm-eac_postgresql_base0 (~> 0.5, >= 0.5.1)
|
141
142
|
avm-eac_ubuntu_base0 (~> 0.4, >= 0.4.2)
|
142
143
|
avm-files (~> 0.6, >= 0.6.2)
|
143
|
-
eac_ruby_utils (~> 0.
|
144
|
+
eac_ruby_utils (~> 0.116)
|
144
145
|
|
145
146
|
PATH
|
146
147
|
remote: sub/avm-eac_wordpress_base0
|
@@ -173,10 +174,10 @@ PATH
|
|
173
174
|
PATH
|
174
175
|
remote: sub/avm-tools
|
175
176
|
specs:
|
176
|
-
avm-tools (0.
|
177
|
-
aranha-parsers (~> 0.
|
178
|
-
avm (~> 0.
|
179
|
-
avm-eac_ruby_base1 (~> 0.30, >= 0.30.
|
177
|
+
avm-tools (0.148.0)
|
178
|
+
aranha-parsers (~> 0.18)
|
179
|
+
avm (~> 0.72)
|
180
|
+
avm-eac_ruby_base1 (~> 0.30, >= 0.30.3)
|
180
181
|
avm-eac_ubuntu_base0 (~> 0.4, >= 0.4.2)
|
181
182
|
avm-files (~> 0.6, >= 0.6.2)
|
182
183
|
avm-git (~> 0.13, >= 0.13.2)
|
@@ -191,14 +192,14 @@ PATH
|
|
191
192
|
PATH
|
192
193
|
remote: sub/avm
|
193
194
|
specs:
|
194
|
-
avm (0.
|
195
|
-
aranha-parsers (~> 0.
|
196
|
-
eac_cli (~> 0.33)
|
195
|
+
avm (0.72.0)
|
196
|
+
aranha-parsers (~> 0.18)
|
197
|
+
eac_cli (~> 0.33, >= 0.33.1)
|
197
198
|
eac_config (~> 0.12)
|
198
199
|
eac_docker (~> 0.7)
|
199
200
|
eac_fs (~> 0.16)
|
200
201
|
eac_git (~> 0.14, >= 0.14.1)
|
201
|
-
eac_ruby_utils (~> 0.
|
202
|
+
eac_ruby_utils (~> 0.116)
|
202
203
|
eac_templates (~> 0.5)
|
203
204
|
filesize (~> 0.2)
|
204
205
|
htmlbeautifier (~> 1.4, >= 1.4.2)
|
@@ -207,10 +208,10 @@ PATH
|
|
207
208
|
PATH
|
208
209
|
remote: sub/eac_cli
|
209
210
|
specs:
|
210
|
-
eac_cli (0.
|
211
|
+
eac_cli (0.34.0)
|
211
212
|
colorize (~> 0.8, >= 0.8.1)
|
212
213
|
eac_config (~> 0.12)
|
213
|
-
eac_ruby_utils (~> 0.
|
214
|
+
eac_ruby_utils (~> 0.116)
|
214
215
|
|
215
216
|
PATH
|
216
217
|
remote: sub/eac_config
|
@@ -226,6 +227,18 @@ PATH
|
|
226
227
|
eac_ruby_utils (~> 0.112)
|
227
228
|
eac_templates (~> 0.3, >= 0.3.2)
|
228
229
|
|
230
|
+
PATH
|
231
|
+
remote: sub/eac_envs-http
|
232
|
+
specs:
|
233
|
+
eac_envs-http (0.3.2)
|
234
|
+
eac_fs (~> 0.16)
|
235
|
+
eac_ruby_utils (~> 0.116)
|
236
|
+
faraday (~> 2.7, >= 2.7.4)
|
237
|
+
faraday-follow_redirects (~> 0.3)
|
238
|
+
faraday-gzip (~> 0.1)
|
239
|
+
faraday-multipart (~> 1.0, >= 1.0.4)
|
240
|
+
faraday-retry (~> 2.1)
|
241
|
+
|
229
242
|
PATH
|
230
243
|
remote: sub/eac_fs
|
231
244
|
specs:
|
@@ -261,7 +274,7 @@ PATH
|
|
261
274
|
PATH
|
262
275
|
remote: sub/eac_ruby_utils
|
263
276
|
specs:
|
264
|
-
eac_ruby_utils (0.
|
277
|
+
eac_ruby_utils (0.116.0)
|
265
278
|
activesupport (>= 4, < 7)
|
266
279
|
addressable (~> 2.8, >= 2.8.4)
|
267
280
|
bundler
|
@@ -295,14 +308,6 @@ GEM
|
|
295
308
|
parslet (~> 2.0)
|
296
309
|
curb (0.9.11)
|
297
310
|
diff-lcs (1.5.0)
|
298
|
-
eac_envs-http (0.3.1)
|
299
|
-
eac_fs (~> 0.16)
|
300
|
-
eac_ruby_utils (~> 0.112)
|
301
|
-
faraday (~> 2.7, >= 2.7.4)
|
302
|
-
faraday-follow_redirects (~> 0.3)
|
303
|
-
faraday-gzip (~> 0.1)
|
304
|
-
faraday-multipart (~> 1.0, >= 1.0.4)
|
305
|
-
faraday-retry (~> 2.1)
|
306
311
|
eac_ruby_gem_support (0.5.1)
|
307
312
|
eac_ruby_utils (~> 0.74)
|
308
313
|
rspec (~> 3.9)
|
@@ -335,7 +340,7 @@ GEM
|
|
335
340
|
minitest (5.18.0)
|
336
341
|
multipart-post (2.3.0)
|
337
342
|
net-ssh (4.2.0)
|
338
|
-
nokogiri (1.
|
343
|
+
nokogiri (1.15.0-x86_64-linux)
|
339
344
|
racc (~> 1.4)
|
340
345
|
ofx-parser (1.1.0)
|
341
346
|
hpricot (>= 0.6)
|
@@ -413,6 +418,7 @@ DEPENDENCIES
|
|
413
418
|
eac_cli!
|
414
419
|
eac_config!
|
415
420
|
eac_docker!
|
421
|
+
eac_envs-http!
|
416
422
|
eac_fs!
|
417
423
|
eac_git!
|
418
424
|
eac_rest!
|
data/lib/eac_tools/version.rb
CHANGED
@@ -13,10 +13,10 @@ Gem::Specification.new do |s|
|
|
13
13
|
s.files = Dir['{lib}/**/*']
|
14
14
|
|
15
15
|
s.add_dependency 'activesupport', '>= 4.0.0'
|
16
|
-
s.add_dependency 'addressable', '~> 2.8', '>= 2.8.
|
17
|
-
s.add_dependency 'eac_envs-http', '~> 0.3'
|
18
|
-
s.add_dependency 'eac_ruby_utils', '~> 0.
|
19
|
-
s.add_dependency 'nokogiri', '~> 1.14', '>= 1.14.
|
16
|
+
s.add_dependency 'addressable', '~> 2.8', '>= 2.8.4'
|
17
|
+
s.add_dependency 'eac_envs-http', '~> 0.3', '>= 0.3.1'
|
18
|
+
s.add_dependency 'eac_ruby_utils', '~> 0.116'
|
19
|
+
s.add_dependency 'nokogiri', '~> 1.14', '>= 1.14.4'
|
20
20
|
s.add_dependency 'ofx-parser', '~> 1.1'
|
21
21
|
|
22
22
|
s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
|
@@ -9,20 +9,25 @@ module Aranha
|
|
9
9
|
module Parsers
|
10
10
|
class Base
|
11
11
|
class << self
|
12
|
+
# @deprecated Use {#from_string} instead.
|
13
|
+
# @param content [String]
|
14
|
+
# @return [Aranha::Parsers::Base]
|
12
15
|
def from_content(content)
|
16
|
+
from_string(content)
|
17
|
+
end
|
18
|
+
|
19
|
+
# @param string [String]
|
20
|
+
# @return [Aranha::Parsers::Base]
|
21
|
+
def from_string(string)
|
13
22
|
::EacRubyUtils::Fs::Temp.on_file do |path|
|
14
23
|
::File.open(path.to_s, 'w:UTF-8') do |f|
|
15
|
-
f.write
|
24
|
+
f.write string.dup.force_encoding('UTF-8')
|
16
25
|
end
|
17
26
|
r = new(path.to_path)
|
18
27
|
r.content
|
19
28
|
r
|
20
29
|
end
|
21
30
|
end
|
22
|
-
|
23
|
-
def parse_content(content)
|
24
|
-
from_content(content).data
|
25
|
-
end
|
26
31
|
end
|
27
32
|
|
28
33
|
LOG_DIR_ENVVAR = 'ARANHA_PARSERS_LOG_DIR'
|
@@ -19,6 +19,20 @@ module Aranha
|
|
19
19
|
@fields << Field.new(name, type, xpath)
|
20
20
|
end
|
21
21
|
|
22
|
+
# @param node [Nokogiri::XML::Node]
|
23
|
+
# @return [Aranha::Parsers::Html::Base]
|
24
|
+
def from_node(node)
|
25
|
+
from_string(node.to_html)
|
26
|
+
end
|
27
|
+
|
28
|
+
# @param haystack [String]
|
29
|
+
# @param needle [String]
|
30
|
+
# @return [String]
|
31
|
+
def xpath_ends_with(haystack, needle)
|
32
|
+
"substring(#{haystack}, string-length(#{haystack}) - string-length(#{needle}) + 1) " \
|
33
|
+
"= #{needle}"
|
34
|
+
end
|
35
|
+
|
22
36
|
Field = Struct.new(:name, :type, :xpath)
|
23
37
|
end
|
24
38
|
|
@@ -27,16 +27,16 @@ module Aranha
|
|
27
27
|
raise "Pattern \"#{pattern}\" not found in string \"#{s}\""
|
28
28
|
end
|
29
29
|
|
30
|
+
# @param node [Nokogiri::XML::Node]
|
31
|
+
# @param xpath [String]
|
32
|
+
# @return [String]
|
30
33
|
def string_value(node, xpath)
|
31
|
-
|
32
|
-
|
33
|
-
else
|
34
|
-
''
|
35
|
-
end
|
34
|
+
found = node_value(node, xpath)
|
35
|
+
found ? sanitize_string(found.text) : ''
|
36
36
|
end
|
37
37
|
|
38
38
|
def string_recursive_value(node, xpath, required = true)
|
39
|
-
root = node
|
39
|
+
root = node_value(node, xpath)
|
40
40
|
if root.blank?
|
41
41
|
return nil unless required
|
42
42
|
|
@@ -11,13 +11,13 @@ module Aranha
|
|
11
11
|
require_sub __FILE__, include_modules: true
|
12
12
|
|
13
13
|
def array_value(node, xpath)
|
14
|
-
r = node
|
14
|
+
r = node_set_value(node, xpath).map { |n| n.text.strip }
|
15
15
|
r.join('|')
|
16
16
|
end
|
17
17
|
|
18
18
|
def join_value(node, xpath)
|
19
19
|
m = ''
|
20
|
-
node
|
20
|
+
node_set_value(node, xpath).each do |n|
|
21
21
|
m << n.text.strip
|
22
22
|
end
|
23
23
|
m
|
@@ -27,6 +27,20 @@ module Aranha
|
|
27
27
|
m = /(\d+) m/.match(join_value(node, xpath))
|
28
28
|
m ? m[1].to_i : nil
|
29
29
|
end
|
30
|
+
|
31
|
+
# @param node [Nokogiri::XML::Node]
|
32
|
+
# @param xpath [String]
|
33
|
+
# @return [Nokogiri::XML::NodeSet]
|
34
|
+
def node_set_value(node, xpath)
|
35
|
+
node.xpath(xpath)
|
36
|
+
end
|
37
|
+
|
38
|
+
# @param node [Nokogiri::XML::Node]
|
39
|
+
# @param xpath [String]
|
40
|
+
# @return [Nokogiri::XML::Node]
|
41
|
+
def node_value(node, xpath)
|
42
|
+
node.at_xpath(xpath)
|
43
|
+
end
|
30
44
|
end
|
31
45
|
end
|
32
46
|
end
|
data/sub/avm/avm.gemspec
CHANGED
@@ -12,13 +12,13 @@ Gem::Specification.new do |s|
|
|
12
12
|
|
13
13
|
s.files = Dir['{lib}/**/*']
|
14
14
|
|
15
|
-
s.add_dependency 'aranha-parsers', '~> 0.
|
16
|
-
s.add_dependency 'eac_cli', '~> 0.33'
|
15
|
+
s.add_dependency 'aranha-parsers', '~> 0.18'
|
16
|
+
s.add_dependency 'eac_cli', '~> 0.33', '>= 0.33.1'
|
17
17
|
s.add_dependency 'eac_config', '~> 0.12'
|
18
18
|
s.add_dependency 'eac_docker', '~> 0.7'
|
19
19
|
s.add_dependency 'eac_fs', '~> 0.16'
|
20
20
|
s.add_dependency 'eac_git', '~> 0.14', '>= 0.14.1'
|
21
|
-
s.add_dependency 'eac_ruby_utils', '~> 0.
|
21
|
+
s.add_dependency 'eac_ruby_utils', '~> 0.116'
|
22
22
|
s.add_dependency 'eac_templates', '~> 0.5'
|
23
23
|
s.add_dependency 'filesize', '~> 0.2'
|
24
24
|
s.add_dependency 'htmlbeautifier', '~> 1.4', '>= 1.4.2'
|
@@ -0,0 +1,18 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'eac_ruby_utils/core_ext'
|
4
|
+
|
5
|
+
module Avm
|
6
|
+
module Data
|
7
|
+
class Clearer
|
8
|
+
enable_speaker
|
9
|
+
|
10
|
+
common_constructor :storage
|
11
|
+
|
12
|
+
# @return [self]
|
13
|
+
def perform
|
14
|
+
storage.clear
|
15
|
+
end
|
16
|
+
end
|
17
|
+
end
|
18
|
+
end
|
@@ -0,0 +1,23 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'eac_ruby_utils/core_ext'
|
4
|
+
|
5
|
+
module Avm
|
6
|
+
module Data
|
7
|
+
class Package
|
8
|
+
class Clear
|
9
|
+
enable_method_class
|
10
|
+
enable_speaker
|
11
|
+
common_constructor :package
|
12
|
+
|
13
|
+
# @return [void]
|
14
|
+
def result
|
15
|
+
package.units.each do |identifier, unit|
|
16
|
+
infov 'Clearing unit', identifier
|
17
|
+
unit.clear
|
18
|
+
end
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
22
|
+
end
|
23
|
+
end
|
@@ -14,7 +14,6 @@ module Avm
|
|
14
14
|
include ::Avm::Data::Package::BuildDirectory
|
15
15
|
|
16
16
|
DEFAULT_EXPIRE_TIME = 1.day
|
17
|
-
DEFAULT_FILE_EXTENSION = '.tar'
|
18
17
|
|
19
18
|
attr_reader :package, :data_file_path, :existing
|
20
19
|
|
@@ -73,15 +72,6 @@ module Avm
|
|
73
72
|
|
74
73
|
private
|
75
74
|
|
76
|
-
def download
|
77
|
-
infom 'Downloading dump...'
|
78
|
-
download_path = find_download_path
|
79
|
-
dump_command.system!(output_file: download_path)
|
80
|
-
fatal_error "File \"#{download_path}\" not saved" unless ::File.exist?(download_path)
|
81
|
-
fatal_error "File \"#{download_path}\" is empty" if ::File.zero?(download_path)
|
82
|
-
download_path
|
83
|
-
end
|
84
|
-
|
85
75
|
def move_download_to_final_dest(download_path)
|
86
76
|
::FileUtils.mkdir_p(::File.dirname(data_file_path))
|
87
77
|
::FileUtils.mv(download_path, data_file_path)
|
@@ -6,9 +6,11 @@ require 'eac_ruby_utils/core_ext'
|
|
6
6
|
module Avm
|
7
7
|
module Data
|
8
8
|
class Package
|
9
|
-
require_sub __FILE__
|
9
|
+
require_sub __FILE__, require_mode: :kernel
|
10
10
|
include ::Avm::Data::Callbacks
|
11
11
|
|
12
|
+
DATA_FILE_EXTENSION = '.tar'
|
13
|
+
|
12
14
|
def initialize(options)
|
13
15
|
options = options.to_options_consumer
|
14
16
|
units = options.consume(:units)
|
@@ -25,6 +27,11 @@ module Avm
|
|
25
27
|
self
|
26
28
|
end
|
27
29
|
|
30
|
+
# @return [String]
|
31
|
+
def data_file_extension
|
32
|
+
DATA_FILE_EXTENSION
|
33
|
+
end
|
34
|
+
|
28
35
|
def dump(data_path, options = {})
|
29
36
|
::Avm::Data::Package::Dump.new(self, data_path, options)
|
30
37
|
end
|
@@ -1,6 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'avm/data/package/dump'
|
4
3
|
require 'avm/self/instance'
|
5
4
|
|
6
5
|
module Avm
|
@@ -15,7 +14,7 @@ module Avm
|
|
15
14
|
.if_present do |v|
|
16
15
|
::File.join(
|
17
16
|
v,
|
18
|
-
"#{id}#{
|
17
|
+
"#{id}#{data_package.data_file_extension}"
|
19
18
|
)
|
20
19
|
end
|
21
20
|
end
|
@@ -34,6 +34,16 @@ module Avm
|
|
34
34
|
self.suffix = suffix.to_s
|
35
35
|
end
|
36
36
|
|
37
|
+
# @return [Avm::Instances::Data::Package]
|
38
|
+
def data_package
|
39
|
+
@data_package ||= data_package_create
|
40
|
+
end
|
41
|
+
|
42
|
+
# @return [Avm::Instances::Data::Package]
|
43
|
+
def data_package_create
|
44
|
+
::Avm::Instances::Data::Package.new(self)
|
45
|
+
end
|
46
|
+
|
37
47
|
# @return [String]
|
38
48
|
def id
|
39
49
|
::Avm::Instances::Ids.build(application.id, suffix)
|
data/sub/avm/lib/avm/version.rb
CHANGED
@@ -12,10 +12,11 @@ Gem::Specification.new do |s|
|
|
12
12
|
|
13
13
|
s.files = Dir['{lib,locale,template}/**/*']
|
14
14
|
|
15
|
-
s.add_dependency 'aranha-parsers', '~> 0.
|
16
|
-
s.add_dependency 'avm', '~> 0.
|
15
|
+
s.add_dependency 'aranha-parsers', '~> 0.18'
|
16
|
+
s.add_dependency 'avm', '~> 0.71'
|
17
17
|
s.add_dependency 'avm-eac_generic_base0', '~> 0.12'
|
18
|
-
s.add_dependency '
|
18
|
+
s.add_dependency 'eac_envs-http', '~> 0.3', '>= 0.3.2'
|
19
|
+
s.add_dependency 'eac_ruby_utils', '~> 0.116'
|
19
20
|
|
20
21
|
s.add_development_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.1'
|
21
22
|
s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
|
@@ -1,13 +1,13 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'json'
|
4
3
|
require 'eac_ruby_utils/simple_cache'
|
5
4
|
require 'rubygems'
|
6
5
|
require 'eac_cli/speaker'
|
7
|
-
require 'aranha/parsers/source_address'
|
8
6
|
require 'avm/launcher/publish/base'
|
9
7
|
require 'avm/launcher/publish/check_result'
|
10
8
|
require 'avm/eac_ruby_base1/launcher/gem'
|
9
|
+
require 'eac_envs/http/request'
|
10
|
+
require 'eac_envs/http/response'
|
11
11
|
|
12
12
|
module Avm
|
13
13
|
module EacRubyBase1
|
@@ -97,14 +97,13 @@ module Avm
|
|
97
97
|
gem_version_max.present? && ::Gem::Version.new(gem_spec.version) < gem_version_max
|
98
98
|
end
|
99
99
|
|
100
|
+
# @return [Array]
|
100
101
|
def gem_versions_uncached
|
101
|
-
::
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
)
|
106
|
-
rescue ::Aranha::Parsers::SourceAddress::FetchContentError => e
|
107
|
-
e.request.status == 404 ? [] : raise(e)
|
102
|
+
::EacEnvs::Http::Request.new
|
103
|
+
.url("https://rubygems.org/api/v1/versions/#{gem_spec.name}.json")
|
104
|
+
.response.body_data_or_raise
|
105
|
+
rescue EacEnvs::Http::Response => e
|
106
|
+
e.status == 404 ? [] : raise(e)
|
108
107
|
end
|
109
108
|
|
110
109
|
def gem_version_max_uncached
|
@@ -12,12 +12,12 @@ Gem::Specification.new do |s|
|
|
12
12
|
|
13
13
|
s.files = Dir['{lib,template}/**/*']
|
14
14
|
|
15
|
-
s.add_dependency 'avm', '~> 0.
|
15
|
+
s.add_dependency 'avm', '~> 0.72'
|
16
16
|
s.add_dependency 'avm-eac_generic_base0', '~> 0.12'
|
17
|
-
s.add_dependency 'avm-eac_postgresql_base0', '~> 0.5'
|
17
|
+
s.add_dependency 'avm-eac_postgresql_base0', '~> 0.5', '>= 0.5.1'
|
18
18
|
s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.4', '>= 0.4.2'
|
19
19
|
s.add_dependency 'avm-files', '~> 0.6', '>= 0.6.2'
|
20
|
-
s.add_dependency 'eac_ruby_utils', '~> 0.
|
20
|
+
s.add_dependency 'eac_ruby_utils', '~> 0.116'
|
21
21
|
|
22
22
|
s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
|
23
23
|
end
|
@@ -22,16 +22,6 @@ module Avm
|
|
22
22
|
).run
|
23
23
|
end
|
24
24
|
|
25
|
-
# @return [Avm::Instances::Data::Package]
|
26
|
-
def data_package
|
27
|
-
@data_package ||= data_package_create
|
28
|
-
end
|
29
|
-
|
30
|
-
# @return [Avm::Instances::Data::Package]
|
31
|
-
def data_package_create
|
32
|
-
::Avm::Instances::Data::Package.new(self)
|
33
|
-
end
|
34
|
-
|
35
25
|
def database_unit
|
36
26
|
pg_data_unit
|
37
27
|
end
|
@@ -14,9 +14,9 @@ Gem::Specification.new do |s|
|
|
14
14
|
s.bindir = 'exe'
|
15
15
|
s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
|
16
16
|
|
17
|
-
s.add_dependency 'aranha-parsers', '~> 0.
|
18
|
-
s.add_dependency 'avm', '~> 0.
|
19
|
-
s.add_dependency 'avm-eac_ruby_base1', '~> 0.30', '>= 0.30.
|
17
|
+
s.add_dependency 'aranha-parsers', '~> 0.18'
|
18
|
+
s.add_dependency 'avm', '~> 0.72'
|
19
|
+
s.add_dependency 'avm-eac_ruby_base1', '~> 0.30', '>= 0.30.3'
|
20
20
|
s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.4', '>= 0.4.2'
|
21
21
|
s.add_dependency 'avm-files', '~> 0.6', '>= 0.6.2'
|
22
22
|
s.add_dependency 'avm-git', '~> 0.13', '>= 0.13.2'
|
@@ -0,0 +1,18 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'avm/instances/runner'
|
4
|
+
require 'eac_cli/core_ext'
|
5
|
+
|
6
|
+
module Avm
|
7
|
+
module Tools
|
8
|
+
class Runner
|
9
|
+
class Instance < ::Avm::Instances::Runner
|
10
|
+
class Data
|
11
|
+
class Clear
|
12
|
+
runner_with :help, :instance_data_clear
|
13
|
+
end
|
14
|
+
end
|
15
|
+
end
|
16
|
+
end
|
17
|
+
end
|
18
|
+
end
|
@@ -17,7 +17,7 @@ module Avm
|
|
17
17
|
runner_with :help do
|
18
18
|
desc 'Dump utility for EacRailsBase instance.'
|
19
19
|
bool_opt '-w', '--rewrite', 'Forces dump overwrite.'
|
20
|
-
pos_arg :dump_path
|
20
|
+
pos_arg :dump_path, optional: true
|
21
21
|
end
|
22
22
|
|
23
23
|
# @return [String]
|
@@ -38,10 +38,6 @@ module Avm
|
|
38
38
|
|
39
39
|
private
|
40
40
|
|
41
|
-
def instance
|
42
|
-
runner_context.call(:instance)
|
43
|
-
end
|
44
|
-
|
45
41
|
def package_dump_uncached
|
46
42
|
instance
|
47
43
|
.data_package.dump(dump_path, existing: package_dump_existing)
|