avm 0.20.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4da4c32db86b5e0217282e7954683ff84d63ddc8b34a7413bc8b255090a5d15c
-  data.tar.gz: b9c369085dcd50e3787c110c828b702eb44b5a1c28a3c036217e6dae19301da8
+  metadata.gz: 9dbfd028daf9c304679d35bee81282c6bfbee007613933e1482c9b3c58cf824d
+  data.tar.gz: 16bdf2e2fafcd9bfc52cdeabb555ff1ce392d8e4165661f3e74ca00b5304d2ee
 SHA512:
-  metadata.gz: 419e7911860b01a11ab6cc5fa901abc5585adbb28d4e2c6cfcf27cb189b4f63abc631e961835ad150b86dada322cc30764996387a92aede230922b6b449e2d5e
-  data.tar.gz: 2ee319d2462b5c8611d719b64d8e4c75376fd4c3d6e1752f8a88fcbe858a87cd058a28f7017cda47089c70436a86d2b4374e89a724c2d73201287d8f8405927b
+  metadata.gz: f649eb88ed02c4201cc7810836e923932772685eee29f7274f1fe8e3c1202205829607e093c817a52ad50ef12253e2d43415537e40b7b84d3082e73aa99d893e
+  data.tar.gz: 5ebb0af2860921456ee00f4c5867ae4e68f916977aacee5c915044e95cb53162ae34dc3df6abc11234456cce04abeb5f228aa2bd745b769d2f59b5cab4e94cfe

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/runners.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'avm/sources/base/subs_paths'
+require 'eac_cli/runner_with/subcommands'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Sources
+    class Base
+      module Runners
+        # @return [Hash<String, EacCli::Runner>]
+        def extra_available_subcommands
+          extra_available_subcommands_from_runners_module
+        end
+
+        # @return [Hash<String, EacCli::Runner>]
+        def extra_available_subcommands_from_runners_module
+          self.class.ancestors.reverse.inject({}) do |a, e|
+            a.merge(RunnersFromModule.new(e).result)
+          end
+        end
+
+        class RunnersFromModule
+          enable_simple_cache
+          common_constructor :the_module
+
+          # @return [Hash<String, EacCli::Runner>]
+          def result
+            return {} if runners_module.blank?
+
+            ::EacCli::RunnerWith::Subcommands.subcommands_from_module(runners_module)
+          end
+
+          def runners_module_uncached
+            return nil if the_module.module_parent.blank?
+
+            begin
+              the_module.module_parent.const_get('Runners')
+            rescue ::NameError
+              nil
+            end
+          end
+        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,7 +21,10 @@ module Avm
 
       abstract_methods :update, :valid?
 
-      delegate :locale, to: :old_configuration
+      # @return [EacRubyUtils::Envs::LocalEnv]
+      def env
+        ::EacRubyUtils::Envs::LocalEnv.new
+      end
 
       # @return [Pathname]
       def relative_path
@@ -37,7 +41,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.20.0'
+  VERSION = '0.23.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-25 00:00:00.000000000 Z
+date: 2022-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_cli
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '0.27'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.23.1
+        version: 0.27.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '0.27'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.23.1
+        version: 0.27.6
 - !ruby/object:Gem::Dependency
   name: eac_docker
   requirement: !ruby/object:Gem::Requirement
@@ -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,14 @@ 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/runners.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