avm 0.35.0 → 0.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d1057f254c35e9a58a3e175d41bc3269a1870a436ae6f9c4906d1f0c1235e74
-  data.tar.gz: 4954952889777c08c9b0af69cf1c10b151e998b54a866c080960558cef5c83cb
+  metadata.gz: '0821a30efc137201d1e73d98cf31b741458bacc8a297495e1d88a6a150d988d3'
+  data.tar.gz: da4de9f1f24f9638ee5158411a05494c5007ffad292f26c3f19a4c5665389b1c
 SHA512:
-  metadata.gz: f5e770babac5244337114c9c9a537d1d9d8e589d64850feced6f699d12b789b82a7281e878a115dbc83476b60a22f27badd800cd73045bf8fa9af3f855c88cd5
-  data.tar.gz: 411a518bf695992eb94aac4c5765f553bc2355f44bac229712809a33eb9ceb87c36247feb9f832928b8e40516d3d6f4a2b153989965f1ff48837543919dbc30b
+  metadata.gz: afad52fb0a1801a83d5d295b9e220d7040a8ed09205d9fafd783393abc08bafe750a882e4ce4a28c6bbb5d23d3039a97e843818ef6e75437f4f7b5b5d87f1458
+  data.tar.gz: b450f642ef1c8692264dd21d60195f669a1d58291cff3256f3c379b5f529bdd589b8b66537f10e19acafa796ec1eb0e4600bb788e31ca6e3712392534dd32b00

data/lib/avm/instances/base.rb

@@ -53,7 +53,7 @@ module Avm
       def host_env_uncached
         install_uri = entry(::Avm::Instances::EntryKeys::INSTALL_URL).value.to_uri
         case install_uri.scheme
-        when 'local' then ::EacRubyUtils::Envs.local
+        when 'file' then ::EacRubyUtils::Envs.local
         when 'ssh' then ::EacRubyUtils::Envs.ssh(install_uri)
         else raise("Unmapped access value: \"#{install_uri}\"")
         end

data/lib/avm/instances/runner.rb

@@ -7,10 +7,12 @@ module Avm
   module Instances
     class Runner < ::Avm::Runners::Base
       class << self
-        def instance_class
-          ::Avm.const_get(stereotype_name).const_get('Instance')
+        def application_stereotype
+          ::Avm::Registry.application_stereotypes.detect(stereotype_name)
         end
 
+        delegate :instance_class, to: :application_stereotype
+
         def stereotype_module
           ::Avm.const_get(stereotype_name)
         end

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'avm/applications/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Sources
+    class Base
+      module Application
+        APPLICATION_NAME_KEY = 'application'
+
+        # @return [Avm::Applications::Base]
+        def application
+          @application ||= ::Avm::Applications::Base.new(application_id)
+        end
+
+        # @return [String]
+        def application_id
+          application_id_by_configuration || application_id_by_directory
+        end
+
+        # @return [String, nil]
+        def application_id_by_configuration
+          configuration.entry(APPLICATION_NAME_KEY).value
+        end
+
+        # @return [String]
+        def application_id_by_directory
+          path.basename.to_path
+        end
+      end
+    end
+  end
+end

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

@@ -24,6 +24,8 @@ module Avm
 
         # @return [EacRubyUtils::Envs::Command, nil]
         def configuration_value_to_env_command(value)
+          return value if value.is_a?(::EacRubyUtils::Envs::Command)
+
           configuration_value_to_shell_words(value).if_present { |v| env.command(v).chdir(path) }
         end
 

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

@@ -57,7 +57,7 @@ module Avm
 
         def configured_enumerable_value_as_test_commands(value)
           configured_hash_value_as_test_commands(
-            value.each_with_index.map { |v| ["test_#{v[1]}", v[0]] }.to_h
+            value.each_with_index.map { |v, i| ["test_#{i}", v] }.to_h
           )
         end
 

data/lib/avm/version.rb

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

data/lib/avm/with/application_stereotype.rb

@@ -5,9 +5,7 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module With
     module ApplicationStereotype
-      common_concern do
-        include ClassMethods
-      end
+      common_concern
 
       module ClassMethods
         # @return [Avm::ApplicationStereotype::Base]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.35.0
+  version: 0.37.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-06 00:00:00.000000000 Z
+date: 2022-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_cli
@@ -19,7 +19,7 @@ dependencies:
         version: '0.27'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.27.6
+        version: 0.27.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.27'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.27.6
+        version: 0.27.8
 - !ruby/object:Gem::Dependency
   name: eac_config
   requirement: !ruby/object:Gem::Requirement
@@ -50,62 +50,74 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: eac_git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.12'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.12'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.12.1
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.97'
+        version: '0.98'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.97'
+        version: '0.98'
 - !ruby/object:Gem::Dependency
   name: eac_templates
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
@@ -126,20 +138,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
@@ -278,6 +290,7 @@ files:
 - lib/avm/source_generators/runner.rb
 - lib/avm/sources.rb
 - lib/avm/sources/base.rb
+- lib/avm/sources/base/application.rb
 - lib/avm/sources/base/configuration.rb
 - lib/avm/sources/base/instance.rb
 - lib/avm/sources/base/locale.rb