avm 0.18.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 678a691cf2ccbd86589577affeb607bb74543347909778401e317b5ada020dd9
-  data.tar.gz: b0dd033965eab254607c952def3dd5a57fc737d00dcd621df72d8e13fd76a212
+  metadata.gz: 4da4c32db86b5e0217282e7954683ff84d63ddc8b34a7413bc8b255090a5d15c
+  data.tar.gz: b9c369085dcd50e3787c110c828b702eb44b5a1c28a3c036217e6dae19301da8
 SHA512:
-  metadata.gz: 36a26e3f0f9068ebac2edad0883af7a336887fffb79fff26db99653a7a250a1ce7f7f317d5bb9223464f5a061448a33aaaae016c1ff21d0d1423e52768c2a22f
-  data.tar.gz: c627d6f37382c3c5ebfe9200288c6ef8bafa95999b39d08647b1071b08c54f8d13e6fa7abef151818c4d8e3bd52e9cc9e012f3c51dc2d0eae7bb61687f7ea4ad
+  metadata.gz: 419e7911860b01a11ab6cc5fa901abc5585adbb28d4e2c6cfcf27cb189b4f63abc631e961835ad150b86dada322cc30764996387a92aede230922b6b449e2d5e
+  data.tar.gz: 2ee319d2462b5c8611d719b64d8e4c75376fd4c3d6e1752f8a88fcbe858a87cd058a28f7017cda47089c70436a86d2b4374e89a724c2d73201287d8f8405927b

data/lib/avm/instances/base/auto_values/mailer.rb

@@ -9,8 +9,8 @@ module Avm
       module AutoValues
         module Mailer
           ::Avm::Instances::EntryKeys.all.select { |c| c.to_s.start_with?('mailer.') }
-                                     .reject { |c| c == ::Avm::Instances::EntryKeys::MAILER_ID }
-                                     .each do |mailer_key|
+            .reject { |c| c == ::Avm::Instances::EntryKeys::MAILER_ID }
+            .each do |mailer_key|
             define_method ::Avm::Instances::Entry.auto_value_method_name(mailer_key) do
               mailer_auto_common(mailer_key)
             end

data/lib/avm/registry/base.rb

@@ -17,7 +17,7 @@ module Avm
 
       def detect_optional(*registered_initialize_args)
         registered_modules.reverse.lazy.map { |klass| klass.new(*registered_initialize_args) }
-                          .find(&:valid?)
+          .find(&:valid?)
       end
 
       def provider_module_suffix
@@ -40,7 +40,7 @@ module Avm
 
       def registered_modules_uncached
         registered_gems.flat_map { |registry| modules_from_registry(registry) }
-                       .select { |v| valid_registered_module?(v) }.uniq
+          .select { |v| valid_registered_module?(v) }.uniq
       end
 
       def modules_from_registry(registry)

data/lib/avm/rspec/shared_examples/not_in_avm_registry.rb

@@ -4,7 +4,7 @@ require 'avm/registry'
 
 ::RSpec.shared_examples 'not_in_avm_registry' do |registry_method = nil|
   registry_method.if_present(::Avm::Registry.registries) { |v| [::Avm::Registry.send(v)] }
-                 .each do |registry|
+    .each do |registry|
     context "when registry is #{registry}" do
       it 'is not in the avm registry' do
         expect(registry.registered_modules).not_to include(described_class)

data/lib/avm/scms/base.rb

@@ -6,6 +6,7 @@ module Avm
   module Scms
     class Base
       enable_abstract_methods
+      enable_simple_cache
       abstract_methods :update, :valid?
       common_constructor :path do
         self.path = path.to_pathname
@@ -28,6 +29,18 @@ module Avm
       def to_s
         name
       end
+
+      private
+
+      # @return [Avm::Scms::Base]
+      def parent_scm
+        parent_path = path.parent
+        until parent_path.root?
+          ::Avm::Registry.scms.detect_optional(parent_path).if_present { |v| return v }
+          parent_path = parent_path.parent
+        end
+        nil
+      end
     end
   end
 end

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'eac_config/yaml_file_node'
 require 'eac_ruby_utils/core_ext'
 require 'eac_ruby_utils/yaml'
 require 'shellwords'
@@ -10,26 +11,33 @@ module Avm
       module Configuration
         # @return [Array<String>, nil]
         def read_configuration_as_shell_words(key)
-          configuration[key].if_present do |v|
+          configuration.entry(key).value.if_present do |v|
             v.is_a?(::Enumerable) ? v.map(&:to_s) : ::Shellwords.split(v.to_s)
           end
         end
 
         private
 
-        # @return [Hash]
+        # @return [EacConfig::YamlFileNode]
         def configuration_uncached
           ::Avm::Sources::Configuration::FILENAMES.each do |filename|
-            file_path = path.join(filename)
-            return ::EacRubyUtils::Yaml.load_file(file_path).with_indifferent_access if
-            file_path.exist?
+            configuration_with_filename(filename, true)
           end
-          {}
+          configuration_with_filename(::Avm::Sources::Configuration::FILENAMES.first, false)
+        end
+
+        # @return [EacConfig::YamlFileNode, nil]
+        def configuration_with_filename(filename, needs_exist)
+          file_path = path.join(filename)
+          return ::EacConfig::YamlFileNode.new(file_path) if !needs_exist || file_path.exist?
+
+          nil
         end
 
         # @return [Avm::Sources::Configuration]
         def old_configuration_uncached
-          ::Avm::Sources::Configuration.find_in_path(path)
+          ::Avm::Sources::Configuration.find_in_path(path) ||
+            ::Avm::Sources::Configuration.temp_instance
         end
       end
     end

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+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]
+        end
+
+        # @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
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'avm/sources/base/subs_paths'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Sources
+    class Base
+      module Subs
+        CONFIGURATION_SUBS_EXCLUDE_PATHS_KEY = 'subs.exclude_path'
+        CONFIGURATION_SUBS_INCLUDE_PATHS_KEY = 'subs.include_path'
+        SUBS_EXCLUDE_PATHS_DEFAULT = [].freeze
+        SUBS_INCLUDE_PATHS_DEFAULT = ['sub/*'].freeze
+
+        # @return [Enumerable<Avm::Sources::Base>]
+        def subs
+          subs_paths_to_search
+            .map { |sub_path| ::Avm::Registry.sources.detect_optional(sub_path, parent: self) }
+            .reject(&:blank?)
+            .sort_by { |sub| [sub.path] }
+        end
+
+        def subs_paths_to_search
+          subs_include_paths.flat_map do |subs_include_path|
+            ::Pathname.glob(path.join(subs_include_path)).reject do |sub_path|
+              subs_exclude_paths.any? do |subs_exclude_path|
+                sub_path.fnmatch?(path.join(subs_exclude_path).to_path)
+              end
+            end
+          end
+        end
+
+        %i[include exclude].each do |type|
+          %i[path paths configured_paths default_paths].each do |method_suffix|
+            obj_method_name = "subs_#{type}_path_obj"
+
+            define_method "subs_#{type}_#{method_suffix}" do
+              send(obj_method_name).send(method_suffix)
+            end
+
+            define_method "#{obj_method_name}_uncached" do
+              ::Avm::Sources::Base::SubsPaths.new(
+                self,
+                self.class.const_get("CONFIGURATION_SUBS_#{type}_PATHS_KEY".upcase),
+                self.class.const_get("SUBS_#{type}_PATHS_DEFAULT".upcase)
+              )
+            end
+
+            private "#{obj_method_name}_uncached" # rubocop:disable Style/AccessModifierDeclarations
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Sources
+    class Base
+      class SubsPaths
+        SUBS_PATH_SEPARATOR = ':'
+
+        common_constructor :source, :configuration_key, :default_paths
+
+        # @return [String]
+        def path
+          paths.join(SUBS_PATH_SEPARATOR)
+        end
+
+        # @return [Array<String>]
+        def paths
+          configured_paths || default_paths
+        end
+
+        # @return [Array<String>]
+        def configured_paths
+          source.configuration.entry(configuration_key).value.if_present do |v|
+            v.split(SUBS_PATH_SEPARATOR)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/sources/base.rb

@@ -21,12 +21,6 @@ module Avm
       abstract_methods :update, :valid?
 
       delegate :locale, to: :old_configuration
-      delegate :to_s, to: :path
-
-      # @return [Avm::Sources::Base]
-      def parent
-        options[OPTION_PARENT]
-      end
 
       # @return [Pathname]
       def relative_path
@@ -35,9 +29,8 @@ module Avm
         path.relative_path_from(parent.path)
       end
 
-      # @return [Enumerable<Avm::Sources::Base>]
-      def subs
-        scm.subs.map { |subrepo| ::Avm::Registry.sources.detect(subrepo.path, parent: self) }
+      def to_s
+        "#{self.class}[#{path}]"
       end
 
       private

data/lib/avm/sources/configuration/{_locale.rb → locale.rb}

@@ -6,10 +6,12 @@ require 'i18n'
 module Avm
   module Sources
     class Configuration < ::EacConfig::OldConfigs
-      LOCALE_KEY = :locale
+      module Locale
+        LOCALE_KEY = :locale
 
-      def locale
-        read_entry(LOCALE_KEY) || ::I18n.default_locale
+        def locale
+          read_entry(LOCALE_KEY) || ::I18n.default_locale
+        end
       end
     end
   end

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Avm
+  module Sources
+    class Configuration < ::EacConfig::OldConfigs
+      module Rubocop
+        RUBOCOP_COMMAND_KEY = 'ruby.rubocop.command'
+        RUBOCOP_GEMFILE_KEY = 'ruby.rubocop.gemfile'
+
+        def rubocop_command
+          read_command(RUBOCOP_COMMAND_KEY)
+        end
+
+        def rubocop_gemfile
+          gemfile_path = read_entry(RUBOCOP_GEMFILE_KEY)
+          return nil if gemfile_path.blank?
+
+          gemfile_path = gemfile_path.to_pathname.expand_path(storage_path.parent)
+          return gemfile_path if gemfile_path.file?
+
+          raise "Gemfile path \"#{gemfile_path}\" does not exist or is not a file"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'avm/patches/eac_ruby_gems_utils/gem'
+
+module Avm
+  module Sources
+    class Configuration < ::EacConfig::OldConfigs
+      module Tests
+        BUNDLE_TEST_COMMAND_KEY = 'test.bundle_command'
+        TEST_COMMAND_KEY = 'test.command'
+
+        def any_test_command
+          bundle_test_command || test_command
+        end
+
+        def test_command
+          read_command(TEST_COMMAND_KEY)
+        end
+
+        def bundle_test_command
+          read_entry(BUNDLE_TEST_COMMAND_KEY).if_present do |v|
+            args = v.is_a?(::Enumerable) ? v.map(&:to_s) : ::Shellwords.split(v)
+            ::EacRubyGemsUtils::Gem.new(::File.dirname(storage_path)).bundle(*args).chdir_root
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/sources/configuration.rb

@@ -7,7 +7,7 @@ require 'yaml'
 module Avm
   module Sources
     class Configuration < ::EacConfig::OldConfigs
-      require_sub __FILE__
+      require_sub __FILE__, include_modules: true
 
       FILENAMES = %w[.avm.yml .avm.yaml].freeze
 
@@ -28,6 +28,10 @@ module Avm
           nil
         end
 
+        def temp_instance
+          new(::Tempfile.new(['.avm', '.yaml']))
+        end
+
         private
 
         def internal_find_path(absolute_pathname)

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

@@ -33,7 +33,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) }
+                                 .map { |a_source| create_unit(a_source) }
         end
 
         def available_units_from_main

data/lib/avm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-07 00:00:00.000000000 Z
+date: 2022-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_cli
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.80'
+        version: '0.95'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.80'
+        version: '0.95'
 - !ruby/object:Gem::Dependency
   name: eac_templates
   requirement: !ruby/object:Gem::Requirement
@@ -146,34 +146,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
-    - - ">="
+        version: '0.14'
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
-    - - ">="
+        version: '0.14'
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.14.1
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.5.1
 description: 
 email: 
 executables: []
@@ -242,11 +242,14 @@ files:
 - lib/avm/sources/base.rb
 - lib/avm/sources/base/configuration.rb
 - lib/avm/sources/base/instance.rb
+- lib/avm/sources/base/parent.rb
+- lib/avm/sources/base/subs.rb
+- lib/avm/sources/base/subs_paths.rb
 - lib/avm/sources/base/testing.rb
 - lib/avm/sources/configuration.rb
-- lib/avm/sources/configuration/_locale.rb
-- lib/avm/sources/configuration/_rubocop.rb
-- lib/avm/sources/configuration/_tests.rb
+- lib/avm/sources/configuration/locale.rb
+- lib/avm/sources/configuration/rubocop.rb
+- lib/avm/sources/configuration/tests.rb
 - lib/avm/sources/tester.rb
 - lib/avm/sources/tests.rb
 - lib/avm/sources/tests/builder.rb

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

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Avm
-  module Sources
-    class Configuration < ::EacConfig::OldConfigs
-      RUBOCOP_COMMAND_KEY = 'ruby.rubocop.command'
-      RUBOCOP_GEMFILE_KEY = 'ruby.rubocop.gemfile'
-
-      def rubocop_command
-        read_command(RUBOCOP_COMMAND_KEY)
-      end
-
-      def rubocop_gemfile
-        gemfile_path = read_entry(RUBOCOP_GEMFILE_KEY)
-        return nil if gemfile_path.blank?
-
-        gemfile_path = gemfile_path.to_pathname.expand_path(storage_path.parent)
-        return gemfile_path if gemfile_path.file?
-
-        raise "Gemfile path \"#{gemfile_path}\" does not exist or is not a file"
-      end
-    end
-  end
-end

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

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/patches/eac_ruby_gems_utils/gem'
-
-module Avm
-  module Sources
-    class Configuration < ::EacConfig::OldConfigs
-      BUNDLE_TEST_COMMAND_KEY = 'test.bundle_command'
-      TEST_COMMAND_KEY = 'test.command'
-
-      def any_test_command
-        bundle_test_command || test_command
-      end
-
-      def test_command
-        read_command(TEST_COMMAND_KEY)
-      end
-
-      def bundle_test_command
-        read_entry(BUNDLE_TEST_COMMAND_KEY).if_present do |v|
-          args = v.is_a?(::Enumerable) ? v.map(&:to_s) : ::Shellwords.split(v)
-          ::EacRubyGemsUtils::Gem.new(::File.dirname(storage_path)).bundle(*args).chdir_root
-        end
-      end
-    end
-  end
-end