avm-tools 0.99.0 → 0.102.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (198) hide show
  1. checksums.yaml +4 -4
  2. data/lib/avm/app_src.rb +12 -11
  3. data/lib/avm/docker/image.rb +7 -23
  4. data/lib/avm/docker/registry.rb +2 -11
  5. data/lib/avm/docker/runner.rb +32 -6
  6. data/lib/avm/eac_rails_base1/runner/bundle.rb +1 -2
  7. data/lib/avm/eac_redmine_base0/docker_image.rb +52 -0
  8. data/lib/avm/eac_redmine_base0/instance.rb +2 -2
  9. data/lib/avm/eac_webapp_base0/deploy.rb +1 -1
  10. data/lib/avm/eac_webapp_base0/deploy/git_info.rb +1 -1
  11. data/lib/avm/git/auto_commit/rules/manual.rb +1 -1
  12. data/lib/avm/git/commit/file.rb +1 -1
  13. data/lib/avm/git/issue/complete.rb +3 -3
  14. data/lib/avm/git/revision_test.rb +9 -6
  15. data/lib/avm/git/subrepo_check.rb +1 -1
  16. data/lib/avm/git/subrepo_check/show_result.rb +1 -1
  17. data/lib/avm/git/subrepo_checks.rb +1 -1
  18. data/lib/avm/instances/base/dockerizable.rb +1 -0
  19. data/lib/avm/instances/base/entry_keys.rb +6 -1
  20. data/lib/avm/instances/docker_image.rb +15 -0
  21. data/lib/avm/instances/entries.rb +0 -1
  22. data/lib/avm/instances/entry.rb +3 -2
  23. data/lib/avm/instances/entry_keys.rb +3 -0
  24. data/lib/avm/launcher/context.rb +83 -0
  25. data/lib/avm/launcher/context/instance_discovery.rb +56 -0
  26. data/lib/avm/launcher/context/instance_manager.rb +3 -3
  27. data/lib/avm/launcher/context/instance_manager/cached_instance.rb +1 -1
  28. data/lib/avm/launcher/context/settings.rb +53 -0
  29. data/lib/avm/launcher/git.rb +7 -0
  30. data/lib/avm/launcher/git/base.rb +86 -0
  31. data/lib/avm/launcher/git/base/class_methods.rb +28 -0
  32. data/lib/avm/launcher/git/base/dirty_files.rb +23 -0
  33. data/lib/avm/launcher/git/base/remotes.rb +40 -0
  34. data/lib/avm/launcher/git/base/subrepo.rb +44 -0
  35. data/lib/avm/launcher/git/base/underlying.rb +63 -0
  36. data/lib/avm/launcher/git/error.rb +13 -0
  37. data/lib/avm/launcher/git/mirror_update.rb +38 -0
  38. data/lib/avm/launcher/git/publish_base.rb +123 -0
  39. data/lib/avm/launcher/git/remote.rb +55 -0
  40. data/lib/avm/launcher/git/sub_warp_base.rb +33 -0
  41. data/lib/avm/launcher/git/warp_base.rb +67 -0
  42. data/lib/{eac_launcher → avm/launcher}/instances.rb +1 -1
  43. data/lib/avm/launcher/instances/base.rb +5 -4
  44. data/lib/avm/launcher/instances/base/cache.rb +1 -1
  45. data/lib/avm/launcher/instances/error.rb +1 -3
  46. data/lib/avm/launcher/instances/runner_helper.rb +1 -1
  47. data/lib/avm/launcher/paths.rb +4 -0
  48. data/lib/avm/launcher/paths/logical.rb +82 -0
  49. data/lib/avm/launcher/paths/real.rb +44 -0
  50. data/lib/avm/launcher/project.rb +18 -0
  51. data/lib/avm/launcher/publish.rb +4 -0
  52. data/lib/avm/launcher/publish/base.rb +47 -0
  53. data/lib/avm/launcher/publish/check_result.rb +67 -0
  54. data/lib/avm/launcher/ruby.rb +3 -0
  55. data/lib/avm/launcher/ruby/gem.rb +4 -0
  56. data/lib/avm/launcher/ruby/gem/build.rb +125 -0
  57. data/lib/avm/launcher/ruby/gem/specification.rb +63 -0
  58. data/lib/avm/launcher/vendor.rb +3 -0
  59. data/lib/avm/launcher/vendor/github.rb +20 -0
  60. data/lib/avm/projects/stereotype/job_comparator.rb +32 -0
  61. data/lib/avm/projects/stereotypes/git/publish.rb +2 -2
  62. data/lib/avm/projects/stereotypes/git/update.rb +1 -2
  63. data/lib/avm/projects/stereotypes/git/update/subrepo.rb +2 -2
  64. data/lib/avm/projects/stereotypes/git/warp.rb +2 -2
  65. data/lib/avm/projects/stereotypes/git_subrepo.rb +2 -2
  66. data/lib/avm/projects/stereotypes/git_subrepo/publish.rb +2 -2
  67. data/lib/avm/projects/stereotypes/git_subrepo/warp.rb +11 -11
  68. data/lib/avm/projects/stereotypes/git_subtree/publish.rb +2 -2
  69. data/lib/avm/projects/stereotypes/git_subtree/warp.rb +4 -4
  70. data/lib/avm/projects/stereotypes/ruby_gem.rb +2 -2
  71. data/lib/avm/projects/stereotypes/ruby_gem/publish.rb +12 -12
  72. data/lib/avm/projects/stereotypes/ruby_gem/update.rb +4 -0
  73. data/lib/avm/self.rb +9 -0
  74. data/lib/avm/tools/runner.rb +4 -0
  75. data/lib/avm/tools/runner/app_src/version_bump.rb +1 -1
  76. data/lib/avm/tools/runner/config.rb +17 -0
  77. data/lib/avm/tools/runner/config/load_path.rb +48 -0
  78. data/lib/avm/tools/runner/eac_redmine_base0/dev_docker.rb +17 -0
  79. data/lib/avm/tools/runner/eac_redmine_base0/docker.rb +3 -0
  80. data/lib/avm/tools/runner/files/format.rb +2 -2
  81. data/lib/avm/tools/runner/git.rb +2 -2
  82. data/lib/avm/tools/runner/git/commit.rb +2 -2
  83. data/lib/avm/tools/runner/git/deploy.rb +4 -3
  84. data/lib/avm/tools/runner/git/organize.rb +1 -1
  85. data/lib/avm/tools/runner/launcher/instances.rb +1 -1
  86. data/lib/avm/tools/runner/launcher/projects.rb +3 -3
  87. data/lib/avm/tools/runner/launcher/publish.rb +2 -2
  88. data/lib/avm/tools/version.rb +1 -1
  89. data/template/avm/eac_redmine_base0/docker_image/Dockerfile.template +47 -0
  90. data/template/avm/eac_redmine_base0/docker_image/apache_http_virtualhost.conf.template +10 -0
  91. data/template/avm/eac_redmine_base0/docker_image/apache_https_virtualhost.conf.template +16 -0
  92. data/template/avm/eac_redmine_base0/docker_image/install_settings.sh.template +29 -0
  93. data/template/avm/eac_redmine_base0/docker_image/start.sh.template +25 -0
  94. data/template/avm/eac_ubuntu_base0/docker_image/Dockerfile +1 -1
  95. data/vendor/avm-apps/avm-apps.gemspec +1 -1
  96. data/vendor/avm-apps/lib/avm/apps/config.rb +15 -0
  97. data/vendor/avm-apps/lib/avm/apps/jobs/base.rb +1 -1
  98. data/vendor/avm-apps/lib/avm/apps/version.rb +1 -1
  99. data/vendor/eac_cli/eac_cli.gemspec +1 -1
  100. data/vendor/eac_cli/lib/eac_cli/config.rb +19 -0
  101. data/vendor/eac_cli/lib/eac_cli/config/entry.rb +48 -0
  102. data/vendor/eac_cli/lib/eac_cli/config/entry/options.rb +57 -0
  103. data/vendor/eac_cli/lib/eac_cli/config/entry/undefined.rb +26 -0
  104. data/vendor/eac_cli/lib/eac_cli/definition/positional_argument.rb +6 -1
  105. data/vendor/eac_cli/lib/eac_cli/docopt/doc_builder/alternative.rb +3 -1
  106. data/vendor/eac_cli/lib/eac_cli/docopt_runner.rb +4 -8
  107. data/vendor/eac_cli/lib/eac_cli/docopt_runner/{_class_methods.rb → class_methods.rb} +5 -3
  108. data/vendor/eac_cli/lib/eac_cli/docopt_runner/context.rb +18 -0
  109. data/vendor/eac_cli/lib/eac_cli/old_configs.rb +0 -1
  110. data/vendor/eac_cli/lib/eac_cli/old_configs/entry_reader.rb +2 -2
  111. data/vendor/eac_cli/lib/eac_cli/old_configs_bridge.rb +37 -0
  112. data/vendor/eac_cli/lib/eac_cli/runner/after_class_methods.rb +20 -3
  113. data/vendor/eac_cli/lib/eac_cli/runner_with/help.rb +6 -2
  114. data/vendor/eac_cli/lib/eac_cli/runner_with/subcommands.rb +5 -1
  115. data/vendor/eac_cli/lib/eac_cli/speaker.rb +15 -19
  116. data/vendor/eac_cli/lib/eac_cli/speaker/_constants.rb +1 -1
  117. data/vendor/eac_cli/lib/eac_cli/speaker/list.rb +1 -1
  118. data/vendor/eac_cli/lib/eac_cli/speaker/options.rb +38 -0
  119. data/vendor/eac_cli/lib/eac_cli/version.rb +1 -1
  120. data/vendor/eac_cli/spec/lib/eac_cli/speaker_spec.rb +5 -9
  121. data/vendor/eac_config/lib/eac_config/entry.rb +7 -1
  122. data/vendor/eac_config/lib/eac_config/envvars_node.rb +25 -0
  123. data/vendor/eac_config/lib/eac_config/envvars_node/entry.rb +54 -0
  124. data/vendor/eac_config/lib/eac_config/load_path.rb +5 -13
  125. data/vendor/eac_config/lib/eac_config/node.rb +9 -2
  126. data/vendor/eac_config/lib/eac_config/node_entry.rb +2 -23
  127. data/vendor/eac_config/lib/eac_config/node_uri.rb +38 -0
  128. data/vendor/eac_config/lib/eac_config/old_configs.rb +1 -0
  129. data/vendor/eac_config/lib/eac_config/version.rb +1 -1
  130. data/vendor/eac_config/lib/eac_config/yaml_file_node.rb +9 -2
  131. data/vendor/eac_config/lib/eac_config/yaml_file_node/entry.rb +37 -0
  132. data/vendor/eac_config/spec/lib/eac_config/envvars_node/entry_spec.rb +14 -0
  133. data/vendor/eac_config/spec/lib/eac_config/envvars_node_spec.rb +40 -0
  134. data/vendor/eac_config/spec/lib/eac_config/yaml_file_node_spec_files/storage1.yaml +3 -1
  135. data/vendor/eac_config/spec/lib/eac_config/yaml_file_node_spec_files/storage1_2.yaml +2 -1
  136. data/vendor/eac_git/lib/eac_git/executables.rb +4 -0
  137. data/vendor/eac_git/lib/eac_git/local.rb +5 -1
  138. data/vendor/eac_git/lib/eac_git/local/commit/archive.rb +19 -0
  139. data/vendor/eac_git/lib/eac_git/local/subrepo.rb +2 -1
  140. data/vendor/eac_git/lib/eac_git/version.rb +1 -1
  141. data/vendor/eac_ruby_base0/eac_ruby_base0.gemspec +2 -2
  142. data/vendor/eac_ruby_base0/lib/eac_ruby_base0/application.rb +8 -11
  143. data/vendor/eac_ruby_base0/lib/eac_ruby_base0/application_xdg.rb +32 -0
  144. data/vendor/eac_ruby_base0/lib/eac_ruby_base0/jobs_runner.rb +2 -2
  145. data/vendor/eac_ruby_base0/lib/eac_ruby_base0/runner.rb +13 -6
  146. data/vendor/eac_ruby_base0/lib/eac_ruby_base0/runner_with/confirmation.rb +8 -1
  147. data/vendor/eac_ruby_base0/lib/eac_ruby_base0/version.rb +1 -1
  148. data/vendor/eac_ruby_gems_utils/eac_ruby_gems_utils.gemspec +1 -1
  149. data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/tests/multiple/decorated_gem.rb +2 -0
  150. data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/version.rb +1 -1
  151. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/context.rb +31 -0
  152. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/contextualizable.rb +12 -7
  153. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/context.rb +11 -0
  154. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/speaker.rb +9 -0
  155. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/simple_cache.rb +10 -2
  156. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/speaker.rb +16 -0
  157. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/speaker/receiver.rb +57 -0
  158. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/speaker/sender.rb +32 -0
  159. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/version.rb +1 -1
  160. data/vendor/{eac_cli/spec/lib → eac_ruby_utils/spec/lib/eac_ruby_utils/patches}/module/speaker_spec.rb +2 -2
  161. data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/simple_cache_spec.rb +18 -0
  162. metadata +67 -41
  163. data/lib/avm/configs.rb +0 -22
  164. data/lib/eac_launcher.rb +0 -13
  165. data/lib/eac_launcher/context.rb +0 -81
  166. data/lib/eac_launcher/context/instance_discovery.rb +0 -54
  167. data/lib/eac_launcher/context/settings.rb +0 -51
  168. data/lib/eac_launcher/git.rb +0 -7
  169. data/lib/eac_launcher/git/base.rb +0 -84
  170. data/lib/eac_launcher/git/base/class_methods.rb +0 -26
  171. data/lib/eac_launcher/git/base/dirty_files.rb +0 -21
  172. data/lib/eac_launcher/git/base/remotes.rb +0 -38
  173. data/lib/eac_launcher/git/base/subrepo.rb +0 -42
  174. data/lib/eac_launcher/git/base/underlying.rb +0 -61
  175. data/lib/eac_launcher/git/error.rb +0 -11
  176. data/lib/eac_launcher/git/mirror_update.rb +0 -36
  177. data/lib/eac_launcher/git/publish_base.rb +0 -119
  178. data/lib/eac_launcher/git/remote.rb +0 -53
  179. data/lib/eac_launcher/git/sub_warp_base.rb +0 -31
  180. data/lib/eac_launcher/git/warp_base.rb +0 -54
  181. data/lib/eac_launcher/paths.rb +0 -4
  182. data/lib/eac_launcher/paths/logical.rb +0 -80
  183. data/lib/eac_launcher/paths/real.rb +0 -42
  184. data/lib/eac_launcher/project.rb +0 -16
  185. data/lib/eac_launcher/publish.rb +0 -4
  186. data/lib/eac_launcher/publish/base.rb +0 -45
  187. data/lib/eac_launcher/publish/check_result.rb +0 -65
  188. data/lib/eac_launcher/ruby.rb +0 -3
  189. data/lib/eac_launcher/ruby/gem.rb +0 -4
  190. data/lib/eac_launcher/ruby/gem/build.rb +0 -123
  191. data/lib/eac_launcher/ruby/gem/specification.rb +0 -61
  192. data/lib/eac_launcher/vendor.rb +0 -3
  193. data/lib/eac_launcher/vendor/github.rb +0 -18
  194. data/lib/eac_launcher/version.rb +0 -5
  195. data/vendor/eac_cli/lib/eac_cli/patches/module.rb +0 -4
  196. data/vendor/eac_cli/lib/eac_cli/patches/module/speaker.rb +0 -10
  197. data/vendor/eac_cli/lib/eac_cli/speaker/_class_methods.rb +0 -37
  198. data/vendor/eac_cli/lib/eac_cli/speaker/node.rb +0 -24
@@ -4,7 +4,7 @@ require 'eac_ruby_utils/by_reference'
4
4
 
5
5
  module EacCli
6
6
  # https://github.com/fazibear/colorize
7
- module Speaker
7
+ class Speaker
8
8
  STDERR = ::EacRubyUtils::ByReference.new { $stderr }
9
9
  STDIN = ::EacRubyUtils::ByReference.new { $stdin }
10
10
  STDOUT = ::EacRubyUtils::ByReference.new { $stdout }
@@ -4,7 +4,7 @@ require 'active_support/hash_with_indifferent_access'
4
4
  require 'ostruct'
5
5
 
6
6
  module EacCli
7
- module Speaker
7
+ class Speaker
8
8
  class List
9
9
  class << self
10
10
  def build(list)
@@ -0,0 +1,38 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+
5
+ module EacCli
6
+ class Speaker
7
+ module Options
8
+ common_concern do
9
+ enable_listable
10
+ lists.add_symbol :option, :out_out, :err_out, :in_in, :parent, :err_line_prefix
11
+ end
12
+
13
+ def err_out
14
+ option(OPTION_ERR_OUT, ::EacCli::Speaker::STDERR)
15
+ end
16
+
17
+ def out_out
18
+ option(OPTION_OUT_OUT, ::EacCli::Speaker::STDOUT)
19
+ end
20
+
21
+ def in_in
22
+ option(OPTION_IN_IN, ::EacCli::Speaker::STDIN)
23
+ end
24
+
25
+ def err_line_prefix
26
+ option(OPTION_ERR_LINE_PREFIX, '')
27
+ end
28
+
29
+ def parent
30
+ options[OPTION_PARENT]
31
+ end
32
+
33
+ def option(key, default)
34
+ options[key] || parent.if_present(default) { |v| v.send(__METHOD__) }
35
+ end
36
+ end
37
+ end
38
+ end
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module EacCli
4
- VERSION = '0.17.0'
4
+ VERSION = '0.20.2'
5
5
  end
@@ -3,23 +3,19 @@
3
3
  require 'eac_cli/speaker'
4
4
 
5
5
  RSpec.describe ::EacCli::Speaker do
6
- let(:instance) do
7
- r = ::Object.new
8
- r.extend(described_class)
9
- r
10
- end
6
+ let(:instance) { described_class.new }
11
7
 
12
- describe '#request_input' do
8
+ describe '#input' do
13
9
  it 'recover value from hash list' do
14
10
  allow(instance).to receive(:request_string).and_return('opt1')
15
11
  list = { opt1: 'value1', opt2: 'value2' }
16
- expect(instance.request_input('Question', list: list)).to eq('value1')
12
+ expect(instance.input('Question', list: list)).to eq('value1')
17
13
  end
18
14
 
19
15
  it 'recover value from array list' do
20
16
  allow(instance).to receive(:request_string).and_return('OPT1')
21
17
  list = %w[opt1 opt2]
22
- expect(instance.request_input('Question', list: list)).to eq('opt1')
18
+ expect(instance.input('Question', list: list)).to eq('opt1')
23
19
  end
24
20
 
25
21
  {
@@ -28,7 +24,7 @@ RSpec.describe ::EacCli::Speaker do
28
24
  context "when bool: true and input is \"#{input}\"" do
29
25
  it "return #{expected}" do
30
26
  allow(instance).to receive(:request_string).and_return(input)
31
- expect(instance.request_input('Question', bool: true)).to eq(expected)
27
+ expect(instance.input('Question', bool: true)).to eq(expected)
32
28
  end
33
29
  end
34
30
  end
@@ -22,7 +22,13 @@ module EacConfig
22
22
  node_entry.if_present(&:value)
23
23
  end
24
24
 
25
- delegate :value=, to: :root_node
25
+ def value=(a_value)
26
+ write_node.self_entry(path).value = a_value
27
+ end
28
+
29
+ def write_node
30
+ root_node.write_node || root_node
31
+ end
26
32
 
27
33
  private
28
34
 
@@ -0,0 +1,25 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'addressable'
4
+ require 'eac_config/node'
5
+ require 'eac_ruby_utils/core_ext'
6
+
7
+ module EacConfig
8
+ # A node that read/write entries from environment variables.
9
+ class EnvvarsNode
10
+ require_sub __FILE__
11
+ include ::EacConfig::Node
12
+
13
+ URI = ::Addressable::URI.parse('self://envvars')
14
+
15
+ class << self
16
+ def from_uri(uri)
17
+ return new if uri == URI
18
+ end
19
+ end
20
+
21
+ def url
22
+ URI
23
+ end
24
+ end
25
+ end
@@ -0,0 +1,54 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_config/entry_path'
4
+ require 'eac_config/node_entry'
5
+ require 'eac_ruby_utils/blank_not_blank'
6
+ require 'eac_ruby_utils/core_ext'
7
+ require 'eac_ruby_utils/yaml'
8
+
9
+ module EacConfig
10
+ class EnvvarsNode
11
+ class Entry < ::EacConfig::NodeEntry
12
+ class << self
13
+ def entry_path_to_envvar_name(path)
14
+ ::EacConfig::EntryPath.assert(path).parts.join('_').gsub(/[^a-z0-9_]/i, '')
15
+ .gsub(/\A_+/, '').gsub(/_+\z/, '').gsub(/_{2,}/, '_').upcase
16
+ end
17
+
18
+ def from_value(string)
19
+ return nil if string.nil?
20
+ return ::EacRubyUtils::Yaml.load(string) if string.start_with?('---')
21
+
22
+ string
23
+ end
24
+
25
+ def to_value(object)
26
+ return nil if object.nil?
27
+ return object if object.is_a?(String)
28
+
29
+ ::EacRubyUtils::Yaml.dump(object)
30
+ end
31
+ end
32
+
33
+ enable_simple_cache
34
+
35
+ def found?
36
+ ENV.key?(envvar_name)
37
+ end
38
+
39
+ def value
40
+ self.class.from_value(ENV[envvar_name])
41
+ end
42
+
43
+ def value=(a_value)
44
+ ENV[envvar_name] = self.class.to_value(a_value)
45
+ end
46
+
47
+ private
48
+
49
+ def envvar_name_uncached
50
+ self.class.entry_path_to_envvar_name(path)
51
+ end
52
+ end
53
+ end
54
+ end
@@ -6,17 +6,6 @@ require 'eac_ruby_utils/core_ext'
6
6
  module EacConfig
7
7
  class LoadPath
8
8
  ENTRY_PATH = ::EacConfig::EntryPath.assert(%w[load_path])
9
- PATH_SEPARATOR = ':'
10
-
11
- class << self
12
- def paths_to_string(paths)
13
- paths.map(&:to_s).join(PATH_SEPARATOR)
14
- end
15
-
16
- def string_to_paths(string)
17
- string.to_s.split(PATH_SEPARATOR)
18
- end
19
- end
20
9
 
21
10
  common_constructor :node
22
11
 
@@ -26,11 +15,14 @@ module EacConfig
26
15
 
27
16
  # @return [Array<String>]
28
17
  def paths
29
- self.class.string_to_paths(entry.value)
18
+ r = entry.value
19
+ r.is_a?(::Array) ? r : []
30
20
  end
31
21
 
32
22
  def push(new_path)
33
- entry.value = self.class.paths_to_string(paths + [new_path])
23
+ entry.value = paths + [new_path]
34
24
  end
25
+
26
+ delegate :to_s, to: :paths
35
27
  end
36
28
  end
@@ -5,10 +5,13 @@ require 'eac_config/entry_path'
5
5
  require 'eac_config/load_path'
6
6
  require 'eac_config/load_nodes_search'
7
7
  require 'eac_config/node_entry'
8
+ require 'eac_config/node_uri'
8
9
  require 'eac_ruby_utils/core_ext'
9
10
 
10
11
  module EacConfig
11
12
  module Node
13
+ attr_accessor :write_node
14
+
12
15
  common_concern do
13
16
  enable_abstract_methods
14
17
  include ::Comparable
@@ -31,7 +34,11 @@ module EacConfig
31
34
  # Return a entry which search values only in the self node.
32
35
  # @return [EacConfig::NodeEntry]
33
36
  def self_entry(path)
34
- ::EacConfig::NodeEntry.new(self, path)
37
+ self_entry_class.new(self, path)
38
+ end
39
+
40
+ def self_entry_class
41
+ self.class.const_get('Entry')
35
42
  end
36
43
 
37
44
  # @return [Array<EacConfig::Node>]
@@ -47,7 +54,7 @@ module EacConfig
47
54
  private
48
55
 
49
56
  def load_node(node_path)
50
- self.class.new(node_path.to_pathname.expand_path(path.parent))
57
+ ::EacConfig::NodeUri.new(node_path, url).instanciate
51
58
  end
52
59
  end
53
60
  end
@@ -7,33 +7,12 @@ require 'eac_ruby_utils/core_ext'
7
7
  module EacConfig
8
8
  # A entry which search values only in the source node.
9
9
  class NodeEntry
10
+ enable_abstract_methods
10
11
  enable_simple_cache
11
12
  common_constructor :node, :path do
12
13
  self.path = ::EacConfig::EntryPath.assert(path)
13
14
  end
14
15
 
15
- def found?
16
- paths_hash.key?(to_paths_hash_key)
17
- end
18
-
19
- def value
20
- paths_hash[to_paths_hash_key]
21
- end
22
-
23
- def value=(a_value)
24
- paths_hash[to_paths_hash_key] = a_value
25
- node.persist_data(paths_hash.root.to_h)
26
- end
27
-
28
- private
29
-
30
- # @return [EacConfig::PathsHash]
31
- def paths_hash_uncached
32
- ::EacConfig::PathsHash.new(node.data)
33
- end
34
-
35
- def to_paths_hash_key
36
- path.parts.join('.')
37
- end
16
+ abstract_methods :found?, :value, :value=
38
17
  end
39
18
  end
@@ -0,0 +1,38 @@
1
+ # frozen_string_literal: true
2
+
3
+ module EacConfig
4
+ class NodeUri
5
+ enable_simple_cache
6
+ common_constructor :source, :loader_uri, default: [nil]
7
+
8
+ def available_node_classes
9
+ require 'eac_config/envvars_node'
10
+ require 'eac_config/yaml_file_node'
11
+ [::EacConfig::EnvvarsNode, ::EacConfig::YamlFileNode]
12
+ end
13
+
14
+ def instanciate
15
+ available_node_classes.lazy.map { |k| k.from_uri(self) }.find(&:present?) ||
16
+ raise("No class mapped for \"#{to_addressable}\"")
17
+ end
18
+
19
+ delegate :to_s, to: :to_addressable
20
+
21
+ private
22
+
23
+ def to_addressable_uncached
24
+ r = ::Addressable::URI.parse(source)
25
+ path = r.path.to_pathname
26
+ r.path = path.expand_path(loader_uri_path_directory).to_path if path.relative?
27
+ r.scheme = 'file' if r.scheme.blank?
28
+ r
29
+ end
30
+
31
+ def loader_uri_path_directory
32
+ r = loader_uri.path
33
+ raise ".loader_uri \"#{loader_uri}\" has no path (Source: \"#{source}\")" if r.blank?
34
+
35
+ r.to_pathname.parent
36
+ end
37
+ end
38
+ end
@@ -8,6 +8,7 @@ require 'eac_config/paths_hash'
8
8
  require 'eac_ruby_utils/simple_cache'
9
9
 
10
10
  module EacConfig
11
+ # @deprecated Use {EacConfig::YamlFileNode} instead.
11
12
  class OldConfigs
12
13
  include ::EacRubyUtils::SimpleCache
13
14
 
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module EacConfig
4
- VERSION = '0.3.0'
4
+ VERSION = '0.4.0'
5
5
  end
@@ -7,20 +7,27 @@ require 'eac_ruby_utils/yaml'
7
7
 
8
8
  module EacConfig
9
9
  class YamlFileNode
10
+ require_sub __FILE__
10
11
  include ::EacConfig::Node
11
12
 
13
+ class << self
14
+ def from_uri(uri)
15
+ return new(uri.to_addressable.path) if uri.to_addressable.scheme == 'file'
16
+ end
17
+ end
18
+
12
19
  common_constructor :path do
13
20
  self.path = path.to_pathname
14
21
  end
15
22
 
16
23
  def data
17
- @data ||= ::EacRubyUtils::Yaml.load_file(assert_path)
24
+ @data ||= ::EacRubyUtils::Yaml.load_file(assert_path) || {}
18
25
  end
19
26
 
20
27
  def persist_data(new_data)
21
28
  path.parent.mkpath
22
29
  ::EacRubyUtils::Yaml.dump_file(path, new_data)
23
- reset_cache(:data)
30
+ @data = nil
24
31
  end
25
32
 
26
33
  def url
@@ -0,0 +1,37 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_config/entry_path'
4
+ require 'eac_config/node_entry'
5
+ require 'eac_ruby_utils/core_ext'
6
+
7
+ module EacConfig
8
+ class YamlFileNode
9
+ class Entry < ::EacConfig::NodeEntry
10
+ enable_simple_cache
11
+
12
+ def found?
13
+ paths_hash.key?(to_paths_hash_key)
14
+ end
15
+
16
+ def value
17
+ paths_hash[to_paths_hash_key]
18
+ end
19
+
20
+ def value=(a_value)
21
+ paths_hash[to_paths_hash_key] = a_value
22
+ node.persist_data(paths_hash.root.to_h)
23
+ end
24
+
25
+ private
26
+
27
+ # @return [EacConfig::PathsHash]
28
+ def paths_hash_uncached
29
+ ::EacConfig::PathsHash.new(node.data)
30
+ end
31
+
32
+ def to_paths_hash_key
33
+ path.parts.join('.')
34
+ end
35
+ end
36
+ end
37
+ end
@@ -0,0 +1,14 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_config/envvars_node/entry'
4
+
5
+ RSpec.describe ::EacConfig::EnvvarsNode::Entry do
6
+ describe '#entry_key_to_envvar_name' do
7
+ {
8
+ 'a.entry.value' => 'A_ENTRY_VALUE',
9
+ 'appli-cation_0.var_one' => 'APPLICATION_0_VAR_ONE'
10
+ }.each do |input, expected_result|
11
+ it { expect(described_class.entry_path_to_envvar_name(input)).to eq(expected_result) }
12
+ end
13
+ end
14
+ end