kettle-jem 7.1.21 → 7.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 683eb5054612a2b6b31db5e9edb84218e8f9af95a11683c873d1cc854412aa90
-  data.tar.gz: 7533b06602be3246bde2f16435a26e67cc01ae88b05e48d24af88de67b14655a
+  metadata.gz: 8a252bd3cf77adb0181517db1810fd56da1d4a7a7636ca931da5d678a91e3dc2
+  data.tar.gz: ab1773b86d3487522ab3b69ead5c74083f69a675d988135f284344ff248c11ab
 SHA512:
-  metadata.gz: 764654bb020c4b4cc10c38a18c27fc8fa59a15efcf90d51f0577fdb89bb94bb82a4bfd517162c32d4ea26d1c7f1a55a1f199123e2c793329e12c1e490e4c9cf6
-  data.tar.gz: 44d4ffb1f84faffb6172178cbb741bc97367a4da9b9d96fd9cbff41722d4cc8326dc3702a3de5834401229c2fe0080b736bfdc7666ff28b073e911b571512fbd
+  metadata.gz: b8ed892bad61aa16ef3d61acc4a06e8434a38884ba24381f38ee3f2910643a36812e3eb2bc3aa26c6b5ce8769753968e6d1e7aba712e774514cc239ea021c30c
+  data.tar.gz: aaa6bcd692fcaa6a83a6a87501142cb0761a01b8435d698980fe2519ff59cb2ab7eace9b81d0ee02336b457c0c91518ce503de980680896f60f57772341b621a

data/CHANGELOG.md

@@ -30,6 +30,19 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [7.1.22] - 2026-09-07
+
+- TAG: [v7.1.22][7.1.22t]
+- COVERAGE: 93.66% -- 11247/12008 lines in 16 files
+- BRANCH COVERAGE: 77.06% -- 4787/6212 branches in 16 files
+- 18.04% documented
+
+### Fixed
+
+- Reconcile managed template-tool dependency requirements in their existing declarations before template bootstrapping, and maintain their floors with kettle-jem-deps-floor.
+
+- Derive injected kettle-jem template requirements from VersionGem major, minor, and current version so releases cannot leave a stale self-dependency floor.
+
 ## [7.1.21] - 2026-09-07
 
 - TAG: [v7.1.21][7.1.21t]
@@ -1915,7 +1928,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.21...HEAD
+[Unreleased]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.22...HEAD
+[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
 [7.1.21t]: https://github.com/structuredmerge/structuredmerge-ruby/releases/tag/v7.1.21
 [7.1.20]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.19...v7.1.20

data/README.md

@@ -655,6 +655,26 @@ The `kettle:jem:*` rake tasks are internal targets used by the executable after
 it prepares the templating environment; call `kettle-jem` directly for normal
 templating work.
 
+### Template Dependency Transitions
+
+Before Bundler prepares a destination, `kettle-jem` reconciles its managed
+template-tool dependencies where they are already declared: the root Gemfile,
+root `*.gemfile` files, gemspecs, and modular Gemfile fragments. It updates the
+complete requirement set in place; it never moves a declaration, adds a missing
+dependency, or uses a local path as a compatibility fallback. A managed
+dependency with non-static version requirements is rejected before Bundler runs.
+
+The managed dependency registry is owned by `kettle-jem`. Run
+`kettle-jem-deps-floor --write` to raise its requirement floors together with
+the template dependency floors. The registry may declare a Ruby-version
+requirement, so a bootstrap only updates dependencies active for the current
+Ruby.
+
+`kettle-jem` itself is not a dependency floor. Generated templating Gemfiles
+derive its pessimistic requirement from `Kettle::Jem::Version.major` and
+`.minor`, and use the running full version as the minimum. This makes a major
+release emit the matching major requirement without a second version to update.
+
 ## 🔐 Security
 
 See [SECURITY.md][🔐security].
@@ -879,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-11.937-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-12.008-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/tasks/prepare_task.rb

@@ -12,6 +12,7 @@ module Kettle
         PREPARE_ONLY_PATHS = [
           Kettle::Jem::KETTLE_CONFIG_PATH,
           "Gemfile",
+          "*.gemspec",
           # Gemfile evaluates these fragments immediately.  Preparing only the
           # templating pair leaves a newly migrated project with references to
           # files that do not exist yet, so Bundler cannot perform the bootstrap.
@@ -36,6 +37,7 @@ module Kettle
             Kettle::Jem.apply_project(project_root, env: env, run_options: prepare_run_options)
           end
           report = merge_supplemental_prepare_report(report, supplemental_report)
+          transition_step = reconcile_template_managed_dependencies_step(project_root, events: events)
           nomono_bootstrap_step = normalize_existing_local_gemfile_bootstraps_step(project_root, events: events)
           setup_env = Kettle::Jem::Tasks::InstallTask.setup_command_env(project_root, env)
           setup_env["BUNDLE_DISABLE_CHECKSUM_VALIDATION"] = "true"
@@ -81,9 +83,10 @@ module Kettle
               %w[skipped succeeded].include?(reset_step.fetch(:status)) &&
               %w[skipped succeeded].include?(bundle_step.fetch(:status)),
             prepare_only: PREPARE_ONLY_PATHS,
-            prepare_steps: [profile_sync_step, nomono_bootstrap_step, reset_step, bootstrap_step, bundle_step].compact,
+            prepare_steps: [profile_sync_step, transition_step, nomono_bootstrap_step, reset_step, bootstrap_step, bundle_step].compact,
             changed_files: (
               report.fetch(:changed_files, []) +
+                transition_step.fetch(:changed_files, []) +
                 nomono_bootstrap_step.fetch(:changed_files, []) +
                 reset_step.fetch(:changed_files, []) +
                 bootstrap_step.fetch(:changed_files, []) +
@@ -136,6 +139,30 @@ module Kettle
           step
         end
 
+        def reconcile_template_managed_dependencies_step(project_root, events:)
+          paths = [
+            File.join(project_root.to_s, "Gemfile"),
+            *Dir.glob(File.join(project_root.to_s, "*.gemfile")),
+            *Dir.glob(File.join(project_root.to_s, "*.gemspec")),
+            *Dir.glob(File.join(project_root.to_s, "gemfiles/modular/**/*.gemfile"))
+          ].select { |path| File.file?(path) }.sort
+          changed_files = paths.filter_map do |path|
+            before = File.read(path)
+            after = Kettle::Jem.reconcile_template_managed_dependencies(before)
+            next if after == before
+
+            File.write(path, after)
+            Pathname.new(path).relative_path_from(Pathname.new(project_root.to_s)).to_s
+          end
+          step = {
+            name: "reconcile_template_managed_dependencies",
+            status: changed_files.empty? ? "already_current" : "applied",
+            changed_files: changed_files
+          }
+          Kettle::Jem.emit_step_event(events, "command_step", step, phase: "prepare")
+          step
+        end
+
         def reset_release_lockfiles_step(project_root:, setup_env:, quiet:, command_runner:, events:)
           if local_path_development_env?(setup_env)
             return {
@@ -191,7 +218,7 @@ module Kettle
         end
 
         def bundle_update_templating_bootstrap_command(project_root = Dir.pwd)
-          %w[bundle update] + CRITICAL_TEMPLATING_GEMS + locked_templating_gems(project_root)
+          %w[bundle update] + managed_bootstrap_gems(project_root) + locked_templating_gems(project_root)
         end
 
         def templating_bootstrap_command(project_root = Dir.pwd)
@@ -211,12 +238,33 @@ module Kettle
           return false unless File.file?(lock_path)
 
           locked_gem_names(project_root).then do |names|
-            CRITICAL_TEMPLATING_GEMS.all? { |gem_name| names.include?(gem_name) }
+            managed_bootstrap_gems(project_root).all? { |gem_name| names.include?(gem_name) }
           end
         rescue Bundler::LockfileError
           false
         end
 
+        def managed_bootstrap_gems(project_root)
+          declared = declared_managed_dependency_names(project_root)
+          (CRITICAL_TEMPLATING_GEMS + Kettle::Jem.template_bootstrap_dependency_names.select do |name|
+            declared.include?(name)
+          end).uniq
+        end
+
+        def declared_managed_dependency_names(project_root)
+          paths = [
+            File.join(project_root.to_s, "Gemfile"),
+            *Dir.glob(File.join(project_root.to_s, "*.gemfile")),
+            *Dir.glob(File.join(project_root.to_s, "*.gemspec")),
+            *Dir.glob(File.join(project_root.to_s, "gemfiles/modular/**/*.gemfile"))
+          ].select { |path| File.file?(path) }
+          paths.flat_map do |path|
+            Kettle::Jem.ruby_call_records(File.read(path), nil).filter_map do |call|
+              Kettle::Jem.ruby_string_argument(call) if Kettle::Jem.template_managed_dependency_call?(call)
+            end
+          end.uniq
+        end
+
         def bundle_install_after_bootstrap_step(project_root:, setup_env:, quiet:, command_runner:, events:, bootstrap_command:)
           if bootstrap_command == %w[bundle install]
             return {

data/lib/kettle/jem/templates/gemfiles/modular/templating.gemfile.example

@@ -18,7 +18,7 @@ end
 
 if structuredmerge_remote
   # Merge recipes for released installs.
-  gem "kettle-jem", ">= 7.0"
+  gem "kettle-jem", {KJ|KETTLE_JEM_DEPENDENCY_ARGUMENTS}
 end
 
 if kettle_remote

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.21"
+      VERSION = "7.1.22"
     end
     # Current gem version exposed at the traditional constant location.
     VERSION = Version::VERSION # Traditional Constant Location

data/lib/kettle/jem.rb

@@ -52,6 +52,19 @@ module Kettle
     GEMSPEC_DEPENDENCY_MINIMUM_REQUIREMENTS = {
       "rspec-stubbed_env" => ">= 1.0.6"
     }.freeze
+    # Template dependency transitions are location-independent. Prepare finds
+    # declarations in the destination and reconciles their complete requirement
+    # 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-changelog",
+        requirements: ["~> 1.0", ">= 1.0.7"],
+        bootstrap: true,
+        ruby_requirement: ">= 4.0.0"
+      }
+    ].freeze
     DEFAULT_GEMSPEC_METADATA_VALUES = {
       "allowed_push_host" => "TODO: Set to your gem server 'https://example.com'"
     }.freeze
@@ -5428,7 +5441,9 @@ module Kettle
     end
 
     def ensure_monorepo_root_gemfile_dependencies(content)
-      updated = ensure_trailing_newline(content.to_s.empty? ? %(source "https://gem.coop"\n) : content.to_s).dup
+      updated = reconcile_template_managed_dependencies(
+        ensure_trailing_newline(content.to_s.empty? ? %(source "https://gem.coop"\n) : content.to_s).dup
+      )
       monorepo_root_gemfile_dependency_lines.each do |line|
         next if gemfile_declares_gem?(updated, line.fetch(:name))
 
@@ -5445,7 +5460,7 @@ module Kettle
         {name: "kettle-dev", source: %(gem "kettle-dev", "~> 3.0", ">= 3.0.32"\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-jem", source: %(gem "kettle-jem", "~> 7.1", ">= 7.1.20"\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)},
         {name: "rspec", source: %(gem "rspec", "~> 3.0"\n)},
@@ -5469,6 +5484,17 @@ module Kettle
       end
     end
 
+    def kettle_jem_dependency_requirements(version_module: Version)
+      require_relative "jem/version_gem" unless version_module.respond_to?(:major)
+
+      ["~> #{version_module.major}.#{version_module.minor}", ">= #{version_module::VERSION}"]
+    end
+
+    def kettle_jem_dependency_source(version_module: Version)
+      requirements = kettle_jem_dependency_requirements(version_module: version_module)
+      %(gem #{PACKAGE_NAME.inspect}, #{requirements.map(&:inspect).join(", ")}\n)
+    end
+
     def gemspec_path_declares_gem?(path, gem_name)
       normalized_path = path.to_s.delete_suffix("/")
       normalized_path == "gems/#{gem_name}"
@@ -9889,6 +9915,76 @@ module Kettle
       end
     end
 
+    def template_managed_dependency(name)
+      TEMPLATE_MANAGED_DEPENDENCIES.find { |dependency| dependency.fetch(:name) == name.to_s }
+    end
+
+    def template_managed_dependency_requirements(name, version_module: Version)
+      return kettle_jem_dependency_requirements(version_module: version_module) if name.to_s == PACKAGE_NAME
+
+      template_managed_dependency(name)&.fetch(:requirements)
+    end
+
+    def template_managed_dependency_names(bootstrap: nil, ruby_version: RUBY_VERSION)
+      TEMPLATE_MANAGED_DEPENDENCIES.filter_map do |dependency|
+        next if !bootstrap.nil? && dependency.fetch(:bootstrap) != bootstrap
+        next unless template_managed_dependency_active?(dependency, ruby_version)
+
+        dependency.fetch(:name)
+      end
+    end
+
+    def template_bootstrap_dependency_names(ruby_version: RUBY_VERSION)
+      ([PACKAGE_NAME] + template_managed_dependency_names(bootstrap: true, ruby_version: ruby_version)).uniq
+    end
+
+    def template_managed_dependency_active?(dependency, ruby_version = RUBY_VERSION)
+      requirement = dependency[:ruby_requirement]
+      return true unless requirement
+
+      Gem::Requirement.new(requirement).satisfied_by?(Gem::Version.new(ruby_version))
+    end
+
+    def reconcile_template_managed_dependencies(source)
+      replacements = ruby_call_records(source, nil).filter_map do |call|
+        next unless template_managed_dependency_call?(call)
+
+        name = ruby_string_argument(call)
+        requirements = template_managed_dependency_requirements(name)
+        next unless requirements
+
+        requirement_nodes = Array(call.arguments&.arguments).drop(1).reject do |argument|
+          argument.is_a?(::Prism::KeywordHashNode)
+        end
+        if requirement_nodes.empty?
+          raise Error, "Managed template dependency #{name} must use static version requirements"
+        end
+        requirement_nodes.each do |argument|
+          value = ruby_static_string_value(argument)
+          next if value && Gem::Requirement::OPS.keys.any? { |operator| value.start_with?(operator) }
+
+          raise Error, "Managed template dependency #{name} must use static version requirements"
+        end
+
+        expected = requirements
+        current = requirement_nodes.map { |argument| ruby_static_string_value(argument) }
+        next if current == expected
+
+        {
+          start_offset: requirement_nodes.first.location.start_offset,
+          end_offset: requirement_nodes.last.location.end_offset,
+          replacement: expected.map { |requirement| JSON.generate(requirement) }.join(", ")
+        }
+      end
+      replace_source_offsets(source, replacements)
+    end
+
+    def template_managed_dependency_call?(call)
+      return call.receiver.nil? && call.name == :gem if call.name == :gem
+
+      %i[add_dependency add_runtime_dependency add_development_dependency].include?(call.name)
+    end
+
     def ruby_keyword_string_argument(call, key)
       keyword_hash = Array(call&.arguments&.arguments).find { |argument| argument.is_a?(::Prism::KeywordHashNode) }
       assoc = keyword_hash&.elements&.find do |element|
@@ -14341,7 +14437,7 @@ module Kettle
               root: ["src", "my", "kettle-dev"]
             )
           elsif Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("4.0.0")
-            gem "kettle-changelog", "~> 1.0", ">= 1.0.7"
+            gem "kettle-changelog", #{template_managed_dependency("kettle-changelog").fetch(:requirements).map(&:inspect).join(", ")}
           end
         end
       RUBY
@@ -15035,6 +15131,7 @@ module Kettle
       compact_hash(
         freeze_token: config.dig("defaults", "freeze_token").to_s.empty? ? "kettle-jem" : config.dig("defaults", "freeze_token").to_s,
         kettle_jem_version: VERSION,
+        kettle_jem_dependency_arguments: kettle_jem_dependency_requirements.map(&:inspect).join(", "),
         template_run_date: run_timestamp.strftime("%Y-%m-%d"),
         template_run_year: run_timestamp.year.to_s,
         kettle_dev_local_gems: kettle_dev_local_gems(config),
@@ -15358,6 +15455,7 @@ module Kettle
       {
         "KJ|FREEZE_TOKEN" => project_runtime[:freeze_token].to_s,
         "KJ|KETTLE_JEM_VERSION" => project_runtime[:kettle_jem_version].to_s,
+        "KJ|KETTLE_JEM_DEPENDENCY_ARGUMENTS" => project_runtime[:kettle_jem_dependency_arguments].to_s,
         "KJ|TEMPLATE_RUN_DATE" => project_runtime[:template_run_date].to_s,
         "KJ|TEMPLATE_RUN_YEAR" => project_runtime[:template_run_year].to_s,
         "KJ|KETTLE_DEV_LOCAL_GEMS" => project_runtime[:kettle_dev_local_gems].to_s,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-jem
 version: !ruby/object:Gem::Version
-  version: 7.1.21
+  version: 7.1.22
 platform: ruby
 authors:
 - Peter H. Boling
@@ -976,10 +976,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.21
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.21/CHANGELOG.md
+  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
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-jem/7.1.21
+  documentation_uri: https://www.rubydoc.info/gems/kettle-jem/7.1.22
   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