From b1ea579e95c6c8ec61407fec035658a76d61a4e3 Mon Sep 17 00:00:00 2001
From: Jon Rowe <hello@jonrowe.co.uk>
Date: Mon, 17 Apr 2023 07:57:29 +0100
Subject: [PATCH] Merge pull request #1420 from rspec/remove-relish

Remove Relish
---
 Changelog.md          |  6 ++----
 Gemfile-custom.sample |  1 -
 Rakefile              | 30 ------------------------------
 3 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 9f6ce9bc5..399febd64 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -331,10 +331,8 @@ Enhancements:
   can cause uses of `super` to trigger infinite recursion. (Myron Marston, #816)
 * Stop rescuing `NoMemoryError`, `SignalExcepetion`, `Interrupt` and
   `SystemExit`. It is dangerous to interfere with these. (Myron Marston, #845)
-* Add `#with_captures` to the
-  [match matcher](https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers/match-matcher)
-  which allows a user to specify expected captures when matching a regex
-  against a string. (Sam Phippen, #848)
+* Add `#with_captures` to the match matcher which allows a user to specify expected
+  captures when matching a regex against a string. (Sam Phippen, #848)
 * Always print compound failure messages in the multi-line form. Trying
   to print it all on a single line didn't read very well. (Myron Marston, #859)
 
diff --git a/Gemfile-custom.sample b/Gemfile-custom.sample
index a5017674b..4a8642532 100644
--- a/Gemfile-custom.sample
+++ b/Gemfile-custom.sample
@@ -1,6 +1,5 @@
 group :development do
   gem 'interactive_rspec'
-  gem 'relish', '~> 0.6.0'
   gem 'guard-rspec', '~> 1.2.1'
   gem 'growl', '1.0.3'
   gem 'spork', '0.9.0'
diff --git a/Rakefile b/Rakefile
index 2a9c468bf..9c7b511cd 100644
--- a/Rakefile
+++ b/Rakefile
@@ -19,36 +19,6 @@ RSpec::Core::RakeTask.new(:spec) do |t|
   t.ruby_opts = %w[-w]
 end
 
-with_changelog_in_features = lambda do |&block|
-  begin
-    sh "cp Changelog.md features/"
-    block.call
-  ensure
-    sh "rm features/Changelog.md"
-  end
-end
-
-desc "Push docs/cukes to relishapp using the relish-client-gem"
-task :relish, :version do |_task, args|
-  raise "rake relish[VERSION]" unless args[:version]
-
-  with_changelog_in_features.call do
-    if `relish versions rspec/rspec-expectations`.split.map(&:strip).include? args[:version]
-      puts "Version #{args[:version]} already exists"
-    else
-      sh "relish versions:add rspec/rspec-expectations:#{args[:version]}"
-    end
-    sh "relish push rspec/rspec-expectations:#{args[:version]}"
-  end
-end
-
-desc "Push to relish staging environment"
-task :relish_staging do
-  with_changelog_in_features.call do
-    sh "relish push rspec-staging/rspec-expectations"
-  end
-end
-
 namespace :clobber do
   desc "delete generated .rbc files"
   task :rbc do