eac_cli 0.32.0 → 0.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1e50e2a284a092f29a86d4ed6871c5f72d60cd0b655f8ab991d281bc0245786
-  data.tar.gz: 88e1aac4d700544a32debe645752a192f2732ee2e4f248796a952acf33853dab
+  metadata.gz: 5669575a2fe583905e0b4f1406102ce97429ecedbfd97e69d737c5198410242c
+  data.tar.gz: 0e777a88e237fa1e2d61d9a95d14c0435f0ec3664902fcc896d89bf9edb509f0
 SHA512:
-  metadata.gz: 1cfe95828490465373b2cacb1f7a8a087903466b89ec0a7fb208cbe05742c5a8c498834350aa35d606cefe900e088853c9b6f5fd5213c71e4a25bb1843616564
-  data.tar.gz: 9d38a66bd9b3b1f3dea27c386a50a26c430cc94ed142ab5733297ab499ad4bf718b04f17d81b765e54e6d9c08e3517abc519877b54bf521e2c15e6704c80db75
+  metadata.gz: 861a9c0e766b38db24fc8e2dc27b74fa4cd91b2978e0ad01d452acdcaa5fcd3c3fc9012e65b71270c65e8bf69333048f84ce115b1d031d57196586944109aec9
+  data.tar.gz: d9d516f186575069712a9d33673ef26021dc2ed2644b347ee05549861cbceca023b2541658cf5730e8446b8abebddb9261e0f616b8255c7a959a8c5fabdf6559

data/lib/eac_cli/definition/base_option.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
+require 'eac_cli/definition/default_value'
 require 'eac_ruby_utils/core_ext'
 
 module EacCli
   class Definition
     class BaseOption
       require_sub __FILE__
+      include ::EacCli::Definition::DefaultValue
 
       class << self
         def from_args(args)
@@ -17,7 +19,7 @@ module EacCli
       DEFAULT_REQUIRED = false
 
       enable_listable
-      enable_abstract_methods :build_value, :default_value
+      enable_abstract_methods :build_value
       lists.add_symbol :option, :default, :optional, :usage, :repeat, :required
       common_constructor :short, :long, :description, :options, default: [{}] do
         raise 'Nor short neither long selector was set' if short.blank? && long.blank?

data/lib/eac_cli/definition/default_value.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacCli
+  class Definition
+    module DefaultValue
+      def default_value
+        default_value? ? options[OPTION_DEFAULT] : default_default_value
+      end
+
+      def default_value?
+        options.key?(OPTION_DEFAULT)
+      end
+    end
+  end
+end

data/lib/eac_cli/runner/context.rb

@@ -18,19 +18,22 @@ module EacCli
       # Call a method in the runner or in one of it ancestors.
       def call(method_name, *args)
         return runner.send(method_name, *args) if runner.respond_to?(method_name)
-        return parent_call(method_name, *args) if parent.present?
+        return parent_call(method_name, *args) if parent_respond_to?(method_name)
 
         raise ::NameError, "No method \"#{method_name}\" found in #{runner} or in its ancestors"
       end
 
-      def respond_to_call?((method_name))
-        parent.respond_to?(:runner_context) && parent.runner_context.respond_to_call?(method_name)
-      end
+      # @param method_name [Symbol]
+      # @return [Boolean]
+      def parent_respond_to?(method_name)
+        parent.if_present(false) do |v|
+          next true if v.respond_to?(method_name)
 
-      protected
+          v.if_respond(:runner_context, false) { |w| w.parent_respond_to?(method_name) }
+        end
+      end
 
       def parent_call(method_name, *args)
-        return parent.context(method_name, *args) if parent.respond_to?(:context)
         return parent.runner_context.call(method_name, *args) if parent.respond_to?(:runner_context)
 
         raise "Parent #{parent} do not respond to .context or .runner_context (Runner: #{runner})"

data/lib/eac_cli/runner/instance_methods.rb

@@ -30,13 +30,13 @@ module EacCli
       end
 
       def respond_to_missing?(method, include_all = false)
-        runner_context.respond_to_call?(method) || super
+        runner_context.parent_respond_to?(method) || super
       end
 
       def method_missing(method, *args, &block)
-        return super unless runner_context.respond_to_call?(method)
+        return super unless runner_context.parent_respond_to?(method)
 
-        runner_context.call(method, *args, &block)
+        runner_context.parent_call(method, *args, &block)
       end
     end
   end

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

@@ -1,18 +1,16 @@
 # frozen_string_literal: true
 
-require 'eac_cli/runner_with/help/list_section'
+require 'eac_cli/runner_with/help/layout'
 require 'eac_ruby_utils/core_ext'
 
 module EacCli
   module RunnerWith
     module Help
       class Builder
+        include ::EacCli::RunnerWith::Help::Layout
         require_sub __FILE__, require_dependency: true
         common_constructor :runner
 
-        OPTION_DESC_SEP = ::EacCli::RunnerWith::Help::ListSection::IDENTATION * 2
-        SECTION_SEPARATOR = "\n"
-
         class << self
           def option_long(option)
             b = option.long
@@ -35,7 +33,7 @@ module EacCli
           end
 
           def word_separator
-            ::EacCli::RunnerWith::Help::ListSection::WORD_SEPARATOR
+            WORD_SEPARATOR
           end
         end
 
@@ -45,36 +43,22 @@ module EacCli
           runner.class.runner_definition
         end
 
-        # @return [String, nil]
-        def extra_section
-          ess = extra_sections
-          return nil if ess.none?
-
-          ess.join(SECTION_SEPARATOR)
-        end
-
         # @return [Enumerable<String>]
         def extra_sections
           runner.if_respond(:help_extra_text, []) do |v|
-            if v.is_a?(::Hash)
-              v.map do |title, lines|
-                ::EacCli::RunnerWith::Help::ListSection.new(title, lines)
-              end
-            else
-              [v.to_s]
-            end
+            [v.to_s]
           end
         end
 
         def option_definition(option)
           [self.class.option_usage_full(option), option.description,
            option.default_value? ? "[Default: \"#{option.default_value}\"]" : nil]
-            .reject(&:blank?).join(OPTION_DESC_SEP)
+            .reject(&:blank?).join(OPTION_DESCRIPTION_SEPARATOR)
         end
 
         # @return [String]
         def options_section
-          ::EacCli::RunnerWith::Help::ListSection.new(
+          list_section(
             'Options',
             definition.alternatives.flat_map(&:options).map { |option| option_definition(option) }
           )
@@ -82,16 +66,14 @@ module EacCli
 
         # @return [String]
         def usage_section
-          ::EacCli::RunnerWith::Help::ListSection.new(
+          list_section(
             'Usage',
             definition.alternatives.map { |alternative| self.alternative(alternative) }
           )
         end
 
         def to_s
-          r = ["#{definition.description}\n", usage_section, options_section]
-                .map { |s| "#{s}#{SECTION_SEPARATOR}" }.join
-          extra_section.if_present(r) { |v| r + v }
+          join_sections(definition.description, usage_section, options_section, *extra_sections)
         end
       end
     end

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacCli
+  module RunnerWith
+    module Help
+      module Layout
+        common_concern do
+          include InstanceClassMethods
+          extend InstanceClassMethods
+        end
+
+        module InstanceClassMethods
+          WORD_SEPARATOR = ' '
+          IDENTATION = WORD_SEPARATOR * 2
+          OPTION_DESCRIPTION_SEPARATOR = IDENTATION * 2
+          LINE_BREAK = "\n"
+          SECTION_SEPARATOR = LINE_BREAK * 2
+
+          # @param title String
+          # @param items [Enumerable<String>]
+          # @return [String]
+          def list_section(title, items)
+            (["#{title}:"] + items.map { |line| "#{IDENTATION}#{line}" })
+              .map { |line| "#{line}\n" }.join
+          end
+
+          # @param sections [Enumerable<String>]
+          # @return [String]
+          def join_sections(*sections)
+            sections.map { |s| s.to_s.strip }.join(SECTION_SEPARATOR) + LINE_BREAK
+          end
+        end
+
+        extend InstanceClassMethods
+      end
+    end
+  end
+end

data/lib/eac_cli/runner_with/help.rb

@@ -20,6 +20,18 @@ module EacCli
         end
       end
 
+      # @param items [Enumerable<String>]
+      # @return [String]
+      def help_list_section(title, items)
+        ::EacCli::RunnerWith::Help::Layout.list_section(title, items)
+      end
+
+      # @param items [Enumerable<String>]
+      # @return [String]
+      def help_join_sections(*sections)
+        ::EacCli::RunnerWith::Help::Layout.join_sections(*sections)
+      end
+
       def help_run
         return unless show_help?
 

data/lib/eac_cli/runner_with/input.rb

@@ -2,7 +2,7 @@
 
 require 'eac_cli/runner'
 require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/abstract_methods'
+require 'eac_ruby_utils/acts_as_abstract'
 
 module EacCli
   module RunnerWith

data/lib/eac_cli/runner_with/output.rb

@@ -2,7 +2,7 @@
 
 require 'eac_cli/runner'
 require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/abstract_methods'
+require 'eac_ruby_utils/acts_as_abstract'
 
 module EacCli
   module RunnerWith

data/lib/eac_cli/runner_with/subcommands.rb

@@ -53,10 +53,7 @@ module EacCli
 
       # @return [Hash<String, Enumerable<String>]
       def help_extra_text
-        {
-          'Subcommands' =>
-          available_subcommands.keys.sort
-        }
+        help_list_section('Subcommands', available_subcommands.keys.sort)
       end
 
       def method_missing(method_name, *arguments, &block)

data/lib/eac_cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_cli
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 0.34.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-10 00:00:00.000000000 Z
+date: 2023-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.113'
+        version: '0.116'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.113'
+        version: '0.116'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -92,6 +92,7 @@ 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/default_value.rb
 - lib/eac_cli/definition/positional_argument.rb
 - lib/eac_cli/enum.rb
 - lib/eac_cli/old_configs.rb
@@ -126,7 +127,7 @@ files:
 - lib/eac_cli/runner_with/help.rb
 - lib/eac_cli/runner_with/help/builder.rb
 - lib/eac_cli/runner_with/help/builder/alternative.rb
-- lib/eac_cli/runner_with/help/list_section.rb
+- lib/eac_cli/runner_with/help/layout.rb
 - lib/eac_cli/runner_with/input.rb
 - lib/eac_cli/runner_with/output.rb
 - lib/eac_cli/runner_with/subcommands.rb

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

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module EacCli
-  module RunnerWith
-    module Help
-      class ListSection
-        WORD_SEPARATOR = ' '
-        IDENTATION = WORD_SEPARATOR * 2
-
-        common_constructor :title, :items
-
-        # @return [String]
-        def to_s
-          (["#{title}:"] + items.map { |line| "#{IDENTATION}#{line}" })
-            .map { |line| "#{line}\n" }.join
-        end
-      end
-    end
-  end
-end