spring 1.7.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85d4ab3b84aa6f12fb90e262bcd8adf394cb94ef
-  data.tar.gz: 69c83b9fe81004f4c25b9a429bd1222316e1d25e
+  metadata.gz: 492a555d7260fc775b233acca0a3fddfb2d20c88
+  data.tar.gz: ccfc69cc32e5105e3de6cb75ae19538d3958b44e
 SHA512:
-  metadata.gz: 491bc17d5c922c974ebe995469c5ebaa099c95351067eab312dad022426feecc006e6dd2211955e390eabb2371392a99e8cdfa39f07dc5b6938f5de73a30d1a7
-  data.tar.gz: 61f6d055f6b22aa94858dbd82227c0c4edbbdd6631a933a8bd5b2ebb0499c3d9c8cff27f1d41c6dca115a084cb0ddbffedef133345385069c87df69673e44ed5
+  metadata.gz: 7bb6d3f377d2004b10b01dcba207c2b1ec285f5e04d1721edc4ad436d6e50d99337d8ba584f08d5a99daf60ef06af853435a760edf467360a5a93919ec1d35ec
+  data.tar.gz: dea0ae70aa4e56ef9aeb525faa1350b711c1f90d87171ce1d530380469da3773b478285a50ab94b628cf6afb81e05237a8cc269cc09a1a3408275af59ff6db7c

data/README.md

@@ -17,7 +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.0+ (in Rails 4.1 and up Spring is included by default)
+* 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).

data/lib/spring/application.rb

@@ -192,7 +192,6 @@ module Spring
       }
 
       disconnect_database
-      reset_streams
 
       log "forked #{pid}"
       manager.puts pid
@@ -209,6 +208,11 @@ module Spring
 
       client.puts(1) if pid
       client.close
+    ensure
+      # Redirect STDOUT and STDERR to prevent from keeping the original FDs
+      # (i.e. to prevent `spring rake -T | grep db` from hanging forever),
+      # even when exception is raised before forking (i.e. preloading).
+      reset_streams
     end
 
     def terminate
@@ -292,8 +296,11 @@ module Spring
       PTY.open do |master, slave|
         [STDOUT, STDERR, STDIN].each { |s| s.reopen slave }
         Thread.new { master.read }
-        yield
-        reset_streams
+        begin
+          yield
+        ensure
+          reset_streams
+        end
       end
     end
 

data/lib/spring/binstub.rb

@@ -1,6 +1,26 @@
 command  = File.basename($0)
 bin_path = File.expand_path("../../../bin/spring", __FILE__)
 
+# When we run a command which does not go through Spring (e.g. DISABLE_SPRING
+# is used, or we just call 'rails' or something) then we get this warning from
+# Rubygems:
+#
+#   WARN: Unresolved specs during Gem::Specification.reset: activesupport (<= 5.1, >= 4.2)
+#   WARN: Clearing out unresolved specs.
+#   Please report a bug if this causes problems.
+#
+# This happens due to our dependency on activesupport, when Bundler.setup gets
+# called.  We don't actually *use* the dependency; it is purely there to
+# restrict the Rails version that we're compatible with.
+#
+# When the warning is shown, Rubygems just does the below.
+# Therefore, by doing it ourselves here, we can avoid the warning.
+if Gem::Specification.respond_to?(:unresolved_deps)
+  Gem::Specification.unresolved_deps.clear
+else
+  Gem.unresolved_deps.clear
+end
+
 if command == "spring"
   load bin_path
 else

data/lib/spring/client/binstub.rb

@@ -23,10 +23,6 @@ CODE
       # binstub from the application process. Which means that in the application
       # process we'll execute the lines which come after the LOADER block, which
       # is what we want.
-      #
-      # Parsing the lockfile in this way is pretty nasty but reliable enough
-      # The regex ensures that the match must be between a GEM line and an empty
-      # line, so it won't go on to the next section.
       SPRING = <<'CODE'
 #!/usr/bin/env ruby
 
@@ -37,9 +33,10 @@ unless defined?(Spring)
   require 'rubygems'
   require 'bundler'
 
-  if (match = Bundler.default_lockfile.read.match(/^GEM$.*?^    (?:  )*spring \((.*?)\)$.*?^$/m))
-    Gem.paths = { 'GEM_PATH' => [Bundler.bundle_path.to_s, *Gem.path].uniq.join(Gem.path_separator) }
-    gem 'spring', match[1]
+  lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read)
+  if spring = lockfile.specs.detect { |spec| spec.name == "spring" }
+    Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
+    gem 'spring', spring.version
     require 'spring/binstub'
   end
 end

data/lib/spring/test/acceptance_test.rb

@@ -12,7 +12,7 @@ module Spring
       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 @@ module Spring
         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 @@ module Spring
             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"
@@ -415,6 +415,12 @@ module Spring
         assert_failure "bin/rake -T", stderr: "unable to find your config/application.rb"
       end
 
+      test "piping with boot-level error" do
+        config = app.application_config.read
+        File.write(app.application_config, "#{config}\nomg")
+        assert_success "bin/rake -T | cat"
+      end
+
       test "piping" do
         assert_success "bin/rake -T | grep db", stdout: "rake db:migrate"
       end
@@ -534,6 +540,11 @@ module Spring
 
         assert_failure "bin/rails runner ''", stderr: "timed out"
       end
+
+      test "no warnings are shown for unsprung commands" do
+        app.env["DISABLE_SPRING"] = "1"
+        refute_output_includes "bin/rails runner ''", stderr: "WARN"
+      end
     end
   end
 end

data/lib/spring/test/application.rb

@@ -65,7 +65,7 @@ module Spring
       end
 
       def spring_test_command
-        "#{rails_version.test_command} #{test}"
+        "bin/rake test #{test}"
       end
 
       def stop_spring
@@ -74,7 +74,7 @@ module Spring
       end
 
       def test
-        path "test/#{rails_version.controller_tests_dir}/posts_controller_test.rb"
+        path "test/controllers/posts_controller_test.rb"
       end
 
       def controller
@@ -205,10 +205,17 @@ module Spring
       end
 
       def bundle
-        run! "(gem list bundler | grep bundler) || gem install bundler", timeout: nil, retry: 2
+        # Version restriction is a workaround for https://github.com/bundler/bundler/pull/4981
+        # The problem breaks our tests on Ruby 2.2
+        # We can remove once it's fixed
+        run! "(gem list bundler | grep bundler) || gem install bundler --version '~> 1.12.0'", timeout: nil, retry: 2
         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)

data/lib/spring/test/application_generator.rb

@@ -38,13 +38,17 @@ module Spring
 
       # Sporadic SSL errors keep causing test failures so there are anti-SSL workarounds here
       def generate_files
+        if RUBY_VERSION == "1.9.3"
+          system("gem list '^mime-types$' --installed --version '~> 2' || " \
+                   "gem install mime-types --clear-sources --source http://rubygems.org --version '~> 2'")
+        end
+
         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)
 
-        skips = %w(--skip-bundle --skip-javascript --skip-sprockets)
-        skips << "--skip-spring" if version.bundles_spring?
+        skips = %w(--skip-bundle --skip-javascript --skip-sprockets --skip-spring)
 
         system("rails _#{version}_ new #{application.root} #{skips.join(' ')}")
         raise "application generation failed" unless application.exists?
@@ -55,14 +59,6 @@ module Spring
 
         append_to_file(application.gemfile, "gem 'spring', '#{Spring::VERSION}'")
 
-        if version.needs_testunit?
-          append_to_file(application.gemfile, "gem 'spring-commands-testunit'")
-        end
-
-        if RUBY_VERSION == "1.9.3"
-          append_to_file(application.gemfile, "gem 'mime-types', '~> 2'")
-        end
-
         rewrite_file(application.gemfile) do |c|
           c.sub!("https://rubygems.org", "http://rubygems.org")
           c.gsub!(/(gem '(byebug|web-console|sdoc|jbuilder)')/, "# \\1")
@@ -90,6 +86,10 @@ module Spring
       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

data/lib/spring/test/rails_version.rb

@@ -7,23 +7,6 @@ module Spring
         @version = Gem::Version.new(string)
       end
 
-      def rails_3?
-        version < Gem::Version.new("4.0.0")
-      end
-      alias needs_testunit? rails_3?
-
-      def test_command
-        needs_testunit? ? 'bin/testunit' : 'bin/rake test'
-      end
-
-      def controller_tests_dir
-        rails_3? ? 'functional' : 'controllers'
-      end
-
-      def bundles_spring?
-        version.segments.take(2) == [4, 1] || version > Gem::Version.new("4.1")
-      end
-
       def major
         version.segments[0]
       end

data/lib/spring/version.rb

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

data/lib/spring/watcher/polling.rb

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

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: spring
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Jon Leighton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2016-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
-  type: :development
+        version: '4.2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement