avm 0.21.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3439e5be72641bfbb2057567b3066ee5a9fa0bb230ac4b755e541a501b2f51af
-  data.tar.gz: 47d2db526602f0054663417bf5e3d519408df59ba1e03c0fb16c9dc5ef23871e
+  metadata.gz: '0165809370dba684b9d456d8d28447e0d8cf625b9abe8f15a6b2d47aae905518'
+  data.tar.gz: f8f75c35fd20364008a777023f542cb505c4ee0774c093c1069d452a2656becf
 SHA512:
-  metadata.gz: f50e41ecf763e2901de01276d03dffb24c4b1322ab28cca1c7d19a0860bddeef3433b42667209b480481c24e074bcbe05fb1148f13f6206427db1be33c160ca7
-  data.tar.gz: 6d93ed47691853ae5a56c0577de8606ab72126fe4a83eefbf9d68ca6a88f1c6960369e8a183671fefdeb235b3a23550bbe5271d2d03382c7030de549948b0619
+  metadata.gz: ba30dc2ecb69636de16b65c6b2dc2b51e2e7014dec33f7958d9b8451cf515435868176d40570693e7f61b7e56a9896e0c40da3e98ce9e2c770acb2d06c339661
+  data.tar.gz: d54c9c0ba6c1fcbcd2f2dba2eff4fc360a300c0eccf6d801989a1f11eb44dd32ae740a6dc122768292dbc1a59e0c51773d2bf78770503d7ce51ccfa7bf91fe91

data/lib/avm/registry/base.rb

@@ -11,8 +11,7 @@ module Avm
 
       def detect(*registered_initialize_args)
         detect_optional(*registered_initialize_args) ||
-          raise("No registered module valid for #{registered_initialize_args}" \
-            " (Module suffix: #{module_suffix}, Available: #{registered_modules.join(', ')})")
+          raise_not_found(*registered_initialize_args)
       end
 
       def detect_optional(*registered_initialize_args)
@@ -38,6 +37,11 @@ module Avm
 
       private
 
+      def raise_not_found(*args)
+        raise("No registered module valid for #{args}" \
+            " (Module suffix: #{module_suffix}, Available: #{registered_modules.join(', ')})")
+      end
+
       def registered_modules_uncached
         registered_gems.flat_map { |registry| modules_from_registry(registry) }
           .select { |v| valid_registered_module?(v) }.uniq

data/lib/avm/registry/with_path.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'avm/registry/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Registry
+    class WithPath < ::Avm::Registry::Base
+      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
+        end
+        nil
+      end
+    end
+  end
+end

data/lib/avm/registry.rb

@@ -9,6 +9,8 @@ module Avm
     enable_listable
     lists.add_symbol :category, :instance_stereotypes, :runners, :scms, :sources
 
+    WITH_PATH = [CATEGORY_SCMS, CATEGORY_SOURCES].freeze
+
     class << self
       enable_simple_cache
 
@@ -21,7 +23,15 @@ module Avm
 
       ::Avm::Registry.lists.category.each_value do |category|
         define_method "#{category}_uncached" do
-          ::Avm::Registry::Base.new(category.to_s.camelize)
+          registry_class(category).new(category.to_s.camelize)
+        end
+      end
+
+      def registry_class(category)
+        if WITH_PATH.include?(category)
+          ::Avm::Registry::WithPath
+        else
+          ::Avm::Registry::Base
         end
       end
     end

data/lib/avm/scms/base.rb

@@ -33,13 +33,8 @@ module Avm
       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
+      def parent_scm_uncached
+        ::Avm::Registry.scms.detect_by_path_optional(path.parent)
       end
     end
   end

data/lib/avm/scms/null.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'avm/scms/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Scms
+    class Null < ::Avm::Scms::Base
+      def update
+        # Do nothing
+      end
+    end
+  end
+end

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

@@ -9,6 +9,8 @@ module Avm
   module Sources
     class Base
       module Configuration
+        CONFIGURATION_FILENAMES = %w[.avm.yml .avm.yaml].freeze
+
         # @return [Array<String>, nil]
         def read_configuration_as_shell_words(key)
           configuration.entry(key).value.if_present do |v|
@@ -16,14 +18,22 @@ module Avm
           end
         end
 
+        # Utility to read a configuration as a [EacRubyUtils::Envs::Command].
+        # @return [EacRubyUtils::Envs::Command]
+        def read_configuration_as_env_command(key)
+          read_configuration_as_shell_words(key).if_present do |v|
+            env.command(v).chdir(path)
+          end
+        end
+
         private
 
         # @return [EacConfig::YamlFileNode]
         def configuration_uncached
-          ::Avm::Sources::Configuration::FILENAMES.each do |filename|
+          CONFIGURATION_FILENAMES.each do |filename|
             configuration_with_filename(filename, true)
           end
-          configuration_with_filename(::Avm::Sources::Configuration::FILENAMES.first, false)
+          configuration_with_filename(CONFIGURATION_FILENAMES.first, false)
         end
 
         # @return [EacConfig::YamlFileNode, nil]

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'i18n'
+
+module Avm
+  module Sources
+    class Base
+      module Locale
+        LOCALE_KEY = 'locale'
+
+        def locale
+          configured_locale || default_locale
+        end
+
+        def configured_locale
+          configuration.entry(LOCALE_KEY).value
+        end
+
+        def default_locale
+          ::I18n.default_locale
+        end
+      end
+    end
+  end
+end

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

@@ -6,6 +6,12 @@ module Avm
   module Sources
     class Base
       module Testing
+        TEST_COMMAND_KEY = 'test.command'
+
+        def configured_test_command
+          read_configuration_as_env_command(TEST_COMMAND_KEY)
+        end
+
         # @return [Avm::Sources::Tester]
         def tester
           tester_class.new(self)

data/lib/avm/sources/base.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/registry'
+require 'avm/scms/null'
 require 'eac_git'
 require 'eac_ruby_utils/core_ext'
 
@@ -20,8 +21,6 @@ module Avm
 
       abstract_methods :update, :valid?
 
-      delegate :locale, to: :old_configuration
-
       # @return [EacRubyUtils::Envs::LocalEnv]
       def env
         ::EacRubyUtils::Envs::LocalEnv.new
@@ -47,7 +46,7 @@ module Avm
 
       # @return [Avm::Scms::Base]
       def scm_uncached
-        ::Avm::Registry.scms.detect(path)
+        ::Avm::Registry.scms.detect_optional(path) || ::Avm::Scms::Null.new(path)
       end
     end
   end

data/lib/avm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-29 00:00:00.000000000 Z
+date: 2022-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_cli
@@ -226,6 +226,7 @@ files:
 - lib/avm/path_string.rb
 - lib/avm/registry.rb
 - lib/avm/registry/base.rb
+- lib/avm/registry/with_path.rb
 - lib/avm/result.rb
 - lib/avm/rspec.rb
 - lib/avm/rspec/setup.rb
@@ -235,6 +236,7 @@ files:
 - lib/avm/scms/base.rb
 - lib/avm/scms/commit.rb
 - lib/avm/scms/inflector.rb
+- lib/avm/scms/null.rb
 - lib/avm/self/docker_image.rb
 - lib/avm/self/instance.rb
 - lib/avm/self/instance/entry_keys.rb
@@ -242,14 +244,13 @@ files:
 - lib/avm/sources/base.rb
 - lib/avm/sources/base/configuration.rb
 - lib/avm/sources/base/instance.rb
+- lib/avm/sources/base/locale.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/tester.rb
 - lib/avm/sources/tests.rb
 - lib/avm/sources/tests/builder.rb

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

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/patches/eac_ruby_gems_utils/gem'
-require 'i18n'
-
-module Avm
-  module Sources
-    class Configuration < ::EacConfig::OldConfigs
-      module Locale
-        LOCALE_KEY = :locale
-
-        def locale
-          read_entry(LOCALE_KEY) || ::I18n.default_locale
-        end
-      end
-    end
-  end
-end

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

@@ -1,29 +0,0 @@
-# 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