avm 0.17.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edd4c18a4938a22e0913c03f4fea9ecd3e88fad97b0b9af4c259921d7a599834
-  data.tar.gz: 7120426eaba5a99f1138e588c1e2b1a8d3e5e424d1e4abc29ddeab703a99dd17
+  metadata.gz: 60254779c64e435b8f853ab931907a47eefb974428e2298dc82b2f6d308d642a
+  data.tar.gz: 8c054b755c9882ed5b1faaa0c521031edf3551139d04259e0e11895844b4ef63
 SHA512:
-  metadata.gz: 314413e3a55d8a090b7f793846300b0be4fde3468865ab395358d1029c537c7974ee2190973be7a703b48cfcc2b22f1da2b02b0c0a00fb1a99b233fb3a0a6b1a
-  data.tar.gz: 3f9eb9c95d16ab50104ee56aa8390df9d2eaf34a851e2168002b385f9189aa7df04153a8008595528a1ac167fab29732baeab251579ac6a577490691aa1cf40f
+  metadata.gz: 3b7aadec66e69a23688c07dffd62f05d1579a1b14c90f57f2e5e6b2caf460e59b394ac62fe60178428100caf5359ab04ae21fecf958748dd01553129cb7d3304
+  data.tar.gz: c7eddaff6582abdbbb12d6b09a919b199505c1d4189fc8a6696eec61c39f5c41d3b4670d92278b9d30e049b49a99271b0826cb4d079c1b6ab2190424029d0274

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/instances/entry_keys.rb

@@ -43,8 +43,10 @@ module Avm
 
       {
         '' => %w[data_fs_path fs_path host_id name source_instance_id],
+        admin: %w[username password api_key],
         database: %w[id hostname limit name password port system timeout username extra],
         docker: %w[registry],
+        fs: %w[url],
         mailer: {
           '' => %w[id from reply_to],
           smtp: %w[address port domain username password authentication openssl_verify_mode

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

@@ -29,7 +29,8 @@ module Avm
 
         # @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.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,6 +29,10 @@ module Avm
         path.relative_path_from(parent.path)
       end
 
+      def to_s
+        "#{self.class}[#{path}]"
+      end
+
       # @return [Enumerable<Avm::Sources::Base>]
       def subs
         scm.subs.map { |subrepo| ::Avm::Registry.sources.detect(subrepo.path, parent: self) }

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.17.0'
+  VERSION = '0.19.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-04 00:00:00.000000000 Z
+date: 2022-06-14 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,12 @@ 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/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