rack-unreloader 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9318a0edd80ea0c0bae830750c33a607ef0146a
-  data.tar.gz: d85653f1770a69dcde0e4c15dd32db9b43ff8686
+  metadata.gz: d64b1a401d4679d7a1811a008c2cc5bb951b8722
+  data.tar.gz: ef510ae0a796be3d5f11e9d80ba842c9f351e764
 SHA512:
-  metadata.gz: ac585d0650959361e75a940f12b677062247ae88c9bc8811146e1808183abb907465ffc786dfffb98372ae9aaac4f5d578dd140d762c39b10ac9d76c51caf6f7
-  data.tar.gz: 299ffb392c1d525c8037855f353209669bf06fca106af0b745fda6b84175d3f60d8e2cc3e0de0e6e8ed22a5e22bf36756678d47015a7969f62b0c214a97a88ab
+  metadata.gz: 9791a0b04d89506251c8fbe9e16cc873f33b581b6927b029b08574170e1dd850048043b97f0e6e15760b5e3961d149132c7b9f7bb4f0ca082bc2be64635b464f
+  data.tar.gz: a6eefba4399f58d591bb474c027eefec4bacf633641736806d9f3f13127239107ea29bc5c25e9adad173e5c80f5e2827663b669ce530e6b8a496d71230bca405

data/CHANGELOG

@@ -1,3 +1,7 @@
+= 1.5.0 (2016-03-10)
+
+* Handle deletions of monitored files (jeremyevans)
+
 = 1.4.0 (2016-01-15)
 
 * Avoid use of Thread.exclusive, preventing warnings on ruby 2.3 (celsworth, jeremyevans) (#6)

data/lib/rack/unreloader/reloader.rb

@@ -94,12 +94,20 @@ module Rack
           check_monitor_dir(dir, changed_files)
         end
 
-        @monitor_files.each do |file, time|
-          if file_changed?(file, time)
-            changed_files << file
+        removed_files = []
+
+        @monitor_files.to_a.each do |file, time|
+          if F.file?(file)
+            if file_changed?(file, time)
+              changed_files << file
+            end
+          else
+            removed_files << file
           end
         end
 
+        remove_files(removed_files)
+
         return if changed_files.empty?
 
         unless @dependencies.empty?
@@ -200,12 +208,7 @@ module Rack
           changed_files.concat(dependency_files(removed_files))
         end
 
-        removed_files.each do |f|
-          remove(f)
-          @monitor_files.delete(f)
-          @dependencies.delete(f)
-          @dependency_order.delete(f)
-        end
+        remove_files(removed_files)
 
         require_dependencies(new_files, &block)
 
@@ -222,6 +225,17 @@ module Rack
         files.replace(cur_files)
       end
 
+      # Remove all files in removed_files from the internal data structures,
+      # because the file no longer exists.
+      def remove_files(removed_files)
+        removed_files.each do |f|
+          remove(f)
+          @monitor_files.delete(f)
+          @dependencies.delete(f)
+          @dependency_order.delete(f)
+        end
+      end
+
       # Requires the given file, logging which constants or features are added
       # by the require, and rolling back the constants and features if there
       # are any errors.

data/spec/unreloader_spec.rb

@@ -100,6 +100,16 @@ describe Rack::Unreloader do
               %r{\ANew classes in .*spec/app\.rb: App\z}
   end
 
+  it "should stop monitoring file for changes if it is deleted constants contained in file and reload file if file changes" do
+    ru.call({}).must_equal [1]
+    File.delete('spec/app.rb')
+    proc{ru.call({})}.must_raise NameError
+    log_match %r{\ALoading.*spec/app\.rb\z},
+              %r{\ANew classes in .*spec/app\.rb: App\z},
+              %r{\AUnloading.*spec/app\.rb\z},
+              "Removed constant App"
+  end
+
   it "should check constants using ObjectSpace if require proc returns :ObjectSpace" do
     base_ru
     update_app(code(1))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-unreloader
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest