eac_cli 0.27.4 → 0.27.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf821288a53c84ca73558b565fd37131c0bc447dcefefdbd94cad83dc585b3b2
-  data.tar.gz: 72432bbad929217ef65ef9a8283141dd9af19117ad7451a7fd165e9b2e72aa32
+  metadata.gz: 938ea5f13a60ee96410614ad3a2467e1ee172f0edbbf8a853169f0c563f61fc6
+  data.tar.gz: ac6f3fde9506adc953a59e96b8c152037233c7609e8194e65a70534dd2f2e358
 SHA512:
-  metadata.gz: eef32945440aa2f30ed31247fe5ea287c5bace6ac511ad4f9b6327e7dd7da1c116fd6d2e40f9a304988b2965b765c860d1b10b893eaf0d0a5cf5ffb2bb404144
-  data.tar.gz: a0690e698c2a702e770e57708bf8e59f115e2fc99d27afb5fbd435866bc6571463835fa5fb7ce1e86ff52eb4eb27f58ba23c0801c187d21b577fb8c2fa37c1b9
+  metadata.gz: fc0d1c69a1f274767b42dcd34456c004edf0896623c7791bc87e1d23fdfd92df65b5ce960e84c1341897b196ba4337de16d1c6e517966d0e6340e86059c2ff9c
+  data.tar.gz: f9dd8eb35bb94e9cdf58d78021ef07f7fea1a9437c57300085bc8a835505100bfaa582fdf7d1f76b97a5cf959d3266bd980a33a38e6f6511f6a0cd5b77be7fee

data/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/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/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/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/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/lib/eac_cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_cli
 version: !ruby/object:Gem::Version
-  version: 0.27.4
+  version: 0.27.5
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 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: colorize
@@ -86,7 +86,6 @@ files:
 - lib/eac_cli/definition/base_option.rb
 - lib/eac_cli/definition/base_option/initialize_args_parser.rb
 - lib/eac_cli/definition/boolean_option.rb
-- lib/eac_cli/definition/help_formatter.rb
 - lib/eac_cli/definition/positional_argument.rb
 - lib/eac_cli/enum.rb
 - lib/eac_cli/old_configs.rb

data/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