eac_tools 0.62.0 → 0.63.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6015e5a017d606e064cf4b1672653826b286f9677550ef552af41178d4815ea
-  data.tar.gz: 210b3d6290d05b251ba3ab7706475f488f1509142007ebd5f4928af0d22fa4ff
+  metadata.gz: e107f6aa74ee0e1e360adc2984d3c2a68aea45023eb92fd0c2612b3f99231fcd
+  data.tar.gz: 4ec44416302a162992af3a0410033895e2a3179847d285cdf295b4c1e303af10
 SHA512:
-  metadata.gz: e6f47cb1544b15c17c3bcf6b4f989886616bf84b9df34b47b6efbbb2ab954bc33c2db5cc2a8ecf58398370f775453212325de74cfd127d7ee417499cc8594788
-  data.tar.gz: 6cd049e9d7d17c35b136f25c70ce638e7a5e4375230c948b39afc1ca3238751337320b3abead82684b327e561a787ef9e3054784d4056842c5387c4ffc16d97e
+  metadata.gz: a89a40d5ceefd62730be561a0bf3305bfacdcdf71ad65c77fbb9e2d04f6e31592e12a54efc2dfcac24f0a39bdd0fdeda2d8a94200c0fd9b8141f45a47b2b3469
+  data.tar.gz: 8e2546581a3d82e9d3d984894e35cc40941364e338c39433e9bfd9cb169222b9f3277042523293ea04e4aa87401d8b4b32f039552c03a101e29e33f61c0f6f0e

data/Gemfile.lock

@@ -1,24 +1,24 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.62.0)
-      avm (~> 0.68)
+    eac_tools (0.63.0)
+      avm (~> 0.69)
       avm-eac_asciidoctor_base0 (~> 0.19)
       avm-eac_generic_base0 (~> 0.12)
       avm-eac_latex_base0 (~> 0.3, >= 0.3.1)
       avm-eac_php_base0 (~> 0.4, >= 0.4.2)
-      avm-eac_postgresql_base0 (~> 0.2, >= 0.2.4)
+      avm-eac_postgresql_base0 (~> 0.4)
       avm-eac_python_base0 (~> 0.2, >= 0.2.1)
-      avm-eac_rails_base0 (~> 0.10, >= 0.10.1)
-      avm-eac_rails_base1 (~> 0.8, >= 0.8.3)
-      avm-eac_redmine_base0 (~> 0.20)
+      avm-eac_rails_base0 (~> 0.10, >= 0.10.2)
+      avm-eac_rails_base1 (~> 0.8, >= 0.8.4)
+      avm-eac_redmine_base0 (~> 0.20, >= 0.20.1)
       avm-eac_redmine_plugin_base0 (~> 0.4)
       avm-eac_ruby_base1 (~> 0.30, >= 0.30.2)
-      avm-eac_webapp_base0 (~> 0.15)
+      avm-eac_webapp_base0 (~> 0.16)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.1)
       avm-git (~> 0.13, >= 0.13.2)
       avm-tools (~> 0.145, >= 0.145.1)
-      eac_ruby_utils (~> 0.112)
+      eac_ruby_utils (~> 0.113)
 
 PATH
   remote: sub/aranha-parsers
@@ -67,9 +67,9 @@ PATH
 PATH
   remote: sub/avm-eac_postgresql_base0
   specs:
-    avm-eac_postgresql_base0 (0.2.4)
-      avm (~> 0.66, >= 0.66.1)
-      eac_ruby_utils (~> 0.112)
+    avm-eac_postgresql_base0 (0.4.0)
+      avm (~> 0.69)
+      eac_ruby_utils (~> 0.113)
 
 PATH
   remote: sub/avm-eac_python_base0
@@ -81,26 +81,26 @@ PATH
 PATH
   remote: sub/avm-eac_rails_base0
   specs:
-    avm-eac_rails_base0 (0.10.1)
-      avm-eac_rails_base1 (~> 0.8, >= 0.8.3)
+    avm-eac_rails_base0 (0.10.2)
+      avm-eac_rails_base1 (~> 0.8, >= 0.8.4)
       eac_ruby_utils (~> 0.112)
 
 PATH
   remote: sub/avm-eac_rails_base1
   specs:
-    avm-eac_rails_base1 (0.8.3)
-      avm (~> 0.67)
-      avm-eac_ruby_base1 (~> 0.30, >= 0.30.1)
-      avm-eac_webapp_base0 (~> 0.15)
+    avm-eac_rails_base1 (0.8.4)
+      avm (~> 0.68)
+      avm-eac_ruby_base1 (~> 0.30, >= 0.30.2)
+      avm-eac_webapp_base0 (~> 0.15, >= 0.15.1)
       eac_ruby_utils (~> 0.112)
 
 PATH
   remote: sub/avm-eac_redmine_base0
   specs:
-    avm-eac_redmine_base0 (0.20.0)
+    avm-eac_redmine_base0 (0.20.1)
       avm (~> 0.68)
       avm-eac_generic_base0 (~> 0.12)
-      avm-eac_rails_base1 (~> 0.8, >= 0.8.3)
+      avm-eac_rails_base1 (~> 0.8, >= 0.8.4)
       avm-eac_ubuntu_base0 (~> 0.4, >= 0.4.2)
       curb (~> 0.9, >= 0.9.11)
       eac_fs (~> 0.16)
@@ -134,13 +134,13 @@ PATH
 PATH
   remote: sub/avm-eac_webapp_base0
   specs:
-    avm-eac_webapp_base0 (0.15.0)
-      avm (~> 0.67)
+    avm-eac_webapp_base0 (0.16.0)
+      avm (~> 0.69)
       avm-eac_generic_base0 (~> 0.12)
-      avm-eac_postgresql_base0 (~> 0.2, >= 0.2.4)
-      avm-eac_ubuntu_base0 (~> 0.4, >= 0.4.1)
-      avm-files (~> 0.6)
-      eac_ruby_utils (~> 0.112)
+      avm-eac_postgresql_base0 (~> 0.4)
+      avm-eac_ubuntu_base0 (~> 0.4, >= 0.4.2)
+      avm-files (~> 0.6, >= 0.6.2)
+      eac_ruby_utils (~> 0.113)
 
 PATH
   remote: sub/avm-eac_wordpress_base0
@@ -191,14 +191,14 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.68.0)
+    avm (0.69.0)
       aranha-parsers (~> 0.17, >= 0.17.1)
-      eac_cli (~> 0.31)
+      eac_cli (~> 0.32)
       eac_config (~> 0.12)
       eac_docker (~> 0.7)
       eac_fs (~> 0.16)
       eac_git (~> 0.14, >= 0.14.1)
-      eac_ruby_utils (~> 0.112)
+      eac_ruby_utils (~> 0.113)
       eac_templates (~> 0.5)
       filesize (~> 0.2)
       htmlbeautifier (~> 1.4, >= 1.4.2)
@@ -207,10 +207,10 @@ PATH
 PATH
   remote: sub/eac_cli
   specs:
-    eac_cli (0.31.0)
+    eac_cli (0.32.0)
       colorize (~> 0.8, >= 0.8.1)
       eac_config (~> 0.12)
-      eac_ruby_utils (~> 0.112)
+      eac_ruby_utils (~> 0.113)
 
 PATH
   remote: sub/eac_config
@@ -261,9 +261,9 @@ PATH
 PATH
   remote: sub/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.112.0)
+    eac_ruby_utils (0.113.0)
       activesupport (>= 4, < 7)
-      addressable (~> 2.8, >= 2.8.1)
+      addressable (~> 2.8, >= 2.8.4)
       bundler
       filesize (~> 0.2)
       net-ssh (~> 4.2)

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.62.0'
+  VERSION = '0.63.0'
 end

data/sub/avm/avm.gemspec

@@ -13,12 +13,12 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*']
 
   s.add_dependency 'aranha-parsers', '~> 0.17', '>= 0.17.1'
-  s.add_dependency 'eac_cli', '~> 0.31'
+  s.add_dependency 'eac_cli', '~> 0.32'
   s.add_dependency 'eac_config', '~> 0.12'
   s.add_dependency 'eac_docker', '~> 0.7'
   s.add_dependency 'eac_fs', '~> 0.16'
   s.add_dependency 'eac_git', '~> 0.14', '>= 0.14.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.112'
+  s.add_dependency 'eac_ruby_utils', '~> 0.113'
   s.add_dependency 'eac_templates', '~> 0.5'
   s.add_dependency 'filesize', '~> 0.2'
   s.add_dependency 'htmlbeautifier', '~> 1.4', '>= 1.4.2'

data/sub/avm/lib/avm/data/package.rb

@@ -45,9 +45,20 @@ module Avm
         end
       end
 
+      # @param id [Symbol]
+      # @return [Avm::Data::Unit]
+      def unit(identifier)
+        units[identifier.to_sym] || raise("No unit found with identifier \"#{identifier}\"")
+      end
+
       def units
         @units ||= {}
       end
+
+      # @return [Enumerable<String>]
+      def units_ids
+        units.keys
+      end
     end
   end
 end

data/sub/avm/lib/avm/instances/data/files_unit.rb

@@ -17,7 +17,7 @@ module Avm
           self.options = self.class.lists.option.hash_keys_validate!(options)
         end
 
-        before_load :clear_files
+        before_load :clear
 
         # @return [Pathname]
         def files_path
@@ -33,7 +33,7 @@ module Avm
           instance_command('tar', '-xzf', '-', '-C', files_path)
         end
 
-        def clear_files
+        def clear
           infom "Removing all files under #{files_path}..."
           instance_command('mkdir', '-p', files_path).execute!
           instance_command('find', files_path, '-mindepth', 1, '-delete').execute!

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avm
-  VERSION = '0.68.0'
+  VERSION = '0.69.0'
 end

data/sub/avm-eac_postgresql_base0/Gemfile

@@ -3,3 +3,6 @@
 source 'https://rubygems.org'
 
 gemspec
+
+local_gemfile = ::File.join(::File.dirname(__FILE__), 'Gemfile.local')
+eval_gemfile local_gemfile if ::File.exist?(local_gemfile)

data/sub/avm-eac_postgresql_base0/avm-eac_postgresql_base0.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'avm', '~> 0.66', '>= 0.66.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.112'
+  s.add_dependency 'avm', '~> 0.69'
+  s.add_dependency 'eac_ruby_utils', '~> 0.113'
 
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/instance/commands.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require 'avm/eac_postgresql_base0/instance/data_unit'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacPostgresqlBase0
+    class Instance
+      module Commands
+        DUMP_EXCLUDE_PATTERN = '^(CREATE|COMMENT ON) EXTENSION'
+
+        # @return [EacRubyUtils::Envs::Command]
+        def dump_command
+          env.command('pg_dump', '--no-privileges', '--no-owner', *common_command_args)
+             .envvar('PGPASSWORD', password)
+             .pipe(remove_extensions_ddl)
+        end
+
+        # @return [EacRubyUtils::Envs::Command]
+        def dump_gzip_command
+          dump_command.pipe(gzip_compress_command)
+        end
+
+        # @return [EacRubyUtils::Envs::Command]
+        def gzip_compress_command
+          env.command('gzip', '-9', '-c')
+        end
+
+        # @return [EacRubyUtils::Envs::Command]
+        def gzip_decompress_command
+          env.command('gzip', '-d')
+        end
+
+        # @return [EacRubyUtils::Envs::Command]
+        def load_gzip_command
+          gzip_decompress_command.pipe(psql_command)
+        end
+
+        # @return [String]
+        def password_command_argument
+          "@ESC_PGPASSWORD=#{password}"
+        end
+
+        def psql_command(database = true)
+          env.command(password_command_argument, 'psql', '--variable', 'ON_ERROR_STOP=t',
+                      *common_command_args(database))
+        end
+
+        def psql_command_command(sql, database = true)
+          psql_command(database).append(['--quiet', '--tuples-only', '--command', sql])
+        end
+
+        def root_psql_command(sql = nil)
+          args = ['sudo', '-u', 'postgres', 'psql']
+          args += ['--quiet', '--tuples-only', '--command', sql] if sql.present?
+          env.command(*args)
+        end
+
+        def common_command_args(database = true)
+          ['--host', host, '--username', user, '--port', port,
+           (database ? name : MAINTENANCE_DATABASE)]
+        end
+
+        private
+
+        # @return [EacRubyUtils::Envs::Command]
+        def remove_extensions_ddl
+          env.command('grep', '--invert-match', '--extended-regexp', DUMP_EXCLUDE_PATTERN)
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/instance/data_unit.rb

@@ -7,9 +7,23 @@ module Avm
     class Instance
       class DataUnit < ::Avm::Instances::Data::Unit
         EXTENSION = '.pgdump.gz'
-        TABLES_SQL = 'select tablename from pg_tables where schemaname = \'public\''
+        SCHEMA_VAR = '%%SCHEMA%%'
+        TABLE_PARTS_SEPARATOR = '/'
+        TABLES_SQL = "select schemaname || '#{TABLE_PARTS_SEPARATOR}' || tablename from " \
+          "pg_tables where schemaname = '#{SCHEMA_VAR}'"
 
-        before_load :clear_database
+        before_load :clear
+
+        def clear
+          info 'Clearing database (Dropping all tables)...'
+          ts = tables
+          if ts.empty?
+            info 'Database has no tables'
+          else
+            info "Removing #{ts.count} table(s)..."
+            run_sql(drop_tables_sql(ts))
+          end
+        end
 
         def dump_command
           instance.dump_gzip_command
@@ -21,23 +35,32 @@ module Avm
 
         private
 
-        def clear_database
-          info 'Clearing database (Dropping all tables)...'
-          ts = tables
-          if ts.empty?
-            info 'Database has no tables'
-          else
-            info "Removing #{ts.count} table(s)..."
-            run_sql('drop table if exists ' + ts.map { |t| "\"#{t}\"" }.join(', ') + ' cascade')
-          end
+        # @param table_list [Array<String>]
+        # @return [String]
+        def drop_tables_sql(table_list)
+          'drop table ' + table_list.map(&:to_s).join(', ') + ' cascade'
+        end
+
+        # @param parts [Array<String>, Strings]
+        # @return [String]
+        def join_table_parts(parts)
+          parts = parts.to_s.split(TABLE_PARTS_SEPARATOR) unless parts.is_a?(::Enumerable)
+          parts.map { |p| "\"#{p}\"" }.join('.')
         end
 
         def run_sql(sql)
           instance.psql_command_command(sql).execute!
         end
 
+        # @return [Array<String>]
         def tables
-          run_sql(TABLES_SQL).each_line.map(&:strip).reject(&:blank?)
+          run_sql(tables_sql).each_line.map(&:strip).reject(&:blank?)
+                             .map { |line| join_table_parts(line) }
+        end
+
+        # @return [String]
+        def tables_sql
+          TABLES_SQL.gsub(SCHEMA_VAR, instance.schema)
         end
       end
     end

data/sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/instance.rb

@@ -6,8 +6,11 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module EacPostgresqlBase0
     class Instance
-      require_sub __FILE__
+      require_sub __FILE__, include_modules: true
 
+      DEFAULT_HOSTNAME = '127.0.0.1'
+      DEFAULT_PORT = 5432
+      DEFAULT_SCHEMA = 'public'
       MAINTENANCE_DATABASE = 'postgres'
 
       common_constructor :env, :connection_params do
@@ -22,61 +25,12 @@ module Avm
         ::Avm::EacPostgresqlBase0::Instance::DataUnit.new(self)
       end
 
-      def dump_command
-        env.command('pg_dump', '--no-privileges', '--clean', '--no-owner', *common_command_args)
-           .envvar('PGPASSWORD', password)
-      end
-
-      # @return [EacRubyUtils::Envs::Command]
-      def dump_gzip_command
-        dump_command.pipe(gzip_compress_command)
-      end
-
-      # @return [EacRubyUtils::Envs::Command]
-      def gzip_compress_command
-        env.command('gzip', '-9', '-c')
-      end
-
-      # @return [EacRubyUtils::Envs::Command]
-      def gzip_decompress_command
-        env.command('gzip', '-d')
-      end
-
-      # @return [EacRubyUtils::Envs::Command]
-      def load_gzip_command
-        gzip_decompress_command.pipe(psql_command)
-      end
-
-      # @return [String]
-      def password_command_argument
-        "@ESC_PGPASSWORD=#{password}"
-      end
-
-      def psql_command(database = true)
-        env.command(password_command_argument, 'psql', *common_command_args(database))
-      end
-
-      def psql_command_command(sql, database = true)
-        psql_command(database).append(['--quiet', '--tuples-only', '--command', sql])
-      end
-
-      def root_psql_command(sql = nil)
-        args = ['sudo', '-u', 'postgres', 'psql']
-        args += ['--quiet', '--tuples-only', '--command', sql] if sql.present?
-        env.command(*args)
-      end
-
-      def common_command_args(database = true)
-        ['--host', host, '--username', user, '--port', port,
-         (database ? name : MAINTENANCE_DATABASE)]
-      end
-
       def host
-        connection_params[:host] || '127.0.0.1'
+        connection_params[:host] || DEFAULT_HOSTNAME
       end
 
       def port
-        connection_params[:port] || '5432'
+        connection_params[:port] || DEFAULT_PORT
       end
 
       def user
@@ -90,6 +44,10 @@ module Avm
       def name
         connection_params.fetch(:name)
       end
+
+      def schema
+        connection_params[:schema] || DEFAULT_SCHEMA
+      end
     end
   end
 end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacPostgresqlBase0
-    VERSION = '0.2.4'
+    VERSION = '0.4.0'
   end
 end

data/sub/avm-eac_rails_base0/avm-eac_rails_base0.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm-eac_rails_base1', '~> 0.8', '>= 0.8.3'
+  s.add_dependency 'avm-eac_rails_base1', '~> 0.8', '>= 0.8.4'
   s.add_dependency 'eac_ruby_utils', '~> 0.112'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase0
-    VERSION = '0.10.1'
+    VERSION = '0.10.2'
   end
 end

data/sub/avm-eac_rails_base1/avm-eac_rails_base1.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.67'
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.30', '>= 0.30.1'
-  s.add_dependency 'avm-eac_webapp_base0', '~> 0.15'
+  s.add_dependency 'avm', '~> 0.68'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.30', '>= 0.30.2'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.15', '>= 0.15.1'
   s.add_dependency 'eac_ruby_utils', '~> 0.112'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase1
-    VERSION = '0.8.3'
+    VERSION = '0.8.4'
   end
 end

data/sub/avm-eac_redmine_base0/avm-eac_redmine_base0.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'avm', '~> 0.68'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.12'
-  s.add_dependency 'avm-eac_rails_base1', '~> 0.8', '>= 0.8.3'
+  s.add_dependency 'avm-eac_rails_base1', '~> 0.8', '>= 0.8.4'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.4', '>= 0.4.2'
   s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
   s.add_dependency 'eac_fs', '~> 0.16'

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.20.0'
+    VERSION = '0.20.1'
   end
 end

data/sub/avm-eac_webapp_base0/avm-eac_webapp_base0.gemspec

@@ -12,12 +12,12 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.67'
+  s.add_dependency 'avm', '~> 0.69'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.12'
-  s.add_dependency 'avm-eac_postgresql_base0', '~> 0.2', '>= 0.2.4'
-  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.4', '>= 0.4.1'
-  s.add_dependency 'avm-files', '~> 0.6'
-  s.add_dependency 'eac_ruby_utils', '~> 0.112'
+  s.add_dependency 'avm-eac_postgresql_base0', '~> 0.4'
+  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.4', '>= 0.4.2'
+  s.add_dependency 'avm-files', '~> 0.6', '>= 0.6.2'
+  s.add_dependency 'eac_ruby_utils', '~> 0.113'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners/data/unit/clear.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      module Runners
+        class Data
+          class Unit
+            class Clear
+              runner_with :help
+
+              def run
+                runner_context.call(:data_unit).clear
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners/data/unit/dump.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      module Runners
+        class Data
+          class Unit
+            class Dump
+              runner_with :help do
+                pos_arg :dump_path
+              end
+
+              def run
+                nyi
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners/data/unit/load.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      module Runners
+        class Data
+          class Unit
+            class Load
+              runner_with :help do
+                pos_arg :dump_path
+              end
+
+              def run
+                nyi
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners/data/unit.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      module Runners
+        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 [Hash<String, Enumerable<String>]
+            def help_extra_text
+              super.merge('Available units' => available_units_ids)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWebappBase0
-    VERSION = '0.15.0'
+    VERSION = '0.16.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.113'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'eac_cli/runner_with/help/list_section'
 require 'eac_ruby_utils/core_ext'
 
 module EacCli
@@ -9,9 +10,8 @@ module EacCli
         require_sub __FILE__, require_dependency: true
         common_constructor :runner
 
-        SEP = ' '
-        IDENT = SEP * 2
-        OPTION_DESC_SEP = IDENT * 2
+        OPTION_DESC_SEP = ::EacCli::RunnerWith::Help::ListSection::IDENTATION * 2
+        SECTION_SEPARATOR = "\n"
 
         class << self
           def option_long(option)
@@ -35,7 +35,7 @@ module EacCli
           end
 
           def word_separator
-            SEP
+            ::EacCli::RunnerWith::Help::ListSection::WORD_SEPARATOR
           end
         end
 
@@ -45,36 +45,53 @@ module EacCli
           runner.class.runner_definition
         end
 
+        # @return [String, nil]
+        def extra_section
+          ess = extra_sections
+          return nil if ess.none?
+
+          ess.join(SECTION_SEPARATOR)
+        end
+
+        # @return [Enumerable<String>]
+        def extra_sections
+          runner.if_respond(:help_extra_text, []) do |v|
+            if v.is_a?(::Hash)
+              v.map do |title, lines|
+                ::EacCli::RunnerWith::Help::ListSection.new(title, lines)
+              end
+            else
+              [v.to_s]
+            end
+          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
-        end
-
+        # @return [String]
         def options_section
-          "Options:\n" +
-            definition.alternatives.flat_map(&:options)
-              .map { |option| IDENT + option_definition(option) + "\n" }.join
+          ::EacCli::RunnerWith::Help::ListSection.new(
+            '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
+          ::EacCli::RunnerWith::Help::ListSection.new(
+            'Usage',
+            definition.alternatives.map { |alternative| self.alternative(alternative) }
+          )
         end
 
         def to_s
-          "#{definition.description}\n\n#{usage_section}\n#{options_section}\n"
+          r = ["#{definition.description}\n", usage_section, options_section]
+                .map { |s| "#{s}#{SECTION_SEPARATOR}" }.join
+          extra_section.if_present(r) { |v| r + v }
         end
       end
     end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacCli
+  module RunnerWith
+    module Help
+      class ListSection
+        WORD_SEPARATOR = ' '
+        IDENTATION = WORD_SEPARATOR * 2
+
+        common_constructor :title, :items
+
+        # @return [String]
+        def to_s
+          (["#{title}:"] + items.map { |line| "#{IDENTATION}#{line}" })
+            .map { |line| "#{line}\n" }.join
+        end
+      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
 
@@ -27,10 +27,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/subcommands.rb

@@ -51,9 +51,12 @@ 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
+        {
+          '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.32.0'
 end

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

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

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.62.0
+  version: 0.63.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-06 00:00:00.000000000 Z
+date: 2023-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.68'
+        version: '0.69'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.68'
+        version: '0.69'
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -98,20 +98,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: avm-eac_python_base0
   requirement: !ruby/object:Gem::Requirement
@@ -141,7 +135,7 @@ dependencies:
         version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -151,7 +145,7 @@ dependencies:
         version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.10.2
 - !ruby/object:Gem::Dependency
   name: avm-eac_rails_base1
   requirement: !ruby/object:Gem::Requirement
@@ -161,7 +155,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -171,7 +165,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.4
 - !ruby/object:Gem::Dependency
   name: avm-eac_redmine_base0
   requirement: !ruby/object:Gem::Requirement
@@ -179,6 +173,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.20'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.20.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -186,6 +183,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.20'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.20.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_redmine_plugin_base0
   requirement: !ruby/object:Gem::Requirement
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: avm-eac_wordpress_base0
   requirement: !ruby/object:Gem::Requirement
@@ -300,14 +300,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.112'
+        version: '0.113'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.112'
+        version: '0.113'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -537,6 +537,7 @@ files:
 - sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0.rb
 - sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/instance.rb
 - sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/instance/assert.rb
+- sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/instance/commands.rb
 - sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/instance/data_unit.rb
 - sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/instance_with.rb
 - sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/version.rb
@@ -878,6 +879,10 @@ files:
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners/data.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners/data/dump.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners/data/load.rb
+- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners/data/unit.rb
+- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners/data/unit/clear.rb
+- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners/data/unit/dump.rb
+- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners/data/unit/load.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners/deploy.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/sources.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/sources/base.rb
@@ -1363,6 +1368,7 @@ files:
 - sub/eac_cli/lib/eac_cli/runner_with/help.rb
 - sub/eac_cli/lib/eac_cli/runner_with/help/builder.rb
 - sub/eac_cli/lib/eac_cli/runner_with/help/builder/alternative.rb
+- sub/eac_cli/lib/eac_cli/runner_with/help/list_section.rb
 - sub/eac_cli/lib/eac_cli/runner_with/input.rb
 - sub/eac_cli/lib/eac_cli/runner_with/output.rb
 - sub/eac_cli/lib/eac_cli/runner_with/subcommands.rb
@@ -1380,6 +1386,7 @@ files:
 - sub/eac_cli/spec/lib/eac_cli/parser/alternative_spec.rb
 - sub/eac_cli/spec/lib/eac_cli/runner_spec.rb
 - sub/eac_cli/spec/lib/eac_cli/runner_with/confirmation_spec.rb
+- sub/eac_cli/spec/lib/eac_cli/runner_with/help/list_section_spec.rb
 - sub/eac_cli/spec/lib/eac_cli/runner_with/help_spec.rb
 - sub/eac_cli/spec/lib/eac_cli/runner_with/output_spec.rb
 - sub/eac_cli/spec/lib/eac_cli/runner_with/subcommands_spec.rb