avm 0.25.0 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7adb5354bca33e4cda4d7a67cbdbcb5d2c980b43b635dab278d086119039609e
-  data.tar.gz: b820f3d9c7b4123b8575d8aae380101ac354e719cc3178ee89b814c2eb2ea79d
+  metadata.gz: 409db17d04ee296956e9770e61a5f65919fbf2b0c8bea4efae0ed68fb169572a
+  data.tar.gz: 3c7e6ea386a2527ed86c3bb9ef8a71b1767d17a204d48b1ecc3b74c015772328
 SHA512:
-  metadata.gz: ce8c195c08b8a4bddd504b9dcdceebaf502fc05183d20a4acaa17ccda90fb3f9d03fd9748055c1dbe087620dfb8d58eb0ac82248680c5d2e0b0db2152bcc7c5c
-  data.tar.gz: abde1646aad402efa68a35800eab3501839234cfa739d26197d12d43f11f27376ae42b45a991096bbb52ba8d4e4a98e60853556a47432e4158f4a2c9885e7f01
+  metadata.gz: 302b99ff7495bf6c3f4624432e63f1f2668f8b5d2a2ac91bc721f3206baf9595520c192fa4ead326ad7ce3c646253ca7f1a71a48ee1b11080e1898efe4fef5f8
+  data.tar.gz: 7b85ae2c2a03f3abfeed96924ab6e0180d17709ec422cd3b0638f7075cc750c25a8118d7654554ecfe80519fdeb505da9aa720f2109fdf7bcacfdf7bf884d141

data/lib/avm/registry/with_path/cache.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'avm/registry/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Registry
+    class WithPath < ::Avm::Registry::Base
+      class Cache
+        enable_simple_cache
+        common_constructor :owner
+
+        def detect_optional(path)
+          return nil if path.root?
+          return cached_paths.fetch(path) if cached_paths.key?(path)
+
+          detected = owner.detect_optional(path)
+          detected = detect_optional(path.parent) if detected.blank?
+          cached_paths[path] = detected
+          detected
+        end
+
+        private
+
+        def cached_paths_uncached
+          {}
+        end
+      end
+    end
+  end
+end

data/lib/avm/registry/with_path.rb

@@ -6,17 +6,37 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module Registry
     class WithPath < ::Avm::Registry::Base
+      require_sub __FILE__
+
       def detect_by_path(path)
         detect_by_path_optional(path) || raise_not_found(path)
       end
 
       def detect_by_path_optional(path)
-        current_path = path.to_pathname.expand_path
-        until current_path.root?
-          detect_optional(current_path).if_present { |v| return v }
-          current_path = current_path.parent
+        on_cache do
+          cache.detect_optional(path)
+        end
+      end
+
+      private
+
+      attr_accessor :cache
+
+      def on_cache(&block)
+        cache.present? ? on_cache_with_cache(&block) : on_cache_with_no_cache(&block)
+      end
+
+      def on_cache_with_cache(&block)
+        block.call
+      end
+
+      def on_cache_with_no_cache(&block)
+        self.cache = ::Avm::Registry::WithPath::Cache.new(self)
+        begin
+          block.call
+        ensure
+          self.cache = nil
         end
-        nil
       end
     end
   end

data/lib/avm/sources/base/configuration.rb

@@ -9,8 +9,19 @@ module Avm
   module Sources
     class Base
       module Configuration
+        PARENT_CONFIGURATION_SUFFIX = %w[subs at].freeze
         CONFIGURATION_FILENAMES = %w[.avm.yml .avm.yaml].freeze
 
+        # @return [EacConfig::NodeEntry]
+        def configuration_entry(*entry_args)
+          parent_configuration.if_present do |v|
+            parent_entry = v.entry(*entry_args)
+            return parent_entry if parent_entry.found?
+          end
+
+          configuration.entry(*entry_args)
+        end
+
         # @return [EacRubyUtils::Envs::Command, nil]
         def configuration_value_to_env_command(value)
           configuration_value_to_shell_words(value).if_present { |v| env.command(v).chdir(path) }
@@ -25,13 +36,13 @@ module Avm
 
         # @return [Array<String>, nil]
         def read_configuration_as_shell_words(key)
-          configuration_value_to_shell_words(configuration.entry(key).value)
+          configuration_value_to_shell_words(configuration_entry(key).value)
         end
 
         # Utility to read a configuration as a [EacRubyUtils::Envs::Command].
         # @return [EacRubyUtils::Envs::Command]
         def read_configuration_as_env_command(key)
-          configuration_value_to_env_command(configuration.entry(key).value)
+          configuration_value_to_env_command(configuration_entry(key).value)
         end
 
         private
@@ -44,6 +55,16 @@ module Avm
           configuration_with_filename(CONFIGURATION_FILENAMES.first, false)
         end
 
+        # @return [String]
+        def parent_configuration_prefix
+          PARENT_CONFIGURATION_SUFFIX + [relative_path]
+        end
+
+        # @return [EacConfig::PrefixedPathNode]
+        def parent_configuration_uncached
+          parent.if_present { |v| v.configuration.with_prefix(parent_configuration_prefix) }
+        end
+
         # @return [EacConfig::YamlFileNode, nil]
         def configuration_with_filename(filename, needs_exist)
           file_path = path.join(filename)

data/lib/avm/sources/base/locale.rb

@@ -14,7 +14,7 @@ module Avm
         end
 
         def configured_locale
-          configuration.entry(LOCALE_KEY).value
+          configuration_entry(LOCALE_KEY).value
         end
 
         def default_locale

data/lib/avm/sources/base/parent.rb

@@ -6,11 +6,6 @@ module Avm
   module Sources
     class Base
       module Parent
-        # @return [Avm::Sources::Base]
-        def parent
-          parent_by_option || parent_by_search
-        end
-
         # @return [Avm::Sources::Base]
         def parent_by_option
           options[OPTION_PARENT]
@@ -18,12 +13,14 @@ module Avm
 
         # @return [Avm::Sources::Base]
         def parent_by_search
-          parent_path = path.parent
-          until parent_path.root?
-            ::Avm::Registry.sources.detect_optional(parent_path).if_present { |v| return v }
-            parent_path = parent_path.parent
-          end
-          nil
+          ::Avm::Registry.sources.detect_by_path_optional(path.parent)
+        end
+
+        private
+
+        # @return [Avm::Sources::Base]
+        def parent_uncached
+          parent_by_option || parent_by_search
         end
       end
     end

data/lib/avm/sources/base/subs_paths.rb

@@ -22,7 +22,7 @@ module Avm
 
         # @return [Array<String>]
         def configured_paths
-          source.configuration.entry(configuration_key).value.if_present do |v|
+          source.configuration_entry(configuration_key).value.if_present do |v|
             v.split(SUBS_PATH_SEPARATOR)
           end
         end

data/lib/avm/sources/base/testing.rb

@@ -18,12 +18,12 @@ module Avm
 
         # @return [Hash<String, EacRubyUtils::Envs::Command>, nil]
         def configured_test_commands
-          configured_value_as_test_commands(configuration.entry(TEST_COMMANDS_KEY).value)
+          configured_value_as_test_commands(configuration_entry(TEST_COMMANDS_KEY).value)
         end
 
         # @return [Hash<String, EacRubyUtils::Envs::Command>, nil]
         def configured_value_as_test_commands(value)
-          return nil if value.blank?
+          return nil if value.nil?
 
           [::EacRubyUtils::Envs::Command, ::Hash, ::Enumerable].each do |type|
             next unless value.is_a?(type)
@@ -45,8 +45,8 @@ module Avm
         # @return [Enumerable<EacRubyUtils::Envs::Command>]
         def test_commands
           configured_test_commands ||
-            configured_value_as_test_commands(configured_test_command)
-          default_test_commands
+            configured_value_as_test_commands(configured_test_command) ||
+            default_test_commands
         end
 
         protected

data/lib/avm/sources/tests/builder.rb

@@ -35,7 +35,7 @@ module Avm
         # @return [Array<Avm::Sources::Tests::Single>]
         def available_units
           @available_units ||= ([main_source] + main_source.subs)
-                                 .map { |a_source| create_unit(a_source) }
+                                 .flat_map { |a_source| create_source_units(a_source) }
         end
 
         def available_units_from_main
@@ -62,20 +62,15 @@ module Avm
           end
         end
 
-        # @return [Avm::Sources::Tests::Single]
-        def create_unit(source)
-          ::Avm::Sources::Tests::Single.new(self, source)
-        end
-
         # @return [Array<Avm::Sources::Tests::Single>]
         def create_units(sources)
           sources.flat_map { |a_source| create_source_units(a_source) }
         end
 
         # @return [Avm::Sources::Tests::Single]
-        def create_unit_by_id(source_id)
-          r = available_units.find { |unit| unit.id == source_id }
-          return r if r
+        def create_units_by_id(source_id)
+          r = available_units.select { |unit| unit.source.relative_path.to_path == source_id.to_s }
+          return r if r.any?
 
           raise ::ArgumentError, "Source not found with ID=#{source_id}" \
             "(Available: #{available_units.map(&:id).join(', ')})"
@@ -83,7 +78,7 @@ module Avm
 
         # @return [Array<Avm::Sources::Tests::Single>]
         def select_units_from_ids
-          include_ids.map { |source_id| create_unit_by_id(source_id) }
+          include_ids.flat_map { |source_id| create_units_by_id(source_id) }
         end
 
         # @return [Array<Avm::Sources::Tests::Single>]

data/lib/avm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.26.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-18 00:00:00.000000000 Z
+date: 2022-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_cli
@@ -30,6 +30,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.27.6
+- !ruby/object:Gem::Dependency
+  name: eac_config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: eac_docker
   requirement: !ruby/object:Gem::Requirement
@@ -227,6 +241,7 @@ files:
 - lib/avm/registry.rb
 - lib/avm/registry/base.rb
 - lib/avm/registry/with_path.rb
+- lib/avm/registry/with_path/cache.rb
 - lib/avm/result.rb
 - lib/avm/rspec.rb
 - lib/avm/rspec/setup.rb