spring 4.0.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f13e2a4d08faffc1b15c2f1dfe801a3b0b6a12b80d7a66a39601e74ccf3feff
-  data.tar.gz: 60c63476055ff6050668abfc79489f7c6fbbfc9a7b3a11ea998cb5b2ab86ef9a
+  metadata.gz: 557c3aebe1211983306061278ab800f1232e42d67a40bc4042c24560ff44409d
+  data.tar.gz: 6c1cdb2f00e1f7893d0fbf60b49d76d8841dd9c931dfa79c45387ddbec1bea5b
 SHA512:
-  metadata.gz: 9c467ea15cea498f05ec7e5211bb014163e37a75557d9694e03cc4d6d6e94d4b62c6edcede752e61c4ff51accf472939150c7fc01901aab94cd60d4d06c8a8b1
-  data.tar.gz: 6d363498591c949b3a49885c38d8694db924d9a2b24c2cc8499236d67739f4cb863eff5db114385bba8cb02bf996af48acd892cbf5e2edebe495bf3bdfffca93
+  metadata.gz: 1da8511a30a3802f6b96ce29b342e70bf136de411278624758a55b73140130902ad7e1afa488df1f48a06685b1980b0f5dd9b9185f27e36ec3d3ba43b9c27841
+  data.tar.gz: c05785038b3a2a048c2b6e9f95f0979561c292714029ec58da934f1cd5e139b3e66b3da9d917082717e83891ac922292f636b53183de580672325b52c58665a9

data/README.md

@@ -18,6 +18,7 @@ boot it every time you run a test, rake task or migration.
 
 * Ruby versions: MRI 2.7, MRI 3.0, MRI 3.1
 * Rails versions: 6.0, 6.1, 7.0
+* Bundler v2.1+
 
 Spring makes extensive use of `Process.fork`, so won't be able to
 provide a speed up on platforms which don't support forking (Windows, JRuby).
@@ -70,11 +71,14 @@ Rails directory.
 Spring reloads application code, and therefore needs the application to have
 reloading enabled.
 
-Please, make sure `config.cache_classes` is `false` in the environments that
+Ensure that `config.enable_reloading` is `true` in the environments that
 Spring manages. That setting is typically configured in
-`config/environments/*.rb`. In particular, make sure it is `false` for the
+`config/environments/*.rb`. In particular, make sure it is `true` for the
 `test` environment.
 
+Note: in versions of Rails before 7, the setting is called `cache_classes`,
+and it needs to be `false` for Spring to work.
+
 ### Usage
 
 For this walkthrough I've generated a new Rails application, and run
@@ -388,6 +392,12 @@ a command runs:
 Spring.quiet = true
 ```
 
+You can also set the initial state of the `quiet` configuration option to true
+by setting the `SPRING_QUIET` environment variable before executing Spring.
+This is useful if you want to set quiet mode when invoking the Spring executable
+in a subprocess, and cannot or prefer not to set it programmatically
+via the `Spring.quiet` option in `~/.spring.rb` or the app's `config/spring.rb`.
+
 ### Environment variables
 
 The following environment variables are used by Spring:
@@ -412,6 +422,8 @@ The following environment variables are used by Spring:
   the long-running Spring server process. By default, this is related to
   the socket path; if the socket path is `/foo/bar/spring.sock` the
   pidfile will be `/foo/bar/spring.pid`.
+* `SPRING_QUIET` - If set, the initial state of the `Spring.quiet`
+  configuration option will default to `true`.
 * `SPRING_SERVER_COMMAND` - The command to run to start up the Spring
   server when it is not already running. Defaults to `spring _[version]_
   server --background`.

data/lib/spring/application.rb

@@ -1,5 +1,4 @@
 require "spring/boot"
-require "set"
 require "pty"
 
 module Spring
@@ -128,7 +127,12 @@ module Spring
     end
 
     def eager_preload
-      with_pty { preload }
+      with_pty do
+        # we can't see stderr and there could be issues when it's overflown
+        # see https://github.com/rails/spring/issues/396
+        STDERR.reopen("/dev/null")
+        preload
+      end
     end
 
     def run
@@ -298,9 +302,9 @@ module Spring
       Kernel.module_eval do
         old_raise = Kernel.method(:raise)
         remove_method :raise
-        define_method :raise do |*args|
+        define_method :raise do |*args, **kwargs|
           begin
-            old_raise.call(*args)
+            old_raise.call(*args, **kwargs)
           ensure
             if $!
               lib = File.expand_path("..", __FILE__)

data/lib/spring/application_manager.rb

@@ -93,7 +93,7 @@ module Spring
     def start_child(preload = false)
       @child, child_socket = UNIXSocket.pair
 
-      Bundler.with_unbundled_env do
+      Bundler.with_original_env do
         bundler_dir = File.expand_path("../..", $LOADED_FEATURES.grep(/bundler\/setup\.rb$/).first)
         @pid = Process.spawn(
           {

data/lib/spring/client/binstub.rb

@@ -1,5 +1,3 @@
-require 'set'
-
 module Spring
   module Client
     class Binstub < Command

data/lib/spring/client/rails.rb

@@ -1,5 +1,3 @@
-require "set"
-
 module Spring
   module Client
     class Rails < Command
@@ -22,7 +20,7 @@ module Spring
 
         if COMMANDS.include?(command_name)
           Run.call(["rails_#{command_name}", *args.drop(2)])
-        elsif command_name.start_with?("db:")
+        elsif command_name&.start_with?("db:") && !command_name.start_with?("db:system")
           Run.call(["rake", *args.drop(1)])
         else
           require "spring/configuration"

data/lib/spring/commands.rb

@@ -28,9 +28,16 @@ module Spring
   config = File.expand_path("~/.spring.rb")
   require config if File.exist?(config)
 
-  # If the config/spring.rb contains requires for commands from other gems,
-  # then we need to be under bundler.
-  require "bundler/setup"
+  # We force the TTY so bundler doesn't show a backtrace in case gems are missing.
+  old_env = ENV["BUNDLER_FORCE_TTY"]
+  ENV["BUNDLER_FORCE_TTY"] = "true"
+  begin
+    # If the config/spring.rb contains requires for commands from other gems,
+    # then we need to be under bundler.
+    require "bundler/setup"
+  ensure
+    ENV["BUNDLER_FORCE_TTY"] = old_env
+  end
 
   # Auto-require any Spring extensions which are in the Gemfile
   Gem::Specification.map(&:name).grep(/^spring-/).each do |command|

data/lib/spring/configuration.rb

@@ -2,7 +2,8 @@ require "spring/errors"
 
 module Spring
   class << self
-    attr_accessor :application_root, :quiet
+    attr_accessor :application_root
+    attr_writer :quiet
 
     def gemfile
       require "bundler"
@@ -52,6 +53,10 @@ module Spring
       @project_root_path ||= find_project_root(Pathname.new(File.expand_path(Dir.pwd)))
     end
 
+    def quiet
+      @quiet || ENV.key?('SPRING_QUIET')
+    end
+
     private
 
     def find_project_root(current_dir)

data/lib/spring/env.rb

@@ -1,5 +1,4 @@
 require "pathname"
-require "digest/md5"
 
 require "spring/version"
 require "spring/configuration"
@@ -41,6 +40,7 @@ module Spring
     end
 
     def application_id
+      require "digest/md5"
       ENV["SPRING_APPLICATION_ID"] || Digest::MD5.hexdigest(RUBY_VERSION + project_root.to_s)
     end
 

data/lib/spring/version.rb

@@ -1,3 +1,3 @@
 module Spring
-  VERSION = "4.0.0"
+  VERSION = "4.1.1"
 end

data/lib/spring/watcher/abstract.rb

@@ -1,4 +1,3 @@
-require "set"
 require "pathname"
 require "mutex_m"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spring
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Jon Leighton
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-10 00:00:00.000000000 Z
+date: 2023-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -99,7 +99,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -114,8 +114,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Rails application preloader
 test_files: []