diff --git a/Gemfile b/Gemfile index 706f94df5d..d6e9b34354 100644 --- a/Gemfile +++ b/Gemfile @@ -113,8 +113,6 @@ group :development do gem 'rspec-rails', '~> 3.1' gem 'rspec-html-matchers', '~> 0.7' gem 'shoulda-matchers' - gem 'spring', '~> 1.3.0' - gem 'spring-commands-rspec' gem 'vcr' gem 'webmock', '~> 1.17.4', require: false end diff --git a/Gemfile.lock b/Gemfile.lock index 0b74a315a8..683628047b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -419,9 +419,6 @@ GEM slop (3.6.0) spectrum-rails (1.3.4) railties (>= 3.1) - spring (1.3.6) - spring-commands-rspec (1.0.4) - spring (>= 0.9.1) sprockets (3.2.0) rack (~> 1.0) sprockets-rails (2.3.1) @@ -569,8 +566,6 @@ DEPENDENCIES shoulda-matchers slack-notifier (~> 1.0.0) spectrum-rails - spring (~> 1.3.0) - spring-commands-rspec string-scrub therubyracer (~> 0.12.2) tumblr_client @@ -589,4 +584,4 @@ DEPENDENCIES xmpp4r (~> 0.5.6) BUNDLED WITH - 1.10.5 + 1.10.6 diff --git a/Guardfile b/Guardfile index 4e114775a0..8cd006f846 100644 --- a/Guardfile +++ b/Guardfile @@ -8,7 +8,7 @@ guard 'livereload' do watch(%r{(app|vendor)(/assets/\w+/(.+\.(css|js|html|png|jpg))).*}) { |m| "/assets/#{m[3]}" } end -guard :rspec, cmd: 'bundle exec spring rspec' do +guard :rspec, cmd: 'bundle exec rspec' do watch(%r{^spec/.+_spec\.rb$}) watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" } watch('spec/spec_helper.rb') { "spec" } diff --git a/bin/rails b/bin/rails index 7feb6a30e6..728cd85aa5 100755 --- a/bin/rails +++ b/bin/rails @@ -1,8 +1,4 @@ #!/usr/bin/env ruby -begin - load File.expand_path("../spring", __FILE__) -rescue LoadError -end APP_PATH = File.expand_path('../../config/application', __FILE__) require_relative '../config/boot' require 'rails/commands' diff --git a/bin/rake b/bin/rake index 8017a0271d..17240489f6 100755 --- a/bin/rake +++ b/bin/rake @@ -1,8 +1,4 @@ #!/usr/bin/env ruby -begin - load File.expand_path("../spring", __FILE__) -rescue LoadError -end require_relative '../config/boot' require 'rake' Rake.application.run diff --git a/bin/rspec b/bin/rspec index 20060ebd79..d72fadf396 100755 --- a/bin/rspec +++ b/bin/rspec @@ -1,7 +1,3 @@ #!/usr/bin/env ruby -begin - load File.expand_path("../spring", __FILE__) -rescue LoadError -end require 'bundler/setup' load Gem.bin_path('rspec-core', 'rspec') diff --git a/bin/spring b/bin/spring deleted file mode 100755 index e09182495f..0000000000 --- a/bin/spring +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env ruby - -# This file loads spring without using Bundler, in order to be fast. -# It gets overwritten when you run the `spring binstub` command. - -unless defined?(Spring) - require "rubygems" - require "bundler" - - if match = Bundler.default_lockfile.read.match(/^GEM$.*?^ (?: )*spring \((.*?)\)$.*?^$/m) - Gem.paths = { "GEM_PATH" => Bundler.bundle_path.to_s } - gem "spring", match[1] - require "spring/binstub" - end -end