avm-tools 0.101.0 → 0.103.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (220) hide show
  1. checksums.yaml +4 -4
  2. data/lib/avm/app_src.rb +8 -7
  3. data/lib/avm/data/package/dump.rb +1 -1
  4. data/lib/avm/git/auto_commit/rules/manual.rb +1 -1
  5. data/lib/avm/git/issue/complete.rb +4 -8
  6. data/lib/avm/git/issue/complete/commits.rb +42 -0
  7. data/lib/avm/git/issue/complete/git_subrepos.rb +23 -0
  8. data/lib/avm/git/issue/complete/local_branch.rb +54 -0
  9. data/lib/avm/git/issue/complete/local_tag.rb +39 -0
  10. data/lib/avm/git/issue/complete/push.rb +54 -0
  11. data/lib/avm/git/issue/complete/remote.rb +33 -0
  12. data/lib/avm/git/issue/complete/test.rb +45 -0
  13. data/lib/avm/git/issue/complete/tracker.rb +28 -0
  14. data/lib/avm/git/issue/complete/validations.rb +53 -0
  15. data/lib/avm/git/issue/complete/working_tree.rb +19 -0
  16. data/lib/avm/git/issue/deliver.rb +1 -1
  17. data/lib/avm/git/revision_test.rb +9 -6
  18. data/lib/avm/instances/base/dockerizable.rb +2 -1
  19. data/lib/avm/launcher/context.rb +1 -1
  20. data/lib/avm/launcher/git/publish_base.rb +3 -1
  21. data/lib/avm/launcher/git/warp_base.rb +11 -0
  22. data/lib/avm/launcher/instances/base.rb +2 -1
  23. data/lib/avm/launcher/instances/error.rb +1 -3
  24. data/lib/avm/launcher/instances/runner_helper.rb +1 -1
  25. data/lib/avm/launcher/ruby/gem/build.rb +1 -1
  26. data/lib/avm/projects/stereotype/job_comparator.rb +32 -0
  27. data/lib/avm/projects/stereotypes/git/update.rb +1 -2
  28. data/lib/avm/projects/stereotypes/ruby_gem/local_project_mixin.rb +2 -2
  29. data/lib/avm/projects/stereotypes/ruby_gem/publish.rb +1 -1
  30. data/lib/avm/projects/stereotypes/ruby_gem/update.rb +4 -0
  31. data/lib/avm/self/instance.rb +4 -0
  32. data/lib/avm/{core_ext.rb → tools/core_ext.rb} +0 -0
  33. data/lib/avm/tools/runner/app_src/eac_asciidoctor_base0/build.rb +1 -1
  34. data/lib/avm/tools/runner/app_src/info.rb +1 -1
  35. data/lib/avm/tools/runner/app_src/test.rb +1 -1
  36. data/lib/avm/tools/runner/app_src/update.rb +1 -1
  37. data/lib/avm/tools/runner/app_src/version_bump.rb +3 -3
  38. data/lib/avm/tools/runner/config.rb +1 -1
  39. data/lib/avm/tools/runner/config/load_path.rb +1 -1
  40. data/lib/avm/tools/runner/git.rb +1 -1
  41. data/lib/avm/tools/runner/git/auto_commit.rb +1 -0
  42. data/lib/avm/tools/runner/git/dirty_files.rb +1 -1
  43. data/lib/avm/tools/runner/git/issue.rb +5 -76
  44. data/lib/avm/tools/runner/git/issue/complete.rb +79 -0
  45. data/lib/avm/tools/runner/git/issue/deliver.rb +35 -0
  46. data/lib/avm/tools/runner/git/organize.rb +1 -1
  47. data/lib/avm/tools/runner/git/revisions_test.rb +1 -1
  48. data/lib/avm/tools/runner/git/subrepo.rb +1 -1
  49. data/lib/avm/tools/runner/git/subrepo/check.rb +1 -1
  50. data/lib/avm/tools/runner/git/subrepo/clone.rb +1 -1
  51. data/lib/avm/tools/runner/git/subrepo/fix.rb +1 -1
  52. data/lib/avm/tools/runner/launcher.rb +1 -1
  53. data/lib/avm/tools/runner/ruby/rubocop.rb +1 -1
  54. data/lib/avm/tools/runner/self.rb +1 -1
  55. data/lib/avm/tools/version.rb +1 -1
  56. data/vendor/avm-apps/avm-apps.gemspec +1 -1
  57. data/vendor/avm-apps/lib/avm/apps/config.rb +6 -2
  58. data/vendor/avm-apps/lib/avm/apps/version.rb +1 -1
  59. data/vendor/avm-eac_rails_base1/Gemfile +5 -0
  60. data/vendor/avm-eac_rails_base1/avm-eac_rails_base1.gemspec +19 -0
  61. data/{lib → vendor/avm-eac_rails_base1/lib}/avm/eac_rails_base1.rb +0 -0
  62. data/{lib → vendor/avm-eac_rails_base1/lib}/avm/eac_rails_base1/apache_host.rb +0 -0
  63. data/{lib → vendor/avm-eac_rails_base1/lib}/avm/eac_rails_base1/instance.rb +0 -0
  64. data/{lib → vendor/avm-eac_rails_base1/lib}/avm/eac_rails_base1/runner.rb +0 -0
  65. data/{lib → vendor/avm-eac_rails_base1/lib}/avm/eac_rails_base1/runner/bundle.rb +0 -0
  66. data/{lib → vendor/avm-eac_rails_base1/lib}/avm/eac_rails_base1/runner/code_runner.rb +0 -0
  67. data/{lib → vendor/avm-eac_rails_base1/lib}/avm/eac_rails_base1/runner/log.rb +0 -0
  68. data/vendor/avm-eac_rails_base1/lib/avm/eac_rails_base1/runner/logs.rb +18 -0
  69. data/vendor/avm-eac_rails_base1/lib/avm/eac_rails_base1/runner/logs/clear.rb +26 -0
  70. data/{lib → vendor/avm-eac_rails_base1/lib}/avm/eac_rails_base1/runner/rails_server.rb +0 -0
  71. data/{lib → vendor/avm-eac_rails_base1/lib}/avm/eac_rails_base1/runner_with/bundle.rb +0 -0
  72. data/{lib → vendor/avm-eac_rails_base1/lib}/avm/eac_rails_base1/runner_with/rails_environment.rb +0 -0
  73. data/vendor/avm-eac_rails_base1/lib/avm/eac_rails_base1/version.rb +7 -0
  74. data/vendor/avm-eac_rails_base1/spec/rubocop_spec.rb +3 -0
  75. data/vendor/avm-eac_rails_base1/spec/spec_helper.rb +102 -0
  76. data/vendor/avm-eac_redmine_base0/Gemfile +5 -0
  77. data/vendor/avm-eac_redmine_base0/avm-eac_redmine_base0.gemspec +19 -0
  78. data/{lib → vendor/avm-eac_redmine_base0/lib}/avm/eac_redmine_base0.rb +2 -2
  79. data/{lib → vendor/avm-eac_redmine_base0/lib}/avm/eac_redmine_base0/apache_host.rb +0 -0
  80. data/{lib → vendor/avm-eac_redmine_base0/lib}/avm/eac_redmine_base0/core_update.rb +0 -0
  81. data/{lib → vendor/avm-eac_redmine_base0/lib}/avm/eac_redmine_base0/data_unit.rb +0 -0
  82. data/{lib → vendor/avm-eac_redmine_base0/lib}/avm/eac_redmine_base0/deploy.rb +0 -0
  83. data/{lib → vendor/avm-eac_redmine_base0/lib}/avm/eac_redmine_base0/instance.rb +2 -2
  84. data/vendor/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/docker_image.rb +55 -0
  85. data/vendor/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/patches/object/template.rb +7 -0
  86. data/vendor/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/version.rb +7 -0
  87. data/vendor/avm-eac_redmine_base0/spec/rubocop_spec.rb +3 -0
  88. data/vendor/avm-eac_redmine_base0/spec/spec_helper.rb +102 -0
  89. data/{template → vendor/avm-eac_redmine_base0/template}/avm/eac_redmine_base0/deploy/config/install.sh.template +0 -0
  90. data/{template → vendor/avm-eac_redmine_base0/template}/avm/eac_redmine_base0/deploy/config/secrets.yml +0 -0
  91. data/{template/avm/eac_redmine_base0 → vendor/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances}/docker_image/Dockerfile.template +1 -1
  92. data/{template/avm/eac_redmine_base0 → vendor/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances}/docker_image/apache_http_virtualhost.conf.template +0 -0
  93. data/{template/avm/eac_redmine_base0 → vendor/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances}/docker_image/apache_https_virtualhost.conf.template +0 -0
  94. data/vendor/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/docker_image/install_settings.sh.template +24 -0
  95. data/{template/avm/eac_redmine_base0 → vendor/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances}/docker_image/start.sh.template +0 -0
  96. data/vendor/avm-eac_webapp_base0/Gemfile +5 -0
  97. data/vendor/avm-eac_webapp_base0/avm-eac_webapp_base0.gemspec +19 -0
  98. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0.rb +2 -2
  99. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/apache_host.rb +0 -0
  100. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/apache_path.rb +0 -0
  101. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/deploy.rb +0 -0
  102. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/deploy/appended_directories.rb +0 -0
  103. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/deploy/build.rb +0 -0
  104. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/deploy/file_unit.rb +0 -0
  105. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/deploy/git_info.rb +0 -0
  106. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/deploy/version.rb +0 -0
  107. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/deploy/write_on_target.rb +0 -0
  108. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/instance.rb +0 -0
  109. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/instance/subcommand_parent.rb +0 -0
  110. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/runner.rb +0 -0
  111. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/runner/apache_host.rb +0 -0
  112. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/runner/apache_path.rb +0 -0
  113. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/runner/data.rb +0 -0
  114. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/runner/data/dump.rb +0 -0
  115. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/runner/data/load.rb +0 -0
  116. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/runner/deploy.rb +0 -0
  117. data/vendor/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/version.rb +7 -0
  118. data/vendor/avm-eac_webapp_base0/spec/rubocop_spec.rb +3 -0
  119. data/vendor/avm-eac_webapp_base0/spec/spec_helper.rb +102 -0
  120. data/vendor/avm/Gemfile +5 -0
  121. data/vendor/avm/avm.gemspec +19 -0
  122. data/vendor/avm/lib/avm.rb +7 -0
  123. data/vendor/avm/lib/avm/docker.rb +9 -0
  124. data/{lib → vendor/avm/lib}/avm/docker/container.rb +5 -5
  125. data/{lib → vendor/avm/lib}/avm/docker/image.rb +3 -4
  126. data/{lib → vendor/avm/lib}/avm/docker/runner.rb +7 -11
  127. data/{lib → vendor/avm/lib}/avm/instances/docker_image.rb +0 -0
  128. data/vendor/avm/lib/avm/version.rb +5 -0
  129. data/{lib/avm/version.rb → vendor/avm/lib/avm/version_number.rb} +1 -1
  130. data/vendor/avm/spec/rubocop_spec.rb +3 -0
  131. data/vendor/avm/spec/spec_helper.rb +102 -0
  132. data/vendor/eac_cli/eac_cli.gemspec +1 -2
  133. data/vendor/eac_cli/lib/eac_cli/config.rb +1 -2
  134. data/vendor/eac_cli/lib/eac_cli/config/entry.rb +2 -2
  135. data/vendor/eac_cli/lib/eac_cli/config/entry/undefined.rb +1 -1
  136. data/vendor/eac_cli/lib/eac_cli/definition/help_formatter.rb +3 -2
  137. data/vendor/eac_cli/lib/eac_cli/old_configs.rb +0 -1
  138. data/vendor/eac_cli/lib/eac_cli/old_configs/entry_reader.rb +2 -2
  139. data/vendor/eac_cli/lib/eac_cli/old_configs_bridge.rb +2 -0
  140. data/vendor/eac_cli/lib/eac_cli/runner.rb +0 -2
  141. data/vendor/eac_cli/lib/eac_cli/runner/after_class_methods.rb +20 -3
  142. data/vendor/eac_cli/lib/eac_cli/runner/instance_methods.rb +5 -1
  143. data/vendor/eac_cli/lib/eac_cli/runner_with/help.rb +3 -2
  144. data/vendor/eac_cli/lib/eac_cli/runner_with/help/builder.rb +73 -0
  145. data/vendor/eac_cli/lib/eac_cli/runner_with/help/builder/alternative.rb +56 -0
  146. data/vendor/eac_cli/lib/eac_cli/runner_with/subcommands.rb +1 -3
  147. data/vendor/eac_cli/lib/eac_cli/speaker.rb +15 -19
  148. data/vendor/eac_cli/lib/eac_cli/speaker/_constants.rb +1 -1
  149. data/vendor/eac_cli/lib/eac_cli/speaker/list.rb +1 -1
  150. data/vendor/eac_cli/lib/eac_cli/speaker/options.rb +38 -0
  151. data/vendor/eac_cli/lib/eac_cli/version.rb +1 -1
  152. data/vendor/eac_cli/spec/lib/eac_cli/parser/alternative_spec.rb +1 -1
  153. data/vendor/eac_cli/spec/lib/eac_cli/runner_spec.rb +0 -1
  154. data/vendor/eac_cli/spec/lib/eac_cli/speaker_spec.rb +5 -9
  155. data/vendor/eac_config/lib/eac_config/node.rb +7 -0
  156. data/vendor/eac_config/lib/eac_config/version.rb +1 -1
  157. data/vendor/eac_docker/eac_docker.gemspec +1 -1
  158. data/vendor/eac_docker/lib/eac_docker/debug.rb +15 -0
  159. data/vendor/eac_docker/lib/eac_docker/images/coded.rb +4 -0
  160. data/vendor/eac_docker/lib/eac_docker/images/templatized.rb +12 -2
  161. data/vendor/eac_docker/lib/eac_docker/version.rb +1 -1
  162. data/vendor/eac_git/lib/eac_git/local.rb +5 -1
  163. data/vendor/eac_git/lib/eac_git/local/subrepo.rb +2 -1
  164. data/vendor/eac_git/lib/eac_git/version.rb +1 -1
  165. data/vendor/eac_ruby_base0/eac_ruby_base0.gemspec +2 -2
  166. data/vendor/eac_ruby_base0/lib/eac_ruby_base0/application.rb +23 -9
  167. data/vendor/eac_ruby_base0/lib/eac_ruby_base0/application_xdg.rb +34 -0
  168. data/vendor/eac_ruby_base0/lib/eac_ruby_base0/jobs_runner.rb +2 -2
  169. data/vendor/eac_ruby_base0/lib/eac_ruby_base0/runner.rb +19 -7
  170. data/vendor/eac_ruby_base0/lib/eac_ruby_base0/runner_with/confirmation.rb +8 -1
  171. data/vendor/eac_ruby_base0/lib/eac_ruby_base0/version.rb +1 -1
  172. data/vendor/eac_ruby_gems_utils/eac_ruby_gems_utils.gemspec +1 -1
  173. data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/tests/multiple/decorated_gem.rb +2 -0
  174. data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/version.rb +1 -1
  175. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/boolean.rb +1 -1
  176. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/speaker.rb +9 -0
  177. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname/parent_n.rb +11 -0
  178. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/simple_cache.rb +10 -2
  179. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/speaker.rb +16 -0
  180. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/speaker/receiver.rb +57 -0
  181. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/speaker/sender.rb +32 -0
  182. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/version.rb +1 -1
  183. data/vendor/{eac_cli/spec/lib → eac_ruby_utils/spec/lib/eac_ruby_utils/patches}/module/speaker_spec.rb +2 -2
  184. data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/pathname/parent_n_spec.rb +33 -0
  185. data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/simple_cache_spec.rb +18 -0
  186. data/vendor/eac_templates/eac_templates.gemspec +1 -1
  187. data/vendor/eac_templates/lib/eac_templates/variable_providers.rb +1 -1
  188. data/vendor/eac_templates/lib/eac_templates/variable_providers/config_reader.rb +27 -0
  189. data/vendor/eac_templates/lib/eac_templates/version.rb +1 -1
  190. metadata +116 -80
  191. data/lib/avm/docker.rb +0 -9
  192. data/lib/avm/docker/registry.rb +0 -28
  193. data/lib/avm/eac_redmine_base0/docker_image.rb +0 -52
  194. data/lib/avm/git/issue/complete/_commits.rb +0 -40
  195. data/lib/avm/git/issue/complete/_git_subrepos.rb +0 -21
  196. data/lib/avm/git/issue/complete/_local_branch.rb +0 -52
  197. data/lib/avm/git/issue/complete/_local_tag.rb +0 -37
  198. data/lib/avm/git/issue/complete/_push.rb +0 -52
  199. data/lib/avm/git/issue/complete/_remote.rb +0 -31
  200. data/lib/avm/git/issue/complete/_test.rb +0 -43
  201. data/lib/avm/git/issue/complete/_tracker.rb +0 -26
  202. data/lib/avm/git/issue/complete/_validations.rb +0 -51
  203. data/lib/avm/git/issue/complete/_working_tree.rb +0 -17
  204. data/template/avm/eac_redmine_base0/docker_image/install_settings.sh.template +0 -29
  205. data/vendor/eac_cli/lib/eac_cli/docopt/doc_builder.rb +0 -71
  206. data/vendor/eac_cli/lib/eac_cli/docopt/doc_builder/alternative.rb +0 -52
  207. data/vendor/eac_cli/lib/eac_cli/docopt/runner_context_replacement.rb +0 -15
  208. data/vendor/eac_cli/lib/eac_cli/docopt/runner_extension.rb +0 -51
  209. data/vendor/eac_cli/lib/eac_cli/docopt_runner.rb +0 -38
  210. data/vendor/eac_cli/lib/eac_cli/docopt_runner/_class_methods.rb +0 -16
  211. data/vendor/eac_cli/lib/eac_cli/docopt_runner/_doc.rb +0 -23
  212. data/vendor/eac_cli/lib/eac_cli/docopt_runner/_settings.rb +0 -17
  213. data/vendor/eac_cli/lib/eac_cli/docopt_runner/_subcommands.rb +0 -152
  214. data/vendor/eac_cli/lib/eac_cli/docopt_runner/context.rb +0 -18
  215. data/vendor/eac_cli/lib/eac_cli/patches/module.rb +0 -4
  216. data/vendor/eac_cli/lib/eac_cli/patches/module/speaker.rb +0 -10
  217. data/vendor/eac_cli/lib/eac_cli/speaker/_class_methods.rb +0 -37
  218. data/vendor/eac_cli/lib/eac_cli/speaker/node.rb +0 -24
  219. data/vendor/eac_cli/spec/lib/eac_cli/docopt/runner_extension_spec.rb +0 -35
  220. data/vendor/eac_cli/spec/lib/eac_cli/docopt_runner_spec.rb +0 -136
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module EacDocker
4
- VERSION = '0.2.2'
4
+ VERSION = '0.3.0'
5
5
  end
@@ -39,13 +39,17 @@ module EacGit
39
39
  ::EacGit::Executables.git.command('-C', root_path.to_path, *args)
40
40
  end
41
41
 
42
+ def raise_error(message)
43
+ raise "#{root_path}: #{message}"
44
+ end
45
+
42
46
  def rev_parse(ref, required = false)
43
47
  r = command('rev-parse', ref).execute!(exit_outputs: { 128 => nil, 32_768 => nil })
44
48
  r.strip! if r.is_a?(String)
45
49
  return r if r.present?
46
50
  return nil unless required
47
51
 
48
- raise "Reference \"#{ref}\" not found"
52
+ raise_error "Reference \"#{ref}\" not found"
49
53
  end
50
54
 
51
55
  def subrepo(subpath)
@@ -12,7 +12,8 @@ module EacGit
12
12
 
13
13
  common_constructor :local, :subpath do
14
14
  self.subpath = subpath.to_pathname
15
- raise "Config file \"#{config_absolute_path}\" not found" unless config_absolute_path.file?
15
+ local.raise_error "Config file \"#{config_absolute_path}\" not found" unless
16
+ config_absolute_path.file?
16
17
  end
17
18
 
18
19
  def command(subrepo_subcommand, *subrepo_subcommand_args)
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module EacGit
4
- VERSION = '0.5.0'
4
+ VERSION = '0.6.0'
5
5
  end
@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
12
12
 
13
13
  s.files = Dir['{lib}/**/*']
14
14
 
15
- s.add_dependency 'eac_cli', '~> 0.15', '>= 0.15.1'
15
+ s.add_dependency 'eac_cli', '~> 0.20'
16
16
  s.add_dependency 'eac_ruby_gems_utils', '~> 0.8'
17
- s.add_dependency 'eac_ruby_utils', '~> 0.64'
17
+ s.add_dependency 'eac_ruby_utils', '~> 0.67'
18
18
 
19
19
  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
20
20
  end
@@ -1,5 +1,9 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require 'eac_cli/config'
4
+ require 'eac_config/envvars_node'
5
+ require 'eac_config/yaml_file_node'
6
+ require 'eac_ruby_base0/application_xdg'
3
7
  require 'eac_ruby_gems_utils/gem'
4
8
  require 'eac_ruby_utils/core_ext'
5
9
  require 'eac_ruby_utils/filesystem_cache'
@@ -21,16 +25,22 @@ module EacRubyBase0
21
25
  vendor_gems + [self_gem]
22
26
  end
23
27
 
24
- { cache: '.cache', config: '.config', data: '.local/share' }.each do |item, subpath|
25
- xdg_env_method_name = "#{item}_xdg_env"
28
+ # @return [EacCli::Config]
29
+ def build_config(path = nil)
30
+ envvar_node = ::EacConfig::EnvvarsNode.new
31
+ file_node = ::EacConfig::YamlFileNode.new(path || config_default_path)
32
+ envvar_node.load_path.push(file_node.url)
33
+ envvar_node.write_node = file_node
34
+ ::EacCli::Config.new(envvar_node)
35
+ end
26
36
 
27
- define_method xdg_env_method_name do
28
- ENV["XDG_#{item.upcase}_HOME"].if_present(&:to_pathname)
29
- end
37
+ # @return [EacCli::Config]
38
+ def config_default_path
39
+ config_dir.join('eac_config.yaml')
40
+ end
30
41
 
31
- define_method "#{item}_dir" do
32
- (send(xdg_env_method_name) || home_dir.join(subpath)).join(name)
33
- end
42
+ ::EacRubyBase0::ApplicationXdg::DIRECTORIES.each_key do |item|
43
+ delegate "#{item}_xdg_env", "#{item}_dir", to: :app_xdg
34
44
  end
35
45
 
36
46
  def fs_cache
@@ -40,7 +50,7 @@ module EacRubyBase0
40
50
  end
41
51
 
42
52
  def home_dir
43
- @home_dir ||= (options[OPTION_HOME_DIR] || ENV.fetch('HOME')).to_pathname
53
+ app_xdg.user_home_dir
44
54
  end
45
55
 
46
56
  def name
@@ -53,6 +63,10 @@ module EacRubyBase0
53
63
 
54
64
  private
55
65
 
66
+ def app_xdg_uncached
67
+ ::EacRubyBase0::ApplicationXdg.new(name, options[OPTION_HOME_DIR])
68
+ end
69
+
56
70
  def self_gem_uncached
57
71
  ::EacRubyGemsUtils::Gem.new(gemspec_dir)
58
72
  end
@@ -0,0 +1,34 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+
5
+ module EacRubyBase0
6
+ # https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
7
+ class ApplicationXdg
8
+ class << self
9
+ # @return [Pathname]
10
+ def user_home_dir_from_env
11
+ ENV.fetch('HOME').to_pathname
12
+ end
13
+ end
14
+
15
+ DIRECTORIES = { cache: '.cache', config: '.config', data: '.local/share',
16
+ state: '.local/state' }.freeze
17
+
18
+ common_constructor :app_name, :user_home_dir, default: [nil] do
19
+ self.user_home_dir ||= self.class.user_home_dir_from_env
20
+ end
21
+
22
+ DIRECTORIES.each do |item, subpath|
23
+ xdg_env_method_name = "#{item}_xdg_env"
24
+
25
+ define_method xdg_env_method_name do
26
+ ENV["XDG_#{item.upcase}_HOME"].if_present(&:to_pathname)
27
+ end
28
+
29
+ define_method "#{item}_dir" do
30
+ (send(xdg_env_method_name) || user_home_dir.join(subpath)).join(app_name)
31
+ end
32
+ end
33
+ end
34
+ end
@@ -1,12 +1,12 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'eac_cli/speaker'
3
+ require 'eac_ruby_utils/core_ext'
4
4
  require 'eac_ruby_utils/settings_provider'
5
5
 
6
6
  module EacRubyBase0
7
7
  module JobsRunner
8
8
  common_concern do
9
- include ::EacCli::Speaker
9
+ enable_speaker
10
10
  include ::EacRubyUtils::SettingsProvider
11
11
  end
12
12
 
@@ -1,6 +1,9 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require 'eac_cli/core_ext'
4
+ require 'eac_cli/speaker'
5
+ require 'eac_config/node'
6
+ require 'eac_ruby_utils/speaker'
4
7
 
5
8
  module EacRubyBase0
6
9
  module Runner
@@ -20,13 +23,13 @@ module EacRubyBase0
20
23
  end
21
24
 
22
25
  def run
23
- on_speaker_node do |node|
24
- node.stderr = ::StringIO.new if parsed.quiet?
25
- node.stdin = FailIfRequestInput.new if parsed.no_input?
26
- if parsed.version?
27
- show_version
28
- else
29
- run_with_subcommand
26
+ ::EacRubyUtils::Speaker.context.on(build_speaker) do
27
+ ::EacConfig::Node.context.on(runner_context.call(:application).build_config) do
28
+ if parsed.version?
29
+ show_version
30
+ else
31
+ run_with_subcommand
32
+ end
30
33
  end
31
34
  end
32
35
  end
@@ -48,5 +51,14 @@ module EacRubyBase0
48
51
  end
49
52
  end
50
53
  end
54
+
55
+ private
56
+
57
+ def build_speaker
58
+ options = {}
59
+ options[:err_out] = ::StringIO.new if parsed.quiet?
60
+ options[:in_in] = FailIfRequestInput.new if parsed.no_input?
61
+ ::EacCli::Speaker.new(options)
62
+ end
51
63
  end
52
64
  end
@@ -12,6 +12,7 @@ module EacRubyBase0
12
12
  common_concern do
13
13
  include ::EacCli::Runner
14
14
  enable_settings_provider
15
+ enable_simple_cache
15
16
  runner_definition do
16
17
  bool_opt '--no', 'Deny confirmation without question.'
17
18
  bool_opt '--yes', 'Accept confirmation without question.'
@@ -22,7 +23,7 @@ module EacRubyBase0
22
23
  return false if parsed.no?
23
24
  return true if parsed.yes?
24
25
 
25
- request_input(
26
+ input(
26
27
  message || setting_value(:confirm_question_text, default: DEFAULT_CONFIRM_QUESTION_TEXT),
27
28
  bool: true
28
29
  )
@@ -31,6 +32,12 @@ module EacRubyBase0
31
32
  def run_confirm(message = nil)
32
33
  yield if confirm?(message)
33
34
  end
35
+
36
+ private
37
+
38
+ def cached_confirm_uncached?(message = nil)
39
+ confirm?(message)
40
+ end
34
41
  end
35
42
  end
36
43
  end
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module EacRubyBase0
4
- VERSION = '0.7.3'
4
+ VERSION = '0.10.0'
5
5
  end
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
23
23
  s.test_files = Dir['{spec}/**/*', '.rspec']
24
24
 
25
25
  s.add_dependency 'bundler', '~> 2.2', '>= 2.2.17'
26
- s.add_dependency 'eac_ruby_utils', '~> 0.29'
26
+ s.add_dependency 'eac_ruby_utils', '~> 0.67'
27
27
 
28
28
  # Tests
29
29
  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
@@ -1,5 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require 'eac_ruby_utils/core_ext'
4
+
3
5
  module EacRubyGemsUtils
4
6
  module Tests
5
7
  class Multiple
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module EacRubyGemsUtils
4
- VERSION = '0.9.3'
4
+ VERSION = '0.9.4'
5
5
  end
@@ -6,7 +6,7 @@ module EacRubyUtils
6
6
  def parse(value)
7
7
  return parse_string(value) if value.is_a?(::String)
8
8
  return parse_string(value.to_s) if value.is_a?(::Symbol)
9
- return parse_number(value) if value.is_a?(::Number)
9
+ return parse_number(value) if value.is_a?(::Numeric)
10
10
 
11
11
  value ? true : false
12
12
  end
@@ -0,0 +1,9 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/speaker/sender'
4
+
5
+ class Module
6
+ def enable_speaker
7
+ include ::EacRubyUtils::Speaker::Sender
8
+ end
9
+ end
@@ -0,0 +1,11 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'pathname'
4
+
5
+ class Pathname
6
+ # Apply .parent n times.
7
+ # @return [Pathname]
8
+ def parent_n(n) # rubocop:disable Naming/MethodParameterName
9
+ n.times.inject(self) { |a, _e| a.parent }
10
+ end
11
+ end
@@ -3,11 +3,19 @@
3
3
  module EacRubyUtils
4
4
  module SimpleCache
5
5
  UNCACHED_METHOD_NAME_SUFFIX = '_uncached'
6
- UNCACHED_METHOD_PATTERN = /\A(\s+)_#{::Regexp.quote(UNCACHED_METHOD_NAME_SUFFIX)}\z/.freeze
6
+ UNCACHED_METHOD_PATTERN = /
7
+ \A(\s+)_#{::Regexp.quote(UNCACHED_METHOD_NAME_SUFFIX)}([\!\?]?)\z
8
+ /x.freeze
7
9
 
8
10
  class << self
9
11
  def uncached_method_name(method_name)
10
- "#{method_name}#{UNCACHED_METHOD_NAME_SUFFIX}"
12
+ method_name = method_name.to_s
13
+ end_mark = nil
14
+ if %w[! ?].any? { |mark| method_name.end_with?(mark) }
15
+ end_mark = method_name[-1]
16
+ method_name = method_name[0..-2]
17
+ end
18
+ "#{method_name}#{UNCACHED_METHOD_NAME_SUFFIX}#{end_mark}"
11
19
  end
12
20
  end
13
21
 
@@ -0,0 +1,16 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/contextualizable'
4
+
5
+ module EacRubyUtils
6
+ module Speaker
7
+ include ::EacRubyUtils::Contextualizable
8
+
9
+ class << self
10
+ # @return [EacRubyUtils::Speaker::Receiver]
11
+ def current_receiver
12
+ context.current
13
+ end
14
+ end
15
+ end
16
+ end
@@ -0,0 +1,57 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/abstract_methods'
4
+
5
+ module EacRubyUtils
6
+ module Speaker
7
+ module Receiver
8
+ extend ::EacRubyUtils::AbstractMethods
9
+
10
+ def error(_string)
11
+ raise_abstract_method(__FILE__)
12
+ end
13
+
14
+ def fatal_error(string)
15
+ error(string)
16
+ ::Kernel.exit 1 # rubocop:disable Rails/Exit
17
+ end
18
+
19
+ # @see EacRubyUtils::Speaker::Sender.input
20
+ def input(_question, _options = {})
21
+ raise_abstract_method(__FILE__)
22
+ end
23
+
24
+ def info(_string)
25
+ raise_abstract_method(__FILE__)
26
+ end
27
+
28
+ def infom(_string)
29
+ raise_abstract_method(__FILE__)
30
+ end
31
+
32
+ def infov(*_args)
33
+ raise_abstract_method(__FILE__)
34
+ end
35
+
36
+ def out(_string = '')
37
+ raise_abstract_method(__FILE__)
38
+ end
39
+
40
+ def puts(_string = '')
41
+ raise_abstract_method(__FILE__)
42
+ end
43
+
44
+ def success(_string)
45
+ raise_abstract_method(__FILE__)
46
+ end
47
+
48
+ def title(_string)
49
+ raise_abstract_method(__FILE__)
50
+ end
51
+
52
+ def warn(_string)
53
+ raise_abstract_method(__FILE__)
54
+ end
55
+ end
56
+ end
57
+ end
@@ -0,0 +1,32 @@
1
+ # frozen_string_literal: true
2
+
3
+ module EacRubyUtils
4
+ module Speaker
5
+ module Sender
6
+ delegate :error, :fatal_error, :info, :infom, :title, :success, :warn, to: :speaker_receiver
7
+
8
+ def infov(*args)
9
+ speaker_receiver.infov(*args)
10
+ end
11
+
12
+ delegate :out, to: :speaker_receiver
13
+
14
+ delegate :puts, to: :speaker_receiver
15
+
16
+ # Shortcut to [EacRubyUtils::Speaker.current_receiver].
17
+ #
18
+ # @return [EacRubyUtils::Speaker::Receiver]
19
+ def speaker_receiver
20
+ ::EacRubyUtils::Speaker.current_receiver
21
+ end
22
+
23
+ # Options:
24
+ # +bool+ ([Boolean], default: +false+): requires a answer "yes" or "no".
25
+ # +list+ ([Hash] or [Array], default: +nil+): requires a answer from a list.
26
+ # +noecho+ ([Boolean], default: +false+): does not output answer.
27
+ def input(question, options = {})
28
+ speaker_receiver.input(question, options)
29
+ end
30
+ end
31
+ end
32
+ end