spring 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d14dc08475fd37c9118d173aea5ec37900657430
-  data.tar.gz: d6fbda6c06dfe77c7bdaa27f6a5cc45019ca5266
+  metadata.gz: 85d4ab3b84aa6f12fb90e262bcd8adf394cb94ef
+  data.tar.gz: 69c83b9fe81004f4c25b9a429bd1222316e1d25e
 SHA512:
-  metadata.gz: bb7c61300a47f81d7ca46c5bf6bb50f679c665bb076b7d05fcacf923d8dc06a8b03b85313ea3f1f465e83fedb4f9ff38641270f9185439156261b03232a58201
-  data.tar.gz: e5bf9351f6bd9af0150cd0cdba8a04b556445a5cf485e69d89d2b6c3007cd91800a9f19c45732cae1e315805153cbab18911f6191d3c7508efc74c516170ad55
+  metadata.gz: 491bc17d5c922c974ebe995469c5ebaa099c95351067eab312dad022426feecc006e6dd2211955e390eabb2371392a99e8cdfa39f07dc5b6938f5de73a30d1a7
+  data.tar.gz: 61f6d055f6b22aa94858dbd82227c0c4edbbdd6631a933a8bd5b2ebb0499c3d9c8cff27f1d41c6dca115a084cb0ddbffedef133345385069c87df69673e44ed5

data/lib/spring/application.rb

@@ -306,7 +306,7 @@ module Spring
       @mutex.synchronize { @waiting << pid }
 
       # Wait in a separate thread so we can run multiple commands at once
-      Thread.new {
+      Spring.failsafe_thread {
         begin
           _, status = Process.wait2 pid
           log "#{pid} exited with #{status.exitstatus}"
@@ -320,7 +320,7 @@ module Spring
         end
       }
 
-      Thread.new {
+      Spring.failsafe_thread {
         while signal = client.gets.chomp
           begin
             Process.kill(signal, -Process.getpgid(pid))

data/lib/spring/application_manager.rb

@@ -116,7 +116,7 @@ module Spring
     def start_wait_thread(pid, child)
       Process.detach(pid)
 
-      Thread.new {
+      Spring.failsafe_thread {
         # The recv can raise an ECONNRESET, killing the thread, but that's ok
         # as if it does we're no longer interested in the child
         loop do

data/lib/spring/boot.rb

@@ -6,3 +6,5 @@ require "spring/env"
 require "spring/process_title_updater"
 require "spring/json"
 require "spring/watcher"
+require "spring/failsafe_thread"
+

data/lib/spring/client/run.rb

@@ -7,7 +7,7 @@ module Spring
     class Run < Command
       FORWARDED_SIGNALS = %w(INT QUIT USR1 USR2 INFO WINCH) & Signal.list.keys
       CONNECT_TIMEOUT   = 1
-      BOOT_TIMEOUT      = 10
+      BOOT_TIMEOUT      = 20
 
       attr_reader :server
 

data/lib/spring/failsafe_thread.rb

@@ -0,0 +1,14 @@
+require 'thread'
+
+module Spring
+  class << self
+    def failsafe_thread
+      Thread.new {
+        begin
+          yield
+        rescue
+        end
+      }
+    end
+  end
+end

data/lib/spring/process_title_updater.rb

@@ -10,7 +10,7 @@ module Spring
     def self.run(&block)
       updater = new(&block)
 
-      Thread.new {
+      Spring.failsafe_thread {
         $0 = updater.value
         loop { $0 = updater.next }
       }

data/lib/spring/server.rb

@@ -106,7 +106,7 @@ module Spring
         end
       end
 
-      @applications.values.map { |a| Thread.new { a.stop } }.map(&:join)
+      @applications.values.map { |a| Spring.failsafe_thread { a.stop } }.map(&:join)
     end
 
     def write_pidfile

data/lib/spring/test/acceptance_test.rb

@@ -465,11 +465,11 @@ module Spring
       test "changing the Gemfile works when spring calls into itself" do
         File.write(app.path("script.rb"), <<-RUBY.strip_heredoc)
           gemfile = Rails.root.join("Gemfile")
-          File.write(gemfile, "\#{gemfile.read}gem 'devise'\\n")
+          File.write(gemfile, "\#{gemfile.read}gem 'text'\\n")
           Bundler.with_clean_env do
             system(#{app.env.inspect}, "bundle install")
           end
-          output = `\#{Rails.root.join('bin/rails')} runner 'require "devise"; puts "done";'`
+          output = `\#{Rails.root.join('bin/rails')} runner 'require "text"; puts "done";'`
           exit output.include? "done\n"
         RUBY
 
@@ -516,10 +516,10 @@ module Spring
       test "booting a foreground server" do
         FileUtils.cd(app.root) do
           assert !spring_env.server_running?
-          app.run "spring server &"
+          assert_success "bin/spring server &"
 
-          Timeout.timeout(1) do
-            sleep 0.1 until spring_env.server_running?
+          Timeout.timeout(10) do
+            sleep 0.1 until spring_env.server_running? && spring_env.socket_path.exist?
           end
 
           assert_success app.spring_test_command

data/lib/spring/test/application.rb

@@ -10,6 +10,7 @@ module Spring
       def initialize(root)
         @root       = Pathname.new(root)
         @spring_env = Spring::Env.new(root: root)
+        @times      = nil
       end
 
       def exists?
@@ -120,7 +121,7 @@ module Spring
         @times << (Time.now - start_time) if @times
 
         output.merge(status: status, command: command)
-      rescue Timeout::Error => e
+      rescue Timeout::Error
         raise Timeout::Error, "While running command:\n\n#{dump_streams(command, read_streams)}"
       end
 

data/lib/spring/test/application_generator.rb

@@ -8,6 +8,7 @@ module Spring
         @version            = RailsVersion.new(version_constraint.split(' ').last)
         @application        = Application.new(root)
         @bundled            = false
+        @installed          = false
       end
 
       def test_root

data/lib/spring/version.rb

@@ -1,3 +1,3 @@
 module Spring
-  VERSION = "1.7.1"
+  VERSION = "1.7.2"
 end

data/lib/spring/watcher/polling.rb

@@ -1,5 +1,3 @@
-require "spring/watcher"
-
 module Spring
   module Watcher
     class Polling < Abstract

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spring
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Jon Leighton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -86,6 +86,7 @@ files:
 - lib/spring/configuration.rb
 - lib/spring/env.rb
 - lib/spring/errors.rb
+- lib/spring/failsafe_thread.rb
 - lib/spring/json.rb
 - lib/spring/process_title_updater.rb
 - lib/spring/server.rb