From 54aa1f65dec1ea45354bb3f4c72c9bce200b7c20 Mon Sep 17 00:00:00 2001 From: Rune Philosof <57357936+runephilosof-abtion@users.noreply.github.com> Date: Tue, 17 Sep 2024 13:02:25 +0200 Subject: [PATCH] Only use Spring if already loaded This makes it possible for the user to selectively use Spring on a command to command basis Fixes https://github.com/bkeepers/dotenv/issues/510 --- lib/dotenv/rails.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/dotenv/rails.rb b/lib/dotenv/rails.rb index 2453eea..a56bd84 100644 --- a/lib/dotenv/rails.rb +++ b/lib/dotenv/rails.rb @@ -10,14 +10,11 @@ Dotenv.instrumenter = ActiveSupport::Notifications # Watch all loaded env files with Spring -begin - require "spring/commands" +if defined?(Spring) ActiveSupport::Notifications.subscribe("load.dotenv") do |*args| event = ActiveSupport::Notifications::Event.new(*args) Spring.watch event.payload[:env].filename if Rails.application end -rescue LoadError, ArgumentError - # Spring is not available end module Dotenv