eac_cli 0.14.0 → 0.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ca942fefac703528e400de1a095cad1dd85d648895eabf7cfdf51ac430b34fe
-  data.tar.gz: 73f8e8c595e7669756b134d35576a1a3f873b67dfda1def674ea02d4a60173a7
+  metadata.gz: 6b336c067e8d70a7f067881875fe4b2c040fa9548d068f5634466d98aeb5c6ee
+  data.tar.gz: ee2db632c41c4cd425ccec883a2a308400c3d004b6f76ab8d2834a0c7b0d203a
 SHA512:
-  metadata.gz: 95cbcedfb77ca5d9fd3a3ffe2f818d9a8866d6774cc25bf3964f0a0fa1c81a3014afb6f3a26cb32393fd84fe76e56e159a5be22f0780e5d916b1d66f90a08961
-  data.tar.gz: 4a9cf2040a0cdae39543379f3da011931d11bbc22c15aca1a0c88838a592215d80c6fd413b034f66c991487d7f6a5b32eecc9b9d29530c787aba09c3f48c4daa
+  metadata.gz: 45fc37951d2d381e9a9157ab07fa086e7272c0411018eb7ee561cab676a66522a898edbb8fb9abbf34cd55135c0f33aeaa641a8503bb4360521af580c02f2560
+  data.tar.gz: ffe16017e057939246dfc62d14b1736a1265cc8e1da100f7695047247befad721a079b8c03ebbb579cd382919e3292eb1d42bb293a4a3c8e65c9eb97c330c5fd

data/lib/eac_cli/core_ext.rb

@@ -2,3 +2,5 @@
 
 require 'eac_ruby_utils/core_ext'
 require 'eac_cli/patches'
+
+::EacCli::RunnerWithSet.default.add_namespace(::EacCli::RunnerWith)

data/lib/eac_cli/definition/base_option.rb

@@ -28,7 +28,11 @@ module EacCli
       end
 
       def identifier
-        long.to_s.variableize.to_sym
+        [long, short].each do |v|
+          v.to_s.if_present { |vv| return vv.variableize.to_sym }
+        end
+
+        raise 'No short or long option to build identifier'
       end
 
       def repeat?

data/lib/eac_cli/docopt/doc_builder.rb

@@ -36,7 +36,9 @@ module EacCli
       end
 
       def option_definition(option)
-        self.class.option_usage_full(option) + OPTION_DESC_SEP + option.description
+        self.class.option_usage_full(option) + option.description.if_present('') do |v|
+          OPTION_DESC_SEP + v
+        end
       end
 
       def section(header, include_header = true)

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

@@ -14,7 +14,9 @@ module EacCli
         end
 
         def find_short_option(char)
-          alternative.options.find { |option| short_without_prefix(option.short) == char }
+          alternative.options.find do |option|
+            short_without_prefix(option.short).if_present(false) { |v| v == char }
+          end
         end
 
         def short_option_collect_argv_value
@@ -37,7 +39,7 @@ module EacCli
         end
 
         def short_without_prefix(short)
-          short.gsub(/\A#{::Regexp.quote(SHORT_OPTION_PREFIX)}/, '')
+          short.to_s.gsub(/\A#{::Regexp.quote(SHORT_OPTION_PREFIX)}/, '')
         end
       end
     end

data/lib/eac_cli/patches/object/runner_with.rb

@@ -3,6 +3,7 @@
 require 'eac_ruby_utils/core_ext'
 require 'eac_cli/runner'
 require 'eac_cli/runner_with'
+require 'eac_cli/runner_with_set'
 
 class Object
   def runner_with(*runners, &block)
@@ -10,7 +11,7 @@ class Object
     enable_simple_cache
     enable_console_speaker
     runners.each do |runner|
-      include runner_with_to_module(runner)
+      include ::EacCli::RunnerWithSet.default.item_to_module(runner)
     end
     runner_definition(&block) if block
   end

data/lib/eac_cli/runner/context.rb

@@ -27,8 +27,9 @@ module EacCli
 
       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)
 
-        parent.runner_context.call(method_name, *args)
+        raise "Parent #{parent} do not respond to .context or .runner_context (Runner: #{runner})"
       end
     end
   end

data/lib/eac_cli/runner/instance_methods.rb

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

data/lib/eac_cli/runner_with_set.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module EacCli
+  class RunnerWithSet
+    class << self
+      def default
+        @default ||= new
+      end
+    end
+
+    def add_namespace(namespace)
+      namespace = sanitize_namespace(namespace)
+      raise "\"#{namespace}\" already was included" if namespace_set.include?(namespace)
+
+      namespace_set << namespace
+      self
+    end
+
+    def item_to_module(item)
+      item.is_a?(::Module) ? item : key_to_module(item)
+    end
+
+    def namespaces
+      namespace_set.dup
+    end
+
+    private
+
+    def namespace_set
+      @namespace_set ||= ::Array.new
+    end
+
+    def key_to_module(key)
+      namespace_set.lazy
+                   .map { |namespace| key_to_module_in_namespace(namespace, key) }
+                   .find(&:present?) ||
+        raise("Not module found with key \"#{key}\" (Namespaces: #{namespace_set})")
+    end
+
+    def key_to_module_in_namespace(namespace, key)
+      namespace.const_get(key.to_s.camelize)
+    rescue ::NameError
+      nil
+    end
+
+    def sanitize_namespace(source)
+      source.is_a?(::Module) ? source : source.to_s.constantize
+    end
+  end
+end

data/lib/eac_cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_cli
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.16.2
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-14 00:00:00.000000000 Z
+date: 2021-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
@@ -87,8 +87,8 @@ files:
 - lib/eac_cli/runner/instance_methods.rb
 - lib/eac_cli/runner_with.rb
 - lib/eac_cli/runner_with/help.rb
-- lib/eac_cli/runner_with/output_file.rb
 - lib/eac_cli/runner_with/subcommands.rb
+- lib/eac_cli/runner_with_set.rb
 - lib/eac_cli/version.rb
 homepage: 
 licenses: []
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.9
 signing_key: 
 specification_version: 4
 summary: Utilities to build CLI applications with Ruby.

data/lib/eac_cli/runner_with/output_file.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_cli/runner'
-require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/abstract_methods'
-
-module EacCli
-  module RunnerWith
-    module OutputFile
-      common_concern do
-        include ::EacCli::Runner
-        include ::EacRubyUtils::AbstractMethods
-
-        abstract_methods :output_content
-
-        runner_definition do
-          arg_opt '-o', '--output-file', 'Output to file.'
-        end
-      end
-
-      def run_output
-        if parsed.output_file.present?
-          ::File.write(parsed.output_file, output_content)
-        else
-          $stdout.write(output_content)
-        end
-      end
-    end
-  end
-end