avm-tools 0.102.2 → 0.103.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (103) hide show
  1. checksums.yaml +4 -4
  2. data/lib/avm/git/issue/complete/push.rb +1 -1
  3. data/lib/avm/projects/stereotypes/ruby_gem/local_project_mixin.rb +2 -2
  4. data/lib/avm/self/instance.rb +4 -0
  5. data/lib/avm/tools/runner/app_src/version_bump.rb +2 -2
  6. data/lib/avm/tools/runner/git/auto_commit.rb +1 -0
  7. data/lib/avm/tools/version.rb +1 -1
  8. data/vendor/avm-apps/lib/avm/apps/config.rb +6 -2
  9. data/vendor/avm-apps/lib/avm/apps/version.rb +1 -1
  10. data/vendor/avm-eac_rails_base1/Gemfile +5 -0
  11. data/vendor/avm-eac_rails_base1/avm-eac_rails_base1.gemspec +19 -0
  12. data/{lib → vendor/avm-eac_rails_base1/lib}/avm/eac_rails_base1.rb +0 -0
  13. data/{lib → vendor/avm-eac_rails_base1/lib}/avm/eac_rails_base1/apache_host.rb +0 -0
  14. data/{lib → vendor/avm-eac_rails_base1/lib}/avm/eac_rails_base1/instance.rb +0 -0
  15. data/{lib → vendor/avm-eac_rails_base1/lib}/avm/eac_rails_base1/runner.rb +0 -0
  16. data/{lib → vendor/avm-eac_rails_base1/lib}/avm/eac_rails_base1/runner/bundle.rb +0 -0
  17. data/{lib → vendor/avm-eac_rails_base1/lib}/avm/eac_rails_base1/runner/code_runner.rb +0 -0
  18. data/{lib → vendor/avm-eac_rails_base1/lib}/avm/eac_rails_base1/runner/log.rb +0 -0
  19. data/vendor/avm-eac_rails_base1/lib/avm/eac_rails_base1/runner/logs.rb +18 -0
  20. data/vendor/avm-eac_rails_base1/lib/avm/eac_rails_base1/runner/logs/clear.rb +26 -0
  21. data/{lib → vendor/avm-eac_rails_base1/lib}/avm/eac_rails_base1/runner/rails_server.rb +0 -0
  22. data/{lib → vendor/avm-eac_rails_base1/lib}/avm/eac_rails_base1/runner_with/bundle.rb +0 -0
  23. data/{lib → vendor/avm-eac_rails_base1/lib}/avm/eac_rails_base1/runner_with/rails_environment.rb +0 -0
  24. data/vendor/avm-eac_rails_base1/lib/avm/eac_rails_base1/version.rb +7 -0
  25. data/vendor/avm-eac_rails_base1/spec/rubocop_spec.rb +3 -0
  26. data/vendor/avm-eac_rails_base1/spec/spec_helper.rb +102 -0
  27. data/vendor/avm-eac_webapp_base0/Gemfile +5 -0
  28. data/vendor/avm-eac_webapp_base0/avm-eac_webapp_base0.gemspec +19 -0
  29. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0.rb +2 -2
  30. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/apache_host.rb +0 -0
  31. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/apache_path.rb +0 -0
  32. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/deploy.rb +0 -0
  33. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/deploy/appended_directories.rb +0 -0
  34. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/deploy/build.rb +0 -0
  35. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/deploy/file_unit.rb +0 -0
  36. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/deploy/git_info.rb +0 -0
  37. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/deploy/version.rb +0 -0
  38. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/deploy/write_on_target.rb +0 -0
  39. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/instance.rb +0 -0
  40. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/instance/subcommand_parent.rb +0 -0
  41. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/runner.rb +0 -0
  42. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/runner/apache_host.rb +0 -0
  43. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/runner/apache_path.rb +0 -0
  44. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/runner/data.rb +0 -0
  45. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/runner/data/dump.rb +0 -0
  46. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/runner/data/load.rb +0 -0
  47. data/{lib → vendor/avm-eac_webapp_base0/lib}/avm/eac_webapp_base0/runner/deploy.rb +0 -0
  48. data/vendor/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/version.rb +7 -0
  49. data/vendor/avm-eac_webapp_base0/spec/rubocop_spec.rb +3 -0
  50. data/vendor/avm-eac_webapp_base0/spec/spec_helper.rb +102 -0
  51. data/vendor/avm/Gemfile +5 -0
  52. data/vendor/avm/avm.gemspec +19 -0
  53. data/vendor/avm/lib/avm.rb +7 -0
  54. data/vendor/avm/lib/avm/docker.rb +9 -0
  55. data/{lib → vendor/avm/lib}/avm/docker/container.rb +5 -5
  56. data/{lib → vendor/avm/lib}/avm/docker/image.rb +3 -4
  57. data/{lib → vendor/avm/lib}/avm/docker/runner.rb +6 -6
  58. data/vendor/avm/lib/avm/version.rb +5 -0
  59. data/{lib/avm/version.rb → vendor/avm/lib/avm/version_number.rb} +1 -1
  60. data/vendor/avm/spec/rubocop_spec.rb +3 -0
  61. data/vendor/avm/spec/spec_helper.rb +102 -0
  62. data/vendor/eac_cli/eac_cli.gemspec +0 -1
  63. data/vendor/eac_cli/lib/eac_cli/config.rb +1 -2
  64. data/vendor/eac_cli/lib/eac_cli/config/entry.rb +1 -1
  65. data/vendor/eac_cli/lib/eac_cli/definition/help_formatter.rb +3 -2
  66. data/vendor/eac_cli/lib/eac_cli/old_configs_bridge.rb +2 -0
  67. data/vendor/eac_cli/lib/eac_cli/runner.rb +0 -2
  68. data/vendor/eac_cli/lib/eac_cli/runner/instance_methods.rb +5 -1
  69. data/vendor/eac_cli/lib/eac_cli/runner_with/help.rb +3 -2
  70. data/vendor/eac_cli/lib/eac_cli/runner_with/help/builder.rb +73 -0
  71. data/vendor/eac_cli/lib/eac_cli/runner_with/help/builder/alternative.rb +56 -0
  72. data/vendor/eac_cli/lib/eac_cli/runner_with/subcommands.rb +1 -3
  73. data/vendor/eac_cli/lib/eac_cli/version.rb +1 -1
  74. data/vendor/eac_cli/spec/lib/eac_cli/parser/alternative_spec.rb +1 -1
  75. data/vendor/eac_cli/spec/lib/eac_cli/runner_spec.rb +0 -1
  76. data/vendor/eac_config/lib/eac_config/node.rb +7 -0
  77. data/vendor/eac_config/lib/eac_config/version.rb +1 -1
  78. data/vendor/eac_ruby_base0/lib/eac_ruby_base0/application.rb +17 -0
  79. data/vendor/eac_ruby_base0/lib/eac_ruby_base0/application_xdg.rb +2 -0
  80. data/vendor/eac_ruby_base0/lib/eac_ruby_base0/runner.rb +7 -4
  81. data/vendor/eac_ruby_base0/lib/eac_ruby_base0/version.rb +1 -1
  82. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname/parent_n.rb +11 -0
  83. data/vendor/eac_ruby_utils/lib/eac_ruby_utils/version.rb +1 -1
  84. data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/pathname/parent_n_spec.rb +33 -0
  85. data/vendor/eac_templates/eac_templates.gemspec +1 -1
  86. data/vendor/eac_templates/lib/eac_templates/variable_providers.rb +1 -1
  87. data/vendor/eac_templates/lib/eac_templates/variable_providers/config_reader.rb +27 -0
  88. data/vendor/eac_templates/lib/eac_templates/version.rb +1 -1
  89. metadata +73 -49
  90. data/lib/avm/docker.rb +0 -9
  91. data/lib/avm/docker/registry.rb +0 -19
  92. data/vendor/eac_cli/lib/eac_cli/docopt/doc_builder.rb +0 -71
  93. data/vendor/eac_cli/lib/eac_cli/docopt/doc_builder/alternative.rb +0 -52
  94. data/vendor/eac_cli/lib/eac_cli/docopt/runner_context_replacement.rb +0 -15
  95. data/vendor/eac_cli/lib/eac_cli/docopt/runner_extension.rb +0 -51
  96. data/vendor/eac_cli/lib/eac_cli/docopt_runner.rb +0 -39
  97. data/vendor/eac_cli/lib/eac_cli/docopt_runner/_doc.rb +0 -23
  98. data/vendor/eac_cli/lib/eac_cli/docopt_runner/_settings.rb +0 -17
  99. data/vendor/eac_cli/lib/eac_cli/docopt_runner/_subcommands.rb +0 -152
  100. data/vendor/eac_cli/lib/eac_cli/docopt_runner/class_methods.rb +0 -18
  101. data/vendor/eac_cli/lib/eac_cli/docopt_runner/context.rb +0 -18
  102. data/vendor/eac_cli/spec/lib/eac_cli/docopt/runner_extension_spec.rb +0 -35
  103. data/vendor/eac_cli/spec/lib/eac_cli/docopt_runner_spec.rb +0 -136
@@ -0,0 +1,5 @@
1
+ # frozen_string_literal: true
2
+
3
+ source 'https://rubygems.org'
4
+
5
+ gemspec
@@ -0,0 +1,19 @@
1
+ # frozen_string_literal: true
2
+
3
+ $LOAD_PATH.push File.expand_path('lib', __dir__)
4
+
5
+ require 'avm/version'
6
+
7
+ Gem::Specification.new do |s|
8
+ s.name = 'avm'
9
+ s.version = Avm::VERSION
10
+ s.authors = ['Eduardo H. Bogoni']
11
+ s.summary = 'Ruby base library for Agora Vai! Methodology (https://avm.esquiloazul.tech).'
12
+
13
+ s.files = Dir['{lib}/**/*']
14
+
15
+ s.add_dependency 'eac_docker', '~> 0.2', '>= 0.2.2'
16
+ s.add_dependency 'eac_ruby_utils', '~> 0.68'
17
+
18
+ s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
19
+ end
@@ -0,0 +1,7 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+
5
+ module Avm
6
+ require_sub __FILE__
7
+ end
@@ -0,0 +1,9 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+
5
+ module Avm
6
+ module Docker
7
+ require_sub __FILE__
8
+ end
9
+ end
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'avm/core_ext'
4
- require 'avm/executables'
3
+ require 'eac_docker/executables'
4
+ require 'eac_ruby_utils/core_ext'
5
5
 
6
6
  module Avm
7
7
  module Docker
@@ -10,7 +10,7 @@ module Avm
10
10
  common_constructor :instance
11
11
 
12
12
  def remove
13
- ::Avm::Executables.docker.command.append(
13
+ ::EacDocker::Executables.docker.command.append(
14
14
  ['rm', '--force', instance.docker_container_name]
15
15
  ).system!
16
16
  end
@@ -28,12 +28,12 @@ module Avm
28
28
 
29
29
  def run_run(options)
30
30
  infom "\"docker run #{instance.docker_container_name}...\""
31
- ::Avm::Executables.docker.command.append(run_run_arguments(options)).system!
31
+ ::EacDocker::Executables.docker.command.append(run_run_arguments(options)).system!
32
32
  end
33
33
 
34
34
  def run_start
35
35
  infom "\"docker start #{instance.docker_container_name}...\""
36
- ::Avm::Executables.docker.command.append(run_start_arguments).system!
36
+ ::EacDocker::Executables.docker.command.append(run_start_arguments).system!
37
37
  end
38
38
 
39
39
  def run_run_arguments(options)
@@ -1,8 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require 'avm/version'
3
4
  require 'eac_ruby_utils/core_ext'
4
- require 'avm/executables'
5
- require 'avm/patches/object/template'
6
5
  require 'eac_docker/images/templatized'
7
6
 
8
7
  module Avm
@@ -25,11 +24,11 @@ module Avm
25
24
  end
26
25
 
27
26
  def generator_version
28
- ::Avm::Tools::VERSION
27
+ ::Avm::VERSION
29
28
  end
30
29
 
31
30
  def push
32
- ::Avm::Executables.docker.command.append(['push', tag]).system!
31
+ ::EacDocker::Executables.docker.command.append(['push', tag]).system!
33
32
  end
34
33
 
35
34
  def read_entry(path, options = {})
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'avm/core_ext'
4
- require 'avm/docker/registry'
3
+ require 'eac_docker/registry'
4
+ require 'eac_ruby_utils/core_ext'
5
5
 
6
6
  module Avm
7
7
  module Docker
@@ -88,21 +88,21 @@ module Avm
88
88
  end
89
89
 
90
90
  def registry_from_option
91
- parsed.registry_name.if_present { |v| ::Avm::Docker::Registry.new(v) }
91
+ parsed.registry_name.if_present { |v| ::EacDocker::Registry.new(v) }
92
92
  end
93
93
 
94
94
  def registry_from_instance
95
95
  if if_respond(:use_default_registry?, true)
96
- instance.docker_registry_optional.if_present { |v| ::Avm::Docker::Registry.new(v) }
96
+ instance.docker_registry_optional.if_present { |v| ::EacDocker::Registry.new(v) }
97
97
  else
98
- ::Avm::Docker::Registry.new(instance.docker_registry)
98
+ ::EacDocker::Registry.new(instance.docker_registry)
99
99
  end
100
100
  end
101
101
 
102
102
  def registry_from_default
103
103
  return nil unless if_respond(:use_default_registry?, true)
104
104
 
105
- ::Avm::Docker::Registry.default
105
+ nyi 'Was "::Avm::Docker::Registry.default"'
106
106
  end
107
107
 
108
108
  def snapshot?
@@ -0,0 +1,5 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Avm
4
+ VERSION = '0.1.0'
5
+ end
@@ -2,7 +2,7 @@
2
2
 
3
3
  module Avm
4
4
  # A sequence of segments of integer versions (Ex.: 2, 1.0.1, 3.0.0.0.0).
5
- class Version
5
+ class VersionNumber
6
6
  include ::Comparable
7
7
 
8
8
  SEGMENT_SEPARATOR = '.'
@@ -0,0 +1,3 @@
1
+ # frozen_string_literal: true
2
+
3
+ ::EacRubyGemSupport::Rspec.default.describe_rubocop
@@ -0,0 +1,102 @@
1
+ # frozen_string_literal: true
2
+
3
+ # This file was generated by the `rspec --init` command. Conventionally, all
4
+ # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
5
+ # The generated `.rspec` file contains `--require spec_helper` which will cause
6
+ # this file to always be loaded, without a need to explicitly require it in any
7
+ # files.
8
+ #
9
+ # Given that it is always loaded, you are encouraged to keep this file as
10
+ # light-weight as possible. Requiring heavyweight dependencies from this file
11
+ # will add to the boot time of your test suite on EVERY test run, even for an
12
+ # individual file that may not need all of that loaded. Instead, consider making
13
+ # a separate helper file that requires the additional dependencies and performs
14
+ # the additional setup, and require it from the spec files that actually need
15
+ # it.
16
+ #
17
+ # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
18
+ RSpec.configure do |config|
19
+ # rspec-expectations config goes here. You can use an alternate
20
+ # assertion/expectation library such as wrong or the stdlib/minitest
21
+ # assertions if you prefer.
22
+ config.expect_with :rspec do |expectations|
23
+ # This option will default to `true` in RSpec 4. It makes the `description`
24
+ # and `failure_message` of custom matchers include text for helper methods
25
+ # defined using `chain`, e.g.:
26
+ # be_bigger_than(2).and_smaller_than(4).description
27
+ # # => "be bigger than 2 and smaller than 4"
28
+ # ...rather than:
29
+ # # => "be bigger than 2"
30
+ expectations.include_chain_clauses_in_custom_matcher_descriptions = true
31
+ end
32
+
33
+ # rspec-mocks config goes here. You can use an alternate test double
34
+ # library (such as bogus or mocha) by changing the `mock_with` option here.
35
+ config.mock_with :rspec do |mocks|
36
+ # Prevents you from mocking or stubbing a method that does not exist on
37
+ # a real object. This is generally recommended, and will default to
38
+ # `true` in RSpec 4.
39
+ mocks.verify_partial_doubles = true
40
+ end
41
+
42
+ # This option will default to `:apply_to_host_groups` in RSpec 4 (and will
43
+ # have no way to turn it off -- the option exists only for backwards
44
+ # compatibility in RSpec 3). It causes shared context metadata to be
45
+ # inherited by the metadata hash of host groups and examples, rather than
46
+ # triggering implicit auto-inclusion in groups with matching metadata.
47
+ config.shared_context_metadata_behavior = :apply_to_host_groups
48
+
49
+ # The settings below are suggested to provide a good initial experience
50
+ # with RSpec, but feel free to customize to your heart's content.
51
+ # # This allows you to limit a spec run to individual examples or groups
52
+ # # you care about by tagging them with `:focus` metadata. When nothing
53
+ # # is tagged with `:focus`, all examples get run. RSpec also provides
54
+ # # aliases for `it`, `describe`, and `context` that include `:focus`
55
+ # # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
56
+ # config.filter_run_when_matching :focus
57
+ #
58
+ # # Allows RSpec to persist some state between runs in order to support
59
+ # # the `--only-failures` and `--next-failure` CLI options. We recommend
60
+ # # you configure your source control system to ignore this file.
61
+ # config.example_status_persistence_file_path = "spec/examples.txt"
62
+ #
63
+ # # Limits the available syntax to the non-monkey patched syntax that is
64
+ # # recommended. For more details, see:
65
+ # # - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
66
+ # # - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
67
+ # # - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
68
+ # config.disable_monkey_patching!
69
+ #
70
+ # # This setting enables warnings. It's recommended, but in some cases may
71
+ # # be too noisy due to issues in dependencies.
72
+ # config.warnings = true
73
+ #
74
+ # # Many RSpec users commonly either run the entire suite or an individual
75
+ # # file, and it's useful to allow more verbose output when running an
76
+ # # individual spec file.
77
+ # if config.files_to_run.one?
78
+ # # Use the documentation formatter for detailed output,
79
+ # # unless a formatter has already been configured
80
+ # # (e.g. via a command-line flag).
81
+ # config.default_formatter = "doc"
82
+ # end
83
+ #
84
+ # # Print the 10 slowest examples and example groups at the
85
+ # # end of the spec run, to help surface which specs are running
86
+ # # particularly slow.
87
+ # config.profile_examples = 10
88
+ #
89
+ # # Run specs in random order to surface order dependencies. If you find an
90
+ # # order dependency and want to debug it, you can fix the order by providing
91
+ # # the seed, which is printed after each run.
92
+ # # --seed 1234
93
+ # config.order = :random
94
+ #
95
+ # # Seed global randomization in this process using the `--seed` CLI option.
96
+ # # Setting this allows you to use `--seed` to deterministically reproduce
97
+ # # test failures related to randomization by passing the same `--seed` value
98
+ # # as the one that triggered the failure.
99
+ # Kernel.srand config.seed
100
+ require 'eac_ruby_gem_support/rspec'
101
+ ::EacRubyGemSupport::Rspec.setup(::File.expand_path('..', __dir__))
102
+ end
@@ -13,7 +13,6 @@ Gem::Specification.new do |s|
13
13
  s.files = Dir['{lib}/**/*', 'Gemfile']
14
14
 
15
15
  s.add_dependency 'colorize', '~> 0.8.1'
16
- s.add_dependency 'docopt', '~> 0.6.1'
17
16
  s.add_dependency 'eac_config', '~> 0.3'
18
17
  s.add_dependency 'eac_ruby_utils', '~> 0.67'
19
18
 
@@ -1,7 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'eac_config/envvars_node'
4
- require 'eac_config/yaml_file_node'
3
+ require 'eac_ruby_utils/core_ext'
5
4
 
6
5
  module EacCli
7
6
  class Config
@@ -26,7 +26,7 @@ module EacCli
26
26
  input_value
27
27
  end
28
28
 
29
- delegate :value=, to: :sub_entry
29
+ delegate :found?, :value=, to: :sub_entry
30
30
 
31
31
  private
32
32
 
@@ -1,5 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require 'eac_cli/runner_with/help/builder/alternative'
3
4
  require 'eac_ruby_utils/core_ext'
4
5
 
5
6
  module EacCli
@@ -27,7 +28,7 @@ module EacCli
27
28
 
28
29
  def positional_argument(positional)
29
30
  if positional.subcommand?
30
- ::EacCli::DocoptRunner::SUBCOMMANDS_MACRO
31
+ ::EacCli::RunnerWith::Help::Builder::Alternative::SUBCOMMANDS_MACRO
31
32
  else
32
33
  r = "<#{positional.name}>"
33
34
  r += '...' if positional.repeat?
@@ -52,7 +53,7 @@ module EacCli
52
53
  end
53
54
 
54
55
  def self_usage_arguments
55
- [::EacCli::DocoptRunner::PROGRAM_MACRO] +
56
+ [::EacCli::RunnerWith::Help::Builder::Alternative::PROGRAM_MACRO] +
56
57
  definition.options_argument.if_present([]) { |_v| ['[options]'] } +
57
58
  self_usage_arguments_options +
58
59
  self_usage_arguments_positional
@@ -1,6 +1,8 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require 'eac_cli/config'
4
+ require 'eac_config/envvars_node'
5
+ require 'eac_config/yaml_file_node'
4
6
  require 'eac_ruby_utils/core_ext'
5
7
 
6
8
  module EacCli
@@ -1,7 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require 'eac_cli/definition'
4
- require 'eac_cli/docopt/runner_extension'
5
4
  require 'eac_cli/parser'
6
5
  require 'eac_ruby_utils/core_ext'
7
6
 
@@ -43,7 +42,6 @@ module EacCli
43
42
 
44
43
  extend AfterClassMethods
45
44
  include InstanceMethods
46
- ::EacCli::Docopt::RunnerExtension.check(self)
47
45
  include ActiveSupport::Callbacks
48
46
  define_callbacks :run
49
47
  end
@@ -15,7 +15,7 @@ module EacCli
15
15
  end
16
16
 
17
17
  def run_parser_error(error)
18
- $stderr.write("#{error}\n")
18
+ $stderr.write("#{program_name}: #{error}\n")
19
19
  ::Kernel.exit(PARSER_ERROR_EXIT_CODE)
20
20
  end
21
21
 
@@ -33,6 +33,10 @@ module EacCli
33
33
  def parsed
34
34
  @parsed ||= ::EacCli::Parser.new(self.class.runner_definition, runner_context.argv).parsed
35
35
  end
36
+
37
+ def program_name
38
+ runner_context.if_present(&:program_name) || $PROGRAM_NAME
39
+ end
36
40
  end
37
41
  end
38
42
  end
@@ -6,11 +6,12 @@ require 'eac_ruby_utils/core_ext'
6
6
  module EacCli
7
7
  module RunnerWith
8
8
  module Help
9
+ require_sub __FILE__
9
10
  common_concern do
10
11
  include ::EacCli::Runner
11
12
 
12
13
  runner_definition.alt do
13
- bool_opt '-h', '--help', 'Show help.', usage: true
14
+ bool_opt '-h', '--help', 'Show help.', usage: true, required: true
14
15
  pos_arg :any_arg_with_help, repeat: true, optional: true, visible: false
15
16
  end
16
17
 
@@ -27,7 +28,7 @@ module EacCli
27
28
  end
28
29
 
29
30
  def help_text
30
- r = ::EacCli::Docopt::DocBuilder.new(self.class.runner_definition).to_s
31
+ r = ::EacCli::RunnerWith::Help::Builder.new(self.class.runner_definition).to_s
31
32
  r += help_extra_text if respond_to?(:help_extra_text)
32
33
  r
33
34
  end
@@ -0,0 +1,73 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+
5
+ module EacCli
6
+ module RunnerWith
7
+ module Help
8
+ class Builder
9
+ require_sub __FILE__
10
+ common_constructor :definition
11
+
12
+ SEP = ' '
13
+ IDENT = SEP * 2
14
+ OPTION_DESC_SEP = IDENT * 2
15
+
16
+ class << self
17
+ def option_long(option)
18
+ b = option.long
19
+ b += '=<value>' if option.argument?
20
+ b
21
+ end
22
+
23
+ def option_short(option)
24
+ b = option.short
25
+ b += '=<value>' if option.argument?
26
+ b
27
+ end
28
+
29
+ def option_usage_full(option)
30
+ if option.long.present?
31
+ [option.short, option_long(option)].reject(&:blank?).join(SEP)
32
+ else
33
+ option_short(option)
34
+ end
35
+ end
36
+ end
37
+
38
+ def option_definition(option)
39
+ self.class.option_usage_full(option) + option.description.if_present('') do |v|
40
+ OPTION_DESC_SEP + v
41
+ end
42
+ end
43
+
44
+ def section(header, include_header = true)
45
+ b = include_header ? "#{header.humanize}:\n" : ''
46
+ b += send("self_#{header}") + "\n"
47
+ definition.alternatives.each do |alternative|
48
+ b += IDENT + ::EacCli::RunnerWith::Help::Builder::Alternative.new(alternative).to_s +
49
+ "\n"
50
+ end
51
+ b
52
+ end
53
+
54
+ def options_section
55
+ "Options:\n" +
56
+ definition.alternatives.flat_map(&:options)
57
+ .map { |option| IDENT + option_definition(option) + "\n" }.join
58
+ end
59
+
60
+ def usage_section
61
+ "Usage:\n" +
62
+ definition.alternatives.map do |alternative|
63
+ IDENT + ::EacCli::RunnerWith::Help::Builder::Alternative.new(alternative).to_s + "\n"
64
+ end.join
65
+ end
66
+
67
+ def to_s
68
+ "#{definition.description}\n\n#{usage_section}\n#{options_section}\n"
69
+ end
70
+ end
71
+ end
72
+ end
73
+ end