Merge pull request #511 from runephilosof-abtion/patch-1

Only use Spring if already loaded

lib/dotenv/rails.rb

@@ -10,14 +10,11 @@
 Dotenv.instrumenter = ActiveSupport::Notifications
 
 # Watch all loaded env files with Spring
-begin
-  require "spring/commands"
-  ActiveSupport::Notifications.subscribe("load.dotenv") do |*args|
+ActiveSupport::Notifications.subscribe("load.dotenv") do |*args|
+  if defined?(Spring)
     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

spec/dotenv/rails_spec.rb

@@ -34,7 +34,6 @@
     Rails.env = "test"
     Rails.application = nil
     Rails.logger = nil
-    Spring.watcher = Set.new # Responds to #add
 
     begin
       # Remove the singleton instance if it exists
@@ -76,6 +75,7 @@
   end
 
   it "watches other loaded files with Spring" do
+    stub_spring
     application.initialize!
     path = fixture_path("plain.env")
     Dotenv.load(path)
@@ -93,6 +93,7 @@
     subject { application.initialize! }
 
     it "watches .env with Spring" do
+      stub_spring
       subject
       expect(Spring.watcher).to include(fixture_path(".env").to_s)
     end
@@ -204,4 +205,14 @@
       expect(Dotenv::Rails.logger).to be(logger)
     end
   end
+
+  def stub_spring
+    spring = Struct.new("Spring", :watcher) do
+      def watch(path)
+        watcher.add path
+      end
+    end
+
+    stub_const "Spring", spring.new(Set.new)
+  end
 end