diff --git a/Gemfile b/Gemfile index ef787c03b..dda521947 100644 --- a/Gemfile +++ b/Gemfile @@ -222,7 +222,7 @@ group :development do # Preloading environment - gem 'spring', '1.2.0' + gem 'spring', '1.3.1' gem 'spring-commands-rspec', '1.0.2' gem 'spring-commands-cucumber', '1.0.1' diff --git a/Gemfile.lock b/Gemfile.lock index 620770618..12d8a969f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -558,7 +558,7 @@ GEM sinon-rails (1.10.3) railties (>= 3.1) slop (3.6.0) - spring (1.2.0) + spring (1.3.1) spring-commands-cucumber (1.0.1) spring (>= 0.9.1) spring-commands-rspec (1.0.2) @@ -725,7 +725,7 @@ DEPENDENCIES simple_captcha2 (= 0.3.2) sinatra (= 1.4.5) sinon-rails (= 1.10.3) - spring (= 1.2.0) + spring (= 1.3.1) spring-commands-cucumber (= 1.0.1) spring-commands-rspec (= 1.0.2) test_after_commit (= 0.4.0) diff --git a/bin/spring b/bin/spring index 7f24d96fb..de6070b2a 100755 --- a/bin/spring +++ b/bin/spring @@ -9,7 +9,7 @@ unless defined?(Spring) if match = Bundler.default_lockfile.read.match(/^GEM$.*?^ (?: )*spring \((.*?)\)$.*?^$/m) ENV["GEM_PATH"] = ([Bundler.bundle_path.to_s] + Gem.path).join(File::PATH_SEPARATOR) - ENV["GEM_HOME"] = "" + ENV["GEM_HOME"] = nil Gem.paths = ENV gem "spring", match[1]