Explicitly support Rails 5

Author: jonleighton

.travis.yml

@@ -4,11 +4,20 @@ sudo: false
 rvm:
   - 1.9.3 # when removed, get rid of the before_script hack and also the one in application_generator.rb
   - 2.0.0
-  - 2.1.5
-  - 2.2.0
-  - 2.3.0
+  - 2.1.9
+  - 2.2.5
+  - 2.3.1
 env:
   - RAILS_VERSION="~> 4.2.0"
+  - RAILS_VERSION="~> 5.0.0"
+matrix:
+  exclude: # Rails 5 is incompatible with Ruby < 2.2.2
+    - rvm: 1.9.3
+      env: RAILS_VERSION="~> 5.0.0"
+    - rvm: 2.0.0
+      env: RAILS_VERSION="~> 5.0.0"
+    - rvm: 2.1.9
+      env: RAILS_VERSION="~> 5.0.0"
 before_script:
   - "[ $TRAVIS_RUBY_VERSION = \"1.9.3\" ] && travis_retry gem install mime-types --version \"~> 2\" || true"
   - travis_retry gem install rails --version "$RAILS_VERSION"

README.md

@@ -17,8 +17,8 @@ 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, MRI 2.2
-* Rails versions: 4.2 (Spring is installed by default when you do `rails
-  new` to generate your application)
+* Rails versions: 4.2, 5.0 (Spring is installed by default when you do
+  `rails new` to generate your application)
 
 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).

lib/spring/test/acceptance_test.rb

@@ -12,7 +12,7 @@ class AcceptanceTest < ActiveSupport::TestCase
       DEFAULT_SPEEDUP = 0.8
 
       def rails_version
-        ENV['RAILS_VERSION'] || '~> 4.2.0'
+        ENV['RAILS_VERSION'] || '~> 5.0.0'
       end
 
       # Extension point for spring-watchers-listen
@@ -121,7 +121,7 @@ def without_gem(name)
         assert_speedup do
           assert_success app.spring_test_command, stdout: "0 failures"
 
-          File.write(app.test, app.test.read.sub("get :index", "raise 'omg'"))
+          app.insert_into_test "raise 'omg'"
           assert_failure app.spring_test_command, stdout: "RuntimeError: omg"
         end
       end
@@ -156,7 +156,7 @@ def self.omg
             end
           end
         RUBY
-        File.write(app.test, app.test.read.sub("get :index", "Foo.omg"))
+        app.insert_into_test "Foo.omg"
 
         app.await_reload
         assert_failure app.spring_test_command, stdout: "RuntimeError: omg"

lib/spring/test/application.rb

@@ -209,6 +209,10 @@ def bundle
         run! "bundle check || bundle update --retry=2", timeout: nil
       end
 
+      def insert_into_test(code)
+        File.write(test, test.read.sub(/^\s*get .+$/, code))
+      end
+
       private
 
       def process_alive?(pid)

lib/spring/test/application_generator.rb

@@ -86,6 +86,10 @@ def generate_if_missing
       def install_spring
         return if @installed
 
+        if RUBY_VERSION < "2.2.2"
+          application.run! "gem install activesupport --version '#{version}'"
+        end
+
         build_and_install_gems
 
         application.bundle