eac_tools 0.62.1 → 0.64.0

data/sub/avm-tools/lib/avm/tools/runner/instance/data/unit.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'avm/instances/runner'
+require 'eac_cli/core_ext'
+
+module Avm
+  module Tools
+    class Runner
+      class Instance < ::Avm::Instances::Runner
+        class Data
+          class Unit
+            require_sub __FILE__
+            runner_with :help, :subcommands do
+              pos_arg :identifier
+              subcommands
+            end
+
+            # @return [Enumerable<String>]
+            def available_units_ids
+              data_package.units_ids
+            end
+
+            # @return [Avm::Instances::Data::Package]
+            def data_package
+              runner_context.call(:instance).data_package
+            end
+
+            # @return [Avm::Instances::Data::Unit]
+            def data_unit
+              data_package.unit(parsed.identifier)
+            end
+
+            # @return [String]
+            def help_extra_text
+              help_join_sections(super, list_section('Available units', available_units_ids))
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/{avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners → avm-tools/lib/avm/tools/runner/instance}/data.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
+require 'avm/instances/runner'
 require 'eac_cli/core_ext'
 
 module Avm
-  module EacWebappBase0
-    module Instances
-      module Runners
+  module Tools
+    class Runner
+      class Instance < ::Avm::Instances::Runner
         class Data
           require_sub __FILE__
           runner_with :help, :subcommands do

data/sub/avm-tools/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.145.1'
+    VERSION = '0.146.0'
   end
 end

data/sub/eac_cli/eac_cli.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'colorize', '~> 0.8', '>= 0.8.1'
   s.add_dependency 'eac_config', '~> 0.12'
-  s.add_dependency 'eac_ruby_utils', '~> 0.112'
+  s.add_dependency 'eac_ruby_utils', '~> 0.114'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

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

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
+require 'eac_cli/definition/default_value'
 require 'eac_ruby_utils/core_ext'
 
 module EacCli
   class Definition
     class BaseOption
       require_sub __FILE__
+      include ::EacCli::Definition::DefaultValue
 
       class << self
         def from_args(args)
@@ -17,7 +19,7 @@ module EacCli
       DEFAULT_REQUIRED = false
 
       enable_listable
-      enable_abstract_methods :build_value, :default_value
+      enable_abstract_methods :build_value
       lists.add_symbol :option, :default, :optional, :usage, :repeat, :required
       common_constructor :short, :long, :description, :options, default: [{}] do
         raise 'Nor short neither long selector was set' if short.blank? && long.blank?

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacCli
+  class Definition
+    module DefaultValue
+      def default_value
+        default_value? ? options[OPTION_DEFAULT] : default_default_value
+      end
+
+      def default_value?
+        options.key?(OPTION_DEFAULT)
+      end
+    end
+  end
+end

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

@@ -1,18 +1,16 @@
 # frozen_string_literal: true
 
+require 'eac_cli/runner_with/help/layout'
 require 'eac_ruby_utils/core_ext'
 
 module EacCli
   module RunnerWith
     module Help
       class Builder
+        include ::EacCli::RunnerWith::Help::Layout
         require_sub __FILE__, require_dependency: true
         common_constructor :runner
 
-        SEP = ' '
-        IDENT = SEP * 2
-        OPTION_DESC_SEP = IDENT * 2
-
         class << self
           def option_long(option)
             b = option.long
@@ -35,7 +33,7 @@ module EacCli
           end
 
           def word_separator
-            SEP
+            WORD_SEPARATOR
           end
         end
 
@@ -45,36 +43,37 @@ module EacCli
           runner.class.runner_definition
         end
 
+        # @return [Enumerable<String>]
+        def extra_sections
+          runner.if_respond(:help_extra_text, []) do |v|
+            [v.to_s]
+          end
+        end
+
         def option_definition(option)
           [self.class.option_usage_full(option), option.description,
            option.default_value? ? "[Default: \"#{option.default_value}\"]" : nil]
-            .reject(&:blank?).join(OPTION_DESC_SEP)
-        end
-
-        def section(header, include_header = true)
-          b = include_header ? "#{header.humanize}:\n" : ''
-          b += send("self_#{header}") + "\n"
-          definition.alternatives.each do |alternative|
-            b += IDENT + self.alternative(alternative) + "\n"
-          end
-          b
+            .reject(&:blank?).join(OPTION_DESCRIPTION_SEPARATOR)
         end
 
+        # @return [String]
         def options_section
-          "Options:\n" +
-            definition.alternatives.flat_map(&:options)
-              .map { |option| IDENT + option_definition(option) + "\n" }.join
+          list_section(
+            'Options',
+            definition.alternatives.flat_map(&:options).map { |option| option_definition(option) }
+          )
         end
 
+        # @return [String]
         def usage_section
-          "Usage:\n" +
-            definition.alternatives.map do |alternative|
-              IDENT + self.alternative(alternative) + "\n"
-            end.join
+          list_section(
+            'Usage',
+            definition.alternatives.map { |alternative| self.alternative(alternative) }
+          )
         end
 
         def to_s
-          "#{definition.description}\n\n#{usage_section}\n#{options_section}\n"
+          join_sections(definition.description, usage_section, options_section, *extra_sections)
         end
       end
     end

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacCli
+  module RunnerWith
+    module Help
+      module Layout
+        common_concern do
+          include InstanceClassMethods
+          extend InstanceClassMethods
+        end
+
+        module InstanceClassMethods
+          WORD_SEPARATOR = ' '
+          IDENTATION = WORD_SEPARATOR * 2
+          OPTION_DESCRIPTION_SEPARATOR = IDENTATION * 2
+          LINE_BREAK = "\n"
+          SECTION_SEPARATOR = LINE_BREAK * 2
+
+          # @param title String
+          # @param items [Enumerable<String>]
+          # @return [String]
+          def list_section(title, items)
+            (["#{title}:"] + items.map { |line| "#{IDENTATION}#{line}" })
+              .map { |line| "#{line}\n" }.join
+          end
+
+          # @param sections [Enumerable<String>]
+          # @return [String]
+          def join_sections(*sections)
+            sections.map { |s| s.to_s.strip }.join(SECTION_SEPARATOR) + LINE_BREAK
+          end
+        end
+
+        extend InstanceClassMethods
+      end
+    end
+  end
+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_dependency: true
+      require_sub __FILE__, require_mode: :kernel
       common_concern do
         include ::EacCli::Runner
 
@@ -20,6 +20,18 @@ module EacCli
         end
       end
 
+      # @param items [Enumerable<String>]
+      # @return [String]
+      def help_list_section(title, items)
+        ::EacCli::RunnerWith::Help::Layout.list_section(title, items)
+      end
+
+      # @param items [Enumerable<String>]
+      # @return [String]
+      def help_join_sections(*sections)
+        ::EacCli::RunnerWith::Help::Layout.join_sections(*sections)
+      end
+
       def help_run
         return unless show_help?
 
@@ -27,10 +39,9 @@ module EacCli
         raise ::EacCli::Runner::Exit
       end
 
+      # @return [String]
       def help_text
-        r = ::EacCli::RunnerWith::Help::Builder.new(self).to_s
-        r += help_extra_text if respond_to?(:help_extra_text)
-        r
+        ::EacCli::RunnerWith::Help::Builder.new(self).to_s
       end
 
       def show_help?

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

@@ -2,7 +2,7 @@
 
 require 'eac_cli/runner'
 require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/abstract_methods'
+require 'eac_ruby_utils/acts_as_abstract'
 
 module EacCli
   module RunnerWith

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

@@ -2,7 +2,7 @@
 
 require 'eac_cli/runner'
 require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/abstract_methods'
+require 'eac_ruby_utils/acts_as_abstract'
 
 module EacCli
   module RunnerWith

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

@@ -51,9 +51,9 @@ module EacCli
         available_subcommands.keys.sort.join(', ')
       end
 
+      # @return [Hash<String, Enumerable<String>]
       def help_extra_text
-        (['Subcommands:'] + available_subcommands.keys.sort.map { |s| "  #{s}" })
-          .map { |v| "#{v}\n" }.join
+        help_list_section('Subcommands', available_subcommands.keys.sort)
       end
 
       def method_missing(method_name, *arguments, &block)

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

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

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'eac_cli/runner_with/help/layout'
+
+::RSpec.describe ::EacCli::RunnerWith::Help::Layout do
+  describe '#list_section' do
+    {
+      ['Options', ['Option A', 'Option B']] => <<~TEXT
+        Options:
+          Option A
+          Option B
+      TEXT
+    }.each do |source, expected|
+      context "when source is #{source}" do
+        it do
+          expect(described_class.list_section(*source)).to eq(expected)
+        end
+      end
+    end
+  end
+end

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

@@ -36,7 +36,6 @@ RSpec.describe ::EacCli::RunnerWith::Help do
 
           Options:
             -h --help    Show help.
-
         OUTPUT
       end
       let(:expected_output) do

data/sub/eac_ruby_utils/eac_ruby_utils.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*', 'MIT-LICENSE', 'README.rdoc']
 
   s.add_dependency 'activesupport', '>= 4', '< 7'
-  s.add_dependency 'addressable', '~> 2.8', '>= 2.8.1'
+  s.add_dependency 'addressable', '~> 2.8', '>= 2.8.4'
   s.add_dependency 'bundler'
   s.add_dependency 'filesize', '~> 0.2'
   s.add_dependency 'net-ssh', '~> 4.2'

data/sub/eac_ruby_utils/lib/eac_ruby_utils/{abstract_methods.rb → acts_as_abstract.rb}

@@ -8,10 +8,10 @@ module EacRubyUtils
   #
   # Usage:
   #
-  #   require 'eac_ruby_utils/abstract_methods'
+  #   require 'eac_ruby_utils/acts_as_abstract'
   #
   #   class BaseClass
-  #     include EacRubyUtils::AbstractMethods
+  #     include EacRubyUtils::ActsAsAbstract
   #
   #     abstract_methods :mymethod
   #   end
@@ -25,12 +25,12 @@ module EacRubyUtils
   #   end
   #
   #   SubClass.new.mymethod # return "Implemented"
-  module AbstractMethods
+  module ActsAsAbstract
     common_concern
 
     class << self
       def abstract?(a_class)
-        a_class.self_included_modules.include?(::EacRubyUtils::AbstractMethods)
+        a_class.self_included_modules.include?(::EacRubyUtils::ActsAsAbstract)
       end
     end
 

data/sub/eac_ruby_utils/lib/eac_ruby_utils/patches/class/abstract.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/abstract_methods'
+require 'eac_ruby_utils/acts_as_abstract'
 
 class Class
   def abstract?
-    ::EacRubyUtils::AbstractMethods.abstract?(self)
+    ::EacRubyUtils::ActsAsAbstract.abstract?(self)
   end
 end

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

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/abstract_methods'
+require 'eac_ruby_utils/patches/module/acts_as_abstract'
 
 class Module
+  # @deprecated Use {#acts_as_abstract} instead.
   def enable_abstract_methods(*methods)
-    include ::EacRubyUtils::AbstractMethods
-    abstract_methods(*methods)
+    acts_as_abstract(*methods)
   end
 end

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/acts_as_abstract'
+
+class Module
+  # Include [EacRubyUtils::ActsAsAbstract] and perform EacRubyUtils::ActsAsAbstract.abstract_methods
+  # on parameter +methods+.
+  # @param methods [Array<Symbol>]
+  # @return [void]
+  def acts_as_abstract(*methods)
+    include ::EacRubyUtils::ActsAsAbstract
+    abstract_methods(*methods)
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname/basename_sub.rb

@@ -3,7 +3,11 @@
 require 'pathname'
 
 class Pathname
+  # @param suffix [String]
+  # @return [Pathname]
   def basename_sub(suffix = '')
-    parent.join(yield(basename(suffix)))
+    new_basename = basename(suffix)
+    new_basename = yield(new_basename) if block_given?
+    parent.join(new_basename)
   end
 end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/require_sub/base.rb

@@ -15,13 +15,17 @@ module EacRubyUtils
       }.freeze
 
       include ::EacRubyUtils::Listable
-      lists.add_symbol :option, :base, :include_modules, :require_dependency
+      lists.add_symbol :option, :base, :include_modules, :require_dependency, :require_mode
+      lists.add_symbol :require_mode, :active_support, :autoload, :kernel
 
       attr_reader :file, :options
 
       def initialize(file, options = {})
         @file = file
         @options = self.class.lists.option.hash_keys_validate!(options)
+        return unless options[OPTION_REQUIRE_MODE]
+
+        self.class.lists.require_mode.value_validate!(options[OPTION_REQUIRE_MODE])
       end
 
       # @return [Boolean]
@@ -54,6 +58,15 @@ module EacRubyUtils
           " \"#{options[OPTION_INCLUDE_MODULES]}\""
       end
 
+      # @return [Symbol]
+      def require_mode
+        return options[OPTION_REQUIRE_MODE] if options[OPTION_REQUIRE_MODE]
+        return REQUIRE_MODE_ACTIVE_SUPPORT if active_support_require?
+        return REQUIRE_MODE_AUTOLOAD if base?
+
+        REQUIRE_MODE_KERNEL
+      end
+
       def require_sub_files
         sub_files.each(&:require_file)
       end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/require_sub/sub_file.rb

@@ -38,26 +38,17 @@ module EacRubyUtils
       end
 
       def require_file
-        active_support_require || autoload_require || kernel_require
+        send("#{owner.require_mode}_require")
       end
 
       private
 
       def active_support_require
-        return false unless owner.active_support_require?
-
         ::Kernel.require_dependency(path)
-        true
       end
 
       def autoload_require
-        return false unless owner.base?
-
-        basename = ::File.basename(path, '.*')
-        return false if basename.start_with?('_')
-
-        owner.base.autoload ::ActiveSupport::Inflector.camelize(basename), path
-        true
+        owner.base.autoload ::ActiveSupport::Inflector.camelize(::File.basename(path, '.*')), path
       end
 
       def kernel_require

data/sub/eac_ruby_utils/lib/eac_ruby_utils/speaker/receiver.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/abstract_methods'
+require 'eac_ruby_utils/acts_as_abstract'
 
 module EacRubyUtils
   module Speaker
     module Receiver
       extend ::ActiveSupport::Concern
-      extend ::EacRubyUtils::AbstractMethods
+      extend ::EacRubyUtils::ActsAsAbstract
 
       module ClassMethods
         def on(*args, &block)

data/sub/eac_ruby_utils/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.112.0'
+  VERSION = '0.114.0'
 end

data/sub/eac_ruby_utils/spec/lib/eac_ruby_utils/{abstract_methods_spec.rb → acts_as_abstract_spec.rb}

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/abstract_methods'
+require 'eac_ruby_utils/acts_as_abstract'
 
-RSpec.describe(::EacRubyUtils::AbstractMethods) do
+RSpec.describe(::EacRubyUtils::ActsAsAbstract) do
   let(:base_class) do
     the_module = described_class
     ::Class.new do

data/sub/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/class/abstract_spec.rb

@@ -5,7 +5,7 @@ require 'eac_ruby_utils/patches/class/abstract'
 RSpec.describe ::Class do
   let(:abstract_class) do
     described_class.new do
-      enable_abstract_methods
+      acts_as_abstract
     end
   end
 

data/sub/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/class/acts_as_abstract_spec.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/acts_as_abstract'
+require 'eac_ruby_utils/patches/module/acts_as_abstract'
+
+::RSpec.describe ::Class do
+  let(:stub_class) do
+    described_class.new { acts_as_abstract }
+  end
+
+  describe '#acts_as_abstract' do
+    it { expect(stub_class.included_modules).to include(::EacRubyUtils::ActsAsAbstract) }
+  end
+end