avm 0.26.0 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 409db17d04ee296956e9770e61a5f65919fbf2b0c8bea4efae0ed68fb169572a
-  data.tar.gz: 3c7e6ea386a2527ed86c3bb9ef8a71b1767d17a204d48b1ecc3b74c015772328
+  metadata.gz: 2c59abe8a0046009874c49f168a3fba854d33721aaaf0bfbb95d96c0556c9aae
+  data.tar.gz: 8308f974d093782ed03f490365580fa4e5c838cd55da3c76fd4edf6972f59ccf
 SHA512:
-  metadata.gz: 302b99ff7495bf6c3f4624432e63f1f2668f8b5d2a2ac91bc721f3206baf9595520c192fa4ead326ad7ce3c646253ca7f1a71a48ee1b11080e1898efe4fef5f8
-  data.tar.gz: 7b85ae2c2a03f3abfeed96924ab6e0180d17709ec422cd3b0638f7075cc750c25a8118d7654554ecfe80519fdeb505da9aa720f2109fdf7bcacfdf7bf884d141
+  metadata.gz: 3544c95b8ffef42a7e9c8d1ad9e16f6984c945e861e2d5b0ce48c5744295087d5941dfa3c9191aefd96703762b2704cb630346f109a4c1348560e4361011b3f9
+  data.tar.gz: bbe9fb54467880e6b69d3954d79c72cac7cd541a300761ebc8cde38b234e5eead3febc889b81871d8079cf4ba95ec33b781ddf26d2ade447660a1c31e03c7486

data/lib/avm/application_stereotypes/base.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module ApplicationStereotypes
+    class Base
+      common_constructor :namespace_module, :instance_class, :source_class
+
+      # @return [String]
+      def name
+        namespace_module.name.demodulize
+      end
+
+      # @return [String]
+      def to_s
+        name
+      end
+    end
+  end
+end

data/lib/avm/application_stereotypes.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module ApplicationStereotypes
+    require_sub __FILE__
+  end
+end

data/lib/avm/applications/base/stereotype.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'avm/registry'
+
+module Avm
+  module Applications
+    class Base
+      module Stereotype
+        # @return [Avm::ApplicationStereotypes::Base, nil]
+        def stereotype_by_configuration
+          entry('stereotype').optional_value.if_present do |v|
+            ::Avm::Registry.application_stereotypes.detect(v)
+          end
+        end
+
+        # @return [Avm::ApplicationStereotypes::Base, nil]
+        def stereotype_by_source
+          ::Avm::Registry.application_stereotypes.detect_optional(local_source.class)
+        end
+
+        private
+
+        # @return [Avm::ApplicationStereotypes::Base]
+        def stereotype_uncached
+          stereotype_by_configuration || stereotype_by_source ||
+            raise("Could not find stereotype for application \"#{self}\"")
+        end
+      end
+    end
+  end
+end

data/lib/avm/applications/base.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'avm/instances/entries'
+require 'avm/registry'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Applications
+    class Base
+      enable_simple_cache
+      require_sub __FILE__, include_modules: true
+      include ::Avm::Instances::Entries
+
+      LOCAL_INSTANCE_SUFFIX = 'dev'
+
+      common_constructor :id do
+        self.id = id.to_s
+      end
+
+      def to_s
+        id
+      end
+
+      def instance(suffix)
+        ::Avm::Instances::Base.new(self, suffix)
+      end
+
+      def name
+        entry(::Avm::Instances::EntryKeys::NAME).read
+      end
+
+      private
+
+      # @return [Avm::Instances::Base]
+      def local_instance_uncached
+        instance(LOCAL_INSTANCE_SUFFIX)
+      end
+
+      # @return [Avm::Sources::Base]
+      def local_source_uncached
+        ::Avm::Registry.sources.detect(local_instance.fs_path)
+      end
+    end
+  end
+end

data/lib/avm/applications.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Applications
+    require_sub __FILE__
+  end
+end

data/lib/avm/docker/image.rb

@@ -3,16 +3,26 @@
 require 'avm/version'
 require 'eac_ruby_utils/core_ext'
 require 'eac_docker/images/templatized'
+require 'eac_docker/registry'
 
 module Avm
   module Docker
     class Image < ::EacDocker::Images::Templatized
+      DEFAULT_REGISTRY_NAME = 'local'
+
+      class << self
+        # @return [EacDocker::Registry]
+        def default_registry
+          ::EacDocker::Registry.new(DEFAULT_REGISTRY_NAME)
+        end
+      end
+
       attr_reader :registry
       attr_accessor :snapshot
       attr_accessor :version
 
-      def initialize(registry)
-        @registry = registry
+      def initialize(registry = nil)
+        @registry = registry || self.class.default_registry
         self.snapshot = true
         self.version = true
       end

data/lib/avm/instances/base.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'avm/with_application_stereotype'
+require 'avm/with_dynamic_runners'
 require 'eac_ruby_utils/require_sub'
 require 'eac_ruby_utils/simple_cache'
 require 'avm/instances/entries'
@@ -7,10 +9,13 @@ require 'avm/instances/entries'
 module Avm
   module Instances
     class Base
+      enable_abstract_methods
       enable_listable
       enable_simple_cache
       require_sub __FILE__, include_modules: true
       include ::Avm::Instances::Entries
+      include ::Avm::WithDynamicRunners
+      include ::Avm::WithApplicationStereotype
 
       lists.add_string :access, :local, :ssh
 
@@ -19,8 +24,8 @@ module Avm
       class << self
         def by_id(id)
           application_id, suffix = parse_id(id)
-          require 'avm/instances/application'
-          new(::Avm::Instances::Application.new(application_id), suffix)
+          require 'avm/applications/base'
+          new(::Avm::Applications::Base.new(application_id), suffix)
         end
 
         private

data/lib/avm/instances.rb

@@ -2,7 +2,7 @@
 
 module Avm
   module Instances
-    require 'avm/instances/application'
+    require 'avm/applications/base'
     require 'avm/instances/entries'
   end
 end

data/lib/avm/registry/application_stereotypes/build_available.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'avm/registry/application_stereotypes/stereotype_builder'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Registry
+    class ApplicationStereotypes
+      class BuildAvailable
+        enable_method_class
+
+        common_constructor :owner
+
+        def result
+          reset_buffer
+          read_instances_registry
+          read_sources_registry
+          buffer.values.map(&:build)
+        end
+
+        private
+
+        attr_accessor :buffer
+
+        def read_object(type, object)
+          buffer[object.stereotype_namespace_module] ||=
+            ::Avm::Registry::ApplicationStereotypes::StereotypeBuilder
+              .new(object.stereotype_namespace_module)
+          buffer[object.stereotype_namespace_module].add_object(type, object)
+        end
+
+        def read_instances_registry
+          ::Avm::Registry.instances.available.each { |instance| read_object(:instance, instance) }
+        end
+
+        def read_sources_registry
+          ::Avm::Registry.sources.available.each { |source| read_object(:source, source) }
+        end
+
+        def reset_buffer
+          self.buffer = {}
+        end
+      end
+    end
+  end
+end

data/lib/avm/registry/application_stereotypes/stereotype_builder.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'avm/application_stereotypes/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Registry
+    class ApplicationStereotypes
+      class StereotypeBuilder
+        common_constructor :namespace_module
+
+        def add_object(type, object)
+          attr_method = "#{type}_class"
+          raise "#{attr_method} is already present" if send(attr_method).present?
+
+          send("#{attr_method}=", object)
+        end
+
+        # @return [Avm::ApplicationStereotypes::Base]
+        def build
+          ::Avm::ApplicationStereotypes::Base.new(namespace_module, instance_class, source_class)
+        end
+
+        private
+
+        attr_accessor :instance_class, :source_class
+      end
+    end
+  end
+end

data/lib/avm/registry/application_stereotypes.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'avm/instances/base'
+require 'avm/sources/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Registry
+    class ApplicationStereotypes
+      require_sub __FILE__, require_dependency: true
+      enable_simple_cache
+
+      common_constructor :module_suffix
+
+      def detect(obj)
+        detect_optional(obj) || raise_not_found(obj)
+      end
+
+      def detect_optional(obj)
+        detect_by_instance_class(obj) || detect_by_source_class(obj) || detecy_by_name(obj)
+      end
+
+      private
+
+      def available_uncached
+        build_available
+      end
+
+      def detect_by_instance_class(obj)
+        return nil unless obj.is_a?(::Class) && obj < ::Avm::Instances::Base
+
+        available.find { |a| a.instance_class == obj }
+      end
+
+      def detecy_by_name(obj)
+        return nil unless obj.is_a?(::String)
+
+        available.find { |a| a.name == obj }
+      end
+
+      def detect_by_source_class(obj)
+        return nil unless obj.is_a?(::Class) && obj < ::Avm::Sources::Base
+
+        available.find { |a| a.source_class == obj }
+      end
+
+      def raise_not_found(obj)
+        raise("No registered module valid for #{obj} (Available: #{available.join(', ')})")
+      end
+    end
+  end
+end

data/lib/avm/registry/{base.rb → from_gems.rb}

@@ -5,18 +5,27 @@ require 'eac_ruby_utils/gems_registry'
 
 module Avm
   module Registry
-    class Base
+    class FromGems
+      enable_abstract_methods
       enable_simple_cache
       common_constructor :module_suffix
 
+      def available
+        registered_modules.reject(&:abstract?)
+      end
+
+      def class_detect(_klass, _detect_args)
+        raise_abstract_method __method__
+      end
+
       def detect(*registered_initialize_args)
         detect_optional(*registered_initialize_args) ||
           raise_not_found(*registered_initialize_args)
       end
 
       def detect_optional(*registered_initialize_args)
-        registered_modules.reverse.lazy.map { |klass| klass.new(*registered_initialize_args) }
-          .find(&:valid?)
+        available.reverse.lazy
+          .map { |klass| class_detect(klass, registered_initialize_args) }.find(&:present?)
       end
 
       def provider_module_suffix
@@ -39,7 +48,7 @@ module Avm
 
       def raise_not_found(*args)
         raise("No registered module valid for #{args}" \
-            " (Module suffix: #{module_suffix}, Available: #{registered_modules.join(', ')})")
+            " (Module suffix: #{module_suffix}, Available: #{available.join(', ')})")
       end
 
       def registered_modules_uncached

data/lib/avm/registry/instances.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'avm/instances/base'
+require 'avm/registry/from_gems'
+
+module Avm
+  module Registry
+    class Instances < ::Avm::Registry::FromGems
+      # @return [Avm::Instances::Base, nil]
+      def class_detect(klass, detect_args)
+        r = ::Avm::Instances::Base.by_id(*detect_args)
+        r.application.stereotype.instance_class == klass ? klass.by_id(*detect_args) : nil
+      end
+    end
+  end
+end

data/lib/avm/registry/runners.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'avm/registry/from_gems'
+
+module Avm
+  module Registry
+    class Runners < ::Avm::Registry::FromGems
+    end
+  end
+end

data/lib/avm/registry/scms.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'avm/registry/with_path'
+
+module Avm
+  module Registry
+    class Scms < ::Avm::Registry::WithPath
+    end
+  end
+end

data/lib/avm/registry/sources.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'avm/registry/with_path'
+
+module Avm
+  module Registry
+    class Sources < ::Avm::Registry::WithPath
+    end
+  end
+end

data/lib/avm/registry/with_path/cache.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'avm/registry/base'
+require 'avm/registry/from_gems'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Registry
-    class WithPath < ::Avm::Registry::Base
+    class WithPath < ::Avm::Registry::FromGems
       class Cache
         enable_simple_cache
         common_constructor :owner

data/lib/avm/registry/with_path.rb

@@ -1,13 +1,19 @@
 # frozen_string_literal: true
 
-require 'avm/registry/base'
+require 'avm/registry/from_gems'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Registry
-    class WithPath < ::Avm::Registry::Base
+    class WithPath < ::Avm::Registry::FromGems
       require_sub __FILE__
 
+      # @return [Object, nil]
+      def class_detect(klass, detect_args)
+        r = klass.new(*detect_args)
+        r.valid? ? r : nil
+      end
+
       def detect_by_path(path)
         detect_by_path_optional(path) || raise_not_found(path)
       end

data/lib/avm/registry.rb

@@ -7,14 +7,14 @@ module Avm
   module Registry
     require_sub __FILE__
     enable_listable
-    lists.add_symbol :category, :instance_stereotypes, :runners, :scms, :sources
+    lists.add_symbol :category, :application_stereotypes, :instances, :runners, :scms, :sources
 
     WITH_PATH = [CATEGORY_SCMS, CATEGORY_SOURCES].freeze
 
     class << self
       enable_simple_cache
 
-      # @return [Array<Avm::Registry::Base>]
+      # @return [Array<Avm::Registry::FromGems>]
       def registries
         lists.category.values.map { |c| send(c) }
       end
@@ -28,11 +28,7 @@ module Avm
       end
 
       def registry_class(category)
-        if WITH_PATH.include?(category)
-          ::Avm::Registry::WithPath
-        else
-          ::Avm::Registry::Base
-        end
+        ::Avm::Registry.const_get(category.to_s.camelize)
       end
     end
   end

data/lib/avm/rspec/shared_examples/not_in_avm_registry.rb

@@ -7,7 +7,7 @@ require 'avm/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)
+        expect(registry.available).not_to include(described_class)
       end
     end
   end

data/lib/avm/scms/base.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/with_application_stereotype'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -7,6 +8,7 @@ module Avm
     class Base
       enable_abstract_methods
       enable_simple_cache
+      include ::Avm::WithApplicationStereotype
       abstract_methods :update, :valid?
       common_constructor :path do
         self.path = path.to_pathname

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/instances/application'
+require 'avm/applications/base'
 require 'avm/instances/base'
 
 module Avm
@@ -16,7 +16,7 @@ module Avm
         private
 
         def application_uncached
-          ::Avm::Instances::Application.new(path.basename)
+          ::Avm::Applications::Base.new(path.basename)
         end
 
         def instance_uncached

data/lib/avm/sources/base.rb

@@ -2,6 +2,8 @@
 
 require 'avm/registry'
 require 'avm/scms/null'
+require 'avm/with_application_stereotype'
+require 'avm/with_dynamic_runners'
 require 'eac_git'
 require 'eac_ruby_utils/core_ext'
 
@@ -9,6 +11,8 @@ module Avm
   module Sources
     class Base
       require_sub __FILE__, include_modules: true
+      include ::Avm::WithApplicationStereotype
+      include ::Avm::WithDynamicRunners
       compare_by :path
       enable_abstract_methods
       enable_simple_cache

data/lib/avm/version.rb

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

data/lib/avm/with_application_stereotype.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'eac_cli/runner_with/subcommands'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module WithApplicationStereotype
+    common_concern do
+      include ClassMethods
+    end
+
+    module ClassMethods
+      # @return [Module]
+      def stereotype_namespace_module
+        module_parent.module_parent
+      end
+    end
+
+    def stereotype_namespace_module
+      self.class.stereotype_namespace_module
+    end
+  end
+end

data/lib/avm/with_dynamic_runners.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'eac_cli/runner_with/subcommands'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module WithDynamicRunners
+    # @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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.29.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-21 00:00:00.000000000 Z
+date: 2022-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_cli
@@ -195,6 +195,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/avm.rb
+- lib/avm/application_stereotypes.rb
+- lib/avm/application_stereotypes/base.rb
+- lib/avm/applications.rb
+- lib/avm/applications/base.rb
+- lib/avm/applications/base/stereotype.rb
 - lib/avm/data/instance.rb
 - lib/avm/data/instance/files_unit.rb
 - lib/avm/data/instance/package.rb
@@ -210,7 +215,6 @@ files:
 - lib/avm/docker/runner.rb
 - lib/avm/executables.rb
 - lib/avm/instances.rb
-- lib/avm/instances/application.rb
 - lib/avm/instances/base.rb
 - lib/avm/instances/base/auto_values.rb
 - lib/avm/instances/base/auto_values/access.rb
@@ -239,7 +243,14 @@ files:
 - lib/avm/launcher/publish/check_result.rb
 - lib/avm/path_string.rb
 - lib/avm/registry.rb
-- lib/avm/registry/base.rb
+- lib/avm/registry/application_stereotypes.rb
+- lib/avm/registry/application_stereotypes/build_available.rb
+- lib/avm/registry/application_stereotypes/stereotype_builder.rb
+- lib/avm/registry/from_gems.rb
+- lib/avm/registry/instances.rb
+- lib/avm/registry/runners.rb
+- lib/avm/registry/scms.rb
+- lib/avm/registry/sources.rb
 - lib/avm/registry/with_path.rb
 - lib/avm/registry/with_path/cache.rb
 - lib/avm/result.rb
@@ -261,7 +272,6 @@ files:
 - 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
@@ -275,6 +285,8 @@ files:
 - lib/avm/sync.rb
 - lib/avm/version.rb
 - lib/avm/version_number.rb
+- lib/avm/with_application_stereotype.rb
+- lib/avm/with_dynamic_runners.rb
 homepage: 
 licenses: []
 metadata: {}

data/lib/avm/instances/application.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/instances/entries'
-
-module Avm
-  module Instances
-    class Application
-      include ::Avm::Instances::Entries
-
-      attr_reader :id
-
-      def initialize(id)
-        @id = id.to_s
-      end
-
-      def to_s
-        id
-      end
-
-      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/sources/base/runners.rb

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