avm 0.78.0 → 0.80.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cb5d857b2f46b9de8b367c04438c3be0bd5d511a3fccb7ba52b6aa92acd83a0
-  data.tar.gz: 5ea79e6a35fede8b4049f923d13bb1d8c357044c53a21e0b52866dda26891bff
+  metadata.gz: '07288db64613db9f7542a592edf18a5ef9c23319b0e89dd14fa475c90c76429d'
+  data.tar.gz: 20510a4b8aea2c182c067ec62be6faba8e45f268e3a7830a8af0358543881151
 SHA512:
-  metadata.gz: b9e1659d394a2bf0107f010af8e26f1c6cf5bbd8af3e670b3b4ccf4c62e06e8394acff968fe39ab5b99ee6e12be0779969cb7d67b2b7c06c26894ed24d4baebb
-  data.tar.gz: 658e8f4282ce9390ed58bc19ce862205f526dd712b3ae604edf8f3f7bb83d3b7d213eb28d461b357aa24aee9f078ff88fe633e655842565a5ab9ef9646280347
+  metadata.gz: a2cf4806ecc92f0e7aff8793e9e9157f06564396770df043cbafbc7ee164dd0f86d1bf547b3b5ddd42d7f113fd9d73884725506bf7369394964d66fdd1450c75
+  data.tar.gz: 26611244b005c70d57d1625de6a55b1332a397769906fd0958aac6a931a61b7ddc18041471b14b5f2365e09b872311bfcf5455d254754956d6f4568488705208

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'avm/instances/ids'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Applications
+    class Base
+      module LocalInstance
+        LOCAL_INSTANCE_SUFFIX = 'dev'
+
+        # @return [String]
+        def local_instance_id
+          ::Avm::Instances::Ids.build(id, local_instance_suffix)
+        end
+
+        # @return [String]
+        def local_instance_suffix
+          LOCAL_INSTANCE_SUFFIX
+        end
+
+        private
+
+        # @return [Avm::Instances::Base]
+        def local_instance_uncached
+          instance(local_instance_suffix)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'avm/registry'
+require 'eac_config/node'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Applications
+    class Base
+      module LocalSource
+        # @return [Pathname]
+        def local_source_path
+          local_source_path_entry.value!.to_pathname
+        end
+
+        # @return [EacConfig::Entry]
+        def local_source_path_entry
+          ::EacConfig::Node.context.current.entry([local_instance_id, 'install', 'path'])
+        end
+
+        private
+
+        # @return [Avm::Sources::Base]
+        def local_source_uncached
+          ::Avm::Registry.sources.detect(local_source_path)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Applications
+    class Base
+      module Naming
+        DEFAULT_NAME = '_Undefined_'
+
+        # @return [String]
+        def default_name
+          DEFAULT_NAME
+        end
+
+        # @return [String]
+        def name
+          name_from_configuration || default_name
+        end
+
+        # @return [String]
+        def name_from_configuration
+          entry(::Avm::Instances::EntryKeys::NAME).optional_value
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'avm/registry'
+
+module Avm
+  module Applications
+    class Base
+      module Organization
+        DEFAULT_ORGANIZATION = '_undefined_'
+        ORGANIZATION_CONFIG_KEY = 'organization'
+
+        # @return [String]
+        def default_organization
+          DEFAULT_ORGANIZATION
+        end
+
+        # @return [String, nil]
+        def organization_by_configuration
+          entry(ORGANIZATION_CONFIG_KEY).optional_value
+        end
+
+        # @return [String]
+        def organization
+          organization_by_configuration || default_organization
+        end
+      end
+    end
+  end
+end

data/lib/avm/applications/base.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require 'avm/entries/base'
-require 'avm/instances/ids'
-require 'avm/registry'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -12,7 +10,7 @@ module Avm
       require_sub __FILE__, include_modules: true
       include ::Avm::Entries::Base
 
-      LOCAL_INSTANCE_SUFFIX = 'dev'
+      AVM_TYPE = 'Application'
 
       common_constructor :id do
         self.id = id.to_s
@@ -25,42 +23,6 @@ module Avm
       def instance(suffix)
         stereotype.instance_class.new(self, suffix)
       end
-
-      def name
-        entry(::Avm::Instances::EntryKeys::NAME).read
-      end
-
-      # @return [String]
-      def local_instance_id
-        ::Avm::Instances::Ids.build(id, local_instance_suffix)
-      end
-
-      # @return [Pathname]
-      def local_source_path
-        local_source_path_entry.value!.to_pathname
-      end
-
-      # @return [EacConfig::Entry]
-      def local_source_path_entry
-        ::EacConfig::Node.context.current.entry([local_instance_id, 'install', 'path'])
-      end
-
-      # @return [String]
-      def local_instance_suffix
-        LOCAL_INSTANCE_SUFFIX
-      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_source_path)
-      end
     end
   end
 end

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

@@ -8,6 +8,7 @@ module Avm
       module AutoValues
         module Database
           LOCAL_ADDRESS = '127.0.0.1'
+          LOCAL_ADDRESSES = [LOCAL_ADDRESS, '::1', 'localhost'].freeze
           DEFAULT_EXTRA = ''
           DEFAULT_HOSTNAME = LOCAL_ADDRESS
           DEFAULT_LIMIT = 5

data/lib/avm/registry/applications.rb

@@ -10,6 +10,7 @@ module Avm
 
       # @return [Array<Avm::Applications::Base>]
       def available
+        load_config
         detected.values
       end
 
@@ -26,6 +27,12 @@ module Avm
       def detected
         @detected ||= {}
       end
+
+      def load_config
+        ::Avm::Registry.config_objects.available.each do |id, type|
+          detect(id) if type == ::Avm::Applications::Base::AVM_TYPE
+        end
+      end
     end
   end
 end

data/lib/avm/registry/config_objects.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'avm/applications/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Registry
+    class ConfigObjects
+      def initialize(*args); end
+
+      # @return [Array<Avm::Applications::Base>]
+      def available
+        ::EacConfig::Node.context.current.entries('*.avm_type').node_entries
+          .map { |ne| [ne.path.first, ne.value] }
+      end
+    end
+  end
+end

data/lib/avm/registry.rb

@@ -7,8 +7,9 @@ module Avm
   module Registry
     require_sub __FILE__
     enable_listable
-    lists.add_symbol :category, :applications, :application_stereotypes, :file_formats, :instances,
-                     :launcher_stereotypes, :runners, :scms, :source_generators, :sources
+    lists.add_symbol :category, :applications, :application_stereotypes, :config_objects,
+                     :file_formats, :instances, :launcher_stereotypes, :runners, :scms,
+                     :source_generators, :sources
 
     class << self
       enable_simple_cache

data/lib/avm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.78.0
+  version: 0.80.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-09 00:00:00.000000000 Z
+date: 2023-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -16,48 +16,48 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0.21'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: eac_cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.35'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: '0.38'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.35'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: '0.38'
 - !ruby/object:Gem::Dependency
   name: eac_config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.14'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.14'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.1
 - !ruby/object:Gem::Dependency
   name: eac_docker
   requirement: !ruby/object:Gem::Requirement
@@ -112,20 +112,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.117'
+        version: '0.119'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.117.1
+        version: 0.119.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.117'
+        version: '0.119'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.117.1
+        version: 0.119.2
 - !ruby/object:Gem::Dependency
   name: eac_templates
   requirement: !ruby/object:Gem::Requirement
@@ -241,6 +241,10 @@ files:
 - lib/avm/application_stereotypes/base.rb
 - lib/avm/applications.rb
 - lib/avm/applications/base.rb
+- lib/avm/applications/base/local_instance.rb
+- lib/avm/applications/base/local_source.rb
+- lib/avm/applications/base/naming.rb
+- lib/avm/applications/base/organization.rb
 - lib/avm/applications/base/publishing.rb
 - lib/avm/applications/base/stereotype.rb
 - lib/avm/data/callbacks.rb
@@ -346,6 +350,7 @@ files:
 - lib/avm/registry/application_stereotypes/build_available.rb
 - lib/avm/registry/application_stereotypes/stereotype_builder.rb
 - lib/avm/registry/applications.rb
+- lib/avm/registry/config_objects.rb
 - lib/avm/registry/file_formats.rb
 - lib/avm/registry/from_gems.rb
 - lib/avm/registry/instances.rb