eac_tools 0.4.0 → 0.7.0

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 +29 -23
  3. data/lib/eac_tools/version.rb +1 -1
  4. data/sub/avm/lib/avm/sources/tests/builder.rb +12 -1
  5. data/sub/avm/lib/avm/version.rb +1 -1
  6. data/sub/{avm-tools/sub/avm-eac_rails_base0 → avm-eac_rails_base0}/Gemfile +0 -0
  7. data/sub/{avm-tools/sub/avm-eac_rails_base0 → avm-eac_rails_base0}/avm-eac_rails_base0.gemspec +0 -0
  8. data/sub/{avm-tools/sub/avm-eac_rails_base0 → avm-eac_rails_base0}/lib/avm/eac_rails_base0/apache_host.rb +0 -0
  9. data/sub/{avm-tools/sub/avm-eac_rails_base0 → avm-eac_rails_base0}/lib/avm/eac_rails_base0/apache_path.rb +0 -0
  10. data/sub/{avm-tools/sub/avm-eac_rails_base0 → avm-eac_rails_base0}/lib/avm/eac_rails_base0/deploy.rb +0 -0
  11. data/sub/{avm-tools/sub/avm-eac_rails_base0 → avm-eac_rails_base0}/lib/avm/eac_rails_base0/instance.rb +0 -0
  12. data/sub/{avm-tools/sub/avm-eac_rails_base0 → avm-eac_rails_base0}/lib/avm/eac_rails_base0/runners/base.rb +0 -0
  13. data/sub/{avm-tools/sub/avm-eac_rails_base0 → avm-eac_rails_base0}/lib/avm/eac_rails_base0/runners.rb +0 -0
  14. data/sub/{avm-tools/sub/avm-eac_rails_base0 → avm-eac_rails_base0}/lib/avm/eac_rails_base0/sources/base.rb +14 -1
  15. data/sub/{avm-tools/sub/avm-eac_rails_base0 → avm-eac_rails_base0}/lib/avm/eac_rails_base0/version.rb +1 -1
  16. data/sub/{avm-tools/sub/avm-eac_rails_base0 → avm-eac_rails_base0}/lib/avm/eac_rails_base0.rb +0 -0
  17. data/sub/{avm-tools/sub/avm-eac_rails_base0 → avm-eac_rails_base0}/spec/lib/avm/eac_rails_base0/apache_host_spec.rb +0 -0
  18. data/sub/{avm-tools/sub/avm-eac_rails_base0 → avm-eac_rails_base0}/spec/lib/avm/eac_rails_base0/apache_host_spec_files/apache_host_spec_no_ssl_content.conf +0 -0
  19. data/sub/{avm-tools/sub/avm-eac_rails_base0 → avm-eac_rails_base0}/spec/lib/avm/eac_rails_base0/apache_path_spec.rb +0 -0
  20. data/sub/{avm-tools/sub/avm-eac_rails_base0 → avm-eac_rails_base0}/spec/lib/avm/eac_rails_base0/apache_path_spec_files/stub-app_0_apache_path.conf +0 -0
  21. data/sub/{avm-tools/sub/avm-eac_rails_base0 → avm-eac_rails_base0}/spec/rubocop_spec.rb +0 -0
  22. data/sub/{avm-tools/sub/avm-eac_rails_base0 → avm-eac_rails_base0}/spec/spec_helper.rb +0 -0
  23. data/sub/{avm-tools/sub/avm-eac_rails_base0 → avm-eac_rails_base0}/template/avm/eac_rails_base0/apache_path/extra_content.conf +0 -0
  24. data/sub/{avm-tools/sub/avm-eac_rails_base0 → avm-eac_rails_base0}/template/avm/eac_rails_base0/deploy/config/database.yml.template +0 -0
  25. data/sub/{avm-tools/sub/avm-eac_rails_base0 → avm-eac_rails_base0}/template/avm/eac_rails_base0/deploy/config/envvars.d/email.yml.template +0 -0
  26. data/sub/avm-eac_rails_base1/Gemfile +3 -0
  27. data/sub/avm-eac_rails_base1/avm-eac_rails_base1.gemspec +2 -2
  28. data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/sources/base.rb +16 -0
  29. data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/version.rb +1 -1
  30. data/sub/avm-eac_redmine_base0/Gemfile +3 -0
  31. data/sub/avm-eac_redmine_base0/avm-eac_redmine_base0.gemspec +6 -6
  32. data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/sources/base.rb +8 -0
  33. data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/version.rb +1 -1
  34. data/sub/avm-eac_redmine_plugin_base0/avm-eac_redmine_plugin_base0.gemspec +1 -1
  35. data/sub/avm-eac_redmine_plugin_base0/lib/avm/eac_redmine_plugin_base0/sources/base.rb +29 -2
  36. data/sub/avm-eac_redmine_plugin_base0/lib/avm/eac_redmine_plugin_base0/version.rb +1 -1
  37. data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base.rb +18 -4
  38. data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/version.rb +1 -1
  39. data/sub/avm-tools/Gemfile.lock +24 -28
  40. data/sub/avm-tools/lib/avm/tools/version.rb +1 -1
  41. metadata +46 -38
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 9f62da51457512bc25b5321faa19507d05bd3fa231950ef6cfcbf39f70809f39
4
- data.tar.gz: 641dc2b412c60738c9d5acb21d217cdcb5459430501c63498114d0336a6b7465
3
+ metadata.gz: d2a2823e5a682fec9ab91720f10d7783faa49fa2015806b7a5d39580bc218001
4
+ data.tar.gz: f5fd98b06fe0fa9d9e31e55d9c9f5ca31f7efef2e78a80cd9a6c4157ed1a06ee
5
5
  SHA512:
6
- metadata.gz: a5a9048310a062489b32ecf8578dfdfad82a3d8ee9d7da42fdd1ea368d1c31d218828ff62641ce5b755a944f4310e268d85bff1f2adacf6c932bdbe47f1ae3ac
7
- data.tar.gz: 82da69b9433611450a88634316e05e162d3af4fccb9da97b51747fe42fcfd535f2462111ab9152e56ffd07d04c55381b0297cfefce1b0f6b0249c4405a45d1ff
6
+ metadata.gz: e8c12e5907f1977602dbaedc5d6bd278d2ff4f34090ca74ce9b5b3bd2ec38e55936412e1cf161c43594d760d940f24f1fcfa90b4a80e871077797c8906241cee
7
+ data.tar.gz: c92d636d848558c31f0b51213e464573a30a70de11ccda7853f0e70f96d8e9853ba9d5298142a939926b65f9f5fe33c906a4fbf22d66dbaca0a2c9fa0dcc13b9
data/Gemfile.lock CHANGED
@@ -1,12 +1,13 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- eac_tools (0.4.0)
4
+ eac_tools (0.7.0)
5
5
  avm-eac_generic_base0 (~> 0.3)
6
- avm-eac_rails_base1 (~> 0.3, >= 0.3.1)
7
- avm-eac_redmine_base0 (~> 0.8)
8
- avm-eac_redmine_plugin_base0 (~> 0.1, >= 0.1.1)
9
- avm-eac_ruby_base1 (~> 0.9)
6
+ avm-eac_rails_base0 (~> 0.5)
7
+ avm-eac_rails_base1 (~> 0.4, >= 0.4.1)
8
+ avm-eac_redmine_base0 (~> 0.9)
9
+ avm-eac_redmine_plugin_base0 (~> 0.2)
10
+ avm-eac_ruby_base1 (~> 0.10)
10
11
  avm-tools (~> 0.121)
11
12
  eac_ruby_utils (~> 0.95, >= 0.95.2)
12
13
 
@@ -17,36 +18,43 @@ PATH
17
18
  avm (~> 0.24)
18
19
  eac_ruby_utils (~> 0.05, >= 0.95.2)
19
20
 
21
+ PATH
22
+ remote: sub/avm-eac_rails_base0
23
+ specs:
24
+ avm-eac_rails_base0 (0.5.0)
25
+ avm-eac_rails_base1 (~> 0.3)
26
+ eac_ruby_utils (~> 0.80, >= 0.80.2)
27
+
20
28
  PATH
21
29
  remote: sub/avm-eac_rails_base1
22
30
  specs:
23
- avm-eac_rails_base1 (0.3.2)
24
- avm-eac_ruby_base1 (~> 0.8)
31
+ avm-eac_rails_base1 (0.4.1)
32
+ avm-eac_ruby_base1 (~> 0.9, >= 0.9.1)
25
33
  avm-eac_webapp_base0 (~> 0.3)
26
- eac_ruby_utils (~> 0.95, >= 0.95.1)
34
+ eac_ruby_utils (~> 0.95, >= 0.95.2)
27
35
 
28
36
  PATH
29
37
  remote: sub/avm-eac_redmine_base0
30
38
  specs:
31
- avm-eac_redmine_base0 (0.8.0)
32
- avm-eac_rails_base1 (~> 0.3)
33
- avm-eac_ubuntu_base0 (~> 0.2)
34
- curb (~> 0.9.10)
35
- eac_fs (~> 0.4)
36
- eac_rest (~> 0.4)
37
- eac_ruby_utils (~> 0.68)
39
+ avm-eac_redmine_base0 (0.9.0)
40
+ avm-eac_rails_base1 (~> 0.4, >= 0.4.1)
41
+ avm-eac_ubuntu_base0 (~> 0.3)
42
+ curb (~> 0.9.11)
43
+ eac_fs (~> 0.12, >= 0.12.2)
44
+ eac_rest (~> 0.6, >= 0.6.1)
45
+ eac_ruby_utils (~> 0.95, >= 0.95.2)
38
46
 
39
47
  PATH
40
48
  remote: sub/avm-eac_redmine_plugin_base0
41
49
  specs:
42
- avm-eac_redmine_plugin_base0 (0.1.1)
43
- avm-eac_ruby_base1 (~> 0.8, >= 0.8.1)
50
+ avm-eac_redmine_plugin_base0 (0.2.0)
51
+ avm-eac_ruby_base1 (~> 0.10)
44
52
  eac_ruby_utils (~> 0.95, >= 0.95.1)
45
53
 
46
54
  PATH
47
55
  remote: sub/avm-eac_ruby_base1
48
56
  specs:
49
- avm-eac_ruby_base1 (0.9.0)
57
+ avm-eac_ruby_base1 (0.10.0)
50
58
  avm (~> 0.23)
51
59
  avm-eac_generic_base0 (~> 0.2)
52
60
  eac_ruby_utils (~> 0.95, >= 0.95.1)
@@ -54,7 +62,7 @@ PATH
54
62
  PATH
55
63
  remote: sub/avm-tools
56
64
  specs:
57
- avm-tools (0.121.1)
65
+ avm-tools (0.121.2)
58
66
  aranha-parsers (~> 0.4)
59
67
  avm (~> 0.22)
60
68
  avm-eac_asciidoctor_base0 (~> 0.3, >= 0.3.4)
@@ -73,7 +81,7 @@ PATH
73
81
  PATH
74
82
  remote: sub/avm
75
83
  specs:
76
- avm (0.24.0)
84
+ avm (0.25.0)
77
85
  eac_cli (~> 0.27, >= 0.27.6)
78
86
  eac_docker (~> 0.3)
79
87
  eac_git (~> 0.6)
@@ -149,9 +157,6 @@ GEM
149
157
  avm-eac_postgresql_base0 (0.2.0)
150
158
  avm (~> 0.12, >= 0.12.1)
151
159
  eac_ruby_utils (~> 0.82)
152
- avm-eac_rails_base0 (0.4.1)
153
- avm-eac_rails_base1 (~> 0.3)
154
- eac_ruby_utils (~> 0.80, >= 0.80.2)
155
160
  avm-eac_ubuntu_base0 (0.3.0)
156
161
  avm (~> 0.7)
157
162
  eac_ruby_utils (~> 0.77, >= 0.77.1)
@@ -296,6 +301,7 @@ PLATFORMS
296
301
  DEPENDENCIES
297
302
  avm!
298
303
  avm-eac_generic_base0!
304
+ avm-eac_rails_base0!
299
305
  avm-eac_rails_base1!
300
306
  avm-eac_redmine_base0!
301
307
  avm-eac_redmine_plugin_base0!
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module EacTools
4
- VERSION = '0.4.0'
4
+ VERSION = '0.7.0'
5
5
  end
@@ -8,6 +8,8 @@ module Avm
8
8
  module Sources
9
9
  module Tests
10
10
  class Builder
11
+ NO_TEST_TEST_NAME = 'no_test'
12
+
11
13
  require_sub __FILE__
12
14
  enable_immutable
13
15
 
@@ -44,9 +46,18 @@ module Avm
44
46
  create_units(main_source.subs)
45
47
  end
46
48
 
49
+ # @return [Avm::Sources::Tests::Single]
50
+ def create_source_no_test_unit(source)
51
+ ::Avm::Sources::Tests::Single.new(self, source, NO_TEST_TEST_NAME,
52
+ source.env.command('true'))
53
+ end
54
+
47
55
  # @return [Array<Avm::Sources::Tests::Single>]
48
56
  def create_source_units(source)
49
- source.test_commands.map do |test_name, test_command|
57
+ tests = source.test_commands
58
+ return create_source_no_test_unit(source) unless tests.any?
59
+
60
+ tests.map do |test_name, test_command|
50
61
  ::Avm::Sources::Tests::Single.new(self, source, test_name, test_command)
51
62
  end
52
63
  end
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Avm
4
- VERSION = '0.24.0'
4
+ VERSION = '0.25.0'
5
5
  end
@@ -8,18 +8,31 @@ module Avm
8
8
  module Sources
9
9
  class Base < ::Avm::EacRailsBase1::Sources::Base
10
10
  CONFIG_RU_SUBPATH = 'config.ru'
11
+ EAC_RAILS_BASE0_GEMNAME = 'eac_rails_base0'
12
+ EAC_RAILS_BASE0_TEST_NAME = 'eac_rails_base0'
13
+ EAC_RAILS_BASE0_TEST_RAKE_TASK_NAME = 'eac_rails_base0:test'
11
14
  SUBS_INCLUDE_PATHS_DEFAULT = ['sub/*/*'].freeze
12
15
 
13
16
  def config_ru_path
14
17
  path.join(CONFIG_RU_SUBPATH)
15
18
  end
16
19
 
20
+ def default_test_commands
21
+ {
22
+ EAC_RAILS_BASE0_TEST_NAME => eac_rails_base0_test_command
23
+ }
24
+ end
25
+
26
+ def eac_rails_base0_test_command
27
+ rake_test_command(EAC_RAILS_BASE0_TEST_RAKE_TASK_NAME)
28
+ end
29
+
17
30
  def subs_include_paths_default
18
31
  SUBS_PATHS_DEFAULT
19
32
  end
20
33
 
21
34
  def valid?
22
- super && config_ru_path.exist?
35
+ super && gemfile_lock_gem_version(EAC_RAILS_BASE0_GEMNAME).present?
23
36
  end
24
37
  end
25
38
  end
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacRailsBase0
5
- VERSION = '0.4.1'
5
+ VERSION = '0.5.0'
6
6
  end
7
7
  end
@@ -3,3 +3,6 @@
3
3
  source 'https://rubygems.org'
4
4
 
5
5
  gemspec
6
+
7
+ local_gemfile = ::File.join(::File.dirname(__FILE__), 'Gemfile.local')
8
+ eval_gemfile local_gemfile if ::File.exist?(local_gemfile)
@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
12
12
 
13
13
  s.files = Dir['{lib,template}/**/*']
14
14
 
15
- s.add_dependency 'avm-eac_ruby_base1', '~> 0.8'
15
+ s.add_dependency 'avm-eac_ruby_base1', '~> 0.9', '>= 0.9.1'
16
16
  s.add_dependency 'avm-eac_webapp_base0', '~> 0.3'
17
- s.add_dependency 'eac_ruby_utils', '~> 0.95', '>= 0.95.1'
17
+ s.add_dependency 'eac_ruby_utils', '~> 0.95', '>= 0.95.2'
18
18
 
19
19
  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
20
20
  end
@@ -8,12 +8,28 @@ module Avm
8
8
  module Sources
9
9
  class Base < ::Avm::EacRubyBase1::Sources::Base
10
10
  CONFIG_RU_SUBPATH = 'config.ru'
11
+ EAC_RAILS_BASE1_TEST_NAME = 'eac_rails_base1'
12
+ RAKE_TEST_COMMAND_DEFAULT_TASK_NAME = 'test'
11
13
  SUBS_PATHS_DEFAULT = ['sub/*/*'].freeze
12
14
 
13
15
  def config_ru_path
14
16
  path.join(CONFIG_RU_SUBPATH)
15
17
  end
16
18
 
19
+ def default_test_commands
20
+ {
21
+ EAC_RAILS_BASE1_TEST_NAME => eac_rails_base1_test_command
22
+ }
23
+ end
24
+
25
+ def eac_rails_base1_test_command
26
+ rake_test_command
27
+ end
28
+
29
+ def rake_test_command(task_name = RAKE_TEST_COMMAND_DEFAULT_TASK_NAME)
30
+ rake(task_name).chdir_root.envvar('RAILS_ENV', 'test')
31
+ end
32
+
17
33
  def subs_paths_default
18
34
  SUBS_PATHS_DEFAULT
19
35
  end
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacRailsBase1
5
- VERSION = '0.3.2'
5
+ VERSION = '0.4.1'
6
6
  end
7
7
  end
@@ -3,3 +3,6 @@
3
3
  source 'https://rubygems.org'
4
4
 
5
5
  gemspec
6
+
7
+ local_gemfile = ::File.join(::File.dirname(__FILE__), 'Gemfile.local')
8
+ eval_gemfile local_gemfile if ::File.exist?(local_gemfile)
@@ -12,12 +12,12 @@ Gem::Specification.new do |s|
12
12
 
13
13
  s.files = Dir['{lib,locale,template}/**/*']
14
14
 
15
- s.add_dependency 'avm-eac_rails_base1', '~> 0.3'
16
- s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.2'
17
- s.add_dependency 'curb', '~> 0.9.10'
18
- s.add_dependency 'eac_fs', '~> 0.4'
19
- s.add_dependency 'eac_rest', '~> 0.4'
20
- s.add_dependency 'eac_ruby_utils', '~> 0.68'
15
+ s.add_dependency 'avm-eac_rails_base1', '~> 0.4', '>= 0.4.1'
16
+ s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
17
+ s.add_dependency 'curb', '~> 0.9.11'
18
+ s.add_dependency 'eac_fs', '~> 0.12', '>= 0.12.2'
19
+ s.add_dependency 'eac_rest', '~> 0.6', '>= 0.6.1'
20
+ s.add_dependency 'eac_ruby_utils', '~> 0.95', '>= 0.95.2'
21
21
 
22
22
  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
23
23
  end
@@ -8,9 +8,17 @@ module Avm
8
8
  module EacRedmineBase0
9
9
  module Sources
10
10
  class Base < ::Avm::EacRailsBase1::Sources::Base
11
+ DEFAULT_TEST_COMMANDS = {}.freeze
11
12
  REDMINE_LIB_SUBPATH = 'lib/redmine.rb'
12
13
  SUBS_INCLUDE_PATHS_DEFAULT = ['plugins/*'].freeze
13
14
 
15
+ # Return a empty hash (No tests).
16
+ #
17
+ # @return [Hash<String, EacRubyUtils::Envs::Command].
18
+ def default_test_commands
19
+ DEFAULT_TEST_COMMANDS
20
+ end
21
+
14
22
  def redmine_lib_path
15
23
  path.join(REDMINE_LIB_SUBPATH)
16
24
  end
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacRedmineBase0
5
- VERSION = '0.8.0'
5
+ VERSION = '0.9.0'
6
6
  end
7
7
  end
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
12
12
 
13
13
  s.files = Dir['{lib}/**/*']
14
14
 
15
- s.add_dependency 'avm-eac_ruby_base1', '~> 0.8', '>= 0.8.1'
15
+ s.add_dependency 'avm-eac_ruby_base1', '~> 0.10'
16
16
  s.add_dependency 'eac_ruby_utils', '~> 0.95', '>= 0.95.1'
17
17
 
18
18
  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5', '>= 0.5.1'
@@ -1,13 +1,15 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'avm/eac_rails_base1/sources/base'
3
+ require 'avm/eac_ruby_base1/sources/base'
4
4
  require 'eac_ruby_utils/core_ext'
5
5
 
6
6
  module Avm
7
7
  module EacRedminePluginBase0
8
8
  module Sources
9
- class Base < ::Avm::EacRailsBase1::Sources::Base
9
+ class Base < ::Avm::EacRubyBase1::Sources::Base
10
10
  DEFAULT_GEMFILE_PATH = 'SelfGemfile'
11
+ RUBOCOP_TEST_NAME = 'rubocop'
12
+ PARENT_RAKE_TASK_TEST_NAME = 'parent_rake_task'
11
13
  INIT_SUBPATH = 'init.rb'
12
14
 
13
15
  # @return [String]
@@ -15,11 +17,36 @@ module Avm
15
17
  DEFAULT_GEMFILE_PATH
16
18
  end
17
19
 
20
+ # @return [Hash<String, EacRubyUtils::Envs::Command>]
21
+ def default_test_commands
22
+ {
23
+ PARENT_RAKE_TASK_TEST_NAME => parent_rake_test_command,
24
+ RUBOCOP_TEST_NAME => rubocop_test_command
25
+ }
26
+ end
27
+
18
28
  # @return [String]
19
29
  def init_path
20
30
  path.join(INIT_SUBPATH)
21
31
  end
22
32
 
33
+ # @return [String]
34
+ def parent_rake_test_task_name
35
+ [gem_name, 'test'].map(&:variableize).join(':')
36
+ end
37
+
38
+ # @return [EacRubyUtils::Envs::Command]
39
+ def parent_rake_test_command
40
+ ruby_parent.rake(parent_rake_test_task_name).chdir_root.envvar('RAILS_ENV', 'test')
41
+ end
42
+
43
+ # @return [EacRubyUtils::Envs::Command]
44
+ def rubocop_test_command
45
+ bundle('exec', 'rubocop', '--ignore-parent-exclusion')
46
+ .envvar('RAILS_ENV', 'test')
47
+ .chdir_root
48
+ end
49
+
23
50
  # @return [Boolean]
24
51
  def valid?
25
52
  init_path.exist?
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacRedminePluginBase0
5
- VERSION = '0.1.1'
5
+ VERSION = '0.2.0'
6
6
  end
7
7
  end
@@ -15,10 +15,6 @@ module Avm
15
15
 
16
16
  require_sub __FILE__, include_modules: :prepend
17
17
 
18
- # To-do: dismiss this method at Avm::EacRailsBase1::Instance and remove.
19
- # @return [EacRubyUtils::Envs::BaseEnv]
20
- attr_reader :env
21
-
22
18
  # @return [Hash<String, EacRubyUtils::Envs::Command>]
23
19
  def default_test_commands
24
20
  {
@@ -26,6 +22,12 @@ module Avm
26
22
  }
27
23
  end
28
24
 
25
+ # To-do: dismiss this method at Avm::EacRailsBase1::Instance and remove.
26
+ # @return [EacRubyUtils::Envs::BaseEnv]
27
+ def env
28
+ @env.presence || super
29
+ end
30
+
29
31
  # To-do: dismiss this method at Avm::EacRailsBase1::Instance and remove.
30
32
  # @return [Avm::EacRubyBase1::Sources::Base]
31
33
  def env_set(env)
@@ -34,6 +36,18 @@ module Avm
34
36
  self
35
37
  end
36
38
 
39
+ # @return [Avm::EacRubyBase1::Source::Base]
40
+ def ruby_parent
41
+ a_parent = parent
42
+
43
+ loop do
44
+ raise 'No Ruby parent found' if a_parent.blank?
45
+ return a_parent if a_parent.is_a?(::Avm::EacRubyBase1::Sources::Base)
46
+
47
+ a_parent = a_parent.parent
48
+ end
49
+ end
50
+
37
51
  # @return [EacRubyUtils::Envs::Command]
38
52
  def rspec_test_command
39
53
  bundle('exec', 'rspec', '--fail-fast').chdir_root
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacRubyBase1
5
- VERSION = '0.9.0'
5
+ VERSION = '0.10.0'
6
6
  end
7
7
  end
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- avm-tools (0.121.1)
4
+ avm-tools (0.121.2)
5
5
  aranha-parsers (~> 0.4)
6
6
  avm (~> 0.22)
7
7
  avm-eac_asciidoctor_base0 (~> 0.3, >= 0.3.4)
@@ -34,13 +34,6 @@ PATH
34
34
  avm (~> 0.12, >= 0.12.1)
35
35
  eac_ruby_utils (~> 0.82)
36
36
 
37
- PATH
38
- remote: sub/avm-eac_rails_base0
39
- specs:
40
- avm-eac_rails_base0 (0.4.1)
41
- avm-eac_rails_base1 (~> 0.3)
42
- eac_ruby_utils (~> 0.80, >= 0.80.2)
43
-
44
37
  PATH
45
38
  remote: sub/avm-eac_ubuntu_base0
46
39
  specs:
@@ -103,7 +96,7 @@ PATH
103
96
  GEM
104
97
  remote: https://rubygems.org/
105
98
  specs:
106
- activesupport (6.1.6)
99
+ activesupport (6.1.6.1)
107
100
  concurrent-ruby (~> 1.0, >= 1.0.2)
108
101
  i18n (>= 1.6, < 2)
109
102
  minitest (>= 5.1)
@@ -122,8 +115,8 @@ GEM
122
115
  ofx-parser (~> 1.1.0)
123
116
  asciidoctor (2.0.17)
124
117
  ast (2.4.2)
125
- avm (0.22.0)
126
- eac_cli (~> 0.23, >= 0.23.1)
118
+ avm (0.24.0)
119
+ eac_cli (~> 0.27, >= 0.27.6)
127
120
  eac_docker (~> 0.3)
128
121
  eac_git (~> 0.6)
129
122
  eac_ruby_utils (~> 0.95)
@@ -131,24 +124,27 @@ GEM
131
124
  filesize (~> 0.2)
132
125
  htmlbeautifier (~> 1.3, >= 1.3.1)
133
126
  minitar (~> 0.9)
134
- avm-eac_generic_base0 (0.2.0)
135
- avm (~> 0.19)
136
- eac_ruby_utils (~> 0.80)
137
- avm-eac_rails_base1 (0.3.1)
127
+ avm-eac_generic_base0 (0.3.0)
128
+ avm (~> 0.24)
129
+ eac_ruby_utils (~> 0.05, >= 0.95.2)
130
+ avm-eac_rails_base0 (0.4.1)
131
+ avm-eac_rails_base1 (~> 0.3)
132
+ eac_ruby_utils (~> 0.80, >= 0.80.2)
133
+ avm-eac_rails_base1 (0.3.2)
138
134
  avm-eac_ruby_base1 (~> 0.8)
139
135
  avm-eac_webapp_base0 (~> 0.3)
140
136
  eac_ruby_utils (~> 0.95, >= 0.95.1)
141
- avm-eac_redmine_base0 (0.6.1)
137
+ avm-eac_redmine_base0 (0.8.0)
142
138
  avm-eac_rails_base1 (~> 0.3)
143
139
  avm-eac_ubuntu_base0 (~> 0.2)
144
140
  curb (~> 0.9.10)
145
141
  eac_fs (~> 0.4)
146
142
  eac_rest (~> 0.4)
147
143
  eac_ruby_utils (~> 0.68)
148
- avm-eac_ruby_base1 (0.8.1)
149
- avm (~> 0.22)
144
+ avm-eac_ruby_base1 (0.9.0)
145
+ avm (~> 0.23)
150
146
  avm-eac_generic_base0 (~> 0.2)
151
- eac_ruby_utils (~> 0.80)
147
+ eac_ruby_utils (~> 0.95, >= 0.95.1)
152
148
  avm-eac_webapp_base0 (0.3.0)
153
149
  avm (~> 0.1)
154
150
  avm-eac_generic_base0 (~> 0.1)
@@ -158,15 +154,15 @@ GEM
158
154
  clipboard (1.3.6)
159
155
  colorize (0.8.1)
160
156
  concurrent-ruby (1.1.10)
161
- content-type (0.0.1)
162
- parslet (~> 1.5)
157
+ content-type (0.0.2)
158
+ parslet (~> 2.0)
163
159
  curb (0.9.11)
164
160
  diff-lcs (1.5.0)
165
- eac_cli (0.27.5)
161
+ eac_cli (0.27.6)
166
162
  colorize (~> 0.8.1)
167
163
  eac_config (~> 0.8)
168
164
  eac_ruby_utils (~> 0.95)
169
- eac_fs (0.12.1)
165
+ eac_fs (0.12.2)
170
166
  content-type
171
167
  eac_ruby_utils (~> 0.70)
172
168
  ruby-filemagic
@@ -181,9 +177,10 @@ GEM
181
177
  rubocop (~> 0.80.1)
182
178
  rubocop-rails (~> 2.4.2)
183
179
  rubocop-rspec (~> 1.38.1)
184
- eac_ruby_utils (0.95.1)
180
+ eac_ruby_utils (0.95.2)
185
181
  activesupport (>= 4, < 7)
186
182
  addressable (~> 2.6)
183
+ bundler
187
184
  filesize
188
185
  net-ssh (~> 4.2)
189
186
  faraday (1.10.0)
@@ -219,14 +216,14 @@ GEM
219
216
  rchardet (~> 1.8)
220
217
  hpricot (0.8.6)
221
218
  htmlbeautifier (1.4.2)
222
- i18n (1.10.0)
219
+ i18n (1.12.0)
223
220
  concurrent-ruby (~> 1.0)
224
221
  jaro_winkler (1.5.4)
225
222
  minitar (0.9)
226
223
  minitest (5.16.2)
227
224
  multipart-post (2.2.3)
228
225
  net-ssh (4.2.0)
229
- nokogiri (1.13.6-x86_64-linux)
226
+ nokogiri (1.13.7-x86_64-linux)
230
227
  racc (~> 1.4)
231
228
  ofx-parser (1.1.0)
232
229
  hpricot (>= 0.6)
@@ -235,7 +232,7 @@ GEM
235
232
  parseconfig (1.1.2)
236
233
  parser (3.1.2.0)
237
234
  ast (~> 2.4.1)
238
- parslet (1.8.2)
235
+ parslet (2.0.0)
239
236
  public_suffix (4.0.7)
240
237
  racc (1.6.0)
241
238
  rack (2.2.4)
@@ -284,7 +281,6 @@ PLATFORMS
284
281
  DEPENDENCIES
285
282
  avm-eac_asciidoctor_base0!
286
283
  avm-eac_postgresql_base0!
287
- avm-eac_rails_base0!
288
284
  avm-eac_ubuntu_base0!
289
285
  avm-files!
290
286
  avm-git!
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module Tools
5
- VERSION = '0.121.1'
5
+ VERSION = '0.121.2'
6
6
  end
7
7
  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.4.0
4
+ version: 0.7.0
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: 2022-07-17 00:00:00.000000000 Z
11
+ date: 2022-07-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: avm-eac_generic_base0
@@ -24,74 +24,82 @@ dependencies:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
26
  version: '0.3'
27
+ - !ruby/object:Gem::Dependency
28
+ name: avm-eac_rails_base0
29
+ requirement: !ruby/object:Gem::Requirement
30
+ requirements:
31
+ - - "~>"
32
+ - !ruby/object:Gem::Version
33
+ version: '0.5'
34
+ type: :runtime
35
+ prerelease: false
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - "~>"
39
+ - !ruby/object:Gem::Version
40
+ version: '0.5'
27
41
  - !ruby/object:Gem::Dependency
28
42
  name: avm-eac_rails_base1
29
43
  requirement: !ruby/object:Gem::Requirement
30
44
  requirements:
31
45
  - - "~>"
32
46
  - !ruby/object:Gem::Version
33
- version: '0.3'
47
+ version: '0.4'
34
48
  - - ">="
35
49
  - !ruby/object:Gem::Version
36
- version: 0.3.1
50
+ version: 0.4.1
37
51
  type: :runtime
38
52
  prerelease: false
39
53
  version_requirements: !ruby/object:Gem::Requirement
40
54
  requirements:
41
55
  - - "~>"
42
56
  - !ruby/object:Gem::Version
43
- version: '0.3'
57
+ version: '0.4'
44
58
  - - ">="
45
59
  - !ruby/object:Gem::Version
46
- version: 0.3.1
60
+ version: 0.4.1
47
61
  - !ruby/object:Gem::Dependency
48
62
  name: avm-eac_redmine_base0
49
63
  requirement: !ruby/object:Gem::Requirement
50
64
  requirements:
51
65
  - - "~>"
52
66
  - !ruby/object:Gem::Version
53
- version: '0.8'
67
+ version: '0.9'
54
68
  type: :runtime
55
69
  prerelease: false
56
70
  version_requirements: !ruby/object:Gem::Requirement
57
71
  requirements:
58
72
  - - "~>"
59
73
  - !ruby/object:Gem::Version
60
- version: '0.8'
74
+ version: '0.9'
61
75
  - !ruby/object:Gem::Dependency
62
76
  name: avm-eac_redmine_plugin_base0
63
77
  requirement: !ruby/object:Gem::Requirement
64
78
  requirements:
65
79
  - - "~>"
66
80
  - !ruby/object:Gem::Version
67
- version: '0.1'
68
- - - ">="
69
- - !ruby/object:Gem::Version
70
- version: 0.1.1
81
+ version: '0.2'
71
82
  type: :runtime
72
83
  prerelease: false
73
84
  version_requirements: !ruby/object:Gem::Requirement
74
85
  requirements:
75
86
  - - "~>"
76
87
  - !ruby/object:Gem::Version
77
- version: '0.1'
78
- - - ">="
79
- - !ruby/object:Gem::Version
80
- version: 0.1.1
88
+ version: '0.2'
81
89
  - !ruby/object:Gem::Dependency
82
90
  name: avm-eac_ruby_base1
83
91
  requirement: !ruby/object:Gem::Requirement
84
92
  requirements:
85
93
  - - "~>"
86
94
  - !ruby/object:Gem::Version
87
- version: '0.9'
95
+ version: '0.10'
88
96
  type: :runtime
89
97
  prerelease: false
90
98
  version_requirements: !ruby/object:Gem::Requirement
91
99
  requirements:
92
100
  - - "~>"
93
101
  - !ruby/object:Gem::Version
94
- version: '0.9'
102
+ version: '0.10'
95
103
  - !ruby/object:Gem::Dependency
96
104
  name: avm-tools
97
105
  requirement: !ruby/object:Gem::Requirement
@@ -162,6 +170,26 @@ files:
162
170
  - sub/avm-eac_generic_base0/spec/lib/avm/eac_generic_base0/sources/base_spec.rb
163
171
  - sub/avm-eac_generic_base0/spec/rubocop_spec.rb
164
172
  - sub/avm-eac_generic_base0/spec/spec_helper.rb
173
+ - sub/avm-eac_rails_base0/Gemfile
174
+ - sub/avm-eac_rails_base0/avm-eac_rails_base0.gemspec
175
+ - sub/avm-eac_rails_base0/lib/avm/eac_rails_base0.rb
176
+ - sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/apache_host.rb
177
+ - sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/apache_path.rb
178
+ - sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/deploy.rb
179
+ - sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/instance.rb
180
+ - sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/runners.rb
181
+ - sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/runners/base.rb
182
+ - sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/sources/base.rb
183
+ - sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/version.rb
184
+ - sub/avm-eac_rails_base0/spec/lib/avm/eac_rails_base0/apache_host_spec.rb
185
+ - sub/avm-eac_rails_base0/spec/lib/avm/eac_rails_base0/apache_host_spec_files/apache_host_spec_no_ssl_content.conf
186
+ - sub/avm-eac_rails_base0/spec/lib/avm/eac_rails_base0/apache_path_spec.rb
187
+ - sub/avm-eac_rails_base0/spec/lib/avm/eac_rails_base0/apache_path_spec_files/stub-app_0_apache_path.conf
188
+ - sub/avm-eac_rails_base0/spec/rubocop_spec.rb
189
+ - sub/avm-eac_rails_base0/spec/spec_helper.rb
190
+ - sub/avm-eac_rails_base0/template/avm/eac_rails_base0/apache_path/extra_content.conf
191
+ - sub/avm-eac_rails_base0/template/avm/eac_rails_base0/deploy/config/database.yml.template
192
+ - sub/avm-eac_rails_base0/template/avm/eac_rails_base0/deploy/config/envvars.d/email.yml.template
165
193
  - sub/avm-eac_rails_base1/Gemfile
166
194
  - sub/avm-eac_rails_base1/avm-eac_rails_base1.gemspec
167
195
  - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1.rb
@@ -547,26 +575,6 @@ files:
547
575
  - sub/avm-tools/sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/version.rb
548
576
  - sub/avm-tools/sub/avm-eac_postgresql_base0/spec/rubocop_spec.rb
549
577
  - sub/avm-tools/sub/avm-eac_postgresql_base0/spec/spec_helper.rb
550
- - sub/avm-tools/sub/avm-eac_rails_base0/Gemfile
551
- - sub/avm-tools/sub/avm-eac_rails_base0/avm-eac_rails_base0.gemspec
552
- - sub/avm-tools/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0.rb
553
- - sub/avm-tools/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/apache_host.rb
554
- - sub/avm-tools/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/apache_path.rb
555
- - sub/avm-tools/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/deploy.rb
556
- - sub/avm-tools/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/instance.rb
557
- - sub/avm-tools/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/runners.rb
558
- - sub/avm-tools/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/runners/base.rb
559
- - sub/avm-tools/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/sources/base.rb
560
- - sub/avm-tools/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/version.rb
561
- - sub/avm-tools/sub/avm-eac_rails_base0/spec/lib/avm/eac_rails_base0/apache_host_spec.rb
562
- - sub/avm-tools/sub/avm-eac_rails_base0/spec/lib/avm/eac_rails_base0/apache_host_spec_files/apache_host_spec_no_ssl_content.conf
563
- - sub/avm-tools/sub/avm-eac_rails_base0/spec/lib/avm/eac_rails_base0/apache_path_spec.rb
564
- - sub/avm-tools/sub/avm-eac_rails_base0/spec/lib/avm/eac_rails_base0/apache_path_spec_files/stub-app_0_apache_path.conf
565
- - sub/avm-tools/sub/avm-eac_rails_base0/spec/rubocop_spec.rb
566
- - sub/avm-tools/sub/avm-eac_rails_base0/spec/spec_helper.rb
567
- - sub/avm-tools/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/apache_path/extra_content.conf
568
- - sub/avm-tools/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/deploy/config/database.yml.template
569
- - sub/avm-tools/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/deploy/config/envvars.d/email.yml.template
570
578
  - sub/avm-tools/sub/avm-eac_ubuntu_base0/Gemfile
571
579
  - sub/avm-tools/sub/avm-eac_ubuntu_base0/avm-eac_ubuntu_base0.gemspec
572
580
  - sub/avm-tools/sub/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0.rb