Fixes #37807 - Support Zeitwerk loader

theforeman · Sep 11, 2024 · 8a1bfc4 · 8a1bfc4
1 parent 58390e2
commit 8a1bfc4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/config/initializers/zeitwerk.rb b/config/initializers/zeitwerk.rb
@@ -0,0 +1,3 @@
+Rails.autoloaders.main.ignore(
+  ForemanSalt::Engine.root.join('lib/tasks')
+)
diff --git a/foreman_salt.gemspec b/foreman_salt.gemspec
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.test_files = Dir['test/**/*']
 
   s.add_dependency 'deface', '< 2.0'
-  s.add_dependency 'foreman_remote_execution', '>= 9.0', '< 14'
-  s.add_dependency 'foreman-tasks', '>= 7.0', '< 10'
+  s.add_dependency 'foreman_remote_execution', '>= 14.0', '< 15'
+  s.add_dependency 'foreman-tasks', '>= 10.0', '< 11'
   s.add_development_dependency 'theforeman-rubocop', '~> 0.0.6'
 end
diff --git a/lib/foreman_salt/engine.rb b/lib/foreman_salt/engine.rb
@@ -5,11 +5,6 @@ module ForemanSalt
   class Engine < ::Rails::Engine
     engine_name 'foreman_salt'
 
-    config.autoload_paths += Dir["#{config.root}/app/controllers/foreman_salt/concerns"]
-    config.autoload_paths += Dir["#{config.root}/app/helpers"]
-    config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
-    config.autoload_paths += Dir["#{config.root}/app/overrides"]
-    config.autoload_paths += Dir["#{config.root}/app/services"]
     config.autoload_paths += Dir["#{config.root}/app/lib"]
 
     config.paths['config/routes.rb'].unshift('config/api_routes.rb')
@@ -42,12 +37,14 @@ class Engine < ::Rails::Engine
       Apipie.configuration.checksum_path += ['/salt/api/']
     end
 
-    initializer 'foreman_salt.register_plugin', before: :finisher_hook do
-      require 'foreman_salt/plugin'
+    initializer 'foreman_salt.register_plugin', before: :finisher_hook do |app|
+      app.reloader.to_prepare do
+        require_relative 'plugin'
+      end
     end
 
     config.to_prepare do
-      require 'foreman_salt/extensions'
+      require_relative 'extensions'
 
       RemoteExecutionProvider.register(:Salt, SaltProvider)
       ForemanSalt.register_rex_feature

diff --git a/lib/foreman_salt/plugin.rb b/lib/foreman_salt/plugin.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Foreman::Plugin.register :foreman_salt do
-  requires_foreman '>= 3.7'
+  requires_foreman '>= 3.13'
   register_gettext
 
   settings do