eac_tools 0.22.0 → 0.23.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (53) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +43 -43
  3. data/lib/eac_tools/version.rb +1 -1
  4. data/sub/avm/lib/avm/instances/base.rb +1 -1
  5. data/sub/avm/lib/avm/version.rb +1 -1
  6. data/sub/avm-eac_asciidoctor_base0/avm-eac_asciidoctor_base0.gemspec +5 -5
  7. data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/base.rb +13 -0
  8. data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances.rb +11 -0
  9. data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/version.rb +1 -1
  10. data/sub/avm-eac_latex_base0/avm-eac_latex_base0.gemspec +3 -3
  11. data/sub/avm-eac_latex_base0/lib/avm/eac_latex_base0/instances/base.rb +2 -2
  12. data/sub/avm-eac_latex_base0/lib/avm/eac_latex_base0/version.rb +1 -1
  13. data/sub/avm-eac_rails_base0/avm-eac_rails_base0.gemspec +2 -2
  14. data/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/instances/base.rb +13 -0
  15. data/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/instances.rb +11 -0
  16. data/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/runners/base.rb +1 -1
  17. data/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/version.rb +1 -1
  18. data/sub/avm-eac_rails_base0/spec/lib/avm/eac_rails_base0/apache_host_spec.rb +2 -2
  19. data/sub/avm-eac_rails_base0/spec/lib/avm/eac_rails_base0/apache_path_spec.rb +2 -2
  20. data/sub/avm-eac_rails_base1/avm-eac_rails_base1.gemspec +4 -4
  21. data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/base.rb +27 -0
  22. data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances.rb +11 -0
  23. data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/runner_with/bundle.rb +1 -1
  24. data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/runner_with/rails_environment.rb +2 -2
  25. data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/version.rb +1 -1
  26. data/sub/avm-eac_redmine_base0/avm-eac_redmine_base0.gemspec +6 -6
  27. data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base.rb +48 -4
  28. data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances.rb +11 -0
  29. data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/runners/base.rb +1 -1
  30. data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/runners.rb +11 -0
  31. data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/sources.rb +11 -0
  32. data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/version.rb +1 -1
  33. data/sub/avm-eac_webapp_base0/avm-eac_webapp_base0.gemspec +4 -4
  34. data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/base/subcommand_parent.rb +26 -0
  35. data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/base.rb +61 -0
  36. data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners/data/dump.rb +65 -0
  37. data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners/data/load.rb +57 -0
  38. data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners/data.rb +19 -0
  39. data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners.rb +13 -0
  40. data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/version.rb +1 -1
  41. data/sub/avm-eac_wordpress_base0/avm-eac_wordpress_base0.gemspec +3 -3
  42. data/sub/avm-eac_wordpress_base0/lib/avm/eac_wordpress_base0/instances/base.rb +2 -2
  43. data/sub/avm-eac_wordpress_base0/lib/avm/eac_wordpress_base0/version.rb +1 -1
  44. metadata +31 -43
  45. data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instance.rb +0 -11
  46. data/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/instance.rb +0 -11
  47. data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instance.rb +0 -25
  48. data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instance.rb +0 -57
  49. data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instance/subcommand_parent.rb +0 -24
  50. data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instance.rb +0 -62
  51. data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/runner/data/dump.rb +0 -63
  52. data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/runner/data/load.rb +0 -55
  53. data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/runner/data.rb +0 -17
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 04cbda8d8b53185b46e806e22d26098771f627a4574eb028e9836905e700a27d
4
- data.tar.gz: 7862b02bf94a320aee41d7ef63052b2049484a5f1540392268b41402b4eb6ba4
3
+ metadata.gz: d37f8e08239e5bac225ad919b4805592413d710cf364e354098aedcd2a9ab758
4
+ data.tar.gz: 7f57813fb27c9757cc6c03b016d69a9e777ccec79a875d4b946ee7136642d04b
5
5
  SHA512:
6
- metadata.gz: d51e79b98e8a886236b82b1cafbbe7e3f817cf4dcc18bce329f19d4d5a176a2ae10c78ed5ca871d6de8e79b31244687bccfd0a4fdca71bf88e9e806aa6faab28
7
- data.tar.gz: 42d8f5266e63f7dac0bf2f952bea10d9ad342fd223c1f41ea7984aeb3f37bce37dc5389bd00da9411607badf39bfed74f24b3fac04dd4bd6a3b3b4a2b55c4736
6
+ metadata.gz: a2027d28a82968c9d2e71b7699be1829e16b7752d7a727d018822e0dfc9f7b4bbf4bd24f491070071b30acd2c7bd61717cc0dbe102fec922ead1af734ac42f83
7
+ data.tar.gz: e5343d8c9b7b5b20d46ccf1393b2254babe9d2320739902a910fc86b61c9aa50555f9732485f01d79d52825e31d46a6fed87205f5131157b80af548eb48afc97
data/Gemfile.lock CHANGED
@@ -1,30 +1,30 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- eac_tools (0.22.0)
4
+ eac_tools (0.23.0)
5
5
  avm (~> 0.35, >= 0.35.1)
6
- avm-eac_asciidoctor_base0 (~> 0.4)
6
+ avm-eac_asciidoctor_base0 (~> 0.5)
7
7
  avm-eac_generic_base0 (~> 0.5)
8
- avm-eac_latex_base0 (~> 0.1, >= 0.1.1)
9
- avm-eac_rails_base0 (~> 0.6, >= 0.6.1)
10
- avm-eac_rails_base1 (~> 0.4, >= 0.4.2)
11
- avm-eac_redmine_base0 (~> 0.11)
8
+ avm-eac_latex_base0 (~> 0.1, >= 0.1.2)
9
+ avm-eac_rails_base0 (~> 0.7)
10
+ avm-eac_rails_base1 (~> 0.5)
11
+ avm-eac_redmine_base0 (~> 0.12)
12
12
  avm-eac_redmine_plugin_base0 (~> 0.3)
13
13
  avm-eac_ruby_base1 (~> 0.19)
14
- avm-eac_webapp_base0 (~> 0.3, >= 0.3.1)
15
- avm-eac_wordpress_base0 (~> 0.1, >= 0.1.1)
14
+ avm-eac_webapp_base0 (~> 0.4)
15
+ avm-eac_wordpress_base0 (~> 0.1, >= 0.1.2)
16
16
  avm-tools (~> 0.132, >= 0.132.1)
17
17
  eac_ruby_utils (~> 0.98)
18
18
 
19
19
  PATH
20
20
  remote: sub/avm-eac_asciidoctor_base0
21
21
  specs:
22
- avm-eac_asciidoctor_base0 (0.4.0)
23
- asciidoctor (~> 2.0, >= 2.0.12)
24
- avm-eac_webapp_base0 (~> 0.2)
25
- eac_ruby_utils (~> 0.63)
26
- os
27
- rouge (~> 3.26)
22
+ avm-eac_asciidoctor_base0 (0.5.0)
23
+ asciidoctor (~> 2.0, >= 2.0.17)
24
+ avm-eac_webapp_base0 (~> 0.4)
25
+ eac_ruby_utils (~> 0.98)
26
+ os (~> 1.1, >= 1.1.4)
27
+ rouge (~> 3.30)
28
28
 
29
29
  PATH
30
30
  remote: sub/avm-eac_generic_base0
@@ -36,39 +36,39 @@ PATH
36
36
  PATH
37
37
  remote: sub/avm-eac_latex_base0
38
38
  specs:
39
- avm-eac_latex_base0 (0.1.1)
40
- avm (~> 0.34)
41
- avm-eac_webapp_base0 (~> 0.3, >= 0.3.1)
42
- eac_ruby_utils (~> 0.97)
39
+ avm-eac_latex_base0 (0.1.2)
40
+ avm (~> 0.35, >= 0.35.1)
41
+ avm-eac_webapp_base0 (~> 0.4)
42
+ eac_ruby_utils (~> 0.98)
43
43
 
44
44
  PATH
45
45
  remote: sub/avm-eac_rails_base0
46
46
  specs:
47
- avm-eac_rails_base0 (0.6.1)
48
- avm-eac_rails_base1 (~> 0.4, >= 0.4.2)
49
- eac_ruby_utils (~> 0.97)
47
+ avm-eac_rails_base0 (0.7.0)
48
+ avm-eac_rails_base1 (~> 0.5)
49
+ eac_ruby_utils (~> 0.98)
50
50
 
51
51
  PATH
52
52
  remote: sub/avm-eac_rails_base1
53
53
  specs:
54
- avm-eac_rails_base1 (0.4.2)
55
- avm (~> 0.31)
56
- avm-eac_ruby_base1 (~> 0.11)
57
- avm-eac_webapp_base0 (~> 0.3)
58
- eac_ruby_utils (~> 0.97)
54
+ avm-eac_rails_base1 (0.5.0)
55
+ avm (~> 0.35, >= 0.35.1)
56
+ avm-eac_ruby_base1 (~> 0.19)
57
+ avm-eac_webapp_base0 (~> 0.4)
58
+ eac_ruby_utils (~> 0.98)
59
59
 
60
60
  PATH
61
61
  remote: sub/avm-eac_redmine_base0
62
62
  specs:
63
- avm-eac_redmine_base0 (0.11.0)
64
- avm (~> 0.29)
65
- avm-eac_generic_base0 (~> 0.4)
66
- avm-eac_rails_base1 (~> 0.4, >= 0.4.1)
63
+ avm-eac_redmine_base0 (0.12.0)
64
+ avm (~> 0.35, >= 0.35.1)
65
+ avm-eac_generic_base0 (~> 0.5)
66
+ avm-eac_rails_base1 (~> 0.5)
67
67
  avm-eac_ubuntu_base0 (~> 0.3)
68
- curb (~> 0.9.11)
69
- eac_fs (~> 0.12, >= 0.12.2)
68
+ curb (~> 0.9, >= 0.9.11)
69
+ eac_fs (~> 0.12, >= 0.12.3)
70
70
  eac_rest (~> 0.6, >= 0.6.1)
71
- eac_ruby_utils (~> 0.95, >= 0.95.2)
71
+ eac_ruby_utils (~> 0.98)
72
72
 
73
73
  PATH
74
74
  remote: sub/avm-eac_redmine_plugin_base0
@@ -88,20 +88,20 @@ PATH
88
88
  PATH
89
89
  remote: sub/avm-eac_webapp_base0
90
90
  specs:
91
- avm-eac_webapp_base0 (0.3.1)
92
- avm (~> 0.1)
93
- avm-eac_generic_base0 (~> 0.1)
94
- avm-eac_postgresql_base0 (~> 0.1)
91
+ avm-eac_webapp_base0 (0.4.0)
92
+ avm (~> 0.35, >= 0.35.1)
93
+ avm-eac_generic_base0 (~> 0.5)
94
+ avm-eac_postgresql_base0 (~> 0.2)
95
95
  avm-eac_ubuntu_base0 (~> 0.3)
96
- eac_ruby_utils (~> 0.68)
96
+ eac_ruby_utils (~> 0.98)
97
97
 
98
98
  PATH
99
99
  remote: sub/avm-eac_wordpress_base0
100
100
  specs:
101
- avm-eac_wordpress_base0 (0.1.1)
102
- avm (~> 0.35)
103
- avm-eac_webapp_base0 (~> 0.3, >= 0.3.1)
104
- eac_ruby_utils (~> 0.97)
101
+ avm-eac_wordpress_base0 (0.1.2)
102
+ avm (~> 0.35, >= 0.35.1)
103
+ avm-eac_webapp_base0 (~> 0.4)
104
+ eac_ruby_utils (~> 0.98)
105
105
 
106
106
  PATH
107
107
  remote: sub/avm-tools
@@ -124,7 +124,7 @@ PATH
124
124
  PATH
125
125
  remote: sub/avm
126
126
  specs:
127
- avm (0.35.1)
127
+ avm (0.36.0)
128
128
  eac_cli (~> 0.27, >= 0.27.8)
129
129
  eac_config (~> 0.10)
130
130
  eac_docker (~> 0.4, >= 0.4.2)
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module EacTools
4
- VERSION = '0.22.0'
4
+ VERSION = '0.23.0'
5
5
  end
@@ -53,7 +53,7 @@ module Avm
53
53
  def host_env_uncached
54
54
  install_uri = entry(::Avm::Instances::EntryKeys::INSTALL_URL).value.to_uri
55
55
  case install_uri.scheme
56
- when 'local' then ::EacRubyUtils::Envs.local
56
+ when 'file' then ::EacRubyUtils::Envs.local
57
57
  when 'ssh' then ::EacRubyUtils::Envs.ssh(install_uri)
58
58
  else raise("Unmapped access value: \"#{install_uri}\"")
59
59
  end
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Avm
4
- VERSION = '0.35.1'
4
+ VERSION = '0.36.0'
5
5
  end
@@ -12,11 +12,11 @@ Gem::Specification.new do |s|
12
12
 
13
13
  s.files = Dir['{lib,template}/**/*']
14
14
 
15
- s.add_dependency 'asciidoctor', '~> 2.0', '>= 2.0.12'
16
- s.add_dependency 'avm-eac_webapp_base0', '~> 0.2'
17
- s.add_dependency 'eac_ruby_utils', '~> 0.63'
18
- s.add_dependency 'os'
19
- s.add_dependency 'rouge', '~> 3.26'
15
+ s.add_dependency 'asciidoctor', '~> 2.0', '>= 2.0.17'
16
+ s.add_dependency 'avm-eac_webapp_base0', '~> 0.4'
17
+ s.add_dependency 'eac_ruby_utils', '~> 0.98'
18
+ s.add_dependency 'os', '~> 1.1', '>= 1.1.4'
19
+ s.add_dependency 'rouge', '~> 3.30'
20
20
 
21
21
  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
22
22
  end
@@ -0,0 +1,13 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'avm/eac_webapp_base0/instances/base'
4
+
5
+ module Avm
6
+ module EacAsciidoctorBase0
7
+ module Instances
8
+ class Base < ::Avm::EacWebappBase0::Instances::Base
9
+ FILES_UNITS = {}.freeze
10
+ end
11
+ end
12
+ end
13
+ end
@@ -0,0 +1,11 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+
5
+ module Avm
6
+ module EacAsciidoctorBase0
7
+ module Instances
8
+ require_sub __FILE__
9
+ end
10
+ end
11
+ end
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacAsciidoctorBase0
5
- VERSION = '0.4.0'
5
+ VERSION = '0.5.0'
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 'avm', '~> 0.34'
16
- s.add_dependency 'avm-eac_webapp_base0', '~> 0.3', '>= 0.3.1'
17
- s.add_dependency 'eac_ruby_utils', '~> 0.97'
15
+ s.add_dependency 'avm', '~> 0.35', '>= 0.35.1'
16
+ s.add_dependency 'avm-eac_webapp_base0', '~> 0.4'
17
+ s.add_dependency 'eac_ruby_utils', '~> 0.98'
18
18
 
19
19
  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5', '>= 0.5.1'
20
20
  end
@@ -1,11 +1,11 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'avm/eac_webapp_base0/instance'
3
+ require 'avm/eac_webapp_base0/instances/base'
4
4
 
5
5
  module Avm
6
6
  module EacLatexBase0
7
7
  module Instances
8
- class Base < ::Avm::EacWebappBase0::Instance
8
+ class Base < ::Avm::EacWebappBase0::Instances::Base
9
9
  FILES_UNITS = {}.freeze
10
10
  end
11
11
  end
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacLatexBase0
5
- VERSION = '0.1.1'
5
+ VERSION = '0.1.2'
6
6
  end
7
7
  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.4', '>= 0.4.2'
16
- s.add_dependency 'eac_ruby_utils', '~> 0.97'
15
+ s.add_dependency 'avm-eac_rails_base1', '~> 0.5'
16
+ s.add_dependency 'eac_ruby_utils', '~> 0.98'
17
17
 
18
18
  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
19
19
  end
@@ -0,0 +1,13 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'avm/eac_rails_base1/instances/base'
4
+
5
+ module Avm
6
+ module EacRailsBase0
7
+ module Instances
8
+ class Base < ::Avm::EacRailsBase1::Instances::Base
9
+ FILES_UNITS = { uploads: 'public/uploads' }.freeze
10
+ end
11
+ end
12
+ end
13
+ end
@@ -0,0 +1,11 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+
5
+ module Avm
6
+ module EacRailsBase0
7
+ module Instances
8
+ require_sub __FILE__
9
+ end
10
+ end
11
+ end
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'avm/eac_rails_base0/instance'
3
+ require 'avm/eac_rails_base0/instances/base'
4
4
  require 'avm/eac_rails_base0/deploy'
5
5
  require 'avm/eac_rails_base0/apache_host'
6
6
  require 'avm/eac_rails_base0/apache_path'
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacRailsBase0
5
- VERSION = '0.6.1'
5
+ VERSION = '0.7.0'
6
6
  end
7
7
  end
@@ -1,11 +1,11 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require 'avm/eac_rails_base0/apache_host'
4
- require 'avm/eac_rails_base0/instance'
4
+ require 'avm/eac_rails_base0/instances/base'
5
5
 
6
6
  RSpec.describe ::Avm::EacRailsBase0::ApacheHost do
7
7
  describe '#no_ssl_site_content' do
8
- let(:instance) { ::Avm::EacRailsBase0::Instance.by_id('stub-app_0') }
8
+ let(:instance) { ::Avm::EacRailsBase0::Instances::Base.by_id('stub-app_0') }
9
9
  let(:apache_host) { described_class.new(instance) }
10
10
  let(:fixtures_dir) { ::Pathname.new('apache_host_spec_files').expand_path(__dir__) }
11
11
  let(:expected_content) { fixtures_dir.join('apache_host_spec_no_ssl_content.conf').read }
@@ -1,11 +1,11 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require 'avm/eac_rails_base0/apache_path'
4
- require 'avm/eac_rails_base0/instance'
4
+ require 'avm/eac_rails_base0/instances/base'
5
5
 
6
6
  RSpec.describe ::Avm::EacRailsBase0::ApachePath do
7
7
  describe '#no_ssl_site_content' do
8
- let(:instance) { ::Avm::EacRailsBase0::Instance.by_id('stub-app_0') }
8
+ let(:instance) { ::Avm::EacRailsBase0::Instances::Base.by_id('stub-app_0') }
9
9
  let(:apache_path) { described_class.new(instance) }
10
10
  let(:fixtures_dir) { ::Pathname.new('apache_path_spec_files').expand_path(__dir__) }
11
11
  let(:expect_file) { fixtures_dir.join('stub-app_0_apache_path.conf') }
@@ -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.31'
16
- s.add_dependency 'avm-eac_ruby_base1', '~> 0.11'
17
- s.add_dependency 'avm-eac_webapp_base0', '~> 0.3'
18
- s.add_dependency 'eac_ruby_utils', '~> 0.97'
15
+ s.add_dependency 'avm', '~> 0.35', '>= 0.35.1'
16
+ s.add_dependency 'avm-eac_ruby_base1', '~> 0.19'
17
+ s.add_dependency 'avm-eac_webapp_base0', '~> 0.4'
18
+ s.add_dependency 'eac_ruby_utils', '~> 0.98'
19
19
 
20
20
  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
21
21
  end
@@ -0,0 +1,27 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'avm/eac_ruby_base1/sources/base'
4
+ require 'avm/eac_webapp_base0/instances/base'
5
+
6
+ module Avm
7
+ module EacRailsBase1
8
+ module Instances
9
+ class Base < ::Avm::EacWebappBase0::Instances::Base
10
+ DEFAULT_RAILS_ENVIRONMENT = 'production'
11
+
12
+ def bundle(*args)
13
+ the_gem.bundle(*args).chdir_root.envvar('RAILS_ENV', DEFAULT_RAILS_ENVIRONMENT)
14
+ end
15
+
16
+ def rake(*args)
17
+ bundle('exec', 'rake', *args)
18
+ end
19
+
20
+ def the_gem
21
+ @the_gem ||= ::Avm::EacRubyBase1::Sources::Base.new(::File.join(read_entry('fs_path')))
22
+ .env_set(host_env)
23
+ end
24
+ end
25
+ end
26
+ end
27
+ end
@@ -0,0 +1,11 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+
5
+ module Avm
6
+ module EacRailsBase1
7
+ module Instances
8
+ require_sub __FILE__
9
+ end
10
+ end
11
+ end
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'avm/eac_rails_base1/instance'
3
+ require 'avm/eac_rails_base1/instances/base'
4
4
  require 'avm/eac_rails_base1/runner_with/rails_environment'
5
5
  require 'eac_cli/runner'
6
6
 
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'avm/eac_rails_base1/instance'
3
+ require 'avm/eac_rails_base1/instances/base'
4
4
  require 'eac_cli/runner'
5
5
 
6
6
  module Avm
@@ -22,7 +22,7 @@ module Avm
22
22
  def default_rails_environment
23
23
  const_get(DEFAULT_RAILS_ENVIRONMENT_CONSTANT)
24
24
  rescue ::NameError
25
- ::Avm::EacRailsBase1::Instance::DEFAULT_RAILS_ENVIRONMENT
25
+ ::Avm::EacRailsBase1::Instances::Base::DEFAULT_RAILS_ENVIRONMENT
26
26
  end
27
27
  end
28
28
 
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacRailsBase1
5
- VERSION = '0.4.2'
5
+ VERSION = '0.5.0'
6
6
  end
7
7
  end
@@ -12,14 +12,14 @@ Gem::Specification.new do |s|
12
12
 
13
13
  s.files = Dir['{lib,locale,template}/**/*']
14
14
 
15
- s.add_dependency 'avm', '~> 0.29'
16
- s.add_dependency 'avm-eac_generic_base0', '~> 0.4'
17
- s.add_dependency 'avm-eac_rails_base1', '~> 0.4', '>= 0.4.1'
15
+ s.add_dependency 'avm', '~> 0.35', '>= 0.35.1'
16
+ s.add_dependency 'avm-eac_generic_base0', '~> 0.5'
17
+ s.add_dependency 'avm-eac_rails_base1', '~> 0.5'
18
18
  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
19
- s.add_dependency 'curb', '~> 0.9.11'
20
- s.add_dependency 'eac_fs', '~> 0.12', '>= 0.12.2'
19
+ s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
20
+ s.add_dependency 'eac_fs', '~> 0.12', '>= 0.12.3'
21
21
  s.add_dependency 'eac_rest', '~> 0.6', '>= 0.6.1'
22
- s.add_dependency 'eac_ruby_utils', '~> 0.95', '>= 0.95.2'
22
+ s.add_dependency 'eac_ruby_utils', '~> 0.98'
23
23
 
24
24
  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
25
25
  end
@@ -1,13 +1,57 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'avm/instances/base'
4
- require 'avm/eac_redmine_base0/instances/runners'
5
- require 'eac_ruby_utils/core_ext'
3
+ require 'addressable/uri'
4
+ require 'avm/eac_redmine_base0/data_unit'
5
+ require 'avm/eac_redmine_base0/instances/docker_image'
6
+ require 'avm/eac_redmine_base0/rest_api'
7
+ require 'avm/eac_rails_base1/instances/base'
6
8
 
7
9
  module Avm
8
10
  module EacRedmineBase0
9
11
  module Instances
10
- class Base < ::Avm::Instances::Base
12
+ class Base < ::Avm::EacRailsBase1::Instances::Base
13
+ enable_simple_cache
14
+
15
+ FILES_UNITS = { files: 'files' }.freeze
16
+
17
+ def docker_image_class
18
+ ::Avm::EacRedmineBase0::Instances::DockerImage
19
+ end
20
+
21
+ def docker_run_arguments
22
+ [
23
+ '--volume',
24
+ "#{read_entry(::Avm::Instances::EntryKeys::FS_PATH)}:/home/myuser/eac_redmine_base0",
25
+ '--publish', "#{read_entry(:ssh_port)}:22",
26
+ '--publish', "#{read_entry(:http_port)}:80",
27
+ '--publish', "#{read_entry(:https_port)}:443"
28
+ ]
29
+ end
30
+
31
+ def data_package
32
+ @data_package ||= ::Avm::Data::Instance::Package.new(
33
+ self,
34
+ units: {
35
+ all: ::Avm::EacRedmineBase0::DataUnit.new(self)
36
+ }
37
+ )
38
+ end
39
+
40
+ # @return [Addressable::URI]
41
+ def root_url
42
+ r = ::Addressable::URI.parse(read_entry(::Avm::Instances::EntryKeys::WEB_URL))
43
+ r.query_values = nil
44
+ r
45
+ end
46
+
47
+ private
48
+
49
+ # @return [Avm::EacRedmineBase0::RestApi]
50
+ def rest_api_uncached
51
+ url = root_url
52
+ url.query_values = { key: read_entry('api.key') }
53
+ ::Avm::EacRedmineBase0::RestApi.new(url)
54
+ end
11
55
  end
12
56
  end
13
57
  end
@@ -0,0 +1,11 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+
5
+ module Avm
6
+ module EacRedmineBase0
7
+ module Instances
8
+ require_sub __FILE__
9
+ end
10
+ end
11
+ end
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'avm/eac_redmine_base0/instance'
3
+ require 'avm/eac_redmine_base0/instances/base'
4
4
  require 'avm/eac_redmine_base0/deploy'
5
5
  require 'avm/eac_redmine_base0/apache_host'
6
6
  require 'avm/eac_rails_base1/runner'
@@ -0,0 +1,11 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+
5
+ module Avm
6
+ module EacRedmineBase0
7
+ module Runners
8
+ require_sub __FILE__
9
+ end
10
+ end
11
+ end
@@ -0,0 +1,11 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+
5
+ module Avm
6
+ module EacRedmineBase0
7
+ module Sources
8
+ require_sub __FILE__
9
+ end
10
+ end
11
+ end
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacRedmineBase0
5
- VERSION = '0.11.0'
5
+ VERSION = '0.12.0'
6
6
  end
7
7
  end
@@ -12,11 +12,11 @@ Gem::Specification.new do |s|
12
12
 
13
13
  s.files = Dir['{lib,template}/**/*']
14
14
 
15
- s.add_dependency 'avm', '~> 0.1'
16
- s.add_dependency 'avm-eac_generic_base0', '~> 0.1'
17
- s.add_dependency 'avm-eac_postgresql_base0', '~> 0.1'
15
+ s.add_dependency 'avm', '~> 0.35', '>= 0.35.1'
16
+ s.add_dependency 'avm-eac_generic_base0', '~> 0.5'
17
+ s.add_dependency 'avm-eac_postgresql_base0', '~> 0.2'
18
18
  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
19
- s.add_dependency 'eac_ruby_utils', '~> 0.68'
19
+ s.add_dependency 'eac_ruby_utils', '~> 0.98'
20
20
 
21
21
  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
22
22
  end
@@ -0,0 +1,26 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+
5
+ module Avm
6
+ module EacWebappBase0
7
+ module Instances
8
+ class Base < ::Avm::Instances::Base
9
+ class SubcommandParent
10
+ enable_simple_cache
11
+ common_constructor :instance
12
+
13
+ private
14
+
15
+ def runner_context_uncached
16
+ ::EacCli::Runner::Context.new(self, argv: runner_argv)
17
+ end
18
+
19
+ def runner_argv
20
+ [instance.class.name.split('::')[-2].dasherize, instance.id]
21
+ end
22
+ end
23
+ end
24
+ end
25
+ end
26
+ end