eac_tools 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d89f91fc9b0ac96c2510d38c9aa06d37d8697339bde9ce7c8cf877a4af28eaf
-  data.tar.gz: 6bc8567322b54c5aa52ec0006980678c0866970d4048fec767d7ecf3df958b68
+  metadata.gz: cf951e52229600803d874cf5338a82d4a5844fc2b6394efe31f5f6fe6e90e211
+  data.tar.gz: f30235f79e322f9c454de1e4260e660b06a6297dd391db4a1d6631ef97c9d2f2
 SHA512:
-  metadata.gz: 02bde179ac70148302c0a0ee45aff95c0db7e871df595cfbb079d3a17fca772305a593af8a4031b0a1ece78997863cb30c3a0c2d309120ab807b7e0df6cc43dd
-  data.tar.gz: '048c5163c663b61878bdad6c327a282c2eff64a7ab709ed02fc35d5e856002e950baf924af186c062b627183c7c2687ecf7c6c906f22118a7149d62156a18d8f'
+  metadata.gz: 80341907f9a9c14fdda123bc57ee50266f9894e23f247e3c84849bccd6b7ede54a9aebe9fd10463ee61440fe8f834c60f27a03992b8eddb8002ac81bb29ed3a5
+  data.tar.gz: 298ec77d399c84bba732913eb5329373fa5b7500c4d09c2347f86f3ad899cce452fffcbbd7a9b893341c7f310dc1ed17ab9fd2c8473e3895c54ca05470990ee4

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.10.0)
+    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.10)
+      avm-eac_redmine_base0 (~> 0.11)
       avm-eac_redmine_plugin_base0 (~> 0.3)
       avm-eac_ruby_base1 (~> 0.11)
-      avm-tools (~> 0.124)
+      avm-tools (~> 0.125)
       eac_ruby_utils (~> 0.96)
 
 PATH
@@ -36,7 +36,8 @@ PATH
 PATH
   remote: sub/avm-eac_redmine_base0
   specs:
-    avm-eac_redmine_base0 (0.10.0)
+    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)
@@ -63,12 +64,11 @@ PATH
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.124.0)
+    avm-tools (0.125.0)
       aranha-parsers (~> 0.4)
       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)
@@ -82,7 +82,7 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.28.0)
+    avm (0.29.0)
       eac_cli (~> 0.27, >= 0.27.6)
       eac_config (~> 0.9)
       eac_docker (~> 0.3)

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 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

@@ -1,13 +1,18 @@
 # 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
@@ -23,6 +28,18 @@ module Avm
       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/registry/application_stereotypes.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'avm/instances/base'
+require 'avm/sources/base'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -10,26 +12,40 @@ module Avm
 
       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
 
-      # @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
+      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 detect(*registered_initialize_args)
-        detect_optional(*registered_initialize_args) ||
-          raise_not_found(*registered_initialize_args)
+      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 detect_optional(*registered_initialize_args)
-        registered_modules.reverse.lazy
-          .map { |klass| class_detect(klass, registered_initialize_args) }.find(&:present?)
+      def raise_not_found(obj)
+        raise("No registered module valid for #{obj} (Available: #{available.join(', ')})")
       end
     end
   end

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

@@ -9,7 +9,7 @@ module Avm
       # @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
+        r.application.stereotype.instance_class == klass ? klass.by_id(*detect_args) : nil
       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/version.rb

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

data/sub/avm-eac_redmine_base0/avm-eac_redmine_base0.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
+  s.add_dependency 'avm', '~> 0.29'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.4'
   s.add_dependency 'avm-eac_rails_base1', '~> 0.4', '>= 0.4.1'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'avm/instances/base'
+require 'avm/eac_redmine_base0/instances/runners'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRedmineBase0
+    module Instances
+      class Base < ::Avm::Instances::Base
+      end
+    end
+  end
+end

data/sub/{avm-tools/lib/avm/tools/runner/eac_redmine_base0 → avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/runners}/docker.rb

@@ -3,9 +3,9 @@
 require 'avm/docker/runner'
 
 module Avm
-  module Tools
-    class Runner
-      class EacRedmineBase0 < ::Avm::EacRailsBase1::Runner
+  module EacRedmineBase0
+    module Instances
+      module Runners
         class Docker < ::Avm::Docker::Runner
           def use_default_registry?
             false

data/sub/{avm-tools/lib/avm/tools/runner/eac_redmine_base0 → avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/runners}/project_rename.rb

@@ -4,9 +4,9 @@ require 'eac_cli/core_ext'
 require 'avm/eac_rails_base1/runner/code_runner'
 
 module Avm
-  module Tools
-    class Runner
-      class EacRedmineBase0 < ::Avm::EacRailsBase1::Runner
+  module EacRedmineBase0
+    module Instances
+      module Runners
         class ProjectRename
           runner_with ::Avm::EacRailsBase1::RunnerWith::Bundle do
             pos_arg :from

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/runners.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRedmineBase0
+    module Instances
+      module Runners
+        require_sub __FILE__
+      end
+    end
+  end
+end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/runners/base.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'avm/eac_redmine_base0/instance'
+require 'avm/eac_redmine_base0/deploy'
+require 'avm/eac_redmine_base0/apache_host'
+require 'avm/eac_rails_base1/runner'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRedmineBase0
+    module Runners
+      class Base < ::Avm::EacRailsBase1::Runner
+        require_sub __FILE__
+
+        STEREOTYPE_NAME = 'EacRedmineBase0'
+
+        class << self
+          def stereotype_name
+            STEREOTYPE_NAME
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/sources/runners/core_update.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
+require 'avm/eac_rails_base1/sources/base'
 require 'avm/eac_redmine_base0/core_update'
 require 'eac_cli/core_ext'
-require 'avm/eac_rails_base1/sources/base'
-require 'avm/eac_redmine_base0/sources/runners'
-require 'eac_ruby_utils/core_ext'
 
 module Avm
   module EacRedmineBase0

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.10.0'
+    VERSION = '0.11.0'
   end
 end

data/sub/avm-tools/avm-tools.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'avm', '~> 0.27'
   s.add_dependency 'avm-eac_asciidoctor_base0', '~> 0.3', '>= 0.3.4'
   s.add_dependency 'avm-eac_rails_base0', '~> 0.3'
-  s.add_dependency 'avm-eac_redmine_base0', '~> 0.5', '>= 0.5.2'
   s.add_dependency 'avm-eac_ruby_base1', '~> 0.8'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
   s.add_dependency 'avm-files', '~> 0.1'

data/sub/avm-tools/lib/avm/tools/runner/instance/info.rb

@@ -22,6 +22,7 @@ module Avm
           def base_banner
             infov 'ID', instance.id
             infov 'Application ID', instance.application.id
+            infov 'Application stereotype', instance.application.stereotype
             infov 'Suffix', instance.suffix
           end
 

data/sub/avm-tools/lib/avm/tools/runner/instance.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/instances/base'
+require 'avm/registry'
 require 'eac_cli/core_ext'
 
 module Avm
@@ -14,10 +15,14 @@ module Avm
           subcommands
         end
 
+        def extra_available_subcommands
+          instance.if_present({}, &:extra_available_subcommands)
+        end
+
         private
 
         def instance_uncached
-          ::Avm::Instances::Base.by_id(parsed.instance_id)
+          ::Avm::Registry.instances.detect(parsed.instance_id)
         end
       end
     end

data/sub/avm-tools/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.124.0'
+    VERSION = '0.125.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-25 00:00:00.000000000 Z
+date: 2022-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: avm-eac_redmine_plugin_base0
   requirement: !ruby/object:Gem::Requirement
@@ -106,14 +106,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.124'
+        version: '0.125'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.124'
+        version: '0.125'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
@@ -219,8 +219,13 @@ files:
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/data_unit.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/deploy.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instance.rb
+- sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/docker_image.rb
+- sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/runners.rb
+- sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/runners/docker.rb
+- sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/runners/project_rename.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/rest_api.rb
+- sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/runners/base.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/sources/base.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/sources/runners.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/sources/runners/core_update.rb
@@ -420,9 +425,6 @@ files:
 - sub/avm-tools/lib/avm/tools/runner/config.rb
 - sub/avm-tools/lib/avm/tools/runner/config/load_path.rb
 - sub/avm-tools/lib/avm/tools/runner/eac_asciidoctor_base0.rb
-- sub/avm-tools/lib/avm/tools/runner/eac_redmine_base0.rb
-- sub/avm-tools/lib/avm/tools/runner/eac_redmine_base0/docker.rb
-- sub/avm-tools/lib/avm/tools/runner/eac_redmine_base0/project_rename.rb
 - sub/avm-tools/lib/avm/tools/runner/eac_webapp_base0.rb
 - sub/avm-tools/lib/avm/tools/runner/eac_wordpress_base0.rb
 - sub/avm-tools/lib/avm/tools/runner/eac_writings_base0.rb
@@ -969,10 +971,9 @@ files:
 - sub/avm/lib/avm.rb
 - sub/avm/lib/avm/application_stereotypes.rb
 - sub/avm/lib/avm/application_stereotypes/base.rb
-- sub/avm/lib/avm/application_stereotypes/base/by_gem.rb
-- sub/avm/lib/avm/application_stereotypes/base/detection.rb
 - sub/avm/lib/avm/applications.rb
 - sub/avm/lib/avm/applications/base.rb
+- sub/avm/lib/avm/applications/base/stereotype.rb
 - sub/avm/lib/avm/data/instance.rb
 - sub/avm/lib/avm/data/instance/files_unit.rb
 - sub/avm/lib/avm/data/instance/package.rb

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

@@ -1,17 +0,0 @@
-# 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

@@ -1,34 +0,0 @@
-# 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-tools/lib/avm/tools/runner/eac_redmine_base0.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/eac_rails_base1/runner'
-require 'avm/eac_redmine_base0'
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module Tools
-    class Runner
-      class EacRedmineBase0 < ::Avm::EacRailsBase1::Runner
-        require_sub __FILE__
-      end
-    end
-  end
-end