follow-up bkeepers#511

lib/dotenv/rails.rb

@@ -12,6 +12,7 @@
 # Watch all loaded env files with Spring
 ActiveSupport::Notifications.subscribe("load.dotenv") do |*args|
   if defined?(Spring)
+    require "spring/watcher"
     event = ActiveSupport::Notifications::Event.new(*args)
     Spring.watch event.payload[:env].filename if Rails.application
   end

spec/dotenv/rails_spec.rb

@@ -28,6 +28,10 @@
     # Restore autoload paths to unfrozen state
     ActiveSupport::Dependencies.autoload_paths = autoload_paths
     ActiveSupport::Dependencies.autoload_once_paths = autoload_once_paths
+
+    # Clear spring to be able to require again
+    spring_path = Gem::Specification.find_by_name("spring").full_gem_path
+    $LOADED_FEATURES.delete_if { |f| f.start_with?(spring_path) }
   end
 
   before do
@@ -207,12 +211,13 @@
   end
 
   def stub_spring
-    spring = Struct.new("Spring", :watcher) do
-      def watch(path)
-        watcher.add path
+    spring = Module.new do
+      class << self
+        attr_accessor :watcher
       end
     end
+    spring.watcher = Set.new
 
-    stub_const "Spring", spring.new(Set.new)
+    stub_const "Spring", spring
   end
 end