eac_cli 0.27.1 → 0.27.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b26ae186394829bdfd8a9ab40f69a660ea88821c1348181a4f1e5c0f86f4de5
-  data.tar.gz: 61e89d36fb3262ae31f5b36b8d1b792e0c4c8a626c44fc9b9a25c2617891abb2
+  metadata.gz: cf821288a53c84ca73558b565fd37131c0bc447dcefefdbd94cad83dc585b3b2
+  data.tar.gz: 72432bbad929217ef65ef9a8283141dd9af19117ad7451a7fd165e9b2e72aa32
 SHA512:
-  metadata.gz: c02ca9a46dee298dc4bd0dc8159cf4a6962c69c95cc65e88931c4babc2caa635c651284ae90ac635f6e5df4891fd5ef3cd996d2978ec03c0720cb0ea2667d723
-  data.tar.gz: a61f21a53d001c8dcfb2efd5d93c4a8705f31b0eeb55c6b9db3cb8ff5d482e59d73ec285fbbfe5951343cb046b75b9e0aca71ef71d87c2c290182fd9c8928e50
+  metadata.gz: eef32945440aa2f30ed31247fe5ea287c5bace6ac511ad4f9b6327e7dd7da1c116fd6d2e40f9a304988b2965b765c860d1b10b893eaf0d0a5cf5ffb2bb404144
+  data.tar.gz: a0690e698c2a702e770e57708bf8e59f115e2fc99d27afb5fbd435866bc6571463835fa5fb7ce1e86ff52eb4eb27f58ba23c0801c187d21b577fb8c2fa37c1b9

data/lib/eac_cli/old_configs/entry_reader.rb

@@ -17,7 +17,7 @@ module EacCli
                    ::EacConfig::PathsHash.parse_entry_key(entry_key)
                  end
           path.join('_').gsub(/[^a-z0-9_]/i, '').gsub(/\A_+/, '').gsub(/_+\z/, '')
-              .gsub(/_{2,}/, '_').upcase
+            .gsub(/_{2,}/, '_').upcase
         end
       end
 

data/lib/eac_cli/old_configs/read_entry_options.rb

@@ -8,7 +8,7 @@ module EacCli
       enable_simple_cache
       common_constructor :options do
         self.options = options.to_h.symbolize_keys
-                              .assert_valid_keys(DEFAULT_VALUES.keys).freeze
+                         .assert_valid_keys(DEFAULT_VALUES.keys).freeze
       end
 
       DEFAULT_VALUES = {

data/lib/eac_cli/parser/alternative/short_options.rb

@@ -33,7 +33,7 @@ module EacCli
         # @return [EacCli::Definition::BaseOption] The option collected.
         def short_option_collect_char(char)
           option = find_short_option(char)
-          raise_error "Invalid short option \"#{char}\"" unless option
+          raise_argv_current_invalid_option unless option
 
           option_collect_option(option)
         end

data/lib/eac_cli/parser.rb

@@ -19,12 +19,12 @@ module EacCli
 
     def alternatives_parsed(error)
       alternatives.select { |a| error == a.error? }.map(&:parsed).reverse
-                  .inject(::EacRubyUtils::Struct.new) { |a, e| a.merge(e) }
+        .inject(::EacRubyUtils::Struct.new) { |a, e| a.merge(e) }
     end
 
     def alternatives_uncached
       definition.alternatives
-                .map { |alternative| ::EacCli::Parser::Alternative.new(alternative, argv) }
+        .map { |alternative| ::EacCli::Parser::Alternative.new(alternative, argv) }
     end
 
     def first_error_uncached

data/lib/eac_cli/runner/after_class_methods.rb

@@ -1,23 +1,22 @@
 # frozen_string_literal: true
 
-require 'eac_cli/speaker'
-require 'eac_ruby_utils/speaker'
+require 'eac_cli/definition'
+require 'eac_cli/runner/class_runner'
 
 module EacCli
   module Runner
     module AfterClassMethods
+      # @return [EacCli::Runner::ClassRunner]
+      def class_runner(runner_context_args)
+        ::EacCli::Runner::ClassRunner.new(self, runner_context_args)
+      end
+
       def create(*runner_context_args)
-        r = new
-        r.runner_context = ::EacCli::Runner::Context.new(r, *runner_context_args)
-        r
+        class_runner(runner_context_args).create
       end
 
       def run(*runner_context_args)
-        on_asserted_speaker do
-          r = create(*runner_context_args)
-          r.run_run
-          r
-        end
+        class_runner(runner_context_args).run
       end
 
       def runner_definition(&block)
@@ -29,18 +28,6 @@ module EacCli
       def super_runner_definition
         superclass.try(:runner_definition).if_present(&:dup) || ::EacCli::Definition.new
       end
-
-      private
-
-      def on_asserted_speaker
-        if ::EacRubyUtils::Speaker.context.optional_current
-          yield
-        else
-          ::EacRubyUtils::Speaker.context.on(::EacCli::Speaker.new) do
-            yield
-          end
-        end
-      end
     end
   end
 end

data/lib/eac_cli/runner/class_runner.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'eac_cli/speaker'
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/speaker'
+
+module EacCli
+  module Runner
+    class ClassRunner
+      PARSER_ERROR_EXIT_CODE = 1
+
+      common_constructor :klass, :context_args
+
+      def create
+        r = klass.new
+        r.runner_context = ::EacCli::Runner::Context.new(r, *context_args)
+        r
+      end
+
+      def run
+        on_asserted_speaker do
+          r = create
+          begin
+            r.run_run
+          rescue ::EacCli::Parser::Error => e
+            run_parser_error(r, e)
+          end
+          r
+        end
+      end
+
+      def run_parser_error(runner_instance, error)
+        $stderr.write("#{runner_instance.program_name}: #{error}\n")
+        ::Kernel.exit(PARSER_ERROR_EXIT_CODE)
+      end
+
+      private
+
+      def on_asserted_speaker
+        if ::EacRubyUtils::Speaker.context.optional_current
+          yield
+        else
+          ::EacRubyUtils::Speaker.context.on(::EacCli::Speaker.new) do
+            yield
+          end
+        end
+      end
+    end
+  end
+end

data/lib/eac_cli/runner/instance_methods.rb

@@ -3,22 +3,13 @@
 module EacCli
   module Runner
     module InstanceMethods
-      PARSER_ERROR_EXIT_CODE = 1
-
       def run_run
         parsed
         run_callbacks(:run) { run }
-      rescue ::EacCli::Parser::Error => e
-        run_parser_error(e)
       rescue ::EacCli::Runner::Exit # rubocop:disable Lint/SuppressedException
         # Do nothing
       end
 
-      def run_parser_error(error)
-        $stderr.write("#{program_name}: #{error}\n")
-        ::Kernel.exit(PARSER_ERROR_EXIT_CODE)
-      end
-
       def runner_context
         return @runner_context if @runner_context
 

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

@@ -54,7 +54,7 @@ module EacCli
         def options_section
           "Options:\n" +
             definition.alternatives.flat_map(&:options)
-                      .map { |option| IDENT + option_definition(option) + "\n" }.join
+              .map { |option| IDENT + option_definition(option) + "\n" }.join
         end
 
         def usage_section

data/lib/eac_cli/runner_with/help.rb

@@ -6,7 +6,7 @@ require 'eac_ruby_utils/core_ext'
 module EacCli
   module RunnerWith
     module Help
-      require_sub __FILE__
+      require_sub __FILE__, require_dependency: true
       common_concern do
         include ::EacCli::Runner
 

data/lib/eac_cli/runner_with/subcommands.rb

@@ -17,7 +17,7 @@ module EacCli
       common_concern do
         include ::EacCli::Runner
         runner_definition.singleton_class
-                         .include(::EacCli::RunnerWith::Subcommands::DefinitionConcern)
+          .include(::EacCli::RunnerWith::Subcommands::DefinitionConcern)
       end
 
       EXTRA_AVAILABLE_SUBCOMMANDS_METHOD_NAME = :extra_available_subcommands
@@ -28,9 +28,9 @@ module EacCli
 
       def available_subcommands_auto
         self.class.constants
-            .map { |name| [name.to_s.underscore.gsub('_', '-'), self.class.const_get(name)] }
-            .select { |c| ::EacCli::RunnerWith::Subcommands.runner?(c[1]) }
-            .to_h.with_indifferent_access
+          .map { |name| [name.to_s.underscore.gsub('_', '-'), self.class.const_get(name)] }
+          .select { |c| ::EacCli::RunnerWith::Subcommands.runner?(c[1]) }
+          .to_h.with_indifferent_access
       end
 
       def available_subcommands_extra
@@ -95,7 +95,7 @@ module EacCli
         raise(::EacCli::Parser::Error.new(
                 self.class.runner_definition, runner_context.argv,
                 "Subcommand \"#{subcommand_name}\" not found " \
-                  "(Available: #{available_subcommands.keys}"
+                  "(Available: #{available_subcommands.keys})"
               ))
       end
 

data/lib/eac_cli/runner_with_set.rb

@@ -32,8 +32,8 @@ module EacCli
 
     def key_to_module(key)
       namespace_set.lazy
-                   .map { |namespace| key_to_module_in_namespace(namespace, key) }
-                   .find(&:present?) ||
+        .map { |namespace| key_to_module_in_namespace(namespace, key) }
+        .find(&:present?) ||
         raise("Not module found with key \"#{key}\" (Namespaces: #{namespace_set})")
     end
 

data/lib/eac_cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_cli
 version: !ruby/object:Gem::Version
-  version: 0.27.1
+  version: 0.27.4
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-04 00:00:00.000000000 Z
+date: 2022-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.83'
+        version: '0.95'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.83'
+        version: '0.95'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.5.1
 description: 
 email: 
 executables: []
@@ -112,6 +112,7 @@ files:
 - lib/eac_cli/rspec/setup.rb
 - lib/eac_cli/runner.rb
 - lib/eac_cli/runner/after_class_methods.rb
+- lib/eac_cli/runner/class_runner.rb
 - lib/eac_cli/runner/context.rb
 - lib/eac_cli/runner/exit.rb
 - lib/eac_cli/runner/instance_methods.rb