Commit 44bc5533 authored by Jonne Haß's avatar Jonne Haß Committed by Dennis Schubert

bump spring

parent 75c8d0c4
...@@ -236,7 +236,7 @@ group :development do ...@@ -236,7 +236,7 @@ group :development do
# Preloading environment # Preloading environment
gem "spring", "1.4.0" gem "spring", "1.5.0"
gem "spring-commands-rspec", "1.0.4" gem "spring-commands-rspec", "1.0.4"
gem "spring-commands-cucumber", "1.0.1" gem "spring-commands-cucumber", "1.0.1"
......
...@@ -701,7 +701,7 @@ GEM ...@@ -701,7 +701,7 @@ GEM
sinon-rails (1.15.0) sinon-rails (1.15.0)
railties (>= 3.1) railties (>= 3.1)
slop (3.6.0) slop (3.6.0)
spring (1.4.0) spring (1.5.0)
spring-commands-cucumber (1.0.1) spring-commands-cucumber (1.0.1)
spring (>= 0.9.1) spring (>= 0.9.1)
spring-commands-rspec (1.0.4) spring-commands-rspec (1.0.4)
...@@ -887,7 +887,7 @@ DEPENDENCIES ...@@ -887,7 +887,7 @@ DEPENDENCIES
simplecov (= 0.11.1) simplecov (= 0.11.1)
sinatra (= 1.4.6) sinatra (= 1.4.6)
sinon-rails (= 1.15.0) sinon-rails (= 1.15.0)
spring (= 1.4.0) spring (= 1.5.0)
spring-commands-cucumber (= 1.0.1) spring-commands-cucumber (= 1.0.1)
spring-commands-rspec (= 1.0.4) spring-commands-rspec (= 1.0.4)
test_after_commit (= 0.4.1) test_after_commit (= 0.4.1)
......
#!/usr/bin/env ruby #!/usr/bin/env ruby
begin begin
load File.expand_path("../spring", __FILE__) load File.expand_path('../spring', __FILE__)
rescue LoadError rescue LoadError => e
raise unless e.message.include?('spring')
end end
require 'bundler/setup' require 'bundler/setup'
load Gem.bin_path('cucumber', 'cucumber') load Gem.bin_path('cucumber', 'cucumber')
#!/usr/bin/env ruby #!/usr/bin/env ruby
begin begin
load File.expand_path("../spring", __FILE__) load File.expand_path('../spring', __FILE__)
rescue LoadError rescue LoadError => e
raise unless e.message.include?('spring')
end end
# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
APP_PATH = File.expand_path('../../config/application', __FILE__) APP_PATH = File.expand_path('../../config/application', __FILE__)
require_relative '../config/boot' require File.expand_path('../../config/boot', __FILE__)
require 'rails/commands' require 'rails/commands'
#!/usr/bin/env ruby #!/usr/bin/env ruby
begin begin
load File.expand_path("../spring", __FILE__) load File.expand_path('../spring', __FILE__)
rescue LoadError rescue LoadError => e
raise unless e.message.include?('spring')
end end
require_relative '../config/boot' require_relative '../config/boot'
require 'rake' require 'rake'
......
#!/usr/bin/env ruby #!/usr/bin/env ruby
begin begin
load File.expand_path("../spring", __FILE__) load File.expand_path('../spring', __FILE__)
rescue LoadError rescue LoadError => e
raise unless e.message.include?('spring')
end end
require 'bundler/setup' require 'bundler/setup'
load Gem.bin_path('rspec-core', 'rspec') load Gem.bin_path('rspec-core', 'rspec')
#!/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"] = nil gem 'spring', match[1]
Gem.paths = ENV require 'spring/binstub'
gem "spring", match[1]
require "spring/binstub"
end end
end end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment