eac_cli 0.12.6 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9465f0f0d648395bb6616a208f830034405eaed91e6d186f8235cd2b0ea28a6
-  data.tar.gz: efd2ab2ad3737f7f12577908cc3c0bda2fbead8ddaa99ae671c72162a3f63bb3
+  metadata.gz: 901db493185f12775a163c9d1b017b32e520a62d48952eead7d6fef94a0dde64
+  data.tar.gz: 474e78827b8ddd3b91f94a65fc250a9aaa36caece0377de75206c344cac06318
 SHA512:
-  metadata.gz: 88e58527420ebd47d4de3684bdd6d2c18eb6b5b1be87c33043b0d3951d924265d44b9108feed7f3c0cd236ef11546ecf188c2a1c0de0ab73e0b4740c2df63287
-  data.tar.gz: 45fb719847efcade7e5c56b015ebd8aefce718d109f11aebb97f7645a681ec5ed53358a3a7beebc63019b77e3847b2be69421e1b9b8bcaacbf7682ecaafdec20
+  metadata.gz: f5594e5963d7e093ee29ceb4214e5d42deac0b59ca449d64dcbc06c2998806bf1011fdf592dfe395ad8269caca8b0b3d79656ab2d8f47a93594833b211406a01
+  data.tar.gz: 89345d413dbd1c7cd52f1fa4ae08c20a2276f307e7c557e94ddf66dbbbbe14f967f0ec7570ac14e40921679702f1b5a7a97c31e69dc1b718e81727f2c4eab97c

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/alternative.rb

@@ -10,15 +10,12 @@ module EacCli
       SUBCOMMAND_NAME_ARG = :subcommand
       SUBCOMMAND_ARGS_ARG = :subcommand_args
 
-      def arg_opt(short, long, description, option_options = {})
-        options_set << ::EacCli::Definition::ArgumentOption.new(
-          short, long, description, option_options
-        )
+      def arg_opt(*args)
+        options_set << ::EacCli::Definition::ArgumentOption.from_args(args)
       end
 
-      def bool_opt(short, long, description, option_options = {})
-        options_set << ::EacCli::Definition::BooleanOption.new(short, long, description,
-                                                               option_options)
+      def bool_opt(*args)
+        options_set << ::EacCli::Definition::BooleanOption.from_args(args)
       end
 
       def options

data/lib/eac_cli/definition/argument_option.rb

@@ -8,6 +8,14 @@ module EacCli
       def argument?
         true
       end
+
+      def build_value(new_value, previous_value)
+        repeat? ? previous_value + [new_value] : new_value
+      end
+
+      def default_value
+        repeat? ? [] : nil
+      end
     end
   end
 end

data/lib/eac_cli/definition/base_option.rb

@@ -5,24 +5,36 @@ require 'eac_ruby_utils/core_ext'
 module EacCli
   class Definition
     class BaseOption
+      require_sub __FILE__
+
+      class << self
+        def from_args(args)
+          p = ::EacCli::Definition::BaseOption::InitializeArgsParser.new(args)
+          new(p.short, p.long, p.description, p.options)
+        end
+      end
+
       DEFAULT_REQUIRED = false
 
       enable_listable
-      lists.add_symbol :option, :optional, :usage, :required
-      attr_reader :short, :long, :description, :options
-
-      def initialize(short, long, description, options = {})
-        @short = short
-        @long = long
-        @description = description
-        @options = options.symbolize_keys
-        @options.assert_valid_keys(::EacCli::Definition::BaseOption.lists.option.values)
+      enable_abstract_methods :build_value, :default_value
+      lists.add_symbol :option, :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?
+
+        self.options = ::EacCli::Definition::BaseOption.lists.option.hash_keys_validate!(
+          options.symbolize_keys
+        )
       end
 
       def identifier
         long.to_s.variableize.to_sym
       end
 
+      def repeat?
+        options[OPTION_REPEAT]
+      end
+
       def required?
         return true if options.key?(:required) && options.fetch(:required)
         return false if options.key?(:optional) && options.fetch(:optional)

data/lib/eac_cli/definition/base_option/initialize_args_parser.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module EacCli
+  class Definition
+    class BaseOption
+      class InitializeArgsParser
+        PROPERTIES = %i[short long description options].freeze
+        attr_reader(*PROPERTIES)
+
+        def initialize(args)
+          self.options = args.extract_options!.freeze
+          args.each { |arg| absorb_arg(arg) }
+        end
+
+        private
+
+        attr_writer(*PROPERTIES)
+
+        def absorb_arg(arg)
+          arg_ext = ArgumentParser.new(arg)
+          send("#{arg_ext.type}=", arg_ext.value)
+        end
+
+        class ArgumentParser
+          TYPES = %i[short long description].freeze
+          common_constructor :value
+
+          def type
+            TYPES.find { |type| send("#{type}?") } || raise("Unknown type for \"#{value}\"")
+          end
+
+          def short?
+            value.start_with?('-') && !long?
+          end
+
+          def long?
+            value.start_with?('--')
+          end
+
+          def description?
+            !short? || !long?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/eac_cli/definition/boolean_option.rb

@@ -8,6 +8,14 @@ module EacCli
       def argument?
         false
       end
+
+      def build_value(_new_value, previous_value)
+        repeat? ? previous_value + 1 : true
+      end
+
+      def default_value
+        repeat? ? 0 : false
+      end
     end
   end
 end

data/lib/eac_cli/definition/positional_argument.rb

@@ -13,6 +13,18 @@ module EacCli
         options.assert_valid_keys(self.class.lists.option.values)
       end
 
+      def build_value(new_value, previous_value)
+        if previous_value.is_a?(::Array)
+          previous_value + [new_value]
+        else
+          new_value
+        end
+      end
+
+      def default_value
+        repeat? ? [] : nil
+      end
+
       def identifier
         name.to_s.variableize.to_sym
       end

data/lib/eac_cli/docopt/doc_builder.rb

@@ -19,10 +19,24 @@ module EacCli
           b += '=<value>' if option.argument?
           b
         end
+
+        def option_short(option)
+          b = option.short
+          b += '=<value>' if option.argument?
+          b
+        end
+
+        def option_usage_full(option)
+          if option.long.present?
+            [option.short, option_long(option)].reject(&:blank?).join(SEP)
+          else
+            option_short(option)
+          end
+        end
       end
 
       def option_definition(option)
-        option.short + SEP + self.class.option_long(option) + OPTION_DESC_SEP + option.description
+        self.class.option_usage_full(option) + OPTION_DESC_SEP + option.description
       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/parser/collector.rb

@@ -24,11 +24,7 @@ module EacCli
       end
 
       def collect(option, value)
-        if data[option].is_a?(::Array)
-          data[option] << value
-        else
-          data[option] = value
-        end
+        data[option] = option.build_value(value, data[option])
       end
 
       def supplied?(option)
@@ -42,18 +38,8 @@ module EacCli
       end
 
       def default_values
-        definition.options.each { |option| data[option] = option_default_value(option) }
-        definition.positional.each do |positional|
-          data[positional] = positional_default_value(positional)
-        end
-      end
-
-      def option_default_value(option)
-        option.argument? ? nil : false
-      end
-
-      def positional_default_value(positional)
-        positional.repeat? ? [] : nil
+        definition.options.each { |option| data[option] = option.default_value }
+        definition.positional.each { |positional| data[positional] = positional.default_value }
       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_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.12.6'
+  VERSION = '0.16.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_cli
 version: !ruby/object:Gem::Version
-  version: 0.12.6
+  version: 0.16.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-06 00:00:00.000000000 Z
+date: 2021-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
@@ -58,6 +58,7 @@ files:
 - lib/eac_cli/definition/alternative.rb
 - lib/eac_cli/definition/argument_option.rb
 - 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
@@ -86,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: []

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