eac_tools 0.24.1 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01ef491263c804f929167ab7067054cfd5341598cf5c7855915f187d8206727c
-  data.tar.gz: 6dfc25b5ee4e38978a80a50980cdbb15a992f6a7fd8a695d7298e481f176f839
+  metadata.gz: b50382fd923923ea176726318a5adeed1194cdc1aac56b3d70c2211a030d2e86
+  data.tar.gz: f35a6fe715fc7d265f046e3692201a8edbab95e16cc324942956ab31804bff0d
 SHA512:
-  metadata.gz: ddd276d51b2eccb1b53ef335d58000de09c32d2d8d86283a8a0723e1a9ea2edb854f6603f37ffdb0a4ec8df9ed23a073ec5a9fcdfc5c95d3f7966fcdd93f9eb8
-  data.tar.gz: c4b5df3fe0a896e24cbeabbb27aa573e6a814460cbadc1fb3941c6490a5e2f129c9c747135085dc064f7cfd6d201cd6e2cbc4fcf246cd304bc64d282b59708cd
+  metadata.gz: 8495da6e5565b3b03901d8c11a4f5bfe1d08fbe02cfafed82d59c4d33c69e92a43f8042e78e29ac32416eeed25250ab46088e9ca21193e0a912db82c2987c3ef
+  data.tar.gz: 81f4b76062b762acd52c63f9b4ec03bbb8e7d599032d7235ea24f2f291001664c3674fbb4db74d0e8f31783e36760f7a59427e1893d38ad087eaa34b24d87b29

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.24.1)
-      avm (~> 0.38)
+    eac_tools (0.25.0)
+      avm (~> 0.39)
       avm-eac_asciidoctor_base0 (~> 0.5)
       avm-eac_generic_base0 (~> 0.5)
       avm-eac_latex_base0 (~> 0.1, >= 0.1.2)
@@ -11,10 +11,10 @@ PATH
       avm-eac_redmine_base0 (~> 0.12)
       avm-eac_redmine_plugin_base0 (~> 0.3)
       avm-eac_ruby_base1 (~> 0.19, >= 0.19.1)
-      avm-eac_webapp_base0 (~> 0.4)
+      avm-eac_webapp_base0 (~> 0.4, >= 0.4.1)
       avm-eac_wordpress_base0 (~> 0.1, >= 0.1.2)
       avm-tools (~> 0.133)
-      eac_ruby_utils (~> 0.100)
+      eac_ruby_utils (~> 0.101)
 
 PATH
   remote: sub/avm-eac_asciidoctor_base0
@@ -88,12 +88,12 @@ PATH
 PATH
   remote: sub/avm-eac_webapp_base0
   specs:
-    avm-eac_webapp_base0 (0.4.0)
-      avm (~> 0.35, >= 0.35.1)
+    avm-eac_webapp_base0 (0.4.1)
+      avm (~> 0.39)
       avm-eac_generic_base0 (~> 0.5)
       avm-eac_postgresql_base0 (~> 0.2)
       avm-eac_ubuntu_base0 (~> 0.3)
-      eac_ruby_utils (~> 0.98)
+      eac_ruby_utils (~> 0.101)
 
 PATH
   remote: sub/avm-eac_wordpress_base0
@@ -124,12 +124,12 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.38.0)
+    avm (0.39.0)
       eac_cli (~> 0.27, >= 0.27.8)
       eac_config (~> 0.11)
       eac_docker (~> 0.4, >= 0.4.2)
       eac_git (~> 0.12, >= 0.12.2)
-      eac_ruby_utils (~> 0.100)
+      eac_ruby_utils (~> 0.101)
       eac_templates (~> 0.3, >= 0.3.1)
       filesize (~> 0.2)
       htmlbeautifier (~> 1.4, >= 1.4.2)
@@ -177,7 +177,7 @@ PATH
 PATH
   remote: sub/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.100.0)
+    eac_ruby_utils (0.101.0)
       activesupport (>= 4, < 7)
       addressable (~> 2.6)
       bundler

data/lib/eac_tools/version.rb

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

data/sub/avm/avm.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'eac_config', '~> 0.11'
   s.add_dependency 'eac_docker', '~> 0.4', '>= 0.4.2'
   s.add_dependency 'eac_git', '~> 0.12', '>= 0.12.2'
-  s.add_dependency 'eac_ruby_utils', '~> 0.100'
+  s.add_dependency 'eac_ruby_utils', '~> 0.101'
   s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.1'
   s.add_dependency 'filesize', '~> 0.2'
   s.add_dependency 'htmlbeautifier', '~> 1.4', '>= 1.4.2'

data/sub/avm/lib/avm/entries/base/inherited_entry_value.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'avm/entries/uri_builder'
+require 'eac_config/entry_path'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Base
+      class InheritedEntryValue
+        enable_method_class
+        common_constructor :entries_provider, :source_entry_suffix, :target_entry_suffix, :block,
+                           block_arg: true
+
+        def result
+          self_entry_value.if_present do |instance_id|
+            other_entry_value(instance_id).if_present(&block)
+          end
+        end
+
+        def other_entry_value(instance_id)
+          ::Avm::Instances::Base.by_id(instance_id).read_entry_optional(target_entry_suffix)
+        end
+
+        def self_entry_value
+          entries_provider.read_entry_optional(source_entry_suffix)
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/entries/base/uri_component_entry_value.rb

@@ -9,17 +9,31 @@ module Avm
     module Base
       class UriComponentEntryValue
         enable_method_class
-        common_constructor :entries_provider, :component_entry_path do
+
+        enable_listable
+        lists.add_symbol :option, :default_value, :inherited_value_block
+
+        common_constructor :entries_provider, :component_entry_path, :options, default: [{}] do
           self.component_entry_path = ::EacConfig::EntryPath.assert(component_entry_path)
+          self.options = self.class.lists.option.hash_keys_validate!(options)
+        end
+
+        def default_value
+          options[OPTION_DEFAULT_VALUE].call_if_proc
         end
 
         def inherited_result
           entries_provider.inherited_entry_value(
             id_entry_path.to_string,
-            component_entry_path.to_string
+            component_entry_path.to_string,
+            &inherited_value_block
           )
         end
 
+        def inherited_value_block
+          options[OPTION_INHERITED_VALUE_BLOCK]
+        end
+
         # @return [EacConfig::EntryPath]
         def id_entry_path
           root_entry_path + %w[id]
@@ -27,12 +41,7 @@ module Avm
 
         # @return [String, nil]
         def result
-          if url_entry.context_found?
-            return ::Avm::Entries::UriBuilder.from_source(url_entry.value.to_uri)
-                     .avm_field_get(component)
-          end
-
-          inherited_result
+          url_entry_value || inherited_result || default_value
         end
 
         # @return [EacConfig::EntryPath]
@@ -45,6 +54,13 @@ module Avm
           entries_provider.entry((root_entry_path + %w[url]).to_string)
         end
 
+        def url_entry_value
+          return unless url_entry.context_found?
+
+          ::Avm::Entries::UriBuilder.from_source(url_entry.value.to_uri)
+            .avm_field_get(component)
+        end
+
         # @return [String]
         def component
           component_entry_path.last

data/sub/avm/lib/avm/entries/base.rb

@@ -34,16 +34,6 @@ module Avm
         end
         (path_prefix + entry_suffix).join('.')
       end
-
-      def inherited_entry_value(source_entry_suffix, target_entry_suffix, &block)
-        read_entry_optional(source_entry_suffix).if_present do |instance_id|
-          other_entry_value(instance_id, target_entry_suffix).if_present(&block)
-        end
-      end
-
-      def other_entry_value(instance_id, entry_suffix)
-        ::Avm::Instances::Base.by_id(instance_id).read_entry_optional(entry_suffix)
-      end
     end
   end
 end

data/sub/avm/lib/avm/instances/base/auto_values/filesystem.rb

@@ -12,11 +12,6 @@ module Avm
                                   ::Avm::Instances::EntryKeys::FS_PATH) { |v| v + '/' + id }
           end
 
-          def auto_data_fs_path
-            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
-                                  ::Avm::Instances::EntryKeys::DATA_FS_PATH) { |v| v + '/' + id }
-          end
-
           def auto_fs_url
             auto_fs_url_with_install || auto_fs_url_without_install
           end

data/sub/avm/lib/avm/instances/base/auto_values/install.rb

@@ -8,15 +8,28 @@ module Avm
     class Base
       module AutoValues
         module Install
+          def auto_install_data_path
+            uri_component_entry_value(
+              ::Avm::Instances::EntryKeys::INSTALL_DATA_PATH,
+              inherited_value_block: ->(v) { v + '/' + id }
+            )
+          end
+
           def auto_install_groupname
-            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
-                                  ::Avm::Instances::EntryKeys::INSTALL_GROUPNAME) ||
-              read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_USERNAME)
+            uri_component_entry_value(
+              ::Avm::Instances::EntryKeys::INSTALL_GROUPNAME,
+              default_value: lambda do
+                read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_USERNAME)
+              end
+            )
           end
 
           ::Avm::Entries::UriBuilder::ENTRIES_FIELDS.each do |component|
-            define_method "auto_install_#{component}" do
-              uri_component_entry_value("install.#{component}")
+            method_suffix = "install_#{component}"
+            define_method "auto_#{method_suffix}" do
+              uri_component_entry_value(
+                ::Avm::Instances::EntryKeys.const_get(method_suffix.underscore.upcase)
+              )
             end
           end
 

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

@@ -45,12 +45,12 @@ module Avm
       end
 
       {
-        '' => %w[data_fs_path fs_path name source_instance_id],
+        '' => %w[fs_path name source_instance_id],
         admin: URI_FIELDS + %w[api_key],
         database: URI_FIELDS + %w[id limit name system timeout extra],
         docker: %w[registry],
         fs: %w[url],
-        install: URI_FIELDS + %w[id groupname],
+        install: URI_FIELDS + %w[id data_path groupname],
         mailer: {
           '' => %w[id from reply_to],
           smtp: URI_FIELDS + %w[address domain authentication openssl_verify_mode starttls_auto tls]

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

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

data/sub/avm/spec/lib/avm/instances/base_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe ::Avm::Instances::Base do
     {
       'app_0' => {
         fs_path: '/fs_root/app_0',
-        data_fs_path: '/data_fs_root/app_0',
+        ::Avm::Instances::EntryKeys::INSTALL_DATA_PATH => '/data_fs_root/app_0',
         ::Avm::Instances::EntryKeys::DATABASE_NAME => 'app_0',
         ::Avm::Instances::EntryKeys::DATABASE_USERNAME => 'user1',
         ::Avm::Instances::EntryKeys::DATABASE_PASSWORD => 'pass1',

data/sub/avm/spec/lib/avm/instances/base_spec_configs_storage.yml

@@ -4,9 +4,9 @@ app_0:
     id: app_1
 app_1:
   fs_path: /fs_root
-  data_fs_path: /data_fs_root
   install:
     id: app_2
+    data_path: /data_fs_root
   database:
     name: app_1_db
     username: user1

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

@@ -12,11 +12,11 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.35', '>= 0.35.1'
+  s.add_dependency 'avm', '~> 0.39'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.5'
   s.add_dependency 'avm-eac_postgresql_base0', '~> 0.2'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
-  s.add_dependency 'eac_ruby_utils', '~> 0.98'
+  s.add_dependency 'eac_ruby_utils', '~> 0.101'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/deploy/file_unit.rb

@@ -23,7 +23,7 @@ module Avm
         end
 
         def source_path
-          ::File.join(instance.read_entry(:data_fs_path), data_key.to_s)
+          ::File.join(instance.install_data_path, data_key.to_s)
         end
 
         def target_path

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWebappBase0
-    VERSION = '0.4.0'
+    VERSION = '0.4.1'
   end
 end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/common_constructor/class_accessors.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/common_constructor/instance_initialize'
+require 'eac_ruby_utils/common_constructor/super_args'
+
+module EacRubyUtils
+  class CommonConstructor
+    class ClassAccessors
+      attr_reader :common_constructor, :klass
+
+      def initialize(common_constructor, klass)
+        @common_constructor = common_constructor
+        @klass = klass
+      end
+
+      def args
+        common_constructor.all_args
+      end
+
+      def perform
+        setup_class_attr_readers
+        setup_class_attr_writers
+      end
+
+      def setup_class_attr_readers
+        klass.send(:attr_reader, *args)
+        klass.send(:public, *args) if args.any?
+      end
+
+      def setup_class_attr_writers
+        klass.send(:attr_writer, *args)
+        klass.send(:private, *args.map { |a| "#{a}=" }) if args.any?
+      end
+    end
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/common_constructor/class_initialize.rb

@@ -13,17 +13,27 @@ module EacRubyUtils
         @klass = klass
       end
 
-      def run
+      def define_initialize_callbacks
+        klass.include(::ActiveSupport::Callbacks)
+        klass.define_callbacks :initialize
+      end
+
+      def define_initialize_method
         class_initialize = self
-        klass.send(:define_method, :initialize) do |*args|
+        klass.send(:define_method, :initialize) do |*args, &block|
           ::EacRubyUtils::CommonConstructor::InstanceInitialize.new(
-            class_initialize.common_constructor, args, self
-          ).run
+            class_initialize.common_constructor, args, self, block
+          ).perform
           super(*::EacRubyUtils::CommonConstructor::SuperArgs.new(
             class_initialize, args, self
           ).result)
         end
       end
+
+      def perform
+        define_initialize_callbacks
+        define_initialize_method
+      end
     end
   end
 end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/common_constructor/instance_initialize.rb

@@ -3,18 +3,20 @@
 module EacRubyUtils
   class CommonConstructor
     class InstanceInitialize
-      attr_reader :common_constructor, :args, :object
+      attr_reader :common_constructor, :args, :object, :block
 
-      def initialize(common_constructor, args, object)
+      def initialize(common_constructor, args, object, block)
         @common_constructor = common_constructor
         @args = args
         @object = object
+        @block = block
       end
 
-      def run
+      def perform
         validate_args_count
         object.run_callbacks :initialize do
           object_attributes_set
+          object_block_set
           object_after_callback
         end
       end
@@ -36,12 +38,21 @@ module EacRubyUtils
         object.instance_eval(&common_constructor.after_set_block)
       end
 
+      def object_attribute_set(attr_name, attr_value)
+        object.send("#{attr_name}=", attr_value)
+      end
+
       def object_attributes_set
         common_constructor.args.each do |arg_name|
-          object.send("#{arg_name}=", arg_value(arg_name))
+          object_attribute_set(arg_name, arg_value(arg_name))
         end
       end
 
+      def object_block_set
+        block_arg = common_constructor.block_arg
+        object_attribute_set(block_arg, block) if block_arg
+      end
+
       def validate_args_count
         return if common_constructor.args_count.include?(args.count)
 

data/sub/eac_ruby_utils/lib/eac_ruby_utils/common_constructor.rb

@@ -2,12 +2,13 @@
 
 require 'active_support/callbacks'
 require 'eac_ruby_utils/arguments_consumer'
+require 'eac_ruby_utils/common_constructor/class_accessors'
 require 'eac_ruby_utils/common_constructor/class_initialize'
 require 'ostruct'
 
 module EacRubyUtils
   class CommonConstructor
-    attr_reader :args, :options, :after_set_block
+    attr_reader :all_args, :options, :after_set_block
 
     class << self
       def parse_args_options(args)
@@ -37,11 +38,15 @@ module EacRubyUtils
 
     def initialize(*args, &after_set_block)
       args_processed = self.class.parse_args_options(args)
-      @args = args_processed.args
+      @all_args = args_processed.args
       @options = args_processed.options
       @after_set_block = after_set_block
     end
 
+    def args
+      block_arg? ? all_args[0..-2] : all_args
+    end
+
     def args_count
       (args_count_min..args_count_max)
     end
@@ -54,32 +59,32 @@ module EacRubyUtils
       args.count
     end
 
+    def block_arg
+      block_arg? ? all_args.last : nil
+    end
+
+    def block_arg?
+      options[:block_arg] || false
+    end
+
     def default_values
       options[:default] || []
     end
 
     def setup_class(klass)
-      setup_class_attr_readers(klass)
-      setup_class_attr_writers(klass)
+      setup_class_accessors(klass)
+
       setup_class_initialize(klass)
 
       klass
     end
 
-    def setup_class_attr_readers(klass)
-      klass.send(:attr_reader, *args)
-      klass.send(:public, *args) if args.any?
-    end
-
-    def setup_class_attr_writers(klass)
-      klass.send(:attr_writer, *args)
-      klass.send(:private, *args.map { |a| "#{a}=" }) if args.any?
+    def setup_class_accessors(klass)
+      ::EacRubyUtils::CommonConstructor::ClassAccessors.new(self, klass).perform
     end
 
     def setup_class_initialize(klass)
-      klass.include(::ActiveSupport::Callbacks)
-      klass.define_callbacks :initialize
-      ::EacRubyUtils::CommonConstructor::ClassInitialize.new(self, klass).run
+      ::EacRubyUtils::CommonConstructor::ClassInitialize.new(self, klass).perform
     end
 
     def super_args

data/sub/eac_ruby_utils/lib/eac_ruby_utils/version.rb

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

data/sub/eac_ruby_utils/spec/lib/eac_ruby_utils/common_constructor_spec.rb

@@ -93,6 +93,32 @@ RSpec.describe ::EacRubyUtils::CommonConstructor do
     end
   end
 
+  context 'with block argument' do
+    let(:instance) do
+      described_class.new(:first, :second, :last, block_arg: true, default: ['second'])
+    end
+
+    let(:block) do
+      ::Proc.new { first + second }
+    end
+
+    let(:a_class) do
+      ::Class.new do
+        def result
+          last.run
+        end
+      end
+    end
+
+    let(:a_class_instance) { a_class.new('first') { 'last' } }
+
+    it { expect(a_class_instance.last).to be_a(::Proc) }
+    it { expect(a_class_instance.last.call).to eq('last') }
+
+    it { expect(a_class_instance.first).to eq('first') }
+    it { expect(a_class_instance.second).to eq('second') }
+  end
+
   context 'with class hierarchy mixed with and without common_constructor' do
     let(:klass_0) do
       described_class.new(:a_param).setup_class(::Class.new)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.24.1
+  version: 0.25.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-16 00:00:00.000000000 Z
+date: 2022-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.38'
+        version: '0.39'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.38'
+        version: '0.39'
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -155,6 +155,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -162,6 +165,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_wordpress_base0
   requirement: !ruby/object:Gem::Requirement
@@ -202,14 +208,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.100'
+        version: '0.101'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.100'
+        version: '0.101'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -772,6 +778,7 @@ files:
 - sub/avm/lib/avm/entries/auto_values/entry.rb
 - sub/avm/lib/avm/entries/auto_values/uri_entry.rb
 - sub/avm/lib/avm/entries/base.rb
+- sub/avm/lib/avm/entries/base/inherited_entry_value.rb
 - sub/avm/lib/avm/entries/base/uri_component_entry_value.rb
 - sub/avm/lib/avm/entries/entry.rb
 - sub/avm/lib/avm/entries/uri_builder.rb
@@ -1053,6 +1060,7 @@ files:
 - sub/eac_ruby_utils/lib/eac_ruby_utils/common_concern/class_setup.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/common_concern/module_setup.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/common_constructor.rb
+- sub/eac_ruby_utils/lib/eac_ruby_utils/common_constructor/class_accessors.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/common_constructor/class_initialize.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/common_constructor/instance_initialize.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/common_constructor/super_args.rb