avm-tools 0.99.1 → 0.102.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (139) hide show
  1. checksums.yaml +4 -4
  2. data/lib/avm/app_src.rb +8 -7
  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/git/auto_commit/rules/manual.rb +1 -1
  10. data/lib/avm/git/issue/complete.rb +4 -8
  11. data/lib/avm/git/issue/complete/commits.rb +42 -0
  12. data/lib/avm/git/issue/complete/git_subrepos.rb +23 -0
  13. data/lib/avm/git/issue/complete/local_branch.rb +54 -0
  14. data/lib/avm/git/issue/complete/local_tag.rb +39 -0
  15. data/lib/avm/git/issue/complete/push.rb +54 -0
  16. data/lib/avm/git/issue/complete/remote.rb +33 -0
  17. data/lib/avm/git/issue/complete/test.rb +45 -0
  18. data/lib/avm/git/issue/complete/tracker.rb +28 -0
  19. data/lib/avm/git/issue/complete/validations.rb +53 -0
  20. data/lib/avm/git/issue/complete/working_tree.rb +19 -0
  21. data/lib/avm/git/revision_test.rb +9 -6
  22. data/lib/avm/instances/base/dockerizable.rb +1 -0
  23. data/lib/avm/instances/base/entry_keys.rb +6 -1
  24. data/lib/avm/instances/docker_image.rb +15 -0
  25. data/lib/avm/instances/entries.rb +0 -1
  26. data/lib/avm/instances/entry.rb +3 -2
  27. data/lib/avm/instances/entry_keys.rb +3 -0
  28. data/lib/avm/launcher/context.rb +1 -1
  29. data/lib/avm/launcher/git/publish_base.rb +3 -1
  30. data/lib/avm/launcher/git/warp_base.rb +11 -0
  31. data/lib/avm/launcher/instances/base.rb +2 -1
  32. data/lib/avm/launcher/instances/error.rb +1 -3
  33. data/lib/avm/launcher/ruby/gem/build.rb +1 -1
  34. data/lib/avm/projects/stereotype/job_comparator.rb +32 -0
  35. data/lib/avm/projects/stereotypes/git/update.rb +1 -2
  36. data/lib/avm/projects/stereotypes/ruby_gem/publish.rb +1 -1
  37. data/lib/avm/projects/stereotypes/ruby_gem/update.rb +4 -0
  38. data/lib/avm/self.rb +9 -0
  39. data/lib/avm/tools/runner.rb +4 -0
  40. data/lib/avm/tools/runner/app_src/version_bump.rb +1 -1
  41. data/lib/avm/tools/runner/config.rb +17 -0
  42. data/lib/avm/tools/runner/config/load_path.rb +48 -0
  43. data/lib/avm/tools/runner/eac_redmine_base0/dev_docker.rb +17 -0
  44. data/lib/avm/tools/runner/eac_redmine_base0/docker.rb +3 -0
  45. data/lib/avm/tools/runner/git/deploy.rb +2 -1
  46. data/lib/avm/tools/runner/git/issue.rb +4 -75
  47. data/lib/avm/tools/runner/git/issue/complete.rb +79 -0
  48. data/lib/avm/tools/runner/git/issue/deliver.rb +35 -0
  49. data/lib/avm/tools/runner/git/organize.rb +1 -1
  50. data/lib/avm/tools/version.rb +1 -1
  51. data/template/avm/eac_redmine_base0/docker_image/Dockerfile.template +47 -0
  52. data/template/avm/eac_redmine_base0/docker_image/apache_http_virtualhost.conf.template +10 -0
  53. data/template/avm/eac_redmine_base0/docker_image/apache_https_virtualhost.conf.template +16 -0
  54. data/template/avm/eac_redmine_base0/docker_image/install_settings.sh.template +29 -0
  55. data/template/avm/eac_redmine_base0/docker_image/start.sh.template +25 -0
  56. data/template/avm/eac_ubuntu_base0/docker_image/Dockerfile +1 -1
  57. data/vendor/avm-apps/avm-apps.gemspec +1 -1
  58. data/vendor/avm-apps/lib/avm/apps/config.rb +15 -0
  59. data/vendor/avm-apps/lib/avm/apps/jobs/base.rb +1 -1
  60. data/vendor/avm-apps/lib/avm/apps/version.rb +1 -1
  61. data/vendor/eac_cli/eac_cli.gemspec +1 -1
  62. data/vendor/eac_cli/lib/eac_cli/config.rb +19 -0
  63. data/vendor/eac_cli/lib/eac_cli/config/entry.rb +48 -0
  64. data/vendor/eac_cli/lib/eac_cli/config/entry/options.rb +57 -0
  65. data/vendor/eac_cli/lib/eac_cli/config/entry/undefined.rb +26 -0
  66. data/vendor/eac_cli/lib/eac_cli/definition/positional_argument.rb +6 -1
  67. data/vendor/eac_cli/lib/eac_cli/docopt/doc_builder/alternative.rb +3 -1
  68. data/vendor/eac_cli/lib/eac_cli/docopt_runner.rb +4 -8
  69. data/vendor/eac_cli/lib/eac_cli/docopt_runner/{_class_methods.rb → class_methods.rb} +5 -3
  70. data/vendor/eac_cli/lib/eac_cli/docopt_runner/context.rb +18 -0
  71. data/vendor/eac_cli/lib/eac_cli/old_configs.rb +0 -1
  72. data/vendor/eac_cli/lib/eac_cli/old_configs/entry_reader.rb +2 -2
  73. data/vendor/eac_cli/lib/eac_cli/old_configs_bridge.rb +37 -0
  74. data/vendor/eac_cli/lib/eac_cli/runner/after_class_methods.rb +20 -3
  75. data/vendor/eac_cli/lib/eac_cli/runner_with/help.rb +6 -2
  76. data/vendor/eac_cli/lib/eac_cli/runner_with/subcommands.rb +5 -1
  77. data/vendor/eac_cli/lib/eac_cli/speaker.rb +15 -19
  78. data/vendor/eac_cli/lib/eac_cli/speaker/_constants.rb +1 -1
  79. data/vendor/eac_cli/lib/eac_cli/speaker/list.rb +1 -1
  80. data/vendor/eac_cli/lib/eac_cli/speaker/options.rb +38 -0
  81. data/vendor/eac_cli/lib/eac_cli/version.rb +1 -1
  82. data/vendor/eac_cli/spec/lib/eac_cli/speaker_spec.rb +5 -9
  83. data/vendor/eac_config/lib/eac_config/entry.rb +7 -1
  84. data/vendor/eac_config/lib/eac_config/envvars_node.rb +25 -0
  85. data/vendor/eac_config/lib/eac_config/envvars_node/entry.rb +54 -0
  86. data/vendor/eac_config/lib/eac_config/load_path.rb +5 -13
  87. data/vendor/eac_config/lib/eac_config/node.rb +9 -2
  88. data/vendor/eac_config/lib/eac_config/node_entry.rb +2 -23
  89. data/vendor/eac_config/lib/eac_config/node_uri.rb +38 -0
  90. data/vendor/eac_config/lib/eac_config/old_configs.rb +1 -0
  91. data/vendor/eac_config/lib/eac_config/version.rb +1 -1
  92. data/vendor/eac_config/lib/eac_config/yaml_file_node.rb +9 -2
  93. data/vendor/eac_config/lib/eac_config/yaml_file_node/entry.rb +37 -0
  94. data/vendor/eac_config/spec/lib/eac_config/envvars_node/entry_spec.rb +14 -0
  95. data/vendor/eac_config/spec/lib/eac_config/envvars_node_spec.rb +40 -0
  96. data/vendor/eac_config/spec/lib/eac_config/yaml_file_node_spec_files/storage1.yaml +3 -1
  97. data/vendor/eac_config/spec/lib/eac_config/yaml_file_node_spec_files/storage1_2.yaml +2 -1
  98. data/vendor/eac_git/lib/eac_git/executables.rb +4 -0
  99. data/vendor/eac_git/lib/eac_git/local.rb +5 -1
  100. data/vendor/eac_git/lib/eac_git/local/commit/archive.rb +19 -0
  101. data/vendor/eac_git/lib/eac_git/local/subrepo.rb +2 -1
  102. data/vendor/eac_git/lib/eac_git/version.rb +1 -1
  103. data/vendor/eac_ruby_base0/eac_ruby_base0.gemspec +2 -2
  104. data/vendor/eac_ruby_base0/lib/eac_ruby_base0/application.rb +8 -11
  105. data/vendor/eac_ruby_base0/lib/eac_ruby_base0/application_xdg.rb +32 -0
  106. data/vendor/eac_ruby_base0/lib/eac_ruby_base0/jobs_runner.rb +2 -2
  107. data/vendor/eac_ruby_base0/lib/eac_ruby_base0/runner.rb +13 -6
  108. data/vendor/eac_ruby_base0/lib/eac_ruby_base0/runner_with/confirmation.rb +8 -1
  109. data/vendor/eac_ruby_base0/lib/eac_ruby_base0/version.rb +1 -1
  110. data/vendor/eac_ruby_gems_utils/eac_ruby_gems_utils.gemspec +1 -1
  111. data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/tests/multiple/decorated_gem.rb +2 -0
  112. data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/version.rb +1 -1
  113. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/context.rb +31 -0
  114. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/contextualizable.rb +12 -7
  115. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/context.rb +11 -0
  116. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/speaker.rb +9 -0
  117. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/simple_cache.rb +10 -2
  118. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/speaker.rb +16 -0
  119. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/speaker/receiver.rb +57 -0
  120. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/speaker/sender.rb +32 -0
  121. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/version.rb +1 -1
  122. data/vendor/{eac_cli/spec/lib → eac_ruby_utils/spec/lib/eac_ruby_utils/patches}/module/speaker_spec.rb +2 -2
  123. data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/simple_cache_spec.rb +18 -0
  124. metadata +49 -19
  125. data/lib/avm/configs.rb +0 -22
  126. data/lib/avm/git/issue/complete/_commits.rb +0 -40
  127. data/lib/avm/git/issue/complete/_git_subrepos.rb +0 -21
  128. data/lib/avm/git/issue/complete/_local_branch.rb +0 -52
  129. data/lib/avm/git/issue/complete/_local_tag.rb +0 -37
  130. data/lib/avm/git/issue/complete/_push.rb +0 -52
  131. data/lib/avm/git/issue/complete/_remote.rb +0 -31
  132. data/lib/avm/git/issue/complete/_test.rb +0 -43
  133. data/lib/avm/git/issue/complete/_tracker.rb +0 -26
  134. data/lib/avm/git/issue/complete/_validations.rb +0 -51
  135. data/lib/avm/git/issue/complete/_working_tree.rb +0 -17
  136. data/vendor/eac_cli/lib/eac_cli/patches/module.rb +0 -4
  137. data/vendor/eac_cli/lib/eac_cli/patches/module/speaker.rb +0 -10
  138. data/vendor/eac_cli/lib/eac_cli/speaker/_class_methods.rb +0 -37
  139. data/vendor/eac_cli/lib/eac_cli/speaker/node.rb +0 -24
@@ -58,7 +58,7 @@ module Avm
58
58
  return true if parsed.yes?
59
59
  return false if parsed.no?
60
60
 
61
- request_input('Confirm operations?', bool: true)
61
+ input('Confirm operations?', bool: true)
62
62
  end
63
63
 
64
64
  def repository_uncached
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module Tools
5
- VERSION = '0.99.1'
5
+ VERSION = '0.102.2'
6
6
  end
7
7
  end
@@ -0,0 +1,47 @@
1
+ FROM ubuntu:20.04
2
+ RUN apt-get update -y
3
+ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y sudo tzdata git apt-utils
4
+ RUN ln -fs /usr/share/zoneinfo/America/Sao_Paulo /etc/localtime
5
+ RUN dpkg-reconfigure --frontend noninteractive tzdata
6
+
7
+ # Usuário "%%redmine_user%%"
8
+ RUN /usr/sbin/useradd --shell /bin/bash --home-dir '%%redmine_user_home%%' --create-home '%%redmine_user%%'
9
+ RUN /bin/echo '%%redmine_user%%:%%redmine_user%%' | /usr/sbin/chpasswd
10
+ RUN /bin/chown '%%redmine_user%%:%%redmine_user%%' %%redmine_user_home%% -R
11
+ RUN /bin/echo "%%redmine_user%% ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/%%redmine_user%%_all_nopasswd && chmod 0440 /etc/sudoers.d/%%redmine_user%%_all_nopasswd
12
+
13
+ # Redmine / Código-fonte
14
+ RUN echo '%%redmine_source_git_id%%' '%%redmine_user_home%%/redmine_source_git_id'
15
+ ADD '%%redmine_source_path%%' '%%redmine_path%%/'
16
+ RUN chown -R '%%redmine_user%%:%%redmine_user%%' '%%redmine_user_home%%'
17
+
18
+ # Redmine / Configuração de instalação
19
+ USER '%%redmine_user%%'
20
+ WORKDIR '%%redmine_user_home%%'
21
+ COPY install_settings.sh "%%redmine_path%%/config/install.sh"
22
+
23
+ # Redmine / Instalação
24
+ USER '%%redmine_user%%'
25
+ WORKDIR '%%redmine_user_home%%'
26
+ RUN '%%redmine_path%%/plugins/redmine_installer/installer/run.sh' redmine_as_apache_base
27
+
28
+ # Apache / Configuração do virtualhost
29
+ COPY apache_http_virtualhost.conf /etc/apache2/sites-available/redmine.conf
30
+ COPY apache_https_virtualhost.conf /etc/apache2/sites-available/redmine_ssl.conf
31
+ USER root
32
+ RUN a2ensite redmine
33
+ RUN a2ensite redmine_ssl
34
+ RUN a2dissite 000-default
35
+ RUN a2enmod ssl
36
+ RUN service apache2 restart
37
+
38
+ # Portas
39
+ EXPOSE 80/tcp 443/tcp 22/tcp
40
+
41
+ # Execução
42
+ COPY start.sh '%%start_path%%'
43
+ RUN /bin/chmod +x '%%start_path%%'
44
+ RUN /bin/chown '%%redmine_user%%:%%redmine_user%%' '%%start_path%%'
45
+ USER '%%redmine_user%%'
46
+ WORKDIR '%%redmine_user_home%%'
47
+ ENTRYPOINT '%%start_path%%'
@@ -0,0 +1,10 @@
1
+ <VirtualHost _default_:80>
2
+ DocumentRoot "%%redmine_path%%/public"
3
+ PassengerEnabled On
4
+
5
+ <Directory "%%redmine_path%%/public" >
6
+ Allow from all
7
+ Options -MultiViews
8
+ Require all granted
9
+ </Directory>
10
+ </VirtualHost>
@@ -0,0 +1,16 @@
1
+ <IfModule mod_ssl.c>
2
+ <VirtualHost _default_:443>
3
+ SSLEngine on
4
+ SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
5
+ SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
6
+
7
+ DocumentRoot "%%redmine_path%%/public"
8
+ PassengerEnabled On
9
+
10
+ <Directory "%%redmine_path%%/public" >
11
+ Allow from all
12
+ Options -MultiViews
13
+ Require all granted
14
+ </Directory>
15
+ </VirtualHost>
16
+ </IfModule>
@@ -0,0 +1,29 @@
1
+ # Database (PostgreSQL)
2
+ export postgresql_database=redmine
3
+ export postgresql_database_test=redmine_test
4
+ export postgresql_user=redmine
5
+ export postgresql_password=redmine
6
+
7
+ # Git hosting
8
+ export gitolite_user=git
9
+ export gitolite_user_home="/var/lib/$gitolite_user"
10
+ export redmine_git_hosting_ssh_key_name=redmine_git_hosting_id
11
+ export git_repositories_hierarchical_organisation=false
12
+
13
+ # Address
14
+ export address_https=false
15
+ export address_host="%%web.hostname%%"
16
+ export address_port=
17
+ export address_path=
18
+
19
+ # Mail
20
+ export smtp_server='mail.trf1.jus.br'
21
+ export smtp_port='25'
22
+ export smtp_domain='trf1.jus.br'
23
+ export smtp_tls='false'
24
+ export smtp_enable_starttls_auto=''
25
+ export smtp_openssl_verify_mode=''
26
+ export smtp_authentication='none'
27
+ export smtp_username=''
28
+ export smtp_password=''
29
+ export mail_from='"redmine-trf1_0" <redmine@trf1.jus.br>'
@@ -0,0 +1,25 @@
1
+ #!/bin/bash
2
+
3
+ set -u
4
+ set -e
5
+
6
+ function title() {
7
+ printf ">>>> %s <<<<\n" "$1"
8
+ }
9
+
10
+ title 'Restarting Apache HTTPD service...'
11
+ sudo service apache2 restart
12
+
13
+ title 'Restarting SSH service...'
14
+ sudo service ssh restart
15
+
16
+ title 'Restarting PostgresSQL service...'
17
+ sudo service postgresql restart
18
+
19
+ title 'Requesting web interface...'
20
+ wget 'http://localhost' &> /dev/null
21
+
22
+ title 'Reading production log...'
23
+ LOG_FILE='%%redmine_path%%/log/production.log'
24
+ printf " * tail -f \"$LOG_FILE\":\n"
25
+ sudo tail -f "$LOG_FILE"
@@ -1,4 +1,4 @@
1
- FROM ubuntu:bionic
1
+ FROM ubuntu:20.04
2
2
  RUN apt-get update -y
3
3
  RUN apt-get install -y sudo tzdata
4
4
  RUN /usr/sbin/useradd --shell /bin/bash --home-dir /home/myuser --create-home myuser
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
12
12
 
13
13
  s.files = Dir['{lib}/**/*']
14
14
 
15
- s.add_dependency 'eac_ruby_utils', '~> 0.58', '>= 0.58.1'
15
+ s.add_dependency 'eac_ruby_utils', '~> 0.67'
16
16
 
17
17
  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
18
18
  end
@@ -0,0 +1,15 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+
5
+ module Avm
6
+ module Apps
7
+ class Config
8
+ enable_context
9
+
10
+ class << self
11
+ delegate :current, to: :context
12
+ end
13
+ end
14
+ end
15
+ end
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require 'avm/apps/jobs/variables_source'
4
- require 'eac_ruby_utils/core_ext'
4
+ require 'eac_cli/core_ext'
5
5
 
6
6
  module Avm
7
7
  module Apps
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module Apps
5
- VERSION = '0.2.1'
5
+ VERSION = '0.3.0'
6
6
  end
7
7
  end
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
15
15
  s.add_dependency 'colorize', '~> 0.8.1'
16
16
  s.add_dependency 'docopt', '~> 0.6.1'
17
17
  s.add_dependency 'eac_config', '~> 0.3'
18
- s.add_dependency 'eac_ruby_utils', '~> 0.64'
18
+ s.add_dependency 'eac_ruby_utils', '~> 0.67'
19
19
 
20
20
  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
21
21
  end
@@ -0,0 +1,19 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_config/envvars_node'
4
+ require 'eac_config/yaml_file_node'
5
+
6
+ module EacCli
7
+ class Config
8
+ require_sub __FILE__
9
+ attr_reader :sub
10
+
11
+ def initialize(sub_node)
12
+ @sub = sub_node
13
+ end
14
+
15
+ def entry(path, options = {})
16
+ ::EacCli::Config::Entry.new(self, path, options)
17
+ end
18
+ end
19
+ end
@@ -0,0 +1,48 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_cli/speaker'
4
+ require 'eac_config/entry_path'
5
+ require 'eac_ruby_utils/core_ext'
6
+
7
+ module EacCli
8
+ class Config
9
+ class Entry
10
+ require_sub __FILE__, include_modules: true
11
+ enable_listable
12
+ enable_simple_cache
13
+ enable_speaker
14
+
15
+ common_constructor :config, :path, :options do
16
+ self.path = ::EacConfig::EntryPath.assert(path)
17
+ self.options = ::EacCli::Config::Entry::Options.new(options)
18
+ end
19
+
20
+ def value
21
+ return sub_value_to_return if sub_entry.found?
22
+ return nil unless options.required?
23
+
24
+ puts "|#{sub_entry.path}|"
25
+
26
+ input_value
27
+ end
28
+
29
+ delegate :value=, to: :sub_entry
30
+
31
+ private
32
+
33
+ def sub_value_to_return
34
+ sub_entry.value.presence || ::EacRubyUtils::BlankNotBlank.instance
35
+ end
36
+
37
+ def sub_entry_uncached
38
+ config.sub.entry(path)
39
+ end
40
+
41
+ def input_value_uncached
42
+ r = send("#{options.type}_value")
43
+ sub_entry.value = r if options.store?
44
+ r
45
+ end
46
+ end
47
+ end
48
+ end
@@ -0,0 +1,57 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+
5
+ module EacCli
6
+ class Config
7
+ class Entry
8
+ class Options
9
+ enable_simple_cache
10
+ enable_listable
11
+
12
+ lists.add_symbol :type, :undefined
13
+
14
+ DEFAULT_VALUES = {
15
+ before_input: nil, bool: false, list: false, noecho: false, noenv: false, noinput: false,
16
+ required: true, store: true, type: TYPE_UNDEFINED, validator: nil
17
+ }.freeze
18
+
19
+ lists.add_symbol :option, *DEFAULT_VALUES.keys
20
+
21
+ common_constructor :options do
22
+ self.options = self.class.lists.option.hash_keys_validate!(options)
23
+ end
24
+
25
+ delegate :to_h, to: :options
26
+
27
+ def [](key)
28
+ values.fetch(key.to_sym)
29
+ end
30
+
31
+ def request_input_options
32
+ values.slice(:bool, :list, :noecho)
33
+ end
34
+
35
+ DEFAULT_VALUES.each do |attr, default_value|
36
+ define_method(attr.to_s + ([true, false].include?(default_value) ? '?' : '')) do
37
+ self[attr]
38
+ end
39
+ end
40
+
41
+ private
42
+
43
+ def values_uncached
44
+ consumer = options.to_options_consumer
45
+ r = {}
46
+ DEFAULT_VALUES.each do |key, default_value|
47
+ value = consumer.consume(key)
48
+ value = default_value if value.nil?
49
+ r[key] = value
50
+ end
51
+ consumer.validate
52
+ r
53
+ end
54
+ end
55
+ end
56
+ end
57
+ end
@@ -0,0 +1,26 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+
5
+ module EacCli
6
+ class Config
7
+ class Entry
8
+ module Undefined
9
+ private
10
+
11
+ def undefined_value
12
+ loop do
13
+ entry_value = undefined_value_no_loop
14
+ next unless options[:validator].if_present(true) { |v| v.call(entry_value) }
15
+
16
+ return entry_value
17
+ end
18
+ end
19
+
20
+ def undefined_value_no_loop
21
+ input("Value for entry \"#{path}\"", options.request_input_options)
22
+ end
23
+ end
24
+ end
25
+ end
26
+ end
@@ -6,9 +6,10 @@ module EacCli
6
6
  class Definition
7
7
  class PositionalArgument
8
8
  DEFAULT_REQUIRED = true
9
+ DEFAULT_VISIBLE = true
9
10
 
10
11
  enable_listable
11
- lists.add_symbol :option, :optional, :repeat, :required, :subcommand
12
+ lists.add_symbol :option, :optional, :repeat, :required, :subcommand, :visible
12
13
  common_constructor :name, :options, default: [{}] do
13
14
  options.assert_valid_keys(self.class.lists.option.values)
14
15
  end
@@ -51,6 +52,10 @@ module EacCli
51
52
  def to_s
52
53
  "#{self.class.name.demodulize}[#{identifier}]"
53
54
  end
55
+
56
+ def visible?
57
+ options.key?(OPTION_VISIBLE) ? options.fetch(OPTION_VISIBLE) : DEFAULT_VISIBLE
58
+ end
54
59
  end
55
60
  end
56
61
  end
@@ -31,10 +31,12 @@ module EacCli
31
31
  end
32
32
 
33
33
  def positionals
34
- alternative.positional.map { |p| positional(p) }
34
+ alternative.positional.map { |p| positional(p) }.reject(&:blank?)
35
35
  end
36
36
 
37
37
  def positional(positional)
38
+ return unless positional.visible?
39
+
38
40
  if positional.subcommand?
39
41
  ::EacCli::DocoptRunner::SUBCOMMANDS_MACRO
40
42
  else
@@ -1,17 +1,13 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'active_support/core_ext/hash/indifferent_access'
4
- require 'active_support/core_ext/hash/slice'
3
+ require 'eac_ruby_utils/core_ext'
5
4
  require 'docopt'
6
- require 'eac_ruby_utils/contextualizable'
7
- require 'eac_ruby_utils/patches/hash/sym_keys_hash'
8
- Dir["#{__dir__}/#{::File.basename(__FILE__, '.*')}/_*.rb"].sort.each do |partial|
9
- require partial
10
- end
11
5
 
12
6
  module EacCli
13
7
  class DocoptRunner
14
- include ::EacRubyUtils::Contextualizable
8
+ require_sub __FILE__
9
+ extend ::EacCli::DocoptRunner::ClassMethods
10
+ include ::EacCli::DocoptRunner::Context
15
11
 
16
12
  class << self
17
13
  def create(settings = {})
@@ -1,13 +1,15 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require 'docopt'
4
+
3
5
  module EacCli
4
6
  class DocoptRunner
5
- DOCOPT_ERROR_EXIT_CODE = 0xC0
7
+ module ClassMethods
8
+ DOCOPT_ERROR_EXIT_CODE = 0xC0
6
9
 
7
- class << self
8
10
  def run(options = {})
9
11
  create(options).send(:run)
10
- rescue Docopt::Exit => e
12
+ rescue ::Docopt::Exit => e
11
13
  STDERR.write(e.message + "\n")
12
14
  ::Kernel.exit(DOCOPT_ERROR_EXIT_CODE)
13
15
  end