avm-tools 0.62.1 → 0.62.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 447658cf671d6c1aac6466424cf7b18d4872629bdfb1bdf9c742cff32204b727
-  data.tar.gz: f7bf0f7474bd5b90b726b5cc19802d4cdaef60ae8eaa06a138c3a4ecd542e483
+  metadata.gz: 023b291269b46cb2a272642eac7febb8cbecd15429aeae61435260d0977c0958
+  data.tar.gz: 4ff8f6c8c50ad54a5f7b84be35780e7a221608c7e955a0cb2e241b6f31aa88e1
 SHA512:
-  metadata.gz: a14e64ac9c8e6220ab30e4d24a86fee412dd7ba7b15d4825adfc3c064fe9b7ea1a0a96469e608ee85a5cc0041580f625bd1a367ba560db3a205428c28ae322eb
-  data.tar.gz: 227b8a6efafda6f7660549498858a09cc1e4900cf154464ef77095c430e7f915f0604c0662faec8d5b4515043a02bc79e66237beeaea075ecf1128fb6a526368
+  metadata.gz: df68926e69e0e8912f73e452fd50b218909620040eb2a69a0695ddce9542f8616e881cd455248df8a9cb89028f6ad9ff9d66aa204c7c79ba0559d317779c2e56
+  data.tar.gz: 155dbcdd721e28b5d4cd021ddb25f35daf4b4f26c2b530cb5ba21377c72ee7a0329a5149831a6031d0c7cfd12e777254b251954774ea7eb9e317b7d57f034f10

data/lib/avm/launcher/context/instance_manager.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_launcher/publish/check_result'
+require('yaml')
+
+module Avm
+  module Launcher
+    class Context
+      class InstanceManager
+        require_sub __FILE__
+        enable_simple_cache
+        common_constructor :context
+
+        def publish_state_set(instance, stereotype_name, check_status)
+          data = cached_instances_file_content_uncached
+          data[instance.logical] ||= {}
+          data[instance.logical][:publish_state] ||= {}
+          data[instance.logical][:publish_state][stereotype_name] = check_status
+          write_cache_file(data)
+        end
+
+        def pending_instances
+          instances.select { |instance| pending_instance?(instance) }
+        end
+
+        private
+
+        def instances_uncached
+          (cached_instances || search_instances).select(&:included?)
+        end
+
+        def search_instances
+          cache_instances(::EacLauncher::Context::InstanceDiscovery.new(context).instances)
+        end
+
+        def cached_instances
+          return nil if context.recache
+          return nil unless cached_instances_file_content
+
+          CachedInstances.new(self, cached_instances_file_content).instances
+        end
+
+        def cached_instances_file_content_uncached
+          r = YAML.load_file(cache_file_path)
+          r.is_a?(::Hash) ? r : nil
+        rescue Errno::ENOENT
+          nil
+        end
+
+        def cache_instances(instances)
+          write_cache_file(Hash[instances.map { |i| [i.logical, i.to_h] }])
+          instances
+        end
+
+        def write_cache_file(data)
+          ::File.write(cache_file_path, data.to_yaml)
+        end
+
+        def cache_file_path
+          ::File.join(context.cache_root, 'instances.yml')
+        end
+
+        def pending_instance?(instance)
+          data = cached_instances_file_content
+          return false unless data[instance.logical]
+          return false unless data[instance.logical][:publish_state].is_a?(Hash)
+
+          data[instance.logical][:publish_state].any? do |_k, v|
+            ::EacLauncher::Publish::CheckResult.pending_status?(v)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/launcher/context/instance_manager/cached_instance.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'avm/launcher/instances/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Launcher
+    class Context
+      class InstanceManager
+        class CachedInstance
+          enable_console_speaker
+          enable_simple_cache
+          common_constructor :cached_instances, :data
+
+          private
+
+          def instance_uncached
+            ::Avm::Launcher::Instances::Base.instanciate(path, parent_instance)
+          rescue ::Avm::Launcher::Errors::NonProject
+            warn "Cached instance \"#{data[:logical]}\" not found"
+            nil
+          end
+
+          def parent_instance_uncached
+            data[:parent]
+              .if_present { |v| cached_instances.by_logical_path(v) }
+              .if_present(&:instance)
+          end
+
+          def path_uncached
+            ::EacLauncher::Paths::Logical.from_h(cached_instances.context, data)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/launcher/context/instance_manager/cached_instances.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'avm/launcher/context/instance_manager/cached_instance'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Launcher
+    class Context
+      class InstanceManager
+        class CachedInstances
+          enable_simple_cache
+          common_constructor :context, :content
+
+          def instances
+            content.keys.map { |k| by_logical_path(k).instance }.reject(&:blank?)
+          end
+
+          def by_logical_path(key)
+            cached_instances[key].if_blank do
+              cached_instances[key] = ::Avm::Launcher::Context::InstanceManager::CachedInstance.new(
+                self, content.fetch(key)
+              )
+            end
+          end
+
+          private
+
+          def cached_instances_uncached
+            {}
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Avm
+  module Launcher
+    module Errors
+      class Base < ::StandardError
+      end
+    end
+  end
+end

data/lib/avm/launcher/errors/non_project.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'avm/launcher/errors/base'
+
+module Avm
+  module Launcher
+    module Errors
+      class NonProject < ::Avm::Launcher::Errors::Base
+        def initialize(path)
+          super("#{path} is not a project")
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+require_relative 'base/cache'
+require 'avm/launcher/errors/non_project'
+
+module Avm
+  module Launcher
+    module Instances
+      module Base
+        class << self
+          def extend_object(object)
+            object.extend ::EacRubyUtils::SimpleCache
+            object.extend ::EacRubyUtils::Console::Speaker
+            object.extend ::Avm::Launcher::Instances::Base::Cache
+            super
+          end
+
+          def instanciate(path, parent)
+            unless path.is_a?(::Avm::Launcher::Instances::Base)
+              raise ::Avm::Launcher::Errors::NonProject, path unless path.project?
+
+              path.extend(::Avm::Launcher::Instances::Base)
+              path.parent = parent
+            end
+            path
+          end
+        end
+
+        attr_accessor :parent
+
+        def name
+          logical
+        end
+
+        def stereotype?(stereotype)
+          stereotypes.include?(stereotype)
+        end
+
+        def to_parent_path
+          return self unless @parent
+
+          logical.gsub(/\A#{Regexp.quote(@parent.logical)}/, '')
+        end
+
+        def project?
+          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
+
+        def included?
+          !::EacLauncher::Context.current.settings.excluded_projects.include?(project_name)
+        end
+
+        def to_h
+          super.to_h.merge(parent: parent ? parent.logical : nil)
+        end
+
+        private
+
+        def publish?(stereotype)
+          return false unless stereotype.publish_class
+
+          filter = ::EacLauncher::Context.current.publish_options[:stereotype]
+          filter.blank? ? true : filter == stereotype.name.demodulize
+        end
+
+        def options_uncached
+          ::EacLauncher::Context.current.settings.instance_settings(self)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Avm
+  module Launcher
+    module Instances
+      module Base
+        module Cache
+          def cache_path(subpath)
+            File.join(cache_root, subpath)
+          end
+
+          def cache_key(key, &block)
+            v = cache_key_get(key)
+            return v if v.present? || block.nil?
+
+            v = yield
+            cache_key_write(key, v)
+            v
+          end
+
+          private
+
+          def cache_key_get(key)
+            File.file?(cache_key_path(key)) ? File.read(cache_key_path(key)) : nil
+          end
+
+          def cache_key_write(key, value)
+            FileUtils.mkdir_p(File.dirname(cache_key_path(key)))
+            File.write(cache_key_path(key), value)
+          end
+
+          def cache_key_path(key)
+            File.join(cache_root, 'keys', key.parameterize)
+          end
+
+          def cache_root
+            File.join(::EacLauncher::Context.current.cache_root, name.parameterize)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/projects/stereotypes/git_subrepo/warp.rb

@@ -2,7 +2,7 @@
 
 require 'eac_ruby_utils/simple_cache'
 require 'eac_launcher/git/sub_warp_base'
-require 'eac_launcher/instances/error'
+require 'avm/launcher/errors/base'
 require 'eac_launcher/paths/real'
 require 'eac_launcher/vendor/github'
 
@@ -32,8 +32,9 @@ module Avm
             return if parent_git_warped.rev_parse(subrepo_parent_hash) &&
                       parent_git_warped.descendant?('HEAD', subrepo_parent_hash)
 
-            raise EacLauncher::Instances::Error, "Subrepo parent hash \"#{subrepo_parent_hash}\""\
-              " not found in \"#{parent_git_warped}\""
+            raise EacLauncher::Instances::Errors::Base,
+                  "Subrepo parent hash \"#{subrepo_parent_hash}\"" \
+                  " not found in \"#{parent_git_warped}\""
           end
 
           def subrepo_parent_hash
@@ -41,7 +42,7 @@ module Avm
             h = data['Pull Parent']
             return h if h.present?
 
-            raise EacLauncher::Instances::Error, "Subrepo parent hash is blank: #{data}"
+            raise EacLauncher::Instances::Errors::Base, "Subrepo parent hash is blank: #{data}"
           end
 
           def init_aux

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.62.1'
+    VERSION = '0.62.2'
   end
 end

data/lib/eac_launcher/context.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 require 'active_support/core_ext/hash/indifferent_access'
+require 'avm/launcher/context/instance_manager'
 require 'eac_ruby_utils/simple_cache'
 require 'eac_ruby_utils/console/speaker'
 require 'eac_launcher/context/instance_discovery'
-require 'eac_launcher/context/instance_manager'
 require 'eac_launcher/context/settings'
 require 'eac_launcher/paths/logical'
 require 'eac_launcher/project'
@@ -39,7 +39,7 @@ module EacLauncher
       @settings = ::EacLauncher::Context::Settings.new(build_option(:settings_file))
       @cache_root = build_option(:cache_root)
       @publish_options = { new: false, confirm: false, stereotype: nil }
-      @instance_manager = ::EacLauncher::Context::InstanceManager.new(self)
+      @instance_manager = ::Avm::Launcher::Context::InstanceManager.new(self)
       @recache = false
     end
 

data/lib/eac_launcher/context/instance_discovery.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'ruby-progressbar'
-require 'eac_launcher/instances/base'
+require 'avm/launcher/instances/base'
 
 module EacLauncher
   class Context
@@ -22,7 +22,7 @@ module EacLauncher
         update_progress_format(path)
         on_rescued_path_instances(path) do |r|
           if path.project?
-            parent_instance = ::EacLauncher::Instances::Base.instanciate(path, parent_instance)
+            parent_instance = ::Avm::Launcher::Instances::Base.instanciate(path, parent_instance)
             r << path
           end
           children = path.children

data/lib/eac_launcher/git/sub_warp_base.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require 'eac_launcher/instances/error'
+require 'avm/projects/stereotype'
+require 'avm/launcher/errors/base'
 
 module EacLauncher
   module Git
@@ -11,7 +12,7 @@ module EacLauncher
         r = find_parent_instance(instance.parent)
         return r if r
 
-        ::EacLauncher::Instances::Error.new('Git parent not found')
+        ::EacLauncher::Instances::Errors::Base.new('Git parent not found')
       end
 
       def find_parent_instance(current)

data/lib/eac_launcher/instances.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_launcher/instances/base'
-require 'eac_launcher/instances/error'
+require 'avm/launcher/errors/base'
+require 'avm/launcher/instances/base'
 require 'eac_launcher/instances/runner_helper'
 require 'eac_launcher/instances/settings'

data/lib/eac_launcher/instances/error.rb

@@ -1,8 +1,12 @@
 # frozen_string_literal: true
 
-module EacLauncher
-  module Instances
-    class Error < StandardError
+module Avm
+  module Launcher
+    module Instances
+      module Errors
+        class Error < StandardError
+        end
+      end
     end
   end
 end

data/lib/eac_launcher/paths/logical.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/stereotypes'
+require 'avm/projects/stereotypes'
 require 'eac_launcher/paths/real'
 
 module EacLauncher
@@ -68,7 +68,7 @@ module EacLauncher
       end
 
       def warped_uncached
-        if is_a?(::EacLauncher::Instances::Base)
+        if is_a?(::Avm::Launcher::Instances::Base)
           stereotypes.each do |s|
             return s.warp_class.new(self) if s.warp_class
           end

data/lib/eac_launcher/publish/base.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_launcher/instances/error'
+require 'avm/launcher/errors/base'
 
 module EacLauncher
   module Publish
@@ -35,7 +35,7 @@ module EacLauncher
 
       def check_with_rescue
         internal_check
-      rescue ::EacLauncher::Instances::Error => e
+      rescue ::EacLauncher::Instances::Errors::Base => e
         ::EacLauncher::Publish::CheckResult.blocked("Error: #{e}")
       rescue ::EacLauncher::Git::Error => e
         ::EacLauncher::Publish::CheckResult.blocked("Git error: #{e}")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.62.1
+  version: 0.62.2
 platform: ruby
 authors:
 - Esquilo Azul Company
@@ -363,6 +363,13 @@ files:
 - lib/avm/instances/entries.rb
 - lib/avm/instances/entries/entry_reader.rb
 - lib/avm/instances/entry_keys.rb
+- lib/avm/launcher/context/instance_manager.rb
+- lib/avm/launcher/context/instance_manager/cached_instance.rb
+- lib/avm/launcher/context/instance_manager/cached_instances.rb
+- lib/avm/launcher/errors/base.rb
+- lib/avm/launcher/errors/non_project.rb
+- lib/avm/launcher/instances/base.rb
+- lib/avm/launcher/instances/base/cache.rb
 - lib/avm/local_projects.rb
 - lib/avm/local_projects/instance.rb
 - lib/avm/local_projects/jobs/update.rb
@@ -487,7 +494,6 @@ files:
 - lib/eac_launcher.rb
 - lib/eac_launcher/context.rb
 - lib/eac_launcher/context/instance_discovery.rb
-- lib/eac_launcher/context/instance_manager.rb
 - lib/eac_launcher/context/settings.rb
 - lib/eac_launcher/git.rb
 - lib/eac_launcher/git/base.rb
@@ -503,8 +509,6 @@ files:
 - lib/eac_launcher/git/sub_warp_base.rb
 - lib/eac_launcher/git/warp_base.rb
 - lib/eac_launcher/instances.rb
-- lib/eac_launcher/instances/base.rb
-- lib/eac_launcher/instances/base/cache.rb
 - lib/eac_launcher/instances/error.rb
 - lib/eac_launcher/instances/runner_helper.rb
 - lib/eac_launcher/instances/settings.rb

data/lib/eac_launcher/context/instance_manager.rb

@@ -1,95 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_launcher/publish/check_result'
-require('yaml')
-
-module EacLauncher
-  class Context
-    class InstanceManager
-      include ::EacRubyUtils::SimpleCache
-
-      def initialize(context)
-        @context = context
-      end
-
-      def publish_state_set(instance, stereotype_name, check_status)
-        data = cached_instances_file_content_uncached
-        data[instance.logical] ||= {}
-        data[instance.logical][:publish_state] ||= {}
-        data[instance.logical][:publish_state][stereotype_name] = check_status
-        write_cache_file(data)
-      end
-
-      def pending_instances
-        instances.select { |instance| pending_instance?(instance) }
-      end
-
-      private
-
-      def instances_uncached
-        (cached_instances || search_instances).select(&:included?)
-      end
-
-      def search_instances
-        cache_instances(::EacLauncher::Context::InstanceDiscovery.new(@context).instances)
-      end
-
-      def cached_instances
-        return nil if @context.recache
-        return nil unless cached_instances_file_content
-
-        CachedInstances.new(cached_instances_file_content).instances
-      end
-
-      def cached_instances_file_content_uncached
-        r = YAML.load_file(cache_file_path)
-        r.is_a?(::Hash) ? r : nil
-      rescue Errno::ENOENT
-        nil
-      end
-
-      def cache_instances(instances)
-        write_cache_file(Hash[instances.map { |i| [i.logical, i.to_h] }])
-        instances
-      end
-
-      def write_cache_file(data)
-        ::File.write(cache_file_path, data.to_yaml)
-      end
-
-      def cache_file_path
-        ::File.join(@context.cache_root, 'instances.yml')
-      end
-
-      def pending_instance?(instance)
-        data = cached_instances_file_content
-        return false unless data[instance.logical]
-        return false unless data[instance.logical][:publish_state].is_a?(Hash)
-
-        data[instance.logical][:publish_state].any? do |_k, v|
-          ::EacLauncher::Publish::CheckResult.pending_status?(v)
-        end
-      end
-
-      class CachedInstances
-        def initialize(content)
-          @content = content
-          @instances = {}
-        end
-
-        def instances
-          @content.keys.map { |k| by_logical_path(k) }
-        end
-
-        def by_logical_path(key)
-          return @instances[key] if @instances.key?(key)
-
-          h = @content[key]
-          parent_instance = h[:parent] ? by_logical_path(h[:parent]) : nil
-          path = ::EacLauncher::Paths::Logical.from_h(@context, h)
-          @instances[key] = ::EacLauncher::Instances::Base.instanciate(path, parent_instance)
-        end
-      end
-    end
-  end
-end

data/lib/eac_launcher/instances/base.rb

@@ -1,91 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'base/cache'
-
-module EacLauncher
-  module Instances
-    module Base
-      class << self
-        def extend_object(object)
-          object.extend ::EacRubyUtils::SimpleCache
-          object.extend ::EacRubyUtils::Console::Speaker
-          object.extend ::EacLauncher::Instances::Base::Cache
-          super
-        end
-
-        def instanciate(path, parent)
-          unless path.is_a?(::EacLauncher::Instances::Base)
-            raise "#{path} is not a project" unless path.project?
-
-            path.extend(::EacLauncher::Instances::Base)
-            path.parent = parent
-          end
-          path
-        end
-      end
-
-      attr_accessor :parent
-
-      def name
-        logical
-      end
-
-      def stereotype?(stereotype)
-        stereotypes.include?(stereotype)
-      end
-
-      def to_parent_path
-        return self unless @parent
-
-        logical.gsub(/\A#{Regexp.quote(@parent.logical)}/, '')
-      end
-
-      def project?
-        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
-
-      def included?
-        !::EacLauncher::Context.current.settings.excluded_projects.include?(project_name)
-      end
-
-      def to_h
-        super.to_h.merge(parent: parent ? parent.logical : nil)
-      end
-
-      private
-
-      def publish?(stereotype)
-        return false unless stereotype.publish_class
-
-        filter = ::EacLauncher::Context.current.publish_options[:stereotype]
-        filter.blank? ? true : filter == stereotype.name.demodulize
-      end
-
-      def options_uncached
-        ::EacLauncher::Context.current.settings.instance_settings(self)
-      end
-    end
-  end
-end

data/lib/eac_launcher/instances/base/cache.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-module EacLauncher
-  module Instances
-    module Base
-      module Cache
-        def cache_path(subpath)
-          File.join(cache_root, subpath)
-        end
-
-        def cache_key(key, &block)
-          v = cache_key_get(key)
-          return v if v.present? || block.nil?
-
-          v = yield
-          cache_key_write(key, v)
-          v
-        end
-
-        private
-
-        def cache_key_get(key)
-          File.file?(cache_key_path(key)) ? File.read(cache_key_path(key)) : nil
-        end
-
-        def cache_key_write(key, value)
-          FileUtils.mkdir_p(File.dirname(cache_key_path(key)))
-          File.write(cache_key_path(key), value)
-        end
-
-        def cache_key_path(key)
-          File.join(cache_root, 'keys', key.parameterize)
-        end
-
-        def cache_root
-          File.join(::EacLauncher::Context.current.cache_root, name.parameterize)
-        end
-      end
-    end
-  end
-end