avm 0.40.0 → 0.42.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29538404e81ca5b9e3c7043a5b665b9a73f4bb662b7e5d6d1de891154c3bdddf
-  data.tar.gz: a2e2216c1cbdaf94044f3b59ee1c0aec69e193720d3f6312c25a6aad59865ea0
+  metadata.gz: 64ca72cb2ab91751e6ac2bf8e81404c0c5111ccbe4971ea349bd38ee490735e2
+  data.tar.gz: 1b840a43b5511128fa3f1cbf54395a3fb435f2c5cd0bb59293aac6fdd970c4e4
 SHA512:
-  metadata.gz: c4e2ac1e34e6d64bc030183c414507b5ca15e82039ff16728727786357b5922c8a193cd58ffd2b51d40b0055531ce94b111135e1ff0589e198099b40b3421f3d
-  data.tar.gz: f430f917bd972158fdfbef76de2f72ecfa4a514df8d333dc360cdaaf6adcc6bbc4dabce9f37371c07b00fde76bc8eda1162787c20ab2a2e1edc80c736a70a98f
+  metadata.gz: 4a6b697d1114c887b4590f51afe76b0bde03b471b3eabfbcf904c5b31fcd686d15eb355cb43a9145e934de2cd60f3ecf045abefda892b4feb3835f7392e5d2cf
+  data.tar.gz: a9331ce632924f1bc83a6ac93b12609abbeb92eec20c04d6c3340d19779ffd8876c63b238cf017ad351e4b7b219fe9ab4ae84bd95ac912f6d92c26a09304c17f

data/lib/avm/applications/base.rb

@@ -38,7 +38,7 @@ module Avm
 
       # @return [Avm::Sources::Base]
       def local_source_uncached
-        ::Avm::Registry.sources.detect(local_instance.fs_path)
+        ::Avm::Registry.sources.detect(local_instance.install_path)
       end
     end
   end

data/lib/avm/data/instance/files_unit.rb

@@ -18,7 +18,8 @@ module Avm
         before_load :clear_files
 
         def files_path
-          ::File.join(instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH), fs_path_subpath)
+          ::File.join(instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH),
+                      fs_path_subpath)
         end
 
         def dump_command

data/lib/avm/entries/base/uri_component_entry_value/default_value.rb

@@ -11,10 +11,10 @@ module Avm
         class DefaultValue
           enable_method_class
           common_constructor :uri_component_entry_value
-          delegate :component, :entries_provider, to: :uri_component_entry_value
+          delegate :component_entry_path, :entries_provider, to: :uri_component_entry_value
 
           def default_value_method_name
-            "#{component}_default_value"
+            "#{component_entry_path.parts.join('_').variableize}_default_value"
           end
 
           def result

data/lib/avm/entries/base/uri_component_entry_value/inherited_value.rb

@@ -11,7 +11,7 @@ module Avm
         class InheritedValue
           enable_method_class
           common_constructor :uri_component_entry_value
-          delegate :component, :entries_provider, :id_entry_path, :component_entry_path,
+          delegate :entries_provider, :id_entry_path, :component_entry_path,
                    to: :uri_component_entry_value
 
           def result
@@ -29,7 +29,7 @@ module Avm
           end
 
           def inherited_value_block_method_name
-            "#{component}_inherited_value_proc".to_sym
+            "#{component_entry_path.parts.join('_').variableize}_inherited_value_proc".to_sym
           end
         end
       end

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

@@ -28,13 +28,17 @@ module Avm
             ::Avm::Entries::AutoValues::UriEntry.new(self, 'install').value
           end
 
-          def data_path_inherited_value_proc(value)
+          def install_data_path_inherited_value_proc(value)
             value + '/' + id
           end
 
-          def groupname_default_value
+          def install_groupname_default_value
             read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_USERNAME)
           end
+
+          def install_path_inherited_value_proc(value)
+            install_data_path_inherited_value_proc(value)
+          end
         end
       end
     end

data/lib/avm/instances/base.rb

@@ -51,11 +51,10 @@ module Avm
       end
 
       def host_env_uncached
-        install_uri = entry(::Avm::Instances::EntryKeys::INSTALL_URL).value.to_uri
-        case install_uri.scheme
+        case install_scheme
         when 'file' then ::EacRubyUtils::Envs.local
-        when 'ssh' then ::EacRubyUtils::Envs.ssh(install_uri)
-        else raise("Unmapped access value: \"#{install_uri}\"")
+        when 'ssh' then ::EacRubyUtils::Envs.ssh(install_url)
+        else raise("Unmapped access value: \"#{install_scheme}\"")
         end
       end
 

data/lib/avm/instances/entry_keys.rb

@@ -45,7 +45,7 @@ module Avm
       end
 
       {
-        '' => %w[fs_path name source_instance_id],
+        '' => %w[name source_instance_id],
         admin: URI_FIELDS + %w[api_key],
         database: URI_FIELDS + %w[id limit name system timeout extra],
         docker: %w[registry],

data/lib/avm/instances/runner.rb

@@ -6,35 +6,31 @@ require 'eac_cli/core_ext'
 module Avm
   module Instances
     class Runner < ::Avm::Runners::Base
-      class << self
-        def application_stereotype
-          ::Avm::Registry.application_stereotypes.detect(stereotype_name)
-        end
-
-        delegate :instance_class, to: :application_stereotype
+      runner_with :help, :subcommands do
+        desc 'Utilities for a instance.'
+        pos_arg 'instance-id'
+        subcommands
+      end
 
-        def stereotype_module
-          ::Avm.const_get(stereotype_name)
-        end
+      delegate :class, to: :instance, prefix: true
+      delegate :stereotype_module, :stereotype_name, to: :class
 
-        def stereotype_name
-          name.demodulize
-        end
+      def extra_available_subcommands
+        instance.if_present({}, &:extra_available_subcommands)
       end
 
-      description = "Utilities for #{stereotype_name} instances."
-      runner_with :help, :subcommands do
-        desc description
-        pos_arg 'instance-id'
-        subcommands
+      def stereotype_module
+        instance.application.stereotype.namespace_module
       end
 
-      delegate :instance_class, :stereotype_module, :stereotype_name, to: :class
+      def stereotype_name
+        stereotype_module.name
+      end
 
       private
 
       def instance_uncached
-        self.class.instance_class.by_id(parsed.instance_id)
+        parsed.instance_id.if_present { |v| ::Avm::Registry.instances.detect(v) }
       end
     end
   end

data/lib/avm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.40.0
+  version: 0.42.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-18 00:00:00.000000000 Z
+date: 2022-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_cli
@@ -97,6 +97,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.102'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.102.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -104,6 +107,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.102'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.102.1
 - !ruby/object:Gem::Dependency
   name: eac_templates
   requirement: !ruby/object:Gem::Requirement
@@ -250,7 +256,6 @@ files:
 - lib/avm/instances/base/auto_values/admin.rb
 - lib/avm/instances/base/auto_values/data.rb
 - lib/avm/instances/base/auto_values/database.rb
-- lib/avm/instances/base/auto_values/filesystem.rb
 - lib/avm/instances/base/auto_values/install.rb
 - lib/avm/instances/base/auto_values/mailer.rb
 - lib/avm/instances/base/auto_values/ruby.rb

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

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/instances/entry_keys'
-
-module Avm
-  module Instances
-    class Base
-      module AutoValues
-        module Filesystem
-          def auto_fs_path
-            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
-                                  ::Avm::Instances::EntryKeys::FS_PATH) { |v| v + '/' + id }
-          end
-        end
-      end
-    end
-  end
-end