eac_tools 0.59.0 → 0.60.1

data/sub/avm-eac_webapp_base0/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/sub/avm-eac_webapp_base0/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/sub/avm-eac_webapp_base0/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/sub/avm-eac_webapp_base0/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

data/sub/avm-eac_wordpress_base0/avm-eac_wordpress_base0.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.57'
-  s.add_dependency 'avm-eac_webapp_base0', '~> 0.13'
-  s.add_dependency 'eac_ruby_utils', '~> 0.109'
+  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_wordpress_base0/lib/avm/eac_wordpress_base0/instances/base.rb

@@ -7,7 +7,15 @@ module Avm
   module EacWordpressBase0
     module Instances
       class Base < ::Avm::EacWebappBase0::Instances::Base
-        FILES_UNITS = { uploads: 'wp-content/uploads', themes: 'wp-content/themes' }.freeze
+        THEMES_UNIT_SUBPATH = 'wp-content/themes'
+        UPLOADS_UNIT_SUBPATH = 'wp-content/uploads'
+
+        # @return [Avm::Instances::Data::Package]
+        def data_package_create
+          %w[database themes uploads].inject(super) do |a, e|
+            a.add_unit(e, send("#{e}_unit"))
+          end
+        end
 
         def database_unit
           web_url = read_entry(::Avm::Instances::EntryKeys::WEB_URL)
@@ -20,6 +28,16 @@ module Avm
             SQL
           end
         end
+
+        # @return [Avm::Instances::Data::FilesUnit]
+        def themes_unit
+          ::Avm::Instances::Data::FilesUnit.new(self, THEMES_UNIT_SUBPATH)
+        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_wordpress_base0/lib/avm/eac_wordpress_base0/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.59.0
+  version: 0.60.1
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-05 00:00:00.000000000 Z
+date: 2023-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,34 +16,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.66'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.66.1
+        version: '0.67'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.66'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.66.1
+        version: '0.67'
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0.18'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0.18'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.18.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
@@ -65,6 +65,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -72,6 +75,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_php_base0
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +87,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,7 +97,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: avm-eac_postgresql_base0
   requirement: !ruby/object:Gem::Requirement
@@ -101,7 +107,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
@@ -111,7 +117,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
   name: avm-eac_python_base0
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +145,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -146,6 +155,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_rails_base1
   requirement: !ruby/object:Gem::Requirement
@@ -155,7 +167,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -165,7 +177,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: avm-eac_redmine_base0
   requirement: !ruby/object:Gem::Requirement
@@ -173,6 +185,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -180,6 +195,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_redmine_plugin_base0
   requirement: !ruby/object:Gem::Requirement
@@ -220,14 +238,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: avm-eac_wordpress_base0
   requirement: !ruby/object:Gem::Requirement
@@ -235,6 +253,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -242,6 +263,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: avm-git
   requirement: !ruby/object:Gem::Requirement
@@ -355,6 +379,13 @@ files:
 - sub/aranha-parsers/spec/lib/aranha/parsers/rspec/shared_examples/source_target_fixtures_spec.rb
 - sub/aranha-parsers/spec/lib/aranha/parsers/rspec/shared_examples/source_target_fixtures_spec_files/fixture1.source.txt
 - sub/aranha-parsers/spec/lib/aranha/parsers/rspec/shared_examples/source_target_fixtures_spec_files/fixture1.target.yaml
+- sub/aranha-parsers/spec/lib/aranha/parsers/source_address/detect_sub_spec.rb
+- sub/aranha-parsers/spec/lib/aranha/parsers/source_address/detect_sub_spec_files/hash_http_get.source.yml
+- sub/aranha-parsers/spec/lib/aranha/parsers/source_address/detect_sub_spec_files/hash_http_get.target.yaml
+- sub/aranha-parsers/spec/lib/aranha/parsers/source_address/detect_sub_spec_files/hash_http_post.source.yml
+- sub/aranha-parsers/spec/lib/aranha/parsers/source_address/detect_sub_spec_files/hash_http_post.target.yaml
+- sub/aranha-parsers/spec/lib/aranha/parsers/source_address/detect_sub_spec_files/http_get.source.yml
+- sub/aranha-parsers/spec/lib/aranha/parsers/source_address/detect_sub_spec_files/http_get.target.yaml
 - sub/aranha-parsers/spec/lib/aranha/parsers/source_address/http_get_spec.rb
 - sub/aranha-parsers/spec/lib/aranha/parsers/source_address_spec.rb
 - sub/aranha-parsers/spec/lib/aranha/parsers/source_target_fixtures_spec.rb
@@ -375,6 +406,7 @@ files:
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/base.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build/document.rb
+- sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build/document/breadcrumbs_macro_value.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build/document/child_docs_macro_value.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build/document/header_lines.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build/document/media.rb
@@ -419,6 +451,7 @@ files:
 - sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/sources/base_spec.rb
 - sub/avm-eac_asciidoctor_base0/spec/rubocop_spec.rb
 - sub/avm-eac_asciidoctor_base0/spec/spec_helper.rb
+- sub/avm-eac_asciidoctor_base0/spec/spec_helper/eac_asciidoctor_base0_stubs.rb
 - sub/avm-eac_asciidoctor_base0/template/avm/eac_asciidoctor_base0/source_generators/base/content/body.adoc
 - sub/avm-eac_asciidoctor_base0/template/avm/eac_asciidoctor_base0/source_generators/base/content/title
 - sub/avm-eac_asciidoctor_base0/template/avm/eac_asciidoctor_base0/source_generators/base/theme/main.css
@@ -614,7 +647,6 @@ files:
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base/install.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base/nodejs.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base/web.rb
-- sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/data_package.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/deploy.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/docker_image.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/rest_api.rb
@@ -835,8 +867,8 @@ files:
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy/appended_directories.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy/build.rb
-- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy/file_unit.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy/scm.rb
+- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy/setup_files_unit.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy/version.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy/write_on_target.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners.rb
@@ -1088,6 +1120,7 @@ files:
 - sub/avm/lib/avm/applications/base/stereotype.rb
 - sub/avm/lib/avm/data/callbacks.rb
 - sub/avm/lib/avm/data/package.rb
+- sub/avm/lib/avm/data/package/build_directory.rb
 - sub/avm/lib/avm/data/package/dump.rb
 - sub/avm/lib/avm/data/package/load.rb
 - sub/avm/lib/avm/data/rotate.rb

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/data_package.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/instances/data/package'
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module EacRedmineBase0
-    module Instances
-      class DataPackage < ::Avm::Instances::Data::Package
-        after_load :run_installer
-
-        def initialize(instance, options = {})
-          super(instance, options.merge(units: options[:units].if_present({}).merge(
-            database: instance.database_unit, files: instance.files_data_unit,
-            gitolite: instance.gitolite_data_unit
-          )))
-        end
-
-        delegate :run_installer, to: :instance
-      end
-    end
-  end
-end