kettle-soup-cover 3.0.14 → 3.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23207526b10c4012c750133e53fd2aff255467d57745570d279f170509430609
-  data.tar.gz: 6c1fa0d124b5e82beeb825e7b7234fe3d0c01ad51dd5d98e10264e853db90fa7
+  metadata.gz: 3bb6413d706639bbf337f05ae0194e9eadadc4f1895ce15d957e7acf1cebf3c9
+  data.tar.gz: 43bef6d581344f6362fabfc8288f1bb348faf123b922bb2f159fdc5f28ecec35
 SHA512:
-  metadata.gz: 9c88a868d7905fcdab31b4c56ca223f66b4db92e59a8c70d03e29b854dcb6076830b4708339a55c0b2326e44d476835158ca4c7b2479aad3fb7ff63280a17dd0
-  data.tar.gz: 5bf227bd3b8f13df8ef60bb273eb24ca048274ed7090977de765d3fd61c4570c2d10a812578cce45b08a06dd921072b1ac39f1c4211de3d63288c0d41c0a3f38
+  metadata.gz: 0d727362c805584e8325ac03027b9ebfba6a13a051a49eb16a0994bb42dbbb6938caa6e6d63745878b25f31b864f000606372a1dd231310c4222e0c7812eaf59
+  data.tar.gz: 324aa2a82800376f0fa641fcebd758d928c819209d0bc346acf8502f77c5b2c8d4c2dcd3860b79a154687e2980a3a1ce91d9387f807e92f54d0b24656ae07200

data/CHANGELOG.md

@@ -30,6 +30,45 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [3.0.15] - 2026-10-25
+
+- TAG: [v3.0.15][3.0.15t]
+- COVERAGE: 99.67% -- 303/304 lines in 13 files
+- BRANCH COVERAGE: 91.11% -- 82/90 branches in 13 files
+- 20.99% documented
+
+### Added
+
+- `K_SOUP_COV_MIN_STRICT=true` opts into strict coverage criteria, enabling branch and
+  method coverage (and eval coverage where supported) and requiring 100% line, branch,
+  and method coverage when hard minimum enforcement is on.
+
+### Changed
+
+- [kc] kettle-jem/prepare: updated 9 project files:
+  - dependencies (9)
+
+- [kc] kettle-jem/template: updated 4 project files:
+  - dependencies (2)
+  - documentation (1)
+  - workflows (1)
+
+### Fixed
+
+- Strict branch, method, and supported eval metrics stay enabled in turbo_tests2 workers
+  even though hard threshold enforcement is disabled there, allowing final collation to
+  enforce the 100% line, branch, and method minimums.
+
+- With `K_SOUP_COV_MIN_HARD=true` and `K_SOUP_COV_MIN_STRICT` unset or false,
+  the SimpleCov config and the turbo_tests2 collation now merge
+  `K_SOUP_COV_MIN_LINE` and `K_SOUP_COV_MIN_BRANCH` into the minimums a
+  project already configured (for example with SimpleCov's `strict` profile
+  in `.simplecov`) instead of replacing them. The higher value wins for each
+  criterion, and criteria kettle-soup-cover does not manage, such as method
+  coverage, are kept. Before, a project's method minimum was silently dropped
+  and its line and branch minimums could be lowered, with no way to restore
+  them after collation.
+
 ## [3.0.14] - 2026-10-25
 
 - TAG: [v3.0.14][3.0.14t]
@@ -827,7 +866,9 @@ Please file a bug if you notice a violation of semantic versioning.
 
 - Initial release
 
-[Unreleased]: https://github.com/kettle-dev/kettle-soup-cover/compare/v3.0.14...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-soup-cover/compare/v3.0.15...HEAD
+[3.0.15]: https://github.com/kettle-dev/kettle-soup-cover/compare/v3.0.14...v3.0.15
+[3.0.15t]: https://github.com/kettle-dev/kettle-soup-cover/releases/tag/v3.0.15
 [3.0.14]: https://github.com/kettle-dev/kettle-soup-cover/compare/v3.0.13...v3.0.14
 [3.0.14t]: https://github.com/kettle-dev/kettle-soup-cover/releases/tag/v3.0.14
 [3.0.13]: https://github.com/kettle-dev/kettle-soup-cover/compare/v3.0.12...v3.0.13

data/README.md

@@ -597,6 +597,7 @@ See [LICENSE.md][📄license] for the official copyright notice.
 <summary>Copyright holders</summary>
 
 - Copyright (c) 2023-2026 Peter H. Boling
+- Copyright (c) 2026 Erik Berlin
 
 </details>
 
@@ -783,7 +784,7 @@ Thanks for RTFM. ☺️
 [📌gitmoji]: https://gitmoji.dev
 [📌gitmoji-img]: https://img.shields.io/badge/gitmoji_commits-%20%F0%9F%98%9C%20%F0%9F%98%8D-34495e.svg?style=flat-square
 [🧮kloc]: https://www.youtube.com/watch?v=dQw4w9WgXcQ
-[🧮kloc-img]: https://img.shields.io/badge/KLOC-0.282-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-0.304-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
 [🔐security]: https://github.com/kettle-dev/kettle-soup-cover/blob/main/SECURITY.md
 [🔐security-img]: https://img.shields.io/badge/security-policy-259D6C.svg?style=flat
 [📄copyright-notice-explainer]: https://opensource.stackexchange.com/questions/5778/why-do-licenses-such-as-the-mit-license-specify-a-single-year

data/lib/kettle/soup/cover/config.rb

@@ -20,6 +20,8 @@ require_relative "constants" unless defined?(Kettle::Soup::Cover::Constants)
 require_relative "loaders" unless defined?(Kettle::Soup::Cover::Loaders)
 require_relative "formatters" unless defined?(Kettle::Soup::Cover) && Kettle::Soup::Cover.respond_to?(:configure_formatters!)
 
+require_relative "coverage_thresholds" unless defined?(Kettle::Soup::Cover::CoverageThresholds)
+
 SimpleCov.configure do
   cover("lib/**/*.rb")
 
@@ -54,12 +56,7 @@ SimpleCov.configure do
   # - If explicitly set to false (K_SOUP_COV_MIN_HARD=false), never enforce minimum coverage
   # - If explicitly set to true (K_SOUP_COV_MIN_HARD=true), always enforce minimum coverage
   # - If not set, defaults to IS_CI (enforce in CI, don't enforce locally)
-  if Kettle::Soup::Cover::Constants::MIN_COVERAGE_HARD
-    minimum_coverage(
-      branch: Kettle::Soup::Cover::Constants::MIN_COVERAGE_BRANCH,
-      line: Kettle::Soup::Cover::Constants::MIN_COVERAGE_LINE
-    )
-  end
+  Kettle::Soup::Cover::CoverageThresholds.configure!(self)
 end
 
 # Clean up stale resultset entries from prior runs before SimpleCov.start.

data/lib/kettle/soup/cover/constants.rb

@@ -76,6 +76,7 @@ module Kettle
         end
         MIN_COVERAGE_BRANCH = ENV_GET.call("MIN_BRANCH", "80").to_i
         MIN_COVERAGE_LINE = ENV_GET.call("MIN_LINE", "80").to_i
+        MIN_COVERAGE_STRICT = ENV_GET.call("MIN_STRICT", Constants::FALSE).casecmp?(Constants::TRUE)
         MULTI_FORMATTERS_DEFAULT = if IS_CI
           Constants::TRUE
         else
@@ -147,6 +148,7 @@ module Kettle
             MERGE_TIMEOUT
             MIN_COVERAGE_BRANCH
             MIN_COVERAGE_LINE
+            MIN_COVERAGE_STRICT
             MIN_COVERAGE_HARD
             MIN_COVERAGE_HARD_REQUESTED
             MULTI_FORMATTERS_DEFAULT

data/lib/kettle/soup/cover/coverage_thresholds.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module Kettle
+  module Soup
+    module Cover
+      # Applies the selected SimpleCov minimum coverage policy.
+      module CoverageThresholds
+        module_function
+
+        def configure!(configuration)
+          configure_strict_criteria!(configuration)
+          configure_minimum!(configuration) if Constants::MIN_COVERAGE_HARD
+        end
+
+        def configure_strict_criteria!(configuration)
+          return unless Constants::MIN_COVERAGE_STRICT
+
+          configuration.enable_coverage(:branch)
+          configuration.enable_coverage(:method)
+          if SimpleCov::Configuration.method_defined?(:coverage_for_eval_supported?) &&
+              configuration.coverage_for_eval_supported?
+            configuration.enable_coverage(:eval)
+          end
+        end
+
+        def configure_minimum!(configuration)
+          if Constants::MIN_COVERAGE_STRICT
+            configuration.minimum_coverage(line: 100, branch: 100, method: 100)
+          else
+            # SimpleCov's `minimum_coverage(hash)` replaces the whole minimums
+            # Hash, so merge into the minimums already configured (for example
+            # by the project's .simplecov) instead of dropping or lowering them.
+            configuration.minimum_coverage(
+              merge_minimum_coverage(
+                configuration.minimum_coverage,
+                branch: Constants::MIN_COVERAGE_BRANCH,
+                line: Constants::MIN_COVERAGE_LINE
+              )
+            )
+          end
+        end
+
+        # Merges minimums into minimums that are already configured.
+        #
+        # For each criterion the higher of the two values wins, so a minimum
+        # the project set itself is never lowered. Criteria only `existing`
+        # has, such as method coverage, are kept as they are.
+        #
+        # @param existing [Hash{Symbol => Numeric}] the current minimums, as
+        #   answered by SimpleCov's `minimum_coverage` reader (empty when
+        #   nothing is configured)
+        # @param minimums [Hash{Symbol => Numeric}] the minimums to merge in
+        # @return [Hash{Symbol => Numeric}] a new Hash (`existing` is left unmodified)
+        def merge_minimum_coverage(existing, minimums)
+          existing.merge(minimums) do |_criterion, current, minimum|
+            [current, minimum].compact.max
+          end
+        end
+      end
+    end
+  end
+end

data/lib/kettle/soup/cover/version.rb

@@ -6,7 +6,7 @@ module Kettle
       # Version namespace for this gem.
       module Version
         # Current gem version.
-        VERSION = "3.0.14"
+        VERSION = "3.0.15"
       end
       # Current gem version exposed at the traditional constant location.
       VERSION = Version::VERSION # Traditional Constant Location

data/lib/kettle/soup/cover.rb

@@ -29,6 +29,7 @@ require "stringio"
 require_relative "cover/constants"
 require_relative "cover/loaders"
 require_relative "cover/formatters"
+require_relative "cover/coverage_thresholds"
 require_relative "cover/version"
 
 module Kettle
@@ -105,12 +106,7 @@ module Kettle
 
             Kettle::Soup::Cover.configure_formatters!
 
-            if Constants::MIN_COVERAGE_HARD
-              minimum_coverage(
-                branch: Constants::MIN_COVERAGE_BRANCH,
-                line: Constants::MIN_COVERAGE_LINE
-              )
-            end
+            Kettle::Soup::Cover::CoverageThresholds.configure!(self)
           end
         end
 

metadata

@@ -1,10 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: kettle-soup-cover
 version: !ruby/object:Gem::Version
-  version: 3.0.14
+  version: 3.0.15
 platform: ruby
 authors:
 - Peter H. Boling
+- Erik Berlin
 bindir: exe
 cert_chain:
 - |
@@ -154,7 +155,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.16
+        version: 1.1.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -164,7 +165,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.16
+        version: 1.1.17
 - !ruby/object:Gem::Dependency
   name: kettle-dev
   requirement: !ruby/object:Gem::Requirement
@@ -248,7 +249,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -258,7 +259,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: appraisal2
   requirement: !ruby/object:Gem::Requirement
@@ -392,6 +393,7 @@ files:
 - lib/kettle/soup/cover.rb
 - lib/kettle/soup/cover/config.rb
 - lib/kettle/soup/cover/constants.rb
+- lib/kettle/soup/cover/coverage_thresholds.rb
 - lib/kettle/soup/cover/filters/gt_line_filter.rb
 - lib/kettle/soup/cover/filters/lt_line_filter.rb
 - lib/kettle/soup/cover/formatters.rb
@@ -407,10 +409,10 @@ licenses:
 - AGPL-3.0-only
 metadata:
   homepage_uri: https://kettle-soup-cover.galtzo.com/
-  source_code_uri: https://github.com/kettle-dev/kettle-soup-cover/tree/v3.0.14
-  changelog_uri: https://github.com/kettle-dev/kettle-soup-cover/blob/v3.0.14/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-soup-cover/tree/v3.0.15
+  changelog_uri: https://github.com/kettle-dev/kettle-soup-cover/blob/v3.0.15/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-soup-cover/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-soup-cover/3.0.14
+  documentation_uri: https://www.rubydoc.info/gems/kettle-soup-cover/3.0.15
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/kettle-dev/kettle-soup-cover/wiki
   news_uri: https://www.railsbling.com/tags/kettle-soup-cover