kettle-jem 7.1.22 → 7.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a252bd3cf77adb0181517db1810fd56da1d4a7a7636ca931da5d678a91e3dc2
-  data.tar.gz: ab1773b86d3487522ab3b69ead5c74083f69a675d988135f284344ff248c11ab
+  metadata.gz: 5e183814ce90643b2d4e1ba747c57730aec7a1fe2c4a07721495a3fc22cdb0b5
+  data.tar.gz: 9d0f017241c7ba8bb6061eb9408dd2f61145349219f518a04a6023a98900d75f
 SHA512:
-  metadata.gz: b8ed892bad61aa16ef3d61acc4a06e8434a38884ba24381f38ee3f2910643a36812e3eb2bc3aa26c6b5ce8769753968e6d1e7aba712e774514cc239ea021c30c
-  data.tar.gz: aaa6bcd692fcaa6a83a6a87501142cb0761a01b8435d698980fe2519ff59cb2ab7eace9b81d0ee02336b457c0c91518ce503de980680896f60f57772341b621a
+  metadata.gz: 1dc4f69e46b0819d491b897ee6fa078fbe44f6eee3ae8b131121c2a3f997610a76c86acbdc9d65a1645ea67540663e2daab17a2d0ba7dee2ba769878364f8ddc
+  data.tar.gz: bd375240be6f8bebfe334e3138a74dfc7d5f32d4c77747f90745feb2527f086e4b4a49e324f78088b48e400e243c387e43d3fb241cbdfe4b594792874061ff47

data/CHANGELOG.md

@@ -30,6 +30,48 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [7.1.24] - 2026-09-08
+
+- TAG: [v7.1.24][7.1.24t]
+- COVERAGE: 93.66% -- 11248/12010 lines in 16 files
+- BRANCH COVERAGE: 77.04% -- 4786/6212 branches in 16 files
+- 18.14% documented
+
+### Changed
+
+- [kc] kettle-jem-deps-floor: Update kettle-jem template dependency floors:
+  - kettle-family (>= 1.2.95 -> >= 1.2.96)
+
+### Fixed
+
+- Preserve destination README Advanced Usage sections and their reference definitions during template merges.
+
+- [kc] kettle-jem/template-destination-preservation: Preserve destination Markdown, retain the required version_gem runtime dependency for dedicated entrypoints, and rebuild RuboCop Gradual work lists after template dependency and style-rule updates.
+
+- Rebuild the RuboCop Gradual work list after templating so generated-code, dependency, and rubocop-lts updates cannot retain stale cop names or locations.
+
+## [7.1.23] - 2026-09-07
+
+- TAG: [v7.1.23][7.1.23t]
+- COVERAGE: 93.66% -- 11251/12013 lines in 16 files
+- BRANCH COVERAGE: 77.07% -- 4789/6214 branches in 16 files
+- 18.13% documented
+
+### Changed
+
+- [kc] kettle-jem-deps-floor: Update kettle-jem template dependency floors:
+  - kettle-dev (>= 3.0.32 -> >= 3.0.33)
+
+### Fixed
+
+- Externalize active template tooling from gemspecs, remove legacy gem-release declarations from managed Gemfiles and gemspecs, and enforce self-test divergence thresholds inclusively.
+
+- Load Bundler before JSON in maintenance executables so Ruby 4 default JSON activation cannot conflict with the project bundle.
+
+- Declare JSON v2 as a Kettle Jem development dependency for repository-local maintenance executables.
+
+- Keep managed dependency reconciliation specs aligned with their declared requirements.
+
 ## [7.1.22] - 2026-09-07
 
 - TAG: [v7.1.22][7.1.22t]
@@ -1928,7 +1970,11 @@ Please file a bug if you notice a violation of semantic versioning.
 - Released kettle-jem as part of the initial StructuredMerge Ruby 7.0.0 gem set.
 - Included packaged templates and parser-backed merge support for Ruby gem templating.
 
-[Unreleased]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.22...HEAD
+[Unreleased]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.24...HEAD
+[7.1.24]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.23...v7.1.24
+[7.1.24t]: https://github.com/structuredmerge/structuredmerge-ruby/releases/tag/v7.1.24
+[7.1.23]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.22...v7.1.23
+[7.1.23t]: https://github.com/structuredmerge/structuredmerge-ruby/releases/tag/v7.1.23
 [7.1.22]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.21...v7.1.22
 [7.1.22t]: https://github.com/structuredmerge/structuredmerge-ruby/releases/tag/v7.1.22
 [7.1.21]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.20...v7.1.21

data/README.md

@@ -899,7 +899,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-12.008-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-12.010-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
 [🔐security]: https://github.com/structuredmerge/structuredmerge-ruby/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/jem/maintenance_changelog.rb

@@ -90,7 +90,8 @@ module Kettle
       def record_template_run(project_root:, report:, run_options: {}, label: "Apply kettle-jem templates")
         report = report.to_h
         if template_changelog_disabled?(run_options) || bootstrap_only_report?(report)
-          return report.merge(changelog: {status: "skipped", reason: template_changelog_disabled?(run_options) ? "disabled" : "bootstrap_only"})
+          reason = template_changelog_disabled?(run_options) ? "disabled" : "bootstrap_only"
+          return report.merge(changelog: {status: "skipped", reason: reason})
         end
 
         changed_files = template_changed_files(report.fetch(:changed_files, []))

data/lib/kettle/jem/tasks/install_task.rb

@@ -889,7 +889,6 @@ module Kettle
               reason: "missing_rubocop_gradual_task"
             }
           end
-
           {
             name: "rubocop_gradual_autocorrect",
             command: rubocop_gradual_autocorrect_command,
@@ -899,6 +898,9 @@ module Kettle
         end
 
         def rubocop_gradual_autocorrect_command
+          # Templating can change generated code, dependency floors, and the
+          # RuboCop/RuboCop-LTS rule set. Rebuild Gradual's work list from the
+          # resulting project instead of carrying stale cop names or locations.
           ["sh", "-c", "rm -f .rubocop_gradual.lock && bin/rake rubocop_gradual:autocorrect"]
         end
 

data/lib/kettle/jem/tasks/self_test_task.rb

@@ -79,8 +79,8 @@ module Kettle
             min_divergence_threshold: threshold,
             drift: drift
           }
-          if threshold && divergence > threshold
-            raise Kettle::Jem::Error, "selftest divergence #{divergence}% exceeds threshold #{threshold}%"
+          if threshold && divergence >= threshold
+            raise Kettle::Jem::Error, "selftest divergence #{divergence}% reaches or exceeds threshold #{threshold}%"
           end
           result
         end

data/lib/kettle/jem/templates/CONTRIBUTING.md.example

@@ -196,6 +196,8 @@ bundle exec rake rubocop_gradual:autocorrect
 
 For more detailed information about using RuboCop in this project, please see the [RUBOCOP.md](RUBOCOP.md) guide. This project uses `rubocop_gradual` instead of vanilla RuboCop, which requires specific commands for checking violations.
 
+Kettle Jem resets `.rubocop_gradual.lock` before its post-template autocorrect step. Template and dependency updates, including updates to the `rubocop-lts` suite, can change the applicable cops; the regenerated lock is the current work list, not a preserved baseline.
+
 ### Important: Do not add inline RuboCop disables
 
 Never add `# rubocop:disable ...` / `# rubocop:enable ...` comments to code or specs (except when following the few existing `rubocop:disable` patterns for a rule already being disabled elsewhere in the code). Instead:

data/lib/kettle/jem/templates/RUBOCOP.md.example

@@ -29,6 +29,8 @@ bundle exec rake rubocop_gradual:check
 
 The `.rubocop_gradual.lock` file is a work list, not a permanent baseline. Every entry represents a style issue that should be resolved by either fixing the code or making an intentional exception explicit.
 
+Kettle Jem deletes this work list before its post-template `rubocop_gradual:autocorrect` step. Templating can update generated code and dependencies, including the `rubocop-lts` suite, which can add, remove, or rename cops. Rebuilding the work list against the resulting project prevents stale cop names and locations from masking the current style state.
+
 This allows the team to:
 
 1. Prevent new violations while existing issues are handled deliberately

data/lib/kettle/jem/templates/gem.gemspec.example

@@ -118,7 +118,7 @@ Gem::Specification.new do |spec|
   #       and preferably a modular one (see gemfiles/modular/*.gemfile).
 
   # Dev, Test, & Release Tasks
-  spec.add_development_dependency("kettle-dev", "~> 3.0", ">= 3.0.32")             # ruby >= {KJ|MIN_TEST_RUBY}
+  spec.add_development_dependency("kettle-dev", "~> 3.0", ">= 3.0.33")             # ruby >= {KJ|MIN_TEST_RUBY}
 
   # Security
   spec.add_development_dependency("bundler-audit", "~> 0.9.3")                      # ruby >= 2.0.0

data/lib/kettle/jem/templates/shim/gem.gemspec.example

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "{KJ|SHIMMED_GEM_NAME}"
 
   # Dev, Test, & Release Tasks
-  spec.add_development_dependency("kettle-dev", "~> 3.0", ">= 3.0.32")             # ruby >= {KJ|MIN_TEST_RUBY}
+  spec.add_development_dependency("kettle-dev", "~> 3.0", ">= 3.0.33")             # ruby >= {KJ|MIN_TEST_RUBY}
 
   # Tasks
   spec.add_development_dependency "rake", "~> 13.0"

data/lib/kettle/jem/version.rb

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

data/lib/kettle/jem.rb

@@ -17,6 +17,7 @@ require "token/resolver"
 require "yaml"
 require "ast/merge"
 require "ast/crispr/markdown/markly"
+require "markdown/merge"
 require "kettle/ndjson"
 require "rbs"
 require "kettle/dev"
@@ -57,7 +58,7 @@ module Kettle
     # set in place before Bundler is allowed to evaluate that destination.
     TEMPLATE_MANAGED_DEPENDENCIES = [
       {name: "nomono", requirements: ["~> 1.1", ">= 1.1.5"], bootstrap: true},
-      {name: "kettle-dev", requirements: ["~> 3.0", ">= 3.0.32"], bootstrap: true},
+      {name: "kettle-dev", requirements: ["~> 3.0", ">= 3.0.33"], bootstrap: true},
       {
         name: "kettle-changelog",
         requirements: ["~> 1.0", ">= 1.0.7"],
@@ -89,7 +90,13 @@ module Kettle
     ].freeze
     DEFAULT_ENGINES = %w[ruby jruby truffleruby].freeze
     DEFAULT_OPENCOLLECTIVE_ORG = "galtzo-floss"
-    RETIRED_GEMSPEC_DEVELOPMENT_DEPENDENCIES = %w[kettle-drift kettle-soup-cover rubocop-rspec yard-junk].freeze
+    # These tools remain active, but their dependency ownership belongs to the
+    # generated modular Gemfiles rather than a destination gemspec.
+    EXTERNALIZED_GEMSPEC_DEVELOPMENT_DEPENDENCIES = %w[kettle-drift kettle-soup-cover rubocop-rspec yard-junk].freeze
+    # These legacy release tools must not be retained in any managed dependency
+    # declaration. Kettle Dev owns release workflows.
+    PROHIBITED_GEMSPEC_DEPENDENCIES = %w[gem-release].freeze
+    PROHIBITED_GEMFILE_DEPENDENCIES = PROHIBITED_GEMSPEC_DEPENDENCIES.freeze
     FILE_DELETION_PRIMITIVES = %w[
       supplied_obsolete_file_deletion
       supplied_opt_in_workflow_deletion
@@ -1416,7 +1423,7 @@ module Kettle
         end
       end
     end
-    README_DEFAULT_PRESERVE_SECTIONS = ["synopsis", "configuration", "basic usage"].freeze
+    README_DEFAULT_PRESERVE_SECTIONS = ["synopsis", "configuration", "basic usage", "advanced usage"].freeze
     README_DEFAULT_PRESERVE_PATTERNS = ["note:*"].freeze
     README_CODETRIAGE_BADGE = "[![Open Source Helpers][👽oss-helpi]][👽oss-help]"
     README_CODETRIAGE_LINK_LABELS = ["👽oss-help", "👽oss-helpi"].freeze
@@ -5444,6 +5451,7 @@ module Kettle
       updated = reconcile_template_managed_dependencies(
         ensure_trailing_newline(content.to_s.empty? ? %(source "https://gem.coop"\n) : content.to_s).dup
       )
+      updated = remove_gemfile_dependency_blocks(updated, PROHIBITED_GEMFILE_DEPENDENCIES)
       monorepo_root_gemfile_dependency_lines.each do |line|
         next if gemfile_declares_gem?(updated, line.fetch(:name))
 
@@ -5457,9 +5465,9 @@ module Kettle
       [
         {name: "appraisal2", source: %(gem "appraisal2", "~> 3.2", ">= 3.2.3"\n)},
         {name: "bundler-audit", source: %(gem "bundler-audit", "~> 0.9.3"\n)},
-        {name: "kettle-dev", source: %(gem "kettle-dev", "~> 3.0", ">= 3.0.32"\n)},
+        {name: "kettle-dev", source: %(gem "kettle-dev", "~> 3.0", ">= 3.0.33"\n)},
         {name: "kettle-drift", source: %(gem "kettle-drift", "~> 1.0", ">= 1.0.13"\n)},
-        {name: "kettle-family", source: %(gem "kettle-family", "~> 1.2", ">= 1.2.95"\n)},
+        {name: "kettle-family", source: %(gem "kettle-family", "~> 1.2", ">= 1.2.96"\n)},
         {name: PACKAGE_NAME, source: kettle_jem_dependency_source},
         {name: "kettle-test", source: %(gem "kettle-test", "~> 2.0", ">= 2.0.21"\n)},
         {name: "rake", source: %(gem "rake", "~> 13.0"\n)},
@@ -7970,7 +7978,7 @@ module Kettle
       when :markdown
         return merge_changelog_template_source(template_content, destination_content, facts: facts) if recipe.fetch(:target_path) == "CHANGELOG.md"
 
-        return template_content
+        merge_result = Markdown::Merge.merge_markdown(template_content, destination_content, "markdown")
       when :dotenv
         merge_result = merge_dotenv_template_source(template_content, destination_content, recipe)
       when :rbs
@@ -9375,7 +9383,7 @@ module Kettle
 
     def merge_gemfile_template_policy(content, facts:, template_content: nil, preserve_self_word_entries: false)
       package_name = facts.dig(:package, :name).to_s if facts
-      removable_gems = ["appraisal"]
+      removable_gems = ["appraisal", *PROHIBITED_GEMFILE_DEPENDENCIES]
       removable_gems << package_name unless package_name.to_s.empty?
       removable_gems.concat(package_runtime_dependency_names(facts))
       removable_gems << "version_gem" unless version_gem_enabled?(facts)
@@ -10685,7 +10693,11 @@ module Kettle
         receiver: template_receiver,
         template_declares_version_gem: gemspec_dependency_names(template_content).include?("version_gem")
       )
-      merged = remove_gemspec_version_gem_dependency_when_non_default_entrypoint(merged, facts, receiver: template_receiver)
+      merged = remove_gemspec_dependency_lines(
+        merged,
+        receiver: template_receiver,
+        names: PROHIBITED_GEMSPEC_DEPENDENCIES
+      )
       # Yard owns the documentation dependency graph. A direct gemspec rdoc
       # development dependency creates an unnecessary second owner and can
       # conflict with the documentation modular Gemfile.
@@ -11074,13 +11086,6 @@ module Kettle
       facts.to_h.dig(:version_gem, :enabled) == false
     end
 
-    def remove_gemspec_version_gem_dependency_when_non_default_entrypoint(content, facts, receiver:)
-      return content unless facts.to_h.dig(:version_gem, :non_default_entrypoint)
-
-      cleaned = remove_gemspec_dependency_lines(content, receiver: receiver, names: ["version_gem"], runtime_only: true)
-      remove_ruby_comment_lines_containing(cleaned, "version_gem")
-    end
-
     def remove_gemspec_assignment(content, receiver:, field:)
       records_by_line = gemspec_assignment_records(content, receiver: receiver)
         .select { |record| record.fetch(:field) == field.to_s }
@@ -11823,7 +11828,7 @@ module Kettle
           enforce_gemspec_dependency_minimum_requirements(normalized, receiver: template_receiver)
         end
       destination_dependencies = destination_dependencies.reject do |key, _source|
-        retired_gemspec_development_dependency_key?(key)
+        excluded_gemspec_dependency_key?(key)
       end
       return template_content if destination_dependencies.empty?
 
@@ -12223,9 +12228,11 @@ module Kettle
       [record.fetch(:kind), record.fetch(:name)]
     end
 
-    def retired_gemspec_development_dependency_key?(key)
+    def excluded_gemspec_dependency_key?(key)
+      return true if PROHIBITED_GEMSPEC_DEPENDENCIES.include?(key.last)
+
       key.first == "add_development_dependency" &&
-        RETIRED_GEMSPEC_DEVELOPMENT_DEPENDENCIES.include?(key.last)
+        EXTERNALIZED_GEMSPEC_DEVELOPMENT_DEPENDENCIES.include?(key.last)
     end
 
     def gemspec_dependency_source_newer?(candidate_source, current_source, receiver:)
@@ -15488,7 +15495,7 @@ module Kettle
     def main_gemfile_kettle_family_gem(package_name)
       return "" if package_name.to_s == "kettle-family"
 
-      %(gem "kettle-family", "~> 1.2", ">= 1.2.95"\n)
+      %(gem "kettle-family", "~> 1.2", ">= 1.2.96"\n)
     end
 
     def main_gemfile_nomono_bootstrap(package_name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-jem
 version: !ruby/object:Gem::Version
-  version: 7.1.22
+  version: 7.1.24
 platform: ruby
 authors:
 - Peter H. Boling
@@ -559,6 +559,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 7.1.8
+- !ruby/object:Gem::Dependency
+  name: version_gem
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.15
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.15
 - !ruby/object:Gem::Dependency
   name: yaml-merge
   requirement: !ruby/object:Gem::Requirement
@@ -593,6 +613,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.3
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.21.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.21.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -976,10 +1016,10 @@ licenses:
 - PolyForm-Small-Business-1.0.0
 metadata:
   homepage_uri: https://structuredmerge.org
-  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.22
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.22/CHANGELOG.md
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.24
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.24/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-jem/7.1.22
+  documentation_uri: https://www.rubydoc.info/gems/kettle-jem/7.1.24
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/structuredmerge/structuredmerge-ruby/wiki
   news_uri: https://www.railsbling.com/tags/kettle-jem