eac_tools 0.7.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2a2823e5a682fec9ab91720f10d7783faa49fa2015806b7a5d39580bc218001
-  data.tar.gz: f5fd98b06fe0fa9d9e31e55d9c9f5ca31f7efef2e78a80cd9a6c4157ed1a06ee
+  metadata.gz: 8d89f91fc9b0ac96c2510d38c9aa06d37d8697339bde9ce7c8cf877a4af28eaf
+  data.tar.gz: 6bc8567322b54c5aa52ec0006980678c0866970d4048fec767d7ecf3df958b68
 SHA512:
-  metadata.gz: e8c12e5907f1977602dbaedc5d6bd278d2ff4f34090ca74ce9b5b3bd2ec38e55936412e1cf161c43594d760d940f24f1fcfa90b4a80e871077797c8906241cee
-  data.tar.gz: c92d636d848558c31f0b51213e464573a30a70de11ccda7853f0e70f96d8e9853ba9d5298142a939926b65f9f5fe33c906a4fbf22d66dbaca0a2c9fa0dcc13b9
+  metadata.gz: 02bde179ac70148302c0a0ee45aff95c0db7e871df595cfbb079d3a17fca772305a593af8a4031b0a1ece78997863cb30c3a0c2d309120ab807b7e0df6cc43dd
+  data.tar.gz: '048c5163c663b61878bdad6c327a282c2eff64a7ab709ed02fc35d5e856002e950baf924af186c062b627183c7c2687ecf7c6c906f22118a7149d62156a18d8f'

data/Gemfile.lock

@@ -1,22 +1,22 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.7.0)
-      avm-eac_generic_base0 (~> 0.3)
+    eac_tools (0.10.0)
+      avm-eac_generic_base0 (~> 0.4)
       avm-eac_rails_base0 (~> 0.5)
       avm-eac_rails_base1 (~> 0.4, >= 0.4.1)
-      avm-eac_redmine_base0 (~> 0.9)
-      avm-eac_redmine_plugin_base0 (~> 0.2)
-      avm-eac_ruby_base1 (~> 0.10)
-      avm-tools (~> 0.121)
-      eac_ruby_utils (~> 0.95, >= 0.95.2)
+      avm-eac_redmine_base0 (~> 0.10)
+      avm-eac_redmine_plugin_base0 (~> 0.3)
+      avm-eac_ruby_base1 (~> 0.11)
+      avm-tools (~> 0.124)
+      eac_ruby_utils (~> 0.96)
 
 PATH
   remote: sub/avm-eac_generic_base0
   specs:
-    avm-eac_generic_base0 (0.3.0)
-      avm (~> 0.24)
-      eac_ruby_utils (~> 0.05, >= 0.95.2)
+    avm-eac_generic_base0 (0.4.0)
+      avm (~> 0.28)
+      eac_ruby_utils (~> 0.96)
 
 PATH
   remote: sub/avm-eac_rails_base0
@@ -36,7 +36,8 @@ PATH
 PATH
   remote: sub/avm-eac_redmine_base0
   specs:
-    avm-eac_redmine_base0 (0.9.0)
+    avm-eac_redmine_base0 (0.10.0)
+      avm-eac_generic_base0 (~> 0.4)
       avm-eac_rails_base1 (~> 0.4, >= 0.4.1)
       avm-eac_ubuntu_base0 (~> 0.3)
       curb (~> 0.9.11)
@@ -47,24 +48,24 @@ PATH
 PATH
   remote: sub/avm-eac_redmine_plugin_base0
   specs:
-    avm-eac_redmine_plugin_base0 (0.2.0)
-      avm-eac_ruby_base1 (~> 0.10)
+    avm-eac_redmine_plugin_base0 (0.3.0)
+      avm-eac_ruby_base1 (~> 0.11)
       eac_ruby_utils (~> 0.95, >= 0.95.1)
 
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.10.0)
-      avm (~> 0.23)
+    avm-eac_ruby_base1 (0.11.0)
+      avm (~> 0.26)
       avm-eac_generic_base0 (~> 0.2)
       eac_ruby_utils (~> 0.95, >= 0.95.1)
 
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.121.2)
+    avm-tools (0.124.0)
       aranha-parsers (~> 0.4)
-      avm (~> 0.22)
+      avm (~> 0.27)
       avm-eac_asciidoctor_base0 (~> 0.3, >= 0.3.4)
       avm-eac_rails_base0 (~> 0.3)
       avm-eac_redmine_base0 (~> 0.5, >= 0.5.2)
@@ -81,8 +82,9 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.25.0)
+    avm (0.28.0)
       eac_cli (~> 0.27, >= 0.27.6)
+      eac_config (~> 0.9)
       eac_docker (~> 0.3)
       eac_git (~> 0.6)
       eac_ruby_utils (~> 0.95)
@@ -94,15 +96,29 @@ PATH
 PATH
   remote: sub/eac_cli
   specs:
-    eac_cli (0.27.6)
+    eac_cli (0.27.7)
       colorize (~> 0.8.1)
       eac_config (~> 0.8)
       eac_ruby_utils (~> 0.95)
 
+PATH
+  remote: sub/eac_config
+  specs:
+    eac_config (0.9.0)
+      addressable
+      eac_ruby_utils (~> 0.83)
+
+PATH
+  remote: sub/eac_docker
+  specs:
+    eac_docker (0.4.2)
+      eac_ruby_utils (~> 0.96)
+      eac_templates (~> 0.3, >= 0.3.1)
+
 PATH
   remote: sub/eac_fs
   specs:
-    eac_fs (0.12.2)
+    eac_fs (0.12.3)
       content-type
       eac_ruby_utils (~> 0.70)
       ruby-filemagic
@@ -110,7 +126,7 @@ PATH
 PATH
   remote: sub/eac_ruby_base0
   specs:
-    eac_ruby_base0 (0.16.5)
+    eac_ruby_base0 (0.16.6)
       avm-eac_ruby_base1 (~> 0.8)
       eac_cli (~> 0.27, >= 0.27.5)
       eac_fs (~> 0.10)
@@ -119,7 +135,7 @@ PATH
 PATH
   remote: sub/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.95.2)
+    eac_ruby_utils (0.96.0)
       activesupport (>= 4, < 7)
       addressable (~> 2.6)
       bundler
@@ -183,12 +199,6 @@ GEM
       parslet (~> 2.0)
     curb (0.9.11)
     diff-lcs (1.5.0)
-    eac_config (0.8.1)
-      addressable
-      eac_ruby_utils (~> 0.83)
-    eac_docker (0.4.1)
-      eac_ruby_utils (~> 0.74)
-      eac_templates (~> 0.1)
     eac_git (0.12.1)
       eac_ruby_utils (~> 0.83)
       parseconfig (~> 1.0, >= 1.0.8)
@@ -243,7 +253,7 @@ GEM
     minitest (5.16.2)
     multipart-post (2.2.3)
     net-ssh (4.2.0)
-    nokogiri (1.13.7-x86_64-linux)
+    nokogiri (1.13.8-x86_64-linux)
       racc (~> 1.4)
     ofx-parser (1.1.0)
       hpricot (>= 0.6)
@@ -289,7 +299,7 @@ GEM
     ruby-filemagic (0.7.3)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unicode-display_width (1.6.1)
     zeitwerk (2.6.0)
@@ -308,6 +318,8 @@ DEPENDENCIES
   avm-eac_ruby_base1!
   avm-tools!
   eac_cli!
+  eac_config!
+  eac_docker!
   eac_fs!
   eac_ruby_base0!
   eac_ruby_gem_support (~> 0.5.1)
@@ -315,4 +327,4 @@ DEPENDENCIES
   eac_tools!
 
 BUNDLED WITH
-   2.3.17
+   2.3.18

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.7.0'
+  VERSION = '0.10.0'
 end

data/sub/avm/avm.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*']
 
   s.add_dependency 'eac_cli', '~> 0.27', '>= 0.27.6'
+  s.add_dependency 'eac_config', '~> 0.9'
   s.add_dependency 'eac_docker', '~> 0.3'
   s.add_dependency 'eac_git', '~> 0.6'
   s.add_dependency 'eac_ruby_utils', '~> 0.95'

data/sub/avm/lib/avm/application_stereotypes/base/by_gem.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Avm
+  module ApplicationStereotypes
+    class Base
+      module ByGem
+        common_concern
+
+        module ClassMethods
+          def by_gem(gem_name)
+            new(gem_name.gsub('-', '/').camelize)
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/application_stereotypes/base/detection.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Avm
+  module ApplicationStereotypes
+    class Base
+      module Detection
+        common_concern
+
+        module ClassMethods
+          # @return [Class<Avm::Sources::Base>, nil]
+          def detect(object)
+            return singleton_instance if
+            %w[name instance_class source_class].any? { |t| send("detect_by_#{t}?", object) }
+          end
+
+          # @return [Boolean]
+          def detect_by_instance_class?(object)
+            object.is_a?(::Class) && singleton_instance.instance_class == object
+          end
+
+          # @return [Boolean]
+          def detect_by_name?(object)
+            object.is_a?(::String) && singleton_instance.name == object
+          end
+
+          # @return [Boolean]
+          def detect_by_source_class?(object)
+            object.is_a?(::Class) && singleton_instance.source_class == object
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/application_stereotypes/base.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module ApplicationStereotypes
+    class Base
+      common_constructor :namespace_module, :instance_class, :source_class
+
+      # @return [String]
+      def name
+        namespace_module.name.demodulize
+      end
+
+      # @return [String]
+      def to_s
+        name
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/application_stereotypes.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module ApplicationStereotypes
+    require_sub __FILE__
+  end
+end

data/sub/avm/lib/avm/{instances/application.rb → applications/base.rb}

@@ -1,16 +1,15 @@
 # frozen_string_literal: true
 
 require 'avm/instances/entries'
+require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module Instances
-    class Application
+  module Applications
+    class Base
       include ::Avm::Instances::Entries
 
-      attr_reader :id
-
-      def initialize(id)
-        @id = id.to_s
+      common_constructor :id do
+        self.id = id.to_s
       end
 
       def to_s

data/sub/avm/lib/avm/applications.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Applications
+    require_sub __FILE__
+  end
+end

data/sub/avm/lib/avm/docker/image.rb

@@ -3,16 +3,26 @@
 require 'avm/version'
 require 'eac_ruby_utils/core_ext'
 require 'eac_docker/images/templatized'
+require 'eac_docker/registry'
 
 module Avm
   module Docker
     class Image < ::EacDocker::Images::Templatized
+      DEFAULT_REGISTRY_NAME = 'local'
+
+      class << self
+        # @return [EacDocker::Registry]
+        def default_registry
+          ::EacDocker::Registry.new(DEFAULT_REGISTRY_NAME)
+        end
+      end
+
       attr_reader :registry
       attr_accessor :snapshot
       attr_accessor :version
 
-      def initialize(registry)
-        @registry = registry
+      def initialize(registry = nil)
+        @registry = registry || self.class.default_registry
         self.snapshot = true
         self.version = true
       end

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'avm/with_application_stereotype'
+require 'avm/with_dynamic_runners'
 require 'eac_ruby_utils/require_sub'
 require 'eac_ruby_utils/simple_cache'
 require 'avm/instances/entries'
@@ -7,10 +9,13 @@ require 'avm/instances/entries'
 module Avm
   module Instances
     class Base
+      enable_abstract_methods
       enable_listable
       enable_simple_cache
       require_sub __FILE__, include_modules: true
       include ::Avm::Instances::Entries
+      include ::Avm::WithDynamicRunners
+      include ::Avm::WithApplicationStereotype
 
       lists.add_string :access, :local, :ssh
 
@@ -19,8 +24,8 @@ module Avm
       class << self
         def by_id(id)
           application_id, suffix = parse_id(id)
-          require 'avm/instances/application'
-          new(::Avm::Instances::Application.new(application_id), suffix)
+          require 'avm/applications/base'
+          new(::Avm::Applications::Base.new(application_id), suffix)
         end
 
         private

data/sub/avm/lib/avm/instances.rb

@@ -2,7 +2,7 @@
 
 module Avm
   module Instances
-    require 'avm/instances/application'
+    require 'avm/applications/base'
     require 'avm/instances/entries'
   end
 end

data/sub/avm/lib/avm/registry/application_stereotypes/build_available.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'avm/registry/application_stereotypes/stereotype_builder'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Registry
+    class ApplicationStereotypes
+      class BuildAvailable
+        enable_method_class
+
+        common_constructor :owner
+
+        def result
+          reset_buffer
+          read_instances_registry
+          read_sources_registry
+          buffer.values.map(&:build)
+        end
+
+        private
+
+        attr_accessor :buffer
+
+        def read_object(type, object)
+          buffer[object.stereotype_namespace_module] ||=
+            ::Avm::Registry::ApplicationStereotypes::StereotypeBuilder
+              .new(object.stereotype_namespace_module)
+          buffer[object.stereotype_namespace_module].add_object(type, object)
+        end
+
+        def read_instances_registry
+          ::Avm::Registry.instances.available.each { |instance| read_object(:instance, instance) }
+        end
+
+        def read_sources_registry
+          ::Avm::Registry.sources.available.each { |source| read_object(:source, source) }
+        end
+
+        def reset_buffer
+          self.buffer = {}
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/registry/application_stereotypes/stereotype_builder.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'avm/application_stereotypes/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Registry
+    class ApplicationStereotypes
+      class StereotypeBuilder
+        common_constructor :namespace_module
+
+        def add_object(type, object)
+          attr_method = "#{type}_class"
+          raise "#{attr_method} is already present" if send(attr_method).present?
+
+          send("#{attr_method}=", object)
+        end
+
+        # @return [Avm::ApplicationStereotypes::Base]
+        def build
+          ::Avm::ApplicationStereotypes::Base.new(namespace_module, instance_class, source_class)
+        end
+
+        private
+
+        attr_accessor :instance_class, :source_class
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/registry/application_stereotypes.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Registry
+    class ApplicationStereotypes
+      require_sub __FILE__, require_dependency: true
+      enable_simple_cache
+
+      common_constructor :module_suffix
+
+      private
+
+      def available_uncached
+        build_available
+      end
+
+      # @return [Avm::Instances::Base, nil]
+      def class_detect(klass, detect_args)
+        r = ::Avm::Instances::Base.by_id(*detect_args)
+        r.application.stereotype.instance_class == klass ? r : nil
+      end
+
+      def detect(*registered_initialize_args)
+        detect_optional(*registered_initialize_args) ||
+          raise_not_found(*registered_initialize_args)
+      end
+
+      def detect_optional(*registered_initialize_args)
+        registered_modules.reverse.lazy
+          .map { |klass| class_detect(klass, registered_initialize_args) }.find(&:present?)
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/registry/{base.rb → from_gems.rb}

@@ -5,18 +5,27 @@ require 'eac_ruby_utils/gems_registry'
 
 module Avm
   module Registry
-    class Base
+    class FromGems
+      enable_abstract_methods
       enable_simple_cache
       common_constructor :module_suffix
 
+      def available
+        registered_modules.reject(&:abstract?)
+      end
+
+      def class_detect(_klass, _detect_args)
+        raise_abstract_method __method__
+      end
+
       def detect(*registered_initialize_args)
         detect_optional(*registered_initialize_args) ||
           raise_not_found(*registered_initialize_args)
       end
 
       def detect_optional(*registered_initialize_args)
-        registered_modules.reverse.lazy.map { |klass| klass.new(*registered_initialize_args) }
-          .find(&:valid?)
+        available.reverse.lazy
+          .map { |klass| class_detect(klass, registered_initialize_args) }.find(&:present?)
       end
 
       def provider_module_suffix
@@ -39,7 +48,7 @@ module Avm
 
       def raise_not_found(*args)
         raise("No registered module valid for #{args}" \
-            " (Module suffix: #{module_suffix}, Available: #{registered_modules.join(', ')})")
+            " (Module suffix: #{module_suffix}, Available: #{available.join(', ')})")
       end
 
       def registered_modules_uncached

data/sub/avm/lib/avm/registry/instances.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'avm/instances/base'
+require 'avm/registry/from_gems'
+
+module Avm
+  module Registry
+    class Instances < ::Avm::Registry::FromGems
+      # @return [Avm::Instances::Base, nil]
+      def class_detect(klass, detect_args)
+        r = ::Avm::Instances::Base.by_id(*detect_args)
+        r.application.stereotype.instance_class == klass ? r : nil
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/registry/runners.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'avm/registry/from_gems'
+
+module Avm
+  module Registry
+    class Runners < ::Avm::Registry::FromGems
+    end
+  end
+end

data/sub/avm/lib/avm/registry/scms.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'avm/registry/with_path'
+
+module Avm
+  module Registry
+    class Scms < ::Avm::Registry::WithPath
+    end
+  end
+end

data/sub/avm/lib/avm/registry/sources.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'avm/registry/with_path'
+
+module Avm
+  module Registry
+    class Sources < ::Avm::Registry::WithPath
+    end
+  end
+end

data/sub/avm/lib/avm/registry/with_path/cache.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'avm/registry/from_gems'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Registry
+    class WithPath < ::Avm::Registry::FromGems
+      class Cache
+        enable_simple_cache
+        common_constructor :owner
+
+        def detect_optional(path)
+          return nil if path.root?
+          return cached_paths.fetch(path) if cached_paths.key?(path)
+
+          detected = owner.detect_optional(path)
+          detected = detect_optional(path.parent) if detected.blank?
+          cached_paths[path] = detected
+          detected
+        end
+
+        private
+
+        def cached_paths_uncached
+          {}
+        end
+      end
+    end
+  end
+end