Update spring, re-run binstubs
This commit is contained in:
parent
71b1a2c728
commit
3601ebda79
|
@ -589,7 +589,7 @@ GEM
|
||||||
capybara (>= 2.0.0)
|
capybara (>= 2.0.0)
|
||||||
railties (>= 3)
|
railties (>= 3)
|
||||||
spinach (>= 0.4)
|
spinach (>= 0.4)
|
||||||
spring (1.3.3)
|
spring (1.3.6)
|
||||||
spring-commands-rspec (1.0.4)
|
spring-commands-rspec (1.0.4)
|
||||||
spring (>= 0.9.1)
|
spring (>= 0.9.1)
|
||||||
spring-commands-spinach (1.0.0)
|
spring-commands-spinach (1.0.0)
|
||||||
|
|
|
@ -3,6 +3,5 @@ begin
|
||||||
load File.expand_path("../spring", __FILE__)
|
load File.expand_path("../spring", __FILE__)
|
||||||
rescue LoadError
|
rescue LoadError
|
||||||
end
|
end
|
||||||
APP_PATH = File.expand_path('../../config/application', __FILE__)
|
require 'bundler/setup'
|
||||||
require_relative '../config/boot'
|
load Gem.bin_path('rails', 'rails')
|
||||||
require 'rails/commands'
|
|
||||||
|
|
5
bin/rake
5
bin/rake
|
@ -3,6 +3,5 @@ begin
|
||||||
load File.expand_path("../spring", __FILE__)
|
load File.expand_path("../spring", __FILE__)
|
||||||
rescue LoadError
|
rescue LoadError
|
||||||
end
|
end
|
||||||
require_relative '../config/boot'
|
require 'bundler/setup'
|
||||||
require 'rake'
|
load Gem.bin_path('rake', 'rake')
|
||||||
Rake.application.run
|
|
||||||
|
|
11
bin/spring
11
bin/spring
|
@ -1,17 +1,14 @@
|
||||||
#!/usr/bin/env ruby
|
#!/usr/bin/env ruby
|
||||||
|
|
||||||
# This file loads spring without using Bundler, in order to be fast
|
# This file loads spring without using Bundler, in order to be fast.
|
||||||
# It gets overwritten when you run the `spring binstub` command
|
# It gets overwritten when you run the `spring binstub` command.
|
||||||
|
|
||||||
unless defined?(Spring)
|
unless defined?(Spring)
|
||||||
require "rubygems"
|
require "rubygems"
|
||||||
require "bundler"
|
require "bundler"
|
||||||
|
|
||||||
if match = Bundler.default_lockfile.read.match(/^GEM$.*?^ spring \((.*?)\)$.*?^$/m)
|
if match = Bundler.default_lockfile.read.match(/^GEM$.*?^ (?: )*spring \((.*?)\)$.*?^$/m)
|
||||||
ENV["GEM_PATH"] = ([Bundler.bundle_path.to_s] + Gem.path).join(File::PATH_SEPARATOR)
|
Gem.paths = { "GEM_PATH" => [Bundler.bundle_path.to_s, *Gem.path].uniq }
|
||||||
ENV["GEM_HOME"] = ""
|
|
||||||
Gem.paths = ENV
|
|
||||||
|
|
||||||
gem "spring", match[1]
|
gem "spring", match[1]
|
||||||
require "spring/binstub"
|
require "spring/binstub"
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue