avm 0.54.0 → 0.55.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a52ddaff3ca8d1d8b6923f5774a840e96579753deda0e37ed836c3d3de7139f4
-  data.tar.gz: 03eb845b333bb37eddc9f59ed29a408e145b2a8ad26038e3ffde44f66801e9c4
+  metadata.gz: 4a1e14183c236b827b6b39bc79d7fb1a1ab6ace3284d897e634d692581db10f8
+  data.tar.gz: 2c03c7564a37f2df94acd5b22b0288eaff35179b3f41c41ae7924db4cd54afa5
 SHA512:
-  metadata.gz: f44830cf5abc31bea03038ab8e551fc1202a6abb715af17ef3bdcbce6e26086adb3782749a861f420e7fc9c370bf110c9ba1d2a4d28e24ca24405b17249b8870
-  data.tar.gz: c8e0b4282562b0dbadcc48c31730f2e976711612cd1d6e712f49db360140ca566b0e30894d3150ecf765762240dd80b8446fb06715c34c41849834d25589c1c1
+  metadata.gz: 933eceb86eea9a697e57cfd6219449cc2f07fdaabde00facdf67a69d7eb26f1f46b843fd19686a096fb4d2bb6a2396203c98b7d831780df68ae8db2dd4c0f728
+  data.tar.gz: 8030a0bff5ea657b2a4c196b68cb0d3b27984a276bce196609b090564206dc130966d0e880242226931fa79f4d1f9ba2ffec3a0c7151c466cc38686ba6142ef6

data/lib/avm/applications/base.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/entries/base'
+require 'avm/instances/ids'
 require 'avm/registry'
 require 'eac_ruby_utils/core_ext'
 
@@ -22,23 +23,43 @@ module Avm
       end
 
       def instance(suffix)
-        ::Avm::Instances::Base.new(self, 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)
+        instance(local_instance_suffix)
       end
 
       # @return [Avm::Sources::Base]
       def local_source_uncached
-        ::Avm::Registry.sources.detect(local_instance.install_path)
+        ::Avm::Registry.sources.detect(local_source_path)
       end
     end
   end

data/lib/avm/entries/entry.rb

@@ -46,6 +46,11 @@ module Avm
         optional_value || read
       end
 
+      def value!
+        optional_value.if_present { |v| return v }
+        context_entry.value!
+      end
+
       def write(value)
         context_entry.value = value
       end

data/lib/avm/instances/base.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/instances/ids'
 require 'avm/with/application_stereotype'
 require 'avm/with/extra_subcommands'
 require 'eac_ruby_utils/require_sub'
@@ -23,18 +24,9 @@ module Avm
 
       class << self
         def by_id(id)
-          application_id, suffix = parse_id(id)
+          parsed_id = ::Avm::Instances::Ids.parse!(id)
           require 'avm/applications/base'
-          new(::Avm::Applications::Base.new(application_id), suffix)
-        end
-
-        private
-
-        def parse_id(id)
-          m = ID_PATTERN.match(id)
-          return [m[1], m[2]] if m
-
-          raise "ID Pattern no matched: \"#{id}\""
+          new(::Avm::Applications::Base.new(parsed_id.application_id), parsed_id.instance_suffix)
         end
       end
 
@@ -42,8 +34,9 @@ module Avm
         self.suffix = suffix.to_s
       end
 
+      # @return [String]
       def id
-        "#{application.id}_#{suffix}"
+        ::Avm::Instances::Ids.build(application.id, suffix)
       end
 
       def to_s

data/lib/avm/instances/ids.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Instances
+    module Ids
+      ID_PARTS_SEPARATOR = '_'
+      ID_PATTERN = /\A([a-z0-9]+(?:\-[a-z0-9]+)*)_(.+)\z/.freeze
+      ID_PARSER = ID_PATTERN.to_parser do |m|
+        ::Struct.new(:application_id, :instance_suffix).new(m[1], m[2])
+      end
+
+      class << self
+        # @param application_id [String]
+        # @param instance_suffix [String]
+        # @return [String]
+        def build(application_id, instance_suffix)
+          [application_id, instance_suffix].join(ID_PARTS_SEPARATOR)
+        end
+
+        # @param id [String]
+        # @return [String]
+        def parse!(id)
+          ID_PARSER.parse!(id)
+        end
+      end
+    end
+  end
+end

data/lib/avm/rspec/setup.rb

@@ -21,6 +21,14 @@ module Avm
           require "avm/rspec/shared_examples/#{example}"
         end
       end
+
+      # @return [self]
+      def stub_avm_contexts
+        stub_eac_config_node
+        stub_eac_speaker
+
+        self
+      end
     end
   end
 end

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

@@ -7,20 +7,8 @@ module Avm
   module Sources
     class Base
       module Instance
-        DEFAULT_INSTANCE_SUFFIX = 'dev'
-
-        def instance_suffix
-          DEFAULT_INSTANCE_SUFFIX
-        end
-
-        private
-
-        def application_uncached
-          ::Avm::Applications::Base.new(path.basename)
-        end
-
-        def instance_uncached
-          ::Avm::Instances::Base.new(application, DEFAULT_INSTANCE_SUFFIX)
+        def instance
+          application.local_instance
         end
       end
     end

data/lib/avm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.54.0
+  version: 0.55.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-29 00:00:00.000000000 Z
+date: 2022-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -36,34 +36,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.28'
+        version: '0.29'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.28'
+        version: '0.29'
 - !ruby/object:Gem::Dependency
   name: eac_config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: eac_docker
   requirement: !ruby/object:Gem::Requirement
@@ -84,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: eac_git
   requirement: !ruby/object:Gem::Requirement
@@ -112,20 +106,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.106'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.106.1
+        version: '0.107'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.106'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.106.1
+        version: '0.107'
 - !ruby/object:Gem::Dependency
   name: eac_templates
   requirement: !ruby/object:Gem::Requirement
@@ -323,6 +311,7 @@ files:
 - lib/avm/instances/base/web.rb
 - lib/avm/instances/docker_image.rb
 - lib/avm/instances/entry_keys.rb
+- lib/avm/instances/ids.rb
 - lib/avm/instances/runner.rb
 - lib/avm/launcher.rb
 - lib/avm/launcher/context.rb