🔨 Improved default rake tasks

- Compatibility with kettle-soup-cover v1.0.6

Author: pboling

.envrc

@@ -23,6 +23,7 @@ export K_SOUP_COV_MIN_BRANCH=100 # Means you want to enforce X% branch coverage
 export K_SOUP_COV_MIN_LINE=100 # Means you want to enforce X% line coverage
 export K_SOUP_COV_MIN_HARD=true # Means you want the build to fail if the coverage thresholds are not met
 export K_SOUP_COV_MULTI_FORMATTERS=true
+export K_SOUP_COV_OPEN_BIN= # Means don't try to open coverage results in browser
 export MAX_ROWS=1 # Setting for simplecov-console gem for tty output, limits to the worst N rows of bad coverage
 
 # Internal Debugging Controls

Gemfile.lock

@@ -69,15 +69,15 @@ GEM
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     json (2.11.3)
-    kettle-soup-cover (1.0.5)
+    kettle-soup-cover (1.0.6)
       simplecov (~> 0.22)
       simplecov-cobertura (~> 2.1)
       simplecov-console (~> 0.9, >= 0.9.1)
       simplecov-html (~> 0.12)
       simplecov-lcov (~> 0.8)
       simplecov-rcov (~> 0.3, >= 0.3.3)
       simplecov_json_formatter (~> 0.1, >= 0.1.4)
-      version_gem (~> 1.1, >= 1.1.4)
+      version_gem (~> 1.1, >= 1.1.7)
     language_server-protocol (3.17.0.4)
     lint_roller (1.1.0)
     logger (1.7.0)
@@ -94,7 +94,7 @@ GEM
     pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    psych (5.2.3)
+    psych (5.2.4)
       date
       stringio
     racc (1.8.1)
@@ -120,13 +120,13 @@ GEM
     rspec-block_is_expected (1.0.6)
     rspec-core (3.13.3)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.3)
+    rspec-expectations (3.13.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.2)
+    rspec-mocks (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.2)
+    rspec-support (3.13.3)
     rubocop (1.75.4)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
@@ -244,7 +244,7 @@ DEPENDENCIES
   bundler-audit (~> 0.9.2)
   debug (>= 1.0.0)
   github-markup (~> 5.0, >= 5.0.1)
-  kettle-soup-cover (~> 1.0, >= 1.0.4)
+  kettle-soup-cover (~> 1.0, >= 1.0.6)
   pry (~> 0.14)
   rake (~> 13.0)
   rdoc (~> 6.11)

Rakefile

@@ -4,6 +4,7 @@ require "bundler/gem_tasks"
 
 defaults = []
 
+### DEVELOPMENT TASKS
 # Setup Kettle Soup Cover
 begin
   require "kettle-soup-cover"
@@ -19,18 +20,6 @@ rescue LoadError
   end
 end
 
-# Setup stone_checksums
-begin
-  require "stone_checksums"
-
-  GemChecksums.install_tasks
-rescue LoadError
-  desc("(stub) build:generate_checksums is unavailable")
-  task("build:generate_checksums") do
-    warn("NOTE: stone_checksums isn't installed, or is disabled for #{RUBY_VERSION} in the current environment")
-  end
-end
-
 # Setup Bundle Audit
 begin
   require "bundler/audit/task"
@@ -52,7 +41,8 @@ begin
   require "rspec/core/rake_task"
 
   RSpec::Core::RakeTask.new(:spec)
-  defaults << "spec"
+  # This takes the place of `coverage` task when running as CI=true
+  defaults << "spec" if Kettle::Soup::Cover::IS_CI
 rescue LoadError
   desc("spec task stub")
   task(:spec) do
@@ -63,20 +53,16 @@ end
 desc "run spec task with test task"
 task test: :spec
 
-# Setup Reek
+# Setup RuboCop-LTS
 begin
-  require "reek/rake/task"
+  require "rubocop/lts"
 
-  Reek::Rake::Task.new do |t|
-    t.fail_on_error = true
-    t.verbose = false
-    t.source_files = "{lib,spec}/**/*.rb"
-  end
-  defaults << "reek"
+  Rubocop::Lts.install_tasks
+  defaults << "rubocop_gradual"
 rescue LoadError
-  desc("(stub) reek is unavailable")
-  task(:reek) do
-    warn("NOTE: reek isn't installed, or is disabled for #{RUBY_VERSION} in the current environment")
+  desc("(stub) rubocop_gradual is unavailable")
+  task(:rubocop_gradual) do
+    warn("NOTE: rubocop-lts isn't installed, or is disabled for #{RUBY_VERSION} in the current environment")
   end
 end
 
@@ -98,16 +84,33 @@ rescue LoadError
   end
 end
 
-# Setup RuboCop-LTS
+# Setup Reek
 begin
-  require "rubocop/lts"
+  require "reek/rake/task"
 
-  Rubocop::Lts.install_tasks
-  defaults << "rubocop_gradual"
+  Reek::Rake::Task.new do |t|
+    t.fail_on_error = true
+    t.verbose = false
+    t.source_files = "{lib,spec}/**/*.rb"
+  end
+  defaults << "reek"
 rescue LoadError
-  desc("(stub) rubocop_gradual is unavailable")
-  task(:rubocop_gradual) do
-    warn("NOTE: rubocop-lts isn't installed, or is disabled for #{RUBY_VERSION} in the current environment")
+  desc("(stub) reek is unavailable")
+  task(:reek) do
+    warn("NOTE: reek isn't installed, or is disabled for #{RUBY_VERSION} in the current environment")
+  end
+end
+
+### RELEASE TASKS
+# Setup stone_checksums
+begin
+  require "stone_checksums"
+
+  GemChecksums.install_tasks
+rescue LoadError
+  desc("(stub) build:generate_checksums is unavailable")
+  task("build:generate_checksums") do
+    warn("NOTE: stone_checksums isn't installed, or is disabled for #{RUBY_VERSION} in the current environment")
   end
 end
 

gemfiles/modular/coverage.gemfile

@@ -3,4 +3,4 @@
 # We run code coverage on the latest version of Ruby only.
 
 # Coverage
-gem "kettle-soup-cover", "~> 1.0", ">= 1.0.4"
+gem "kettle-soup-cover", "~> 1.0", ">= 1.0.6", require: false

spec/spec_helper.rb

@@ -16,9 +16,14 @@
   # kettle-soup-cover does not require "simplecov", but
   #   we do that next, and that has a side effect of running `.simplecov`
   # Also, we must avoid loading "version_gem" (this gem) via "kettle-soup-cover",
-  #   so instead of the normal kettle-soup-cover we use kettle/soup/cover.
-  require "kettle/soup/cover"
-  require "simplecov" if defined?(Kettle) && Kettle::Soup::Cover::DO_COV
+  #   so instead of the normal kettle-soup-cover, or kettle/soup/cover,
+  #   we do some proper hacking around the internals. Fortunately 2 gems, one author!
+  # require "kettle/soup/cover"
+  require "kettle/change"
+  require "kettle/soup/cover/version"
+  require "kettle/soup/cover/loaders"
+  require "kettle/soup/cover/constants"
+  require "simplecov" if Kettle::Soup::Cover::Constants::DO_COV
 rescue LoadError
   nil
 end