eac_tools 0.8.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee0e7b0ec8c211e2d60baa268eec54c8f94ed0402f8a248d354f6d5ced0e0b3b
-  data.tar.gz: 68ca11e086283e81939d5c8552e6c4c7ea03897790038e789d6d5f2dbf91eb16
+  metadata.gz: cf951e52229600803d874cf5338a82d4a5844fc2b6394efe31f5f6fe6e90e211
+  data.tar.gz: f30235f79e322f9c454de1e4260e660b06a6297dd391db4a1d6631ef97c9d2f2
 SHA512:
-  metadata.gz: bbbcbdb525534c94dea882fc4aa20533c1836e56fefa47f816c97da91f8d31ec03b95ffe7d4b6da049fab7f42d64f64ff652162533ab53056ce06ef4df285556
-  data.tar.gz: 8a14803261fca0b5780abb81a23ee5ac63b72e442b0ebfdc087984277a21e3ec08f17d6cd39ce460e5d0c6768105ec829590afa531e95945e7777d983efbe825
+  metadata.gz: 80341907f9a9c14fdda123bc57ee50266f9894e23f247e3c84849bccd6b7ede54a9aebe9fd10463ee61440fe8f834c60f27a03992b8eddb8002ac81bb29ed3a5
+  data.tar.gz: 298ec77d399c84bba732913eb5329373fa5b7500c4d09c2347f86f3ad899cce452fffcbbd7a9b893341c7f310dc1ed17ab9fd2c8473e3895c54ca05470990ee4

data/Gemfile.lock

@@ -1,22 +1,22 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.8.0)
-      avm-eac_generic_base0 (~> 0.3)
+    eac_tools (0.11.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_base0 (~> 0.11)
       avm-eac_redmine_plugin_base0 (~> 0.3)
       avm-eac_ruby_base1 (~> 0.11)
-      avm-tools (~> 0.122)
-      eac_ruby_utils (~> 0.95, >= 0.95.2)
+      avm-tools (~> 0.125)
+      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,9 @@ PATH
 PATH
   remote: sub/avm-eac_redmine_base0
   specs:
-    avm-eac_redmine_base0 (0.9.1)
+    avm-eac_redmine_base0 (0.11.0)
+      avm (~> 0.29)
+      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)
@@ -62,12 +64,11 @@ PATH
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.122.0)
+    avm-tools (0.125.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)
       avm-eac_ruby_base1 (~> 0.8)
       avm-eac_ubuntu_base0 (~> 0.3)
       avm-files (~> 0.1)
@@ -81,7 +82,7 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.26.0)
+    avm (0.29.0)
       eac_cli (~> 0.27, >= 0.27.6)
       eac_config (~> 0.9)
       eac_docker (~> 0.3)
@@ -107,6 +108,13 @@ PATH
       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:
@@ -127,7 +135,7 @@ PATH
 PATH
   remote: sub/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.95.3)
+    eac_ruby_utils (0.96.0)
       activesupport (>= 4, < 7)
       addressable (~> 2.6)
       bundler
@@ -191,9 +199,6 @@ GEM
       parslet (~> 2.0)
     curb (0.9.11)
     diff-lcs (1.5.0)
-    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)
@@ -248,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)
@@ -314,6 +319,7 @@ DEPENDENCIES
   avm-tools!
   eac_cli!
   eac_config!
+  eac_docker!
   eac_fs!
   eac_ruby_base0!
   eac_ruby_gem_support (~> 0.5.1)
@@ -321,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.8.0'
+  VERSION = '0.11.0'
 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/applications/base/stereotype.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'avm/registry'
+
+module Avm
+  module Applications
+    class Base
+      module Stereotype
+        # @return [Avm::ApplicationStereotypes::Base, nil]
+        def stereotype_by_configuration
+          entry('stereotype').optional_value.if_present do |v|
+            ::Avm::Registry.application_stereotypes.detect(v)
+          end
+        end
+
+        # @return [Avm::ApplicationStereotypes::Base, nil]
+        def stereotype_by_source
+          ::Avm::Registry.application_stereotypes.detect_optional(local_source.class)
+        end
+
+        private
+
+        # @return [Avm::ApplicationStereotypes::Base]
+        def stereotype_uncached
+          stereotype_by_configuration || stereotype_by_source ||
+            raise("Could not find stereotype for application \"#{self}\"")
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'avm/instances/entries'
+require 'avm/registry'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Applications
+    class Base
+      enable_simple_cache
+      require_sub __FILE__, include_modules: true
+      include ::Avm::Instances::Entries
+
+      LOCAL_INSTANCE_SUFFIX = 'dev'
+
+      common_constructor :id do
+        self.id = id.to_s
+      end
+
+      def to_s
+        id
+      end
+
+      def instance(suffix)
+        ::Avm::Instances::Base.new(self, suffix)
+      end
+
+      def name
+        entry(::Avm::Instances::EntryKeys::NAME).read
+      end
+
+      private
+
+      # @return [Avm::Instances::Base]
+      def local_instance_uncached
+        instance(LOCAL_INSTANCE_SUFFIX)
+      end
+
+      # @return [Avm::Sources::Base]
+      def local_source_uncached
+        ::Avm::Registry.sources.detect(local_instance.fs_path)
+      end
+    end
+  end
+end

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,52 @@
+# frozen_string_literal: true
+
+require 'avm/instances/base'
+require 'avm/sources/base'
+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
+
+      def detect(obj)
+        detect_optional(obj) || raise_not_found(obj)
+      end
+
+      def detect_optional(obj)
+        detect_by_instance_class(obj) || detect_by_source_class(obj) || detecy_by_name(obj)
+      end
+
+      private
+
+      def available_uncached
+        build_available
+      end
+
+      def detect_by_instance_class(obj)
+        return nil unless obj.is_a?(::Class) && obj < ::Avm::Instances::Base
+
+        available.find { |a| a.instance_class == obj }
+      end
+
+      def detecy_by_name(obj)
+        return nil unless obj.is_a?(::String)
+
+        available.find { |a| a.name == obj }
+      end
+
+      def detect_by_source_class(obj)
+        return nil unless obj.is_a?(::Class) && obj < ::Avm::Sources::Base
+
+        available.find { |a| a.source_class == obj }
+      end
+
+      def raise_not_found(obj)
+        raise("No registered module valid for #{obj} (Available: #{available.join(', ')})")
+      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 ? klass.by_id(*detect_args) : 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

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'avm/registry/base'
+require 'avm/registry/from_gems'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Registry
-    class WithPath < ::Avm::Registry::Base
+    class WithPath < ::Avm::Registry::FromGems
       class Cache
         enable_simple_cache
         common_constructor :owner

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

@@ -1,13 +1,19 @@
 # frozen_string_literal: true
 
-require 'avm/registry/base'
+require 'avm/registry/from_gems'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Registry
-    class WithPath < ::Avm::Registry::Base
+    class WithPath < ::Avm::Registry::FromGems
       require_sub __FILE__
 
+      # @return [Object, nil]
+      def class_detect(klass, detect_args)
+        r = klass.new(*detect_args)
+        r.valid? ? r : nil
+      end
+
       def detect_by_path(path)
         detect_by_path_optional(path) || raise_not_found(path)
       end

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

@@ -7,14 +7,14 @@ module Avm
   module Registry
     require_sub __FILE__
     enable_listable
-    lists.add_symbol :category, :instance_stereotypes, :runners, :scms, :sources
+    lists.add_symbol :category, :application_stereotypes, :instances, :runners, :scms, :sources
 
     WITH_PATH = [CATEGORY_SCMS, CATEGORY_SOURCES].freeze
 
     class << self
       enable_simple_cache
 
-      # @return [Array<Avm::Registry::Base>]
+      # @return [Array<Avm::Registry::FromGems>]
       def registries
         lists.category.values.map { |c| send(c) }
       end
@@ -28,11 +28,7 @@ module Avm
       end
 
       def registry_class(category)
-        if WITH_PATH.include?(category)
-          ::Avm::Registry::WithPath
-        else
-          ::Avm::Registry::Base
-        end
+        ::Avm::Registry.const_get(category.to_s.camelize)
       end
     end
   end

data/sub/avm/lib/avm/rspec/shared_examples/not_in_avm_registry.rb

@@ -7,7 +7,7 @@ require 'avm/registry'
     .each do |registry|
     context "when registry is #{registry}" do
       it 'is not in the avm registry' do
-        expect(registry.registered_modules).not_to include(described_class)
+        expect(registry.available).not_to include(described_class)
       end
     end
   end

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/with_application_stereotype'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -7,6 +8,7 @@ module Avm
     class Base
       enable_abstract_methods
       enable_simple_cache
+      include ::Avm::WithApplicationStereotype
       abstract_methods :update, :valid?
       common_constructor :path do
         self.path = path.to_pathname

data/sub/avm/lib/avm/sources/base/instance.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/instances/application'
+require 'avm/applications/base'
 require 'avm/instances/base'
 
 module Avm
@@ -16,7 +16,7 @@ module Avm
         private
 
         def application_uncached
-          ::Avm::Instances::Application.new(path.basename)
+          ::Avm::Applications::Base.new(path.basename)
         end
 
         def instance_uncached