eac_tools 0.74.0 → 0.74.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (31) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +21 -21
  3. data/lib/eac_tools/version.rb +1 -1
  4. data/sub/avm-eac_rails_base0/avm-eac_rails_base0.gemspec +2 -2
  5. data/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/instances/apache_path.rb +2 -10
  6. data/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/version.rb +1 -1
  7. data/sub/avm-eac_rails_base0/spec/lib/avm/eac_rails_base0/instances/apache_path_spec_files/stub-app_0_apache_path.conf +7 -9
  8. data/sub/avm-eac_rails_base1/avm-eac_rails_base1.gemspec +3 -3
  9. data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/apache_base.rb +16 -0
  10. data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/apache_host.rb +2 -3
  11. data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/apache_path.rb +21 -0
  12. data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/base.rb +2 -0
  13. data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/version.rb +1 -1
  14. data/sub/avm-eac_webapp_base0/avm-eac_webapp_base0.gemspec +2 -2
  15. data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/apache_base.rb +5 -0
  16. data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/apache_path.rb +0 -4
  17. data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/base/apache.rb +44 -0
  18. data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/base.rb +0 -8
  19. data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners/apache_path.rb +2 -1
  20. data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/version.rb +1 -1
  21. data/sub/avm-eac_webapp_base0/template/avm/eac_webapp_base0/instances/apache_path/default.conf +7 -9
  22. data/sub/eac_cli/eac_cli.gemspec +2 -2
  23. data/sub/eac_cli/lib/eac_cli/runner_with/output_list/base_formatter.rb +30 -0
  24. data/sub/eac_cli/lib/eac_cli/runner_with/output_list/csv_formatter.rb +26 -0
  25. data/sub/eac_cli/lib/eac_cli/runner_with/output_list/yaml_formatter.rb +23 -0
  26. data/sub/eac_cli/lib/eac_cli/runner_with/output_list.rb +42 -0
  27. data/sub/eac_cli/lib/eac_cli/version.rb +1 -1
  28. data/sub/eac_ruby_utils/lib/eac_ruby_utils/module_ancestors_variable.rb +1 -1
  29. data/sub/eac_ruby_utils/lib/eac_ruby_utils/version.rb +1 -1
  30. metadata +22 -9
  31. /data/sub/{avm-eac_rails_base0/template/avm/eac_rails_base0 → avm-eac_rails_base1/template/avm/eac_rails_base1}/instances/apache_path/extra_content.conf +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e1ed89a8e8dbb593fd5a7b84b1cebbe9c4b4055b743d527a85452b7b44aab2e8
4
- data.tar.gz: 470361676d52d6ffba1ecaad4818bc367226b8c88b6beba69530ed0fcce110f0
3
+ metadata.gz: 1e400757a0f601581fffabdee1ad0d4cc32be1142486cf96cdb7cdc8777f4325
4
+ data.tar.gz: ffb4a99e49b7a85e99e9728272a1a351f6363178a4a65347c15d82674570df06
5
5
  SHA512:
6
- metadata.gz: 599a3f888a29fae5a3cdadfcc351b330bf4a8c4c7c3a0d7864f7a6233770d5d4ce8b2ff1a6511edab93e7a70a4f4bca6f95d849229198b5b73539da99242ba1c
7
- data.tar.gz: b5f6e6c9ba8784f9c733875afffece135dc29d40c8b1ae7e947a33ef25c7094fc9ca61887021f86bb01f258655f1d30d557d8e8d1f3568b9e8d7c33920b2c8b8
6
+ metadata.gz: c34349be4ffad51598e9122d33a0680ccc10891bb6d59a3c28e4263bd5616161b3de96684263be6ad063211f75d1d5f035982af6427a6169cd452f7c2b019306
7
+ data.tar.gz: 629b9802cc151904f42c32182756f489986bb4f46a6c4b1c0859582362f41833d332787381fc674efca66aac88c27323d1223a28748adaec9c8c144650f5f2f3
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- eac_tools (0.74.0)
4
+ eac_tools (0.74.1)
5
5
  avm (~> 0.79)
6
6
  avm-eac_asciidoctor_base0 (~> 0.19)
7
7
  avm-eac_generic_base0 (~> 0.12)
@@ -9,16 +9,16 @@ PATH
9
9
  avm-eac_php_base0 (~> 0.4, >= 0.4.2)
10
10
  avm-eac_postgresql_base0 (~> 0.5, >= 0.5.1)
11
11
  avm-eac_python_base0 (~> 0.2, >= 0.2.1)
12
- avm-eac_rails_base0 (~> 0.10, >= 0.10.2)
13
- avm-eac_rails_base1 (~> 0.9, >= 0.9.1)
12
+ avm-eac_rails_base0 (~> 0.10, >= 0.10.3)
13
+ avm-eac_rails_base1 (~> 0.9, >= 0.9.2)
14
14
  avm-eac_redmine_base0 (~> 0.20, >= 0.20.1)
15
15
  avm-eac_redmine_plugin_base0 (~> 0.4)
16
16
  avm-eac_ruby_base1 (~> 0.30, >= 0.30.3)
17
- avm-eac_webapp_base0 (~> 0.18, >= 0.18.1)
17
+ avm-eac_webapp_base0 (~> 0.18, >= 0.18.2)
18
18
  avm-eac_wordpress_base0 (~> 0.3, >= 0.3.1)
19
19
  avm-git (~> 0.13, >= 0.13.3)
20
20
  avm-tools (~> 0.154)
21
- eac_ruby_utils (~> 0.119)
21
+ eac_ruby_utils (~> 0.119, >= 0.119.1)
22
22
 
23
23
  PATH
24
24
  remote: sub/avm-eac_asciidoctor_base0
@@ -70,18 +70,18 @@ PATH
70
70
  PATH
71
71
  remote: sub/avm-eac_rails_base0
72
72
  specs:
73
- avm-eac_rails_base0 (0.10.2)
74
- avm-eac_rails_base1 (~> 0.8, >= 0.8.4)
75
- eac_ruby_utils (~> 0.112)
73
+ avm-eac_rails_base0 (0.10.3)
74
+ avm-eac_rails_base1 (~> 0.9, >= 0.9.2)
75
+ eac_ruby_utils (~> 0.119, >= 0.119.1)
76
76
 
77
77
  PATH
78
78
  remote: sub/avm-eac_rails_base1
79
79
  specs:
80
- avm-eac_rails_base1 (0.9.1)
81
- avm (~> 0.78)
80
+ avm-eac_rails_base1 (0.9.2)
81
+ avm (~> 0.79)
82
82
  avm-eac_ruby_base1 (~> 0.30, >= 0.30.3)
83
- avm-eac_webapp_base0 (~> 0.18, >= 0.18.1)
84
- eac_ruby_utils (~> 0.117, >= 0.117.1)
83
+ avm-eac_webapp_base0 (~> 0.18, >= 0.18.2)
84
+ eac_ruby_utils (~> 0.119, >= 0.119.1)
85
85
 
86
86
  PATH
87
87
  remote: sub/avm-eac_redmine_base0
@@ -124,13 +124,13 @@ PATH
124
124
  PATH
125
125
  remote: sub/avm-eac_webapp_base0
126
126
  specs:
127
- avm-eac_webapp_base0 (0.18.1)
128
- avm (~> 0.78)
127
+ avm-eac_webapp_base0 (0.18.2)
128
+ avm (~> 0.79)
129
129
  avm-eac_generic_base0 (~> 0.12)
130
130
  avm-eac_postgresql_base0 (~> 0.5, >= 0.5.1)
131
131
  avm-eac_ubuntu_base0 (~> 0.5)
132
132
  avm-files (~> 0.6, >= 0.6.2)
133
- eac_ruby_utils (~> 0.117, >= 0.117.1)
133
+ eac_ruby_utils (~> 0.119, >= 0.119.1)
134
134
 
135
135
  PATH
136
136
  remote: sub/avm-eac_wordpress_base0
@@ -197,10 +197,10 @@ PATH
197
197
  PATH
198
198
  remote: sub/eac_cli
199
199
  specs:
200
- eac_cli (0.35.1)
200
+ eac_cli (0.36.0)
201
201
  colorize (~> 0.8, >= 0.8.1)
202
- eac_config (~> 0.12)
203
- eac_ruby_utils (~> 0.117)
202
+ eac_config (~> 0.14)
203
+ eac_ruby_utils (~> 0.119)
204
204
 
205
205
  PATH
206
206
  remote: sub/eac_config
@@ -263,7 +263,7 @@ PATH
263
263
  PATH
264
264
  remote: sub/eac_ruby_utils
265
265
  specs:
266
- eac_ruby_utils (0.119.0)
266
+ eac_ruby_utils (0.119.1)
267
267
  activesupport (>= 4, < 7)
268
268
  addressable (~> 2.8, >= 2.8.4)
269
269
  bundler
@@ -310,7 +310,7 @@ GEM
310
310
  rubocop (~> 0.80.1)
311
311
  rubocop-rails (~> 2.4.2)
312
312
  rubocop-rspec (~> 1.38.1)
313
- faraday (2.7.9)
313
+ faraday (2.7.10)
314
314
  faraday-net_http (>= 2.0, < 3.1)
315
315
  ruby2_keywords (>= 0.0.4)
316
316
  faraday-follow_redirects (0.3.0)
@@ -336,7 +336,7 @@ GEM
336
336
  minitest (5.18.1)
337
337
  multipart-post (2.3.0)
338
338
  net-ssh (4.2.0)
339
- nokogiri (1.15.2-x86_64-linux)
339
+ nokogiri (1.15.3-x86_64-linux)
340
340
  racc (~> 1.4)
341
341
  ofx-parser (1.1.0)
342
342
  hpricot (>= 0.6)
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module EacTools
4
- VERSION = '0.74.0'
4
+ VERSION = '0.74.1'
5
5
  end
@@ -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-eac_rails_base1', '~> 0.8', '>= 0.8.4'
16
- s.add_dependency 'eac_ruby_utils', '~> 0.112'
15
+ s.add_dependency 'avm-eac_rails_base1', '~> 0.9', '>= 0.9.2'
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
@@ -1,20 +1,12 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'eac_templates/core_ext'
4
- require 'avm/eac_webapp_base0/instances/apache_path'
3
+ require 'avm/eac_rails_base1/instances/apache_path'
5
4
  require 'eac_ruby_utils/core_ext'
6
5
 
7
6
  module Avm
8
7
  module EacRailsBase0
9
8
  module Instances
10
- class ApachePath < ::Avm::EacWebappBase0::Instances::ApachePath
11
- def document_root
12
- ::File.join(super, 'public')
13
- end
14
-
15
- def extra_content
16
- template.child('extra_content.conf').apply(instance)
17
- end
9
+ class ApachePath < ::Avm::EacRailsBase1::Instances::ApachePath
18
10
  end
19
11
  end
20
12
  end
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacRailsBase0
5
- VERSION = '0.10.2'
5
+ VERSION = '0.10.3'
6
6
  end
7
7
  end
@@ -1,14 +1,12 @@
1
- <IfModule mod_passenger.c>
2
- Alias "/stub-app_0" "/path/to/stub-app_0/public"
3
- <Location "/stub-app_0">
1
+ Alias "/stub-app_0" "/path/to/stub-app_0/public"
2
+ <Location "/stub-app_0">
4
3
  PassengerBaseURI "/stub-app_0"
5
4
  PassengerAppRoot "/path/to/stub-app_0"
6
5
  PassengerAppEnv production
7
6
  </Location>
8
7
 
9
- <Directory "/path/to/stub-app_0/public">
10
- Allow from all
11
- Options -MultiViews
12
- Require all granted
13
- </Directory>
14
- </IfModule>
8
+ <Directory "/path/to/stub-app_0/public">
9
+ Allow from all
10
+ Options -MultiViews
11
+ Require all granted
12
+ </Directory>
@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
12
12
 
13
13
  s.files = Dir['{lib,template}/**/*']
14
14
 
15
- s.add_dependency 'avm', '~> 0.78'
15
+ s.add_dependency 'avm', '~> 0.79'
16
16
  s.add_dependency 'avm-eac_ruby_base1', '~> 0.30', '>= 0.30.3'
17
- s.add_dependency 'avm-eac_webapp_base0', '~> 0.18', '>= 0.18.1'
18
- s.add_dependency 'eac_ruby_utils', '~> 0.117', '>= 0.117.1'
17
+ s.add_dependency 'avm-eac_webapp_base0', '~> 0.18', '>= 0.18.2'
18
+ s.add_dependency 'eac_ruby_utils', '~> 0.119', '>= 0.119.1'
19
19
 
20
20
  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
21
21
  end
@@ -0,0 +1,16 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+
5
+ module Avm
6
+ module EacRailsBase1
7
+ module Instances
8
+ module ApacheBase
9
+ # @return [String]
10
+ def document_root
11
+ ::File.join(super, 'public')
12
+ end
13
+ end
14
+ end
15
+ end
16
+ end
@@ -1,14 +1,13 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require 'avm/eac_rails_base1/instances/apache_base'
3
4
  require 'avm/eac_webapp_base0/instances/apache_host'
4
5
 
5
6
  module Avm
6
7
  module EacRailsBase1
7
8
  module Instances
8
9
  class ApacheHost < ::Avm::EacWebappBase0::Instances::ApacheHost
9
- def document_root
10
- "#{instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)}/public"
11
- end
10
+ prepend ::Avm::EacRailsBase1::Instances::ApacheBase
12
11
 
13
12
  def extra_content
14
13
  'PassengerEnabled On'
@@ -0,0 +1,21 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'avm/eac_rails_base1/instances/apache_base'
4
+ require 'avm/eac_webapp_base0/instances/apache_path'
5
+ require 'eac_templates/core_ext'
6
+
7
+ module Avm
8
+ module EacRailsBase1
9
+ module Instances
10
+ class ApachePath < ::Avm::EacWebappBase0::Instances::ApachePath
11
+ prepend ::Avm::EacRailsBase1::Instances::ApacheBase
12
+
13
+ # @return [String]
14
+ def extra_content
15
+ ::Avm::EacRailsBase1::Instances::ApachePath.template.child('extra_content.conf')
16
+ .apply(instance)
17
+ end
18
+ end
19
+ end
20
+ end
21
+ end
@@ -1,5 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require 'avm/eac_rails_base1/instances/apache_host'
4
+ require 'avm/eac_rails_base1/instances/apache_path'
3
5
  require 'avm/eac_rails_base1/instances/processes/tasks_scheduler'
4
6
  require 'avm/eac_rails_base1/instances/runners'
5
7
  require 'avm/eac_ruby_base1/instances/mixin'
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacRailsBase1
5
- VERSION = '0.9.1'
5
+ VERSION = '0.9.2'
6
6
  end
7
7
  end
@@ -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.78'
15
+ s.add_dependency 'avm', '~> 0.79'
16
16
  s.add_dependency 'avm-eac_generic_base0', '~> 0.12'
17
17
  s.add_dependency 'avm-eac_postgresql_base0', '~> 0.5', '>= 0.5.1'
18
18
  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.5'
19
19
  s.add_dependency 'avm-files', '~> 0.6', '>= 0.6.2'
20
- s.add_dependency 'eac_ruby_utils', '~> 0.117', '>= 0.117.1'
20
+ s.add_dependency 'eac_ruby_utils', '~> 0.119', '>= 0.119.1'
21
21
 
22
22
  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
23
23
  end
@@ -9,6 +9,11 @@ module Avm
9
9
  module EacWebappBase0
10
10
  module Instances
11
11
  class ApacheBase
12
+ # @return [String]
13
+ def document_root
14
+ instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
15
+ end
16
+
12
17
  protected
13
18
 
14
19
  def reload_apache
@@ -17,10 +17,6 @@ module Avm
17
17
  .apply(variables_source)
18
18
  end
19
19
 
20
- def document_root
21
- instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
22
- end
23
-
24
20
  def extra_content
25
21
  ''
26
22
  end
@@ -0,0 +1,44 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Avm
4
+ module EacWebappBase0
5
+ module Instances
6
+ class Base < ::Avm::Instances::Base
7
+ module Apache
8
+ common_concern
9
+
10
+ class_methods do
11
+ # @return [Class]
12
+ def apache_path_class
13
+ ancestors.lazy.map { |ancestor| apache_path_class_by_ancestor(ancestor) }
14
+ .find(&:present?) || raise("No apache patch class found for \"#{self}\"")
15
+ end
16
+
17
+ private
18
+
19
+ # @param ancestor [Module]
20
+ # @return [Class]
21
+ def apache_path_class_by_ancestor(ancestor)
22
+ "#{ancestor.name.deconstantize}::ApachePath".constantize
23
+ rescue ::NameError
24
+ nil
25
+ end
26
+ end
27
+
28
+ # @return [Class]
29
+ def apache_path_class
30
+ self.class.apache_path_class
31
+ end
32
+
33
+ # @return [Avm::EacUbuntuBase0::Apache::Resource, nil]
34
+ def apache_resource
35
+ %i[conf site]
36
+ .lazy
37
+ .map { |type| platform_instance.apache.send(type, install_apache_resource_name) }
38
+ .find(&:available?)
39
+ end
40
+ end
41
+ end
42
+ end
43
+ end
44
+ end
@@ -16,14 +16,6 @@ module Avm
16
16
  include ::Avm::EacPostgresqlBase0::InstanceWith
17
17
  enable_simple_cache
18
18
 
19
- # @return [Avm::EacUbuntuBase0::Apache::Resource, nil]
20
- def apache_resource
21
- %i[conf site]
22
- .lazy
23
- .map { |type| platform_instance.apache.send(type, install_apache_resource_name) }
24
- .find(&:available?)
25
- end
26
-
27
19
  def run_subcommand(subcommand_class, argv)
28
20
  subcommand_class.create(
29
21
  argv: argv,
@@ -12,6 +12,7 @@ module Avm
12
12
  end
13
13
 
14
14
  def run
15
+ infov 'ApachePath class', stereotype_apache_path_class
15
16
  if result.error?
16
17
  fatal_error result.to_s
17
18
  else
@@ -30,7 +31,7 @@ module Avm
30
31
  end
31
32
 
32
33
  def stereotype_apache_path_class
33
- "#{runner_context.call(:instance).class.name.deconstantize}::ApachePath".constantize
34
+ runner_context.call(:instance).apache_path_class
34
35
  end
35
36
  end
36
37
  end
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacWebappBase0
5
- VERSION = '0.18.1'
5
+ VERSION = '0.18.2'
6
6
  end
7
7
  end
@@ -1,9 +1,7 @@
1
- <IfModule mod_passenger.c>
2
- Alias "%%WEB.PATH%%" "%%DOCUMENT_ROOT%%"
3
- %%EXTRA_CONTENT%%
4
- <Directory "%%DOCUMENT_ROOT%%">
5
- Allow from all
6
- Options -MultiViews
7
- Require all granted
8
- </Directory>
9
- </IfModule>
1
+ Alias "%%WEB.PATH%%" "%%DOCUMENT_ROOT%%"
2
+ %%EXTRA_CONTENT%%
3
+ <Directory "%%DOCUMENT_ROOT%%">
4
+ Allow from all
5
+ Options -MultiViews
6
+ Require all granted
7
+ </Directory>
@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
13
13
  s.files = Dir['{lib}/**/*', 'Gemfile']
14
14
 
15
15
  s.add_dependency 'colorize', '~> 0.8', '>= 0.8.1'
16
- s.add_dependency 'eac_config', '~> 0.12'
17
- s.add_dependency 'eac_ruby_utils', '~> 0.117'
16
+ s.add_dependency 'eac_config', '~> 0.14'
17
+ s.add_dependency 'eac_ruby_utils', '~> 0.119'
18
18
 
19
19
  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
20
20
  end
@@ -0,0 +1,30 @@
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 OutputList
9
+ class BaseFormatter
10
+ acts_as_abstract :to_output
11
+ common_constructor :columns, :rows
12
+
13
+ # @return [String]
14
+ def build_column(column)
15
+ column.to_s
16
+ end
17
+
18
+ # @return [Array<String>]
19
+ def build_columns
20
+ columns.map(&:to_s)
21
+ end
22
+
23
+ # @return [Array<Hash<String, String>>]
24
+ def build_rows
25
+ rows.map { |row| build_row(row) }
26
+ end
27
+ end
28
+ end
29
+ end
30
+ end
@@ -0,0 +1,26 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'csv'
4
+ require 'eac_ruby_utils/core_ext'
5
+ require 'eac_cli/runner_with/output_list/base_formatter'
6
+
7
+ module EacCli
8
+ module RunnerWith
9
+ module OutputList
10
+ class CsvFormatter < ::EacCli::RunnerWith::OutputList::BaseFormatter
11
+ # @return [Array]
12
+ def build_row(row)
13
+ build_columns.map { |c| row.send(c) }
14
+ end
15
+
16
+ # @return [String]
17
+ def to_output
18
+ ::CSV.generate do |csv|
19
+ csv << build_columns
20
+ build_rows.each { |row| csv << row }
21
+ end
22
+ end
23
+ end
24
+ end
25
+ end
26
+ end
@@ -0,0 +1,23 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+ require 'eac_cli/runner_with/output_list/base_formatter'
5
+ require 'yaml'
6
+
7
+ module EacCli
8
+ module RunnerWith
9
+ module OutputList
10
+ class YamlFormatter < ::EacCli::RunnerWith::OutputList::BaseFormatter
11
+ # @return [Hash<String, String>]
12
+ def build_row(row)
13
+ build_columns.inject({}) { |a, e| a.merge(e => row.send(e).to_s) }
14
+ end
15
+
16
+ # @return [String]
17
+ def to_output
18
+ ::YAML.dump(build_rows)
19
+ end
20
+ end
21
+ end
22
+ end
23
+ 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 OutputList
10
+ require_sub __FILE__
11
+
12
+ FORMATS = {
13
+ 'csv' => ::EacCli::RunnerWith::OutputList::CsvFormatter,
14
+ 'yaml' => ::EacCli::RunnerWith::OutputList::YamlFormatter
15
+ }.freeze
16
+
17
+ common_concern do
18
+ acts_as_abstract :list_columns, :list_rows
19
+ include ::EacCli::RunnerWith::Output
20
+
21
+ runner_definition do
22
+ arg_opt '-f', '--format', 'Format to output list.', 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(list_columns, list_rows)
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.35.1'
4
+ VERSION = '0.36.0'
5
5
  end
@@ -3,7 +3,7 @@
3
3
  require 'eac_ruby_utils/patches/module/require_sub'
4
4
 
5
5
  module EacRubyUtils
6
- class ModuleAncestorsHash
6
+ class ModuleAncestorsVariable
7
7
  require_sub __FILE__
8
8
  end
9
9
  end
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module EacRubyUtils
4
- VERSION = '0.119.0'
4
+ VERSION = '0.119.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.74.0
4
+ version: 0.74.1
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-03 00:00:00.000000000 Z
11
+ date: 2023-07-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: avm
@@ -141,7 +141,7 @@ dependencies:
141
141
  version: '0.10'
142
142
  - - ">="
143
143
  - !ruby/object:Gem::Version
144
- version: 0.10.2
144
+ version: 0.10.3
145
145
  type: :runtime
146
146
  prerelease: false
147
147
  version_requirements: !ruby/object:Gem::Requirement
@@ -151,7 +151,7 @@ dependencies:
151
151
  version: '0.10'
152
152
  - - ">="
153
153
  - !ruby/object:Gem::Version
154
- version: 0.10.2
154
+ version: 0.10.3
155
155
  - !ruby/object:Gem::Dependency
156
156
  name: avm-eac_rails_base1
157
157
  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.1
164
+ version: 0.9.2
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.1
174
+ version: 0.9.2
175
175
  - !ruby/object:Gem::Dependency
176
176
  name: avm-eac_redmine_base0
177
177
  requirement: !ruby/object:Gem::Requirement
@@ -235,7 +235,7 @@ dependencies:
235
235
  version: '0.18'
236
236
  - - ">="
237
237
  - !ruby/object:Gem::Version
238
- version: 0.18.1
238
+ version: 0.18.2
239
239
  type: :runtime
240
240
  prerelease: false
241
241
  version_requirements: !ruby/object:Gem::Requirement
@@ -245,7 +245,7 @@ dependencies:
245
245
  version: '0.18'
246
246
  - - ">="
247
247
  - !ruby/object:Gem::Version
248
- version: 0.18.1
248
+ version: 0.18.2
249
249
  - !ruby/object:Gem::Dependency
250
250
  name: avm-eac_wordpress_base0
251
251
  requirement: !ruby/object:Gem::Requirement
@@ -307,6 +307,9 @@ dependencies:
307
307
  - - "~>"
308
308
  - !ruby/object:Gem::Version
309
309
  version: '0.119'
310
+ - - ">="
311
+ - !ruby/object:Gem::Version
312
+ version: 0.119.1
310
313
  type: :runtime
311
314
  prerelease: false
312
315
  version_requirements: !ruby/object:Gem::Requirement
@@ -314,6 +317,9 @@ dependencies:
314
317
  - - "~>"
315
318
  - !ruby/object:Gem::Version
316
319
  version: '0.119'
320
+ - - ">="
321
+ - !ruby/object:Gem::Version
322
+ version: 0.119.1
317
323
  - !ruby/object:Gem::Dependency
318
324
  name: eac_ruby_gem_support
319
325
  requirement: !ruby/object:Gem::Requirement
@@ -527,7 +533,6 @@ files:
527
533
  - sub/avm-eac_rails_base0/spec/lib/avm/eac_rails_base0/instances/apache_path_spec_files/stub-app_0_apache_path.conf
528
534
  - sub/avm-eac_rails_base0/spec/rubocop_spec.rb
529
535
  - sub/avm-eac_rails_base0/spec/spec_helper.rb
530
- - sub/avm-eac_rails_base0/template/avm/eac_rails_base0/instances/apache_path/extra_content.conf
531
536
  - sub/avm-eac_rails_base0/template/avm/eac_rails_base0/instances/deploy/config/database.yml.template
532
537
  - sub/avm-eac_rails_base0/template/avm/eac_rails_base0/instances/deploy/config/envvars.d/email.yml.template
533
538
  - sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/Gemfile
@@ -561,7 +566,9 @@ files:
561
566
  - sub/avm-eac_rails_base1/avm-eac_rails_base1.gemspec
562
567
  - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1.rb
563
568
  - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances.rb
569
+ - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/apache_base.rb
564
570
  - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/apache_host.rb
571
+ - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/apache_path.rb
565
572
  - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/base.rb
566
573
  - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/processes.rb
567
574
  - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/processes/daemon.rb
@@ -584,6 +591,7 @@ files:
584
591
  - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/version.rb
585
592
  - sub/avm-eac_rails_base1/spec/rubocop_spec.rb
586
593
  - sub/avm-eac_rails_base1/spec/spec_helper.rb
594
+ - sub/avm-eac_rails_base1/template/avm/eac_rails_base1/instances/apache_path/extra_content.conf
587
595
  - sub/avm-eac_rails_base1/template/avm/eac_rails_base1/instances/systemd_unit/tasks_scheduler.service
588
596
  - sub/avm-eac_rails_base1/template/avm/eac_rails_base1/instances/systemd_unit/tasks_scheduler_command.sh
589
597
  - sub/avm-eac_redmine_base0/Gemfile
@@ -824,6 +832,7 @@ files:
824
832
  - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/apache_host.rb
825
833
  - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/apache_path.rb
826
834
  - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/base.rb
835
+ - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/base/apache.rb
827
836
  - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/base/install.rb
828
837
  - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy.rb
829
838
  - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy/appended_directories.rb
@@ -1364,6 +1373,10 @@ files:
1364
1373
  - sub/eac_cli/lib/eac_cli/runner_with/help/layout.rb
1365
1374
  - sub/eac_cli/lib/eac_cli/runner_with/input.rb
1366
1375
  - sub/eac_cli/lib/eac_cli/runner_with/output.rb
1376
+ - sub/eac_cli/lib/eac_cli/runner_with/output_list.rb
1377
+ - sub/eac_cli/lib/eac_cli/runner_with/output_list/base_formatter.rb
1378
+ - sub/eac_cli/lib/eac_cli/runner_with/output_list/csv_formatter.rb
1379
+ - sub/eac_cli/lib/eac_cli/runner_with/output_list/yaml_formatter.rb
1367
1380
  - sub/eac_cli/lib/eac_cli/runner_with/subcommands.rb
1368
1381
  - sub/eac_cli/lib/eac_cli/runner_with/subcommands/definition_concern.rb
1369
1382
  - sub/eac_cli/lib/eac_cli/runner_with_set.rb