avm 0.55.0 → 0.56.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a1e14183c236b827b6b39bc79d7fb1a1ab6ace3284d897e634d692581db10f8
-  data.tar.gz: 2c03c7564a37f2df94acd5b22b0288eaff35179b3f41c41ae7924db4cd54afa5
+  metadata.gz: c3fbdddcdbc848524b57336f7c1ac341950a1f725d4de87a64dde6951499d835
+  data.tar.gz: bf01ee819ed341084e1dea109d318d0275d1661a3228048d98e873df544eacb9
 SHA512:
-  metadata.gz: 933eceb86eea9a697e57cfd6219449cc2f07fdaabde00facdf67a69d7eb26f1f46b843fd19686a096fb4d2bb6a2396203c98b7d831780df68ae8db2dd4c0f728
-  data.tar.gz: 8030a0bff5ea657b2a4c196b68cb0d3b27984a276bce196609b090564206dc130966d0e880242226931fa79f4d1f9ba2ffec3a0c7151c466cc38686ba6142ef6
+  metadata.gz: 22a5f8d897b2eeb7e19ca82e4f1e50c864a97ff08936a83dfcf4ede15d8510650ce8beb69b300d5800b7c825825cf200a9e1eb6672c4a097028857ec7b6384c3
+  data.tar.gz: b3956dc0425e73d3a4579d1d50d9ad9704adc41079ba4fbf779d2f52edd31055ea255ee47bb8d88a52351124c583cc4b33ff0857ef65d1f57eb85ace1abdfef9

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/entries/uri_builder.rb

@@ -46,8 +46,10 @@ module Avm
         field_get(translate_field(avm_field))
       end
 
+      # @return [String, nil]
       def field_get(name)
-        data[name.to_sym].if_present(&:to_s)
+        v = data[name.to_sym]
+        v.nil? ? nil : v.to_s
       end
 
       def field_set(field, value)

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

@@ -25,6 +25,7 @@ module Avm
       # @return [self]
       def stub_avm_contexts
         stub_eac_config_node
+        stub_eac_fs_contexts
         stub_eac_speaker
 
         self

data/lib/avm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.55.0
+  version: 0.56.1
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-02 00:00:00.000000000 Z
+date: 2022-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.29'
+        version: '0.30'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.29'
+        version: '0.30'
 - !ruby/object:Gem::Dependency
   name: eac_config
   requirement: !ruby/object:Gem::Requirement
@@ -78,28 +78,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: eac_git
   requirement: !ruby/object:Gem::Requirement
     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_ruby_utils
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +107,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.107'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.107.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -114,6 +117,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.107'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.107.1
 - !ruby/object:Gem::Dependency
   name: eac_templates
   requirement: !ruby/object:Gem::Requirement
@@ -255,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
@@ -327,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
@@ -344,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