avm 0.28.0 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d4a230abab5f14e443e55426f5deb3fa99d8570d57714c5128c50d3dff3340a
-  data.tar.gz: 71c879c6ee9fd1b3e3550142c9b78bfc101f8b863ac5ef812366cc3ff66e7c8d
+  metadata.gz: 2c59abe8a0046009874c49f168a3fba854d33721aaaf0bfbb95d96c0556c9aae
+  data.tar.gz: 8308f974d093782ed03f490365580fa4e5c838cd55da3c76fd4edf6972f59ccf
 SHA512:
-  metadata.gz: cda7f5840e1d6ddf4c49732b9205b0c6ee9f31afa0d4ecfa41b343a96e9423704a76520544db021598567894b3a157ddbf034a892fc25be7792cd3bb47077666
-  data.tar.gz: 566e375d67d75cc9dfd8de54b1839e4e85308b37dd34e9a9b337114dca02d8808fbdef7d888cc9e348c65f7316bfdd542c540bf204c3f4316d11a2767bac5fef
+  metadata.gz: 3544c95b8ffef42a7e9c8d1ad9e16f6984c945e861e2d5b0ce48c5744295087d5941dfa3c9191aefd96703762b2704cb630346f109a4c1348560e4361011b3f9
+  data.tar.gz: bbe9fb54467880e6b69d3954d79c72cac7cd541a300761ebc8cde38b234e5eead3febc889b81871d8079cf4ba95ec33b781ddf26d2ade447660a1c31e03c7486

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/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/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/version.rb

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

metadata

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

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