avm-tools 0.116.2 → 0.117.2

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

@@ -1,23 +1,22 @@
 # frozen_string_literal: true
 
-require 'eac_cli/speaker'
-require 'eac_ruby_utils/speaker'
+require 'eac_cli/definition'
+require 'eac_cli/runner/class_runner'
 
 module EacCli
   module Runner
     module AfterClassMethods
+      # @return [EacCli::Runner::ClassRunner]
+      def class_runner(runner_context_args)
+        ::EacCli::Runner::ClassRunner.new(self, runner_context_args)
+      end
+
       def create(*runner_context_args)
-        r = new
-        r.runner_context = ::EacCli::Runner::Context.new(r, *runner_context_args)
-        r
+        class_runner(runner_context_args).create
       end
 
       def run(*runner_context_args)
-        on_asserted_speaker do
-          r = create(*runner_context_args)
-          r.run_run
-          r
-        end
+        class_runner(runner_context_args).run
       end
 
       def runner_definition(&block)
@@ -29,18 +28,6 @@ module EacCli
       def super_runner_definition
         superclass.try(:runner_definition).if_present(&:dup) || ::EacCli::Definition.new
       end
-
-      private
-
-      def on_asserted_speaker
-        if ::EacRubyUtils::Speaker.context.optional_current
-          yield
-        else
-          ::EacRubyUtils::Speaker.context.on(::EacCli::Speaker.new) do
-            yield
-          end
-        end
-      end
     end
   end
 end

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

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'eac_cli/speaker'
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/speaker'
+
+module EacCli
+  module Runner
+    class ClassRunner
+      PARSER_ERROR_EXIT_CODE = 1
+
+      common_constructor :klass, :context_args
+
+      def create
+        r = klass.new
+        r.runner_context = ::EacCli::Runner::Context.new(r, *context_args)
+        r
+      end
+
+      def run
+        on_asserted_speaker do
+          r = create
+          begin
+            r.run_run
+          rescue ::EacCli::Parser::Error => e
+            run_parser_error(r, e)
+          end
+          r
+        end
+      end
+
+      def run_parser_error(runner_instance, error)
+        $stderr.write("#{runner_instance.program_name}: #{error}\n")
+        ::Kernel.exit(PARSER_ERROR_EXIT_CODE)
+      end
+
+      private
+
+      def on_asserted_speaker
+        if ::EacRubyUtils::Speaker.context.optional_current
+          yield
+        else
+          ::EacRubyUtils::Speaker.context.on(::EacCli::Speaker.new) do
+            yield
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -3,22 +3,13 @@
 module EacCli
   module Runner
     module InstanceMethods
-      PARSER_ERROR_EXIT_CODE = 1
-
       def run_run
         parsed
         run_callbacks(:run) { run }
-      rescue ::EacCli::Parser::Error => e
-        run_parser_error(e)
       rescue ::EacCli::Runner::Exit # rubocop:disable Lint/SuppressedException
         # Do nothing
       end
 
-      def run_parser_error(error)
-        $stderr.write("#{program_name}: #{error}\n")
-        ::Kernel.exit(PARSER_ERROR_EXIT_CODE)
-      end
-
       def runner_context
         return @runner_context if @runner_context
 

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

@@ -7,18 +7,19 @@ module EacCli
     module Help
       class Builder
         class Alternative
-          PROGRAM_MACRO = '__PROGRAM__'
+          enable_method_class
+
           SUBCOMMANDS_MACRO = '__SUBCOMMANDS__'
 
-          common_constructor :alternative
+          common_constructor :builder, :alternative
 
-          def to_s
+          def result
             (
-              [PROGRAM_MACRO] +
+              program_name +
                 alternative.options_argument?.if_present([]) { |_v| ['[options]'] } +
                 options +
                 positionals
-            ).join(::EacCli::RunnerWith::Help::Builder::SEP)
+            ).join(builder.word_separator)
           end
 
           def options
@@ -49,6 +50,12 @@ module EacCli
               r
             end
           end
+
+          def program_name
+            r = builder.runner.program_name
+            r = [r] unless r.is_a?(::Enumerable)
+            r
+          end
         end
       end
     end

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

@@ -6,8 +6,8 @@ module EacCli
   module RunnerWith
     module Help
       class Builder
-        require_sub __FILE__
-        common_constructor :definition
+        require_sub __FILE__, require_dependency: true
+        common_constructor :runner
 
         SEP = ' '
         IDENT = SEP * 2
@@ -28,11 +28,21 @@ module EacCli
 
           def option_usage_full(option)
             if option.long.present?
-              [option.short, option_long(option)].reject(&:blank?).join(SEP)
+              [option.short, option_long(option)].reject(&:blank?).join(word_separator)
             else
               option_short(option)
             end
           end
+
+          def word_separator
+            SEP
+          end
+        end
+
+        delegate :word_separator, to: :class
+
+        def definition
+          runner.class.runner_definition
         end
 
         def option_definition(option)
@@ -45,8 +55,7 @@ module EacCli
           b = include_header ? "#{header.humanize}:\n" : ''
           b += send("self_#{header}") + "\n"
           definition.alternatives.each do |alternative|
-            b += IDENT + ::EacCli::RunnerWith::Help::Builder::Alternative.new(alternative).to_s +
-                 "\n"
+            b += IDENT + self.alternative(alternative) + "\n"
           end
           b
         end
@@ -60,7 +69,7 @@ module EacCli
         def usage_section
           "Usage:\n" +
             definition.alternatives.map do |alternative|
-              IDENT + ::EacCli::RunnerWith::Help::Builder::Alternative.new(alternative).to_s + "\n"
+              IDENT + self.alternative(alternative) + "\n"
             end.join
         end
 

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

@@ -6,7 +6,7 @@ require 'eac_ruby_utils/core_ext'
 module EacCli
   module RunnerWith
     module Help
-      require_sub __FILE__
+      require_sub __FILE__, require_dependency: true
       common_concern do
         include ::EacCli::Runner
 
@@ -28,7 +28,7 @@ module EacCli
       end
 
       def help_text
-        r = ::EacCli::RunnerWith::Help::Builder.new(self.class.runner_definition).to_s
+        r = ::EacCli::RunnerWith::Help::Builder.new(self).to_s
         r += help_extra_text if respond_to?(:help_extra_text)
         r
       end

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

@@ -104,7 +104,7 @@ module EacCli
       end
 
       def subcommand_program
-        subcommand_name
+        [program_name, subcommand_name]
       end
 
       def subcommand_runner

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

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

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

@@ -20,23 +20,32 @@ RSpec.describe ::EacCli::RunnerWith::Help do
     end
   end
 
-  let(:runner_argv) { ['--help'] }
-  let(:instance) { runner.create(argv: runner_argv) }
-  let(:expected_output) do
-    <<~OUTPUT
-      A stub runner.
-
-      Usage:
-        __PROGRAM__ [options] <a_argument>
-        __PROGRAM__ --help
-
-      Options:
-        -h --help    Show help.
-
-    OUTPUT
-  end
+  [
+    ['--help'],
+    ['trash-pos-arg-before', '--help', 'trash-pos-arg-after']
+  ].each do |runner_argv|
+    context "when runner ARGV is #{runner_argv}" do
+      let(:instance) { runner.create(argv: runner_argv) }
+      let(:expected_output_source) do
+        <<~OUTPUT
+          A stub runner.
+
+          Usage:
+            __PROGRAM__ [options] <a_argument>
+            __PROGRAM__ --help
+
+          Options:
+            -h --help    Show help.
+
+        OUTPUT
+      end
+      let(:expected_output) do
+        expected_output_source.gsub('__PROGRAM__', instance.program_name)
+      end
 
-  it 'show help text' do
-    expect { instance.run_run }.to output(expected_output).to_stdout_from_any_process
+      it 'show help text' do
+        expect { instance.run_run }.to output(expected_output).to_stdout_from_any_process
+      end
+    end
   end
 end

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

@@ -57,7 +57,7 @@ RSpec.describe ::EacCli::RunnerWith::Subcommands do
 
   context 'with help' do
     let(:instance) { parent_runner.create(%w[--help]) }
-    let(:expected_output) do
+    let(:expected_output_source) do
       <<~OUTPUT
         A stub root runner.
 
@@ -73,6 +73,9 @@ RSpec.describe ::EacCli::RunnerWith::Subcommands do
           child-cmd
       OUTPUT
     end
+    let(:expected_output) do
+      expected_output_source.gsub('__PROGRAM__', instance.program_name)
+    end
 
     before do
       parent_runner.include(::EacCli::RunnerWith::Help)

data/sub/eac_ruby_base0/eac_ruby_base0.gemspec

@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'eac_cli', '~> 0.26'
+  s.add_dependency 'eac_cli', '~> 0.27', '>= 0.27.5'
   s.add_dependency 'eac_fs', '~> 0.10'
   s.add_dependency 'eac_ruby_gems_utils', '~> 0.9', '~> 0.9.6'
-  s.add_dependency 'eac_ruby_utils', '~> 0.70'
+  s.add_dependency 'eac_ruby_utils', '~> 0.95', '>= 0.95.1'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/eac_ruby_base0/lib/eac_ruby_base0/version.rb

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

data/sub/eac_ruby_utils/lib/eac_ruby_utils/common_constructor.rb

@@ -68,12 +68,12 @@ module EacRubyUtils
 
     def setup_class_attr_readers(klass)
       klass.send(:attr_reader, *args)
-      klass.send(:public, *args)
+      klass.send(:public, *args) if args.any?
     end
 
     def setup_class_attr_writers(klass)
       klass.send(:attr_writer, *args)
-      klass.send(:private, *args.map { |a| "#{a}=" })
+      klass.send(:private, *args.map { |a| "#{a}=" }) if args.any?
     end
 
     def setup_class_initialize(klass)

data/sub/eac_ruby_utils/lib/eac_ruby_utils/core_ext.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/locales/from_all_gems'
 require 'eac_ruby_utils/patches'
 require 'active_support/dependencies/autoload'
 require 'active_support/core_ext'

data/sub/eac_ruby_utils/lib/eac_ruby_utils/locales/from_all_gems.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/locales/from_gem'
+::EacRubyUtils::Locales::FromGem.include_all

data/sub/eac_ruby_utils/lib/eac_ruby_utils/locales/from_gem.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'i18n'
+require 'eac_ruby_utils/patches/class/common_constructor'
+require 'eac_ruby_utils/patches/object/to_pathname'
+
+module EacRubyUtils
+  module Locales
+    class FromGem
+      class << self
+        def include_all(i18n_obj = nil)
+          ::Gem::Specification.each { |gemspec| new(gemspec, i18n_obj).include }
+        end
+      end
+
+      LOCALES_DIR_SUBPATH = 'locale'
+      LOCALES_FILES_GLOB_PATTERNS = %w[*.yaml *.yml].freeze
+
+      common_constructor :gemspec, :i18n_obj, default: [nil] do
+        self.i18n_obj ||= ::I18n
+      end
+
+      # @return [Boolean]
+      delegate :exist?, to: :path
+
+      # @return [Pathname, nil]
+      def include
+        return nil unless exist?
+
+        ::I18n.load_path += paths_to_load.map(&:to_path)
+        path
+      end
+
+      # @return [Pathname]
+      def path
+        gemspec.gem_dir.to_pathname.join(LOCALES_DIR_SUBPATH)
+      end
+
+      # @return [Pathname]
+      def paths_to_load
+        return [] unless exist?
+
+        LOCALES_FILES_GLOB_PATTERNS.inject([]) { |a, e| a + path.glob(e) }
+      end
+    end
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/locales/module_i18n_translate.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/string/inflections'
+require 'eac_ruby_utils/common_constructor'
+require 'i18n'
+
+module EacRubyUtils
+  module Locales
+    class ModuleI18nTranslate
+      TRANSLATE_LOCALE_KEY = :__locale
+
+      common_constructor :the_module, :entry_suffix, :values, default: [{}]
+
+      def ancestor_i18n_translate(ancestor)
+        t = self.class.new(ancestor, entry_suffix, values)
+        t.exists? ? t.i18n_translate : nil
+      end
+
+      def ancestors_i18n_translate
+        the_module.ancestors.lazy.map { |v| ancestor_i18n_translate(v) }.find(&:present?)
+      end
+
+      def exists?
+        ::I18n.exists?(i18n_key)
+      end
+
+      def i18n_key
+        "#{module_entry_prefix}.#{entry_suffix}"
+      end
+
+      def i18n_options
+        values.except(TRANSLATE_LOCALE_KEY)
+      end
+
+      def i18n_translate
+        ::I18n.translate(i18n_key, i18n_options)
+      end
+
+      def locale
+        values[TRANSLATE_LOCALE_KEY]
+      end
+
+      def module_entry_prefix
+        the_module.name.underscore.gsub('/', '.')
+      end
+
+      def on_locale(&block)
+        if locale.present?
+          on_present_locale(&block)
+        else
+          block.call
+        end
+      end
+
+      def result
+        on_locale do
+          ancestors_i18n_translate || i18n_translate
+        end
+      end
+
+      private
+
+      def on_present_locale(&block)
+        old_locale = ::I18n.locale
+        begin
+          ::I18n.locale = locale
+          block.call
+        ensure
+          ::I18n.locale = old_locale
+        end
+      end
+    end
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/locales.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+
+module EacRubyUtils
+  module Locales
+    ::EacRubyUtils.require_sub __FILE__
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/method_class.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/module/introspection'
+require 'eac_ruby_utils/patches/class/common_constructor'
+require 'eac_ruby_utils/patches/module/common_concern'
+require 'eac_ruby_utils/patches/string/inflector'
+
+module EacRubyUtils
+  module MethodClass
+    common_concern do
+      ::EacRubyUtils::MethodClass::Setup.new(self)
+    end
+
+    class Setup
+      common_constructor :method_class do
+        perform
+      end
+
+      def perform
+        the_setup = self
+        sender_module.define_method(method_name) do |*args, &block|
+          the_setup.method_class.new(self, *args, &block).result
+        end
+      end
+
+      def method_name
+        method_class.name.demodulize.underscore.variableize
+      end
+
+      def sender_module
+        method_class.module_parent
+      end
+    end
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/patches/module/i18n_translate.rb

@@ -1,32 +1,9 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/string/inflections'
-require 'i18n'
+require 'eac_ruby_utils/locales/module_i18n_translate'
 
 class Module
-  TRANSLATE_LOCALE_KEY = :__locale
-
   def i18n_translate(entry_suffix, values = {})
-    on_i18n_locale(values.delete(TRANSLATE_LOCALE_KEY)) do
-      ::I18n.translate(i18n_translate_entry_full(entry_suffix), values)
-    end
-  end
-
-  def i18n_translate_entry_full(entry_suffix)
-    "#{i18n_translate_entry_self_prefix}.#{entry_suffix}"
-  end
-
-  def i18n_translate_entry_self_prefix
-    name.underscore.gsub('/', '.')
-  end
-
-  def on_i18n_locale(locale)
-    old_locale = ::I18n.locale
-    begin
-      ::I18n.locale = locale
-      yield
-    ensure
-      ::I18n.locale = old_locale
-    end
+    ::EacRubyUtils::Locales::ModuleI18nTranslate.new(self, entry_suffix, values).result
   end
 end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/patches/module/method_class.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/method_class'
+
+class Module
+  def enable_method_class
+    ::EacRubyUtils.patch(self, ::EacRubyUtils::MethodClass)
+  end
+end