avm-tools 0.82.1 → 0.86.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 810bb2b051e5c63d3eed6093eed8e78c8f76ede7a9ac5adfdaa42f5d08628f93
-  data.tar.gz: 2708dd1270ec32a734db517ec82015f9e390f415eb51b23f8cce8b11c3a772c8
+  metadata.gz: 3d94c38f057d3459362f2f15eba68de92e72a7141f03a5c029e920db648eb34b
+  data.tar.gz: 2719a55cb7b994c496349331e4b5a40a11307e4fe92d889914d3005836d68398
 SHA512:
-  metadata.gz: 0a97ffc1122511054c5f0629c3c67d90d6df8544cb2cc821bce1fb546c550a8ce1963a1fd34d52c0dbdaf351b931cbd3bdd96f1817888eee5d0182396c3f06d0
-  data.tar.gz: 9267154e5c284a1d8d74cb8c7eb144df2a5601eb6d5e4b0f847d0f746bd988147f147a82792951b8a100c11da728a32cdc8b76dd129537dcb49b8ec75ba4bdf1
+  metadata.gz: 54d1c5271e6d30791bbc6a9cd6084f21ef2e171f3b64e21c315aa41f4bf2f289ae4c8725f74280a0f008d4a6fb32ce85f71fcf3f5e83d46a5ef14d48dc7a6174
+  data.tar.gz: 2c717894f623ab3bfd4b8b489c01adf8cc564a638c374fa1f7dbc5f9be715461ae4b1f8847b22d48a383e51775754eac408d8f6273260ff32dd1837acd5b30dd

data/lib/avm/eac_writings_base1.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacWritingsBase1
+    require_sub __FILE__
+  end
+end

data/lib/avm/eac_writings_base1/apache_host.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/apache_host'
+
+module Avm
+  module EacWritingsBase1
+    class ApacheHost < ::Avm::EacWebappBase0::ApacheHost
+      def document_root
+        instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
+      end
+
+      def extra_content
+        ''
+      end
+    end
+  end
+end

data/lib/avm/eac_writings_base1/build.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/fs/clearable_directory'
+
+module Avm
+  module EacWritingsBase1
+    class Build
+      require_sub __FILE__
+      enable_console_speaker
+      enable_simple_cache
+      enable_listable
+      lists.add_symbol :option, :target_directory
+      common_constructor :project, :options, default: [{}] do
+        self.options = self.class.lists.option.hash_keys_validate!(options.symbolize_keys)
+      end
+
+      def run
+        infov 'Files to build', source_files.count
+        target_directory.clear
+        source_files.each(&:run)
+      end
+
+      def default_target_directory
+        project.root.join('build')
+      end
+
+      def target_directory
+        ::EacRubyUtils::Fs::ClearableDirectory.new(
+          options[OPTION_TARGET_DIRECTORY] || default_target_directory
+        )
+      end
+
+      def source_files_uncached
+        r = []
+        project.root.children.each do |child|
+          next unless child.extname == '.asc'
+
+          r << ::Avm::EacWritingsBase1::Build::File.new(self, child.basename)
+        end
+        r
+      end
+    end
+  end
+end

data/lib/avm/eac_writings_base1/build/file.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'avm/executables'
+
+module Avm
+  module EacWritingsBase1
+    class Build
+      class File
+        enable_console_speaker
+        common_constructor :build, :subpath
+
+        def run
+          infov 'Building', subpath
+          target_path.parent.mkpath
+          ::Avm::Executables.asciidoc.command('--out-file', target_path, source_path).system!
+        end
+
+        def source_path
+          build.project.root.join(subpath)
+        end
+
+        def target_path
+          build.target_directory.join(subpath).basename_sub('.*') { |b| "#{b}.html" }
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_writings_base1/deploy.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/deploy'
+require 'avm/eac_writings_base1/project'
+require 'avm/eac_writings_base1/build'
+
+module Avm
+  module EacWritingsBase1
+    class Deploy < ::Avm::EacWebappBase0::Deploy
+      def build_content
+        ::Avm::EacWritingsBase1::Build.new(
+          project,
+          ::Avm::EacWritingsBase1::Build::OPTION_TARGET_DIRECTORY => build_dir
+        ).run
+      end
+
+      private
+
+      def project_uncached
+        ::Avm::EacWritingsBase1::Project.new(
+          instance.source_instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
+        )
+      end
+    end
+  end
+end

data/lib/avm/eac_writings_base1/instance.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/instance'
+
+module Avm
+  module EacWritingsBase1
+    class Instance < ::Avm::EacWebappBase0::Instance
+      FILES_UNITS = {}.freeze
+    end
+  end
+end

data/lib/avm/eac_writings_base1/project.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacWritingsBase1
+    class Project
+      common_constructor :root do
+        self.root = root.to_pathname
+      end
+    end
+  end
+end

data/lib/avm/executables.rb

@@ -14,7 +14,7 @@ module Avm
 
       private
 
-      %w[docker file git latex php-cs-fixer tidy yapf xdg-open].each do |program|
+      %w[asciidoc docker file git latex php-cs-fixer tidy yapf xdg-open].each do |program|
         define_method(program.underscore + '_uncached') do
           env.executable(program, '--version')
         end

data/lib/avm/instances/base/auto_values/database.rb

@@ -8,6 +8,7 @@ module Avm
       module AutoValues
         module Database
           DEFAULT_HOSTNAME = '127.0.0.1'
+          DEFAULT_LIMIT = 5
           DEFAULT_PORTS = {
             'postgresql' => 5432,
             'mysql' => 3306,
@@ -15,6 +16,7 @@ module Avm
             'sqlserver' => 1433
           }.freeze
           DEFAULT_SYSTEM = 'postgresql'
+          DEFAULT_TIMEOUT = 5000
 
           def auto_database_name
             inherited_entry_value(::Avm::Instances::EntryKeys::DATABASE_ID,
@@ -25,6 +27,10 @@ module Avm
             database_auto_common('hostname') || DEFAULT_HOSTNAME
           end
 
+          def auto_database_limit
+            database_auto_common('limit') || DEFAULT_LIMIT
+          end
+
           def auto_database_password
             database_auto_common('password')
           end
@@ -41,6 +47,10 @@ module Avm
             database_auto_common('system') || DEFAULT_SYSTEM
           end
 
+          def auto_database_timeout
+            database_auto_common('timeout') || DEFAULT_TIMEOUT
+          end
+
           private
 
           def database_auto_common(suffix)

data/lib/avm/instances/entry_keys.rb

@@ -41,7 +41,7 @@ module Avm
 
       {
         '' => %w[fs_path host_id source_instance_id],
-        database: %w[id hostname name password port system username],
+        database: %w[id hostname limit name password port system timeout username],
         mailer: {
           '' => %w[id from reply_to],
           smtp: %w[address port domain username password authentication starttls_auto]

data/lib/avm/projects/stereotypes/git/update.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/patches/class/i18n'
+
+module Avm
+  module Projects
+    module Stereotypes
+      class Git
+        class Update
+          require_sub __FILE__
+          enable_simple_cache
+          enable_console_speaker
+          common_constructor :instance
+
+          delegate :git_repo, to: :instance
+
+          def run
+            clean_all
+            selected_subrepos.map do |f|
+              infov 'Subrepo', f
+              on_speaker_node do |node|
+                node.stderr_line_prefix = '  '
+                ::Avm::Projects::Stereotypes::Git::Update::Subrepo.new(self, f).run
+              end
+            end
+          end
+
+          def selected_subrepos_uncached
+            git_repo.command('subrepo', '-q', 'status').execute!.split("\n").map(&:strip)
+                    .select(&:present?).map(&:to_pathname)
+          end
+
+          def clean_all
+            infom 'Cleaning'
+            git_repo.command('subrepo', 'clean', '--all').execute!
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/projects/stereotypes/git/update/subrepo.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require 'eac_launcher/git/base'
+require 'avm/git/commit'
+
+module Avm
+  module Projects
+    module Stereotypes
+      class Git
+        class Update
+          class Subrepo
+            TRANSLATE_CLASS = self
+
+            require_sub __FILE__, include_modules: true
+            enable_simple_cache
+            enable_console_speaker
+            common_constructor :parent_update, :subpath do
+              self.subpath = subpath.to_pathname
+            end
+
+            delegate :git_repo, :instance, to: :parent_update
+
+            def run
+              run_banner
+              if base_commit.sha1 == pull_commit.sha1
+                infom 'No new commit (No changes)'
+              elsif fix_message.present?
+                on_fix_message_present
+              else
+                warn 'No fix message found'
+              end
+            end
+
+            private
+
+            def base_commit_uncached
+              ::Avm::Git::Commit.new(git_repo, git_repo.rev_parse('HEAD'))
+            end
+
+            def on_fix_message_present
+              infom 'Fixing message...'
+              infov 'Message', fix_message
+              git_repo.command('commit', '--amend', '-m', fix_message).execute!
+            end
+
+            def pull_commit_uncached
+              base_commit
+              infom 'Pulling subrepo...'
+              git_repo.command('subrepo', 'pull', '--force', subpath).execute!
+              ::Avm::Git::Commit.new(
+                ::EacLauncher::Git::Base.new(git_repo.root_path.to_path),
+                git_repo.rev_parse('HEAD')
+              )
+            end
+
+            def run_banner
+              infov 'Base SHA1', base_commit.sha1
+              infov 'Pull SHA1', pull_commit.sha1
+            end
+
+            def fix_message
+              TRANSLATE_CLASS.translate(
+                fix_message_translate_key, subpath: subpath, name: subpath.basename,
+                                           __locale: instance.locale
+              )
+            end
+
+            def fix_message_translate_key
+              if gitrepo_only_changed?
+                :gitrepo_only_changed_fix_message
+              else
+                :content_updated_fix_message
+              end
+            end
+
+            def gitrepo_only_changed?
+              pull_commit.files.count == 1 &&
+                ::File.basename(pull_commit.files.first.path) == '.gitrepo'
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/eac_writings_base1.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/runner'
+require 'avm/eac_writings_base1'
+require 'eac_ruby_utils/console/docopt_runner'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class EacWritingsBase1 < ::Avm::EacWebappBase0::Runner
+        require_sub __FILE__
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/local_project/eac_writings_base0.rb

@@ -8,12 +8,11 @@ module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class LocalProject < ::EacRubyUtils::Console::DocoptRunner
-        class EacWritingsBase0 < ::EacRubyUtils::Console::DocoptRunner
+        class EacWritingsBase0
           require_sub __FILE__
-          runner_with
           enable_simple_cache
 
-          runner_definition do
+          runner_with :help, :subcommands do
             desc 'EacWritingsBase0 utitilies for local projects.'
             subcommands
           end
@@ -26,7 +25,7 @@ module Avm
           private
 
           def project_uncached
-            ::Avm::EacWritingsBase0::Project.new(context(:instance_path))
+            ::Avm::EacWritingsBase0::Project.new(runner_context.call(:instance_path))
           end
         end
       end

data/lib/avm/tools/runner/local_project/eac_writings_base0/build_chapters.rb

@@ -8,11 +8,9 @@ module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class LocalProject < ::EacRubyUtils::Console::DocoptRunner
-        class EacWritingsBase0 < ::EacRubyUtils::Console::DocoptRunner
+        class EacWritingsBase0
           class BuildChapters
-            runner_with
-
-            runner_definition do
+            runner_with :help do
               arg_opt '-o', '--output-dir', 'Output chapters to specific directory.'
             end
 

data/lib/avm/tools/runner/local_project/eac_writings_base0/build_single.rb

@@ -8,10 +8,9 @@ module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class LocalProject < ::EacRubyUtils::Console::DocoptRunner
-        class EacWritingsBase0 < ::EacRubyUtils::Console::DocoptRunner
+        class EacWritingsBase0
           class BuildSingle
-            runner_with
-            runner_definition do
+            runner_with :help do
               arg_opt '-s', '--source-dir', 'Write .tex source code in specific directory.'
               arg_opt '-f', '--output-file', 'Output to specific file.'
               arg_opt '-c', '--chapter', 'Write only the chapter <chapter>.'

data/lib/avm/tools/runner/local_project/eac_writings_base0/info.rb

@@ -8,10 +8,9 @@ module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class LocalProject < ::EacRubyUtils::Console::DocoptRunner
-        class EacWritingsBase0 < ::EacRubyUtils::Console::DocoptRunner
+        class EacWritingsBase0
           class Info
-            runner_with
-            runner_definition do
+            runner_with :help do
               desc 'Information about a loca EacRailsBase0 local project.'
             end
 

data/lib/avm/tools/runner/local_project/eac_writings_base1.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+require 'eac_ruby_utils/console/docopt_runner'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
+        class EacWritingsBase1
+          require_sub __FILE__
+
+          runner_with :help, :subcommands do
+            desc 'EacWritingsBase0 utitilies for local projects.'
+            subcommands
+          end
+
+          def project_banner
+            infov 'Project', project.name
+            infov 'Path', project.root
+          end
+
+          private
+
+          def project_uncached
+            ::Avm::EacWritingsBase0::Project.new(runner_context.call(:instance_path))
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/local_project/eac_writings_base1/build.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'avm/eac_writings_base1/build'
+require 'avm/eac_writings_base1/project'
+require 'eac_cli/core_ext'
+require 'eac_ruby_utils/console/docopt_runner'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
+        class EacWritingsBase1
+          class Build
+            runner_with :help do
+              desc 'Build the project'
+              arg_opt '-d', '--target-dir', 'Directory to build'
+            end
+
+            def run
+              start_banner
+              build.run
+            end
+
+            private
+
+            def build_uncached
+              ::Avm::EacWritingsBase1::Build.new(runner_context.call(:project),
+                                                 target_directory: parsed.target_dir)
+            end
+
+            def default_target_directory
+              runner_context.call(:project).root.join('build')
+            end
+
+            def start_banner
+              runner_context.call(:project_banner)
+              infov 'Target directory', build.target_directory
+            end
+            #
+            #            def target_directory_uncached
+            #              .if_present(default_target_directory).to_pathname
+            #            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.82.1'
+    VERSION = '0.86.0'
   end
 end

data/template/avm/eac_rails_base0/deploy/config/database.yml.template

@@ -1,12 +1,13 @@
 default: &default
   adapter: %%DATABASE.SYSTEM%%
-  pool: 40
-  timeout: 5000
+  pool: %%DATABASE.LIMIT%%
+  timeout: %%DATABASE.TIMEOUT%%
   encoding: unicode
   username: %%DATABASE.USERNAME%%
   password: %%DATABASE.PASSWORD%%
   host: %%DATABASE.HOSTNAME%%
   port: %%DATABASE.PORT%%
+  reconnect: true
 
 development: &development
   <<: *default

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

@@ -27,7 +27,9 @@ module EacCli
       end
 
       def help_text
-        ::EacCli::Docopt::DocBuilder.new(self.class.runner_definition).to_s
+        r = ::EacCli::Docopt::DocBuilder.new(self.class.runner_definition).to_s
+        r += help_extra_text if respond_to?(:help_extra_text)
+        r
       end
     end
   end

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

@@ -31,6 +31,11 @@ module EacCli
         end
       end
 
+      def help_extra_text
+        (['Subcommands:'] + available_subcommands.keys.map { |s| "  #{s}" })
+          .map { |v| "#{v}\n" }.join
+      end
+
       def method_missing(method_name, *arguments, &block)
         return run_with_subcommand(*arguments, &block) if
         run_with_subcommand_alias_run?(method_name)

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

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

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_cli/runner'
+require 'eac_cli/runner_with/help'
 require 'eac_cli/runner_with/subcommands'
 
 RSpec.describe ::EacCli::RunnerWith::Subcommands do
@@ -53,4 +54,32 @@ RSpec.describe ::EacCli::RunnerWith::Subcommands do
       expect { instance.run }.to raise_error(::EacCli::Parser::Error)
     end
   end
+
+  context 'with help' do
+    let(:instance) { parent_runner.create(%w[--help]) }
+    let(:expected_output) do
+      <<~OUTPUT
+        A stub root runner.
+
+        Usage:
+          __PROGRAM__ [options] __SUBCOMMANDS__ [<subcommand_args>...]
+          __PROGRAM__ --help
+
+        Options:
+          -r --root-var=<value>    A root variable.
+          -h --help    Show help.
+
+        Subcommands:
+          child-cmd
+      OUTPUT
+    end
+
+    before do
+      parent_runner.include(::EacCli::RunnerWith::Help)
+    end
+
+    it 'show help text' do
+      expect { instance.run_run }.to output(expected_output).to_stdout_from_any_process
+    end
+  end
 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

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/patches/pathname/basename_sub.rb

@@ -3,7 +3,7 @@
 require 'pathname'
 
 class Pathname
-  def basename_sub
-    parent.join(yield(basename))
+  def basename_sub(suffix = '')
+    parent.join(yield(basename(suffix)))
   end
 end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/version.rb

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

data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/common_concern_spec.rb

@@ -19,7 +19,7 @@ RSpec.describe ::EacRubyUtils::CommonConcern do
 
       module InstanceMethods # rubocop:disable RSpec/LeakyConstantDeclaration
         def my_instance_method
-          'instance'
+          'from_module'
         end
       end
     end
@@ -31,8 +31,8 @@ RSpec.describe ::EacRubyUtils::CommonConcern do
         attr_accessor :valor
       end
 
-      def method1
-        'from_stub_module'
+      def my_instance_method
+        'from_class'
       end
     end
   end
@@ -48,7 +48,17 @@ RSpec.describe ::EacRubyUtils::CommonConcern do
       stub_class.include stub_module
     end
 
-    it { expect(stub_class_instance.my_instance_method).to eq('instance') }
+    it { expect(stub_class_instance.my_instance_method).to eq('from_class') }
+    it { expect(stub_class_instance.class.my_class_method).to eq('class') }
+    it { expect(stub_class_instance.class.valor).to eq('changed') }
+  end
+
+  context 'when prepended' do
+    before do
+      stub_class.prepend stub_module
+    end
+
+    it { expect(stub_class_instance.my_instance_method).to eq('from_module') }
     it { expect(stub_class_instance.class.my_class_method).to eq('class') }
     it { expect(stub_class_instance.class.valor).to eq('changed') }
   end

data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/common_constructor_spec.rb

@@ -92,4 +92,34 @@ RSpec.describe ::EacRubyUtils::CommonConstructor do
       end
     end
   end
+
+  context 'with class hierarchy mixed with and without common_constructor' do
+    let(:klass_0) do
+      described_class.new(:a_param).setup_class(::Class.new)
+    end
+
+    let(:klass_1) do
+      ::Class.new(klass_0) do
+        def initialize(a_param)
+          super(a_param)
+        end
+      end
+    end
+
+    let(:klass_2) do
+      ::Class.new(klass_1)
+    end
+
+    let(:klass_3) do
+      described_class.new(:a_param).setup_class(::Class.new(klass_2))
+    end
+
+    4.times.each do |i|
+      context "wit #{i}-th class" do
+        let(:class_instance) { send("klass_#{i}").new(:a) }
+
+        it { expect(class_instance.a_param).to eq(:a) }
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.82.1
+  version: 0.86.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-22 00:00:00.000000000 Z
+date: 2020-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -346,6 +346,13 @@ files:
 - lib/avm/eac_writings_base0/project_build.rb
 - lib/avm/eac_writings_base0/project_build/chapters_content.rb
 - lib/avm/eac_writings_base0/project_build/copy_files.rb
+- lib/avm/eac_writings_base1.rb
+- lib/avm/eac_writings_base1/apache_host.rb
+- lib/avm/eac_writings_base1/build.rb
+- lib/avm/eac_writings_base1/build/file.rb
+- lib/avm/eac_writings_base1/deploy.rb
+- lib/avm/eac_writings_base1/instance.rb
+- lib/avm/eac_writings_base1/project.rb
 - lib/avm/executables.rb
 - lib/avm/files.rb
 - lib/avm/files/appendable.rb
@@ -453,6 +460,8 @@ files:
 - lib/avm/projects/stereotypes/git.rb
 - lib/avm/projects/stereotypes/git/local_project_mixin.rb
 - lib/avm/projects/stereotypes/git/publish.rb
+- lib/avm/projects/stereotypes/git/update.rb
+- lib/avm/projects/stereotypes/git/update/subrepo.rb
 - lib/avm/projects/stereotypes/git/warp.rb
 - lib/avm/projects/stereotypes/git_subrepo.rb
 - lib/avm/projects/stereotypes/git_subrepo/publish.rb
@@ -495,6 +504,7 @@ files:
 - lib/avm/tools/runner/eac_redmine_base0/project_rename.rb
 - lib/avm/tools/runner/eac_wordpress_base0.rb
 - lib/avm/tools/runner/eac_writings_base0.rb
+- lib/avm/tools/runner/eac_writings_base1.rb
 - lib/avm/tools/runner/files.rb
 - lib/avm/tools/runner/files/format.rb
 - lib/avm/tools/runner/files/rotate.rb
@@ -522,6 +532,8 @@ files:
 - lib/avm/tools/runner/local_project/eac_writings_base0/build_chapters.rb
 - lib/avm/tools/runner/local_project/eac_writings_base0/build_single.rb
 - lib/avm/tools/runner/local_project/eac_writings_base0/info.rb
+- lib/avm/tools/runner/local_project/eac_writings_base1.rb
+- lib/avm/tools/runner/local_project/eac_writings_base1/build.rb
 - lib/avm/tools/runner/local_project/info.rb
 - lib/avm/tools/runner/local_project/ruby.rb
 - lib/avm/tools/runner/local_project/ruby/bundler.rb
@@ -910,6 +922,9 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/common_concern/class_setup.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/common_concern/module_setup.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/common_constructor.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/common_constructor/class_initialize.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/common_constructor/instance_initialize.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/common_constructor/super_args.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/configs.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/configs/base.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/configs/file.rb