ehbrs-tools 0.16.2 → 0.18.0

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

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require 'active_support/concern'
-require 'eac_ruby_utils/simple_cache'
-require 'eac_ruby_utils/patches/object/if_present'
+require 'eac_ruby_utils/common_concern/module_setup'
 
 module EacRubyUtils
   class CommonConcern
@@ -16,53 +14,7 @@ module EacRubyUtils
     end
 
     def setup(a_module)
-      Setup.new(self, a_module).run
-    end
-
-    class Setup
-      include ::EacRubyUtils::SimpleCache
-      attr_reader :a_module, :common_concern
-
-      def initialize(common_concern, a_module)
-        @common_concern = common_concern
-        @a_module = a_module
-      end
-
-      def run
-        setup = self
-        a_module.extend(::ActiveSupport::Concern)
-        a_module.included do
-          %w[class_methods instance_methods after_callback].each do |suffix|
-            setup.send("setup_#{suffix}", self)
-          end
-        end
-      end
-
-      def setup_class_methods(base)
-        class_methods_module.if_present { |v| base.extend v }
-      end
-
-      def setup_instance_methods(base)
-        instance_methods_module.if_present { |v| base.include v }
-      end
-
-      def setup_after_callback(base)
-        common_concern.after_callback.if_present do |v|
-          base.instance_eval(&v)
-        end
-      end
-
-      def class_methods_module_uncached
-        a_module.const_get(CLASS_METHODS_MODULE_NAME)
-      rescue NameError
-        nil
-      end
-
-      def instance_methods_module_uncached
-        a_module.const_get(INSTANCE_METHODS_MODULE_NAME)
-      rescue NameError
-        nil
-      end
+      ::EacRubyUtils::CommonConcern::ModuleSetup.new(self, a_module).run
     end
   end
 end

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

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'active_support/concern'
+require 'eac_ruby_utils/simple_cache'
+require 'eac_ruby_utils/patches/object/if_present'
+
+module EacRubyUtils
+  class CommonConcern
+    class ClassSetup
+      include ::EacRubyUtils::SimpleCache
+      attr_reader :a_class, :module_setup, :include_method
+
+      def initialize(module_setup, a_class, include_method)
+        @module_setup = module_setup
+        @a_class = a_class
+        @include_method = include_method
+      end
+
+      def run
+        %w[class_methods instance_methods after_callback].each do |suffix|
+          send("setup_#{suffix}")
+        end
+      end
+
+      def setup_class_methods
+        class_methods_module.if_present { |v| a_class.extend v }
+      end
+
+      def setup_instance_methods
+        instance_methods_module.if_present { |v| a_class.send(include_method, v) }
+      end
+
+      def setup_after_callback
+        module_setup.common_concern.after_callback.if_present do |v|
+          a_class.instance_eval(&v)
+        end
+      end
+
+      def class_methods_module_uncached
+        module_setup.a_module.const_get(CLASS_METHODS_MODULE_NAME)
+      rescue NameError
+        nil
+      end
+
+      def instance_methods_module_uncached
+        module_setup.a_module.const_get(INSTANCE_METHODS_MODULE_NAME)
+      rescue NameError
+        nil
+      end
+    end
+  end
+end

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

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'active_support/concern'
+require 'eac_ruby_utils/common_concern/class_setup'
+require 'eac_ruby_utils/simple_cache'
+require 'eac_ruby_utils/patches/object/if_present'
+
+module EacRubyUtils
+  class CommonConcern
+    class ModuleSetup
+      include ::EacRubyUtils::SimpleCache
+      attr_reader :a_module, :common_concern
+
+      def initialize(common_concern, a_module)
+        @common_concern = common_concern
+        @a_module = a_module
+      end
+
+      def run
+        a_module.extend(::ActiveSupport::Concern)
+        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
@@ -61,6 +62,8 @@ module EacRubyUtils
       setup_class_attr_readers(klass)
       setup_class_attr_writers(klass)
       setup_class_initialize(klass)
+
+      klass
     end
 
     def setup_class_attr_readers(klass)
@@ -74,60 +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
-      end
+      ::EacRubyUtils::CommonConstructor::ClassInitialize.new(self, klass).run
     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
+    def super_args
+      options[:super_args]
     end
   end
 end

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/common_constructor/instance_initialize'
+require 'eac_ruby_utils/common_constructor/super_args'
+
+module EacRubyUtils
+  class CommonConstructor
+    class ClassInitialize
+      attr_reader :common_constructor, :klass
+
+      def initialize(common_constructor, klass)
+        @common_constructor = common_constructor
+        @klass = klass
+      end
+
+      def run
+        class_initialize = self
+        klass.send(:define_method, :initialize) do |*args|
+          ::EacRubyUtils::CommonConstructor::InstanceInitialize.new(
+            class_initialize.common_constructor, args, self
+          ).run
+          super(*::EacRubyUtils::CommonConstructor::SuperArgs.new(
+            class_initialize, args, self
+          ).result)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module EacRubyUtils
+  class CommonConstructor
+    class InstanceInitialize
+      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
+  end
+end

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

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/module/delegation'
+
+module EacRubyUtils
+  class CommonConstructor
+    class SuperArgs
+      attr_reader :class_initialize, :args, :object
+      delegate :common_constructor, to: :class_initialize
+
+      def initialize(class_initialize, args, object)
+        @class_initialize = class_initialize
+        @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
+        class_initialize.klass.superclass&.instance_method(:initialize)
+      end
+    end
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/console/docopt_runner/_subcommands.rb

@@ -38,7 +38,7 @@ module EacRubyUtils
         def run_with_subcommand
           if subcommand_name
             check_valid_subcommand
-            subcommand.run
+            subcommand_run
           else
             run_without_subcommand
           end
@@ -52,6 +52,15 @@ module EacRubyUtils
           )
         end
 
+        def subcommand_run
+          if !subcommand.is_a?(::EacRubyUtils::Console::DocoptRunner) &&
+             subcommand.respond_to?(:run_run)
+            subcommand.run_run
+          else
+            subcommand.run
+          end
+        end
+
         def target_doc
           super.gsub(SUBCOMMANDS_MACRO,
                      "#{target_doc_subcommand_arg} [#{SUBCOMMAND_ARGS_ARG}...]") +

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/command.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/hash/indifferent_access'
-require 'eac_ruby_utils/console/speaker'
-require 'eac_ruby_utils/envs/command/extra_options'
+require 'eac_ruby_utils/core_ext'
 require 'eac_ruby_utils/envs/process'
 require 'eac_ruby_utils/envs/spawn'
 require 'pp'
@@ -11,8 +9,8 @@ require 'shellwords'
 module EacRubyUtils
   module Envs
     class Command
-      include EacRubyUtils::Console::Speaker
-      include EacRubyUtils::Envs::Command::ExtraOptions
+      require_sub __FILE__, include_modules: true
+      enable_console_speaker
 
       def initialize(env, command, extra_options = {})
         @env = env
@@ -47,7 +45,7 @@ module EacRubyUtils
         c = c.map { |x| escape(x) }.join(' ') if c.is_a?(Enumerable)
         append_command_options(
           @env.command_line(
-            append_chdir(append_pipe(append_envvars(c)))
+            append_chdir(append_concat(append_envvars(c)))
           ),
           options
         )

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/command/concat.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/struct'
+
+module EacRubyUtils
+  module Envs
+    class Command
+      module Concat
+        def concat(operator, other_command)
+          duplicate_by_extra_options(concat: ::EacRubyUtils::Struct.new(
+            operator: operator, command: other_command
+          ))
+        end
+
+        def or(other_command)
+          concat('||', other_command)
+        end
+
+        def pipe(other_command)
+          concat('|', other_command)
+        end
+
+        private
+
+        def append_concat(command)
+          extra_options[:concat].if_present(command) do |v|
+            "#{command} #{v.operator} #{v.command.command}"
+          end
+        end
+      end
+    end
+  end
+end