avm-tools 0.71.0 → 0.75.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (143) hide show
  1. checksums.yaml +4 -4
  2. data/lib/avm/{stereotypes/eac_rails_base0.rb → eac_rails_base0.rb} +1 -3
  3. data/lib/avm/eac_rails_base0/instance.rb +2 -5
  4. data/lib/avm/{rails/runners.rb → eac_rails_base1.rb} +2 -4
  5. data/lib/avm/{rails → eac_rails_base1}/instance.rb +8 -3
  6. data/lib/avm/eac_rails_base1/runner.rb +12 -0
  7. data/lib/avm/eac_rails_base1/runner/bundle.rb +28 -0
  8. data/lib/avm/eac_rails_base1/runner/code_runner.rb +28 -0
  9. data/lib/avm/eac_rails_base1/runner_with/bundle.rb +57 -0
  10. data/lib/avm/{stereotypes/rails.rb → eac_redmine_base0.rb} +2 -4
  11. data/lib/avm/eac_redmine_base0/instance.rb +2 -4
  12. data/lib/avm/{stereotypes/eac_ubuntu_base0.rb → eac_ubuntu_base0.rb} +1 -3
  13. data/lib/avm/{stereotypes/eac_webapp_base0.rb → eac_webapp_base0.rb} +1 -3
  14. data/lib/avm/eac_webapp_base0/deploy.rb +17 -40
  15. data/lib/avm/eac_webapp_base0/deploy/build.rb +48 -0
  16. data/lib/avm/eac_webapp_base0/deploy/git_info.rb +13 -0
  17. data/lib/avm/eac_webapp_base0/deploy/version.rb +4 -0
  18. data/lib/avm/eac_webapp_base0/deploy/write_on_target.rb +18 -0
  19. data/lib/avm/eac_webapp_base0/instance.rb +2 -2
  20. data/lib/avm/eac_webapp_base0/runner.rb +12 -0
  21. data/lib/avm/eac_webapp_base0/runner/apache_host.rb +2 -3
  22. data/lib/avm/eac_webapp_base0/runner/data.rb +1 -1
  23. data/lib/avm/eac_webapp_base0/runner/data/dump.rb +1 -1
  24. data/lib/avm/eac_webapp_base0/runner/data/load.rb +1 -1
  25. data/lib/avm/eac_webapp_base0/runner/deploy.rb +3 -16
  26. data/lib/avm/eac_wordpress_base0.rb +9 -0
  27. data/lib/avm/eac_wordpress_base0/apache_host.rb +25 -0
  28. data/lib/avm/eac_wordpress_base0/deploy.rb +10 -0
  29. data/lib/avm/eac_wordpress_base0/instance.rb +24 -0
  30. data/lib/avm/eac_writings_base0.rb +9 -0
  31. data/lib/avm/eac_writings_base0/apache_host.rb +17 -0
  32. data/lib/avm/eac_writings_base0/commons.rb +12 -0
  33. data/lib/avm/eac_writings_base0/deploy.rb +36 -0
  34. data/lib/avm/eac_writings_base0/file_build.rb +45 -0
  35. data/lib/avm/eac_writings_base0/file_build/base_stereotype.rb +19 -0
  36. data/lib/avm/eac_writings_base0/file_build/chapter_index.rb +23 -0
  37. data/lib/avm/eac_writings_base0/file_build/tex_source.rb +33 -0
  38. data/lib/avm/eac_writings_base0/instance.rb +11 -0
  39. data/lib/avm/eac_writings_base0/project.rb +33 -0
  40. data/lib/avm/eac_writings_base0/project_build.rb +117 -0
  41. data/lib/avm/eac_writings_base0/project_build/chapters_content.rb +47 -0
  42. data/lib/avm/eac_writings_base0/project_build/copy_files.rb +42 -0
  43. data/lib/avm/executables.rb +1 -1
  44. data/lib/avm/files/appendable.rb +55 -0
  45. data/lib/avm/files/appendable/file_content.rb +24 -0
  46. data/lib/avm/files/appendable/plain_directory.rb +25 -0
  47. data/lib/avm/files/appendable/resource_base.rb +13 -0
  48. data/lib/avm/files/appendable/tar_output_command.rb +26 -0
  49. data/lib/avm/files/appendable/templatized_directory.rb +28 -0
  50. data/lib/avm/files/appender.rb +11 -0
  51. data/lib/avm/files/deploy.rb +72 -0
  52. data/lib/avm/git/commit/deploy.rb +8 -61
  53. data/lib/avm/instances/application.rb +4 -0
  54. data/lib/avm/instances/base.rb +2 -1
  55. data/lib/avm/instances/base/auto_values.rb +2 -1
  56. data/lib/avm/instances/base/auto_values/access.rb +5 -4
  57. data/lib/avm/instances/base/auto_values/admin.rb +2 -2
  58. data/lib/avm/instances/base/auto_values/database.rb +1 -1
  59. data/lib/avm/instances/base/auto_values/filesystem.rb +6 -2
  60. data/lib/avm/instances/base/auto_values/mailer.rb +34 -0
  61. data/lib/avm/instances/base/auto_values/ruby.rb +1 -1
  62. data/lib/avm/instances/base/auto_values/system.rb +2 -2
  63. data/lib/avm/instances/entry.rb +7 -1
  64. data/lib/avm/instances/entry_keys.rb +42 -7
  65. data/lib/avm/instances/runner.rb +40 -0
  66. data/lib/avm/{stereotypes/postgresql.rb → postgresql.rb} +1 -3
  67. data/lib/avm/postgresql/instance.rb +63 -0
  68. data/lib/avm/postgresql/instance/data_unit.rb +39 -0
  69. data/lib/avm/postgresql/instance_with.rb +18 -0
  70. data/lib/avm/projects/stereotypes/git_subtree/publish.rb +2 -0
  71. data/lib/avm/projects/stereotypes/git_subtree/warp.rb +3 -0
  72. data/lib/avm/tools/runner.rb +3 -3
  73. data/lib/avm/tools/runner/eac_rails_base0.rb +5 -18
  74. data/lib/avm/tools/runner/eac_rails_base0/apache_path.rb +1 -1
  75. data/lib/avm/tools/runner/eac_rails_base0/bundle.rb +3 -3
  76. data/lib/avm/tools/runner/eac_rails_base0/rails_server.rb +7 -12
  77. data/lib/avm/tools/runner/eac_rails_base0/runner.rb +3 -3
  78. data/lib/avm/tools/runner/eac_redmine_base0.rb +5 -23
  79. data/lib/avm/tools/runner/eac_redmine_base0/core_update.rb +1 -1
  80. data/lib/avm/tools/runner/eac_redmine_base0/docker.rb +1 -1
  81. data/lib/avm/tools/runner/eac_redmine_base0/project_rename.rb +3 -3
  82. data/lib/avm/tools/runner/eac_wordpress_base0.rb +5 -24
  83. data/lib/avm/tools/runner/{eac_rails_base0/data.rb → eac_writings_base0.rb} +4 -4
  84. data/lib/avm/tools/runner/git/deploy.rb +1 -1
  85. data/lib/avm/tools/runner/instance.rb +28 -0
  86. data/lib/avm/tools/runner/instance/info.rb +44 -0
  87. data/lib/avm/tools/runner/local_project/eac_writings_base0.rb +35 -0
  88. data/lib/avm/tools/runner/local_project/eac_writings_base0/build_chapters.rb +48 -0
  89. data/lib/avm/tools/runner/local_project/eac_writings_base0/build_single.rb +37 -0
  90. data/lib/avm/tools/runner/local_project/eac_writings_base0/info.rb +36 -0
  91. data/lib/avm/tools/version.rb +1 -1
  92. data/template/avm/eac_rails_base0/deploy/config/envvars.d/email.yml.template +11 -0
  93. data/template/avm/{stereotypes/eac_ubuntu_base0 → eac_ubuntu_base0}/docker_image/Dockerfile +0 -0
  94. data/template/avm/{stereotypes/eac_wordpress_base0 → eac_wordpress_base0}/deploy/wp-config.php.template +0 -0
  95. data/template/avm/eac_writings_base0/commons/all.tex +5 -0
  96. data/template/avm/eac_writings_base0/commons/ebook.tex +11 -0
  97. data/template/avm/eac_writings_base0/commons/images.tex +11 -0
  98. data/template/avm/eac_writings_base0/commons/links.tex +2 -0
  99. data/template/avm/eac_writings_base0/commons/portuguese.tex +8 -0
  100. data/template/avm/eac_writings_base0/commons/source_code.tex +21 -0
  101. data/template/avm/eac_writings_base0/commons/source_code/java.tex +15 -0
  102. data/template/avm/eac_writings_base0/commons/utils.tex +6 -0
  103. data/template/avm/eac_writings_base0/deploy/index.html.template +9 -0
  104. data/vendor/eac_ruby_base0/lib/eac_ruby_base0/runner.rb +12 -0
  105. data/vendor/eac_ruby_base0/lib/eac_ruby_base0/version.rb +1 -1
  106. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/blank_not_blank.rb +19 -0
  107. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/configs/base.rb +43 -0
  108. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/configs/file.rb +12 -31
  109. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/console/configs.rb +4 -1
  110. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/fs/clearable_directory.rb +57 -0
  111. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/paths_hash.rb +21 -58
  112. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/paths_hash/entry_key_error.rb +8 -0
  113. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/paths_hash/node.rb +67 -0
  114. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/paths_hash/path_search.rb +39 -0
  115. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/struct.rb +4 -0
  116. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/version.rb +1 -1
  117. data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/blank_not_blank_spec.rb +16 -0
  118. data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/configs_spec.rb +15 -0
  119. data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/paths_hash_spec.rb +52 -13
  120. metadata +72 -35
  121. data/lib/avm/git/commit/deploy/appended.rb +0 -37
  122. data/lib/avm/git/commit/deploy/appended/base.rb +0 -17
  123. data/lib/avm/git/commit/deploy/appended/directory.rb +0 -32
  124. data/lib/avm/git/commit/deploy/appended/file_content.rb +0 -28
  125. data/lib/avm/rails/runners/bundle.rb +0 -35
  126. data/lib/avm/rails/runners/runner.rb +0 -48
  127. data/lib/avm/stereotypes/eac_redmine_base0.rb +0 -11
  128. data/lib/avm/stereotypes/eac_wordpress_base0/apache_host.rb +0 -27
  129. data/lib/avm/stereotypes/eac_wordpress_base0/deploy.rb +0 -12
  130. data/lib/avm/stereotypes/eac_wordpress_base0/instance.rb +0 -26
  131. data/lib/avm/stereotypes/postgresql/instance.rb +0 -65
  132. data/lib/avm/stereotypes/postgresql/instance/data_unit.rb +0 -41
  133. data/lib/avm/stereotypes/postgresql/instance_with.rb +0 -20
  134. data/lib/avm/tools/runner/eac_rails_base0/apache_host.rb +0 -16
  135. data/lib/avm/tools/runner/eac_rails_base0/deploy.rb +0 -15
  136. data/lib/avm/tools/runner/eac_redmine_base0/bundle.rb +0 -14
  137. data/lib/avm/tools/runner/eac_redmine_base0/data.rb +0 -27
  138. data/lib/avm/tools/runner/eac_redmine_base0/data/dump.rb +0 -16
  139. data/lib/avm/tools/runner/eac_redmine_base0/deploy.rb +0 -15
  140. data/lib/avm/tools/runner/eac_redmine_base0/runner.rb +0 -14
  141. data/lib/avm/tools/runner/eac_wordpress_base0/apache_host.rb +0 -17
  142. data/lib/avm/tools/runner/eac_wordpress_base0/data.rb +0 -15
  143. data/lib/avm/tools/runner/eac_wordpress_base0/deploy.rb +0 -15
@@ -0,0 +1,48 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'avm/eac_writings_base0/project_build'
4
+ require 'eac_cli/core_ext'
5
+ require 'eac_ruby_utils/console/docopt_runner'
6
+
7
+ module Avm
8
+ module Tools
9
+ class Runner < ::EacRubyUtils::Console::DocoptRunner
10
+ class LocalProject < ::EacRubyUtils::Console::DocoptRunner
11
+ class EacWritingsBase0 < ::EacRubyUtils::Console::DocoptRunner
12
+ class BuildChapters
13
+ runner_with
14
+
15
+ runner_definition do
16
+ arg_opt '-o', '--output-dir', 'Output chapters to specific directory.'
17
+ end
18
+
19
+ def run
20
+ runner_context.call(:project_banner)
21
+ output_dir.mkpath
22
+ project.chapters.each_with_index do |c, i|
23
+ ::Avm::EacWritingsBase0::ProjectBuild.new(project, chapter_build_options(c, i))
24
+ end
25
+ end
26
+
27
+ private
28
+
29
+ def chapter_build_options(chapter, index)
30
+ output_name = "#{(index + 1).to_s.rjust(3, '0')}_#{chapter}.pdf"
31
+ { output_file: output_dir.join(output_name), chapter: chapter }
32
+ end
33
+
34
+ def output_dir_uncached
35
+ (
36
+ parsed.output_dir || project.default_output_dir.join('chapters')
37
+ ).to_pathname
38
+ end
39
+
40
+ def project
41
+ runner_context.call(:project)
42
+ end
43
+ end
44
+ end
45
+ end
46
+ end
47
+ end
48
+ end
@@ -0,0 +1,37 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'avm/eac_writings_base0/project_build'
4
+ require 'eac_cli/core_ext'
5
+ require 'eac_ruby_utils/console/docopt_runner'
6
+
7
+ module Avm
8
+ module Tools
9
+ class Runner < ::EacRubyUtils::Console::DocoptRunner
10
+ class LocalProject < ::EacRubyUtils::Console::DocoptRunner
11
+ class EacWritingsBase0 < ::EacRubyUtils::Console::DocoptRunner
12
+ class BuildSingle
13
+ runner_with
14
+ runner_definition do
15
+ arg_opt '-s', '--source-dir', 'Write .tex source code in specific directory.'
16
+ arg_opt '-f', '--output-file', 'Output to specific file.'
17
+ arg_opt '-c', '--chapter', 'Write only the chapter <chapter>.'
18
+ bool_opt '-o', '--open', 'Open the file after build.'
19
+ end
20
+
21
+ def run
22
+ runner_context.call(:project_banner)
23
+ infov 'Build options', build_options
24
+ ::Avm::EacWritingsBase0::ProjectBuild.new(runner_context.call(:project), parsed)
25
+ end
26
+
27
+ private
28
+
29
+ def build_options
30
+ parsed.slice_fetch(:output_file, :open, :chapter, :source_dir)
31
+ end
32
+ end
33
+ end
34
+ end
35
+ end
36
+ end
37
+ end
@@ -0,0 +1,36 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'avm/eac_writings_base0/project_build'
4
+ require 'eac_cli/core_ext'
5
+ require 'eac_ruby_utils/console/docopt_runner'
6
+
7
+ module Avm
8
+ module Tools
9
+ class Runner < ::EacRubyUtils::Console::DocoptRunner
10
+ class LocalProject < ::EacRubyUtils::Console::DocoptRunner
11
+ class EacWritingsBase0 < ::EacRubyUtils::Console::DocoptRunner
12
+ class Info
13
+ runner_with
14
+ runner_definition do
15
+ desc 'Information about a loca EacRailsBase0 local project.'
16
+ end
17
+
18
+ def run
19
+ runner_context.call(:project_banner)
20
+ infov 'Chapters', project.chapters.count
21
+ project.chapters.each_with_index do |chapter, index|
22
+ infov " * #{index + 1}", chapter
23
+ end
24
+ end
25
+
26
+ private
27
+
28
+ def project
29
+ runner_context.call(:project)
30
+ end
31
+ end
32
+ end
33
+ end
34
+ end
35
+ end
36
+ end
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module Tools
5
- VERSION = '0.71.0'
5
+ VERSION = '0.75.0'
6
6
  end
7
7
  end
@@ -0,0 +1,11 @@
1
+ ---
2
+ action_mailer_smtp_address: '%%MAILER.SMTP.ADDRESS%%'
3
+ action_mailer_smtp_port: '%%MAILER.SMTP.PORT%%'
4
+ action_mailer_smtp_domain: '%%MAILER.SMTP.DOMAIN%%'
5
+ action_mailer_smtp_username: '%%MAILER.SMTP.USERNAME%%'
6
+ action_mailer_smtp_password: '%%MAILER.SMTP.PASSWORD%%'
7
+ action_mailer_smtp_authentication: '%%MAILER.SMTP.AUTHENTICATION%%'
8
+ action_mailer_smtp_enable_starttls_auto: '%%MAILER.SMTP.STARTTLS_AUTO%%'
9
+ action_mailer_default_options_from: '%%MAILER.FROM%%'
10
+ action_mailer_default_options_reply_to: '%%MAILER.REPLY_TO%%'
11
+ action_mailer_default_url_host: '%%WEB.URL%%'
@@ -0,0 +1,5 @@
1
+ \input{commons/links}
2
+ \input{commons/portuguese}
3
+ \input{commons/source_code}
4
+ \input{commons/utils}
5
+ \input{commons/images}
@@ -0,0 +1,11 @@
1
+ \documentclass[a4paper,twoside,final,12pt,openany]{memoir}
2
+ \input{commons/all}
3
+ \setlength{\parindent}{0em}
4
+ \setlength{\parskip}{1em}
5
+ \setlrmarginsandblock{1cm}{1cm}{*}
6
+ \setulmarginsandblock{2cm}{2cm}{*}
7
+ \checkandfixthelayout
8
+
9
+ \newcommand{\chapref}[1] {
10
+ Cap. \ref{chap:#1} - \nameref{chap:#1}
11
+ }
@@ -0,0 +1,11 @@
1
+ \usepackage{graphicx}
2
+ \usepackage[font=small,labelfont=bf]{caption}
3
+
4
+ \newcommand{\inputimage}[2] {
5
+ \begin{minipage}{\linewidth}
6
+ \begin{center}
7
+ \includegraphics{#1}
8
+ \captionof{figure}{#2}
9
+ \end{center}
10
+ \end{minipage}
11
+ }
@@ -0,0 +1,2 @@
1
+ \usepackage{hyperref}
2
+ \hypersetup{colorlinks=true}
@@ -0,0 +1,8 @@
1
+ \usepackage[utf8]{inputenc}
2
+ \usepackage[portuguese]{babel}
3
+ \usepackage{listings}
4
+ \lstset{
5
+ inputencoding=utf8,
6
+ extendedchars=true,
7
+ literate={á}{{\'a}}1 {à}{{\`a}}1 {ã}{{\~a}}1 {â}{{\^a}}1 {é}{{\'e}}1 {ê}{{\^e}}1 {ë}{{\"e}}1 {í}{{\'i}}1 {ç}{{\c{c}}}1 {Ç}{{\c{C}}}1 {õ}{{\~o}}1 {Õ}{{\~O}}1 {ó}{{\'o}}1 {ô}{{\^o}}1 {ú}{{\'u}}1
8
+ }
@@ -0,0 +1,21 @@
1
+ \usepackage[dvipsnames]{xcolor}
2
+ \usepackage{listings}
3
+ \usepackage{courier}
4
+ \usepackage[T1]{fontenc}
5
+ \usepackage{textcomp}
6
+ \definecolor{code_background}{rgb}{0.95,0.95,0.95}
7
+ \lstset{
8
+ backgroundcolor=\color{code_background},
9
+ breakatwhitespace=false,
10
+ breaklines=true,
11
+ basicstyle=\ttfamily\color{black},
12
+ commentstyle = \ttfamily\color{gray},
13
+ keywordstyle=\ttfamily\color{blue},
14
+ stringstyle=\color{orange},
15
+ showstringspaces=false,
16
+ frame=single,
17
+ basicstyle=\ttfamily\tiny,
18
+ columns=flexible,
19
+ upquote=true,
20
+ }
21
+ \input{commons/source_code/java}
@@ -0,0 +1,15 @@
1
+ \lstloadlanguages{Java}
2
+ \newcommand{\java}[1] {
3
+ \lstinline[language=Java]{#1}
4
+ }
5
+ \newcommand{\javafile}[1] {
6
+ \begin{minipage}{\linewidth}
7
+ \lstinputlisting[language=Java,caption=$#1$]{#1}
8
+ \end{minipage}
9
+ }
10
+ \lstnewenvironment{javaenv} {
11
+ \lstset{language=Java}
12
+ \minipage\linewidth
13
+ } {
14
+ \endminipage
15
+ }
@@ -0,0 +1,6 @@
1
+ \newcommand{\todo}[0] {
2
+ \textcolor{red}{\textbf{TO-DO}}
3
+ }
4
+ \newcommand{\dq}[1] {
5
+ ``#1''
6
+ }
@@ -0,0 +1,9 @@
1
+ <html>
2
+ <head>
3
+ <title>%%title%%</title>
4
+ </head>
5
+ <body>
6
+ <h1>%%title%%</h1>
7
+ <a href="%%pdf_path%%">PDF</a>
8
+ </body>
9
+ </html>
@@ -10,6 +10,7 @@ module EacRubyBase0
10
10
  include ::EacCli::DefaultRunner
11
11
  runner_definition do
12
12
  bool_opt '-q', '--quiet', 'Quiet mode.'
13
+ bool_opt '-I', '--no-input', 'Fail if a input is requested.'
13
14
  subcommands
14
15
  alt do
15
16
  bool_opt '-V', '--version', 'Show version.'
@@ -20,6 +21,7 @@ module EacRubyBase0
20
21
  def run
21
22
  on_speaker_node do |node|
22
23
  node.stderr = ::StringIO.new if options.fetch('--quiet')
24
+ node.stdin = FailIfRequestInput.new if options.fetch('--no-input')
23
25
  if options.fetch('--version')
24
26
  show_version
25
27
  else
@@ -35,5 +37,15 @@ module EacRubyBase0
35
37
  def show_version
36
38
  out("#{application_version}\n")
37
39
  end
40
+
41
+ class FailIfRequestInput
42
+ enable_console_speaker
43
+
44
+ %w[gets noecho].each do |method|
45
+ define_method(method) do
46
+ raise "Input method requested (\"#{method}\") and option --no-input is set"
47
+ end
48
+ end
49
+ end
38
50
  end
39
51
  end
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module EacRubyBase0
4
- VERSION = '0.1.1'
4
+ VERSION = '0.2.0'
5
5
  end
@@ -0,0 +1,19 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'active_support/core_ext/object/blank'
4
+ require 'singleton'
5
+
6
+ module EacRubyUtils
7
+ # A blank string which returns +false+ for +blank?+ method.
8
+ class BlankNotBlank < String
9
+ include ::Singleton
10
+
11
+ def initialize
12
+ super('')
13
+ end
14
+
15
+ def blank?
16
+ false
17
+ end
18
+ end
19
+ end
@@ -0,0 +1,43 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/blank_not_blank'
4
+ require 'eac_ruby_utils/core_ext'
5
+ require 'eac_ruby_utils/paths_hash'
6
+
7
+ module EacRubyUtils
8
+ class Configs
9
+ class Base
10
+ enable_simple_cache
11
+
12
+ common_constructor :data, default: [{}] do
13
+ self.data = ::EacRubyUtils::PathsHash.new(data)
14
+ end
15
+
16
+ def []=(entry_key, entry_value)
17
+ write(entry_key, entry_value)
18
+ end
19
+
20
+ def [](entry_key)
21
+ read(entry_key)
22
+ end
23
+
24
+ def clear
25
+ replace({})
26
+ end
27
+
28
+ def read(entry_key)
29
+ return nil unless data.key?(entry_key)
30
+
31
+ data.fetch(entry_key).if_present(::EacRubyUtils::BlankNotBlank.instance)
32
+ end
33
+
34
+ def replace(new_data)
35
+ self.data = ::EacRubyUtils::PathsHash.new(new_data)
36
+ end
37
+
38
+ def write(entry_key, entry_value)
39
+ data[entry_key] = entry_value
40
+ end
41
+ end
42
+ end
43
+ end
@@ -1,27 +1,18 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'active_support/core_ext/string'
3
+ require 'eac_ruby_utils/configs/base'
4
4
  require 'yaml'
5
- require 'eac_ruby_utils/patches/hash/sym_keys_hash'
6
- require 'eac_ruby_utils/paths_hash'
7
- require 'eac_ruby_utils/simple_cache'
8
5
 
9
6
  module EacRubyUtils
10
7
  class Configs
11
- class File
12
- include ::EacRubyUtils::SimpleCache
13
-
8
+ class File < ::EacRubyUtils::Configs::Base
14
9
  attr_reader :path, :options
15
10
 
16
11
  # Valid options: [:autosave]
17
12
  def initialize(path, options = {})
18
13
  @path = path
19
14
  @options = options.to_sym_keys_hash.freeze
20
- load
21
- end
22
-
23
- def clear
24
- self.data = ::EacRubyUtils::PathsHash.new({})
15
+ super(raw_data_from_file)
25
16
  end
26
17
 
27
18
  def save
@@ -30,37 +21,27 @@ module EacRubyUtils
30
21
  end
31
22
 
32
23
  def load
33
- self.data = if ::File.exist?(path) && ::File.size(path).positive?
34
- ::EacRubyUtils::PathsHash.new(YAML.load_file(path))
35
- else
36
- {}
37
- end
38
- end
39
-
40
- def []=(entry_key, entry_value)
41
- write(entry_key, entry_value)
24
+ replace(raw_data_from_file)
42
25
  end
43
26
 
44
27
  def write(entry_key, entry_value)
45
- data[entry_key] = entry_value
28
+ super
46
29
  save if autosave?
47
30
  end
48
31
 
49
- def [](entry_key)
50
- read(entry_key)
51
- end
52
-
53
- def read(entry_key)
54
- data[entry_key]
55
- end
56
-
57
32
  def autosave?
58
33
  options[:autosave] ? true : false
59
34
  end
60
35
 
61
36
  private
62
37
 
63
- attr_accessor :data
38
+ def raw_data_from_file
39
+ if ::File.exist?(path) && ::File.size(path).positive?
40
+ ::YAML.load_file(path)
41
+ else
42
+ {}
43
+ end
44
+ end
64
45
  end
65
46
  end
66
47
  end
@@ -66,7 +66,10 @@ module EacRubyUtils
66
66
  protected
67
67
 
68
68
  def envvar_read_entry(entry_key)
69
- ENV[self.class.entry_key_to_envvar_name(entry_key)]
69
+ env_entry_key = self.class.entry_key_to_envvar_name(entry_key)
70
+ return nil unless ENV.key?(env_entry_key)
71
+
72
+ ENV.fetch(env_entry_key).if_present(::EacRubyUtils::BlankNotBlank.instance)
70
73
  end
71
74
 
72
75
  def read_entry_from_console(entry_key, options)