spring 4.4.0 → 4.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98db88859d325bff2e76e6569e05eb10bf89baf2a07ab47f43eb6548e8ca8f1c
-  data.tar.gz: 01e6ec88fa814c0bfe8f737a71164301b59681ea909de9bcf9fe5516eca1a2ee
+  metadata.gz: def7b2369b2bfd2e89227a11ab9fab2a336b10011ec8b51a82319828e73ecee4
+  data.tar.gz: 58e3868998fe06b76e2e6a86cd5274aabdd5f315395aae004e5cfd3d488708ca
 SHA512:
-  metadata.gz: ebb7f95463b29f0e8c2995e19b101f0730cd0aa98ea51496fb6f8bd624253a3e4536dd5664ad2ea8ec5348cf074eb9b79f798b4b3b38adb6c717cc3ad73ca6b1
-  data.tar.gz: e01d2b58bbace569bfdcacec81b852427a5bdf5efdf724be560598f13dbabbf32502aec90aa899d0fdf3b16e0255a1ada40d9b0ac7a4cb74a3d3f6f1352342c4
+  metadata.gz: 4e48694be64ae52918a2a82c61d5e0ba1bec2c826123b697e789abcf74c38d7d8d6162b32b64ccd8694855e2bb4cf29af5147a2ea34fd96163c95fd4405940c7
+  data.tar.gz: '054845db5469efb81a6fc0a9775dcbaa0518153e51a13807a2e340a470b5ac100cd01f51f99b9676ccae1b395fd2b57bb3306d65410f1587999481ed40052d80'

data/README.md

@@ -17,7 +17,7 @@ boot it every time you run a test, rake task or migration.
 ## Compatibility
 
 * Ruby versions: MRI 3.1+
-* Rails versions: 6.0+
+* Rails versions: 7.1+
 * Bundler v2.1+
 
 Spring makes extensive use of `Process.fork`, so won't be able to

data/lib/spring/application.rb

@@ -129,8 +129,9 @@ module Spring
 
       if defined?(Rails) && Rails.application
         watcher.add Rails.application.paths["config/initializers"]
-        Rails::Engine.descendants.each do |engine|
-          if engine.root.to_s.start_with?(Rails.root.to_s)
+        rails_root = Rails.root.to_s
+        Rails::Engine.subclasses.each do |engine|
+          if engine.root.to_s.start_with?(rails_root)
             watcher.add engine.paths["config/initializers"].expanded
           end
         end
@@ -377,10 +378,10 @@ module Spring
       Spring.failsafe_thread {
         begin
           _, status = Process.wait2 pid
-          log "#{pid} exited with #{status.exitstatus}"
+          log "#{pid} exited with #{status.exitstatus || status.inspect}"
 
           streams.each(&:close)
-          client.puts(status.exitstatus)
+          client.puts(status.exitstatus || status.to_i)
           client.close
         ensure
           @mutex.synchronize { @waiting.delete pid }

data/lib/spring/application_manager.rb

@@ -102,7 +102,7 @@ module Spring
             "RACK_ENV"            => app_env,
             "SPRING_ORIGINAL_ENV" => JSON.dump(Spring::ORIGINAL_ENV),
             "SPRING_PRELOAD"      => preload ? "1" : "0",
-            "SPRING_SPAWN_ENV"    => JSON.dump(spawn_env),
+            "SPRING_SPAWN_ENV"    => JSON.dump(spawn_env.compact),
             **spawn_env,
           },
           "ruby",

data/lib/spring/client/run.rb

@@ -184,11 +184,16 @@ module Spring
           suspend_resume_on_tstp_cont(pid)
 
           forward_signals(application)
-          status = application.read.to_i
+          status = application.read
+          log "got exit status #{status.inspect}"
 
-          log "got exit status #{status}"
+          # Status should always be an integer. If it is empty, something unexpected must have happened to the server.
+          if status.to_s.strip.empty?
+            log "unexpected empty exit status, app crashed?"
+            exit 1
+          end
 
-          exit status
+          exit status.to_i
         else
           log "got no pid"
           exit 1
@@ -249,7 +254,9 @@ module Spring
       end
 
       def spawn_env
-        ENV.slice(*Spring.spawn_on_env)
+        Spring.spawn_on_env.to_h do |key|
+          [key, ENV[key]]
+        end
       end
     end
   end

data/lib/spring/version.rb

@@ -1,3 +1,3 @@
 module Spring
-  VERSION = "4.4.0"
+  VERSION = "4.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spring
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.4.2
 platform: ruby
 authors:
 - Jon Leighton