Merge branch 'rs-update-binstubs' into 'master'

Re-generate Spring binstubs for updated version of Spring Prevents output like this: Array values in the parameter are deprecated. Please use a String or nil. An Array was passed in from bin/rspec:3:in `load' See merge request !3887

Merge branch 'rs-update-binstubs' into 'master'
c56da881 · Robert Speicher · 80893cad · fdc8b05a · c56da881 · c56da881
Commit c56da881 authored Apr 22, 2016 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 30 additions and 10 deletions

rails bin/rails +5 -0

rake bin/rake +5 -0

rspec bin/rspec +3 -2

spinach bin/spinach +3 -2

spring bin/spring +6 -6

teaspoon bin/teaspoon +8 -0

No files found.
--- a/bin/rails
+++ b/bin/rails
 #!/usr/bin/env ruby
+begin
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError => e
+  raise unless e.message.include?('spring')
+end
 APP_PATH = File.expand_path('../../config/application', __FILE__)
 require_relative '../config/boot'
 require 'rails/commands'
--- a/bin/rake
+++ b/bin/rake
 #!/usr/bin/env ruby
+begin
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError => e
+  raise unless e.message.include?('spring')
+end
 require_relative '../config/boot'
 require 'rake'
 Rake.application.run
--- a/bin/rspec
+++ b/bin/rspec
 #!/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 'bundler/setup'
 load Gem.bin_path('rspec-core', 'rspec')
--- a/bin/spinach
+++ b/bin/spinach
 #!/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 'bundler/setup'
 load Gem.bin_path('spinach', 'spinach')
--- 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.join(Gem.path_separator) }
+    gem 'spring', match[1]
+    require 'spring/binstub'
  end
 end
--- a/bin/teaspoon
+++ b/bin/teaspoon
+#!/usr/bin/env ruby
+begin
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError => e
+  raise unless e.message.include?('spring')
+end
+require 'bundler/setup'
+load Gem.bin_path('teaspoon', 'teaspoon')