avm-tools 0.80.0 → 0.84.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0517668b390f4bfcd0ade6b28b127de99e7b309e54633353bae6a0e558c36054'
-  data.tar.gz: d6cb8cb3880f9929fe7f5bea9ed794934a50e2aed96fccbe4c1f42c5cc2e2524
+  metadata.gz: d6a742d3c0263c2512a52c5109e56336b275560ed7db3c94fe42792021c1762a
+  data.tar.gz: 3efdf68bf27d110a3a17ea012b208b6a59b40a05158f360f018423917fc55089
 SHA512:
-  metadata.gz: f46b14fadb4d557a6e3af527649b9237b7e2281af7828bc646c031c326f9441d2720e07d878b161c42de90d0770edaf1df67b006b77b233b1a1b21352e346903
-  data.tar.gz: 8e2bf840b44027bfbe263607654e11ae4557d0bdbb0867e3cfad51f823f7e9427205c3ed296461c2c5414d354ad505d64e3a76a37256175d21bc5f947cbeaf8f
+  metadata.gz: 1c1fcb15c0f44dc6a91081eed404f64e1a729fce4de417ada083f09b23149a7192b33d8ed67a4d087de84c161f43aca09b10dd9a51ec4c1ce645354c2cd62b96
+  data.tar.gz: 04bae047386b129d906a5ed2f8663ba0c0c3019a48b0b63603ac431ad4cc17163b92bae642daa9785d3c8d8277e1643d65da5ff612815e1110ae0566a8258086

data/lib/avm/data/unit.rb

@@ -12,11 +12,12 @@ module Avm
       enable_console_speaker
 
       %w[dump load].each do |action|
+        method_name = "#{action}_command"
         class_eval <<~CODE, __FILE__, __LINE__ + 1
           # Should be overrided.
           # @return [EacRubyUtils::Envs::Command]
-          def #{action}_command
-            fail "Abstract method. Override in #{singleton_class}."
+          def #{method_name}
+            fail "\\"#{method_name}\\" is a abstract method. Override in #{singleton_class}."
           end
         CODE
 
@@ -69,7 +70,7 @@ module Avm
       def load(data_path)
         run_callbacks :load do
           infom "Loading unit \"#{name}\" from \"#{data_path}\"..."
-          load_command.execute!(input_file: data_path)
+          do_load(data_path)
         end
       end
 
@@ -79,6 +80,10 @@ module Avm
         dump_command.execute!(output_file: data_path)
       end
 
+      def do_load(data_path)
+        load_command.execute!(input_file: data_path)
+      end
+
       private
 
       def unit_on_directory_path(directory, identifier)

data/lib/avm/eac_rails_base0/apache_host.rb

@@ -1,17 +1,10 @@
 # frozen_string_literal: true
 
-require 'avm/eac_webapp_base0/apache_host'
+require 'avm/eac_rails_base1/apache_host'
 
 module Avm
   module EacRailsBase0
-    class ApacheHost < ::Avm::EacWebappBase0::ApacheHost
-      def document_root
-        "#{instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)}/public"
-      end
-
-      def extra_content
-        'PassengerEnabled On'
-      end
+    class ApacheHost < ::Avm::EacRailsBase1::ApacheHost
     end
   end
 end

data/lib/avm/eac_rails_base1/apache_host.rb

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

data/lib/avm/eac_rails_base1/runner/code_runner.rb

@@ -8,8 +8,7 @@ module Avm
   module EacRailsBase1
     class Runner < ::Avm::EacWebappBase0::Runner
       class CodeRunner
-        runner_with ::Avm::EacRailsBase1::RunnerWith::Bundle
-        runner_definition do
+        runner_with :help, ::Avm::EacRailsBase1::RunnerWith::Bundle do
           desc 'Runs a Ruby code with "rails runner".'
           pos_arg :code
         end

data/lib/avm/eac_rails_base1/runner/rails_server.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'avm/eac_rails_base1/runner_with/bundle'
+require 'avm/instances/entry_keys'
+require 'eac_cli/core_ext'
+require 'eac_ruby_utils/console/docopt_runner'
+require 'shellwords'
+
+module Avm
+  module EacRailsBase1
+    class Runner < ::Avm::EacWebappBase0::Runner
+      class RailsServer
+        DEFAULT_RAILS_ENVIRONMENT = 'development'
+        runner_with :help, ::Avm::EacRailsBase1::RunnerWith::Bundle do
+          desc 'Run the embbeded Rails web server.'
+        end
+
+        def run
+          infov 'Environment', rails_environment
+          infov 'Bundle args', ::Shellwords.join(bundle_args)
+          infov 'Result', bundle_command.system
+        end
+
+        protected
+
+        def bundle_args
+          ['exec', 'rails', 'server', '--port',
+           runner_context.call(:instance).read_entry(::Avm::Instances::EntryKeys::WEB_PORT)]
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_redmine_base0/apache_host.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'avm/eac_rails_base1/apache_host'
+
+module Avm
+  module EacRedmineBase0
+    class ApacheHost < ::Avm::EacRailsBase1::ApacheHost
+    end
+  end
+end

data/lib/avm/eac_redmine_base0/data_unit.rb

@@ -2,6 +2,7 @@
 
 require 'avm/data/instance/unit'
 require 'eac_ruby_utils/core_ext'
+require 'curb'
 require 'open-uri'
 
 module Avm
@@ -17,8 +18,35 @@ module Avm
         end
       end
 
+      def do_load(data_path)
+        do_load_by_web(data_path) || do_load_by_rake(data_path) || raise('Failed to load')
+      end
+
+      def do_load_by_web(data_path)
+        c = Curl::Easy.new(import_url)
+        c.multipart_form_post = true
+        c.http_post(Curl::PostField.file('redmine_with_git_tableless_load[path]', data_path))
+        c.perform
+        true
+      rescue Curl::Err::ConnectionFailedError
+        false
+      end
+
+      def do_load_by_rake(data_path)
+        instance.bundle('exec', 'rake', "redmine_with_git:load:all[#{data_path}]").system
+        true
+      end
+
       def export_url
-        uri = ::Addressable::URI.parse(instance.read_entry('web.url')) + '/backup/export'
+        url('/backup/export')
+      end
+
+      def import_url
+        url('/backup/import.json')
+      end
+
+      def url(path)
+        uri = ::Addressable::URI.parse(instance.read_entry('web.url')) + path
         uri.query_values = { key: instance.read_entry('admin.api_key') }
         uri.to_s
       end

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/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_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.80.0'
+    VERSION = '0.84.0'
   end
 end

data/vendor/eac_cli/eac_cli.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*', 'Gemfile']
 
-  s.add_dependency 'eac_ruby_utils', '~> 0.50'
+  s.add_dependency 'eac_ruby_utils', '~> 0.55'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.1', '>= 0.1.2'
 end

data/vendor/eac_cli/lib/eac_cli/parser.rb

@@ -12,12 +12,14 @@ module EacCli
 
     def parsed_uncached
       raise 'Definition has no alternatives' if alternatives.empty?
+      raise first_error unless alternatives.select(&:success?).any?
 
-      alternatives.each do |alt_parser|
-        return alt_parser.parsed unless alt_parser.error?
-      end
+      alternatives_parsed(true).merge(alternatives_parsed(false))
+    end
 
-      raise first_error
+    def alternatives_parsed(error)
+      alternatives.select { |a| error == a.error? }.map(&:parsed).reverse
+                  .inject(::EacRubyUtils::Struct.new) { |a, e| a.merge(e) }
     end
 
     def alternatives_uncached

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

@@ -22,6 +22,10 @@ module EacCli
         error.present?
       end
 
+      def success?
+        !error?
+      end
+
       def parsed
         @parsed ||= collector.to_data.freeze
       end

data/vendor/eac_cli/lib/eac_cli/runner.rb

@@ -44,6 +44,8 @@ module EacCli
       extend AfterClassMethods
       include InstanceMethods
       ::EacCli::Docopt::RunnerExtension.check(self)
+      include ActiveSupport::Callbacks
+      define_callbacks :run
     end
 
     module AfterClassMethods
@@ -55,8 +57,7 @@ module EacCli
 
       def run(*runner_context_args)
         r = create(*runner_context_args)
-        r.parsed
-        r.run
+        r.run_run
         r
       end
 
@@ -72,6 +73,13 @@ module EacCli
     end
 
     module InstanceMethods
+      def run_run
+        parsed
+        run_callbacks(:run) { run }
+      rescue ::EacCli::Runner::Exit # rubocop:disable Lint/SuppressedException
+        # Do nothing
+      end
+
       def runner_context
         return @runner_context if @runner_context
 

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module EacCli
+  module Runner
+    class Exit < ::StandardError
+      attr_reader :status
+
+      def initialize(status = true)
+        @status = status
+      end
+    end
+  end
+end

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

@@ -13,6 +13,23 @@ module EacCli
           options_argument false
           bool_opt '-h', '--help', 'Show help.', usage: true
         end
+
+        set_callback :run, :before do
+          help_run
+        end
+      end
+
+      def help_run
+        return unless parsed.help?
+
+        puts help_text
+        raise ::EacCli::Runner::Exit
+      end
+
+      def help_text
+        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)
@@ -44,7 +49,7 @@ module EacCli
 
       def run_with_subcommand
         if subcommand_name
-          subcommand_runner.run
+          subcommand_runner.run_run
         else
           run_without_subcommand
         end

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

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

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

@@ -28,7 +28,10 @@ RSpec.describe ::EacCli::Runner do
 
   context 'when all args are supplied' do
     let(:argv) { %w[--opt1 aaa --opt2 bbb ccc ddd] }
-    let(:parsed_expected) { { opt1: 'aaa', opt2: true, pos1: 'bbb', pos2: %w[ccc ddd] } }
+    let(:parsed_expected) do
+      { opt1: 'aaa', opt2: true, opt3: false, pos1: 'bbb',
+        pos2: %w[ccc ddd] }
+    end
 
     it { expect(parsed_actual).to eq(parsed_expected) }
     it { expect(instance.parsed.opt1).to eq('aaa') }
@@ -39,7 +42,7 @@ RSpec.describe ::EacCli::Runner do
 
   context 'when only required args are supplied' do
     let(:argv) { %w[bbb] }
-    let(:parsed_expected) { { opt1: nil, opt2: false, pos1: 'bbb', pos2: [] } }
+    let(:parsed_expected) { { opt1: nil, opt2: false, opt3: false, pos1: 'bbb', pos2: [] } }
 
     it { expect(parsed_actual).to eq(parsed_expected) }
     it { expect(instance.parsed.opt1).to be_nil }
@@ -58,7 +61,7 @@ RSpec.describe ::EacCli::Runner do
 
   context 'when alternative args are supplied' do
     let(:argv) { %w[--opt3] }
-    let(:parsed_expected) { { opt3: true } }
+    let(:parsed_expected) { { opt1: nil, opt2: false, opt3: true, pos1: nil, pos2: [] } }
 
     it { expect(parsed_actual).to eq(parsed_expected) }
     it { expect(instance.parsed.opt3?).to eq(true) }

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

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'eac_cli/runner_with/help'
+require 'eac_ruby_utils/fs/temp'
+
+RSpec.describe ::EacCli::RunnerWith::Help do
+  let(:runner) do
+    the_module = described_class
+    Class.new do
+      include the_module
+
+      runner_definition do
+        desc 'A stub runner.'
+        pos_arg :a_argument
+      end
+
+      def run
+        puts 'Runner run'
+      end
+    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
+
+  it 'show help text' do
+    expect { instance.run_run }.to output(expected_output).to_stdout_from_any_process
+  end
+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
@@ -8,7 +9,6 @@ RSpec.describe ::EacCli::RunnerWith::Subcommands do
     the_module = described_class
     the_child = child_runner
     Class.new do
-      include ::EacCli::Runner
       include the_module
       const_set('ChildCmd', the_child)
 
@@ -54,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.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,31 @@
+# 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
+        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
+        end
+      end
+    end
+  end
+end

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/struct.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
 require 'active_support/hash_with_indifferent_access'
+require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/object/blank'
 
 module EacRubyUtils
   class Struct
     def initialize(initial_data = {})
-      self.data = ::ActiveSupport::HashWithIndifferentAccess.new(initial_data)
+      self.data = initial_data.symbolize_keys
     end
 
     def [](key)
@@ -19,6 +20,11 @@ module EacRubyUtils
       bool ? fetch(key).present? : data.fetch(key)
     end
 
+    def merge(other)
+      other = self.class.new(other) unless other.is_a?(self.class)
+      self.class.new(to_h.merge(other.to_h))
+    end
+
     def method_missing(method_name, *arguments, &block)
       property_method?(method_name) ? fetch(method_name) : super
     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.0'
 end

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

@@ -9,34 +9,47 @@ RSpec.describe ::EacRubyUtils::CommonConcern do
     end
   end
 
-  module MyModule
-    module ClassMethods
-      def my_class_method
-        'class'
+  let(:stub_module) do
+    ::Module.new do
+      module ClassMethods # rubocop:disable RSpec/LeakyConstantDeclaration
+        def my_class_method
+          'class'
+        end
       end
-    end
 
-    module InstanceMethods
-      def my_instance_method
-        'instance'
+      module InstanceMethods # rubocop:disable RSpec/LeakyConstantDeclaration
+        def my_instance_method
+          'instance'
+        end
       end
     end
   end
 
-  class MyClass
-    class << self
-      attr_accessor :valor
+  let(:stub_class) do
+    ::Class.new do
+      class << self
+        attr_accessor :valor
+      end
+
+      def method1
+        'from_stub_module'
+      end
     end
   end
 
-  let(:subject) { MyClass.new }
+  let(:stub_class_instance) { stub_class.new }
 
   before do
-    instance.setup(MyModule)
-    MyClass.include MyModule
+    instance.setup(stub_module)
   end
 
-  it { expect(subject.my_instance_method).to eq('instance') }
-  it { expect(subject.class.my_class_method).to eq('class') }
-  it { expect(subject.class.valor).to eq('changed') }
+  context 'when included' do
+    before do
+      stub_class.include stub_module
+    end
+
+    it { expect(stub_class_instance.my_instance_method).to eq('instance') }
+    it { expect(stub_class_instance.class.my_class_method).to eq('class') }
+    it { expect(stub_class_instance.class.valor).to eq('changed') }
+  end
 end

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

@@ -3,7 +3,8 @@
 require 'eac_ruby_utils/struct'
 
 RSpec.describe ::EacRubyUtils::Struct do
-  let(:instance) { described_class.new(a: 1, b: '') }
+  let(:instance) { described_class.new('a' => 1, b: '') }
+  let(:other) { described_class.new('a' => 'm1', c: 'm2') }
 
   describe '#[]' do
     it { expect(instance[:a]).to eq(1) }
@@ -35,6 +36,12 @@ RSpec.describe ::EacRubyUtils::Struct do
     it { expect { instance.fetch('c?') }.to raise_error(::KeyError) }
   end
 
+  describe '#merge' do
+    let(:merged) { instance.merge(other) }
+
+    it { expect(merged.to_h).to eq(a: 'm1', b: '', c: 'm2') }
+  end
+
   describe '#property_method' do
     it { expect(instance.a).to eq(1) }
     it { expect(instance.a?).to eq(true) }
@@ -43,4 +50,8 @@ RSpec.describe ::EacRubyUtils::Struct do
     it { expect { instance.c }.to raise_error(::NoMethodError) }
     it { expect { instance.c? }.to raise_error(::NoMethodError) }
   end
+
+  describe '#to_h' do
+    it { expect(instance.to_h).to eq(a: 1, b: '') }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.80.0
+  version: 0.84.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-16 00:00:00.000000000 Z
+date: 2020-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -296,12 +296,15 @@ files:
 - lib/avm/eac_rails_base0/deploy.rb
 - lib/avm/eac_rails_base0/instance.rb
 - lib/avm/eac_rails_base1.rb
+- lib/avm/eac_rails_base1/apache_host.rb
 - lib/avm/eac_rails_base1/instance.rb
 - lib/avm/eac_rails_base1/runner.rb
 - lib/avm/eac_rails_base1/runner/bundle.rb
 - lib/avm/eac_rails_base1/runner/code_runner.rb
+- lib/avm/eac_rails_base1/runner/rails_server.rb
 - lib/avm/eac_rails_base1/runner_with/bundle.rb
 - lib/avm/eac_redmine_base0.rb
+- lib/avm/eac_redmine_base0/apache_host.rb
 - lib/avm/eac_redmine_base0/core_update.rb
 - lib/avm/eac_redmine_base0/data_unit.rb
 - lib/avm/eac_redmine_base0/deploy.rb
@@ -343,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
@@ -486,14 +496,13 @@ files:
 - lib/avm/tools/runner.rb
 - lib/avm/tools/runner/eac_rails_base0.rb
 - lib/avm/tools/runner/eac_rails_base0/apache_path.rb
-- lib/avm/tools/runner/eac_rails_base0/rails_server.rb
-- lib/avm/tools/runner/eac_rails_base0/runner.rb
 - lib/avm/tools/runner/eac_redmine_base0.rb
 - lib/avm/tools/runner/eac_redmine_base0/core_update.rb
 - lib/avm/tools/runner/eac_redmine_base0/docker.rb
 - 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
@@ -521,6 +530,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
@@ -623,6 +634,7 @@ files:
 - vendor/eac_cli/lib/eac_cli/patches/object/runner_with.rb
 - vendor/eac_cli/lib/eac_cli/runner.rb
 - vendor/eac_cli/lib/eac_cli/runner/context.rb
+- vendor/eac_cli/lib/eac_cli/runner/exit.rb
 - vendor/eac_cli/lib/eac_cli/runner_with.rb
 - vendor/eac_cli/lib/eac_cli/runner_with/help.rb
 - vendor/eac_cli/lib/eac_cli/runner_with/output_file.rb
@@ -632,6 +644,7 @@ files:
 - vendor/eac_cli/spec/lib/eac_cli/docopt/runner_extension_spec.rb
 - vendor/eac_cli/spec/lib/eac_cli/parser/alternative_spec.rb
 - vendor/eac_cli/spec/lib/eac_cli/runner_spec.rb
+- vendor/eac_cli/spec/lib/eac_cli/runner_with/help_spec.rb
 - vendor/eac_cli/spec/lib/eac_cli/runner_with/output_file_spec.rb
 - vendor/eac_cli/spec/lib/eac_cli/runner_with/subcommands_spec.rb
 - vendor/eac_cli/spec/rubocop_spec.rb
@@ -904,6 +917,8 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/boolean.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/by_reference.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/common_concern.rb
+- 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/configs.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/configs/base.rb

data/lib/avm/tools/runner/eac_rails_base0/rails_server.rb

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/eac_rails_base1/runner_with/bundle'
-require 'avm/instances/entry_keys'
-require 'eac_cli/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'shellwords'
-
-module Avm
-  module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class EacRailsBase0 < ::Avm::EacRailsBase1::Runner
-        class RailsServer
-          DEFAULT_RAILS_ENVIRONMENT = 'development'
-          runner_with ::Avm::EacRailsBase1::RunnerWith::Bundle
-          runner_definition do
-            desc 'Run the embbeded Rails web server.'
-          end
-
-          def run
-            infov 'Environment', rails_environment
-            infov 'Bundle args', ::Shellwords.join(bundle_args)
-            infov 'Result', bundle_command.system
-          end
-
-          protected
-
-          def bundle_args
-            ['exec', 'rails', 'server', '--port',
-             runner_context.call(:instance).read_entry(::Avm::Instances::EntryKeys::WEB_PORT)]
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/eac_rails_base1/runner/code_runner'
-
-module Avm
-  module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class EacRailsBase0 < ::Avm::EacRailsBase1::Runner
-        class Runner < ::Avm::EacRailsBase1::Runner::CodeRunner
-        end
-      end
-    end
-  end
-end