Skip to content

Commit 8a1bfc4

Browse files
ofedorenekohl
authored andcommitted
Fixes #37807 - Support Zeitwerk loader
1 parent 58390e2 commit 8a1bfc4

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

config/initializers/zeitwerk.rb

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Rails.autoloaders.main.ignore(
2+
ForemanSalt::Engine.root.join('lib/tasks')
3+
)

foreman_salt.gemspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
1414
s.test_files = Dir['test/**/*']
1515

1616
s.add_dependency 'deface', '< 2.0'
17-
s.add_dependency 'foreman_remote_execution', '>= 9.0', '< 14'
18-
s.add_dependency 'foreman-tasks', '>= 7.0', '< 10'
17+
s.add_dependency 'foreman_remote_execution', '>= 14.0', '< 15'
18+
s.add_dependency 'foreman-tasks', '>= 10.0', '< 11'
1919
s.add_development_dependency 'theforeman-rubocop', '~> 0.0.6'
2020
end

lib/foreman_salt/engine.rb

+5-8
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@ module ForemanSalt
55
class Engine < ::Rails::Engine
66
engine_name 'foreman_salt'
77

8-
config.autoload_paths += Dir["#{config.root}/app/controllers/foreman_salt/concerns"]
9-
config.autoload_paths += Dir["#{config.root}/app/helpers"]
10-
config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
11-
config.autoload_paths += Dir["#{config.root}/app/overrides"]
12-
config.autoload_paths += Dir["#{config.root}/app/services"]
138
config.autoload_paths += Dir["#{config.root}/app/lib"]
149

1510
config.paths['config/routes.rb'].unshift('config/api_routes.rb')
@@ -42,12 +37,14 @@ class Engine < ::Rails::Engine
4237
Apipie.configuration.checksum_path += ['/salt/api/']
4338
end
4439

45-
initializer 'foreman_salt.register_plugin', before: :finisher_hook do
46-
require 'foreman_salt/plugin'
40+
initializer 'foreman_salt.register_plugin', before: :finisher_hook do |app|
41+
app.reloader.to_prepare do
42+
require_relative 'plugin'
43+
end
4744
end
4845

4946
config.to_prepare do
50-
require 'foreman_salt/extensions'
47+
require_relative 'extensions'
5148

5249
RemoteExecutionProvider.register(:Salt, SaltProvider)
5350
ForemanSalt.register_rex_feature

lib/foreman_salt/plugin.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: true
22

33
Foreman::Plugin.register :foreman_salt do
4-
requires_foreman '>= 3.7'
4+
requires_foreman '>= 3.13'
55
register_gettext
66

77
settings do

0 commit comments

Comments
 (0)