eac_tools 0.77.1 → 0.79.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f517b6d6540d86de71eb838d6bb96479c1991ec194ca1d60b420e3d7318f7f4
-  data.tar.gz: be11c1bbf741c6c9a39e6108c312f9cc2d11a75e924da7b59be2a5ffb4c569e6
+  metadata.gz: 90311d99a8fde34e9e085138cecf3eb3eaec19cd6db5df22b900ca73a058a568
+  data.tar.gz: '082caa63292c671845f74e8a913054ad212894aa117ddc7d3f7cd2ff65885bdb'
 SHA512:
-  metadata.gz: bf8108ddd620e8ca590551490a742d1f3bbf35090f3df2e5b11bcbff00c6c8625720468f13dd710a097e38cb815e5f012c2d93759d8facc8e62a82defdfba5ba
-  data.tar.gz: f8ef025927b82d16f5ab1f9ae34f2e60d648923a9a748fb93c466d8846523204a53a0f8344c47303c9c1bd5caaaa98b4c5c8bb129f1fe5962088cef5a839eba9
+  metadata.gz: 392a2ae0e2f9688a644ae606bd2b6e8c82e06a2aa0e9f30138972866f15f29dd045533b5ebd59303b2613ce43bebdfc3903535727a5e2f2b48c410c5a6b04168
+  data.tar.gz: 99306a1b0f26497d5bebb657c766c912acc347be451a23eea152c0e73f9f5b9e1fe31c39dc1eed32faebbeebf1df39f6cf47d86759b26c902222b217c1c5743c

data/Gemfile.lock

@@ -1,23 +1,24 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.77.1)
-      avm (~> 0.79)
+    eac_tools (0.79.0)
+      avm (~> 0.81)
       avm-eac_asciidoctor_base0 (~> 0.19)
       avm-eac_generic_base0 (~> 0.12, >= 0.12.1)
+      avm-eac_github_base0 (~> 0.2)
       avm-eac_latex_base0 (~> 0.3, >= 0.3.1)
       avm-eac_php_base0 (~> 0.4, >= 0.4.2)
       avm-eac_postgresql_base0 (~> 0.5, >= 0.5.2)
       avm-eac_python_base0 (~> 0.2, >= 0.2.1)
       avm-eac_rails_base0 (~> 0.10, >= 0.10.3)
       avm-eac_rails_base1 (~> 0.9, >= 0.9.3)
-      avm-eac_redmine_base0 (~> 0.21)
+      avm-eac_redmine_base0 (~> 0.21, >= 0.21.2)
       avm-eac_redmine_plugin_base0 (~> 0.4)
-      avm-eac_ruby_base1 (~> 0.32)
+      avm-eac_ruby_base1 (~> 0.32, >= 0.32.1)
       avm-eac_webapp_base0 (~> 0.18, >= 0.18.2)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.1)
       avm-git (~> 0.13, >= 0.13.4)
-      avm-tools (~> 0.155)
+      avm-tools (~> 0.157)
       eac_ruby_utils (~> 0.119, >= 0.119.2)
 
 PATH
@@ -37,6 +38,14 @@ PATH
       avm (~> 0.79)
       eac_ruby_utils (~> 0.119, >= 0.119.2)
 
+PATH
+  remote: sub/avm-eac_github_base0
+  specs:
+    avm-eac_github_base0 (0.2.0)
+      avm (~> 0.81)
+      eac_rest (~> 0.10)
+      eac_ruby_utils (~> 0.119, >= 0.119.2)
+
 PATH
   remote: sub/avm-eac_latex_base0
   specs:
@@ -86,9 +95,9 @@ PATH
 PATH
   remote: sub/avm-eac_redmine_base0
   specs:
-    avm-eac_redmine_base0 (0.21.0)
-      avm (~> 0.79)
-      avm-eac_generic_base0 (~> 0.12)
+    avm-eac_redmine_base0 (0.21.2)
+      avm (~> 0.81)
+      avm-eac_generic_base0 (~> 0.12, >= 0.12.1)
       avm-eac_rails_base1 (~> 0.9, >= 0.9.3)
       avm-eac_ubuntu_base0 (~> 0.5)
       curb (~> 0.9, >= 0.9.11)
@@ -106,9 +115,9 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.32.0)
+    avm-eac_ruby_base1 (0.32.1)
       aranha-parsers (~> 0.21)
-      avm (~> 0.79)
+      avm (~> 0.80)
       avm-eac_generic_base0 (~> 0.12, >= 0.12.1)
       eac_envs-http (~> 0.4, >= 0.4.1)
       eac_ruby_utils (~> 0.119, >= 0.119.2)
@@ -163,10 +172,10 @@ PATH
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.155.0)
+    avm-tools (0.157.0)
       aranha-parsers (~> 0.21)
-      avm (~> 0.79)
-      avm-eac_ruby_base1 (~> 0.31, >= 0.31.2)
+      avm (~> 0.81)
+      avm-eac_ruby_base1 (~> 0.32, >= 0.32.1)
       avm-eac_ubuntu_base0 (~> 0.5)
       avm-files (~> 0.6, >= 0.6.2)
       avm-git (~> 0.13, >= 0.13.4)
@@ -181,14 +190,14 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.79.0)
+    avm (0.81.0)
       aranha-parsers (~> 0.21)
-      eac_cli (~> 0.35, >= 0.35.1)
-      eac_config (~> 0.14)
+      eac_cli (~> 0.38)
+      eac_config (~> 0.14, >= 0.14.1)
       eac_docker (~> 0.7)
       eac_fs (~> 0.16)
       eac_git (~> 0.14, >= 0.14.1)
-      eac_ruby_utils (~> 0.119)
+      eac_ruby_utils (~> 0.119, >= 0.119.2)
       eac_templates (~> 0.5)
       filesize (~> 0.2)
       htmlbeautifier (~> 1.4, >= 1.4.2)
@@ -205,9 +214,9 @@ PATH
 PATH
   remote: sub/eac_config
   specs:
-    eac_config (0.14.0)
-      addressable (~> 2.8, >= 2.8.4)
-      eac_ruby_utils (~> 0.119)
+    eac_config (0.14.1)
+      addressable (~> 2.8, >= 2.8.5)
+      eac_ruby_utils (~> 0.119, >= 0.119.2)
 
 PATH
   remote: sub/eac_git
@@ -268,10 +277,10 @@ GEM
       eac_cli (~> 0.35)
       eac_fs (~> 0.16)
       eac_ruby_utils (~> 0.117)
-    eac_ruby_gem_support (0.8.1)
+    eac_ruby_gem_support (0.8.2)
       eac_ruby_utils (~> 0.119, >= 0.119.2)
       rspec (~> 3.12)
-      rubocop (~> 1.56, >= 1.56.4)
+      rubocop (~> 1.57, >= 1.57.1)
       rubocop-rails (~> 2.21, >= 2.21.2)
       rubocop-rspec (~> 2.24, >= 2.24.1)
     eac_ruby_utils (0.119.2)
@@ -343,8 +352,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.1)
-    rubocop (1.57.1)
-      base64 (~> 0.1.1)
+    rubocop (1.57.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -355,18 +363,18 @@ GEM
       rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
+    rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
     rubocop-capybara (2.19.0)
       rubocop (~> 1.41)
     rubocop-factory_bot (2.24.0)
       rubocop (~> 1.33)
-    rubocop-rails (2.21.2)
+    rubocop-rails (2.22.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
-    rubocop-rspec (2.24.1)
-      rubocop (~> 1.33)
+    rubocop-rspec (2.25.0)
+      rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
     ruby-filemagic (0.7.3)
@@ -385,6 +393,7 @@ DEPENDENCIES
   avm!
   avm-eac_asciidoctor_base0!
   avm-eac_generic_base0!
+  avm-eac_github_base0!
   avm-eac_latex_base0!
   avm-eac_php_base0!
   avm-eac_postgresql_base0!
@@ -407,4 +416,4 @@ DEPENDENCIES
   eac_tools!
 
 BUNDLED WITH
-   2.3.26
+   2.4.19

data/lib/eac_tools/version.rb

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

data/sub/avm/avm.gemspec

@@ -13,12 +13,12 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*']
 
   s.add_dependency 'aranha-parsers', '~> 0.21'
-  s.add_dependency 'eac_cli', '~> 0.35', '>= 0.35.1'
-  s.add_dependency 'eac_config', '~> 0.14'
+  s.add_dependency 'eac_cli', '~> 0.38'
+  s.add_dependency 'eac_config', '~> 0.14', '>= 0.14.1'
   s.add_dependency 'eac_docker', '~> 0.7'
   s.add_dependency 'eac_fs', '~> 0.16'
   s.add_dependency 'eac_git', '~> 0.14', '>= 0.14.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.119'
+  s.add_dependency 'eac_ruby_utils', '~> 0.119', '>= 0.119.2'
   s.add_dependency 'eac_templates', '~> 0.5'
   s.add_dependency 'filesize', '~> 0.2'
   s.add_dependency 'htmlbeautifier', '~> 1.4', '>= 1.4.2'

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module ApplicationScms
+    class Base
+      class << self
+        # @return [String]
+        def type_name
+          name.gsub(/#{Regexp.quote('::ApplicationScms::Base')}$/, '').demodulize
+        end
+      end
+
+      # !method initialize(url)
+      # @param url [Addressable::URI]
+      common_constructor :url do
+        self.url = url.to_uri
+      end
+      delegate :type_name, to: :class
+
+      # @return [String]
+      def to_s
+        "#{type_name}[#{url}]"
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/application_scms.rb

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

data/sub/avm/lib/avm/applications/base/local_instance.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'avm/instances/ids'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Applications
+    class Base
+      module LocalInstance
+        LOCAL_INSTANCE_SUFFIX = 'dev'
+
+        # @return [String]
+        def local_instance_id
+          ::Avm::Instances::Ids.build(id, local_instance_suffix)
+        end
+
+        # @return [String]
+        def local_instance_suffix
+          LOCAL_INSTANCE_SUFFIX
+        end
+
+        private
+
+        # @return [Avm::Instances::Base]
+        def local_instance_uncached
+          instance(local_instance_suffix)
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/applications/base/local_source.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'avm/registry'
+require 'eac_config/node'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Applications
+    class Base
+      module LocalSource
+        # @return [Pathname]
+        def local_source_path
+          local_source_path_entry.value!.to_pathname
+        end
+
+        # @return [EacConfig::Entry]
+        def local_source_path_entry
+          ::EacConfig::Node.context.current.entry([local_instance_id, 'install', 'path'])
+        end
+
+        private
+
+        # @return [Avm::Sources::Base]
+        def local_source_uncached
+          ::Avm::Registry.sources.detect(local_source_path)
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/applications/base/naming.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Applications
+    class Base
+      module Naming
+        DEFAULT_NAME = '_Undefined_'
+
+        # @return [String]
+        def default_name
+          DEFAULT_NAME
+        end
+
+        # @return [String]
+        def name
+          name_from_configuration || default_name
+        end
+
+        # @return [String]
+        def name_from_configuration
+          entry(::Avm::Instances::EntryKeys::NAME).optional_value
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/applications/base/organization.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'avm/registry'
+
+module Avm
+  module Applications
+    class Base
+      module Organization
+        DEFAULT_ORGANIZATION = '_undefined_'
+        ORGANIZATION_CONFIG_KEY = 'organization'
+
+        # @return [String]
+        def default_organization
+          DEFAULT_ORGANIZATION
+        end
+
+        # @return [String, nil]
+        def organization_by_configuration
+          entry(ORGANIZATION_CONFIG_KEY).optional_value
+        end
+
+        # @return [String]
+        def organization
+          organization_by_configuration || default_organization
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/applications/base/scm.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'avm/registry'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Applications
+    class Base
+      module Scm
+        common_concern do
+          uri_components_entries_values 'scm', %w[repos_path type]
+        end
+
+        # @return [Avm::ApplicationScms::Base]
+        def scm
+          @scm ||= ::Avm::Registry.application_scms.detect(scm_type, scm_url)
+        end
+
+        # @param value [String]
+        # @return [String]
+        def scm_repos_path_inherited_value_proc(value)
+          value.to_pathname.join(id).to_path
+        end
+      end
+    end
+  end
+end

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

@@ -1,19 +1,23 @@
 # frozen_string_literal: true
 
 require 'avm/entries/base'
-require 'avm/instances/ids'
-require 'avm/registry'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Applications
     class Base
       enable_simple_cache
-      require_sub __FILE__, include_modules: true
       include ::Avm::Entries::Base
 
       AVM_TYPE = 'Application'
-      LOCAL_INSTANCE_SUFFIX = 'dev'
+
+      class << self
+        # @param id [String]
+        # @return [Avm::Applications::Base]
+        def by_id(id)
+          new(id)
+        end
+      end
 
       common_constructor :id do
         self.id = id.to_s
@@ -27,41 +31,7 @@ module Avm
         stereotype.instance_class.new(self, suffix)
       end
 
-      def name
-        entry(::Avm::Instances::EntryKeys::NAME).read
-      end
-
-      # @return [String]
-      def local_instance_id
-        ::Avm::Instances::Ids.build(id, local_instance_suffix)
-      end
-
-      # @return [Pathname]
-      def local_source_path
-        local_source_path_entry.value!.to_pathname
-      end
-
-      # @return [EacConfig::Entry]
-      def local_source_path_entry
-        ::EacConfig::Node.context.current.entry([local_instance_id, 'install', 'path'])
-      end
-
-      # @return [String]
-      def local_instance_suffix
-        LOCAL_INSTANCE_SUFFIX
-      end
-
-      private
-
-      # @return [Avm::Instances::Base]
-      def local_instance_uncached
-        instance(local_instance_suffix)
-      end
-
-      # @return [Avm::Sources::Base]
-      def local_source_uncached
-        ::Avm::Registry.sources.detect(local_source_path)
-      end
+      require_sub __FILE__, include_modules: true
     end
   end
 end

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

@@ -18,8 +18,23 @@ module Avm
           end
         end
 
+        # @param provider_id [String]
+        # @return [Avm::Entries::Base]
+        def other_entries_provider(provider_id)
+          other_entries_provider_class.by_id(provider_id)
+        end
+
+        # @return [Class]
+        def other_entries_provider_class
+          [::Avm::Instances::Base, ::Avm::Applications::Base].each do |klass|
+            return klass if entries_provider.is_a?(klass)
+          end
+
+          raise "No provider class found for \"#{entries_provider}\""
+        end
+
         def other_entry_value(instance_id)
-          ::Avm::Instances::Base.by_id(instance_id).read_entry_optional(target_entry_suffix)
+          other_entries_provider(instance_id).read_entry_optional(target_entry_suffix)
         end
 
         def self_entry_value

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

@@ -13,8 +13,9 @@ module Avm
           common_constructor :uri_component_entry_value
           delegate :component_entry_path, :entries_provider, to: :uri_component_entry_value
 
+          # @return [Symbol]
           def default_value_method_name
-            "#{component_entry_path.parts.join('_').variableize}_default_value"
+            component_entry_path.default_method_name
           end
 
           def result

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

@@ -28,8 +28,9 @@ module Avm
             ->(value) { entries_provider.send(inherited_value_block_method_name, value) }
           end
 
+          # @return [Symbol]
           def inherited_value_block_method_name
-            "#{component_entry_path.parts.join('_').variableize}_inherited_value_proc".to_sym
+            component_entry_path.inherited_block_method_name
           end
         end
       end

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/entries/uri_builder'
+require 'avm/patches/eac_config/entry_path'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -10,14 +11,8 @@ module Avm
         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
+          delegate :auto_method_name, :get_method_name, :get_optional_method_name,
+                   to: :entry_key_path
 
           def define_auto_method
             outer_self = self
@@ -48,22 +43,12 @@ module Avm
             ::EacConfig::EntryPath.assert([prefix, component])
           end
 
-          # @return [String]
-          def get_method_name # rubocop:disable Naming/AccessorMethodName
-            component_method_name
-          end
-
-          # @return [String]
-          def get_optional_method_name # rubocop:disable Naming/AccessorMethodName
-            get_method_name + '_optional'
-          end
-
           def id_component
             @id_component ||= owner.component_factory('id')
           end
 
           def inherited_value_proc_name
-            [component_method_name, 'inherited_value_proc'].join('_')
+            entry_key_path.inherited_block_method_name
           end
 
           def setup

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

@@ -8,6 +8,7 @@ module Avm
       module AutoValues
         module Database
           LOCAL_ADDRESS = '127.0.0.1'
+          LOCAL_ADDRESSES = [LOCAL_ADDRESS, '::1', 'localhost'].freeze
           DEFAULT_EXTRA = ''
           DEFAULT_HOSTNAME = LOCAL_ADDRESS
           DEFAULT_LIMIT = 5

data/sub/avm/lib/avm/patches/eac_config/entry_path.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'eac_config/entry_path'
+
+module EacConfig
+  class EntryPath
+    # @return [Symbol]
+    def auto_method_name
+      method_name('auto_', '')
+    end
+
+    # @return [Symbol]
+    def default_method_name
+      method_name('', '_default_value')
+    end
+
+    # @return [Symbol]
+    def get_method_name # rubocop:disable Naming/AccessorMethodName
+      method_name('', '')
+    end
+
+    # @return [Symbol]
+    def get_optional_method_name # rubocop:disable Naming/AccessorMethodName
+      method_name('', '_optional')
+    end
+
+    # @return [Symbol]
+    def inherited_block_method_name
+      method_name('', '_inherited_value_proc')
+    end
+
+    # @return [String]
+    def variableize
+      parts.join('_')
+    end
+
+    private
+
+    # @param before [String]
+    # @param after [String]
+    # @return [Symbol]
+    def method_name(before, after)
+      "#{before}#{variableize}#{after}".to_sym
+    end
+  end
+end

data/sub/avm/lib/avm/registry/application_scms.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'avm/registry/from_gems'
+
+module Avm
+  module Registry
+    class ApplicationScms < ::Avm::Registry::FromGems
+      def class_detect(klass, detect_args)
+        return nil unless klass.type_name == detect_args[0]
+
+        klass.new(*detect_args[1..-1])
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/registry.rb

@@ -7,9 +7,9 @@ module Avm
   module Registry
     require_sub __FILE__
     enable_listable
-    lists.add_symbol :category, :applications, :application_stereotypes, :config_objects,
-                     :file_formats, :instances, :launcher_stereotypes, :runners, :scms,
-                     :source_generators, :sources
+    lists.add_symbol :category, :applications, :application_scms, :application_stereotypes,
+                     :config_objects, :file_formats, :instances, :launcher_stereotypes, :runners,
+                     :scms, :source_generators, :sources
 
     class << self
       enable_simple_cache

data/sub/avm/lib/avm/rspec/shared_examples/entries_values.rb

@@ -13,8 +13,8 @@ require 'eac_ruby_utils/core_ext'
         context "when a auto value is requested for \"#{instance_id}.#{input}\"" do
           let(:instance) { described_class.by_id(instance_id) }
 
-          it ".read_entry should return \"#{expected}\"" do
-            expect(instance.read_entry(input)).to eq(expected)
+          it ".entry('#{input}').value should return \"#{expected}\"" do
+            expect(instance.entry(input).value).to eq(expected)
           end
         end
       end

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

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