From fb00b95c748a840573d12c4eb539fb410efc9646 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sun, 27 Dec 2015 02:01:50 +0100
Subject: [PATCH] bump spring

---
 Gemfile.lock          |  4 ++--
 bin/rails             |  5 +++--
 bin/rake              |  5 +++--
 bin/rspec             |  5 +++--
 bin/spring            | 12 ++++++------
 test/dummy/bin/rake   |  5 +++--
 test/dummy/bin/spring | 12 ++++++------
 7 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 458ec62..bd20e12 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -241,7 +241,7 @@ GEM
     simplecov-rcov (0.2.3)
       simplecov (>= 0.4.1)
     slop (3.6.0)
-    spring (1.4.4)
+    spring (1.6.1)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
     spring-watcher-listen (2.0.0)
@@ -305,4 +305,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.10.6
+   1.11.2
diff --git a/bin/rails b/bin/rails
index f281890..ef53508 100755
--- a/bin/rails
+++ b/bin/rails
@@ -2,8 +2,9 @@
 # This command will automatically be run when you run "rails" with Rails 4 gems installed from the root of your application.
 
 begin
-  load File.expand_path("../spring", __FILE__)
-rescue LoadError
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError => e
+  raise unless e.message.include?('spring')
 end
 
 ENGINE_ROOT = File.expand_path('../..', __FILE__)
diff --git a/bin/rake b/bin/rake
index 6779365..15c7e5e 100755
--- a/bin/rake
+++ b/bin/rake
@@ -7,8 +7,9 @@
 #
 
 begin
-  load File.expand_path("../spring", __FILE__)
-rescue LoadError
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError => e
+  raise unless e.message.include?('spring')
 end
 
 require 'pathname'
diff --git a/bin/rspec b/bin/rspec
index ce2c396..f234e5f 100755
--- a/bin/rspec
+++ b/bin/rspec
@@ -7,8 +7,9 @@
 #
 
 begin
-  load File.expand_path("../spring", __FILE__)
-rescue LoadError
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError => e
+  raise unless e.message.include?('spring')
 end
 
 require 'pathname'
diff --git a/bin/spring b/bin/spring
index 7b45d37..62ec28f 100755
--- a/bin/spring
+++ b/bin/spring
@@ -4,12 +4,12 @@
 # It gets overwritten when you run the `spring binstub` command.
 
 unless defined?(Spring)
-  require "rubygems"
-  require "bundler"
+  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 }
-    gem "spring", match[1]
-    require "spring/binstub"
+  if (match = Bundler.default_lockfile.read.match(/^GEM$.*?^    (?:  )*spring \((.*?)\)$.*?^$/m))
+    Gem.paths = { 'GEM_PATH' => [Bundler.bundle_path.to_s, *Gem.path].uniq }
+    gem 'spring', match[1]
+    require 'spring/binstub'
   end
 end
diff --git a/test/dummy/bin/rake b/test/dummy/bin/rake
index 8017a02..d87d5f5 100755
--- a/test/dummy/bin/rake
+++ b/test/dummy/bin/rake
@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 begin
-  load File.expand_path("../spring", __FILE__)
-rescue LoadError
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError => e
+  raise unless e.message.include?('spring')
 end
 require_relative '../config/boot'
 require 'rake'
diff --git a/test/dummy/bin/spring b/test/dummy/bin/spring
index 7b45d37..62ec28f 100755
--- a/test/dummy/bin/spring
+++ b/test/dummy/bin/spring
@@ -4,12 +4,12 @@
 # It gets overwritten when you run the `spring binstub` command.
 
 unless defined?(Spring)
-  require "rubygems"
-  require "bundler"
+  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 }
-    gem "spring", match[1]
-    require "spring/binstub"
+  if (match = Bundler.default_lockfile.read.match(/^GEM$.*?^    (?:  )*spring \((.*?)\)$.*?^$/m))
+    Gem.paths = { 'GEM_PATH' => [Bundler.bundle_path.to_s, *Gem.path].uniq }
+    gem 'spring', match[1]
+    require 'spring/binstub'
   end
 end