avm 0.27.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e8acabcae2be2a5ede0d16f23948a2fde0073eadcb0aa4affec5af992db9ee9
-  data.tar.gz: e2a626b43d125f5f3c79173753e8a94edf8d1894aca17ba5299a94a5e9f3639c
+  metadata.gz: 056fb39001835d22921692f1801a184d8b94852259e282520eb992ce5ffa29f4
+  data.tar.gz: 4f951bd5a35dfe20f25c27f67e7c6ee6c1db3cc4a6d9a8529d614b57bd655cee
 SHA512:
-  metadata.gz: 758bf21073943b0e38cb7dccd36592220a6b55c4286e37be1b7fd33cb4476d3d4d72a3e4d097b64b2aad6a0790685ebf89460d51ecbe4bd60334051cd6a4af26
-  data.tar.gz: 827a1b04ef6b93dface81cf9d6e1c30f78d4b60fa3246a35147f124acbcc57839f7b26302b977fab10ddd9189894ab3536108d244c1920fa0f43c71fbbed8123
+  metadata.gz: 69a12b474da5a2aa07e41250569f4ce0786e51800958157b6d437a74480f5244e5f2846ca7b8ee2c495a5907adf8c7d289f7eef8e313244cc8ccc8f2066ef29e
+  data.tar.gz: a52eb72873f40f8fe55ed3009ecb3b3914512f8a17159f1dbed1aeda3383d76911947c7eef2ccb7a33af1a3c8294ee0767f18a6dc4a03cf78a8faa1f9f998325

data/lib/avm/application_stereotypes/base.rb

@@ -5,7 +5,11 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module ApplicationStereotypes
     class Base
-      common_constructor :namespace_module, :instance_class, :source_class
+      enable_listable
+      lists.add_symbol :resource, :instance, :source, :source_generator
+      common_constructor :namespace_module, :resources do
+        self.resources = self.class.lists.resource.hash_keys_validate!(resources)
+      end
 
       # @return [String]
       def name
@@ -16,6 +20,12 @@ module Avm
       def to_s
         name
       end
+
+      lists.resource.each_value do |resource|
+        define_method "#{resource}_class" do
+          resources[resource]
+        end
+      end
     end
   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

@@ -1,13 +1,18 @@
 # 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
@@ -23,6 +28,18 @@ module Avm
       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/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/registry/application_stereotypes/build_available.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/application_stereotypes/base'
 require 'avm/registry/application_stereotypes/stereotype_builder'
 require 'eac_ruby_utils/core_ext'
 
@@ -13,8 +14,7 @@ module Avm
 
         def result
           reset_buffer
-          read_instances_registry
-          read_sources_registry
+          read_registries
           buffer.values.map(&:build)
         end
 
@@ -29,12 +29,15 @@ module Avm
           buffer[object.stereotype_namespace_module].add_object(type, object)
         end
 
-        def read_instances_registry
-          ::Avm::Registry.instances.available.each { |instance| read_object(:instance, instance) }
+        def read_registries
+          ::Avm::ApplicationStereotypes::Base.lists.resource.each_value do |resource|
+            read_registry(resource)
+          end
         end
 
-        def read_sources_registry
-          ::Avm::Registry.sources.available.each { |source| read_object(:source, source) }
+        def read_registry(resource)
+          ::Avm::Registry.send(resource.to_s.pluralize).available
+            .each { |obj| read_object(resource, obj) }
         end
 
         def reset_buffer

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

@@ -10,20 +10,23 @@ module Avm
         common_constructor :namespace_module
 
         def add_object(type, object)
-          attr_method = "#{type}_class"
-          raise "#{attr_method} is already present" if send(attr_method).present?
+          type = type.to_sym
+          raise "#{attr_method} is already present" if resources.key?(type)
 
-          send("#{attr_method}=", object)
+          resources[::Avm::ApplicationStereotypes::Base.lists.resource.value_validate!(type)] =
+            object
         end
 
         # @return [Avm::ApplicationStereotypes::Base]
         def build
-          ::Avm::ApplicationStereotypes::Base.new(namespace_module, instance_class, source_class)
+          ::Avm::ApplicationStereotypes::Base.new(namespace_module, resources)
         end
 
         private
 
-        attr_accessor :instance_class, :source_class
+        def resources
+          @resources ||= {}
+        end
       end
     end
   end

data/lib/avm/registry/application_stereotypes.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'avm/instances/base'
+require 'avm/sources/base'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -10,26 +12,40 @@ module Avm
 
       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
 
-      # @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 ? r : nil
+      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 detect(*registered_initialize_args)
-        detect_optional(*registered_initialize_args) ||
-          raise_not_found(*registered_initialize_args)
+      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 detect_optional(*registered_initialize_args)
-        registered_modules.reverse.lazy
-          .map { |klass| class_detect(klass, registered_initialize_args) }.find(&:present?)
+      def raise_not_found(obj)
+        raise("No registered module valid for #{obj} (Available: #{available.join(', ')})")
       end
     end
   end

data/lib/avm/registry/instances.rb

@@ -9,7 +9,7 @@ module Avm
       # @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 ? r : nil
+        r.application.stereotype.instance_class == klass ? klass.by_id(*detect_args) : nil
       end
     end
   end

data/lib/avm/registry/source_generators.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'avm/instances/base'
+require 'avm/registry/from_gems'
+
+module Avm
+  module Registry
+    class SourceGenerators < ::Avm::Registry::FromGems
+      # @return [Avm::Instances::Base, nil]
+      def class_detect(klass, detect_args)
+        stereotype_name, target_path = detect_args
+        klass.application_stereotype.name == stereotype_name ? klass.new(target_path) : nil
+      end
+    end
+  end
+end

data/lib/avm/registry.rb

@@ -7,7 +7,8 @@ module Avm
   module Registry
     require_sub __FILE__
     enable_listable
-    lists.add_symbol :category, :application_stereotypes, :instances, :runners, :scms, :sources
+    lists.add_symbol :category, :application_stereotypes, :instances, :runners, :scms,
+                     :source_generators, :sources
 
     WITH_PATH = [CATEGORY_SCMS, CATEGORY_SOURCES].freeze
 

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/source_generators/base.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'avm/with_application_stereotype'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module SourceGenerators
+    class Base
+      include ::Avm::WithApplicationStereotype
+      common_constructor :target_path do
+        self.target_path = target_path.to_pathname
+      end
+
+      def perform
+        assert_clear_directory
+        apply_template
+      end
+
+      def assert_clear_directory
+        target_path.mkpath
+        raise "\"#{target_path}\" is not empty" if target_path.children.any?
+      end
+
+      def apply_template
+        template.apply(self, target_path)
+      end
+    end
+  end
+end

data/lib/avm/source_generators.rb

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

data/lib/avm/version.rb

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

data/lib/avm/with_application_stereotype.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_cli/runner_with/subcommands'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -10,6 +9,17 @@ module Avm
     end
 
     module ClassMethods
+      # @return [Avm::ApplicationStereotype::Base]
+      def application_stereotype
+        @application_stereotype ||=
+          ::Avm::Registry.application_stereotypes.detect(application_stereotype_name)
+      end
+
+      # @return [String]
+      def application_stereotype_name
+        stereotype_namespace_module.name.demodulize
+      end
+
       # @return [Module]
       def stereotype_namespace_module
         module_parent.module_parent

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.30.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-22 00:00:00.000000000 Z
+date: 2022-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_cli
@@ -197,10 +197,9 @@ files:
 - lib/avm.rb
 - lib/avm/application_stereotypes.rb
 - lib/avm/application_stereotypes/base.rb
-- lib/avm/application_stereotypes/base/by_gem.rb
-- lib/avm/application_stereotypes/base/detection.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
@@ -251,6 +250,7 @@ files:
 - lib/avm/registry/instances.rb
 - lib/avm/registry/runners.rb
 - lib/avm/registry/scms.rb
+- lib/avm/registry/source_generators.rb
 - lib/avm/registry/sources.rb
 - lib/avm/registry/with_path.rb
 - lib/avm/registry/with_path/cache.rb
@@ -267,6 +267,8 @@ files:
 - lib/avm/self/docker_image.rb
 - lib/avm/self/instance.rb
 - lib/avm/self/instance/entry_keys.rb
+- lib/avm/source_generators.rb
+- lib/avm/source_generators/base.rb
 - lib/avm/sources.rb
 - lib/avm/sources/base.rb
 - lib/avm/sources/base/configuration.rb

data/lib/avm/application_stereotypes/base/by_gem.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module Avm
-  module ApplicationStereotypes
-    class Base
-      module ByGem
-        common_concern
-
-        module ClassMethods
-          def by_gem(gem_name)
-            new(gem_name.gsub('-', '/').camelize)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/application_stereotypes/base/detection.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-module Avm
-  module ApplicationStereotypes
-    class Base
-      module Detection
-        common_concern
-
-        module ClassMethods
-          # @return [Class<Avm::Sources::Base>, nil]
-          def detect(object)
-            return singleton_instance if
-            %w[name instance_class source_class].any? { |t| send("detect_by_#{t}?", object) }
-          end
-
-          # @return [Boolean]
-          def detect_by_instance_class?(object)
-            object.is_a?(::Class) && singleton_instance.instance_class == object
-          end
-
-          # @return [Boolean]
-          def detect_by_name?(object)
-            object.is_a?(::String) && singleton_instance.name == object
-          end
-
-          # @return [Boolean]
-          def detect_by_source_class?(object)
-            object.is_a?(::Class) && singleton_instance.source_class == object
-          end
-        end
-      end
-    end
-  end
-end