From dc8abc3185263e75b8f4a7a998d4a516f0b82260 Mon Sep 17 00:00:00 2001
From: Paul DobbinSchmaltz <p.dobbinschmaltz@icloud.com>
Date: Sat, 25 Nov 2023 18:59:23 -0600
Subject: [PATCH] Utilize new Gemwork dependencies + test support

This simplifies definition and update of gem dependencies and
utilization of test/test_helper.rb support/requires.
---
 Gemfile.lock        | 20 --------------------
 bin/setup           |  4 +---
 say.gemspec         |  4 ----
 test/test_helper.rb | 17 ++++-------------
 4 files changed, 5 insertions(+), 40 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 9b1294c..89fdfc7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,14 +7,11 @@ GEM
   remote: https://rubygems.org/
   specs:
     amazing_print (1.5.0)
-    ansi (1.5.0)
     ast (2.4.2)
-    builder (3.2.4)
     coderay (1.1.3)
     debug (1.8.0)
       irb (>= 1.5.0)
       reline (>= 0.3.1)
-    docile (1.4.0)
     gemwork (0.1.0)
       reek
       rubocop
@@ -30,13 +27,6 @@ GEM
     kwalify (0.7.2)
     language_server-protocol (3.17.0.3)
     method_source (1.0.0)
-    minitest (5.20.0)
-    minitest-reporters (1.6.1)
-      ansi
-      builder
-      minitest (>= 5.0)
-      ruby-progressbar
-    much-stub (0.1.10)
     parallel (1.23.0)
     parser (3.2.2.4)
       ast (~> 2.4.1)
@@ -80,12 +70,6 @@ GEM
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
     ruby-progressbar (1.13.0)
-    simplecov (0.22.0)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.4)
     stringio (3.0.9)
     timecop (0.9.8)
     unicode-display_width (2.5.0)
@@ -100,13 +84,9 @@ DEPENDENCIES
   amazing_print
   debug
   gemwork
-  minitest
-  minitest-reporters
-  much-stub
   pry
   rake
   say!
-  simplecov
   timecop
 
 BUNDLED WITH
diff --git a/bin/setup b/bin/setup
index 772bdac..17f4a4e 100755
--- a/bin/setup
+++ b/bin/setup
@@ -2,7 +2,7 @@
 
 # Recompile and install Gemwork locally.
 if [ -n "$REBUILD_GEMWORK" ]; then
-  ( cd ~/dev/gemwork && rake install:local )
+  ( cd ~/dev/gemwork && bin/setup && rake install:local )
 fi
 
 set -euo pipefail
@@ -10,5 +10,3 @@ IFS=$'\n\t'
 set -vx
 
 bundle install
-
-# Do any other automated setup that you need to do here
diff --git a/say.gemspec b/say.gemspec
index d9f7ebf..a793b97 100644
--- a/say.gemspec
+++ b/say.gemspec
@@ -39,11 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "amazing_print"
   spec.add_development_dependency "debug"
   spec.add_development_dependency "gemwork"
-  spec.add_development_dependency "minitest"
-  spec.add_development_dependency "minitest-reporters"
-  spec.add_development_dependency "much-stub"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "simplecov"
   spec.add_development_dependency "timecop"
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 1b13162..f9e64f9 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,23 +1,14 @@
 # frozen_string_literal: true
 
-require "support/simplecov"
+require "gemwork/test/support/simplecov"
 
 $LOAD_PATH.unshift File.expand_path("../lib", __dir__)
 require "say"
 
 require "minitest/autorun"
-require "support/reporters"
 
-require "much-stub"
+require "gemwork/test/support/reporters"
+require "gemwork/test/support/much_stub"
+require "gemwork/test/support/spec_dsl"
 
 require "timecop"
-
-class Minitest::Spec
-  after do
-    MuchStub.unstub!
-  end
-end
-
-def context(...)
-  describe(...)
-end