spring 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bae3c5f77134086e25e77df5d700895438e16ba
-  data.tar.gz: 882c5139fed3fe573bb75136e683ca8ee3744069
+  metadata.gz: cf0643d72425f9cc14e93423dd4f131aa42b143a
+  data.tar.gz: 224eb7729ea0b874659a2951fea96fbdc3bb4c8a
 SHA512:
-  metadata.gz: c5d7a1655a09f56c5663024af741c3c58fe9542418603a59dddb0c19ee24203a1527911a4626f6a5eedd5daf5b6e19b1107582fdc2c7528563af1878034cf1a7
-  data.tar.gz: d143cad1d9b6f15440d80aa300b566a4fa19c0c90deada7fa627e3b230f9199ed56eae911c0005fa2ff83814bf3e66190777a42e0bb4cf5ee6d997df9d06b297
+  metadata.gz: f31525f82a8f8daa814e08ab0fb0ca65047fe25652037421899e7e4da566f7bbefb8b95bd4920fe40827d275b000e5f9dce5f1ea031c64bd807ebbe1912503e8
+  data.tar.gz: 07594958b366487e7b5f88d96edb3efa1b5f1378de5b68b37ef711d149084116cfd421562061e985c7d12a90d22a72caa8f96480362ca95eba40ed6916a3fa42

data/.travis.yml

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

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 1.3.0
+
+* Automatically restart spring after new commands are added. This means
+  that you can add spring-commands-rspec to your Gemfile and then
+  immediately start using it, without having to run `spring stop`.
+  (Spring will effectively run `spring stop` for you.)
+* Make app reloading work in apps which spew out lots of output on
+  startup (previously a buffer would fill up and cause the process to
+  hang). Issue #332.
+* Make sure running `bin/spring` does not add an empty string to `Gem.path`.
+  Issues #297, #310.
+* Fixed problem with `$0` including the command line args, which could
+  confuse commands which try to parse `$0`. This caused the
+  spring-commands-rspec to not work properly in some cases. Issue #369.
+* Add OpenBSD compatibility for `spring status`. Issue #299.
+* Rails 3.2 no longer officially supported (but it may continue to work)
+
 ## 1.2.0
 
 * Accept -e and --environment options for `rails console`.

data/README.md

@@ -1,7 +1,7 @@
 # Spring
 
-[![Build Status](https://travis-ci.org/rails/spring.png?branch=master)](https://travis-ci.org/rails/spring)
-[![Gem Version](https://badge.fury.io/rb/spring.png)](http://badge.fury.io/rb/spring)
+[![Build Status](https://travis-ci.org/rails/spring.svg?branch=master)](https://travis-ci.org/rails/spring)
+[![Gem Version](https://badge.fury.io/rb/spring.svg)](http://badge.fury.io/rb/spring)
 
 Spring is a Rails application preloader. It speeds up development by
 keeping your application running in the background so you don't need to
@@ -218,8 +218,7 @@ speed-up).
 
 ### Additional commands
 
-You can add these to your Gemfile for additional commands (run `spring stop` afterwards
-to pick up the changes):
+You can add these to your Gemfile for additional commands:
 
 * [spring-commands-rspec](https://github.com/jonleighton/spring-commands-rspec)
 * [spring-commands-cucumber](https://github.com/jonleighton/spring-commands-cucumber)

data/lib/spring/application.rb

@@ -158,7 +158,7 @@ module Spring
         trap("TERM", "DEFAULT")
 
         ARGV.replace(args)
-        $0 = command.process_title
+        $0 = command.exec_name
 
         # Delete all env vars which are unchanged from before spring started
         original_env.each { |k, v| ENV.delete k if ENV[k] == v }
@@ -283,6 +283,7 @@ module Spring
     def with_pty
       PTY.open do |master, slave|
         [STDOUT, STDERR, STDIN].each { |s| s.reopen slave }
+        Thread.new { master.read }
         yield
         reset_streams
       end

data/lib/spring/client/binstub.rb

@@ -38,7 +38,7 @@ unless defined?(Spring)
 
   if match = Bundler.default_lockfile.read.match(/^GEM$.*?^    (?:  )*spring \((.*?)\)$.*?^$/m)
     ENV["GEM_PATH"] = ([Bundler.bundle_path.to_s] + Gem.path).join(File::PATH_SEPARATOR)
-    ENV["GEM_HOME"] = ""
+    ENV["GEM_HOME"] = nil
     Gem.paths = ENV
 
     gem "spring", match[1]

data/lib/spring/client/run.rb

@@ -21,7 +21,37 @@ module Spring
       end
 
       def call
-        boot_server unless env.server_running?
+        if env.server_running?
+          warm_run
+        else
+          cold_run
+        end
+      rescue Errno::ECONNRESET
+        exit 1
+      ensure
+        server.close if @server
+      end
+
+      def warm_run
+        run
+      rescue CommandNotFound
+        require "spring/commands"
+
+        if Spring.command?(args.first)
+          # Command installed since spring started
+          stop_server
+          cold_run
+        else
+          raise
+        end
+      end
+
+      def cold_run
+        boot_server
+        run
+      end
+
+      def run
         verify_server_version
 
         application, client = UNIXSocket.pair
@@ -29,19 +59,16 @@ module Spring
         queue_signals
         connect_to_application(client)
         run_command(client, application)
-      rescue Errno::ECONNRESET
-        exit 1
-      ensure
-        server.close if @server
       end
 
       def boot_server
         env.socket_path.unlink if env.socket_path.exist?
 
-        pid = fork {
-          require "spring/server"
-          Spring::Server.boot
-        }
+        pid = Process.spawn(
+          "ruby",
+          "-r", "spring/server",
+          "-e", "Spring::Server.boot"
+        )
 
         until env.socket_path.exist?
           _, status = Process.waitpid2(pid, Process::WNOHANG)
@@ -50,6 +77,12 @@ module Spring
         end
       end
 
+      def stop_server
+        server.close
+        @server = nil
+        env.stop
+      end
+
       def verify_server_version
         server_version = server.gets.chomp
         if server_version != env.version

data/lib/spring/client/status.rb

@@ -17,11 +17,11 @@ module Spring
       end
 
       def print_process(pid)
-        puts `ps -p #{pid} -o pid= -o args=`
+        puts `ps -p #{pid} -o pid= -o command=`
       end
 
       def application_pids
-        candidates = `ps -A -o ppid= -o pid=`.lines
+        candidates = `ps -ax -o ppid= -o pid=`.lines
         candidates.select { |l| l =~ /^(\s+)?#{env.pid} / }
                   .map    { |l| l.split(" ").last   }
       end

data/lib/spring/client/stop.rb

@@ -3,35 +3,20 @@ require "spring/version"
 module Spring
   module Client
     class Stop < Command
-      TIMEOUT = 2 # seconds
-
       def self.description
         "Stop all spring processes for this project."
       end
 
       def call
-        if env.server_running?
-          timeout = Time.now + TIMEOUT
-          kill 'TERM'
-          sleep 0.1 until !env.server_running? || Time.now >= timeout
-
-          if env.server_running?
-            $stderr.puts "Spring did not stop; killing forcibly."
-            kill 'KILL'
-          else
-            puts "Spring stopped."
-          end
-        else
+        case env.stop
+        when :stopped
+          puts "Spring stopped."
+        when :killed
+          $stderr.puts "Spring did not stop; killing forcibly."
+        when :not_running
           puts "Spring is not running"
         end
       end
-
-      def kill(sig)
-        pid = env.pid
-        Process.kill(sig, pid) if pid
-      rescue Errno::ESRCH
-        # already dead
-      end
     end
   end
 end

data/lib/spring/command_wrapper.rb

@@ -41,10 +41,6 @@ module Spring
       end
     end
 
-    def process_title
-      [name, *ARGV].join(" ")
-    end
-
     def gem_name
       if command.respond_to?(:gem_name)
         command.gem_name

data/lib/spring/env.rb

@@ -9,6 +9,7 @@ require "spring/configuration"
 
 module Spring
   IGNORE_SIGNALS = %w(INT QUIT)
+  STOP_TIMEOUT = 2 # seconds
 
   class Env
     attr_reader :log_file
@@ -80,5 +81,29 @@ module Spring
       log_file.puts "[#{Time.now}] [#{Process.pid}] #{message}"
       log_file.flush
     end
+
+    def stop
+      if server_running?
+        timeout = Time.now + STOP_TIMEOUT
+        kill 'TERM'
+        sleep 0.1 until !server_running? || Time.now >= timeout
+
+        if server_running?
+          kill 'KILL'
+          :killed
+        else
+          :stopped
+        end
+      else
+        :not_running
+      end
+    end
+
+    def kill(sig)
+      pid = self.pid
+      Process.kill(sig, pid) if pid
+    rescue Errno::ESRCH
+      # already dead
+    end
   end
 end

data/lib/spring/test.rb

@@ -1,5 +1,8 @@
+require "active_support"
 require "active_support/test_case"
 
+ActiveSupport.test_order = :random
+
 module Spring
   module Test
     class << self

data/lib/spring/test/acceptance_test.rb

@@ -13,7 +13,7 @@ module Spring
       DEFAULT_SPEEDUP = 0.8
 
       def rails_version
-        ENV['RAILS_VERSION'] || '~> 4.0.0'
+        ENV['RAILS_VERSION'] || '~> 4.2.0'
       end
 
       # Extension point for spring-watchers-listen
@@ -124,6 +124,16 @@ module Spring
         assert_failure app.spring_test_command, stdout: "RuntimeError: omg"
       end
 
+      test "app gets reloaded even with a ton of boot output" do
+        limit = UNIXSocket.pair.first.getsockopt(:SOCKET, :SNDBUF).int
+
+        assert_success app.spring_test_command
+        File.write(app.path("config/initializers/verbose.rb"), "#{limit}.times { puts 'x' }")
+
+        app.await_reload
+        assert_success app.spring_test_command
+      end
+
       test "app recovers when a boot-level error is introduced" do
         config = app.application_config.read
 
@@ -147,6 +157,9 @@ module Spring
       end
 
       test "custom commands" do
+        # Start spring before setting up the command, to test that it gracefully upgrades itself
+        assert_success "bin/rails runner ''"
+
         File.write(app.spring_config, <<-CODE)
           class CustomCommand
             def call

data/lib/spring/test/application_generator.rb

@@ -37,7 +37,7 @@ module Spring
 
       # Sporadic SSL errors keep causing test failures so there are anti-SSL workarounds here
       def generate_files
-        system("gem list rails --installed --version '#{version_constraint}' || " \
+        system("gem list '^rails$' --installed --version '#{version_constraint}' || " \
                  "gem install rails --clear-sources --source http://rubygems.org --version '#{version_constraint}'")
 
         @version = RailsVersion.new(`ruby -e 'puts Gem::Specification.find_by_name("rails", "#{version_constraint}").version'`.chomp)

data/lib/spring/version.rb

@@ -1,3 +1,3 @@
 module Spring
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/spring.gemspec

@@ -18,6 +18,6 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency 'activesupport'
+  gem.add_development_dependency 'activesupport', '~> 4.2.0'
   gem.add_development_dependency 'rake'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: spring
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Jon Leighton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-22 00:00:00.000000000 Z
+date: 2015-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Rails application preloader