eac_tools 0.12.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8e7fe08b68334a93a53b8f91d2becce812f7e5489d36af3718477d77d651cbc
-  data.tar.gz: 484af66fe24d6907d195fb67af719ad79299d3ba978e2387e92737b2c1c72c8b
+  metadata.gz: 435984e41a0bf529de374dc9e4640143f9e9caf7a26118d11ce65e6879488ed2
+  data.tar.gz: 99c63bd9a4b686211df32d65762873913e21b245a21535e3bc0f3ef8d9e81080
 SHA512:
-  metadata.gz: 76be1cd01e6f3874a9c3a0a987592cdee9957b723f0ed0dab109f95a0541abd49d62e76a1f3f6da2d633de6ba6bcc115893eb5b44f18180c1deba40c5c7c9b5d
-  data.tar.gz: 8d814b9bfa7c899a56a2721088e6285ca17af658c3e500ff64075682a59eccb0c7347145c2887313c2520cd9315916ff4c73529dc775f5714561b2c3581711b0
+  metadata.gz: 31d1736330d976d3a50e14fa312b2ce826227fea5da3fb3a9bfd846a9a870a7a36244f11f7ac77989bd6773f6f8dbf797ed4065b0061256dbaacd4468d047052
+  data.tar.gz: ec2df47e102ed54df74f8f35ffb52038d272c20879900c88aaf27058be34c0d2527a96b6f21c4c0dd81b0a70d42d1ff6e166d045a311c9cd411cdc89ebb2afbe

data/Gemfile.lock

@@ -1,15 +1,27 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.12.0)
+    eac_tools (0.15.0)
+      avm-eac_asciidoctor_base0 (~> 0.4)
       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)
+      avm-eac_ruby_base1 (~> 0.12)
+      avm-eac_webapp_base0 (~> 0.3, >= 0.3.1)
+      avm-tools (~> 0.128)
+      eac_ruby_utils (~> 0.97)
+
+PATH
+  remote: sub/avm-eac_asciidoctor_base0
+  specs:
+    avm-eac_asciidoctor_base0 (0.4.0)
+      asciidoctor (~> 2.0, >= 2.0.12)
+      avm-eac_webapp_base0 (~> 0.2)
+      eac_ruby_utils (~> 0.63)
+      os
+      rouge (~> 3.26)
 
 PATH
   remote: sub/avm-eac_generic_base0
@@ -21,17 +33,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
@@ -56,18 +69,27 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.11.0)
+    avm-eac_ruby_base1 (0.12.0)
       avm (~> 0.26)
       avm-eac_generic_base0 (~> 0.2)
       eac_ruby_utils (~> 0.95, >= 0.95.1)
 
+PATH
+  remote: sub/avm-eac_webapp_base0
+  specs:
+    avm-eac_webapp_base0 (0.3.1)
+      avm (~> 0.1)
+      avm-eac_generic_base0 (~> 0.1)
+      avm-eac_postgresql_base0 (~> 0.1)
+      avm-eac_ubuntu_base0 (~> 0.3)
+      eac_ruby_utils (~> 0.68)
+
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.127.0)
+    avm-tools (0.128.0)
       aranha-parsers (~> 0.4)
       avm (~> 0.30)
-      avm-eac_asciidoctor_base0 (~> 0.3, >= 0.3.4)
       avm-eac_ruby_base1 (~> 0.8)
       avm-eac_ubuntu_base0 (~> 0.3)
       avm-files (~> 0.1)
@@ -81,12 +103,12 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.30.0)
+    avm (0.33.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 +125,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 +156,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
@@ -163,12 +185,6 @@ GEM
       ofx-parser (~> 1.1.0)
     asciidoctor (2.0.17)
     ast (2.4.2)
-    avm-eac_asciidoctor_base0 (0.3.4)
-      asciidoctor (~> 2.0, >= 2.0.12)
-      avm-eac_webapp_base0 (~> 0.2)
-      eac_ruby_utils (~> 0.63)
-      os
-      rouge (~> 3.26)
     avm-eac_postgresql_base0 (0.2.0)
       avm (~> 0.12, >= 0.12.1)
       eac_ruby_utils (~> 0.82)
@@ -176,12 +192,6 @@ GEM
       avm (~> 0.7)
       eac_ruby_utils (~> 0.77, >= 0.77.1)
       eac_templates (~> 0.3)
-    avm-eac_webapp_base0 (0.3.0)
-      avm (~> 0.1)
-      avm-eac_generic_base0 (~> 0.1)
-      avm-eac_postgresql_base0 (~> 0.1)
-      avm-eac_ubuntu_base0 (~> 0.3)
-      eac_ruby_utils (~> 0.68)
     avm-files (0.3.2)
       avm (~> 0.6)
       eac_fs (~> 0.5)
@@ -268,7 +278,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)
@@ -309,12 +319,14 @@ PLATFORMS
 
 DEPENDENCIES
   avm!
+  avm-eac_asciidoctor_base0!
   avm-eac_generic_base0!
   avm-eac_rails_base0!
   avm-eac_rails_base1!
   avm-eac_redmine_base0!
   avm-eac_redmine_plugin_base0!
   avm-eac_ruby_base1!
+  avm-eac_webapp_base0!
   avm-tools!
   eac_cli!
   eac_config!

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.12.0'
+  VERSION = '0.15.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/applications/base.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/instances/entries'
+require 'avm/entries/base'
 require 'avm/registry'
 require 'eac_ruby_utils/core_ext'
 
@@ -9,7 +9,7 @@ module Avm
     class Base
       enable_simple_cache
       require_sub __FILE__, include_modules: true
-      include ::Avm::Instances::Entries
+      include ::Avm::Entries::Base
 
       LOCAL_INSTANCE_SUFFIX = 'dev'
 

data/sub/avm/lib/avm/entries/auto_values/entry.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'eac_config/node'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module AutoValues
+      class Entry
+        class << self
+          def auto_value_method_name(suffix)
+            "auto_#{suffix.to_s.gsub('.', '_')}"
+          end
+        end
+
+        common_constructor :entries_provider, :suffix
+
+        def auto_value_method
+          self.class.auto_value_method_name(suffix)
+        end
+
+        def found?
+          entries_provider.respond_to?(auto_value_method, true)
+        end
+
+        def value
+          entries_provider.if_respond(auto_value_method)
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/entries/auto_values.rb

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

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

@@ -1,17 +1,21 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
-require 'avm/instances/entry'
+require 'avm/entries/entry'
 
 module Avm
-  module Instances
-    module Entries
+  module Entries
+    module Base
+      def entries_provider_id
+        id
+      end
+
       def entry(suffix, options = {})
-        ::Avm::Instances::Entry.new(self, suffix, options)
+        ::Avm::Entries::Entry.new(self, suffix, options)
       end
 
       def path_prefix
-        @path_prefix ||= [id].freeze
+        @path_prefix ||= [entries_provider_id].freeze
       end
 
       def read_entry(entry_suffix, options = {})

data/sub/avm/lib/avm/{instances → entries}/entry.rb

@@ -1,25 +1,16 @@
 # frozen_string_literal: true
 
+require 'avm/entries/auto_values/entry'
 require 'eac_config/node'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module Instances
+  module Entries
     class Entry
-      class << self
-        def auto_value_method_name(suffix)
-          "auto_#{suffix.to_s.gsub('.', '_')}"
-        end
-      end
-
       common_constructor :parent, :suffix, :options
 
       def auto_value
-        parent.respond_to?(auto_value_method, true) ? parent.send(auto_value_method) : nil
-      end
-
-      def auto_value_method
-        self.class.auto_value_method_name(suffix)
+        ::Avm::Entries::AutoValues::Entry.new(parent, suffix).value
       end
 
       def full_path

data/sub/avm/lib/avm/entries.rb

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

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

@@ -6,11 +6,11 @@ module Avm
       module AutoValues
         module Admin
           def auto_admin_email
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'admin.email')
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, 'admin.email')
           end
 
           def auto_admin_name
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'admin.name')
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, 'admin.name')
           end
         end
       end

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

@@ -61,7 +61,7 @@ module Avm
           def database_auto_common(suffix)
             database_key = ::Avm::Instances::EntryKeys.const_get("database_#{suffix}".upcase)
             inherited_entry_value(::Avm::Instances::EntryKeys::DATABASE_ID, database_key) ||
-              inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, database_key)
+              inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, database_key)
           end
 
           def database_port_by_system

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

@@ -8,29 +8,30 @@ module Avm
       module AutoValues
         module Filesystem
           def auto_fs_path
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID,
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
                                   ::Avm::Instances::EntryKeys::FS_PATH) { |v| v + '/' + id }
           end
 
           def auto_data_fs_path
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID,
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
                                   ::Avm::Instances::EntryKeys::DATA_FS_PATH) { |v| v + '/' + id }
           end
 
           def auto_fs_url
-            auto_fs_url_with_ssh || auto_fs_url_without_ssh
+            auto_fs_url_with_install || auto_fs_url_without_install
           end
 
-          def auto_fs_url_with_ssh
-            read_entry_optional('ssh.url').if_present do |ssh_url|
+          def auto_fs_url_with_install
+            read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_URL)
+              .if_present do |install_url|
               read_entry_optional('fs_path').if_present do |fs_path|
-                "#{ssh_url}#{fs_path}"
+                "#{install_url}#{fs_path}"
               end
             end
           end
 
-          def auto_fs_url_without_ssh
-            return nil if read_entry_optional('ssh.url').present?
+          def auto_fs_url_without_install
+            return nil if read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_URL).present?
 
             read_entry_optional('fs_path').if_present do |fs_path|
               "file://#{fs_path}"

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::INSTALL_ID,
+                                  ::Avm::Instances::EntryKeys::INSTALL_HOSTNAME)
+          end
+
+          def auto_install_port
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
+                                  ::Avm::Instances::EntryKeys::INSTALL_PORT) || 22
+          end
+
+          def auto_install_username
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
+                                  ::Avm::Instances::EntryKeys::INSTALL_USERNAME)
+          end
+
+          def auto_install_url
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_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/mailer.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require 'avm/instances/entry'
+require 'avm/entries/auto_values/entry'
+require 'avm/entries/entry'
 require 'avm/instances/entry_keys'
 
 module Avm
@@ -11,15 +12,15 @@ module Avm
           ::Avm::Instances::EntryKeys.all.select { |c| c.to_s.start_with?('mailer.') }
             .reject { |c| c == ::Avm::Instances::EntryKeys::MAILER_ID }
             .each do |mailer_key|
-            define_method ::Avm::Instances::Entry.auto_value_method_name(mailer_key) do
+            define_method ::Avm::Entries::AutoValues::Entry.auto_value_method_name(mailer_key) do
               mailer_auto_common(mailer_key)
             end
           end
 
           def auto_mailer_id
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID,
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
                                   ::Avm::Instances::EntryKeys::MAILER_ID) ||
-              read_entry_optional(::Avm::Instances::EntryKeys::HOST_ID)
+              read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_ID)
           end
 
           private

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

@@ -6,7 +6,7 @@ module Avm
       module AutoValues
         module Ruby
           def auto_ruby_version
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'ruby.version')
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, 'ruby.version')
           end
         end
       end

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

@@ -8,12 +8,12 @@ module Avm
       module AutoValues
         module System
           def auto_system_username
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'system.username') ||
-              read_entry_optional('ssh.username')
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, 'system.username') ||
+              read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_USERNAME)
           end
 
           def auto_system_groupname
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'system.groupname') ||
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, 'system.groupname') ||
               read_entry_optional('system.username')
           end
         end

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

@@ -1,16 +1,15 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/require_sub'
-::EacRubyUtils.require_sub(__FILE__)
+require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Instances
     class Base
       module AutoValues
-        extend ::ActiveSupport::Concern
+        require_sub __FILE__
 
-        included do
-          %w[Access Admin Data Database Filesystem Mailer Ruby Source System Web]
+        common_concern do
+          %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,10 +1,10 @@
 # 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'
+require 'avm/entries/base'
 
 module Avm
   module Instances
@@ -13,9 +13,9 @@ module Avm
       enable_listable
       enable_simple_cache
       require_sub __FILE__, include_modules: true
-      include ::Avm::Instances::Entries
-      include ::Avm::WithDynamicRunners
-      include ::Avm::WithApplicationStereotype
+      include ::Avm::Entries::Base
+      include ::Avm::With::ExtraSubcommands
+      include ::Avm::With::ApplicationStereotype
 
       lists.add_string :access, :local, :ssh
 
@@ -51,11 +51,11 @@ module Avm
       end
 
       def host_env_uncached
-        access = read_entry(:access, list: ::Avm::Instances::Base.lists.access.values)
-        case access
+        install_uri = entry(::Avm::Instances::EntryKeys::INSTALL_URL).value.to_uri
+        case install_uri.scheme
         when 'local' then ::EacRubyUtils::Envs.local
-        when 'ssh' then ::EacRubyUtils::Envs.ssh(read_entry('ssh.url'))
-        else raise("Unmapped access value: \"#{access}\"")
+        when 'ssh' then ::EacRubyUtils::Envs.ssh(install_uri)
+        else raise("Unmapped access value: \"#{install_uri}\"")
         end
       end
 

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
@@ -42,18 +44,17 @@ module Avm
       end
 
       {
-        '' => %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],
+        '' => %w[data_fs_path fs_path name source_instance_id],
+        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 + %w[id],
         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