avm-eac_webapp_base0 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7f10bd706fb68eb2cda66ced6731a6bc34b4fe3bc4f1550ae5b69e9aa344144
-  data.tar.gz: 70acc90deb8b548d5f74ea20633b02a131031dfcabc6b38c7a2199a9d4b854a4
+  metadata.gz: a085657bc8ef0940c482244afb30cc55a1bb7b555e4430aa6e9cb616ef2396f5
+  data.tar.gz: 2eb529b6ba2076a305b12e17006ae46d57fb324cb0b79d113cffa5364801438c
 SHA512:
-  metadata.gz: fb2e07f9d84e3a905c470b1aa82b289706bb4d2a9f1e0e8021b65c104fcbf9066f0225caa8ec1c507f05b7859ba47970c5b825de92b5646e2b0e9b58d4b5c686
-  data.tar.gz: d4d36b61ae3cbed2920f765164a39b1634b3e0115b4b1c250d15b08360f3d07c3b6cd030f7db840d839173d1815b7f0c1c9070cf22c4a232a3862b6bf9ba1c02
+  metadata.gz: 9b6d0343699e993bc79a23500ae1afbe580ccc2bd7af8c710c9d87cfa8bd9ab6d4b63e45a0a7bfc23d5399e7a7dedfbdf1200d16be19c24531a2fcbf2063fc86
+  data.tar.gz: 586d6db038a7186194c45da92edd64027be181258af8b10bd177ab844f907515cf7c7df2b0ead19468af09e852f3316f80b1ec78e38f8e856eefb64e1c6d7070

data/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

data/lib/avm/eac_webapp_base0/instances/deploy/{file_unit.rb → setup_files_unit.rb}

@@ -4,7 +4,8 @@ module Avm
   module EacWebappBase0
     module Instances
       class Deploy
-        class FileUnit < ::SimpleDelegator
+        class SetupFilesUnit < ::SimpleDelegator
+          enable_method_class
           attr_reader :data_key, :fs_path_subpath
 
           def initialize(deploy, data_key, fs_path_subpath)
@@ -13,7 +14,7 @@ module Avm
             @fs_path_subpath = fs_path_subpath
           end
 
-          def run
+          def result
             assert_source_directory
             link_source_target
           end
@@ -34,9 +35,17 @@ module Avm
 
           def link_source_target
             infom "Linking \"#{data_key}\" directory..."
-            instance.host_env.command('rm', '-rf', target_path).execute!
+            return unless remove_target
+
             instance.host_env.command('ln', '-s', source_path, target_path).execute!
           end
+
+          private
+
+          # @return [Boolean]
+          def remove_target
+            instance.host_env.command('rm', '-rf', target_path).execute.fetch(:exit_code).zero?
+          end
         end
       end
     end

data/lib/avm/eac_webapp_base0/instances/deploy.rb

@@ -10,7 +10,7 @@ module Avm
   module EacWebappBase0
     module Instances
       class Deploy
-        require_sub __FILE__, include_modules: true
+        require_sub __FILE__, include_modules: true, require_dependency: true
 
         DEFAULT_REFERENCE = 'HEAD'
 
@@ -42,9 +42,8 @@ module Avm
         end
 
         def setup_files_units
-          instance.class.const_get('FILES_UNITS').each do |data_key, fs_path_subpath|
-            FileUnit.new(self, data_key, fs_path_subpath).run
-          end
+          instance.data_package.units.values.map(&:installation_files_data).select(&:present?)
+                  .each { |unit_install| setup_files_unit(unit_install.key, unit_install.subpath) }
         end
 
         def assert_instance_branch

data/lib/avm/eac_webapp_base0/instances/runners/data/load.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_support/core_ext/numeric/time'
+require 'avm/result'
 require 'eac_cli/speaker'
 require 'eac_ruby_utils/simple_cache'
 
@@ -17,7 +18,7 @@ module Avm
             end
 
             def run
-              return ::Dev::Result.error("Dump \"#{dump_path}\" does not exist") unless
+              return fatal_error("Dump \"#{dump_path}\" does not exist") unless
               ::File.exist?(dump_path)
 
               load_dump

data/lib/avm/eac_webapp_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWebappBase0
-    VERSION = '0.14.0'
+    VERSION = '0.15.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_webapp_base0
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-01 00:00:00.000000000 Z
+date: 2023-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.66'
+        version: '0.67'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.66'
+        version: '0.67'
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
@@ -47,7 +47,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
   name: avm-eac_ubuntu_base0
   requirement: !ruby/object:Gem::Requirement
@@ -143,8 +143,8 @@ files:
 - lib/avm/eac_webapp_base0/instances/deploy.rb
 - lib/avm/eac_webapp_base0/instances/deploy/appended_directories.rb
 - lib/avm/eac_webapp_base0/instances/deploy/build.rb
-- lib/avm/eac_webapp_base0/instances/deploy/file_unit.rb
 - lib/avm/eac_webapp_base0/instances/deploy/scm.rb
+- lib/avm/eac_webapp_base0/instances/deploy/setup_files_unit.rb
 - lib/avm/eac_webapp_base0/instances/deploy/version.rb
 - lib/avm/eac_webapp_base0/instances/deploy/write_on_target.rb
 - lib/avm/eac_webapp_base0/instances/runners.rb