eac_tools 0.59.0 → 0.60.1

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build/document/breadcrumbs_macro_value.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacAsciidoctorBase0
+    module Instances
+      class Build
+        class Document
+          class BreadcrumbsMacroValue
+            enable_method_class
+            common_constructor :document
+
+            NODE_SEPARATOR = ' » '
+            ROOT_DOCUMENT_TITLE = 'Home'
+
+            # @return [Array<String>]
+            def result
+              trail_nodes.join(NODE_SEPARATOR)
+            end
+
+            def trail_nodes
+              r = []
+              current = document
+              while current.present?
+                r.unshift(Node.new(document, current))
+                current = current.parent_document
+              end
+              r
+            end
+
+            class Node
+              common_constructor :current, :document
+
+              # @return [String]
+              def address
+                current.href_to_other_body(document)
+              end
+
+              # @return [String]
+              def title
+                if document.parent_document.present?
+                  document.source_document.title
+                else
+                  ROOT_DOCUMENT_TITLE
+                end
+              end
+
+              # @return [String]
+              def to_s
+                "link:#{address}[#{title}]"
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build/document/child_docs_macro_value.rb

@@ -23,9 +23,7 @@ module Avm
 
               # @return [Pathname]
               def address
-                child.body_target_path.relative_path_from(
-                  document.body_target_path.dirname
-                )
+                document.href_to_other_body(child)
               end
 
               # @return [String]

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build/document/header_lines.rb

@@ -43,9 +43,15 @@ module Avm
               "#{author_name} <#{author_email}>"
             end
 
+            # @return [String]
+            def breadcrumbs_lines
+              ['[.normal]', document.breadcrumbs_macro_value]
+            end
+
             # @return [Array<String>]
             def result
-              [stylesheet_line, title_line, author_line] + attributes_lines
+              [stylesheet_line, title_line, author_line] + attributes_lines + [''] +
+                breadcrumbs_lines
             end
 
             # @return [String]

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build/document.rb

@@ -16,6 +16,12 @@ module Avm
           enable_speaker
           common_constructor :build, :parent_document, :source_document
 
+          # @param other [Avm::EacAsciidoctorBase0::Instances::Build::Document]
+          # @return [String]
+          def href_to_other_body(other)
+            other.body_target_path.relative_path_from(body_target_path.dirname)
+          end
+
           # Absolute path to the output of Asciidoctor's source file.
           #
           # @return [Pathname]
@@ -32,6 +38,19 @@ module Avm
             )
           end
 
+          # @param basename [String]
+          # @return [Avm::EacAsciidoctorBase0::Instances::Build::Document, nil]
+          def child(basename)
+            basename = basename.to_s
+            children.find { |c| c.source_document.root_path.basename.to_path == basename }
+          end
+
+          # @param basename [String]
+          # @return [Avm::EacAsciidoctorBase0::Instances::Build::Document]
+          def child!(basename)
+            child(basename) || raise("Child not found with basename \"#{basename}\"")
+          end
+
           # @return [Pathname]
           def convert_base_dir
             source_document.root_path
@@ -56,7 +75,7 @@ module Avm
           def pre_processed_body_source_content
             (
               header_lines + [''] + source_document.body_path.read.each_line
-                               .flat_map { |line| pre_process_line(line.rstrip) }
+              .flat_map { |line| pre_process_line(line.rstrip) }
             ).map { |line| "#{line.rstrip}\n" }.join
           end
 

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacAsciidoctorBase0
-    VERSION = '0.17.0'
+    VERSION = '0.18.1'
   end
 end

data/sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/instances/build/document_spec.rb

@@ -1,32 +1,72 @@
 # frozen_string_literal: true
 
-require 'avm/eac_asciidoctor_base0/sources/base'
 require 'avm/eac_asciidoctor_base0/instances/build'
 
-::RSpec.describe ::Avm::EacAsciidoctorBase0::Instances::Build::Document do
-  let(:application) { ::Avm::Applications::Base.new('myapp') }
-  let(:application_instance) do
-    ::Avm::EacAsciidoctorBase0::Instances::Base
-      .new(application, 'stub')
-  end
-  let(:build) { ::Avm::EacAsciidoctorBase0::Instances::Build.new(application_instance) }
+::RSpec.describe ::Avm::EacAsciidoctorBase0::Instances::Build::Document do # rubocop:disable Metrics/BlockLength
+  let(:app_director) { eac_asciidoctor_base0_stubs }
+  let(:build) { ::Avm::EacAsciidoctorBase0::Instances::Build.new(app_director.instance) }
   let(:fixtures_dir) { __dir__.to_pathname.join('document_spec_files') }
-  let(:instance) { build.root_document }
-  let(:source) { avm_source('EacAsciidoctorBase0', target_basename: application.id) }
+  let(:instance) { build_doc_child(build.root_document, :c1, :c1_1, :c1_1_1) }
   let(:target_file) { fixtures_dir.join('pre_processed_root_body.adoc') }
+  let(:source) { app_director.source }
+  let(:doc_template) do
+    r = temp_dir
+    ::FileUtils.copy_entry(source.root_document.root_path, r)
+    r
+  end
 
   before do
-    application.entry('stereotype').write('EacAsciidoctorBase0')
-    ::EacConfig::Node.context.current.entry("#{application.id}_dev.install.path")
-                     .value = source.path.to_path
-    application_instance.entry('install.path').write(source.path.to_path)
-    application_instance.entry('install.name').write('The Author')
-    application_instance.entry('install.name_initials').write('T.A.')
-    application_instance.entry('install.email').write('theauthor@example.net')
-    application_instance.entry('web.url').write('https://www.example.net')
+    copy_template_hash(
+      source.root_document,
+      c1: {
+        c1_1: {
+          c1_1_1: {
+            c1_1_1_1: {},
+            c1_1_1_2: {}
+          },
+          c1_1_2: {
+            c1_1_2_1: {},
+            c1_1_2_2: {}
+          }
+        }
+      },
+      c2: {
+        c2_1: {}
+      }
+    )
   end
 
   it do
     expect(instance.pre_processed_body_source_content).to eq(target_file.read)
   end
+
+  # @return [Avm::EacAsciidoctorBase0::Sources::Base::Document]
+  def copy_template_doc(parent, basename)
+    parent.assert_argument(::Avm::EacAsciidoctorBase0::Sources::Base::Document, 'parent')
+
+    root_target = parent.root_path.join(basename.to_s)
+    ::FileUtils.copy_entry(doc_template, root_target)
+    root_target.join('title').write(root_target.basename.to_path)
+    ::Avm::EacAsciidoctorBase0::Sources::Base::Document.new(parent.source, parent,
+                                                            root_target.basename)
+  end
+
+  # @return [Array<Avm::EacAsciidoctorBase0::Sources::Base::Document>]
+  def copy_template_hash(parent, hash)
+    parent.assert_argument(::Avm::EacAsciidoctorBase0::Sources::Base::Document, 'parent')
+    hash.assert_argument(::Hash, 'hash')
+
+    hash.map do |k, v|
+      r = copy_template_doc(parent, k)
+      copy_template_hash(r, v)
+      r
+    end
+  end
+
+  # @return [Avm::EacAsciidoctorBase0::Instances::Build::Document]
+  def build_doc_child(build_doc, *path)
+    basename = path.shift.to_s
+    r = build_doc.child!(basename)
+    path.any? ? build_doc_child(r, *path) : r
+  end
 end

data/sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/instances/build/document_spec_files/pre_processed_root_body.adoc

@@ -1,5 +1,5 @@
-:stylesheet: ../theme/main.css
-= EacAsciidoctorBase0 Generated Source
+:stylesheet: ../../../../theme/main.css
+= c1_1_1
 The Author <theauthor@example.net>
 :Author Initials: T.A.
 :toc: left
@@ -7,8 +7,13 @@ The Author <theauthor@example.net>
 :numbered:
 :website: https://www.example.net
 
+[.normal]
+link:../../../index.html[Home] » link:../../index.html[c1] » link:../index.html[c1_1] » link:index.html[c1_1_1]
+
 == Child Documents
 
+* link:c1_1_1_1/index.html[c1_1_1_1]
+* link:c1_1_1_2/index.html[c1_1_1_2]
 
 == First Section
 

data/sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/instances/build_spec.rb

@@ -1,32 +1,16 @@
 # frozen_string_literal: true
 
-require 'avm/eac_asciidoctor_base0/sources/base'
 require 'avm/eac_asciidoctor_base0/instances/build'
 require 'eac_fs/comparator'
 
-::RSpec.describe ::Avm::EacAsciidoctorBase0::Instances::Build do # rubocop:disable Metrics/BlockLength
-  let(:application) { ::Avm::Applications::Base.new('myapp') }
-  let(:application_instance) do
-    ::Avm::EacAsciidoctorBase0::Instances::Base
-      .new(application, 'stub')
-  end
+::RSpec.describe ::Avm::EacAsciidoctorBase0::Instances::Build do
+  let(:app_director) { eac_asciidoctor_base0_stubs }
   let(:fs_comparator) { ::EacFs::Comparator.new.truncate_file('*.html') }
-  let(:instance) { described_class.new(application_instance) }
-  let(:source) { avm_source('EacAsciidoctorBase0', target_basename: application.id) }
-
-  before do
-    application.entry('stereotype').write('EacAsciidoctorBase0')
-    ::EacConfig::Node.context.current.entry("#{application.id}_dev.install.path")
-                     .value = source.path.to_path
-    application_instance.entry('install.name').write('The Author')
-    application_instance.entry('install.name_initials').write('T.A.')
-    application_instance.entry('install.email').write('theauthor@example.net')
-    application_instance.entry('web.url').write('https://www.example.net')
-  end
+  let(:instance) { described_class.new(app_director.instance) }
 
   include_examples 'source_target_fixtures', __FILE__ do
     def source_data(source_file)
-      ::FileUtils.copy_entry(source_file, source.path)
+      ::FileUtils.copy_entry(source_file, app_director.source.path)
       instance.perform
       fs_comparator.build(instance.target_directory)
     end

data/sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/sources/base_spec.rb

@@ -7,12 +7,7 @@ require 'avm/eac_asciidoctor_base0/sources/base'
   include_examples 'in_avm_registry', 'sources'
 
   describe '#instance' do
-    let(:application) { ::Avm::Applications::Base.new('myapp') }
-    let(:source) { avm_source('EacAsciidoctorBase0', target_basename: application.id) }
-
-    before do
-      application.local_source_path_entry.value = source.path
-    end
+    let(:source) { eac_asciidoctor_base0_stubs.source }
 
     it do
       expect(source.instance).to be_a(::Avm::EacAsciidoctorBase0::Instances::Base)

data/sub/avm-eac_asciidoctor_base0/spec/spec_helper/eac_asciidoctor_base0_stubs.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'eac_config/node'
+require 'avm/applications/base'
+require 'avm/instances/base'
+require 'eac_ruby_utils/core_ext'
+
+module EacAsciidoctorBase0Stubs
+  class Director
+    DEFAULT_APPLICATION_ID = 'myapp'
+    INSTANCE_ENTRY_KEYS = {
+      'install.name' => 'The Author',
+      'install.name_initials' => 'T.A.',
+      'install.email' => 'theauthor@example.net',
+      'web.url' => 'https://www.example.net'
+    }.freeze
+
+    enable_simple_cache
+    common_constructor :rspec_example, :application_id, default: [DEFAULT_APPLICATION_ID] do
+      source
+      application
+      instance
+    end
+
+    private
+
+    # @return [Avm::Applications::Base]
+    def application_uncached
+      r = ::Avm::Applications::Base.new(application_id)
+      r.entry('stereotype').write('EacAsciidoctorBase0')
+      r.local_source_path_entry.value = source.path.to_path
+      r
+    end
+
+    # @return [Avm::EacAsciidoctorBase0::Instances::Base]
+    def instance_uncached
+      r = ::Avm::EacAsciidoctorBase0::Instances::Base.new(application, 'stub')
+      INSTANCE_ENTRY_KEYS.each { |k, v| r.entry(k).write(v) }
+      r
+    end
+
+    # @return [Avm::EacAsciidoctorBase0::Sources::Base]
+    def source_uncached
+      rspec_example.avm_source('EacAsciidoctorBase0', target_basename: application_id)
+    end
+  end
+
+  def eac_asciidoctor_base0_stubs(id = nil)
+    args = [self]
+    args << id if id.present?
+    ::EacAsciidoctorBase0Stubs::Director.new(*args)
+  end
+end
+
+::EacRubyUtils::Rspec.default_setup.rspec_config.include(::EacAsciidoctorBase0Stubs)

data/sub/avm-eac_asciidoctor_base0/spec/spec_helper.rb

@@ -3,3 +3,6 @@
 require 'eac_ruby_utils/rspec/default_setup'
 ::EacRubyUtils::Rspec.default_setup_create(::File.expand_path('..', __dir__))
                      .stub_avm_contexts
+
+require 'eac_ruby_utils/require_sub'
+::EacRubyUtils.require_sub __FILE__

data/sub/avm-eac_latex_base0/avm-eac_latex_base0.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'avm', '~> 0.52'
-  s.add_dependency 'avm-eac_webapp_base0', '~> 0.12'
-  s.add_dependency 'eac_ruby_utils', '~> 0.106'
+  s.add_dependency 'avm', '~> 0.67'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.15'
+  s.add_dependency 'eac_ruby_utils', '~> 0.112'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5', '>= 0.5.1'
 end

data/sub/avm-eac_latex_base0/lib/avm/eac_latex_base0/instances/base.rb

@@ -6,7 +6,6 @@ module Avm
   module EacLatexBase0
     module Instances
       class Base < ::Avm::EacWebappBase0::Instances::Base
-        FILES_UNITS = {}.freeze
       end
     end
   end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacLatexBase0
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
   end
 end

data/sub/avm-eac_php_base0/avm-eac_php_base0.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm-eac_generic_base0', '~> 0.8'
-  s.add_dependency 'avm-eac_webapp_base0', '~> 0.13'
-  s.add_dependency 'eac_ruby_utils', '~> 0.109'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.12'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.15'
+  s.add_dependency 'eac_ruby_utils', '~> 0.112'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5', '>= 0.5.1'
 end

data/sub/avm-eac_php_base0/lib/avm/eac_php_base0/instances/base.rb

@@ -7,7 +7,6 @@ module Avm
   module EacPhpBase0
     module Instances
       class Base < ::Avm::EacWebappBase0::Instances::Base
-        FILES_UNITS = {}.freeze
       end
     end
   end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacPhpBase0
-    VERSION = '0.4.1'
+    VERSION = '0.4.2'
   end
 end

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.57'
-  s.add_dependency 'eac_ruby_utils', '~> 0.109'
+  s.add_dependency 'avm', '~> 0.66', '>= 0.66.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.112'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'
 end

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

@@ -28,7 +28,7 @@ module Avm
             info 'Database has no tables'
           else
             info "Removing #{ts.count} table(s)..."
-            run_sql('drop table ' + ts.map { |t| "\"#{t}\"" }.join(', ') + ' cascade')
+            run_sql('drop table if exists ' + ts.map { |t| "\"#{t}\"" }.join(', ') + ' cascade')
           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.3'
+    VERSION = '0.2.4'
   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.1'
+  s.add_dependency 'avm-eac_rails_base1', '~> 0.8', '>= 0.8.3'
   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/instances/base.rb

@@ -7,7 +7,17 @@ module Avm
   module EacRailsBase0
     module Instances
       class Base < ::Avm::EacRailsBase1::Instances::Base
-        FILES_UNITS = { uploads: 'public/uploads' }.freeze
+        UPLOADS_UNIT_SUBPATH = 'public/uploads'
+
+        # @return [Avm::Instances::Data::Package]
+        def data_package_create
+          super.add_unit('uploads', uploads_unit)
+        end
+
+        # @return [Avm::Instances::Data::FilesUnit]
+        def uploads_unit
+          ::Avm::Instances::Data::FilesUnit.new(self, UPLOADS_UNIT_SUBPATH)
+        end
       end
     end
   end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase0
-    VERSION = '0.10.0'
+    VERSION = '0.10.1'
   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.66', '>= 0.66.1'
+  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.14'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.15'
   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/instances/base.rb

@@ -17,6 +17,11 @@ module Avm
           the_gem.bundle(*args).chdir_root.envvar('RAILS_ENV', DEFAULT_RAILS_ENVIRONMENT)
         end
 
+        # @return [Avm::Instances::Data::Package]
+        def data_package_create
+          super.add_unit('database', database_unit)
+        end
+
         def rake(*args)
           bundle('exec', 'rake', *args)
         end

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

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

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

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.66', '>= 0.66.1'
+  s.add_dependency 'avm', '~> 0.67'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.12'
-  s.add_dependency 'avm-eac_rails_base1', '~> 0.8', '>= 0.8.2'
+  s.add_dependency 'avm-eac_rails_base1', '~> 0.8', '>= 0.8.3'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.4', '>= 0.4.1'
   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/instances/base.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'addressable/uri'
-require 'avm/eac_redmine_base0/instances/data_package'
 require 'avm/eac_redmine_base0/instances/docker_image'
 require 'avm/eac_redmine_base0/instances/runners'
 require 'avm/eac_redmine_base0/instances/rest_api'
@@ -31,9 +30,11 @@ module Avm
           ]
         end
 
-        # @return [Avm::EacRedmineBase0::Instances::DataPackage]
-        def data_package
-          @data_package ||= ::Avm::EacRedmineBase0::Instances::DataPackage.new(self)
+        # @return [Avm::Instances::Data::Package]
+        def data_package_create
+          r = super.add_unit('files', files_data_unit).add_unit('gitolite', gitolite_data_unit)
+          r.after_load { instance.run_installer }
+          r
         end
 
         # @return [Addressable::URI]

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.19.0'
+    VERSION = '0.19.1'
   end
 end

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

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.66'
+  s.add_dependency 'avm', '~> 0.67'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.12'
-  s.add_dependency 'avm-eac_postgresql_base0', '~> 0.2', '>= 0.2.3'
+  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'

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/base.rb

@@ -4,7 +4,6 @@ require 'avm/instances/base'
 require 'avm/eac_postgresql_base0/instance_with'
 require 'avm/instances/data/files_unit'
 require 'avm/instances/data/package'
-require 'avm/eac_webapp_base0/instances/deploy/file_unit'
 require 'avm/eac_webapp_base0/instances/runners'
 require 'avm/eac_ubuntu_base0/instances/base'
 
@@ -16,8 +15,6 @@ module Avm
         include ::Avm::EacPostgresqlBase0::InstanceWith
         enable_simple_cache
 
-        FILES_UNITS = [].freeze
-
         def data_dump(argv = [])
           run_subcommand(data_dump_runner_class, argv)
         end
@@ -33,10 +30,14 @@ module Avm
           ).run
         end
 
+        # @return [Avm::Instances::Data::Package]
         def data_package
-          @data_package ||= ::Avm::Instances::Data::Package.new(
-            self, units: { database: database_unit }.merge(files_units)
-          )
+          @data_package ||= data_package_create
+        end
+
+        # @return [Avm::Instances::Data::Package]
+        def data_package_create
+          ::Avm::Instances::Data::Package.new(self)
         end
 
         def database_unit
@@ -49,12 +50,6 @@ module Avm
         def platform_instance_uncached
           ::Avm::EacUbuntuBase0::Instances::Base.by_id(id)
         end
-
-        def files_units
-          self.class.const_get('FILES_UNITS').transform_values do |fs_path_subpath|
-            ::Avm::Instances::Data::FilesUnit.new(self, fs_path_subpath)
-          end
-        end
       end
     end
   end