spring 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4095a71b95759b8a4ed6a71b5ddcb5048aad506
-  data.tar.gz: 360837121b6655c0abc8fb88f28ce6b62f46a88e
+  metadata.gz: 6828395a6b2b9a2d02ec15c9baba9305f36dbec9
+  data.tar.gz: 62af73ac2056ca5a62ed440c0e9220f115c82830
 SHA512:
-  metadata.gz: 255ec2bc4edd38b0c1d609e16b8cc6d7d9f8bccdddff14e482f98202260e1dae3f7d766a56b47cb846973c443e45b67bac0ae1c8c3c830c9c9c0ed64486c6025
-  data.tar.gz: 3181e4b656a12b4094742647f6b7fe260d6f3f5acb0642bc39bfbfb83389a174a7434fa6ab355723a169cb2a2441793f02f46aa618a9ec87d7f9eccb9611ee71
+  metadata.gz: 73d982d8d66de05071338ea45fd59b042c5f05a5cb2eb32a10143777e0ec8e120a8b0ecd6d02e18570ee8515b4c18079dc67f12a74c5523f5f6586e93ba3b54c
+  data.tar.gz: 54cc11c7135f91337199ee65d4062516ceec762c87f943bdb823b58b646e10d16d48cc5248b33cabcf68b517319fb7397c469e1d3ce3f75a378152cca30256db

data/.travis.yml

@@ -2,10 +2,10 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1.2
 env:
   - RAILS_VERSION="~> 3.2.0"
   - RAILS_VERSION="~> 4.0.0"
-  - RAILS_VERSION="~> 4.1.0.rc1"
+  - RAILS_VERSION="~> 4.1.0"
 before_script:
   - travis_retry gem install rails --version "$RAILS_VERSION"

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.1.3
+
+* The `rails runner` command no longer passes environment switches to
+  files which it runs. Issue #272.
+* Various issues solved to do with termination / processes hanging around
+  longer than they should. Issue #290.
+
 ## 1.1.2
 
 * Detect old binstubs generated with Spring 1.0 and exit with an error.

data/CONTRIBUTING.md

@@ -30,3 +30,18 @@ $ RAILS_VERSION="~> 3.2.0" rake test:acceptance
 
 The apps in `test/apps` will be named based on the rails version and the
 spring version.
+
+## Testing with your app
+
+You cannot link to a git repo from your Gemfile. Spring doesn't support
+this due to the way that it gets loaded (bypassing bundler for
+performance reasons).
+
+Therefore, to test changes with your app, run `rake install` to properly
+install the gem on your system.
+
+## Submitting a pull request
+
+If your change is a bugfix or feature, please make sure you add to
+`CHANGELOG.md` under the "Next Release" heading (add the heading if
+needed).

data/README.md

@@ -19,7 +19,7 @@ boot it every time you run a test, rake task or migration.
 ## Compatibility
 
 * Ruby versions: MRI 1.9.3, MRI 2.0, MRI 2.1
-* Rails versions: 3.2, 4.0
+* Rails versions: 3.2, 4.0 (in Rails 4.1 and up Spring is included by default)
 
 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).
@@ -34,6 +34,9 @@ Add spring to your Gemfile:
 gem "spring", group: :development
 ```
 
+(Note: using `gem "spring", git: "..."` *won't* work and is not a
+supported way of using spring.)
+
 It's recommended to 'springify' the executables in your `bin/`
 directory:
 
@@ -213,6 +216,7 @@ to pick up the changes):
 * [spring-commands-testunit](https://github.com/jonleighton/spring-commands-testunit) - useful for
   running `Test::Unit` tests on Rails 3, since only Rails 4 allows you
   to use `rake test path/to/test` to run a particular test/directory.
+* [spring-commands-teaspoon](https://github.com/alejandrobabio/spring-commands-teaspoon.git)
 
 ## Use without adding to bundle
 
@@ -295,7 +299,7 @@ Spring.application_root = './test/dummy'
 
 There is no `Spring.before_fork` callback. To run something before the
 fork, you can place it in `~/.spring.rb` or `config/spring.rb` or in any of the files
-which get run when your application initializers, such as
+which get run when your application initializes, such as
 `config/application.rb`, `config/environments/*.rb` or
 `config/initializers/*.rb`.
 
@@ -324,7 +328,7 @@ If there are additional files or directories which should trigger an
 application restart, you can specify them with `Spring.watch`:
 
 ```ruby
-Spring.watch "spec/factories"
+Spring.watch "config/some_config_file.yml"
 ```
 
 By default Spring polls the filesystem for changes once every 0.2 seconds. This

data/lib/spring/application.rb

@@ -11,7 +11,7 @@ module Spring
       @original_env = original_env
       @spring_env   = Env.new
       @mutex        = Mutex.new
-      @waiting      = 0
+      @waiting      = Set.new
       @preloaded    = false
       @state        = :initialized
       @interrupt    = IO.pipe
@@ -186,21 +186,7 @@ module Spring
       log "forked #{pid}"
       manager.puts pid
 
-      # Wait in a separate thread so we can run multiple commands at once
-      Thread.new {
-        @mutex.synchronize { @waiting += 1 }
-
-        _, status = Process.wait2 pid
-        log "#{pid} exited with #{status.exitstatus}"
-
-        streams.each(&:close)
-        client.puts(status.exitstatus)
-        client.close
-
-        @mutex.synchronize { @waiting -= 1 }
-        exit_if_finished
-      }
-
+      wait pid, streams, client
     rescue Exception => e
       log "exception: #{e}"
       manager.puts unless pid
@@ -215,7 +201,14 @@ module Spring
     end
 
     def terminate
-      state! :terminating
+      if exiting?
+        # Ensure that we do not ignore subsequent termination attempts
+        log "forced exit"
+        @waiting.each { |pid| Process.kill("TERM", pid) }
+        Kernel.exit
+      else
+        state! :terminating
+      end
     end
 
     def exit
@@ -227,7 +220,7 @@ module Spring
 
     def exit_if_finished
       @mutex.synchronize {
-        Kernel.exit if exiting? && @waiting == 0
+        Kernel.exit if exiting? && @waiting.empty?
       }
     end
 
@@ -296,6 +289,25 @@ module Spring
       STDIN.reopen("/dev/null")
     end
 
+    def wait(pid, streams, client)
+      @mutex.synchronize { @waiting << pid }
+
+      # Wait in a separate thread so we can run multiple commands at once
+      Thread.new {
+        begin
+          _, status = Process.wait2 pid
+          log "#{pid} exited with #{status.exitstatus}"
+
+          streams.each(&:close)
+          client.puts(status.exitstatus)
+          client.close
+        ensure
+          @mutex.synchronize { @waiting.delete pid }
+          exit_if_finished
+        end
+      }
+    end
+
     private
 
     def active_record_configured?

data/lib/spring/application_manager.rb

@@ -76,6 +76,7 @@ module Spring
     end
 
     def stop
+      log "stopping"
       @state = :stopping
 
       if pid

data/lib/spring/client/run.rb

@@ -5,6 +5,12 @@ module Spring
   module Client
     class Run < Command
       FORWARDED_SIGNALS = %w(INT QUIT USR1 USR2 INFO) & Signal.list.keys
+      TIMEOUT = 1
+
+      def initialize(args)
+        super
+        @signal_queue = []
+      end
 
       def log(message)
         env.log "[client] #{message}"
@@ -20,6 +26,7 @@ module Spring
 
         application, client = UNIXSocket.pair
 
+        queue_signals
         connect_to_application(client)
         run_command(client, application)
       rescue Errno::ECONNRESET
@@ -59,7 +66,12 @@ ERROR
       def connect_to_application(client)
         server.send_io client
         send_json server, "args" => args, "default_rails_env" => default_rails_env
-        server.gets or raise CommandNotFound
+
+        if IO.select([server], [], [], TIMEOUT)
+          server.gets or raise CommandNotFound
+        else
+          raise "Error connecting to Spring server"
+        end
       end
 
       def run_command(client, application)
@@ -96,14 +108,23 @@ ERROR
         application.close
       end
 
+      def queue_signals
+        FORWARDED_SIGNALS.each do |sig|
+          trap(sig) { @signal_queue << sig }
+        end
+      end
+
       def forward_signals(pid)
+        @signal_queue.each { |sig| kill sig, pid }
+
         FORWARDED_SIGNALS.each do |sig|
           trap(sig) { forward_signal sig, pid }
         end
+      rescue Errno::ESRCH
       end
 
       def forward_signal(sig, pid)
-        Process.kill(sig, -Process.getpgid(pid))
+        kill(sig, pid)
       rescue Errno::ESRCH
         # If the application process is gone, then don't block the
         # signal on this process.
@@ -111,6 +132,10 @@ ERROR
         Process.kill(sig, Process.pid)
       end
 
+      def kill(sig, pid)
+        Process.kill(sig, -Process.getpgid(pid))
+      end
+
       def send_json(socket, data)
         data = JSON.dump(data)
 

data/lib/spring/commands/rails.rb

@@ -34,21 +34,41 @@ module Spring
     end
 
     class RailsRunner < Rails
-      def env(tail)
-        previous_option = nil
-        tail.reverse.each do |option|
-          case option
-          when /--environment=(\w+)/ then return $1
-          when '-e' then return previous_option
-          end
-          previous_option = option
-        end
-        nil
+      def call
+        ARGV.replace extract_environment(ARGV).first
+        super
+      end
+
+      def env(args)
+        extract_environment(args).last
       end
 
       def command_name
         "runner"
       end
+
+      def extract_environment(args)
+        environment = nil
+
+        args = args.select.with_index { |arg, i|
+          case arg
+          when "-e"
+            false
+          when /--environment=(\w+)/
+            environment = $1
+            false
+          else
+            if i > 0 && args[i - 1] == "-e"
+              environment = arg
+              false
+            else
+              true
+            end
+          end
+        }
+
+        [args, environment]
+      end
     end
 
     Spring.register_command "rails_console",  RailsConsole.new

data/lib/spring/env.rb

@@ -16,7 +16,7 @@ module Spring
     def initialize(root = nil)
       @root         = root
       @project_root = root
-      @log_file     = File.open(ENV["SPRING_LOG"] || "/dev/null", "a")
+      @log_file     = File.open(ENV["SPRING_LOG"] || File::NULL, "a")
     end
 
     def root

data/lib/spring/server.rb

@@ -92,6 +92,8 @@ module Spring
     end
 
     def shutdown
+      log "shutting down"
+
       [env.socket_path, env.pidfile_path].each do |path|
         if path.exist?
           path.unlink rescue nil

data/lib/spring/version.rb

@@ -1,3 +1,3 @@
 module Spring
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

data/test/acceptance/helper.rb

@@ -68,7 +68,7 @@ module Spring
       def env
         @env ||= {
           "GEM_HOME"   => gem_home.to_s,
-          "GEM_PATH"   => "",
+          "GEM_PATH"   => gem_home.to_s,
           "HOME"       => user_home.to_s,
           "RAILS_ENV"  => nil,
           "RACK_ENV"   => nil,

data/test/unit/commands_test.rb

@@ -27,6 +27,18 @@ class CommandsTest < ActiveSupport::TestCase
     assert_nil command.env(['puts 1+1'])
   end
 
+  test 'RailsRunner#extract_environment removes -e <env>' do
+    command = Spring::Commands::RailsRunner.new
+    args = ['-b', '-a', '-e', 'test', '-r']
+    assert_equal [['-b', '-a', '-r'], 'test'], command.extract_environment(args)
+  end
+
+  test 'RailsRunner#extract_environment removes --environment=<env>' do
+    command = Spring::Commands::RailsRunner.new
+    args = ['-b', '--environment=test', '-a', '-r']
+    assert_equal [['-b', '-a', '-r'], 'test'], command.extract_environment(args)
+  end
+
   test "rake command has configurable environments" do
     command = Spring::Commands::Rake.new
     assert_nil command.env(["foo"])

data/test/unit/watcher_test.rb

@@ -125,12 +125,12 @@ module WatcherTests
     file = "#{@dir}/omg"
     touch file, Time.now - 2.seconds
 
-    watcher.add file
-    watcher.start
-
     stale = false
     watcher.on_stale { stale = true }
 
+    watcher.add file
+    watcher.start
+
     touch file, Time.now
 
     Timeout.timeout(1) { sleep 0.01 until stale }

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: spring
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Jon Leighton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   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
@@ -46,8 +46,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -105,17 +105,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: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rails application preloader
@@ -129,4 +129,3 @@ test_files:
 - test/unit/commands_test.rb
 - test/unit/process_title_updater_test.rb
 - test/unit/watcher_test.rb
-has_rdoc: