kettle-jem 7.1.32 → 7.1.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f62f4e109608570afb3659b7ae9f191b89f8f2ca51e6575035df53d3849f02d8
-  data.tar.gz: 578cbde7471209ad1623eb3b274a6eac38f66ed605aa783b3e7021a79da751fe
+  metadata.gz: 0331126c9cd143dae738734bcfb54afe39ff65800a0c342260d3c1482f88f94d
+  data.tar.gz: d44de2c4ab2afc8b784e5e9eabc5f4c1b3ec1735033f361437dc33a9980d104c
 SHA512:
-  metadata.gz: a84de8dbff686176ce7cb9e6a0ded538a1cc675f3246488f22939bd4adcf222ab618ff76c34739e9df6aae86d904778e73283b08df73934c5744d8d90098285c
-  data.tar.gz: 860ee1f3bc66069a5e880c40cb35a3eed9485fd4cb2454c07632bad5c401397ae38d07fa2bb7dc9949d0f59c2f97db36b2e64e710db61b509b7a4d0d3c105ec0
+  metadata.gz: c2e9a4edcbcbf0a12f6494858fd9c5479116f44326164dbc4769719b5e87fd350d57894cea9b509b04ba5e3989100bef7dfc4cd52ddc42d40042309633f94e62
+  data.tar.gz: 37db58e793e5632632ec72f0d7cdd518d8bda2f29ad0937871030bde4061a1daa1d05941f4d4dd84655263be38c88c0dc9d64d7ffe491cd8eef6000161e8f9f0

data/CHANGELOG.md

@@ -30,6 +30,24 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [7.1.33] - 2026-10-19
+
+- TAG: [v7.1.33][7.1.33t]
+- COVERAGE: 93.42% -- 11362/12162 lines in 17 files
+- BRANCH COVERAGE: 77.04% -- 4891/6349 branches in 17 files
+- 19.80% documented
+
+### Added
+
+- Version gate for local gemfile wiring: _local.gemfile now declares local_gem_requirements from the same template facts style.gemfile uses (KJ|RUBOCOP_LTS_CONSTRAINT, KJ|RUBOCOP_RUBY_CONSTRAINT) and path-wires a local gem only when its checkout version satisfies the requirement; unsatisfied checkouts fall back to the registry declaration. ensure_local_gem_requirements_from_template re-injects the hash after the AST merge, which drops hash assignments absent from the destination.
+
+### Changed
+
+- [kc] kettle-jem-deps-floor: Update kettle-jem template dependency floors:
+  - kettle-changelog (>= 1.0.12 -> >= 1.0.13)
+  - kettle-dev (>= 3.1.15 -> >= 3.1.18)
+  - kettle-family (>= 1.3.11 -> >= 1.3.22)
+
 ## [7.1.32] - 2026-10-17
 
 - TAG: [v7.1.32][7.1.32t]
@@ -2300,7 +2318,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.32...HEAD
+[Unreleased]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.33...HEAD
+[7.1.33]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.32...v7.1.33
+[7.1.33t]: https://github.com/structuredmerge/structuredmerge-ruby/releases/tag/v7.1.33
 [7.1.32]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.31...v7.1.32
 [7.1.32t]: https://github.com/structuredmerge/structuredmerge-ruby/releases/tag/v7.1.32
 [7.1.31]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.30...v7.1.31

data/README.md

@@ -807,7 +807,7 @@ If none of the available licenses suit your use case, please [contact us](mailto
 [📌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.125-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-12.162-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/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.1", ">= 3.1.15")             # ruby >= {KJ|MIN_TEST_RUBY}
+  spec.add_development_dependency("kettle-dev", "~> 3.1", ">= 3.1.18")             # ruby >= {KJ|MIN_TEST_RUBY}
 
   # Security
   spec.add_development_dependency("bundler-audit", "~> 0.9.3")                      # ruby >= 2.0.0

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

@@ -8,9 +8,51 @@
 
 {KJ|LOCAL_GEMFILE_NOMONO_BOOTSTRAP}
 
+# Requirements for local gems (must match the declarations in style.gemfile).
+# Only gems whose local checkout version satisfies the requirement will be
+# path-wired; others fall back to the registry declaration in style.gemfile.
+local_gem_requirements = {
+  "rubocop-lts" => [{KJ|RUBOCOP_LTS_CONSTRAINT}],
+  "rubocop-lts-rspec" => ["~> 1.0", ">= 1.0.7"],
+  "{KJ|RUBOCOP_RUBY_GEM}" => [{KJ|RUBOCOP_RUBY_CONSTRAINT}],
+  "standard-rubocop-lts" => ["~> 2.0", ">= 2.0.14"],
+}
+
 local_gems = %w[rubocop-lts rubocop-lts-rspec {KJ|RUBOCOP_RUBY_GEM} standard-rubocop-lts]
 declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name)
-local_gems_to_eval = local_gems - %w[{KJ|PACKAGE_NAME}] - declared_gems
+
+# Filter local_gems: only include gems whose local checkout version satisfies
+# the declared requirement. Unsatisfied gems fall back to the registry.
+def local_gem_satisfies?(gem_name, requirements, dev_root)
+  return false unless dev_root && File.directory?(dev_root)
+
+  # Resolve the actual gem name (handle token substitution)
+  actual_name = gem_name.dup
+  actual_name = ENV["RUBOCOP_RUBY_GEM"] if gem_name == "{KJ|RUBOCOP_RUBY_GEM}"
+  return false if actual_name.nil? || actual_name.empty?
+
+  # Find the gemspec
+  gemspec_path = Dir.glob(File.join(dev_root, actual_name, "*.gemspec")).first
+  return false unless gemspec_path && File.file?(gemspec_path)
+
+  # Parse version from gemspec
+  spec = Gem::Specification.load(gemspec_path)
+  return false unless spec && spec.version
+
+  # Check if version satisfies all requirements
+  requirements.all? do |req|
+    Gem::Requirement.new(req).satisfied_by?(spec.version)
+  end
+rescue => e
+  warn "Warning: could not check local version for #{gem_name}: #{e.message}"
+  false
+end
+
+dev_root = ENV["RUBOCOP_LTS_DEV"]
+local_gems_to_eval = local_gems.select do |gem|
+  reqs = local_gem_requirements[gem]
+  reqs && local_gem_satisfies?(gem, reqs, dev_root)
+end - %w[{KJ|PACKAGE_NAME}] - declared_gems
 
 # The generated RuboCop config loads this plugin in both local and released
 # style modes, so the local bundle must provide it too.
@@ -29,4 +71,4 @@ platform :mri do
     debug_env: "RUBOCOP_LTS_DEBUG",
     root: ["src", "my", "rubocop-lts"]
   )
-end
+end

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.1", ">= 3.1.15")             # ruby >= {KJ|MIN_TEST_RUBY}
+  spec.add_development_dependency("kettle-dev", "~> 3.1", ">= 3.1.18")             # 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.32"
+      VERSION = "7.1.33"
     end
     # Current gem version exposed at the traditional constant location.
     VERSION = Version::VERSION # Traditional Constant Location

data/lib/kettle/jem.rb

@@ -63,10 +63,10 @@ module Kettle
     TEMPLATE_MANAGED_DEPENDENCIES = [
       {name: PACKAGE_NAME, requirements: ["~> 7.1", ">= 7.1.28"], bootstrap: false},
       {name: "nomono", requirements: ["~> 1.1", ">= 1.1.8"], bootstrap: true},
-      {name: "kettle-dev", requirements: ["~> 3.1", ">= 3.1.15"], bootstrap: true},
+      {name: "kettle-dev", requirements: ["~> 3.1", ">= 3.1.18"], bootstrap: true},
       {
         name: "kettle-changelog",
-        requirements: ["~> 1.0", ">= 1.0.12"],
+        requirements: ["~> 1.0", ">= 1.0.13"],
         bootstrap: true,
         ruby_requirement: ">= 4.0.0"
       }
@@ -5120,9 +5120,9 @@ module Kettle
       [
         {name: "appraisal2", source: %(gem "appraisal2", "~> 3.2", ">= 3.2.5"\n)},
         {name: "bundler-audit", source: %(gem "bundler-audit", "~> 0.9.3"\n)},
-        {name: "kettle-dev", source: %(gem "kettle-dev", "~> 3.1", ">= 3.1.15"\n)},
+        {name: "kettle-dev", source: %(gem "kettle-dev", "~> 3.1", ">= 3.1.18"\n)},
         {name: "kettle-drift", source: %(gem "kettle-drift", "~> 1.0", ">= 1.0.17"\n)},
-        {name: "kettle-family", source: %(gem "kettle-family", "~> 1.3", ">= 1.3.11"\n)},
+        {name: "kettle-family", source: %(gem "kettle-family", "~> 1.3", ">= 1.3.22"\n)},
         {name: PACKAGE_NAME, source: kettle_jem_dependency_source},
         {name: "kettle-test", source: %(gem "kettle-test", "~> 2.0", ">= 2.0.27"\n)},
         {name: "rake", source: %(gem "rake", "~> 13.0"\n)},
@@ -6870,7 +6870,7 @@ module Kettle
         end
       end
       if strategy.empty? || strategy == "merge"
-        merged = merge_config_template_source(recipe, resolved, original, facts: facts, env: env)
+        merged = merge_config_template_source(recipe, resolved, original, facts: facts, env: env, project_root: project_root)
         merged = preserve_mise_project_settings(recipe, merged, original, project_root: project_root, facts: facts) if template_file_type(recipe) == :toml
         return finalize_template_source_content(recipe, sync_kettle_config_env_overrides(merged, env, project_root: project_root)) if recipe.fetch(:target_path) == KETTLE_CONFIG_PATH
 
@@ -7617,7 +7617,7 @@ module Kettle
       ensure_trailing_newline(lines.join("\n").gsub(/\n{3,}/, "\n\n").strip)
     end
 
-    def merge_config_template_source(recipe, template_content, destination_content, facts: nil, env: ENV)
+    def merge_config_template_source(recipe, template_content, destination_content, facts: nil, env: ENV, project_root: nil)
       file_type = template_file_type(recipe)
       trivial_outcome = Ast::Template::Strategies.trivial_merge_outcome(template_content, destination_content)
       if trivial_outcome == :empty_destination
@@ -7754,6 +7754,8 @@ module Kettle
 
       output = normalize_local_gemfile_nomono_bootstrap(output) if local_gemfile_template_recipe?(recipe)
       output = remove_gemfile_percent_w_entries(output, [facts.to_h.dig(:package, :name)]) if local_gemfile_template_recipe?(recipe)
+      output = ensure_local_gem_requirements_from_template(output, template_content) if local_gemfile_template_recipe?(recipe)
+
       return output if recipe.dig(:template_preference, :strategy).to_s == "accept_template"
       return output unless local_gemfile_template_recipe?(recipe)
 
@@ -8765,6 +8767,7 @@ module Kettle
         output = replace_source_range_lines(output, first_line, marker.fetch(:start_line) - 1, bootstrap) if first_line < marker.fetch(:start_line)
         output = remove_local_gemfile_nomono_loader_blocks_after_marker(output)
         output = remove_redundant_nomono_bundler_requires_after_marker(output)
+        output = apply_local_gem_exclusions(output)
         return ensure_trailing_newline(output.rstrip)
       end
 
@@ -8781,7 +8784,9 @@ module Kettle
         without_duplicates = require_records.reject { |record| record.equal?(first) }.sort_by { |record| -record.fetch(:start_line) }.reduce(output) do |memo, record|
           replace_source_range_lines(memo, record.fetch(:start_line), expand_line_range_through_following_blanks(memo, record.fetch(:end_line)), "")
         end
-        return replace_source_range_lines(without_duplicates, first.fetch(:start_line), first.fetch(:end_line), bootstrap)
+        output = replace_source_range_lines(without_duplicates, first.fetch(:start_line), first.fetch(:end_line), bootstrap)
+        output = apply_local_gem_exclusions(output)
+        return ensure_trailing_newline(output.rstrip)
       end
 
       if (record = local_gems_assignment_record(output))
@@ -8789,6 +8794,8 @@ module Kettle
       else
         ensure_trailing_newline([output.to_s.rstrip, bootstrap.rstrip].reject(&:empty?).join("\n\n"))
       end
+      output = apply_local_gem_exclusions(output)
+      ensure_trailing_newline(output.rstrip)
     end
 
     def local_gemfile_nomono_bootstrap_marker(content)
@@ -8974,6 +8981,67 @@ module Kettle
       word_array_assignment_record(content, :local_gems)
     end
 
+    # Apply local gem exclusions from KETTLE_JEM_LOCAL_GEM_EXCLUSIONS env var
+    # to the local_gems word array in _local.gemfile templates.
+    def apply_local_gem_exclusions(content)
+      exclusions_env = ENV["KETTLE_JEM_LOCAL_GEM_EXCLUSIONS"]
+      return content if exclusions_env.nil? || exclusions_env.strip.empty?
+
+      exclusions = exclusions_env.split(",").map(&:strip).reject(&:empty?)
+      return content if exclusions.empty?
+
+      record = local_gems_assignment_record(content)
+      return content unless record
+
+      current_gems = record.fetch(:names)
+      filtered_gems = current_gems.reject { |gem| exclusions.include?(gem) }
+      return content if filtered_gems == current_gems
+
+      replace_word_array_assignment(content, :local_gems, filtered_gems)
+    end
+
+    # The AST merge can drop the template's local_gem_requirements hash when the
+    # destination predates it. The token-resolved template content is the source
+    # of truth for these requirements (the same facts style.gemfile declares),
+    # so re-inject the assignment from the template after the merge, replacing
+    # any stale copy in the merged output.
+    def ensure_local_gem_requirements_from_template(output, template_content)
+      template_record = local_variable_assignment_record(template_content, :local_gem_requirements)
+      return output unless template_record
+
+      replacement = template_record.fetch(:source)
+      output_record = local_variable_assignment_record(output, :local_gem_requirements)
+      if output_record
+        return output if output_record.fetch(:source) == replacement
+
+        replace_source_range_lines(output, output_record.fetch(:start_line), output_record.fetch(:end_line), replacement)
+      else
+        anchor = local_variable_assignment_record(output, :local_gems) ||
+          local_variable_assignment_record(output, :declared_gems)
+        return output unless anchor
+
+        lines = output.lines
+        lines.insert(anchor.fetch(:start_line) - 1, "#{replacement}\n\n")
+        ensure_trailing_newline(lines.join)
+      end
+    end
+
+    def local_variable_assignment_record(content, name)
+      result = prism_parse_success(content)
+      return unless result
+
+      node = result.value.breadth_first_search_all do |candidate|
+        candidate.is_a?(::Prism::LocalVariableWriteNode) && candidate.name == name
+      end.first
+      return unless node
+
+      {
+        source: content.lines[(node.location.start_line - 1)...node.location.end_line].join.chomp,
+        start_line: node.location.start_line,
+        end_line: node.location.end_line
+      }
+    end
+
     def word_array_assignment(content, name)
       word_array_assignment_record(content, name)&.fetch(:names) || []
     end
@@ -15827,7 +15895,7 @@ module Kettle
     def main_gemfile_kettle_family_gem(package_name)
       return "" if package_name.to_s == "kettle-family"
 
-      %(gem "kettle-family", "~> 1.3", ">= 1.3.11"\n)
+      %(gem "kettle-family", "~> 1.3", ">= 1.3.22"\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.32
+  version: 7.1.33
 platform: ruby
 authors:
 - Peter H. Boling
@@ -997,10 +997,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.32
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.32/CHANGELOG.md
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.33
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.33/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-jem/7.1.32
+  documentation_uri: https://www.rubydoc.info/gems/kettle-jem/7.1.33
   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