eac_cli 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 921813c1a708922d85ab9b75031bfe6acaf750791dab915182c693c78e7ce745
-  data.tar.gz: '0931a044b7668f9fbba9a5dc7b3809b477ccaec2c7a09387371f4999109139e7'
+  metadata.gz: 8ca942fefac703528e400de1a095cad1dd85d648895eabf7cfdf51ac430b34fe
+  data.tar.gz: 73f8e8c595e7669756b134d35576a1a3f873b67dfda1def674ea02d4a60173a7
 SHA512:
-  metadata.gz: 3c91bdbbbdd974a29723bce6de6e978d7371d290ca81b07db28e4eb90d30ad511c210713ea3bf5b22a6959e93a4de0c4cb5db0c8c75df0fbe8a142ead9fb70fb
-  data.tar.gz: a262fd7dba70dca1617213532f4e875f9078d08f8df86992f0a0b139ddd1fe54a27dad2e0ea8978cd64a508b108f90814516db057f9f0c85deef57c7a2fb1f88
+  metadata.gz: 95cbcedfb77ca5d9fd3a3ffe2f818d9a8866d6774cc25bf3964f0a0fa1c81a3014afb6f3a26cb32393fd84fe76e56e159a5be22f0780e5d916b1d66f90a08961
+  data.tar.gz: 4a9cf2040a0cdae39543379f3da011931d11bbc22c15aca1a0c88838a592215d80c6fd413b034f66c991487d7f6a5b32eecc9b9d29530c787aba09c3f48c4daa

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

@@ -5,19 +5,26 @@ 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
       enable_abstract_methods :build_value, :default_value
       lists.add_symbol :option, :optional, :usage, :repeat, :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)
+      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

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_cli
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-13 00:00:00.000000000 Z
+date: 2021-02-14 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