avm-tools 0.84.0 → 0.87.1

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

@@ -4,49 +4,20 @@ 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
+        def option_collect_option(option)
+          if option.argument?
+            argument_option_collect_argv(option)
+          else
+            boolean_option_collect_argv(option)
+          end
 
-            true
-          end || raise_argv_current_invalid_option
+          option
         end
 
         def raise_argv_current_invalid_option

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

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module EacCli
+  class Parser
+    class Alternative
+      module ShortOptions
+        SHORT_OPTION_PREFIX = '-'
+
+        private
+
+        def argv_current_short_option?
+          phase == PHASE_ANY && argv_enum.peek.start_with?(SHORT_OPTION_PREFIX) &&
+            !argv_current_long_option?
+        end
+
+        def find_short_option(char)
+          alternative.options.find { |option| short_without_prefix(option.short) == char }
+        end
+
+        def short_option_collect_argv_value
+          last_option = nil
+          short_without_prefix(argv_enum.peek).each_char do |char|
+            raise_error "Option \"#{last_option}\" requires a argument not provided" if
+            last_option.present?
+
+            collected_option = short_option_collect_char(char)
+            last_option = collected_option if collected_option.argument?
+          end
+        end
+
+        # @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
+
+          option_collect_option(option)
+        end
+
+        def short_without_prefix(short)
+          short.gsub(/\A#{::Regexp.quote(SHORT_OPTION_PREFIX)}/, '')
+        end
+      end
+    end
+  end
+end

data/vendor/eac_cli/lib/eac_cli/runner.rb

@@ -47,53 +47,5 @@ module EacCli
       include ActiveSupport::Callbacks
       define_callbacks :run
     end
-
-    module AfterClassMethods
-      def create(*runner_context_args)
-        r = new
-        r.runner_context = ::EacCli::Runner::Context.new(r, *runner_context_args)
-        r
-      end
-
-      def run(*runner_context_args)
-        r = create(*runner_context_args)
-        r.run_run
-        r
-      end
-
-      def runner_definition(&block)
-        @runner_definition ||= super_runner_definition
-        @runner_definition.instance_eval(&block) if block
-        @runner_definition
-      end
-
-      def super_runner_definition
-        superclass.try(:runner_definition).if_present(&:dup) || ::EacCli::Definition.new
-      end
-    end
-
-    module InstanceMethods
-      def run_run
-        parsed
-        run_callbacks(:run) { run }
-      rescue ::EacCli::Runner::Exit # rubocop:disable Lint/SuppressedException
-        # Do nothing
-      end
-
-      def runner_context
-        return @runner_context if @runner_context
-
-        raise 'Context was required, but was not set yet'
-      end
-
-      def runner_context=(new_runner_context)
-        @runner_context = new_runner_context
-        @parsed = nil
-      end
-
-      def parsed
-        @parsed ||= ::EacCli::Parser.new(self.class.runner_definition, runner_context.argv).parsed
-      end
-    end
   end
 end

data/vendor/eac_cli/lib/eac_cli/runner/after_class_methods.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module EacCli
+  module Runner
+    module AfterClassMethods
+      def create(*runner_context_args)
+        r = new
+        r.runner_context = ::EacCli::Runner::Context.new(r, *runner_context_args)
+        r
+      end
+
+      def run(*runner_context_args)
+        r = create(*runner_context_args)
+        r.run_run
+        r
+      end
+
+      def runner_definition(&block)
+        @runner_definition ||= super_runner_definition
+        @runner_definition.instance_eval(&block) if block
+        @runner_definition
+      end
+
+      def super_runner_definition
+        superclass.try(:runner_definition).if_present(&:dup) || ::EacCli::Definition.new
+      end
+    end
+  end
+end

data/vendor/eac_cli/lib/eac_cli/runner/instance_methods.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module EacCli
+  module Runner
+    module InstanceMethods
+      def run_run
+        parsed
+        run_callbacks(:run) { run }
+      rescue ::EacCli::Parser::Error => e
+        $stderr.write("#{e}\n")
+      rescue ::EacCli::Runner::Exit # rubocop:disable Lint/SuppressedException
+        # Do nothing
+      end
+
+      def runner_context
+        return @runner_context if @runner_context
+
+        raise 'Context was required, but was not set yet'
+      end
+
+      def runner_context=(new_runner_context)
+        @runner_context = new_runner_context
+        @parsed = nil
+      end
+
+      def parsed
+        @parsed ||= ::EacCli::Parser.new(self.class.runner_definition, runner_context.argv).parsed
+      end
+    end
+  end
+end

data/vendor/eac_cli/lib/eac_cli/runner_with/subcommands.rb

@@ -6,6 +6,14 @@ require 'eac_ruby_utils/core_ext'
 module EacCli
   module RunnerWith
     module Subcommands
+      class << self
+        def runner?(object)
+          ::EacCli::Runner.runner?(object) || (
+            object.is_a?(::Class) && object < ::EacRubyUtils::Console::DocoptRunner
+          )
+        end
+      end
+
       common_concern do
         include ::EacCli::Runner
       end
@@ -19,7 +27,7 @@ module EacCli
       def available_subcommands_auto
         self.class.constants
             .map { |name| [name.to_s.underscore.gsub('_', '-'), self.class.const_get(name)] }
-            .select { |c| ::EacCli::Runner.runner?(c[1]) }
+            .select { |c| ::EacCli::RunnerWith::Subcommands.runner?(c[1]) }
             .to_h.with_indifferent_access
       end
 
@@ -32,7 +40,7 @@ module EacCli
       end
 
       def help_extra_text
-        (['Subcommands:'] + available_subcommands.keys.map { |s| "  #{s}" })
+        (['Subcommands:'] + available_subcommands.keys.sort.map { |s| "  #{s}" })
           .map { |v| "#{v}\n" }.join
       end
 
@@ -49,7 +57,11 @@ module EacCli
 
       def run_with_subcommand
         if subcommand_name
-          subcommand_runner.run_run
+          if subcommand_runner.respond_to?(:run_run)
+            subcommand_runner.run_run
+          else
+            subcommand_runner.run
+          end
         else
           run_without_subcommand
         end

data/vendor/eac_cli/lib/eac_cli/version.rb

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

data/vendor/eac_cli/spec/lib/eac_cli/runner_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe ::EacCli::Runner do
 
       runner_definition do
         arg_opt '-o', '--opt1', 'A arg option.'
-        bool_opt '-o', '--opt2', 'A boolean option'
+        bool_opt '-p', '--opt2', 'A boolean option'
         pos_arg :pos1
         pos_arg :pos2, repeat: true, optional: true
         alt do
@@ -40,6 +40,27 @@ RSpec.describe ::EacCli::Runner do
     it { expect(instance.parsed.pos2).to eq(%w[ccc ddd]) }
   end
 
+  context 'with long option and argument in same position' do
+    let(:argv) { %w[--opt1=aaa pos1] }
+
+    it { expect(instance.parsed.opt1).to eq('aaa') }
+  end
+
+  context 'with valid grouped short options' do
+    let(:argv) { %w[-po aaa pos1] }
+
+    it { expect(instance.parsed.opt1).to eq('aaa') }
+    it { expect(instance.parsed.opt2?).to eq(true) }
+  end
+
+  context 'with invalid grouped short options' do
+    let(:argv) { %w[-op aaa pos1] }
+
+    it do
+      expect { instance.parsed }.to raise_error(::EacCli::Parser::Error)
+    end
+  end
+
   context 'when only required args are supplied' do
     let(:argv) { %w[bbb] }
     let(:parsed_expected) { { opt1: nil, opt2: false, opt3: false, pos1: 'bbb', pos2: [] } }

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/application.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_gems_utils/gem'
 require 'eac_ruby_utils/core_ext'
 require 'eac_ruby_utils/filesystem_cache'
 

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/runner.rb

@@ -1,13 +1,16 @@
 # frozen_string_literal: true
 
-require 'eac_cli/default_runner'
+require 'eac_cli/runner_with/help'
+require 'eac_cli/runner_with/subcommands'
 require 'eac_ruby_utils/core_ext'
 
 module EacRubyBase0
   module Runner
     require_sub __FILE__
+    enable_console_speaker
     common_concern do
-      include ::EacCli::DefaultRunner
+      include ::EacCli::RunnerWith::Help
+      include ::EacCli::RunnerWith::Subcommands
       runner_definition do
         bool_opt '-q', '--quiet', 'Quiet mode.'
         bool_opt '-I', '--no-input', 'Fail if a input is requested.'
@@ -20,9 +23,9 @@ module EacRubyBase0
 
     def run
       on_speaker_node do |node|
-        node.stderr = ::StringIO.new if options.fetch('--quiet')
-        node.stdin = FailIfRequestInput.new if options.fetch('--no-input')
-        if options.fetch('--version')
+        node.stderr = ::StringIO.new if parsed.quiet?
+        node.stdin = FailIfRequestInput.new if parsed.no_input?
+        if parsed.version?
           show_version
         else
           run_with_subcommand
@@ -31,7 +34,7 @@ module EacRubyBase0
     end
 
     def application_version
-      context(:application).version.to_s
+      runner_context.call(:application).version.to_s
     end
 
     def show_version

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/runner/test_all.rb

@@ -1,17 +1,12 @@
 # frozen_string_literal: true
 
-require 'eac_cli/default_runner'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/core_ext'
+require 'eac_cli/core_ext'
 require 'eac_ruby_gems_utils/tests/multiple'
 
 module EacRubyBase0
   module Runner
-    class TestAll < ::EacRubyUtils::Console::DocoptRunner
-      require_sub __FILE__
-      include ::EacCli::DefaultRunner
-
-      runner_definition do
+    class TestAll
+      runner_with :help do
         desc 'Test core and local gems.'
       end
 
@@ -20,7 +15,7 @@ module EacRubyBase0
       end
 
       def tests_uncached
-        ::EacRubyGemsUtils::Tests::Multiple.new(context(:application).all_gems)
+        ::EacRubyGemsUtils::Tests::Multiple.new(runner_context.call(:application).all_gems)
       end
     end
   end

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyBase0
-  VERSION = '0.3.1'
+  VERSION = '0.3.3'
 end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/common_concern/module_setup.rb

@@ -17,15 +17,25 @@ module EacRubyUtils
       end
 
       def run
-        setup = self
         a_module.extend(::ActiveSupport::Concern)
-        a_module.included do
-          ::EacRubyUtils::CommonConcern::ClassSetup.new(setup, self, :include).run
-        end
-        a_module.prepended do
-          ::EacRubyUtils::CommonConcern::ClassSetup.new(setup, self, :prepend).run
+        include_or_prepend(:included, :include)
+        include_or_prepend(:prepended, :prepend)
+      end
+
+      private
+
+      def include_or_prepend(module_method, class_setup_method)
+        setup = self
+        a_module.send(module_method, *a_module_method_args(module_method)) do
+          ::EacRubyUtils::CommonConcern::ClassSetup.new(setup, self, class_setup_method).run
         end
       end
+
+      def a_module_method_args(module_method)
+        method_arity = a_module.method(module_method).arity
+        method_arity = -method_arity - 1 if method_arity.negative?
+        method_arity.times.map { |_n| a_module }
+      end
     end
   end
 end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/common_constructor.rb

@@ -2,6 +2,7 @@
 
 require 'active_support/callbacks'
 require 'eac_ruby_utils/arguments_consumer'
+require 'eac_ruby_utils/common_constructor/class_initialize'
 require 'ostruct'
 
 module EacRubyUtils
@@ -76,111 +77,13 @@ module EacRubyUtils
     end
 
     def setup_class_initialize(klass)
-      common_constructor = self
       klass.include(::ActiveSupport::Callbacks)
       klass.define_callbacks :initialize
-      klass.send(:define_method, :initialize) do |*args|
-        Initialize.new(common_constructor, args, self).run
-        super(*SuperArgs.new(common_constructor, args, self).result)
-      end
+      ::EacRubyUtils::CommonConstructor::ClassInitialize.new(self, klass).run
     end
 
     def super_args
       options[:super_args]
     end
-
-    class Initialize
-      attr_reader :common_constructor, :args, :object
-
-      def initialize(common_constructor, args, object)
-        @common_constructor = common_constructor
-        @args = args
-        @object = object
-      end
-
-      def run
-        validate_args_count
-        object.run_callbacks :initialize do
-          object_attributes_set
-          object_after_callback
-        end
-      end
-
-      private
-
-      def arg_value(arg_name)
-        arg_index = common_constructor.args.index(arg_name)
-        if arg_index < args.count
-          args[arg_index]
-        else
-          common_constructor.default_values[arg_index - common_constructor.args_count_min]
-        end
-      end
-
-      def object_after_callback
-        return unless common_constructor.after_set_block
-
-        object.instance_eval(&common_constructor.after_set_block)
-      end
-
-      def object_attributes_set
-        common_constructor.args.each do |arg_name|
-          object.send("#{arg_name}=", arg_value(arg_name))
-        end
-      end
-
-      def validate_args_count
-        return if common_constructor.args_count.include?(args.count)
-
-        raise ArgumentError, "#{object.class}.initialize: wrong number of arguments" \
-          " (given #{args.count}, expected #{common_constructor.args_count})"
-      end
-    end
-
-    class SuperArgs
-      attr_reader :common_constructor, :args, :object
-
-      def initialize(common_constructor, args, object)
-        @common_constructor = common_constructor
-        @args = args
-        @object = object
-      end
-
-      def auto_result
-        r = []
-        sub_args.each do |name, value|
-          i = super_arg_index(name)
-          r[i] = value if i
-        end
-        r
-      end
-
-      def result
-        result_from_options || auto_result
-      end
-
-      def result_from_options
-        return unless common_constructor.super_args
-
-        object.instance_exec(&common_constructor.super_args)
-      end
-
-      def sub_args
-        common_constructor.args.each_with_index.map do |name, index|
-          [name, args[index]]
-        end.to_h
-      end
-
-      def super_arg_index(name)
-        super_method.parameters.each_with_index do |arg, index|
-          return index if arg[1] == name
-        end
-        nil
-      end
-
-      def super_method
-        object.class.superclass ? object.class.superclass.instance_method(:initialize) : nil
-      end
-    end
   end
 end