eac_tools 0.76.0 → 0.77.0

data/sub/eac_cli/lib/eac_cli/definition/alternative.rb

@@ -7,9 +7,30 @@ require 'eac_cli/definition/positional_argument'
 module EacCli
   class Definition
     class Alternative
+      ANY_OPTION_DESCRIPTION = 'ANY_OPTION'
+      ANY_OPTION_LONG = '__'
+      ANY_OPTION_SHORT = '_'
       SUBCOMMAND_NAME_ARG = :subcommand
       SUBCOMMAND_ARGS_ARG = :subcommand_args
 
+      # @return [Boolean]
+      def any_opt
+        @any_opt = true
+      end
+
+      # @return [Boolean]
+      def any_option?
+        @any_opt ? true : false
+      end
+
+      # @return [EacCli::Definition::BooleanOption]
+      def any_options_option
+        @any_options_option ||= ::EacCli::Definition::BooleanOption.new(
+          ANY_OPTION_SHORT, ANY_OPTION_LONG, ANY_OPTION_DESCRIPTION,
+          optional: true, repeat: true, usage: false
+        )
+      end
+
       def arg_opt(*args)
         options_set << ::EacCli::Definition::ArgumentOption.from_args(args)
       end
@@ -48,7 +69,7 @@ module EacCli
         return 'there are subcommands' if subcommands?
         return 'last argument repeats' if last.repeat?
         return 'new argument is required and last is optional' if
-          last.optional? && new_pos_arg.if_present(&:required?)
+        last.optional? && new_pos_arg.if_present(&:required?)
 
         nil
       end
@@ -67,8 +88,8 @@ module EacCli
 
       def check_positional_blocked(new_pos_arg)
         positional_arguments_blocked_reason(new_pos_arg).if_present do |v|
-          raise ::EacCli::Definition::Error, "Positional arguments are blocked: #{v}" \
-            " (New argument: #{new_pos_arg})"
+          raise ::EacCli::Definition::Error, "Positional arguments are blocked: #{v} " \
+                                             "(New argument: #{new_pos_arg})"
         end
       end
 

data/sub/eac_cli/lib/eac_cli/definition.rb

@@ -66,7 +66,7 @@ module EacCli
       alternatives.any?(&:subcommands?)
     end
 
-    def options_first(enable = true)
+    def options_first(enable = true) # rubocop:disable Style/OptionalBooleanParameter
       @options_first = enable
     end
 

data/sub/eac_cli/lib/eac_cli/old_configs/store_passwords_entry_reader.rb

@@ -17,7 +17,7 @@ module EacCli
       def banner
         infom 'Do you wanna to store passwords?'
         infom 'Warning: the passwords will be store in clear text in ' \
-          "\"#{console_configs.configs.storage_path}\""
+              "\"#{console_configs.configs.storage_path}\""
         infom 'Enter "yes" or "no"'
       end
     end

data/sub/eac_cli/lib/eac_cli/parser/alternative/any_options.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacCli
+  class Parser
+    class Alternative
+      module AnyOptions
+        delegate :any_option?, to: :alternative
+
+        # @return [EacCli::Definition::BooleanOption] if #any_option? is true.
+        # @raise [EacCli::Parser::Error] if #any_option? is false.
+        def any_option_collect_option
+          any_option? ? alternative.any_options_option : raise_argv_current_invalid_option
+        end
+      end
+    end
+  end
+end

data/sub/eac_cli/lib/eac_cli/parser/alternative/long_options.rb

@@ -24,7 +24,7 @@ module EacCli
             else
               option_argument_collect(option, value)
             end
-          end || raise_argv_current_invalid_option
+          end || any_option_collect_option
         end
 
         def parse_option_current_argv

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

@@ -33,9 +33,7 @@ module EacCli
         # @return [EacCli::Definition::BaseOption] The option collected.
         def short_option_collect_char(char)
           option = find_short_option(char)
-          raise_argv_current_invalid_option unless option
-
-          option_collect_option(option)
+          option ? option_collect_option(option) : any_option_collect_option
         end
 
         def short_without_prefix(short)

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

@@ -62,15 +62,6 @@ module EacCli
         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

data/sub/eac_cli/lib/eac_cli/parser.rb

@@ -12,7 +12,7 @@ module EacCli
 
     def parsed_uncached
       raise 'Definition has no alternatives' if alternatives.empty?
-      raise first_error unless alternatives.select(&:success?).any?
+      raise first_error unless alternatives.any?(&:success?)
 
       alternatives_parsed(true).merge(alternatives_parsed(false))
     end

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-Dir["#{File.dirname(__FILE__)}/#{::File.basename(__FILE__, '.*')}/*.rb"].sort.each do |path|
+Dir["#{File.dirname(__FILE__)}/#{File.basename(__FILE__, '.*')}/*.rb"].sort.each do |path|
   require path
 end

data/sub/eac_cli/lib/eac_cli/patches.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/require_sub'
-::EacRubyUtils.require_sub(__FILE__)
+EacRubyUtils.require_sub(__FILE__)

data/sub/eac_cli/lib/eac_cli/runner/class_runner.rb

@@ -29,7 +29,7 @@ module EacCli
 
       def run_parser_error(runner_instance, error)
         $stderr.write("#{runner_instance.program_name}: #{error}\n")
-        ::Kernel.exit(PARSER_ERROR_EXIT_CODE)
+        ::Kernel.exit(PARSER_ERROR_EXIT_CODE) # rubocop:disable Rails/Exit
       end
     end
   end

data/sub/eac_cli/lib/eac_cli/runner/context_responders/set.rb

@@ -18,9 +18,9 @@ module EacCli
           responders_instances.any?(&:callable?)
         end
 
-        def call(*args, &block)
+        def call(...)
           caller = responder_to_call
-          return caller.call(*args, &block) if caller
+          return caller.call(...) if caller
 
           raise ::NameError, "No method \"#{method_name}\" found in #{runner} or in its ancestors"
         end

data/sub/eac_cli/lib/eac_cli/runner/exit.rb

@@ -5,7 +5,8 @@ module EacCli
     class Exit < ::StandardError
       attr_reader :status
 
-      def initialize(status = true)
+      def initialize(status = true) # rubocop:disable Style/OptionalBooleanParameter
+        super
         @status = status
       end
     end

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

@@ -6,7 +6,7 @@ module EacCli
       def run_run
         parsed
         run_callbacks(:run) { run }
-      rescue ::EacCli::Runner::Exit # rubocop:disable Lint/SuppressedException
+      rescue ::EacCli::Runner::Exit
         # Do nothing
       end
 

data/sub/eac_cli/lib/eac_cli/runner_with/help/builder/alternative.rb

@@ -35,7 +35,7 @@ module EacCli
           end
 
           def positionals
-            alternative.positional.map { |p| positional(p) }.reject(&:blank?)
+            alternative.positional.map { |p| positional(p) }.compact_blank
           end
 
           def positional(positional)

data/sub/eac_cli/lib/eac_cli/runner_with/help/builder.rb

@@ -26,7 +26,7 @@ module EacCli
 
           def option_usage_full(option)
             if option.long.present?
-              [option.short, option_long(option)].reject(&:blank?).join(word_separator)
+              [option.short, option_long(option)].compact_blank.join(word_separator)
             else
               option_short(option)
             end
@@ -53,7 +53,7 @@ module EacCli
         def option_definition(option)
           [self.class.option_usage_full(option), option.description,
            option.default_value? ? "[Default: \"#{option.default_value}\"]" : nil]
-            .reject(&:blank?).join(OPTION_DESCRIPTION_SEPARATOR)
+            .compact_blank.join(OPTION_DESCRIPTION_SEPARATOR)
         end
 
         # @return [String]

data/sub/eac_cli/lib/eac_cli/runner_with/help.rb

@@ -12,6 +12,7 @@ module EacCli
 
         runner_definition.alt do
           bool_opt '-h', '--help', 'Show help.', usage: true, required: true
+          any_opt
           pos_arg :any_arg_with_help, repeat: true, optional: true, visible: false
         end
 

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

@@ -105,7 +105,7 @@ module EacCli
         raise(::EacCli::Parser::Error.new(
                 self.class.runner_definition, runner_context.argv,
                 "Subcommand \"#{subcommand_name}\" not found " \
-                  "(Available: #{available_subcommands_to_s})"
+                "(Available: #{available_subcommands_to_s})"
               ))
       end
 

data/sub/eac_cli/lib/eac_cli/runner_with_set.rb

@@ -33,7 +33,7 @@ module EacCli
     private
 
     def namespace_set
-      @namespace_set ||= ::Array.new
+      @namespace_set ||= []
     end
 
     def key_to_module(key)

data/sub/eac_cli/lib/eac_cli/speaker/list.rb

@@ -17,11 +17,11 @@ module EacCli
         private
 
         def hash_to_values(list)
-          list.map { |key, value| ::OpenStruct.new(key: key, label: key, value: value) }
+          list.map { |key, value| ::OpenStruct.new(key: key, label: key, value: value) } # rubocop:disable Style/OpenStructUse
         end
 
         def array_to_values(list)
-          list.map { |value| ::OpenStruct.new(key: value, label: value, value: value) }
+          list.map { |value| ::OpenStruct.new(key: value, label: value, value: value) }  # rubocop:disable Style/OpenStructUse
         end
       end
 
@@ -29,7 +29,7 @@ module EacCli
 
       def initialize(values)
         @values = values.map do |v|
-          ::OpenStruct.new(key: to_key(v.key), label: to_label(v.label), value: v.value)
+          ::OpenStruct.new(key: to_key(v.key), label: to_label(v.label), value: v.value)  # rubocop:disable Style/OpenStructUse
         end
       end
 
@@ -51,7 +51,7 @@ module EacCli
 
       def build_value(value)
         key = to_key(value)
-        values.each do |v| # rubocop:disable Style/HashEachMethods
+        values.each do |v|
           return v.value if v.key == key
         end
         raise "Value not found: \"#{value}\" (#{values})"

data/sub/eac_cli/lib/eac_cli/speaker/options.rb

@@ -11,15 +11,15 @@ module EacCli
       end
 
       def err_out
-        option(OPTION_ERR_OUT, ::EacCli::Speaker::STDERR)
+        option(OPTION_ERR_OUT, $stderr)
       end
 
       def out_out
-        option(OPTION_OUT_OUT, ::EacCli::Speaker::STDOUT)
+        option(OPTION_OUT_OUT, $stdout)
       end
 
       def in_in
-        option(OPTION_IN_IN, ::EacCli::Speaker::STDIN)
+        option(OPTION_IN_IN, $stdin)
       end
 
       def err_line_prefix

data/sub/eac_cli/lib/eac_cli/speaker.rb

@@ -83,7 +83,8 @@ module EacCli
     def list_value(list, input)
       values = list_values(list)
       return input, true unless values
-      return input, false unless values.include?(input)
+
+      [input, false] unless values.include?(input)
     end
 
     def list_values(list)

data/sub/eac_cli/lib/eac_cli/version.rb

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

data/sub/eac_cli/spec/lib/eac_cli/definition/alternative_spec.rb

@@ -2,7 +2,7 @@
 
 require 'eac_cli/definition/alternative'
 
-RSpec.describe ::EacCli::Definition::Alternative do
+RSpec.describe EacCli::Definition::Alternative do
   let(:instance) { described_class.new }
 
   it { expect { instance.arg_opt '-a', '--opt2', 'A argument option' }.not_to raise_error }
@@ -10,7 +10,7 @@ RSpec.describe ::EacCli::Definition::Alternative do
   it { expect { instance.bool_opt '-b', '--no-description' }.not_to raise_error }
   it { expect { instance.bool_opt '--opt1', 'A option without short' }.not_to raise_error }
   it { expect { instance.bool_opt '-b', 'A option without long' }.not_to raise_error }
-  it { expect { instance.bool_opt 'A option without selectors' }.to raise_error(::StandardError) }
+  it { expect { instance.bool_opt 'A option without selectors' }.to raise_error(StandardError) }
   it { expect { instance.options_argument(true) }.not_to raise_error }
   it { expect { instance.pos_arg :pos1 }.not_to raise_error }
   it { expect { instance.pos_arg :pos2, optional: true, repeat: true }.not_to raise_error }

data/sub/eac_cli/spec/lib/eac_cli/old_configs_spec.rb

@@ -2,7 +2,7 @@
 
 require 'eac_cli/old_configs'
 
-RSpec.describe ::EacCli::OldConfigs do
+RSpec.describe EacCli::OldConfigs do
   describe '#entry_key_to_envvar_name' do
     {
       'a.entry.value' => 'A_ENTRY_VALUE',

data/sub/eac_cli/spec/lib/eac_cli/parser/alternative_spec.rb

@@ -2,13 +2,13 @@
 
 require 'eac_cli/parser/alternative'
 
-RSpec.describe ::EacCli::Parser::Alternative do
+RSpec.describe EacCli::Parser::Alternative do
   let(:instance) { described_class.new(alternative, argv) }
   let(:actual_parsed) { instance.parsed.to_h.symbolize_keys }
 
   context 'without subcommands' do
     let(:alternative) do
-      r = ::EacCli::Definition::Alternative.new
+      r = EacCli::Definition::Alternative.new
       r.bool_opt '-b', '--opt1', 'A boolean option'
       r.arg_opt '-a', '--opt2', 'A argument option'
       r.bool_opt '-c', '--opt3', 'A required boolean option', required: true
@@ -73,7 +73,7 @@ RSpec.describe ::EacCli::Parser::Alternative do
 
     context 'with excedent positional' do
       let(:alternative) do
-        r = ::EacCli::Definition::Alternative.new
+        r = EacCli::Definition::Alternative.new
         r.pos_arg :pos1
         r
       end
@@ -88,7 +88,7 @@ RSpec.describe ::EacCli::Parser::Alternative do
 
   context 'with subcommands' do
     let(:alternative) do
-      r = ::EacCli::Definition::Alternative.new
+      r = EacCli::Definition::Alternative.new
       r.bool_opt '-b', '--opt1', 'A boolean option'
       r.arg_opt '-a', '--opt2', 'A argument option'
       r.subcommands
@@ -100,8 +100,8 @@ RSpec.describe ::EacCli::Parser::Alternative do
       let(:parsed_expected) do
         {
           opt1: true, opt2: 'OPT2',
-          ::EacCli::Definition::Alternative::SUBCOMMAND_NAME_ARG => 'CMD',
-          ::EacCli::Definition::Alternative::SUBCOMMAND_ARGS_ARG => %w[CMD_ARG_1 --CMD_ARG_2]
+          EacCli::Definition::Alternative::SUBCOMMAND_NAME_ARG => 'CMD',
+          EacCli::Definition::Alternative::SUBCOMMAND_ARGS_ARG => %w[CMD_ARG_1 --CMD_ARG_2]
         }
       end
 
@@ -114,8 +114,8 @@ RSpec.describe ::EacCli::Parser::Alternative do
       let(:parsed_expected) do
         {
           opt1: false, opt2: nil,
-          ::EacCli::Definition::Alternative::SUBCOMMAND_NAME_ARG => 'CMD',
-          ::EacCli::Definition::Alternative::SUBCOMMAND_ARGS_ARG => []
+          EacCli::Definition::Alternative::SUBCOMMAND_NAME_ARG => 'CMD',
+          EacCli::Definition::Alternative::SUBCOMMAND_ARGS_ARG => []
         }
       end
 
@@ -128,8 +128,8 @@ RSpec.describe ::EacCli::Parser::Alternative do
       let(:parsed_expected) do
         {
           opt1: true, opt2: nil,
-          ::EacCli::Definition::Alternative::SUBCOMMAND_NAME_ARG => nil,
-          ::EacCli::Definition::Alternative::SUBCOMMAND_ARGS_ARG => []
+          EacCli::Definition::Alternative::SUBCOMMAND_NAME_ARG => nil,
+          EacCli::Definition::Alternative::SUBCOMMAND_ARGS_ARG => []
         }
       end
 

data/sub/eac_cli/spec/lib/eac_cli/runner/for_context_spec.rb

@@ -2,10 +2,10 @@
 
 require 'eac_cli/runner'
 
-::RSpec.describe ::EacCli::Runner do
+RSpec.describe EacCli::Runner, '#for_context' do # rubocop:disable RSpec/MultipleMemoizedHelpers
   let(:parent_runner_class) do
     example = self
-    ::Class.new do
+    Class.new do
       include example.described_class
 
       def self.name
@@ -22,9 +22,9 @@ require 'eac_cli/runner'
     end
   end
 
-  let(:child_runner_class_1) do
+  let(:child_runner_class1) do # rubocop:disable RSpec/IndexedLet
     example = self
-    ::Class.new do
+    Class.new do
       include example.described_class
 
       def self.name
@@ -39,9 +39,9 @@ require 'eac_cli/runner'
     end
   end
 
-  let(:child_runner_class_2) do
+  let(:child_runner_class2) do # rubocop:disable RSpec/IndexedLet
     example = self
-    ::Class.new do
+    Class.new do
       include example.described_class
 
       def self.name
@@ -58,22 +58,22 @@ require 'eac_cli/runner'
   let(:context_args) { [{ argv: [], parent: parent_runner }] }
   let(:child_runner) { child_runner_class.create(*context_args) }
 
-  it { expect(parent_runner.for_context?(:method_for_context)).to eq(true) }
-  it { expect(parent_runner.for_context?(:method_not_for_context)).to eq(false) }
+  it { expect(parent_runner.for_context?(:method_for_context)).to be(true) }
+  it { expect(parent_runner.for_context?(:method_not_for_context)).to be(false) }
 
-  context 'when method is for context' do
-    let(:child_runner_class) { child_runner_class_1 }
+  context 'when method is for context' do # rubocop:disable RSpec/MultipleMemoizedHelpers
+    let(:child_runner_class) { child_runner_class1 }
 
     it do
       expect { child_runner.run }.not_to raise_error
     end
   end
 
-  context 'when method is not for context' do
-    let(:child_runner_class) { child_runner_class_2 }
+  context 'when method is not for context' do # rubocop:disable RSpec/MultipleMemoizedHelpers
+    let(:child_runner_class) { child_runner_class2 }
 
     it do
-      expect { child_runner.run }.to raise_error(::NameError)
+      expect { child_runner.run }.to raise_error(NameError)
     end
   end
 end

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

@@ -2,10 +2,10 @@
 
 require 'eac_cli/runner'
 
-RSpec.describe ::EacCli::Runner do
+RSpec.describe EacCli::Runner do
   let(:runner_class) do
     the_module = described_class
-    ::Class.new do
+    Class.new do
       include the_module
 
       runner_definition do
@@ -37,7 +37,7 @@ RSpec.describe ::EacCli::Runner do
 
     it { expect(parsed_actual).to eq(parsed_expected) }
     it { expect(instance.parsed.opt1).to eq('aaa') }
-    it { expect(instance.parsed.opt2?).to eq(true) }
+    it { expect(instance.parsed.opt2?).to be(true) }
     it { expect(instance.parsed.pos1).to eq('bbb') }
     it { expect(instance.parsed.pos2).to eq(%w[ccc ddd]) }
   end
@@ -52,14 +52,14 @@ RSpec.describe ::EacCli::Runner do
     let(:argv) { %w[-po aaa pos1] }
 
     it { expect(instance.parsed.opt1).to eq('aaa') }
-    it { expect(instance.parsed.opt2?).to eq(true) }
+    it { expect(instance.parsed.opt2?).to be(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)
+      expect { instance.parsed }.to raise_error(EacCli::Parser::Error)
     end
   end
 
@@ -72,7 +72,7 @@ RSpec.describe ::EacCli::Runner do
 
     it { expect(parsed_actual).to eq(parsed_expected) }
     it { expect(instance.parsed.opt1).to be_nil }
-    it { expect(instance.parsed.opt2?).to eq(false) }
+    it { expect(instance.parsed.opt2?).to be(false) }
     it { expect(instance.parsed.pos1).to eq('bbb') }
     it { expect(instance.parsed.pos2).to eq([]) }
   end
@@ -81,7 +81,7 @@ RSpec.describe ::EacCli::Runner do
     let(:argv) { %w[] }
 
     it do
-      expect { instance.parsed }.to raise_error(::EacCli::Parser::Error)
+      expect { instance.parsed }.to raise_error(EacCli::Parser::Error)
     end
   end
 
@@ -93,7 +93,7 @@ RSpec.describe ::EacCli::Runner do
     end
 
     it { expect(parsed_actual).to eq(parsed_expected) }
-    it { expect(instance.parsed.opt3?).to eq(true) }
+    it { expect(instance.parsed.opt3?).to be(true) }
   end
 
   context 'when repeated options are supplied' do
@@ -109,7 +109,7 @@ RSpec.describe ::EacCli::Runner do
   context 'when extra args are not supplied' do
     let(:runner_class) do
       the_module = described_class
-      ::Class.new do
+      Class.new do
         include the_module
 
         runner_definition do
@@ -123,7 +123,7 @@ RSpec.describe ::EacCli::Runner do
     let(:argv) { %w[aaa bbb] }
 
     it do
-      expect { instance.parsed }.to raise_error(::EacCli::Parser::Error)
+      expect { instance.parsed }.to raise_error(EacCli::Parser::Error)
     end
   end
 end

data/sub/eac_cli/spec/lib/eac_cli/runner_with/confirmation_spec.rb

@@ -2,7 +2,7 @@
 
 require 'eac_cli/runner_with/confirmation'
 
-::RSpec.describe ::EacCli::RunnerWith::Confirmation do
+RSpec.describe EacCli::RunnerWith::Confirmation do
   let(:runner) do
     the_module = described_class
     Class.new do
@@ -14,9 +14,9 @@ require 'eac_cli/runner_with/confirmation'
 
       def run
         if confirm?
-          ::Kernel.puts 'Accepted'
+          Kernel.puts 'Accepted'
         else
-          ::Kernel.puts 'Denied'
+          Kernel.puts 'Denied'
         end
       end
     end

data/sub/eac_cli/spec/lib/eac_cli/runner_with/help/layout_spec.rb

@@ -2,7 +2,7 @@
 
 require 'eac_cli/runner_with/help/layout'
 
-::RSpec.describe ::EacCli::RunnerWith::Help::Layout do
+RSpec.describe EacCli::RunnerWith::Help::Layout do
   describe '#list_section' do
     {
       ['Options', ['Option A', 'Option B']] => <<~TEXT

data/sub/eac_cli/spec/lib/eac_cli/runner_with/help_spec.rb

@@ -3,7 +3,7 @@
 require 'eac_cli/runner_with/help'
 require 'eac_ruby_utils/fs/temp'
 
-RSpec.describe ::EacCli::RunnerWith::Help do
+RSpec.describe EacCli::RunnerWith::Help do
   let(:runner) do
     the_module = described_class
     Class.new do
@@ -22,7 +22,8 @@ RSpec.describe ::EacCli::RunnerWith::Help do
 
   [
     ['--help'],
-    ['trash-pos-arg-before', '--help', 'trash-pos-arg-after']
+    ['trash-pos-arg-before', '--help', 'trash-pos-arg-after', '--any-option', '-XYZ',
+     'other-trash-arg']
   ].each do |runner_argv|
     context "when runner ARGV is #{runner_argv}" do
       let(:instance) { runner.create(argv: runner_argv) }