avm 0.54.0 → 0.56.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a52ddaff3ca8d1d8b6923f5774a840e96579753deda0e37ed836c3d3de7139f4
-  data.tar.gz: 03eb845b333bb37eddc9f59ed29a408e145b2a8ad26038e3ffde44f66801e9c4
+  metadata.gz: 2fe83959f89ed9d43c44578111aa230b740036e6d9231b5c80a6a59ba777d7cc
+  data.tar.gz: 48911ce71466c63dbe3e8dd4ab84f0ecfa061a1c7c55103150ce325bcf745462
 SHA512:
-  metadata.gz: f44830cf5abc31bea03038ab8e551fc1202a6abb715af17ef3bdcbce6e26086adb3782749a861f420e7fc9c370bf110c9ba1d2a4d28e24ca24405b17249b8870
-  data.tar.gz: c8e0b4282562b0dbadcc48c31730f2e976711612cd1d6e712f49db360140ca566b0e30894d3150ecf765762240dd80b8446fb06715c34c41849834d25589c1c1
+  metadata.gz: 210f097d0c4f57a0fa0a1bbf64e83e9d4a116250ba552f477401fbc5064eaa7f781c7ff1a3115b5a42844299728578cc13508c663031c2e287994d0507f7b488
+  data.tar.gz: 7b65907b3c3201914d97d1e3efa2a740b26dcb87cd820e689a81fdcfbb6e0e1d21619807a6a0f02759af964cae5f0278020eea4dce16672e8aad391bc6d8ee8d

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'avm/registry'
+require 'eac_ruby_utils/blank_not_blank'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Applications
+    class Base
+      module Publishing
+        PUBLISHABLE_KEY = 'publishable'
+
+        def publishable?
+          publishable_value ? true : false
+        end
+
+        def stereotype_publishable?(stereotype)
+          return publishable? unless publishable_value.is_a?(::Hash)
+
+          parse_publishable_value(publishable_value[stereotype.stereotype_name], true)
+        end
+
+        private
+
+        def publishable_value
+          parse_publishable_value(entry(PUBLISHABLE_KEY).optional_value, false)
+        end
+
+        def parse_publishable_value(value, hash_to_true) # rubocop:disable Metrics/CyclomaticComplexity
+          return value.with_indifferent_access if parse_publishable_value_hash?(value, hash_to_true)
+          return true if value.nil? || value == true
+          return false if value == false || value.is_a?(::EacRubyUtils::BlankNotBlank)
+
+          value ? true : false
+        end
+
+        def parse_publishable_value_hash?(value, hash_to_true)
+          !hash_to_true && value.is_a?(::Hash)
+        end
+      end
+    end
+  end
+end

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/launcher/context/instance_manager.rb

@@ -54,6 +54,7 @@ module Avm
         end
 
         def write_cache_file(data)
+          cache_file_path.to_pathname.parent.mkpath
           ::File.write(cache_file_path, data.to_yaml)
         end
 

data/lib/avm/launcher/context.rb

@@ -2,6 +2,8 @@
 
 require 'active_support/core_ext/hash/indifferent_access'
 require 'avm/launcher/context/instance_manager'
+require 'eac_fs/contexts'
+require 'eac_fs/core_ext'
 require 'eac_ruby_utils/simple_cache'
 require 'eac_cli/speaker'
 require 'avm/launcher/context/instance_discovery'
@@ -76,8 +78,9 @@ module Avm
         send("default_#{key}".underscore)
       end
 
+      # @return [String]
       def default_projects_root
-        '.'
+        '.'.to_pathname.expand_path.to_path
       end
 
       def default_settings_file

data/lib/avm/launcher/instances/base/publishing.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Avm
+  module Launcher
+    module Instances
+      module Base
+        module Publishing
+          def publish?(stereotype)
+            publish_by_stereotype?(stereotype) && publish_by_application?(stereotype) &&
+              publish_by_context?(stereotype)
+          end
+
+          # @return [Boolean]
+          def publish_by_application?(stereotype)
+            application.stereotype_publishable?(stereotype)
+          end
+
+          # @return [Boolean]
+          def publish_by_context?(stereotype)
+            filter = ::Avm::Launcher::Context.current.publish_options[:stereotype]
+            filter.blank? ? true : filter == stereotype.name.demodulize
+          end
+
+          # @return [Boolean]
+          def publish_by_stereotype?(stereotype)
+            stereotype.publish_class.present?
+          end
+
+          # @return [Boolean]
+          delegate :publishable?, to: :application
+
+          def publish_check
+            stereotypes.each do |s|
+              next unless publish?(s)
+
+              puts "#{name.to_s.cyan}|#{s.label}|" \
+                "#{s.publish_class.new(self).check}"
+            end
+          end
+
+          def publish_run
+            stereotypes.each do |s|
+              next unless publish?(s)
+
+              infov(name, "publishing #{s.label}")
+              s.publish_class.new(self).run
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/launcher/instances/base.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative 'base/cache'
 require 'avm/launcher/errors/non_project'
+require 'avm/registry'
 require 'eac_ruby_utils/speaker/sender'
 
 module Avm
@@ -13,6 +13,7 @@ module Avm
             object.extend ::EacRubyUtils::SimpleCache
             object.extend ::EacRubyUtils::Speaker::Sender
             object.extend ::Avm::Launcher::Instances::Base::Cache
+            object.extend ::Avm::Launcher::Instances::Base::Publishing
             super
           end
 
@@ -27,8 +28,15 @@ module Avm
           end
         end
 
+        require_sub __FILE__
+
         attr_accessor :parent
 
+        # @return [Avm::Applications::Base]
+        def application
+          @application ||= ::Avm::Registry.applications.detect(project_name)
+        end
+
         def name
           logical
         end
@@ -47,24 +55,6 @@ module Avm
           stereotypes.any?
         end
 
-        def publish_run
-          stereotypes.each do |s|
-            next unless publish?(s)
-
-            infov(name, "publishing #{s.label}")
-            s.publish_class.new(self).run
-          end
-        end
-
-        def publish_check
-          stereotypes.each do |s|
-            next unless publish?(s)
-
-            puts "#{name.to_s.cyan}|#{s.label}|" \
-              "#{s.publish_class.new(self).check}"
-          end
-        end
-
         def project_name
           ::File.basename(logical)
         end
@@ -79,14 +69,6 @@ module Avm
 
         private
 
-        def publish?(stereotype)
-          return false unless stereotype.publish_class
-          return false unless options.stereotype_publishable?(stereotype)
-
-          filter = ::Avm::Launcher::Context.current.publish_options[:stereotype]
-          filter.blank? ? true : filter == stereotype.name.demodulize
-        end
-
         def options_uncached
           ::Avm::Launcher::Context.current.settings.instance_settings(self)
         end

data/lib/avm/launcher/instances/settings.rb

@@ -8,7 +8,6 @@ module Avm
       class Settings
         DEFAULT_CURRENT_REVISION = 'origin/master'
         DEFAULT_PUBLISH_REMOTE = 'publish'
-        PUBLISHABLE_KEY = :publishable
 
         common_constructor :data do
           self.data = (data.is_a?(Hash) ? data : {}).with_indifferent_access
@@ -21,34 +20,6 @@ module Avm
         def git_publish_remote
           data[__method__] || DEFAULT_PUBLISH_REMOTE
         end
-
-        def publishable?
-          publishable_value ? true : false
-        end
-
-        def stereotype_publishable?(stereotype)
-          return publishable? unless publishable_value.is_a?(::Hash)
-
-          parse_publishable_value(publishable_value[stereotype.stereotype_name], true)
-        end
-
-        private
-
-        def publishable_value
-          parse_publishable_value(data[PUBLISHABLE_KEY], false)
-        end
-
-        def parse_publishable_value(value, hash_to_true)
-          return value.with_indifferent_access if parse_publishable_value_hash?(value, hash_to_true)
-          return true if value.nil? || value == true
-          return false if value == false
-
-          value ? true : false
-        end
-
-        def parse_publishable_value_hash?(value, hash_to_true)
-          !hash_to_true && value.is_a?(::Hash)
-        end
       end
     end
   end

data/lib/avm/registry/applications.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'avm/applications/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Registry
+    class Applications
+      def initialize(*args); end
+
+      # @return [Array<Avm::Applications::Base>]
+      def available
+        detected.values
+      end
+
+      # @return [Avm::Applications::Base]
+      def detect(id)
+        id = id.to_s
+        detected[id] = ::Avm::Applications::Base.new(id) unless detected.key?(id)
+        detected[id]
+      end
+
+      private
+
+      # @return [Hash<String, Avm::Applications::Base>]
+      def detected
+        @detected ||= {}
+      end
+    end
+  end
+end

data/lib/avm/registry.rb

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

data/lib/avm/rspec/setup.rb

@@ -21,6 +21,15 @@ module Avm
           require "avm/rspec/shared_examples/#{example}"
         end
       end
+
+      # @return [self]
+      def stub_avm_contexts
+        stub_eac_config_node
+        stub_eac_fs_contexts
+        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.56.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.54.0
+  version: 0.56.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-29 00:00:00.000000000 Z
+date: 2022-11-09 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.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: eac_git
   requirement: !ruby/object:Gem::Requirement
@@ -112,20 +106,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.106'
+        version: '0.107'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.106.1
+        version: 0.107.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.106'
+        version: '0.107'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.106.1
+        version: 0.107.1
 - !ruby/object:Gem::Dependency
   name: eac_templates
   requirement: !ruby/object:Gem::Requirement
@@ -267,6 +261,7 @@ files:
 - lib/avm/application_stereotypes/base.rb
 - lib/avm/applications.rb
 - lib/avm/applications/base.rb
+- lib/avm/applications/base/publishing.rb
 - lib/avm/applications/base/stereotype.rb
 - lib/avm/data/instance.rb
 - lib/avm/data/instance/files_unit.rb
@@ -323,6 +318,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
@@ -338,6 +334,7 @@ files:
 - lib/avm/launcher/instances.rb
 - lib/avm/launcher/instances/base.rb
 - lib/avm/launcher/instances/base/cache.rb
+- lib/avm/launcher/instances/base/publishing.rb
 - lib/avm/launcher/instances/error.rb
 - lib/avm/launcher/instances/runner_helper.rb
 - lib/avm/launcher/instances/settings.rb
@@ -355,6 +352,7 @@ files:
 - lib/avm/registry/application_stereotypes.rb
 - lib/avm/registry/application_stereotypes/build_available.rb
 - lib/avm/registry/application_stereotypes/stereotype_builder.rb
+- lib/avm/registry/applications.rb
 - lib/avm/registry/file_formats.rb
 - lib/avm/registry/from_gems.rb
 - lib/avm/registry/instances.rb