eac_cli 0.10.0 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 607e900ac4f5c7b6e7531c4ce9f9f6cfc8fd8ffce30f7b4d2a22ff91cdfd99bb
-  data.tar.gz: 0f49af96a89a527390ba34d2e6ecc17d2942aea7200bebbab1ba1f540398f413
+  metadata.gz: 90408a7ab93c85784cf6f5946a034567a222ecbfb66922903302ab50a5a38d94
+  data.tar.gz: 87f6ab796eb1c6734fa615500cb5d7721d3fb1477ce7059bf7da434f60543b01
 SHA512:
-  metadata.gz: 1e2a23e42fb5df31819b499f8dc1448f6ecc9d095fc22c9a0ceabe1acadf9ba6398a62d04a09943b233feeeb5e07325f62069ee883fb388b29424e7656ebe500
-  data.tar.gz: 1fefcf204e43d2ccfcf45c8507be13be885d46da72f0d6eda2ea3c3e6b7b845592e3ed989fc29b8c687a3727b795f8ea3a2d2a6526c3cda61bbf6b6f7da8df86
+  metadata.gz: a9a941471808a3827ff4edc8bf6f3e3533e174a62078895514e90fbb32ec53db5f4284da379357fc2bfe64edae36646400688df4386d7344c0cfb087a7887544
+  data.tar.gz: d9e54da85eb7487bba85a30550ffd32065d7b419c5384c81d9724b6d33d0385791b9d0bd07b5733e391fd0030faf59d9b21a9a7ff2c91a384bcfcc4b0d1cff94

data/lib/eac_cli/definition.rb

@@ -9,72 +9,65 @@ module EacCli
   class Definition
     require_sub __FILE__
 
+    MAIN_ALTERNATIVE_KEY = :main
     SUBCOMMAND_NAME_ARG = 'subcommand'
     SUBCOMMAND_ARGS_ARG = 'subcommand_args'
 
     attr_accessor :description
-    attr_accessor :options_argument
 
     def initialize
       self.description = '-- NO DESCRIPTION SET --'
-      self.options_argument = true
+      alternatives_set[MAIN_ALTERNATIVE_KEY] = main_alternative
     end
 
     def alt(&block)
-      r = ::EacCli::Definition.new
+      r = ::EacCli::Definition::Alternative.new
       r.instance_eval(&block)
-      alternatives << r
+      alternatives_set[new_alternative_key] = r
       r
     end
 
     def alternatives
-      @alternatives ||= []
+      alternatives_set.values
     end
 
-    def arg_opt(short, long, description, option_options = {})
-      options << ::EacCli::Definition::ArgumentOption.new(
-        short, long, description, option_options
-      )
-    end
-
-    def bool_opt(short, long, description, option_options = {})
-      options << ::EacCli::Definition::BooleanOption.new(short, long, description, option_options)
+    def alternative(key)
+      alternatives_set.fetch(key)
     end
 
     def desc(description)
       self.description = description
     end
 
-    def options_arg(options_argument)
-      self.options_argument = options_argument
+    def help_formatter
+      @help_formatter ||= ::EacCli::Definition::HelpFormatter.new(self)
     end
 
-    def options
-      @options ||= []
+    def main_alternative
+      @main_alternative ||= begin
+        r = ::EacCli::Definition::Alternative.new
+        r.options_argument(true)
+        r
+      end
     end
 
-    def pos_arg(name, arg_options = {})
-      raise 'Positional arguments are blocked' if positional_arguments_blocked?
-
-      pos_set << ::EacCli::Definition::PositionalArgument.new(name, arg_options)
+    def options_arg(options_argument)
+      self.options_argument = options_argument
     end
 
-    def positional
-      pos_set.to_a
+    def options_argument
+      main_alternative.options_argument?
     end
 
-    def positional_arguments_blocked?
-      pos_set.any? { |e| e.optional? || e.repeat? }
+    def options_argument=(enable)
+      main_alternative.options_argument(enable)
     end
 
-    def subcommands
-      pos_arg(SUBCOMMAND_NAME_ARG, subcommand: true)
-      pos_set << ::EacCli::Definition::PositionalArgument.new(SUBCOMMAND_ARGS_ARG,
-                                                              optional: true, repeat: true)
-    end
+    delegate :arg_opt, :bool_opt, :options, :pos_arg,
+             :positional, :subcommands, to: :main_alternative
 
     def subcommands?
-      pos_set.any?(&:subcommand?)
+      alternatives.any?(&:subcommands?)
     end
 
     def options_first(enable = true)
@@ -87,6 +80,18 @@ module EacCli
 
     private
 
+    def alternatives_set
+      @alternatives_set ||= ::ActiveSupport::HashWithIndifferentAccess.new
+    end
+
+    def new_alternative_key
+      @last_key ||= 0
+      loop do
+        @last_key += 1
+        break @last_key unless alternatives_set.key?(@last_key)
+      end
+    end
+
     def pos_set
       @pos_set ||= []
     end

data/lib/eac_cli/definition/alternative.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+require 'eac_cli/definition/argument_option'
+require 'eac_cli/definition/boolean_option'
+require 'eac_cli/definition/positional_argument'
+
+module EacCli
+  class Definition
+    class Alternative
+      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
+        )
+      end
+
+      def bool_opt(short, long, description, option_options = {})
+        options_set << ::EacCli::Definition::BooleanOption.new(short, long, description,
+                                                               option_options)
+      end
+
+      def options
+        options_set.to_a
+      end
+
+      def options_argument?
+        @options_argument ? true : false
+      end
+
+      def options_argument(enable)
+        @options_argument = enable
+
+        self
+      end
+
+      def pos_arg(name, arg_options = {})
+        new_pos_arg = ::EacCli::Definition::PositionalArgument.new(name, arg_options)
+        check_positional_blocked(new_pos_arg)
+        pos_set << new_pos_arg
+      end
+
+      def positional
+        pos_set.to_a
+      end
+
+      def positional_arguments_blocked?(new_pos_arg)
+        last = pos_set.last
+        return false unless last
+        return true if subcommands?
+        return true if last.repeat?
+        return true if last.optional? && new_pos_arg.if_present(&:required?)
+
+        false
+      end
+
+      def subcommands
+        pos_arg(SUBCOMMAND_NAME_ARG, subcommand: true)
+        pos_set << ::EacCli::Definition::PositionalArgument.new(SUBCOMMAND_ARGS_ARG,
+                                                                optional: true, repeat: true)
+      end
+
+      def subcommands?
+        pos_set.any?(&:subcommand?)
+      end
+
+      private
+
+      def check_positional_blocked(new_pos_arg)
+        raise 'Positional arguments are blocked' if positional_arguments_blocked?(new_pos_arg)
+      end
+
+      def pos_set
+        @pos_set ||= []
+      end
+
+      def options_set
+        @options_set ||= []
+      end
+    end
+  end
+end

data/lib/eac_cli/definition/help_formatter.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacCli
+  class Definition
+    class HelpFormatter
+      SEP = ' '
+      IDENT = SEP * 2
+      OPTION_DESC_SEP = IDENT * 2
+
+      class << self
+        def option_long(option)
+          b = option.long
+          b += '=VALUE' if option.argument?
+          b
+        end
+
+        def option_short(option)
+          b = option.short
+          b += 'VALUE' if option.argument?
+          b
+        end
+      end
+
+      common_constructor :definition
+
+      def positional_argument(positional)
+        if positional.subcommand?
+          ::EacRubyUtils::Console::DocoptRunner::SUBCOMMANDS_MACRO
+        else
+          r = "<#{positional.name}>"
+          r += '...' if positional.repeat?
+          r = "[#{r}]" if positional.optional?
+          r
+        end
+      end
+
+      def section(header, include_header = true)
+        b = include_header ? "#{header.humanize}:\n" : ''
+        b += send("self_#{header}") + "\n"
+        # TO-DO: implement alternatives
+        b
+      end
+
+      def self_options
+        definition.options.map { |option| IDENT + option_definition(option) }.join("\n")
+      end
+
+      def self_usage
+        IDENT + self_usage_arguments.join(SEP)
+      end
+
+      def self_usage_arguments
+        [::EacRubyUtils::Console::DocoptRunner::PROGRAM_MACRO] +
+          definition.options_argument.if_present([]) { |_v| ['[options]'] } +
+          self_usage_arguments_options +
+          self_usage_arguments_positional
+      end
+
+      def self_usage_arguments_options
+        definition.options.select(&:show_on_usage?).map do |option|
+          self.class.option_long(option)
+        end
+      end
+
+      def self_usage_arguments_positional
+        definition.positional.map { |p| positional_argument(p) }
+      end
+
+      def to_banner
+        "#{definition.description}\n\n#{section('usage')}"
+      end
+    end
+  end
+end

data/lib/eac_cli/definition/positional_argument.rb

@@ -5,8 +5,10 @@ require 'eac_ruby_utils/core_ext'
 module EacCli
   class Definition
     class PositionalArgument
+      DEFAULT_REQUIRED = true
+
       enable_listable
-      lists.add_symbol :option, :optional, :repeat, :subcommand
+      lists.add_symbol :option, :optional, :repeat, :required, :subcommand
       common_constructor :name, :options, default: [{}] do
         options.assert_valid_keys(self.class.lists.option.values)
       end
@@ -16,16 +18,27 @@ module EacCli
       end
 
       def optional?
-        options[OPTION_OPTIONAL]
+        !required?
       end
 
       def repeat?
         options[OPTION_REPEAT]
       end
 
+      def required?
+        return true if options.key?(OPTION_REQUIRED) && options.fetch(OPTION_REQUIRED)
+        return false if options.key?(OPTION_OPTIONAL) && options.fetch(OPTION_OPTIONAL)
+
+        DEFAULT_REQUIRED
+      end
+
       def subcommand?
         options[OPTION_SUBCOMMAND]
       end
+
+      def to_s
+        "#{self.class.name.demodulize}[#{identifier}]"
+      end
     end
   end
 end

data/lib/eac_cli/docopt/doc_builder.rb

@@ -6,71 +6,49 @@ require 'eac_ruby_utils/console/docopt_runner'
 module EacCli
   module Docopt
     class DocBuilder
+      require_sub __FILE__
       common_constructor :definition
 
       SEP = ' '
       IDENT = SEP * 2
       OPTION_DESC_SEP = IDENT * 2
 
-      def positional_argument(positional)
-        if positional.subcommand?
-          ::EacRubyUtils::Console::DocoptRunner::SUBCOMMANDS_MACRO
-        else
-          r = "<#{positional.name}>"
-          r += '...' if positional.repeat?
-          r = "[#{r}]" if positional.optional?
-          r
+      class << self
+        def option_long(option)
+          b = option.long
+          b += '=<value>' if option.argument?
+          b
         end
       end
 
-      def option_argument(option)
-        option_long(option)
-      end
-
       def option_definition(option)
-        option.short + SEP + option_long(option) + OPTION_DESC_SEP + option.description
-      end
-
-      def option_long(option)
-        b = option.long
-        b += '=<value>' if option.argument?
-        b
+        option.short + SEP + self.class.option_long(option) + OPTION_DESC_SEP + option.description
       end
 
       def section(header, include_header = true)
         b = include_header ? "#{header.humanize}:\n" : ''
         b += send("self_#{header}") + "\n"
         definition.alternatives.each do |alternative|
-          b += self.class.new(alternative).section(header, false)
+          b += IDENT + ::EacCli::Docopt::DocBuilder::Alternative.new(alternative).to_s + "\n"
         end
         b
       end
 
-      def self_options
-        definition.options.map { |option| IDENT + option_definition(option) }.join("\n")
-      end
-
-      def self_usage
-        IDENT + self_usage_arguments.join(SEP)
-      end
-
-      def self_usage_arguments
-        [::EacRubyUtils::Console::DocoptRunner::PROGRAM_MACRO] +
-          definition.options_argument.if_present([]) { |_v| ['[options]'] } +
-          self_usage_arguments_options +
-          self_usage_arguments_positional
-      end
-
-      def self_usage_arguments_options
-        definition.options.select(&:show_on_usage?).map { |option| option_argument(option) }
+      def options_section
+        "Options:\n" +
+          definition.alternatives.flat_map(&:options)
+                    .map { |option| IDENT + option_definition(option) + "\n" }.join
       end
 
-      def self_usage_arguments_positional
-        definition.positional.map { |p| positional_argument(p) }
+      def usage_section
+        "Usage:\n" +
+          definition.alternatives.map do |alternative|
+            IDENT + ::EacCli::Docopt::DocBuilder::Alternative.new(alternative).to_s + "\n"
+          end.join
       end
 
       def to_s
-        "#{definition.description}\n\n#{section('usage')}\n#{section('options')}\n"
+        "#{definition.description}\n\n#{usage_section}\n#{options_section}\n"
       end
     end
   end

data/lib/eac_cli/docopt/doc_builder/alternative.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/console/docopt_runner'
+
+module EacCli
+  module Docopt
+    class DocBuilder
+      class Alternative
+        common_constructor :alternative
+
+        def to_s
+          (
+            [::EacRubyUtils::Console::DocoptRunner::PROGRAM_MACRO] +
+              alternative.options_argument?.if_present([]) { |_v| ['[options]'] } +
+              options +
+              positionals
+          ).join(::EacCli::Docopt::DocBuilder::SEP)
+        end
+
+        def options
+          alternative.options.select(&:show_on_usage?).map do |option|
+            ::EacCli::Docopt::DocBuilder.option_long(option)
+          end
+        end
+
+        def option_argument(option)
+          b = option.long
+          b += '=<value>' if option.argument?
+          b
+        end
+
+        def positionals
+          alternative.positional.map { |p| positional(p) }
+        end
+
+        def positional(positional)
+          if positional.subcommand?
+            ::EacRubyUtils::Console::DocoptRunner::SUBCOMMANDS_MACRO
+          else
+            r = "<#{positional.name}>"
+            r += '...' if positional.repeat?
+            r = "[#{r}]" if positional.optional?
+            r
+          end
+        end
+      end
+    end
+  end
+end

data/lib/eac_cli/parser.rb

@@ -5,10 +5,28 @@ require 'eac_ruby_utils/core_ext'
 module EacCli
   class Parser
     require_sub __FILE__
-    common_constructor :definition
+    enable_simple_cache
+    common_constructor :definition, :argv
 
-    def parse(argv)
-      ::EacCli::Parser::ParseResult.new(definition, argv).result
+    private
+
+    def parsed_uncached
+      raise 'Definition has no alternatives' if alternatives.empty?
+
+      alternatives.each do |alt_parser|
+        return alt_parser.parsed unless alt_parser.error?
+      end
+
+      raise first_error
+    end
+
+    def alternatives_uncached
+      definition.alternatives
+                .map { |alternative| ::EacCli::Parser::Alternative.new(alternative, argv) }
+    end
+
+    def first_error_uncached
+      alternatives.lazy.select(&:error?).map(&:error).first
     end
   end
 end

data/lib/eac_cli/parser/alternative.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+require 'eac_cli/parser/collector'
+require 'eac_cli/parser/error'
+require 'eac_ruby_utils/core_ext'
+
+module EacCli
+  class Parser
+    class Alternative
+      require_sub __FILE__, include_modules: true
+      enable_listable
+      lists.add_symbol :phase, :any, :option_argument, :positional
+      attr_reader :error
+
+      common_constructor :alternative, :argv do
+        alternative.assert_argument(::EacCli::Definition::Alternative, :alternative)
+        self.phase = PHASE_ANY
+        collect
+      end
+
+      def error?
+        error.present?
+      end
+
+      def parsed
+        @parsed ||= collector.to_data.freeze
+      end
+
+      private
+
+      attr_accessor :phase
+
+      def any_collect_argv_value
+        if argv_current_option?
+          option_collect_argv_value
+        else
+          positional_collect_argv_value
+        end
+      end
+
+      def collector
+        @collector ||= ::EacCli::Parser::Collector.new(alternative)
+      end
+
+      def collect
+        loop do
+          break unless argv_pending?
+
+          collect_argv_value
+        end
+        validate
+      rescue ::EacCli::Parser::Error => e
+        @error = e
+      end
+
+      def collect_argv_value
+        send("#{phase}_collect_argv_value")
+        argv_enum.next
+      end
+
+      def collect_option_argv_value
+        alternative.options.each do |option|
+        end
+
+        raise ::EacCli::Parser::Error.new(
+          alternative, argv, "Invalid option: #{argv_enum.current}"
+        )
+      end
+
+      def raise_error(message)
+        raise ::EacCli::Parser::Error.new(alternative, argv, message)
+      end
+
+      def validate
+        (alternative.options + alternative.positional).each do |option|
+          validate_option(option)
+        end
+      end
+
+      def validate_option(option)
+        return unless option.required?
+        return if collector.supplied?(option)
+
+        raise_error("Required option/positional #{option} not supplied")
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module EacCli
+  class Parser
+    class Alternative
+      module Argv
+        def argv_enum
+          @argv_enum ||= argv.each
+        end
+
+        def argv_pending?
+          argv_enum.ongoing?
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module EacCli
+  class Parser
+    class Alternative
+      module DoubleDash
+        DOUBLE_DASH = '--'
+
+        private
+
+        attr_accessor :double_dash
+
+        def argv_current_double_dash?
+          argv_enum.peek == DOUBLE_DASH && !double_dash
+        end
+
+        def double_dash_collect_argv_value
+          self.phase = PHASE_POSITIONAL
+          self.double_dash = true
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module EacCli
+  class Parser
+    class Alternative
+      module Options
+        DOUBLE_DASH = '--'
+
+        private
+
+        attr_accessor :argument_option, :double_dash
+
+        def argument_option_collect_argv(option)
+          self.argument_option = option
+          self.phase = PHASE_OPTION_ARGUMENT
+        end
+
+        def argv_current_option?
+          phase == PHASE_ANY && argv_enum.peek.start_with?('-')
+        end
+
+        def argv_current_double_dash?
+          argv_enum.peek == DOUBLE_DASH && !double_dash
+        end
+
+        def boolean_option_collect_argv(option)
+          collector.collect(option, true)
+        end
+
+        def option_argument_collect_argv_value
+          collector.collect(argument_option, argv_enum.peek)
+          self.argument_option = nil
+          self.phase = PHASE_ANY
+        end
+
+        def option_collect_argv_value
+          return double_dash_collect_argv_value if argv_current_double_dash?
+
+          alternative.options.any? do |option|
+            next false unless [option.short, option.long].include?(argv_enum.peek)
+
+            if option.argument?
+              argument_option_collect_argv(option)
+            else
+              boolean_option_collect_argv(option)
+            end
+
+            true
+          end || raise_argv_current_invalid_option
+        end
+
+        def raise_argv_current_invalid_option
+          raise_error "Invalid option: \"#{argv_enum.peek}\""
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module EacCli
+  class Parser
+    class Alternative
+      module Positionals
+        private
+
+        def positional_collect_argv_value
+          positional_check
+          collector.collect(positional_enum.peek, argv_enum.peek)
+          positional_next
+        end
+
+        def positional_enum
+          @positional_enum ||= alternative.positional.each
+        end
+
+        def positional_check
+          raise_error("Invalid positional: #{argv_enum.peek}") if positional_enum.stopped?
+        end
+
+        def positional_next
+          self.phase = PHASE_POSITIONAL if positional_enum.peek.subcommand?
+          positional_enum.next unless positional_enum.peek.repeat?
+        end
+      end
+    end
+  end
+end

data/lib/eac_cli/runner.rb

@@ -28,7 +28,7 @@ module EacCli
         sklass = klass.singleton_class
         return unless sklass.method_defined?(from)
 
-        sklass.alias_method to, from
+        sklass.send(:alias_method, to, from)
       end
 
       def build_method_name(name, suffix)
@@ -84,7 +84,7 @@ module EacCli
       end
 
       def parsed
-        @parsed ||= ::EacCli::Parser.new(self.class.runner_definition).parse(runner_context.argv)
+        @parsed ||= ::EacCli::Parser.new(self.class.runner_definition, runner_context.argv).parsed
       end
     end
   end

data/lib/eac_cli/runner_with/help.rb

@@ -10,7 +10,7 @@ module EacCli
         include ::EacCli::Runner
 
         runner_definition.alt do
-          options_arg false
+          options_argument false
           bool_opt '-h', '--help', 'Show help.', usage: true
         end
       end

data/lib/eac_cli/runner_with/output_file.rb

@@ -2,12 +2,16 @@
 
 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.'
@@ -18,7 +22,7 @@ module EacCli
         if parsed.output_file.present?
           ::File.write(parsed.output_file, output_content)
         else
-          out output_content
+          $stdout.write(output_content)
         end
       end
     end

data/lib/eac_cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_cli
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.12.2
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-15 00:00:00.000000000 Z
+date: 2020-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
@@ -55,18 +55,23 @@ files:
 - lib/eac_cli/core_ext.rb
 - lib/eac_cli/default_runner.rb
 - lib/eac_cli/definition.rb
+- lib/eac_cli/definition/alternative.rb
 - lib/eac_cli/definition/argument_option.rb
 - lib/eac_cli/definition/base_option.rb
 - lib/eac_cli/definition/boolean_option.rb
+- lib/eac_cli/definition/help_formatter.rb
 - lib/eac_cli/definition/positional_argument.rb
 - lib/eac_cli/docopt/doc_builder.rb
+- lib/eac_cli/docopt/doc_builder/alternative.rb
 - lib/eac_cli/docopt/runner_extension.rb
 - lib/eac_cli/parser.rb
+- lib/eac_cli/parser/alternative.rb
+- lib/eac_cli/parser/alternative/argv.rb
+- lib/eac_cli/parser/alternative/double_dash.rb
+- lib/eac_cli/parser/alternative/options.rb
+- lib/eac_cli/parser/alternative/positionals.rb
 - lib/eac_cli/parser/collector.rb
 - lib/eac_cli/parser/error.rb
-- lib/eac_cli/parser/options_collection.rb
-- lib/eac_cli/parser/parse_result.rb
-- lib/eac_cli/parser/positional_collection.rb
 - lib/eac_cli/patches.rb
 - lib/eac_cli/patches/object.rb
 - lib/eac_cli/patches/object/runner_with.rb

data/lib/eac_cli/parser/options_collection.rb

@@ -1,127 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-require 'optparse'
-
-module EacCli
-  class Parser
-    class OptionsCollection
-      SEP = ' '
-      IDENT = SEP * 2
-      OPTION_DESC_SEP = IDENT * 2
-
-      enable_simple_cache
-      common_constructor(:definition, :argv, :collector) { collect }
-      attr_reader :arguments
-
-      def options_first?
-        definition.options_first? || definition.subcommands?
-      end
-
-      private
-
-      def check_required_options
-        definition.options.each do |option|
-          next unless option.required?
-          next if collector.supplied?(option)
-
-          raise ::EacCli::Parser::Error.new(
-            definition, argv, "Option \"#{option}\" is required and a value was not supplied"
-          )
-        end
-      end
-
-      def collect
-        build_banner
-        build_options
-        parse_argv
-        check_required_options
-      end
-
-      def option_parser_uncached
-        ::OptionParser.new
-      end
-
-      def parse_argv
-        @arguments = options_first? ? option_parser.order(argv) : option_parser.parse(argv)
-      rescue ::OptionParser::InvalidOption => e
-        raise ::EacCli::Parser::Error.new(definition, argv, e.message)
-      end
-
-      def build_banner
-        option_parser.banner = "#{definition.description}\n\n#{section('usage')}"
-      end
-
-      def build_options
-        definition.options.each do |option|
-          build_option(option)
-        end
-      end
-
-      def build_option(option)
-        option_parser.on(
-          *[option_short(option), option_long(option), option.description].reject(&:blank?)
-        ) do |value|
-          collector.collect(option, value)
-        end
-      end
-
-      def positional_argument(positional)
-        if positional.subcommand?
-          ::EacRubyUtils::Console::DocoptRunner::SUBCOMMANDS_MACRO
-        else
-          r = "<#{positional.name}>"
-          r += '...' if positional.repeat?
-          r = "[#{r}]" if positional.optional?
-          r
-        end
-      end
-
-      def option_argument(option)
-        option_long(option)
-      end
-
-      def option_long(option)
-        b = option.long
-        b += '=VALUE' if option.argument?
-        b
-      end
-
-      def option_short(option)
-        b = option.short
-        b += 'VALUE' if option.argument?
-        b
-      end
-
-      def section(header, include_header = true)
-        b = include_header ? "#{header.humanize}:\n" : ''
-        b += send("self_#{header}") + "\n"
-        # TO-DO: implement alternatives
-        b
-      end
-
-      def self_options
-        definition.options.map { |option| IDENT + option_definition(option) }.join("\n")
-      end
-
-      def self_usage
-        IDENT + self_usage_arguments.join(SEP)
-      end
-
-      def self_usage_arguments
-        [::EacRubyUtils::Console::DocoptRunner::PROGRAM_MACRO] +
-          definition.options_argument.if_present([]) { |_v| ['[options]'] } +
-          self_usage_arguments_options +
-          self_usage_arguments_positional
-      end
-
-      def self_usage_arguments_options
-        definition.options.select(&:show_on_usage?).map { |option| option_argument(option) }
-      end
-
-      def self_usage_arguments_positional
-        definition.positional.map { |p| positional_argument(p) }
-      end
-    end
-  end
-end

data/lib/eac_cli/parser/parse_result.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_cli/parser/error'
-require 'eac_ruby_utils/core_ext'
-
-module EacCli
-  class Parser
-    class ParseResult
-      common_constructor :definition, :argv
-
-      def result
-        result_or_error = parse(definition)
-        return result_or_error unless result_or_error.is_a?(::Exception)
-
-        definition.alternatives.each do |alternative|
-          alt_result_or_error = parse(alternative)
-          return alt_result_or_error unless alt_result_or_error.is_a?(::Exception)
-        end
-
-        raise result_or_error
-      end
-
-      private
-
-      def parse(definition)
-        ::EacCli::Parser::Collector.to_data(definition) do |collector|
-          ::EacCli::Parser::PositionalCollection.new(
-            definition,
-            ::EacCli::Parser::OptionsCollection.new(definition, argv, collector).arguments,
-            collector
-          )
-        end
-      rescue ::EacCli::Parser::Error => e
-        e
-      end
-    end
-  end
-end

data/lib/eac_cli/parser/positional_collection.rb

@@ -1,77 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-require 'eac_cli/parser/error'
-
-module EacCli
-  class Parser
-    class PositionalCollection
-      common_constructor(:definition, :argv, :collector) { collect }
-
-      private
-
-      def argv_enum
-        @argv_enum ||= argv.each
-      end
-
-      def argv_pending?
-        argv_enum.ongoing?
-      end
-
-      def argv_pending_check
-        return unless argv_pending?
-        return unless positional_enum.stopped?
-
-        raise ::EacCli::Parser::Error.new(
-          definition, argv, "No positional left for argv \"#{argv_enum.current}\""
-        )
-      end
-
-      def collected
-        @collected ||= ::Set.new
-      end
-
-      def collect
-        loop do
-          break unless enums('pending?').any?
-
-          enums('pending_check')
-          collect_argv_value
-        end
-      end
-
-      def collect_argv_value
-        collector.collect(*enums('enum', &:peek))
-        collected << positional_enum.peek
-        positional_enum.next unless positional_enum.peek.repeat?
-        argv_enum.next
-      end
-
-      def enums(method_suffix, &block)
-        %w[positional argv].map do |method_prefix|
-          v = send("#{method_prefix}_#{method_suffix}")
-          block ? block.call(v) : v
-        end
-      end
-
-      def positional_enum
-        @positional_enum ||= definition.positional.each
-      end
-
-      def positional_pending?
-        !(positional_enum.stopped? || positional_enum.current.optional? ||
-            collected.include?(positional_enum.current))
-      end
-
-      def positional_pending_check
-        return unless positional_pending?
-        return unless argv_enum.stopped?
-
-        raise ::EacCli::Parser::Error.new(
-          definition, argv, 'No value for required positional ' \
-            "\"#{positional_enum.current.identifier}\""
-        )
-      end
-    end
-  end
-end