From ce82ba3dde7178b6e707d83bc6246fe033a328c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Fri, 10 Jul 2020 14:03:07 +0200
Subject: [PATCH] Drop spring

it does more harm than good at this point

closes #8133
---
 Gemfile          |  4 ----
 Gemfile.lock     |  8 --------
 bin/cucumber     |  5 -----
 bin/rails        |  5 -----
 bin/rake         |  5 -----
 bin/rspec        |  5 -----
 bin/spring       | 16 ----------------
 config/spring.rb |  8 --------
 8 files changed, 56 deletions(-)
 delete mode 100755 bin/spring
 delete mode 100644 config/spring.rb

diff --git a/Gemfile b/Gemfile
index aaea47b21..c8433bbef 100644
--- a/Gemfile
+++ b/Gemfile
@@ -260,10 +260,6 @@ group :development do
 
   # Preloading environment
 
-  gem "spring", "2.1.0"
-  gem "spring-commands-rspec", "1.0.4"
-  gem "spring-commands-cucumber", "1.0.1"
-
   # Debugging
   gem "pry"
   gem "pry-byebug"
diff --git a/Gemfile.lock b/Gemfile.lock
index 0626c61e6..33bbb5d96 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -699,11 +699,6 @@ GEM
     simplecov-html (0.10.2)
     sinon-rails (1.15.0)
       railties (>= 3.1)
-    spring (2.1.0)
-    spring-commands-cucumber (1.0.1)
-      spring (>= 0.9.1)
-    spring-commands-rspec (1.0.4)
-      spring (>= 0.9.1)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -923,9 +918,6 @@ DEPENDENCIES
   simple_captcha2 (= 0.5.0)
   simplecov (= 0.16.1)
   sinon-rails (= 1.15.0)
-  spring (= 2.1.0)
-  spring-commands-cucumber (= 1.0.1)
-  spring-commands-rspec (= 1.0.4)
   sprockets-rails (= 3.2.1)
   string-direction (= 1.2.2)
   timecop (= 0.9.1)
diff --git a/bin/cucumber b/bin/cucumber
index f135a7564..df07be133 100755
--- a/bin/cucumber
+++ b/bin/cucumber
@@ -1,8 +1,3 @@
 #!/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('cucumber', 'cucumber')
diff --git a/bin/rails b/bin/rails
index 5badb2fde..073966023 100755
--- a/bin/rails
+++ b/bin/rails
@@ -1,9 +1,4 @@
 #!/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', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'
diff --git a/bin/rake b/bin/rake
index d87d5f578..17240489f 100755
--- a/bin/rake
+++ b/bin/rake
@@ -1,9 +1,4 @@
 #!/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
diff --git a/bin/rspec b/bin/rspec
index 6e6709219..d72fadf39 100755
--- a/bin/rspec
+++ b/bin/rspec
@@ -1,8 +1,3 @@
 #!/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('rspec-core', 'rspec')
diff --git a/bin/spring b/bin/spring
deleted file mode 100755
index 9bc076b9e..000000000
--- a/bin/spring
+++ /dev/null
@@ -1,16 +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'
-
-  lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read)
-  if spring = lockfile.specs.detect { |spec| spec.name == "spring" }
-    Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
-    gem 'spring', spring.version
-    require 'spring/binstub'
-  end
-end
diff --git a/config/spring.rb b/config/spring.rb
deleted file mode 100644
index 650a73ca0..000000000
--- a/config/spring.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-%w[
-  .ruby-version
-  .rbenv-vars
-  tmp/restart.txt
-  tmp/caching-dev.txt
-].each {|path| Spring.watch(path) }