avm 0.53.0 → 0.55.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9867c212c40c67bb9467d5109778d76f2bc11752b604934404e11956663e719b
-  data.tar.gz: 0ef0d4ca046e4fcbf8e03174bbece1b4e71972c02d50692bd9c3ef8ad2f3e04a
+  metadata.gz: 4a1e14183c236b827b6b39bc79d7fb1a1ab6ace3284d897e634d692581db10f8
+  data.tar.gz: 2c03c7564a37f2df94acd5b22b0288eaff35179b3f41c41ae7924db4cd54afa5
 SHA512:
-  metadata.gz: d68c998e7a9decaebba0c1023f1e2c259ea9edeeac3a8bb05d78740a45422308031bdcd650d2beaf487de4adef82b9faa72c4bfc2fd88e9c788a456a5ac7fd17
-  data.tar.gz: b499addbd90d59becc16270a7f9cb5f8839db6ac4d1a3dc2e7467f75d8d6b97a45ade2bfca0b783fb24f314a4c4241b263d587a0aee755c1e0eb1918d9d188f9
+  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/source_generator.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Rspec
+    module Setup
+      module SourceGenerator
+        DEFAULT_TARGET_BASENAME = 'generated_app'
+
+        # @return [Avm::Sources::Base]
+        def avm_source(stereotype_name, options = {})
+          options = options.dup
+          target_basename ||= options.delete(:target_basename) || DEFAULT_TARGET_BASENAME
+          target_path ||= options.delete(:target_path) || temp_dir.join(target_basename)
+          ::Avm::Registry.source_generators.detect(stereotype_name, target_path, options).perform
+          ::Avm::Registry.sources.detect(target_path)
+        end
+      end
+    end
+  end
+end

data/lib/avm/rspec/setup.rb

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 
-require 'avm/rspec/source_generator'
+require 'avm/rspec/setup/source_generator'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Rspec
     module Setup
       require_sub __FILE__
-      EXAMPLES = %w[avm_file_formats_with_fixtures entries_values in_avm_registry
-                    not_in_avm_registry].freeze
+      EXAMPLES = %w[avm_file_formats_with_fixtures avm_source_generated entries_values
+                    in_avm_registry not_in_avm_registry].freeze
 
       def self.extended(obj)
         obj.setup_examples
         obj.rspec_config.include(::Avm::Rspec::Setup::Launcher)
-        obj.rspec_config.include(::Avm::Rspec::SourceGenerator)
+        obj.rspec_config.include(::Avm::Rspec::Setup::SourceGenerator)
       end
 
       def setup_examples
@@ -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/rspec/shared_examples/avm_source_generated.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'eac_fs/comparator'
+require 'eac_ruby_utils/core_ext'
+
+::RSpec.shared_examples 'avm_source_generated' do |spec_file, stereotype, options = {}|
+  fixtures_dir = ::Pathname.new('base_spec_files').expand_path(::File.dirname(spec_file))
+
+  fixtures_dir.children.select(&:directory?).each do |target_dir|
+    context "when target is \"#{target_dir.basename}\"" do
+      let(:source) { avm_source(stereotype, options.merge(target_basename: target_dir.basename)) }
+
+      it do
+        expect(fs_comparator.build(source.path)).to eq(fs_comparator.build(target_dir))
+      end
+    end
+  end
+
+  # @return [EacFs::Comparato]
+  def fs_comparator
+    ::EacFs::Comparator.new.rename_file('.gitignore', '_gitignore')
+  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.53.0'
+  VERSION = '0.55.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.53.0
+  version: 0.55.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-28 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,20 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.3
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.3
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: eac_git
   requirement: !ruby/object:Gem::Requirement
@@ -118,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
@@ -329,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
@@ -375,11 +358,12 @@ files:
 - lib/avm/rspec.rb
 - lib/avm/rspec/setup.rb
 - lib/avm/rspec/setup/launcher.rb
+- lib/avm/rspec/setup/source_generator.rb
 - lib/avm/rspec/shared_examples/avm_file_formats_with_fixtures.rb
+- lib/avm/rspec/shared_examples/avm_source_generated.rb
 - lib/avm/rspec/shared_examples/entries_values.rb
 - lib/avm/rspec/shared_examples/in_avm_registry.rb
 - lib/avm/rspec/shared_examples/not_in_avm_registry.rb
-- lib/avm/rspec/source_generator.rb
 - lib/avm/runners/base.rb
 - lib/avm/scms/base.rb
 - lib/avm/scms/commit.rb

data/lib/avm/rspec/source_generator.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module Rspec
-    module SourceGenerator
-      # @return [Avm::Sources::Base]
-      def avm_source(stereotype_name, options = {})
-        target_path ||= options.delete(:target_path) || temp_dir.join('generated_app')
-        ::Avm::Registry.source_generators.detect(stereotype_name, target_path, options).perform
-        ::Avm::Registry.sources.detect(target_path)
-      end
-    end
-  end
-end