eac_tools 0.75.0 → 0.75.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (41) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +31 -31
  3. data/lib/eac_tools/version.rb +1 -1
  4. data/sub/avm-eac_postgresql_base0/avm-eac_postgresql_base0.gemspec +2 -2
  5. data/sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/instance/commands.rb +12 -6
  6. data/sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/version.rb +1 -1
  7. data/sub/avm-eac_rails_base1/avm-eac_rails_base1.gemspec +1 -1
  8. data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/processes/daemon.rb +1 -1
  9. data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/version.rb +1 -1
  10. data/sub/avm-eac_ruby_base1/avm-eac_ruby_base1.gemspec +1 -1
  11. data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/incompatible_parser/line_buffer.rb +4 -0
  12. data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/incompatible_parser/line_factory.rb +3 -1
  13. data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/incompatible_parser/ruby_requirement.rb +16 -0
  14. data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/update_dependency_requirements.rb +3 -1
  15. data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/version.rb +1 -1
  16. data/sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/bundler/incompatible_parser_spec_files/3.source.out +0 -0
  17. data/sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/bundler/incompatible_parser_spec_files/3.target.yaml +305 -0
  18. data/sub/avm-git/avm-git.gemspec +4 -3
  19. data/sub/avm-git/lib/avm/git/commit/diff_tree_line.rb +1 -1
  20. data/sub/avm-git/lib/avm/git/launcher/base/underlying.rb +3 -5
  21. data/sub/avm-git/lib/avm/git/scms/git/commit_dirty.rb +1 -0
  22. data/sub/avm-git/lib/avm/git/version.rb +1 -1
  23. data/sub/avm-git/spec/lib/avm/git/scms/git/commit/deploy_spec.rb +3 -3
  24. data/sub/eac_cli/eac_cli.gemspec +1 -1
  25. data/sub/eac_cli/lib/eac_cli/runner_with/output_item/base_formatter.rb +15 -0
  26. data/sub/eac_cli/lib/eac_cli/runner_with/output_item/csv_formatter.rb +23 -0
  27. data/sub/eac_cli/lib/eac_cli/runner_with/output_item/yaml_formatter.rb +18 -0
  28. data/sub/eac_cli/lib/eac_cli/runner_with/output_item.rb +42 -0
  29. data/sub/eac_cli/lib/eac_cli/version.rb +1 -1
  30. data/sub/eac_envs-http/eac_envs-http.gemspec +2 -2
  31. data/sub/eac_envs-http/lib/eac_envs/http/response/statuses.rb +1 -1
  32. data/sub/eac_envs-http/lib/eac_envs/http/version.rb +1 -1
  33. data/sub/eac_rest/eac_rest.gemspec +2 -2
  34. data/sub/eac_rest/lib/eac_rest/api.rb +2 -14
  35. data/sub/eac_rest/lib/eac_rest/entity/data.rb +44 -0
  36. data/sub/eac_rest/lib/eac_rest/entity/fetching.rb +20 -0
  37. data/sub/eac_rest/lib/eac_rest/entity.rb +1 -32
  38. data/sub/eac_rest/lib/eac_rest/helper.rb +34 -0
  39. data/sub/eac_rest/lib/eac_rest/response.rb +2 -0
  40. data/sub/eac_rest/lib/eac_rest/version.rb +1 -1
  41. metadata +24 -8
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 7c2c69ad47e84183ee63518aa76b7f9944e6ddaa6fd8753466b94bedb122f26e
4
- data.tar.gz: b59199eec09ccd27fd33667ac2d35b2c73473b4c64b68f9ccf2572f7badce750
3
+ metadata.gz: 2737e40d7375352c3fb09bd0fcfc745906f8427668e2f177a80857f1bab7d38a
4
+ data.tar.gz: c01891031e2b448dcc9ace257025494c45478841a3a95782ce8707c896a4582f
5
5
  SHA512:
6
- metadata.gz: 641d03b38f8c8934e900aa797d6048fa746aa2b128e4ae537338b4e067893d2e43ac6c7ee206a4a0d147fb2d93d043fb25472f0987f946e699abbd5b2c63bdd8
7
- data.tar.gz: 9e96cd416fa7e64c9019937867502033fa3cceefb8dd0943f49290f55f7177608f46c38eeb058c8b9cf960f94f761d3503e1211340f3ca3b81aa5a8368534e6f
6
+ metadata.gz: 5b4def0b984b7cdb226780d1f4bf195ffc49bf35806254d8d586de94cf1911312934c426ef9bf9ae8e10d0ea23d39b1401472486a73c7c84961dac01ed9c6cc9
7
+ data.tar.gz: 58df3ac9441b4b19a843dbd589a60f997b85c97ab5ac3074ea5504e7de9d1d10eb65a83e3083ea4867dd69b0338911ac7ad9119f4f2fd76459088c618ea7d4ec
data/Gemfile.lock CHANGED
@@ -1,22 +1,22 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- eac_tools (0.75.0)
4
+ eac_tools (0.75.2)
5
5
  avm (~> 0.79)
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)
9
9
  avm-eac_php_base0 (~> 0.4, >= 0.4.2)
10
- avm-eac_postgresql_base0 (~> 0.5, >= 0.5.1)
10
+ avm-eac_postgresql_base0 (~> 0.5, >= 0.5.2)
11
11
  avm-eac_python_base0 (~> 0.2, >= 0.2.1)
12
12
  avm-eac_rails_base0 (~> 0.10, >= 0.10.3)
13
- avm-eac_rails_base1 (~> 0.9, >= 0.9.2)
13
+ avm-eac_rails_base1 (~> 0.9, >= 0.9.3)
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.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.3)
19
+ avm-git (~> 0.13, >= 0.13.4)
20
20
  avm-tools (~> 0.154)
21
21
  eac_ruby_utils (~> 0.119, >= 0.119.1)
22
22
 
@@ -56,9 +56,9 @@ PATH
56
56
  PATH
57
57
  remote: sub/avm-eac_postgresql_base0
58
58
  specs:
59
- avm-eac_postgresql_base0 (0.5.1)
60
- avm (~> 0.71)
61
- eac_ruby_utils (~> 0.115)
59
+ avm-eac_postgresql_base0 (0.5.2)
60
+ avm (~> 0.79)
61
+ eac_ruby_utils (~> 0.119, >= 0.119.1)
62
62
 
63
63
  PATH
64
64
  remote: sub/avm-eac_python_base0
@@ -77,9 +77,9 @@ PATH
77
77
  PATH
78
78
  remote: sub/avm-eac_rails_base1
79
79
  specs:
80
- avm-eac_rails_base1 (0.9.2)
80
+ avm-eac_rails_base1 (0.9.3)
81
81
  avm (~> 0.79)
82
- avm-eac_ruby_base1 (~> 0.30, >= 0.30.3)
82
+ avm-eac_ruby_base1 (~> 0.31, >= 0.31.1)
83
83
  avm-eac_webapp_base0 (~> 0.18, >= 0.18.2)
84
84
  eac_ruby_utils (~> 0.119, >= 0.119.1)
85
85
 
@@ -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.0)
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.3)
157
- avm (~> 0.73, >= 0.73.1)
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.117)
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.36.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.0)
222
+ eac_envs-http (0.4.1)
223
223
  eac_fs (~> 0.16)
224
- eac_ruby_utils (~> 0.117, >= 0.117.1)
225
- faraday (~> 2.7, >= 2.7.6)
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.9.1)
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.117, >= 0.117.1)
252
+ eac_ruby_utils (~> 0.119, >= 0.119.1)
253
253
 
254
254
  PATH
255
255
  remote: sub/eac_ruby_base0
@@ -280,13 +280,13 @@ PATH
280
280
  GEM
281
281
  remote: https://rubygems.org/
282
282
  specs:
283
- activesupport (6.1.7.4)
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.4)
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)
@@ -332,10 +332,10 @@ GEM
332
332
  i18n (1.14.1)
333
333
  concurrent-ruby (~> 1.0)
334
334
  minitar (0.9)
335
- minitest (5.18.1)
335
+ minitest (5.19.0)
336
336
  multipart-post (2.3.0)
337
337
  net-ssh (4.2.0)
338
- nokogiri (1.15.3-x86_64-linux)
338
+ nokogiri (1.15.4-x86_64-linux)
339
339
  racc (~> 1.4)
340
340
  ofx-parser (1.1.0)
341
341
  hpricot (>= 0.6)
@@ -346,12 +346,12 @@ GEM
346
346
  ast (~> 2.4.1)
347
347
  racc
348
348
  parslet (2.0.0)
349
- public_suffix (5.0.1)
349
+ public_suffix (5.0.3)
350
350
  racc (1.7.1)
351
351
  rack (3.0.8)
352
352
  rainbow (3.1.1)
353
353
  rchardet (1.8.0)
354
- rexml (3.2.5)
354
+ rexml (3.2.6)
355
355
  rouge (3.30.0)
356
356
  rspec (3.12.0)
357
357
  rspec-core (~> 3.12.0)
@@ -362,7 +362,7 @@ GEM
362
362
  rspec-expectations (3.12.3)
363
363
  diff-lcs (>= 1.2.0, < 2.0)
364
364
  rspec-support (~> 3.12.0)
365
- rspec-mocks (3.12.5)
365
+ rspec-mocks (3.12.6)
366
366
  diff-lcs (>= 1.2.0, < 2.0)
367
367
  rspec-support (~> 3.12.0)
368
368
  rspec-support (3.12.1)
@@ -385,7 +385,7 @@ GEM
385
385
  tzinfo (2.0.6)
386
386
  concurrent-ruby (~> 1.0)
387
387
  unicode-display_width (1.8.0)
388
- zeitwerk (2.6.8)
388
+ zeitwerk (2.6.11)
389
389
  zlib (2.1.1)
390
390
 
391
391
  PLATFORMS
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module EacTools
4
- VERSION = '0.75.0'
4
+ VERSION = '0.75.2'
5
5
  end
@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
12
12
 
13
13
  s.files = Dir['{lib}/**/*']
14
14
 
15
- s.add_dependency 'avm', '~> 0.71'
16
- s.add_dependency 'eac_ruby_utils', '~> 0.115'
15
+ s.add_dependency 'avm', '~> 0.79'
16
+ s.add_dependency 'eac_ruby_utils', '~> 0.119', '>= 0.119.1'
17
17
 
18
18
  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
19
19
  end
@@ -7,13 +7,13 @@ module Avm
7
7
  module EacPostgresqlBase0
8
8
  class Instance
9
9
  module Commands
10
- DUMP_EXCLUDE_PATTERN = '^(CREATE|COMMENT ON) EXTENSION'
10
+ DUMP_EXCLUDE_PATTERNS = ['(CREATE|COMMENT ON) EXTENSION',
11
+ 'SET default_table_access_method'].freeze
11
12
 
12
13
  # @return [EacRubyUtils::Envs::Command]
13
14
  def dump_command
14
- env.command('pg_dump', '--no-privileges', '--no-owner', *common_command_args)
15
- .envvar('PGPASSWORD', password)
16
- .pipe(remove_extensions_ddl)
15
+ DUMP_EXCLUDE_PATTERNS
16
+ .inject(pg_dump_command) { |a, e| a.pipe(exclude_pattern_command(e)) }
17
17
  end
18
18
 
19
19
  # @return [EacRubyUtils::Envs::Command]
@@ -64,8 +64,14 @@ module Avm
64
64
  private
65
65
 
66
66
  # @return [EacRubyUtils::Envs::Command]
67
- def remove_extensions_ddl
68
- env.command('grep', '--invert-match', '--extended-regexp', DUMP_EXCLUDE_PATTERN)
67
+ def exclude_pattern_command(pattern)
68
+ env.command('sed', '--regexp-extended', "s/(^|\\n)#{pattern}[^;]*;//gm")
69
+ end
70
+
71
+ # @return [EacRubyUtils::Envs::Command]
72
+ def pg_dump_command
73
+ env.command('pg_dump', '--no-privileges', '--no-owner', *common_command_args)
74
+ .envvar('PGPASSWORD', password)
69
75
  end
70
76
  end
71
77
  end
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacPostgresqlBase0
5
- VERSION = '0.5.1'
5
+ VERSION = '0.5.2'
6
6
  end
7
7
  end
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
13
13
  s.files = Dir['{lib,template}/**/*']
14
14
 
15
15
  s.add_dependency 'avm', '~> 0.79'
16
- s.add_dependency 'avm-eac_ruby_base1', '~> 0.30', '>= 0.30.3'
16
+ s.add_dependency 'avm-eac_ruby_base1', '~> 0.31', '>= 0.31.1'
17
17
  s.add_dependency 'avm-eac_webapp_base0', '~> 0.18', '>= 0.18.2'
18
18
  s.add_dependency 'eac_ruby_utils', '~> 0.119', '>= 0.119.1'
19
19
 
@@ -12,7 +12,7 @@ module Avm
12
12
 
13
13
  # @return [Boolean]
14
14
  def available?
15
- instance.the_gem.gemfile_lock_gem_version(gem_name).present?
15
+ instance.application.local_source.gemfile_lock_gem_version(gem_name).present?
16
16
  end
17
17
 
18
18
  def disable
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacRailsBase1
5
- VERSION = '0.9.2'
5
+ VERSION = '0.9.3'
6
6
  end
7
7
  end
@@ -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'
@@ -56,6 +56,10 @@ module Avm
56
56
  current_gem_conflict.add_depends_on(result)
57
57
  end
58
58
 
59
+ def on_ruby_requirement_line(result)
60
+ # Do nothing
61
+ end
62
+
59
63
  def on_version_requirement_line(result)
60
64
  current_gem_conflict.add_version_requirement(result)
61
65
  end
@@ -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
@@ -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
@@ -48,7 +48,9 @@ module Avm
48
48
  def update_gemspec
49
49
  gemspec.dependency(gem_name).version_specs = requirements_list
50
50
  gemspec.write(source.gemspec_path)
51
- source.bundle('exec', 'rubocop', source.gemspec_path).system!
51
+ ::Avm::EacRubyBase1::Rubocop.new(
52
+ source.path, ['-a', '--ignore-parent-exclusion', source.gemspec_path]
53
+ ).run
52
54
  end
53
55
  end
54
56
  end
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacRubyBase1
5
- VERSION = '0.31.0'
5
+ VERSION = '0.31.2'
6
6
  end
7
7
  end
@@ -0,0 +1,305 @@
1
+ ---
2
+ - :gem_name: actionpack
3
+ :versions_requirements:
4
+ - :requirements_source: ">= 5.0"
5
+ :stack:
6
+ - :gem_name: actionpack-xml_parser
7
+ :version: &9 !ruby/object:Gem::Version
8
+ version: 2.0.1
9
+ - :requirements_source: "= 5.2.8.1"
10
+ :stack:
11
+ - :gem_name: rails (= 5.2.8.1)
12
+ :version: &1 !ruby/object:Gem::Version
13
+ version: 5.2.8.1
14
+ - :requirements_source: ">= 5.0.1.rc1"
15
+ :stack:
16
+ - :gem_name: rails-controller-testing
17
+ :version: &2 !ruby/object:Gem::Version
18
+ version: 1.0.5
19
+ - :requirements_source: ">= 3.0"
20
+ :stack:
21
+ - :gem_name: rspec-rails (~> 3.5, >= 3.5.2)
22
+ :version: &4 !ruby/object:Gem::Version
23
+ version: 3.9.1
24
+ - :requirements_source: ">= 3.1"
25
+ :stack:
26
+ - :gem_name: slim-rails
27
+ :version: &14 !ruby/object:Gem::Version
28
+ version: 3.6.2
29
+ - :gem_name: actionview
30
+ :versions_requirements:
31
+ - :requirements_source: "= 5.2.8.1"
32
+ :stack:
33
+ - :gem_name: rails (= 5.2.8.1)
34
+ :version: *1
35
+ - :requirements_source: ">= 5.0.1.rc1"
36
+ :stack:
37
+ - :gem_name: rails-controller-testing
38
+ :version: *2
39
+ - :gem_name: activerecord
40
+ :versions_requirements:
41
+ - :requirements_source: "< 6, >= 4.1"
42
+ :stack:
43
+ - :gem_name: activemodel-associations
44
+ :version: &3 !ruby/object:Gem::Version
45
+ version: 0.2.0
46
+ - :requirements_source: ">= 4.0.0, < 7.1"
47
+ :stack:
48
+ - :gem_name: awesome_nested_set
49
+ :version: &15 !ruby/object:Gem::Version
50
+ version: 3.5.0
51
+ - :requirements_source: "= 5.2.8.1"
52
+ :stack:
53
+ - :gem_name: rails (= 5.2.8.1)
54
+ :version: *1
55
+ - :gem_name: activesupport
56
+ :versions_requirements:
57
+ - :requirements_source: "< 6, >= 4.1"
58
+ :stack:
59
+ - :gem_name: activemodel-associations
60
+ :version: *3
61
+ - :requirements_source: ">= 4, < 7"
62
+ :stack:
63
+ - :gem_name: redmine_with_git
64
+ :version: &5 !ruby/object:Gem::Version
65
+ version: 0.7.9
66
+ - :gem_name: eac_ruby_utils (~> 0.119)
67
+ :version: !ruby/object:Gem::Version
68
+ version: 0.119.1
69
+ - :requirements_source: ">= 2"
70
+ :stack:
71
+ - :gem_name: html-pipeline
72
+ :version: !ruby/object:Gem::Version
73
+ version: 2.14.3
74
+ - :requirements_source: "= 5.2.8.1"
75
+ :stack:
76
+ - :gem_name: rails (= 5.2.8.1)
77
+ :version: *1
78
+ - :requirements_source: ">= 5.0.1.rc1"
79
+ :stack:
80
+ - :gem_name: rails-controller-testing
81
+ :version: *2
82
+ - :requirements_source: ">= 5.0.0"
83
+ :stack:
84
+ - :gem_name: rails-dom-testing
85
+ :version: &11 !ruby/object:Gem::Version
86
+ version: 2.2.0
87
+ - :requirements_source: ">= 3.0"
88
+ :stack:
89
+ - :gem_name: rspec-rails (~> 3.5, >= 3.5.2)
90
+ :version: *4
91
+ - :requirements_source: ">= 4.2.0"
92
+ :stack:
93
+ - :gem_name: rubocop-rails (~> 2.9.0)
94
+ :version: &7 !ruby/object:Gem::Version
95
+ version: 2.9.1
96
+ - :gem_name: i18n
97
+ :versions_requirements:
98
+ - :requirements_source: "~> 1.8.2"
99
+ :stack: []
100
+ - :requirements_source: ">= 0.7, < 2"
101
+ :stack:
102
+ - :gem_name: rails (= 5.2.8.1)
103
+ :version: *1
104
+ - :gem_name: activesupport (= 5.2.8.1)
105
+ :version: *1
106
+ - :gem_name: mail
107
+ :versions_requirements:
108
+ - :requirements_source: "~> 2.7.1"
109
+ :stack: []
110
+ - :requirements_source: "~> 2.5, >= 2.5.4"
111
+ :stack:
112
+ - :gem_name: rails (= 5.2.8.1)
113
+ :version: *1
114
+ - :gem_name: actionmailer (= 5.2.8.1)
115
+ :version: *1
116
+ - :gem_name: mini_mime
117
+ :versions_requirements:
118
+ - :requirements_source: "~> 1.0.1"
119
+ :stack: []
120
+ - :requirements_source: ">= 0.1.3"
121
+ :stack:
122
+ - :gem_name: capybara (~> 3.31.0)
123
+ :version: &6 !ruby/object:Gem::Version
124
+ version: 3.31.0
125
+ - :requirements_source: ">= 0.1.1"
126
+ :stack:
127
+ - :gem_name: mail (~> 2.7.1)
128
+ :version: !ruby/object:Gem::Version
129
+ version: 2.7.1
130
+ - :gem_name: nokogiri
131
+ :versions_requirements:
132
+ - :requirements_source: "~> 1.13.10"
133
+ :stack: []
134
+ - :requirements_source: "~> 1.15, >= 1.15.2"
135
+ :stack:
136
+ - :gem_name: redmine_with_git
137
+ :version: *5
138
+ - :gem_name: avm (~> 0.78)
139
+ :version: !ruby/object:Gem::Version
140
+ version: 0.78.0
141
+ - :gem_name: aranha-parsers (~> 0.20)
142
+ :version: &8 !ruby/object:Gem::Version
143
+ version: 0.21.0
144
+ - :gem_name: rack
145
+ :versions_requirements:
146
+ - :requirements_source: "~> 2.0, >= 2.0.8"
147
+ :stack:
148
+ - :gem_name: rails (= 5.2.8.1)
149
+ :version: *1
150
+ - :gem_name: actionpack (= 5.2.8.1)
151
+ :version: *1
152
+ - :requirements_source: ">= 1.6.0"
153
+ :stack:
154
+ - :gem_name: capybara (~> 3.31.0)
155
+ :version: *6
156
+ - :requirements_source: ">= 1.5.1"
157
+ :stack:
158
+ - :gem_name: gitlab-grack (~> 2.0.0)
159
+ :version: !ruby/object:Gem::Version
160
+ version: 2.0.2
161
+ - :requirements_source:
162
+ :stack:
163
+ - :gem_name: rack-parser
164
+ :version: !ruby/object:Gem::Version
165
+ version: 0.7.0
166
+ - :requirements_source: ">= 1.4"
167
+ :stack:
168
+ - :gem_name: request_store (~> 1.5.0)
169
+ :version: !ruby/object:Gem::Version
170
+ version: 1.5.1
171
+ - :requirements_source: ">= 1.1"
172
+ :stack:
173
+ - :gem_name: rubocop-rails (~> 2.9.0)
174
+ :version: *7
175
+ - :requirements_source: ">= 2.2.4"
176
+ :stack:
177
+ - :gem_name: sidekiq
178
+ :version: !ruby/object:Gem::Version
179
+ version: 7.1.2
180
+ - :requirements_source: "> 1, < 3"
181
+ :stack:
182
+ - :gem_name: redmine_plugins_helper
183
+ :version: &12 !ruby/object:Gem::Version
184
+ version: 0.12.2
185
+ - :gem_name: sass-rails (~> 5.0)
186
+ :version: &13 !ruby/object:Gem::Version
187
+ version: 5.1.0
188
+ - :gem_name: sprockets (>= 2.8, < 4.0)
189
+ :version: !ruby/object:Gem::Version
190
+ version: 3.7.2
191
+ - :gem_name: rails
192
+ :versions_requirements:
193
+ - :requirements_source: "= 5.2.8.1"
194
+ :stack: []
195
+ - :requirements_source: "< 6.2, >= 4.2.0"
196
+ :stack:
197
+ - :gem_name: active_scaffold
198
+ :version: !ruby/object:Gem::Version
199
+ version: 3.6.20
200
+ - :requirements_source: ">= 4.1"
201
+ :stack:
202
+ - :gem_name: deface (= 1.5.3)
203
+ :version: !ruby/object:Gem::Version
204
+ version: 1.5.3
205
+ - :requirements_source: ">= 4.2.11"
206
+ :stack:
207
+ - :gem_name: redmine_nonproject_modules
208
+ :version: &10 !ruby/object:Gem::Version
209
+ version: 0.3.12
210
+ - :gem_name: eac_rails_utils (~> 0.15)
211
+ :version: *8
212
+ - :requirements_source: ">= 5.2"
213
+ :stack:
214
+ - :gem_name: invisible_captcha
215
+ :version: !ruby/object:Gem::Version
216
+ version: 2.1.0
217
+ - :gem_name: railties
218
+ :versions_requirements:
219
+ - :requirements_source: ">= 5.0"
220
+ :stack:
221
+ - :gem_name: actionpack-xml_parser
222
+ :version: *9
223
+ - :requirements_source: ">= 4.2.0"
224
+ :stack:
225
+ - :gem_name: redmine_nonproject_modules
226
+ :version: *10
227
+ - :gem_name: jquery-rails (~> 4.5)
228
+ :version: !ruby/object:Gem::Version
229
+ version: 4.6.0
230
+ - :requirements_source: ">= 3.2.16"
231
+ :stack:
232
+ - :gem_name: jquery-ui-rails (~> 5.0.5)
233
+ :version: !ruby/object:Gem::Version
234
+ version: 5.0.5
235
+ - :requirements_source: "= 5.2.8.1"
236
+ :stack:
237
+ - :gem_name: rails (= 5.2.8.1)
238
+ :version: *1
239
+ - :requirements_source: ">= 5.1, < 6.2"
240
+ :stack:
241
+ - :gem_name: roadie-rails (~> 2.2.0)
242
+ :version: *11
243
+ - :requirements_source: ">= 3.0"
244
+ :stack:
245
+ - :gem_name: rspec-rails (~> 3.5, >= 3.5.2)
246
+ :version: *4
247
+ - :requirements_source: ">= 5.2.0"
248
+ :stack:
249
+ - :gem_name: redmine_plugins_helper
250
+ :version: *12
251
+ - :gem_name: sass-rails (~> 5.0)
252
+ :version: *13
253
+ - :requirements_source: ">= 3.1"
254
+ :stack:
255
+ - :gem_name: slim-rails
256
+ :version: *14
257
+ - :gem_name: rspec-rails
258
+ :versions_requirements:
259
+ - :requirements_source: "~> 3.5, >= 3.5.2"
260
+ :stack: []
261
+ - :requirements_source:
262
+ :stack:
263
+ - :gem_name: redmine_plugins_helper
264
+ :version: *12
265
+ - :gem_name: rubocop
266
+ :versions_requirements:
267
+ - :requirements_source: "~> 1.12.0"
268
+ :stack: []
269
+ - :requirements_source: ">= 0.90.0, < 2.0"
270
+ :stack:
271
+ - :gem_name: rubocop-rails (~> 2.9.0)
272
+ :version: *7
273
+ - :requirements_source: "~> 1.0"
274
+ :stack:
275
+ - :gem_name: rubocop-rspec
276
+ :version: !ruby/object:Gem::Version
277
+ version: 2.4.0
278
+ - :gem_name: "ruby\0"
279
+ :versions_requirements: []
280
+ - :gem_name: selenium-webdriver
281
+ :versions_requirements:
282
+ - :requirements_source: "~> 3.142.7"
283
+ :stack: []
284
+ - :requirements_source: "> 3.141, < 5.0"
285
+ :stack:
286
+ - :gem_name: webdrivers (~> 4.4)
287
+ :version: !ruby/object:Gem::Version
288
+ version: 4.7.0
289
+ - :gem_name: shoulda-matchers
290
+ :versions_requirements:
291
+ - :requirements_source: "~> 2.7.0"
292
+ :stack: []
293
+ - :requirements_source: ">= 1.4.1, < 3.0"
294
+ :stack:
295
+ - :gem_name: shoulda (~> 3.5.0)
296
+ :version: *15
297
+ - :gem_name: simplecov
298
+ :versions_requirements:
299
+ - :requirements_source: "~> 0.18.5"
300
+ :stack: []
301
+ - :requirements_source:
302
+ :stack:
303
+ - :gem_name: codeclimate-test-reporter
304
+ :version: !ruby/object:Gem::Version
305
+ version: 1.0.7
@@ -11,13 +11,14 @@ Gem::Specification.new do |s|
11
11
  s.summary = 'Put here de description.'
12
12
 
13
13
  s.files = Dir['{lib,locale}/**/*']
14
+ s.required_ruby_version = '>= 2.7'
14
15
 
15
- s.add_dependency 'avm', '~> 0.73', '>= 0.73.1'
16
+ s.add_dependency 'avm', '~> 0.79'
16
17
  s.add_dependency 'avm-files', '~> 0.6', '>= 0.6.2'
17
18
  s.add_dependency 'eac_git', '~> 0.14', '>= 0.14.1'
18
- s.add_dependency 'eac_ruby_utils', '~> 0.117'
19
+ s.add_dependency 'eac_ruby_utils', '~> 0.119', '>= 0.119.1'
19
20
  s.add_dependency 'git', '~> 1.18'
20
21
 
21
22
  s.add_development_dependency 'aranha-parsers', '~> 0.8', '>= 0.8.5'
22
- s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'
23
+ s.add_development_dependency 'eac_ruby_gem_support', '~> 0.7.0'
23
24
  end
@@ -20,7 +20,7 @@ module Avm
20
20
  end
21
21
 
22
22
  def fields
23
- FIELDS.map { |field| [field, send(field)] }.to_h
23
+ FIELDS.index_with { |field| send(field) }
24
24
  end
25
25
 
26
26
  private
@@ -21,11 +21,9 @@ module Avm
21
21
 
22
22
  %w[execute execute! system system!].each do |exec_type|
23
23
  define_method exec_type do |*args|
24
- begin
25
- command(*args).send(exec_type)
26
- rescue ::EacRubyUtils::Envs::ExecutionError
27
- raise ::Avm::Git::Launcher::Error
28
- end
24
+ command(*args).send(exec_type)
25
+ rescue ::EacRubyUtils::Envs::ExecutionError
26
+ raise ::Avm::Git::Launcher::Error
29
27
  end
30
28
  end
31
29
 
@@ -1,5 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require 'avm/scms/commit_info'
3
4
  require 'avm/git/scms/git/changed_file'
4
5
  require 'eac_ruby_utils/core_ext'
5
6
 
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module Git
5
- VERSION = '0.13.3'
5
+ VERSION = '0.13.4'
6
6
  end
7
7
  end
@@ -3,7 +3,7 @@
3
3
  require 'avm/git/scms/git'
4
4
  require 'eac_ruby_utils/fs/temp'
5
5
 
6
- RSpec.describe ::Avm::Git::Scms::Git::Commit::Deploy, git: true do
6
+ RSpec.describe ::Avm::Git::Scms::Git::Commit::Deploy, git: true do # rubocop:disable RSpec/MultipleMemoizedHelpers
7
7
  class << self
8
8
  FROM_DEPLOY = %w[a.txt b.txt c.txt appended].freeze # rubocop:disable RSpec/LeakyConstantDeclaration
9
9
  NOT_FROM_DEPLOY = %w[to_be_removed].freeze # rubocop:disable RSpec/LeakyConstantDeclaration
@@ -80,11 +80,11 @@ RSpec.describe ::Avm::Git::Scms::Git::Commit::Deploy, git: true do
80
80
  target_dir.remove
81
81
  end
82
82
 
83
- context 'without run' do # rubocop:disable RSpec/EmptyExampleGroup
83
+ context 'without run' do # rubocop:disable RSpec/EmptyExampleGroup, RSpec/MultipleMemoizedHelpers
84
84
  check_files(false)
85
85
  end
86
86
 
87
- context 'with run' do # rubocop:disable RSpec/EmptyExampleGroup
87
+ context 'with run' do # rubocop:disable RSpec/EmptyExampleGroup, RSpec/MultipleMemoizedHelpers
88
88
  before { instance.run }
89
89
 
90
90
  check_files(true)
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
14
14
 
15
15
  s.add_dependency 'colorize', '~> 0.8', '>= 0.8.1'
16
16
  s.add_dependency 'eac_config', '~> 0.14'
17
- s.add_dependency 'eac_ruby_utils', '~> 0.119'
17
+ s.add_dependency 'eac_ruby_utils', '~> 0.119', '>= 0.119.1'
18
18
 
19
19
  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
20
20
  end
@@ -0,0 +1,15 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+ require 'eac_ruby_utils/acts_as_abstract'
5
+
6
+ module EacCli
7
+ module RunnerWith
8
+ module OutputItem
9
+ class BaseFormatter
10
+ acts_as_abstract :to_output
11
+ common_constructor :item_hash
12
+ end
13
+ end
14
+ end
15
+ end
@@ -0,0 +1,23 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'csv'
4
+ require 'eac_ruby_utils/core_ext'
5
+ require 'eac_cli/runner_with/output_item/base_formatter'
6
+
7
+ module EacCli
8
+ module RunnerWith
9
+ module OutputItem
10
+ class CsvFormatter < ::EacCli::RunnerWith::OutputItem::BaseFormatter
11
+ COLUMNS = %w[key value].freeze
12
+
13
+ # @return [String]
14
+ def to_output
15
+ ::CSV.generate do |csv|
16
+ csv << COLUMNS
17
+ item_hash.each { |k, v| csv << [k, v] }
18
+ end
19
+ end
20
+ end
21
+ end
22
+ end
23
+ end
@@ -0,0 +1,18 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+ require 'eac_cli/runner_with/output_item/base_formatter'
5
+ require 'yaml'
6
+
7
+ module EacCli
8
+ module RunnerWith
9
+ module OutputItem
10
+ class YamlFormatter < ::EacCli::RunnerWith::OutputItem::BaseFormatter
11
+ # @return [String]
12
+ def to_output
13
+ ::YAML.dump(item_hash.deep_stringify_keys)
14
+ end
15
+ end
16
+ end
17
+ end
18
+ end
@@ -0,0 +1,42 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_cli/runner_with/output'
4
+ require 'eac_ruby_utils/core_ext'
5
+ require 'eac_ruby_utils/acts_as_abstract'
6
+
7
+ module EacCli
8
+ module RunnerWith
9
+ module OutputItem
10
+ require_sub __FILE__
11
+
12
+ FORMATS = {
13
+ 'csv' => ::EacCli::RunnerWith::OutputItem::CsvFormatter,
14
+ 'yaml' => ::EacCli::RunnerWith::OutputItem::YamlFormatter
15
+ }.freeze
16
+
17
+ common_concern do
18
+ acts_as_abstract :item_hash
19
+ include ::EacCli::RunnerWith::Output
20
+
21
+ runner_definition do
22
+ arg_opt '-f', '--format', 'Format to output item.', default: 'yaml'
23
+ end
24
+ end
25
+
26
+ # @return [String]
27
+ def output_content
28
+ formatter.to_output
29
+ end
30
+
31
+ # @return [EacCli::RunnerWith::OutputList::BaseFormatter]
32
+ def formatter
33
+ formatter_class.new(item_hash)
34
+ end
35
+
36
+ # @return [Class]
37
+ def formatter_class
38
+ FORMATS.fetch(parsed.format)
39
+ end
40
+ end
41
+ end
42
+ end
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module EacCli
4
- VERSION = '0.36.0'
4
+ VERSION = '0.37.0'
5
5
  end
@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
13
13
  s.files = Dir['{lib}/**/*']
14
14
 
15
15
  s.add_dependency 'eac_fs', '~> 0.16'
16
- s.add_dependency 'eac_ruby_utils', '~> 0.117', '>= 0.117.1'
17
- s.add_dependency 'faraday', '~> 2.7', '>= 2.7.6'
16
+ s.add_dependency 'eac_ruby_utils', '~> 0.119', '>= 0.119.1'
17
+ s.add_dependency 'faraday', '~> 2.7', '>= 2.7.10'
18
18
  s.add_dependency 'faraday-follow_redirects', '~> 0.3'
19
19
  s.add_dependency 'faraday-gzip', '~> 0.1'
20
20
  s.add_dependency 'faraday-multipart', '~> 1.0', '>= 1.0.4'
@@ -7,7 +7,7 @@ module EacEnvs
7
7
  class Response < ::StandardError
8
8
  module Statuses
9
9
  def raise_unless_200
10
- return nil if status == 200
10
+ return nil if status >= 200 && status < 300
11
11
 
12
12
  raise self
13
13
  end
@@ -2,6 +2,6 @@
2
2
 
3
3
  module EacEnvs
4
4
  module Http
5
- VERSION = '0.4.0'
5
+ VERSION = '0.4.1'
6
6
  end
7
7
  end
@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
12
12
 
13
13
  s.files = Dir['{lib}/**/*']
14
14
 
15
- s.add_dependency 'eac_envs-http', '~> 0.4'
15
+ s.add_dependency 'eac_envs-http', '~> 0.4', '>= 0.4.1'
16
16
  s.add_dependency 'eac_fs', '~> 0.16'
17
- s.add_dependency 'eac_ruby_utils', '~> 0.117', '>= 0.117.1'
17
+ s.add_dependency 'eac_ruby_utils', '~> 0.119', '>= 0.119.1'
18
18
 
19
19
  s.add_development_dependency 'aranha-parsers', '~> 0.15'
20
20
  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
@@ -1,5 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require 'eac_rest/helper'
3
4
  require 'eac_rest/request'
4
5
  require 'eac_ruby_utils/core_ext'
5
6
 
@@ -40,20 +41,7 @@ module EacRest
40
41
 
41
42
  # @return [Addressable::URI]
42
43
  def build_service_url(suffix)
43
- r = ::Addressable::URI.parse(suffix)
44
- return r if r.scheme.present?
45
-
46
- s = build_service_url_suffix(suffix)
47
- r = ::Addressable::URI.parse(root_url)
48
- r.path += s.path
49
- r.query_values = r.query_values(::Array).if_present([]) +
50
- s.query_values(::Array).if_present([])
51
- r
52
- end
53
-
54
- # @return [Addressable::URI]
55
- def build_service_url_suffix(suffix)
56
- ::Addressable::URI.parse(suffix)
44
+ ::EacRest::Helper.url_join(root_url, suffix)
57
45
  end
58
46
 
59
47
  # @return [EacRest::Entity]
@@ -0,0 +1,44 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+
5
+ module EacRest
6
+ class Entity
7
+ module Data
8
+ common_concern
9
+
10
+ # @return [Hash]
11
+ def data
12
+ if internal_data.blank?
13
+ self.internal_data = data_or_id_data? ? data_or_id : data_from_id
14
+ end
15
+
16
+ internal_data
17
+ end
18
+
19
+ # @return [Boolean]
20
+ def data_or_id_data?
21
+ data_or_id.is_a?(::Hash)
22
+ end
23
+
24
+ # @return [Hash]
25
+ def data_from_id
26
+ raise_abstract_method __method__
27
+ end
28
+
29
+ # @return [Object]
30
+ def id
31
+ data_or_id_data? ? id_from_data : data_or_id
32
+ end
33
+
34
+ # @return [Object]
35
+ def id_from_data
36
+ raise_abstract_method __method__
37
+ end
38
+
39
+ private
40
+
41
+ attr_accessor :internal_data
42
+ end
43
+ end
44
+ end
@@ -0,0 +1,20 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_rest/helper'
4
+ require 'eac_ruby_utils/core_ext'
5
+
6
+ module EacRest
7
+ class Entity
8
+ module Fetching
9
+ # @return [Addressable::URI]
10
+ def entity_root_url_suffix
11
+ parent_entity.if_present('', &:entity_root_url_suffix).to_uri
12
+ end
13
+
14
+ # @return [EacRest::Request]
15
+ def request(url_suffix)
16
+ api.request(::EacRest::Helper.url_join(entity_root_url_suffix, url_suffix))
17
+ end
18
+ end
19
+ end
20
+ end
@@ -25,42 +25,11 @@ module EacRest
25
25
  api.entity(entity_class, data_or_id, options.merge(OPTION_PARENT => self))
26
26
  end
27
27
 
28
- # @return [Hash]
29
- def data
30
- if internal_data.blank?
31
- self.internal_data = data_or_id_data? ? data_or_id : data_from_id
32
- end
33
-
34
- internal_data
35
- end
36
-
37
- # @return [Boolean]
38
- def data_or_id_data?
39
- data_or_id.is_a?(::Hash)
40
- end
41
-
42
- # @return [Hash]
43
- def data_from_id
44
- raise_abstract_method __method__
45
- end
46
-
47
- # @return [Object]
48
- def id
49
- data_or_id_data? ? id_from_data : data_or_id
50
- end
51
-
52
- # @return [Object]
53
- def id_from_data
54
- raise_abstract_method __method__
55
- end
56
-
57
28
  # @return [EacRest::Entity, nil]
58
29
  def parent_entity
59
30
  options[OPTION_PARENT]
60
31
  end
61
32
 
62
- private
63
-
64
- attr_accessor :internal_data
33
+ require_sub __FILE__, include_modules: :include
65
34
  end
66
35
  end
@@ -0,0 +1,34 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+
5
+ module EacRest
6
+ module Helper
7
+ # @param parts [Array<Addressable::URI>]
8
+ # @return [Addressable::URI]
9
+ def url_join(*parts)
10
+ left = parts.shift
11
+ left = url_join_pair(left, parts.shift) while parts.any?
12
+ left
13
+ end
14
+
15
+ private
16
+
17
+ # @param left [Addressable::URI]
18
+ # @param right [Addressable::URI]
19
+ # @return [Addressable::URI]
20
+ def url_join_pair(left, right)
21
+ r = ::Addressable::URI.parse(right)
22
+ return r if r.scheme.present?
23
+
24
+ s = ::Addressable::URI.parse(right)
25
+ r = ::Addressable::URI.parse(left)
26
+ r.path += s.path
27
+ r.query_values = r.query_values(::Array).if_present([]) +
28
+ s.query_values(::Array).if_present([])
29
+ r
30
+ end
31
+
32
+ extend self
33
+ end
34
+ end
@@ -19,6 +19,8 @@ module EacRest
19
19
  internal_response.send(method_name, *args, &block)
20
20
  rescue ::EacEnvs::Http::Error
21
21
  raise ::EacRest::Error
22
+ rescue ::EacEnvs::Http::Response
23
+ raise self
22
24
  end
23
25
  end
24
26
  end
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module EacRest
4
- VERSION = '0.9.1'
4
+ VERSION = '0.10.0'
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.75.0
4
+ version: 0.75.2
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-07-08 00:00:00.000000000 Z
11
+ date: 2023-09-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: avm
@@ -101,7 +101,7 @@ dependencies:
101
101
  version: '0.5'
102
102
  - - ">="
103
103
  - !ruby/object:Gem::Version
104
- version: 0.5.1
104
+ version: 0.5.2
105
105
  type: :runtime
106
106
  prerelease: false
107
107
  version_requirements: !ruby/object:Gem::Requirement
@@ -111,7 +111,7 @@ dependencies:
111
111
  version: '0.5'
112
112
  - - ">="
113
113
  - !ruby/object:Gem::Version
114
- version: 0.5.1
114
+ version: 0.5.2
115
115
  - !ruby/object:Gem::Dependency
116
116
  name: avm-eac_python_base0
117
117
  requirement: !ruby/object:Gem::Requirement
@@ -161,7 +161,7 @@ dependencies:
161
161
  version: '0.9'
162
162
  - - ">="
163
163
  - !ruby/object:Gem::Version
164
- version: 0.9.2
164
+ version: 0.9.3
165
165
  type: :runtime
166
166
  prerelease: false
167
167
  version_requirements: !ruby/object:Gem::Requirement
@@ -171,7 +171,7 @@ dependencies:
171
171
  version: '0.9'
172
172
  - - ">="
173
173
  - !ruby/object:Gem::Version
174
- version: 0.9.2
174
+ version: 0.9.3
175
175
  - !ruby/object:Gem::Dependency
176
176
  name: avm-eac_redmine_base0
177
177
  requirement: !ruby/object:Gem::Requirement
@@ -213,6 +213,9 @@ dependencies:
213
213
  - - "~>"
214
214
  - !ruby/object:Gem::Version
215
215
  version: '0.31'
216
+ - - ">="
217
+ - !ruby/object:Gem::Version
218
+ version: 0.31.2
216
219
  type: :runtime
217
220
  prerelease: false
218
221
  version_requirements: !ruby/object:Gem::Requirement
@@ -220,6 +223,9 @@ dependencies:
220
223
  - - "~>"
221
224
  - !ruby/object:Gem::Version
222
225
  version: '0.31'
226
+ - - ">="
227
+ - !ruby/object:Gem::Version
228
+ version: 0.31.2
223
229
  - !ruby/object:Gem::Dependency
224
230
  name: avm-eac_webapp_base0
225
231
  requirement: !ruby/object:Gem::Requirement
@@ -269,7 +275,7 @@ dependencies:
269
275
  version: '0.13'
270
276
  - - ">="
271
277
  - !ruby/object:Gem::Version
272
- version: 0.13.3
278
+ version: 0.13.4
273
279
  type: :runtime
274
280
  prerelease: false
275
281
  version_requirements: !ruby/object:Gem::Requirement
@@ -279,7 +285,7 @@ dependencies:
279
285
  version: '0.13'
280
286
  - - ">="
281
287
  - !ruby/object:Gem::Version
282
- version: 0.13.3
288
+ version: 0.13.4
283
289
  - !ruby/object:Gem::Dependency
284
290
  name: avm-tools
285
291
  requirement: !ruby/object:Gem::Requirement
@@ -665,6 +671,7 @@ files:
665
671
  - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/incompatible_parser/line_buffer.rb
666
672
  - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/incompatible_parser/line_factory.rb
667
673
  - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/incompatible_parser/line_parser_base.rb
674
+ - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/incompatible_parser/ruby_requirement.rb
668
675
  - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/incompatible_parser/version_requirement.rb
669
676
  - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/file_formats.rb
670
677
  - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/file_formats/base.rb
@@ -738,6 +745,8 @@ files:
738
745
  - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/bundler/incompatible_parser_spec_files/1.target.yaml
739
746
  - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/bundler/incompatible_parser_spec_files/2.source.out
740
747
  - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/bundler/incompatible_parser_spec_files/2.target.yaml
748
+ - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/bundler/incompatible_parser_spec_files/3.source.out
749
+ - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/bundler/incompatible_parser_spec_files/3.target.yaml
741
750
  - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/file_formats/base_spec.rb
742
751
  - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/file_formats/base_spec_files/Gemfile.source
743
752
  - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/file_formats/base_spec_files/Gemfile.target
@@ -1368,6 +1377,10 @@ files:
1368
1377
  - sub/eac_cli/lib/eac_cli/runner_with/help/layout.rb
1369
1378
  - sub/eac_cli/lib/eac_cli/runner_with/input.rb
1370
1379
  - sub/eac_cli/lib/eac_cli/runner_with/output.rb
1380
+ - sub/eac_cli/lib/eac_cli/runner_with/output_item.rb
1381
+ - sub/eac_cli/lib/eac_cli/runner_with/output_item/base_formatter.rb
1382
+ - sub/eac_cli/lib/eac_cli/runner_with/output_item/csv_formatter.rb
1383
+ - sub/eac_cli/lib/eac_cli/runner_with/output_item/yaml_formatter.rb
1371
1384
  - sub/eac_cli/lib/eac_cli/runner_with/output_list.rb
1372
1385
  - sub/eac_cli/lib/eac_cli/runner_with/output_list/base_formatter.rb
1373
1386
  - sub/eac_cli/lib/eac_cli/runner_with/output_list/csv_formatter.rb
@@ -1754,7 +1767,10 @@ files:
1754
1767
  - sub/eac_rest/lib/eac_rest.rb
1755
1768
  - sub/eac_rest/lib/eac_rest/api.rb
1756
1769
  - sub/eac_rest/lib/eac_rest/entity.rb
1770
+ - sub/eac_rest/lib/eac_rest/entity/data.rb
1771
+ - sub/eac_rest/lib/eac_rest/entity/fetching.rb
1757
1772
  - sub/eac_rest/lib/eac_rest/error.rb
1773
+ - sub/eac_rest/lib/eac_rest/helper.rb
1758
1774
  - sub/eac_rest/lib/eac_rest/request.rb
1759
1775
  - sub/eac_rest/lib/eac_rest/response.rb
1760
1776
  - sub/eac_rest/lib/eac_rest/version.rb