kettle-jem 7.1.23 → 7.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b44bfaa2d3dc87b533330ef926a348487a57912fcd4f5c3c75f2f39b5f3d6f0
-  data.tar.gz: a42faa5fb58ce8fc630dacebbd9c7cabd75641791236fb405a4471accf7e0b7b
+  metadata.gz: 5e183814ce90643b2d4e1ba747c57730aec7a1fe2c4a07721495a3fc22cdb0b5
+  data.tar.gz: 9d0f017241c7ba8bb6061eb9408dd2f61145349219f518a04a6023a98900d75f
 SHA512:
-  metadata.gz: 0f692b668c282c7657c5af5bfb3de195d996d2f9eda582b8bb55ee39ed9d31a863b66fd17b82b75925ed949092336d5e74a66539a7d4a9efd91974b0ec4c5bb3
-  data.tar.gz: 0f7d11313e632476917ee8b3a4afd492998d82f9bd8c8535a6e195cb5185c8caa167f5fd2ac295cb0e0f28a4d7e86443b47e054faba8488825213185d6206377
+  metadata.gz: 1dc4f69e46b0819d491b897ee6fa078fbe44f6eee3ae8b131121c2a3f997610a76c86acbdc9d65a1645ea67540663e2daab17a2d0ba7dee2ba769878364f8ddc
+  data.tar.gz: bd375240be6f8bebfe334e3138a74dfc7d5f32d4c77747f90745feb2527f086e4b4a49e324f78088b48e400e243c387e43d3fb241cbdfe4b594792874061ff47

data/CHANGELOG.md

@@ -30,6 +30,26 @@ 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]
@@ -1950,7 +1970,9 @@ 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.23...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

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.013-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/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/version.rb

@@ -5,7 +5,7 @@ module Kettle
     # Version namespace for this gem.
     module Version
       # Current gem version.
-      VERSION = "7.1.23"
+      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"
@@ -1422,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
@@ -5466,7 +5467,7 @@ module Kettle
         {name: "bundler-audit", source: %(gem "bundler-audit", "~> 0.9.3"\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)},
@@ -7977,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
@@ -10692,7 +10693,6 @@ 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,
@@ -11086,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 }
@@ -15502,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.23
+  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
@@ -996,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.23
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.23/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.23
+  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