spring 1.1.0.beta3 → 1.1.0.beta4

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: ec57b11dfce83e9e7ca74433cd0e18e0e4b499f3
-  data.tar.gz: 61e4462c800903ab2d66710ccc92544a2a5f251b
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YTc2OTBiOGJlOWQ1ODNlMDVhY2NkNWMwNjhiMzA4ZGQxNjQ1MzA3ZA==
+  data.tar.gz: !binary |-
+    ZTk3ZGJlNGVhODM1YmIxNTkwOTgzYmI4YzQ5ZGEzOWVhN2M0ZTAwYg==
 SHA512:
-  metadata.gz: 38741e9b52477feee7d28b28ea299438f46174f89e64ca16a5a34a9b673d723fd9b4830d9a216c958f3b5e2b8f66bc8bea2ca536fcfb498fb8c524ef508771ce
-  data.tar.gz: d0c5bdfcaacf59dae01f4701c2d974675a624485d10efbe6aab155055e773b696d332fc54ba4e24a285ce1127bc16a11f3323f6328d771c34e9fe0cb57898314
+  metadata.gz: !binary |-
+    Mzk0MDdkMTAwNTc1MjNkY2UwZjZiNTIxNDJhMmJmMjkwNGU3NWU2NTQxN2Ez
+    ZTM5ZmUzNjdiMzk3ZjFmYTc0MTQyYjFhYzUxYmVmYjkyMTBlZjllZjAwNTA3
+    NGZiOWY1MGZhNGEyOTQ0MTkzMTdmZDA5ODY2YWJiMDUxNjk3NGE=
+  data.tar.gz: !binary |-
+    MjJmYmYxMmNkNWZiNzgwMGJhMThkOTcxNWU1OTkwNDdmMWIyMjQwNWE3Mzhl
+    Njk1MWE2NjMxMTg3Njk0ZTJmNDZmODE4NDg3YzliY2IxYzFlMzA1MTJhYzU1
+    NTAxODJlOWFlZGQ5MTYzMTc5N2U5MTJiYWQ3MjQ3ZmY2OTFhZjI=

data/bin/spring

@@ -21,6 +21,7 @@ if defined?(Gem)
 
     if unstubbed.any?
       warn "Warning: Running `gem pristine --all` to regenerate your installed gemspecs " \
+           "(and deleting then reinstalling your bundle if you use bundle --path) " \
            "will improve the startup performance of Spring."
     end
   end

data/lib/spring/application/boot.rb

@@ -5,6 +5,7 @@ app = Spring::Application.new(
   Spring::JSON.load(ENV.delete("SPRING_ORIGINAL_ENV").dup)
 )
 Signal.trap("TERM") { app.terminate }
+Signal.trap("TTOU", "IGNORE")
 
 app.preload if ENV.delete("SPRING_PRELOAD") == "1"
 app.run

data/lib/spring/application_manager.rb

@@ -6,6 +6,7 @@ module Spring
       @app_env    = app_env
       @spring_env = Env.new
       @mutex      = Mutex.new
+      @state      = :running
     end
 
     def log(message)
@@ -26,6 +27,7 @@ module Spring
     end
 
     def restart
+      return if @state == :stopping
       start_child(true)
     end
 
@@ -74,7 +76,12 @@ module Spring
     end
 
     def stop
-      Process.kill('TERM', pid) if pid
+      @state = :stopping
+
+      if pid
+        Process.kill('TERM', pid)
+        Process.wait(pid)
+      end
     end
 
     private

data/lib/spring/boot.rb

@@ -1,10 +1,6 @@
 require "socket"
 require "thread"
 
-# readline must be required before we setpgid, otherwise the require may hang,
-# if readline has been built against libedit. See issue #70.
-require "readline"
-
 require "spring/configuration"
 require "spring/env"
 require "spring/process_title_updater"

data/lib/spring/server.rb

@@ -92,13 +92,13 @@ module Spring
     end
 
     def shutdown
-      @applications.values.each(&:stop)
-
       [env.socket_path, env.pidfile_path].each do |path|
         if path.exist?
           path.unlink rescue nil
         end
       end
+
+      @applications.values.map { |a| Thread.new { a.stop } }.map(&:join)
     end
 
     def write_pidfile

data/lib/spring/version.rb

@@ -1,3 +1,3 @@
 module Spring
-  VERSION = "1.1.0.beta3"
+  VERSION = "1.1.0.beta4"
 end

data/test/acceptance/helper.rb

@@ -57,16 +57,8 @@ module Spring
         @stderr ||= IO.pipe
       end
 
-      def log_file_path
-        path("tmp/spring.log")
-      end
-
       def log_file
-        @log_file ||= begin
-          tmp = path("tmp")
-          tmp.mkdir unless tmp.exist?
-          tmp.join("spring.log").open("w+")
-        end
+        @log_file ||= path("tmp/spring.log").open("w+")
       end
 
       def env
@@ -265,7 +257,7 @@ module Spring
         if ENV["SPRING_DEBUG"]
           puts "$ #{command}\n"
         else
-          command = "#{command} > /dev/null"
+          command = "(#{command}) > /dev/null"
         end
 
         Kernel.system(command) or raise "command failed: #{command}"
@@ -329,8 +321,8 @@ module Spring
       end
 
       def copy_to(path)
-        FileUtils.rm_rf(path.to_s)
-        FileUtils.cp_r(application.root.to_s, path.to_s)
+        system("rm -rf #{path}")
+        system("cp -r #{application.root} #{path}")
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spring
 version: !ruby/object:Gem::Version
-  version: 1.1.0.beta3
+  version: 1.1.0.beta4
 platform: ruby
 authors:
 - Jon Leighton
@@ -14,28 +14,28 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Rails application preloader
@@ -104,17 +104,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Rails application preloader
@@ -128,4 +128,3 @@ test_files:
 - test/unit/commands_test.rb
 - test/unit/process_title_updater_test.rb
 - test/unit/watcher_test.rb
-has_rdoc: