avm 0.11.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bc589fce7e7ecab9f13ac06d9f48990995ae1709ad593cb9a18053715f46508
-  data.tar.gz: a0e0fd0693719a46d2bd3d943b70cf13cef07ab89e96961a4f60f2fec343d3de
+  metadata.gz: 84721ab93d07c32f2b8c587c364a3cf3a3881b12c7984bf8011737eae8e47334
+  data.tar.gz: d54152761bbc8cd0ab059e96e3e8a4a8d102c9276b29362a92cc915a0cad3a94
 SHA512:
-  metadata.gz: 767b4cb523ef822a6a58a799efb5f839cd22c5dd251abd7d25267c45cb7d8fdb52fddd177c02cd7bf2866f73c555a3ad840394611d5817cc5339ead385eab4c4
-  data.tar.gz: 450c6420ff3864834e4e1cc1191671d7f655c34be7deb60131fbf19651c9e07dff056d73646bd483f8cccec62bcbe1134771d3968030daae4a3d36ef110cf94e
+  metadata.gz: e152406d787229dd1a56ff977fbcb4d50dac8667fb67360e323fc758420dbbd81efd37f5049dd1bbf8961aae93e6fa34ea865831dcdcbdd69f1e8d6a6e486749
+  data.tar.gz: a3b25728a082f27ca49e85fb191e8334be93cc8919df3175cdbd7264066d598ddb2cc9dc0a016d52ac450ba6a3afb6c5890ab12972be7e54dc13a1dff8d192f0

data/lib/avm/instances/application.rb

@@ -20,6 +20,10 @@ module Avm
       def instance(suffix)
         ::Avm::Instances::Base.new(self, suffix)
       end
+
+      def name
+        entry(::Avm::Instances::EntryKeys::NAME).read
+      end
     end
   end
 end

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

@@ -9,8 +9,8 @@ module Avm
       module AutoValues
         module Data
           def auto_data_default_dump_path
-            ::Avm::Self
-              .instance
+            ::Avm::Self::Instance
+              .default
               .read_entry_optional(::Avm::Self::Instance::EntryKeys::DATA_DEFAULT_PATH)
               .if_present do |v|
               ::File.join(

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

@@ -1,22 +1,20 @@
 # frozen_string_literal: true
 
+require 'avm/instances/entry_keys'
+
 module Avm
   module Instances
     class Base
       module AutoValues
         module Filesystem
-          FS_PATH_KEY = :fs_path
-
           def auto_fs_path
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, FS_PATH_KEY) do |v|
-              v + '/' + id
-            end
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID,
+                                  ::Avm::Instances::EntryKeys::FS_PATH) { |v| v + '/' + id }
           end
 
           def auto_data_fs_path
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, :data_fs_path) do |v|
-              v + '/' + id
-            end
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID,
+                                  ::Avm::Instances::EntryKeys::DATA_FS_PATH) { |v| v + '/' + id }
           end
 
           def auto_fs_url

data/lib/avm/instances/entry.rb

@@ -27,11 +27,11 @@ module Avm
       end
 
       def optional_value
-        read(required: false, noinput: true) || auto_value
+        context_entry.found? ? context_entry.value : auto_value
       end
 
-      def read(extra_options = {})
-        ::EacConfig::Node.context.current.entry(full_path, options.merge(extra_options)).value
+      def read
+        context_entry.value
       end
 
       def suffix_as_array
@@ -47,7 +47,13 @@ module Avm
       end
 
       def write(value)
-        ::EacConfig::Node.context.current.entry(full_path).value = value
+        context_entry.value = value
+      end
+
+      private
+
+      def context_entry
+        ::EacConfig::Node.context.current.entry(full_path)
       end
     end
   end

data/lib/avm/instances/entry_keys.rb

@@ -42,7 +42,7 @@ module Avm
       end
 
       {
-        '' => %w[fs_path host_id source_instance_id],
+        '' => %w[data_fs_path fs_path host_id name source_instance_id],
         database: %w[id hostname limit name password port system timeout username extra],
         docker: %w[registry],
         mailer: {

data/lib/avm/self/instance.rb

@@ -8,6 +8,14 @@ require 'avm/eac_ubuntu_base0/docker_image'
 module Avm
   module Self
     class Instance < ::Avm::Instances::Base
+      DEFAULT_INSTANCE_ID = 'avm_self'
+
+      class << self
+        def default
+          @default ||= by_id(DEFAULT_INSTANCE_ID)
+        end
+      end
+
       def docker_image_class
         ::Avm::Self::DockerImage
       end

data/lib/avm/sources/base.rb

@@ -37,7 +37,7 @@ module Avm
 
       # @return [Enumerable<Avm::Sources::Base>]
       def subs
-        scm.subs.map { |subrepo| self.class.new(subrepo.path, parent: self) }
+        scm.subs.map { |subrepo| ::Avm::Registry.sources.detect(subrepo.path, parent: self) }
       end
 
       private

data/lib/avm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-06 00:00:00.000000000 Z
+date: 2021-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_cli