eac_tools 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8e7fe08b68334a93a53b8f91d2becce812f7e5489d36af3718477d77d651cbc
-  data.tar.gz: 484af66fe24d6907d195fb67af719ad79299d3ba978e2387e92737b2c1c72c8b
+  metadata.gz: 5bf2ba914845ef4487ca80e47097879d283ece113e6cbe0863a9f54920b605d7
+  data.tar.gz: b9c45a9db9dba67f8c742bf689a1b267480c40b8312ec066dfe25aabf8f66ec6
 SHA512:
-  metadata.gz: 76be1cd01e6f3874a9c3a0a987592cdee9957b723f0ed0dab109f95a0541abd49d62e76a1f3f6da2d633de6ba6bcc115893eb5b44f18180c1deba40c5c7c9b5d
-  data.tar.gz: 8d814b9bfa7c899a56a2721088e6285ca17af658c3e500ff64075682a59eccb0c7347145c2887313c2520cd9315916ff4c73529dc775f5714561b2c3581711b0
+  metadata.gz: de155498ec4b29e4391433f4fe3fb5a9509f15f92d5b4106b1e402026e7349d3887bb4b75bedf96bcb22281ba606149bd17be4ba67dad2d3bb4c741dc4f2a237
+  data.tar.gz: 0e738279dd36f46a1bc247d71fb2165ad0b5537e7050874a3705ee3b85c0b353e490535b3e74c7d6960ac17df6c0a8ab9c5f5ad371a7de7a524ad266faae4e6c

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.12.0)
+    eac_tools (0.13.0)
       avm-eac_generic_base0 (~> 0.4)
-      avm-eac_rails_base0 (~> 0.6)
-      avm-eac_rails_base1 (~> 0.4, >= 0.4.1)
+      avm-eac_rails_base0 (~> 0.6, >= 0.6.1)
+      avm-eac_rails_base1 (~> 0.4, >= 0.4.2)
       avm-eac_redmine_base0 (~> 0.11)
       avm-eac_redmine_plugin_base0 (~> 0.3)
       avm-eac_ruby_base1 (~> 0.11)
       avm-tools (~> 0.127)
-      eac_ruby_utils (~> 0.96, >= 0.96.1)
+      eac_ruby_utils (~> 0.97)
 
 PATH
   remote: sub/avm-eac_generic_base0
@@ -21,17 +21,18 @@ PATH
 PATH
   remote: sub/avm-eac_rails_base0
   specs:
-    avm-eac_rails_base0 (0.6.0)
-      avm-eac_rails_base1 (~> 0.3)
-      eac_ruby_utils (~> 0.80, >= 0.80.2)
+    avm-eac_rails_base0 (0.6.1)
+      avm-eac_rails_base1 (~> 0.4, >= 0.4.2)
+      eac_ruby_utils (~> 0.97)
 
 PATH
   remote: sub/avm-eac_rails_base1
   specs:
-    avm-eac_rails_base1 (0.4.1)
-      avm-eac_ruby_base1 (~> 0.9, >= 0.9.1)
+    avm-eac_rails_base1 (0.4.2)
+      avm (~> 0.31)
+      avm-eac_ruby_base1 (~> 0.11)
       avm-eac_webapp_base0 (~> 0.3)
-      eac_ruby_utils (~> 0.95, >= 0.95.2)
+      eac_ruby_utils (~> 0.97)
 
 PATH
   remote: sub/avm-eac_redmine_base0
@@ -81,12 +82,12 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.30.0)
+    avm (0.31.0)
       eac_cli (~> 0.27, >= 0.27.6)
-      eac_config (~> 0.9)
+      eac_config (~> 0.10)
       eac_docker (~> 0.3)
       eac_git (~> 0.6)
-      eac_ruby_utils (~> 0.95)
+      eac_ruby_utils (~> 0.97)
       eac_templates (~> 0.1, >= 0.1.1)
       filesize (~> 0.2)
       htmlbeautifier (~> 1.3, >= 1.3.1)
@@ -103,9 +104,9 @@ PATH
 PATH
   remote: sub/eac_config
   specs:
-    eac_config (0.9.0)
+    eac_config (0.10.0)
       addressable
-      eac_ruby_utils (~> 0.83)
+      eac_ruby_utils (~> 0.97)
 
 PATH
   remote: sub/eac_docker
@@ -134,7 +135,7 @@ PATH
 PATH
   remote: sub/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.96.1)
+    eac_ruby_utils (0.97.0)
       activesupport (>= 4, < 7)
       addressable (~> 2.6)
       bundler
@@ -268,7 +269,7 @@ GEM
     rainbow (3.1.1)
     rchardet (1.8.0)
     rexml (3.2.5)
-    rouge (3.29.0)
+    rouge (3.30.0)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
       rspec-expectations (~> 3.11.0)

data/lib/eac_tools/version.rb

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

data/sub/avm/avm.gemspec

@@ -13,10 +13,10 @@ 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_config', '~> 0.10'
   s.add_dependency 'eac_docker', '~> 0.3'
   s.add_dependency 'eac_git', '~> 0.6'
-  s.add_dependency 'eac_ruby_utils', '~> 0.95'
+  s.add_dependency 'eac_ruby_utils', '~> 0.97'
   s.add_dependency 'eac_templates', '~> 0.1', '>= 0.1.1'
   s.add_dependency 'filesize', '~> 0.2'
   s.add_dependency 'htmlbeautifier', '~> 1.3', '>= 1.3.1'

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

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'avm/instances/entry_keys'
+
+module Avm
+  module Instances
+    class Base
+      module AutoValues
+        module Install
+          def auto_access
+            read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_URL).present? ? 'ssh' : 'local'
+          end
+
+          def auto_install_hostname
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID,
+                                  ::Avm::Instances::EntryKeys::INSTALL_HOSTNAME)
+          end
+
+          def auto_install_port
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID,
+                                  ::Avm::Instances::EntryKeys::INSTALL_PORT) || 22
+          end
+
+          def auto_install_username
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID,
+                                  ::Avm::Instances::EntryKeys::INSTALL_USERNAME)
+          end
+
+          def auto_install_url
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID,
+                                  ::Avm::Instances::EntryKeys::INSTALL_URL) ||
+              auto_install_url_by_parts
+          end
+
+          def auto_install_url_by_parts
+            read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_HOSTNAME).if_present do |a|
+              a = read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_USERNAME)
+                    .if_present(a) { |v| "#{v}@#{a}" }
+              a = read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_PORT)
+                    .if_present(a) { |v| "#{a}:#{v}" }
+              "ssh://#{a}"
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -10,7 +10,7 @@ module Avm
         extend ::ActiveSupport::Concern
 
         included do
-          %w[Access Admin Data Database Filesystem Mailer Ruby Source System Web]
+          %w[Admin Data Database Filesystem Install Mailer Ruby Source System Web]
             .each do |class_name|
             include const_get(class_name)
           end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'avm/with_application_stereotype'
-require 'avm/with_dynamic_runners'
+require 'avm/with/application_stereotype'
+require 'avm/with/extra_subcommands'
 require 'eac_ruby_utils/require_sub'
 require 'eac_ruby_utils/simple_cache'
 require 'avm/instances/entries'
@@ -14,8 +14,8 @@ module Avm
       enable_simple_cache
       require_sub __FILE__, include_modules: true
       include ::Avm::Instances::Entries
-      include ::Avm::WithDynamicRunners
-      include ::Avm::WithApplicationStereotype
+      include ::Avm::With::ExtraSubcommands
+      include ::Avm::With::ApplicationStereotype
 
       lists.add_string :access, :local, :ssh
 

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

@@ -5,6 +5,8 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module Instances
     module EntryKeys
+      URI_FIELDS = %i[fragment hostname password path port query scheme url username].freeze
+
       class << self
         def all
           all_keys.to_a
@@ -43,17 +45,16 @@ module Avm
 
       {
         '' => %w[data_fs_path fs_path host_id name source_instance_id],
-        admin: %w[username password api_key],
-        database: %w[id hostname limit name password port system timeout username extra],
+        admin: URI_FIELDS + %w[api_key],
+        database: URI_FIELDS + %w[id limit name system timeout extra],
         docker: %w[registry],
         fs: %w[url],
+        install: URI_FIELDS,
         mailer: {
           '' => %w[id from reply_to],
-          smtp: %w[address port domain username password authentication openssl_verify_mode
-                   starttls_auto tls]
+          smtp: URI_FIELDS + %w[address domain authentication openssl_verify_mode starttls_auto tls]
         },
-        ssh: %w[hostname port url username],
-        web: %w[authority hostname path port scheme url userinfo]
+        web: URI_FIELDS + %w[authority userinfo]
       }.each { |prefix, suffixes| keys_consts_set(prefix, suffixes) }
     end
   end

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

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/core_ext'
+
 module Avm
   module Instances
-    require 'avm/applications/base'
-    require 'avm/instances/entries'
+    require_sub __FILE__
   end
 end

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

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

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

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'avm/with_application_stereotype'
+require 'avm/with/application_stereotype'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module SourceGenerators
     class Base
-      include ::Avm::WithApplicationStereotype
+      include ::Avm::With::ApplicationStereotype
       common_constructor :target_path do
         self.target_path = target_path.to_pathname
       end

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

@@ -2,8 +2,8 @@
 
 require 'avm/registry'
 require 'avm/scms/null'
-require 'avm/with_application_stereotype'
-require 'avm/with_dynamic_runners'
+require 'avm/with/application_stereotype'
+require 'avm/with/extra_subcommands'
 require 'eac_git'
 require 'eac_ruby_utils/core_ext'
 
@@ -11,8 +11,8 @@ module Avm
   module Sources
     class Base
       require_sub __FILE__, include_modules: true
-      include ::Avm::WithApplicationStereotype
-      include ::Avm::WithDynamicRunners
+      include ::Avm::With::ApplicationStereotype
+      include ::Avm::With::ExtraSubcommands
       compare_by :path
       enable_abstract_methods
       enable_simple_cache

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

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

data/sub/avm/lib/avm/with/application_stereotype.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module With
+    module ApplicationStereotype
+      common_concern do
+        include ClassMethods
+      end
+
+      module ClassMethods
+        # @return [Avm::ApplicationStereotype::Base]
+        def application_stereotype
+          @application_stereotype ||=
+            ::Avm::Registry.application_stereotypes.detect(application_stereotype_name)
+        end
+
+        # @return [String]
+        def application_stereotype_name
+          stereotype_namespace_module.name.demodulize
+        end
+
+        # @return [Module]
+        def stereotype_namespace_module
+          module_parent.module_parent
+        end
+      end
+
+      def stereotype_namespace_module
+        self.class.stereotype_namespace_module
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/with/extra_subcommands.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'eac_cli/runner_with/subcommands'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module With
+    module ExtraSubcommands
+      # @return [Hash<String, EacCli::Runner>]
+      def extra_available_subcommands
+        extra_available_subcommands_from_runners_module
+      end
+
+      # @return [Hash<String, EacCli::Runner>]
+      def extra_available_subcommands_from_runners_module
+        self.class.ancestors.reverse.inject({}) do |a, e|
+          a.merge(RunnersFromModule.new(e).result)
+        end
+      end
+
+      class RunnersFromModule
+        enable_simple_cache
+        common_constructor :the_module
+
+        # @return [Hash<String, EacCli::Runner>]
+        def result
+          return {} if runners_module.blank?
+
+          ::EacCli::RunnerWith::Subcommands.subcommands_from_module(runners_module)
+        end
+
+        def runners_module_uncached
+          return nil if the_module.module_parent.blank?
+
+          begin
+            the_module.module_parent.const_get('Runners')
+          rescue ::NameError
+            nil
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -23,9 +23,9 @@ RSpec.describe ::Avm::Instances::Base do
           ::Avm::Instances::EntryKeys::DATABASE_PASSWORD => 'pass1',
           ::Avm::Instances::EntryKeys::DATABASE_HOSTNAME => 'database.net',
           ::Avm::Instances::EntryKeys::DATABASE_PORT => 5432,
-          ::Avm::Instances::EntryKeys::SSH_HOSTNAME => 'myhost.com',
-          ::Avm::Instances::EntryKeys::SSH_USERNAME => 'myuser',
-          ::Avm::Instances::EntryKeys::SSH_URL => 'ssh://otheruser@otherhost.com'
+          ::Avm::Instances::EntryKeys::INSTALL_HOSTNAME => 'myhost.com',
+          ::Avm::Instances::EntryKeys::INSTALL_USERNAME => 'myuser',
+          ::Avm::Instances::EntryKeys::INSTALL_URL => 'ssh://otheruser@otherhost.com'
         },
         'app_2' => {
           ::Avm::Instances::EntryKeys::DATABASE_HOSTNAME => '127.0.0.1',

data/sub/avm/spec/lib/avm/instances/base_spec_configs_storage.yml

@@ -11,7 +11,7 @@ app_1:
     password: pass1
     hostname: database.net
 app_2:
-  ssh:
+  install:
     hostname: myhost.com
     username: myuser
     url: ssh://otheruser@otherhost.com

data/sub/avm-eac_rails_base0/avm-eac_rails_base0.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm-eac_rails_base1', '~> 0.3'
-  s.add_dependency 'eac_ruby_utils', '~> 0.80', '>= 0.80.2'
+  s.add_dependency 'avm-eac_rails_base1', '~> 0.4', '>= 0.4.2'
+  s.add_dependency 'eac_ruby_utils', '~> 0.97'
 
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase0
-    VERSION = '0.6.0'
+    VERSION = '0.6.1'
   end
 end

data/sub/avm-eac_rails_base1/avm-eac_rails_base1.gemspec

@@ -12,9 +12,10 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.9', '>= 0.9.1'
+  s.add_dependency 'avm', '~> 0.31'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.11'
   s.add_dependency 'avm-eac_webapp_base0', '~> 0.3'
-  s.add_dependency 'eac_ruby_utils', '~> 0.95', '>= 0.95.2'
+  s.add_dependency 'eac_ruby_utils', '~> 0.97'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/systemd_unit.rb

@@ -38,7 +38,7 @@ module Avm
       end
 
       def user
-        instance.ssh_username
+        instance.install_username
       end
 
       private

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase1
-    VERSION = '0.4.1'
+    VERSION = '0.4.2'
   end
 end

data/sub/eac_config/eac_config.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*']
 
   s.add_dependency 'addressable'
-  s.add_dependency 'eac_ruby_utils', '~> 0.83'
+  s.add_dependency 'eac_ruby_utils', '~> 0.97'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/eac_config/lib/eac_config/entry_path.rb

@@ -28,17 +28,28 @@ module EacConfig
       end
     end
 
-    attr_reader :parts
-
-    def initialize(parts)
-      @parts = parts.to_a.freeze
+    common_constructor :parts, default: [[]] do
+      self.parts = ::Array.new(parts).freeze
     end
 
+    compare_by :parts
+    delegate :any?, :count, :each, :each_value, :each_with_index, :empty?, :fetch, :first, :index,
+             :inject, :last, :map, :size, to: :parts
+
     # @return [EacConfig::EntryPath]
     def +(other)
       self.class.new(parts + self.class.assert(other).parts)
     end
 
+    def [](*args)
+      slice(*args)
+    end
+
+    def slice(*args)
+      r = parts.slice(*args)
+      r.is_a?(::Enumerable) ? self.class.new(r) : r
+    end
+
     def to_s
       "#{self.class}[#{parts.join(PART_SEPARATOR)}]"
     end

data/sub/eac_config/lib/eac_config/version.rb

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

data/sub/eac_ruby_utils/lib/eac_ruby_utils/regexp_parser.rb

@@ -20,6 +20,11 @@ module EacRubyUtils
       raise ::ArgumentError, "String \"#{string}\" does not match pattern \"#{pattern}\""
     end
 
+    # @return [Boolean]
+    def parse?(string)
+      internal_parse(string).first
+    end
+
     private
 
     def internal_parse(string)

data/sub/eac_ruby_utils/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.96.1'
+  VERSION = '0.97.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-27 00:00:00.000000000 Z
+date: 2022-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
@@ -31,6 +31,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +41,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_rails_base1
   requirement: !ruby/object:Gem::Requirement
@@ -47,7 +53,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +63,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: avm-eac_redmine_base0
   requirement: !ruby/object:Gem::Requirement
@@ -120,20 +126,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.96'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.96.1
+        version: '0.97'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.96'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.96.1
+        version: '0.97'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -218,7 +218,7 @@ files:
 - sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/lib/ability.rb
 - sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/lib/ability_mapping.rb
 - sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/public/favicon.ico
-- sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/spec/ruby_style_spec.rb
+- sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/spec/code/rubocop_spec.rb
 - sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/spec/spec_helper.rb
 - sub/avm-eac_rails_base1/Gemfile
 - sub/avm-eac_rails_base1/avm-eac_rails_base1.gemspec
@@ -1026,11 +1026,11 @@ files:
 - sub/avm/lib/avm/instances.rb
 - sub/avm/lib/avm/instances/base.rb
 - sub/avm/lib/avm/instances/base/auto_values.rb
-- sub/avm/lib/avm/instances/base/auto_values/access.rb
 - sub/avm/lib/avm/instances/base/auto_values/admin.rb
 - sub/avm/lib/avm/instances/base/auto_values/data.rb
 - sub/avm/lib/avm/instances/base/auto_values/database.rb
 - sub/avm/lib/avm/instances/base/auto_values/filesystem.rb
+- sub/avm/lib/avm/instances/base/auto_values/install.rb
 - sub/avm/lib/avm/instances/base/auto_values/mailer.rb
 - sub/avm/lib/avm/instances/base/auto_values/ruby.rb
 - sub/avm/lib/avm/instances/base/auto_values/source.rb
@@ -1097,8 +1097,8 @@ files:
 - sub/avm/lib/avm/sync.rb
 - sub/avm/lib/avm/version.rb
 - sub/avm/lib/avm/version_number.rb
-- sub/avm/lib/avm/with_application_stereotype.rb
-- sub/avm/lib/avm/with_dynamic_runners.rb
+- sub/avm/lib/avm/with/application_stereotype.rb
+- sub/avm/lib/avm/with/extra_subcommands.rb
 - sub/avm/spec/lib/avm/applications/base_spec.rb
 - sub/avm/spec/lib/avm/applications/base_spec_fixture.yml
 - sub/avm/spec/lib/avm/instances/base_spec.rb

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

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-module Avm
-  module Instances
-    class Base
-      module AutoValues
-        module Access
-          def auto_access
-            read_entry_optional('ssh.url').present? ? 'ssh' : 'local'
-          end
-
-          def auto_ssh_hostname
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'ssh.hostname')
-          end
-
-          def auto_ssh_port
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'ssh.port') || 22
-          end
-
-          def auto_ssh_username
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'ssh.username')
-          end
-
-          def auto_ssh_url
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'ssh.url') ||
-              auto_ssh_url_by_parts
-          end
-
-          def auto_ssh_url_by_parts
-            read_entry_optional('ssh.hostname').if_present do |a|
-              a = read_entry_optional('ssh.username').if_present(a) { |v| "#{v}@#{a}" }
-              a = read_entry_optional('ssh.port').if_present(a) { |v| "#{a}:#{v}" }
-              "ssh://#{a}"
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/sub/avm/lib/avm/with_application_stereotype.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module WithApplicationStereotype
-    common_concern do
-      include ClassMethods
-    end
-
-    module ClassMethods
-      # @return [Avm::ApplicationStereotype::Base]
-      def application_stereotype
-        @application_stereotype ||=
-          ::Avm::Registry.application_stereotypes.detect(application_stereotype_name)
-      end
-
-      # @return [String]
-      def application_stereotype_name
-        stereotype_namespace_module.name.demodulize
-      end
-
-      # @return [Module]
-      def stereotype_namespace_module
-        module_parent.module_parent
-      end
-    end
-
-    def stereotype_namespace_module
-      self.class.stereotype_namespace_module
-    end
-  end
-end

data/sub/avm/lib/avm/with_dynamic_runners.rb

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_cli/runner_with/subcommands'
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module WithDynamicRunners
-    # @return [Hash<String, EacCli::Runner>]
-    def extra_available_subcommands
-      extra_available_subcommands_from_runners_module
-    end
-
-    # @return [Hash<String, EacCli::Runner>]
-    def extra_available_subcommands_from_runners_module
-      self.class.ancestors.reverse.inject({}) do |a, e|
-        a.merge(RunnersFromModule.new(e).result)
-      end
-    end
-
-    class RunnersFromModule
-      enable_simple_cache
-      common_constructor :the_module
-
-      # @return [Hash<String, EacCli::Runner>]
-      def result
-        return {} if runners_module.blank?
-
-        ::EacCli::RunnerWith::Subcommands.subcommands_from_module(runners_module)
-      end
-
-      def runners_module_uncached
-        return nil if the_module.module_parent.blank?
-
-        begin
-          the_module.module_parent.const_get('Runners')
-        rescue ::NameError
-          nil
-        end
-      end
-    end
-  end
-end