avm-tools 0.117.1 → 0.117.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c5b9e1cd2e14d276b38a0efe3965a884143065eafbade65938f37f72f0857e9
-  data.tar.gz: 81d047244f7fa7478bffc26e23457da9da5cc7e33839b6108e7fe55cb78a4706
+  metadata.gz: 35fb18a5736eb65f686b0915a77da3f4e548a64b0ce7e0bd5bc754483c675757
+  data.tar.gz: 053eeec2795b4cf08660991b06d13127e1a66b112a084642f8213fbe89a82e59
 SHA512:
-  metadata.gz: 4c802171d7c42fde415e6674888a0d430c003107d87846e7159cfc5aebb7d04a604b7b7f6c034b9d0081206e111f373e13e7fada07e2130d92624409f4389b17
-  data.tar.gz: 30765546f1f0faab035133812dd4f0508ac5a63112e2aa1925758c1bf66e7a81d92e01ed61f298c9f05f12cd156d49940d333c89ce3f9971b40021ef9c566bfd
+  metadata.gz: 356218e0b80f21fbd6612ef6f88b49112ee7d97bff1c7b3ef21039964f024dffbcf0944d4ab01b82c6f919384b0bba401319572911599154a418f8a1e3d50c99
+  data.tar.gz: f290a18803f13ae99202ec10ee6106f267913a27b8537dd2fc3f6156151b6d0f01a34354c980de17885b85dc7614019adb7747c03e91ebe1038aca22c6d898a5

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.117.1'
+    VERSION = '0.117.2'
   end
 end

data/sub/eac_cli/lib/eac_cli/definition.rb

@@ -39,10 +39,6 @@ module EacCli
       self.description = description
     end
 
-    def help_formatter
-      @help_formatter ||= ::EacCli::Definition::HelpFormatter.new(self)
-    end
-
     def main_alternative
       @main_alternative ||= begin
         r = ::EacCli::Definition::Alternative.new

data/sub/eac_cli/lib/eac_cli/runner_with/help/builder/alternative.rb

@@ -7,18 +7,19 @@ module EacCli
     module Help
       class Builder
         class Alternative
-          PROGRAM_MACRO = '__PROGRAM__'
+          enable_method_class
+
           SUBCOMMANDS_MACRO = '__SUBCOMMANDS__'
 
-          common_constructor :alternative
+          common_constructor :builder, :alternative
 
-          def to_s
+          def result
             (
-              [PROGRAM_MACRO] +
+              program_name +
                 alternative.options_argument?.if_present([]) { |_v| ['[options]'] } +
                 options +
                 positionals
-            ).join(::EacCli::RunnerWith::Help::Builder::SEP)
+            ).join(builder.word_separator)
           end
 
           def options
@@ -49,6 +50,12 @@ module EacCli
               r
             end
           end
+
+          def program_name
+            r = builder.runner.program_name
+            r = [r] unless r.is_a?(::Enumerable)
+            r
+          end
         end
       end
     end

data/sub/eac_cli/lib/eac_cli/runner_with/help/builder.rb

@@ -6,8 +6,8 @@ module EacCli
   module RunnerWith
     module Help
       class Builder
-        require_sub __FILE__
-        common_constructor :definition
+        require_sub __FILE__, require_dependency: true
+        common_constructor :runner
 
         SEP = ' '
         IDENT = SEP * 2
@@ -28,11 +28,21 @@ module EacCli
 
           def option_usage_full(option)
             if option.long.present?
-              [option.short, option_long(option)].reject(&:blank?).join(SEP)
+              [option.short, option_long(option)].reject(&:blank?).join(word_separator)
             else
               option_short(option)
             end
           end
+
+          def word_separator
+            SEP
+          end
+        end
+
+        delegate :word_separator, to: :class
+
+        def definition
+          runner.class.runner_definition
         end
 
         def option_definition(option)
@@ -45,8 +55,7 @@ module EacCli
           b = include_header ? "#{header.humanize}:\n" : ''
           b += send("self_#{header}") + "\n"
           definition.alternatives.each do |alternative|
-            b += IDENT + ::EacCli::RunnerWith::Help::Builder::Alternative.new(alternative).to_s +
-                 "\n"
+            b += IDENT + self.alternative(alternative) + "\n"
           end
           b
         end
@@ -60,7 +69,7 @@ module EacCli
         def usage_section
           "Usage:\n" +
             definition.alternatives.map do |alternative|
-              IDENT + ::EacCli::RunnerWith::Help::Builder::Alternative.new(alternative).to_s + "\n"
+              IDENT + self.alternative(alternative) + "\n"
             end.join
         end
 

data/sub/eac_cli/lib/eac_cli/runner_with/help.rb

@@ -28,7 +28,7 @@ module EacCli
       end
 
       def help_text
-        r = ::EacCli::RunnerWith::Help::Builder.new(self.class.runner_definition).to_s
+        r = ::EacCli::RunnerWith::Help::Builder.new(self).to_s
         r += help_extra_text if respond_to?(:help_extra_text)
         r
       end

data/sub/eac_cli/lib/eac_cli/runner_with/subcommands.rb

@@ -104,7 +104,7 @@ module EacCli
       end
 
       def subcommand_program
-        subcommand_name
+        [program_name, subcommand_name]
       end
 
       def subcommand_runner

data/sub/eac_cli/lib/eac_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacCli
-  VERSION = '0.27.4'
+  VERSION = '0.27.5'
 end

data/sub/eac_cli/spec/lib/eac_cli/runner_with/help_spec.rb

@@ -26,7 +26,7 @@ RSpec.describe ::EacCli::RunnerWith::Help do
   ].each do |runner_argv|
     context "when runner ARGV is #{runner_argv}" do
       let(:instance) { runner.create(argv: runner_argv) }
-      let(:expected_output) do
+      let(:expected_output_source) do
         <<~OUTPUT
           A stub runner.
 
@@ -39,6 +39,9 @@ RSpec.describe ::EacCli::RunnerWith::Help do
 
         OUTPUT
       end
+      let(:expected_output) do
+        expected_output_source.gsub('__PROGRAM__', instance.program_name)
+      end
 
       it 'show help text' do
         expect { instance.run_run }.to output(expected_output).to_stdout_from_any_process

data/sub/eac_cli/spec/lib/eac_cli/runner_with/subcommands_spec.rb

@@ -57,7 +57,7 @@ RSpec.describe ::EacCli::RunnerWith::Subcommands do
 
   context 'with help' do
     let(:instance) { parent_runner.create(%w[--help]) }
-    let(:expected_output) do
+    let(:expected_output_source) do
       <<~OUTPUT
         A stub root runner.
 
@@ -73,6 +73,9 @@ RSpec.describe ::EacCli::RunnerWith::Subcommands do
           child-cmd
       OUTPUT
     end
+    let(:expected_output) do
+      expected_output_source.gsub('__PROGRAM__', instance.program_name)
+    end
 
     before do
       parent_runner.include(::EacCli::RunnerWith::Help)

data/sub/eac_ruby_base0/eac_ruby_base0.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'eac_cli', '~> 0.27', '>= 0.27.4'
+  s.add_dependency 'eac_cli', '~> 0.27', '>= 0.27.5'
   s.add_dependency 'eac_fs', '~> 0.10'
   s.add_dependency 'eac_ruby_gems_utils', '~> 0.9', '~> 0.9.6'
   s.add_dependency 'eac_ruby_utils', '~> 0.95', '>= 0.95.1'

data/sub/eac_ruby_base0/lib/eac_ruby_base0/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyBase0
-  VERSION = '0.16.3'
+  VERSION = '0.16.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.117.1
+  version: 0.117.2
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-19 00:00:00.000000000 Z
+date: 2022-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -197,7 +197,7 @@ dependencies:
         version: '0.16'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.3
+        version: 0.16.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -207,7 +207,7 @@ dependencies:
         version: '0.16'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.3
+        version: 0.16.4
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gems_utils
   requirement: !ruby/object:Gem::Requirement
@@ -806,7 +806,6 @@ files:
 - sub/eac_cli/lib/eac_cli/definition/base_option.rb
 - sub/eac_cli/lib/eac_cli/definition/base_option/initialize_args_parser.rb
 - sub/eac_cli/lib/eac_cli/definition/boolean_option.rb
-- sub/eac_cli/lib/eac_cli/definition/help_formatter.rb
 - sub/eac_cli/lib/eac_cli/definition/positional_argument.rb
 - sub/eac_cli/lib/eac_cli/enum.rb
 - sub/eac_cli/lib/eac_cli/old_configs.rb

data/sub/eac_cli/lib/eac_cli/definition/help_formatter.rb

@@ -1,77 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_cli/runner_with/help/builder/alternative'
-require 'eac_ruby_utils/core_ext'
-
-module EacCli
-  class Definition
-    class HelpFormatter
-      SEP = ' '
-      IDENT = SEP * 2
-      OPTION_DESC_SEP = IDENT * 2
-
-      class << self
-        def option_long(option)
-          b = option.long
-          b += '=VALUE' if option.argument?
-          b
-        end
-
-        def option_short(option)
-          b = option.short
-          b += 'VALUE' if option.argument?
-          b
-        end
-      end
-
-      common_constructor :definition
-
-      def positional_argument(positional)
-        if positional.subcommand?
-          ::EacCli::RunnerWith::Help::Builder::Alternative::SUBCOMMANDS_MACRO
-        else
-          r = "<#{positional.name}>"
-          r += '...' if positional.repeat?
-          r = "[#{r}]" if positional.optional?
-          r
-        end
-      end
-
-      def section(header, include_header = true)
-        b = include_header ? "#{header.humanize}:\n" : ''
-        b += send("self_#{header}") + "\n"
-        # TO-DO: implement alternatives
-        b
-      end
-
-      def self_options
-        definition.options.map { |option| IDENT + option_definition(option) }.join("\n")
-      end
-
-      def self_usage
-        IDENT + self_usage_arguments.join(SEP)
-      end
-
-      def self_usage_arguments
-        [::EacCli::RunnerWith::Help::Builder::Alternative::PROGRAM_MACRO] +
-          definition.options_argument.if_present([]) { |_v| ['[options]'] } +
-          self_usage_arguments_options +
-          self_usage_arguments_positional
-      end
-
-      def self_usage_arguments_options
-        definition.options.select(&:show_on_usage?).map do |option|
-          self.class.option_long(option)
-        end
-      end
-
-      def self_usage_arguments_positional
-        definition.positional.map { |p| positional_argument(p) }
-      end
-
-      def to_banner
-        "#{definition.description}\n\n#{section('usage')}"
-      end
-    end
-  end
-end