eac_tools 0.31.0 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ca7fa87db2c97ecf60dc93100760491b936f91d3d979a38953bbf2f1c9c964a
-  data.tar.gz: ce07adf422abd3a143defcd747de05d527a605934dce9300bf8cf48b46195dc8
+  metadata.gz: 81dc6bdf661e34dc3a4136b707733bea7f9528829dc30e9b918a656c156db423
+  data.tar.gz: 87651ba1f7ea344fc8d53e29f7360e65a391b4acf0c4f77456104bfbd6a6af43
 SHA512:
-  metadata.gz: 813cd67c73235bd826df76db57fc0711fd4a176a2ac601111cd3f5359a68d6c05ceeff179c4311f2ec51d5f8d4b79ce6e6413242e93b44a07507e9f87407f726
-  data.tar.gz: 2e8042ef0bf14c1bc656f9735f978364ad51bf18c0330b0edd73f88ff75f078f37e48d39aeb9a498d72aee87af8e1662aefee29ba98db930a33b37041860b9ee
+  metadata.gz: 39579d9d45e8a0b0064553aec347e5d0915c8bdf9e14037af7ea5f29c3bb8f4d5622a16405095906db82e0691c1d5ca33a5a3808b5f6acfdb478775961a04003
+  data.tar.gz: f0b3749dcf1ebc71f2a15bb04a2a2bbbf1785655b9ce7a0cb2331ddd3d44dc9a389247e963595e0899a75fc0bd5505743e5954890ec3df0800638b193873ee78

data/Gemfile.lock

@@ -1,28 +1,28 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.31.0)
-      avm (~> 0.43)
-      avm-eac_asciidoctor_base0 (~> 0.7)
+    eac_tools (0.32.0)
+      avm (~> 0.45)
+      avm-eac_asciidoctor_base0 (~> 0.7, >= 0.7.1)
       avm-eac_generic_base0 (~> 0.5)
-      avm-eac_latex_base0 (~> 0.2)
-      avm-eac_rails_base0 (~> 0.8)
-      avm-eac_rails_base1 (~> 0.6)
-      avm-eac_redmine_base0 (~> 0.15)
+      avm-eac_latex_base0 (~> 0.2, >= 0.2.1)
+      avm-eac_rails_base0 (~> 0.8, >= 0.8.1)
+      avm-eac_rails_base1 (~> 0.7)
+      avm-eac_redmine_base0 (~> 0.16)
       avm-eac_redmine_plugin_base0 (~> 0.3)
       avm-eac_ruby_base1 (~> 0.21)
-      avm-eac_webapp_base0 (~> 0.8)
-      avm-eac_wordpress_base0 (~> 0.2)
-      avm-tools (~> 0.136, >= 0.136.1)
-      eac_ruby_utils (~> 0.103)
+      avm-eac_webapp_base0 (~> 0.9)
+      avm-eac_wordpress_base0 (~> 0.2, >= 0.2.1)
+      avm-tools (~> 0.136, >= 0.136.2)
+      eac_ruby_utils (~> 0.104)
 
 PATH
   remote: sub/avm-eac_asciidoctor_base0
   specs:
-    avm-eac_asciidoctor_base0 (0.7.0)
+    avm-eac_asciidoctor_base0 (0.7.1)
       asciidoctor (~> 2.0, >= 2.0.17)
-      avm-eac_webapp_base0 (~> 0.7)
-      eac_ruby_utils (~> 0.102, >= 0.102.1)
+      avm-eac_webapp_base0 (~> 0.9)
+      eac_ruby_utils (~> 0.104)
       os (~> 1.1, >= 1.1.4)
       rouge (~> 3.30)
 
@@ -36,39 +36,39 @@ PATH
 PATH
   remote: sub/avm-eac_latex_base0
   specs:
-    avm-eac_latex_base0 (0.2.0)
-      avm (~> 0.41)
-      avm-eac_webapp_base0 (~> 0.5, >= 0.5.1)
-      eac_ruby_utils (~> 0.102)
+    avm-eac_latex_base0 (0.2.1)
+      avm (~> 0.45)
+      avm-eac_webapp_base0 (~> 0.9)
+      eac_ruby_utils (~> 0.104)
 
 PATH
   remote: sub/avm-eac_rails_base0
   specs:
-    avm-eac_rails_base0 (0.8.0)
-      avm-eac_rails_base1 (~> 0.6)
-      eac_ruby_utils (~> 0.102)
+    avm-eac_rails_base0 (0.8.1)
+      avm-eac_rails_base1 (~> 0.7)
+      eac_ruby_utils (~> 0.104)
 
 PATH
   remote: sub/avm-eac_rails_base1
   specs:
-    avm-eac_rails_base1 (0.6.0)
-      avm (~> 0.41)
-      avm-eac_ruby_base1 (~> 0.20)
-      avm-eac_webapp_base0 (~> 0.6)
-      eac_ruby_utils (~> 0.102)
+    avm-eac_rails_base1 (0.7.0)
+      avm (~> 0.45)
+      avm-eac_ruby_base1 (~> 0.21)
+      avm-eac_webapp_base0 (~> 0.9)
+      eac_ruby_utils (~> 0.104)
 
 PATH
   remote: sub/avm-eac_redmine_base0
   specs:
-    avm-eac_redmine_base0 (0.15.0)
-      avm (~> 0.43)
+    avm-eac_redmine_base0 (0.16.0)
+      avm (~> 0.44)
       avm-eac_generic_base0 (~> 0.5)
       avm-eac_rails_base1 (~> 0.6)
       avm-eac_ubuntu_base0 (~> 0.3)
       curb (~> 0.9, >= 0.9.11)
       eac_fs (~> 0.12, >= 0.12.3)
       eac_rest (~> 0.6, >= 0.6.1)
-      eac_ruby_utils (~> 0.103)
+      eac_ruby_utils (~> 0.104)
 
 PATH
   remote: sub/avm-eac_redmine_plugin_base0
@@ -88,20 +88,20 @@ PATH
 PATH
   remote: sub/avm-eac_webapp_base0
   specs:
-    avm-eac_webapp_base0 (0.8.0)
-      avm (~> 0.42)
+    avm-eac_webapp_base0 (0.9.0)
+      avm (~> 0.45)
       avm-eac_generic_base0 (~> 0.5)
       avm-eac_postgresql_base0 (~> 0.2)
       avm-eac_ubuntu_base0 (~> 0.3)
-      eac_ruby_utils (~> 0.103)
+      eac_ruby_utils (~> 0.104)
 
 PATH
   remote: sub/avm-eac_wordpress_base0
   specs:
-    avm-eac_wordpress_base0 (0.2.0)
-      avm (~> 0.41)
-      avm-eac_webapp_base0 (~> 0.6)
-      eac_ruby_utils (~> 0.102)
+    avm-eac_wordpress_base0 (0.2.1)
+      avm (~> 0.45)
+      avm-eac_webapp_base0 (~> 0.9)
+      eac_ruby_utils (~> 0.104)
 
 PATH
   remote: sub/avm-files
@@ -116,12 +116,12 @@ PATH
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.136.1)
+    avm-tools (0.136.2)
       aranha-parsers (~> 0.14, >= 0.14.3)
-      avm (~> 0.42)
+      avm (~> 0.44)
       avm-eac_ruby_base1 (~> 0.21)
       avm-eac_ubuntu_base0 (~> 0.3)
-      avm-files (~> 0.4)
+      avm-files (~> 0.4, >= 0.4.1)
       avm-git (~> 0.4)
       clipboard (~> 1.3, >= 1.3.6)
       curb (~> 0.9, >= 0.9.11)
@@ -134,13 +134,13 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.43.0)
-      eac_cli (~> 0.27, >= 0.27.8)
+    avm (0.45.0)
+      eac_cli (~> 0.28)
       eac_config (~> 0.11, >= 0.11.1)
       eac_docker (~> 0.4, >= 0.4.2)
-      eac_git (~> 0.12, >= 0.12.2)
-      eac_ruby_utils (~> 0.103)
-      eac_templates (~> 0.3, >= 0.3.1)
+      eac_git (~> 0.12, >= 0.12.3)
+      eac_ruby_utils (~> 0.104)
+      eac_templates (~> 0.3, >= 0.3.2)
       filesize (~> 0.2)
       htmlbeautifier (~> 1.4, >= 1.4.2)
       minitar (~> 0.9)
@@ -175,6 +175,13 @@ PATH
       eac_ruby_utils (~> 0.70)
       ruby-filemagic
 
+PATH
+  remote: sub/eac_git
+  specs:
+    eac_git (0.12.3)
+      eac_ruby_utils (~> 0.103)
+      parseconfig (~> 1.1, >= 1.1.2)
+
 PATH
   remote: sub/eac_ruby_base0
   specs:
@@ -187,9 +194,9 @@ PATH
 PATH
   remote: sub/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.103.0)
+    eac_ruby_utils (0.104.0)
       activesupport (>= 4, < 7)
-      addressable (~> 2.8)
+      addressable (~> 2.8, >= 2.8.1)
       bundler
       filesize (~> 0.2)
       net-ssh (~> 4.2)
@@ -234,9 +241,6 @@ GEM
       parslet (~> 2.0)
     curb (0.9.11)
     diff-lcs (1.5.0)
-    eac_git (0.12.2)
-      eac_ruby_utils (~> 0.83)
-      parseconfig (~> 1.0, >= 1.0.8)
     eac_rest (0.6.1)
       eac_ruby_utils (~> 0.70)
     eac_ruby_gem_support (0.5.1)
@@ -362,6 +366,7 @@ DEPENDENCIES
   eac_config!
   eac_docker!
   eac_fs!
+  eac_git!
   eac_ruby_base0!
   eac_ruby_gem_support (~> 0.5.1)
   eac_ruby_utils!

data/lib/eac_tools/version.rb

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

data/sub/avm/avm.gemspec

@@ -12,12 +12,12 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'eac_cli', '~> 0.27', '>= 0.27.8'
+  s.add_dependency 'eac_cli', '~> 0.28'
   s.add_dependency 'eac_config', '~> 0.11', '>= 0.11.1'
   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.103'
-  s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.1'
+  s.add_dependency 'eac_git', '~> 0.12', '>= 0.12.3'
+  s.add_dependency 'eac_ruby_utils', '~> 0.104'
+  s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.2'
   s.add_dependency 'filesize', '~> 0.2'
   s.add_dependency 'htmlbeautifier', '~> 1.4', '>= 1.4.2'
   s.add_dependency 'minitar', '~> 0.9'

data/sub/avm/lib/avm/entries/auto_values/entry.rb

@@ -8,15 +8,22 @@ module Avm
     module AutoValues
       class Entry
         class << self
-          def auto_value_method_name(suffix)
-            "auto_#{suffix.to_s.gsub('.', '_')}"
+          # @param path [EacConfig::EntryPath]
+          # @return String
+          def auto_value_method_name(path)
+            "auto_#{::EacConfig::EntryPath.assert(path).to_string.gsub('.', '_')}"
           end
         end
 
-        common_constructor :entries_provider, :suffix
+        # @!method initialize(entries_provider, path)
+        #   @param entries_provider
+        #   @param path [EacConfig::EntryPath]
+        common_constructor :entries_provider, :path do
+          self.path = ::EacConfig::EntryPath.assert(path)
+        end
 
         def auto_value_method
-          self.class.auto_value_method_name(suffix)
+          self.class.auto_value_method_name(path)
         end
 
         def found?

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

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Base
+      class UriComponentsEntriesValues
+        class ComponentFactory
+          enable_method_class
+          common_constructor :owner, :component
+
+          def result
+            component_class.new(owner, component)
+          end
+
+          def component_class
+            specific_class || generic_class
+          end
+
+          def generic_class
+            parent_class.const_get('GenericComponent')
+          end
+
+          def parent_class
+            ::Avm::Entries::Base::UriComponentsEntriesValues
+          end
+
+          def specific_class
+            return nil unless parent_class.const_defined?(specific_class_basename)
+
+            parent_class.const_get(specific_class_basename)
+          end
+
+          def specific_class_basename
+            [component, 'component'].join('_').camelize
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'avm/entries/uri_builder'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Base
+      class UriComponentsEntriesValues
+        class GenericComponent
+          common_constructor :owner, :component
+          delegate :entries_provider_class, :prefix, to: :owner
+
+          def auto_method_name
+            ['auto', component_method_name].join('_')
+          end
+
+          def component_method_name
+            [prefix, component].join('_')
+          end
+
+          def define_auto_method(&block)
+            entries_provider_class.define_method(auto_method_name, &block)
+          end
+
+          def define_inherited_value_proc_method(&block)
+            entries_provider_class.define_method(inherited_value_proc_name, &block)
+          end
+
+          def entry_key_path
+            ::EacConfig::EntryPath.assert([prefix, component])
+          end
+
+          def id_component
+            @id_component ||= owner.component_factory('id')
+          end
+
+          def inherited_value_proc_name
+            [component_method_name, 'inherited_value_proc'].join('_')
+          end
+
+          def setup
+            outer_self = self
+            define_auto_method do
+              uri_component_entry_value(outer_self.entry_key_path.to_string)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'avm/entries/base/uri_components_entries_values/generic_component'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Base
+      class UriComponentsEntriesValues
+        class PathComponent < ::Avm::Entries::Base::UriComponentsEntriesValues::GenericComponent
+          def setup
+            super
+            define_inherited_value_proc_method { |value| value + '/' + id }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'avm/entries/base/uri_components_entries_values/generic_component'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Base
+      class UriComponentsEntriesValues
+        class UrlComponent < ::Avm::Entries::Base::UriComponentsEntriesValues::GenericComponent
+          def setup
+            outer_self = self
+            define_auto_method do
+              inherited_entry_value(outer_self.id_component.entry_key_path.to_string,
+                                    outer_self.entry_key_path.to_string) ||
+                outer_self.auto_install_url_by_parts(self)
+            end
+          end
+
+          def auto_install_url_by_parts(entries_provider)
+            require 'avm/entries/auto_values/uri_entry'
+            ::Avm::Entries::AutoValues::UriEntry.new(entries_provider, 'install').value
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'avm/entries/uri_builder'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Base
+      class UriComponentsEntriesValues
+        require_sub __FILE__
+        common_constructor :entries_provider_class, :prefix, :extra_fields
+
+        ENTRIES_FIELDS = ::Avm::Entries::UriBuilder::ENTRIES_FIELDS + %w[url]
+
+        def fields
+          ENTRIES_FIELDS + extra_fields
+        end
+
+        def result
+          fields.map { |field| component_factory(field).setup }
+        end
+      end
+    end
+  end
+end

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

@@ -7,6 +7,13 @@ module Avm
   module Entries
     module Base
       require_sub __FILE__, require_dependency: true
+      common_concern
+
+      module ClassMethods
+        def uri_components_entries_values(prefix, extra_fields = [])
+          ::Avm::Entries::Base::UriComponentsEntriesValues.new(self, prefix, extra_fields).result
+        end
+      end
 
       def entries_provider_id
         id

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

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require 'avm/entries/jobs/with_variables_source'
+require 'avm/result'
+require 'eac_cli/core_ext'
+
+module Avm
+  module Entries
+    module Jobs
+      module Base
+        common_concern do
+          include ::ActiveSupport::Callbacks
+          include ::Avm::Entries::Jobs::WithVariablesSource
+
+          enable_speaker
+          enable_simple_cache
+          enable_listable
+          common_constructor :instance, :options, default: [{}] do
+            if option_list.present?
+              self.options = option_list.hash_keys_validate!(options.symbolize_keys)
+            end
+          end
+          define_callbacks(*jobs)
+        end
+
+        module ClassMethods
+          def jobs
+            const_get('JOBS').dup
+          end
+        end
+
+        module InstanceMethods
+          def option_list
+            nil
+          end
+
+          def run
+            start_banner if respond_to?(:start_banner)
+            run_jobs
+            ::Avm::Result.success('Done!')
+          rescue ::Avm::Result::Error => e
+            e.to_result
+          end
+
+          protected
+
+          def run_jobs
+            jobs.each do |job|
+              run_callbacks job do
+                send(job)
+              end
+            end
+          end
+
+          def jobs
+            self.class.jobs
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/entries/jobs/variables_source/read_entry.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Jobs
+      class VariablesSource
+        class ReadEntry
+          enable_method_class
+          common_constructor :variables_source, :path, :options, default: [{}]
+          delegate :instance, :job, to: :variables_source
+
+          def result
+            return result_from_job if result_from_job?
+            return result_from_instance_method if result_from_instance_method?
+
+            result_from_instance_entry
+          end
+
+          private
+
+          def path_method_name
+            path.gsub('.', '_').underscore
+          end
+
+          def result_from_instance_entry
+            instance.read_entry(path, options)
+          end
+
+          def result_from_instance_method
+            instance.send(path_method_name)
+          end
+
+          def result_from_instance_method?
+            instance.respond_to?(path_method_name, true)
+          end
+
+          def result_from_job
+            job.send(path_method_name)
+          end
+
+          def result_from_job?
+            job.respond_to?(path_method_name, true)
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/entries/jobs/variables_source.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Jobs
+      class VariablesSource
+        require_sub __FILE__, require_dependency: true
+        common_constructor :job
+        delegate :instance, to: :job
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/entries/jobs/with_variables_source.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'avm/entries/jobs/variables_source'
+
+module Avm
+  module Entries
+    module Jobs
+      module WithVariablesSource
+        def variables_source
+          ::Avm::Entries::Jobs::VariablesSource.new(self)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Jobs
+      require_sub __FILE__
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    class KeysConstantsSet
+      common_constructor :entries_provider_class, :prefix, :suffixes
+
+      # @return [Array<String>]
+      def result
+        if suffixes.is_a?(::Hash)
+          keys_consts_set_from_hash
+        elsif suffixes.is_a?(::Enumerable)
+          keys_consts_set_from_enum
+        else
+          raise "Unmapped suffixes class: #{suffixes.class}"
+        end
+      end
+
+      private
+
+      # @return [String]
+      def key_const_set(prefix, suffix)
+        key = [prefix, suffix].reject(&:blank?).join('.')
+        entries_provider_class.const_set(key.gsub('.', '_').upcase, key)
+        key
+      end
+
+      # @return [Array<String>]
+      def keys_consts_set_from_enum
+        suffixes.map { |suffix| key_const_set(prefix, suffix) }
+      end
+
+      # @return [Array<String>]
+      def keys_consts_set_from_hash
+        suffixes.flat_map do |k, v|
+          self.class.new(entries_provider_class, prefix.to_s + (k.blank? ? '' : ".#{k}"), v).result
+        end
+      end
+    end
+  end
+end

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

@@ -13,7 +13,7 @@ module Avm
           end
 
           define_method "#{method_name}_optional" do
-            read_entry(key, required: false)
+            read_entry_optional(key)
           end
         end
       end