kettle-jem 7.1.33 → 7.1.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0331126c9cd143dae738734bcfb54afe39ff65800a0c342260d3c1482f88f94d
-  data.tar.gz: d44de2c4ab2afc8b784e5e9eabc5f4c1b3ec1735033f361437dc33a9980d104c
+  metadata.gz: f1760c5c4522f12469f4dd8b03571cc2fa22f93d364e2da8a54c3cc93d57e292
+  data.tar.gz: bf01a7571deabfabc42d7314f48b6198811221cdcda975b798ca8a9406ccc211
 SHA512:
-  metadata.gz: c2e9a4edcbcbf0a12f6494858fd9c5479116f44326164dbc4769719b5e87fd350d57894cea9b509b04ba5e3989100bef7dfc4cd52ddc42d40042309633f94e62
-  data.tar.gz: 37db58e793e5632632ec72f0d7cdd518d8bda2f29ad0937871030bde4061a1daa1d05941f4d4dd84655263be38c88c0dc9d64d7ffe491cd8eef6000161e8f9f0
+  metadata.gz: 2ad19f6e1bffb1959452eae2f59d31d203412ba9341dabc04746fb8202f72b31dcf8c7ad7f377a6e509c3db8ccbc13b21440ce9456921d55725fe85e8355b2b8
+  data.tar.gz: 06aeb688c7b0064d0dfc325a34666a01a51f42dcfcc272994583799e1f5c8e9438e88903073b436377550a4ae5c213905cdf171efd93514d70826b2b369ca855

data/CHANGELOG.md

@@ -30,6 +30,47 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [7.1.35] - 2026-10-20
+
+- TAG: [v7.1.35][7.1.35t]
+- COVERAGE: 93.46% -- 11385/12182 lines in 17 files
+- BRANCH COVERAGE: 77.09% -- 4907/6365 branches in 17 files
+- 19.87% documented
+
+### Fixed
+
+- Match direct-versus-modular dependency decisions across a modular Gemfile and its _local.gemfile counterpart.
+
+## [7.1.34] - 2026-10-20
+
+- TAG: [v7.1.34][7.1.34t]
+- COVERAGE: 93.45% -- 11380/12178 lines in 17 files
+- BRANCH COVERAGE: 77.09% -- 4907/6365 branches in 17 files
+- 19.84% documented
+
+### Changed
+
+- [kc] kettle-jem/prepare: updated 10 project files:
+  - dependencies (10)
+
+- [kc] kettle-jem/template: updated 3 project files:
+  - code and tests (1)
+  - documentation (1)
+  - other (1)
+
+- [kc] kettle-jem-deps-floor: Update kettle-jem template dependency floors:
+  - kettle-dev (>= 3.1.18 -> >= 3.1.19)
+  - kettle-family (>= 1.3.22 -> >= 1.3.25)
+  - nomono (>= 1.1.10 -> >= 1.1.14)
+
+### Fixed
+
+- Monorepo member Gemfiles now wire every family sibling as a local path dependency, not just the dependency-reachable closure: monorepo CI must never resolve family members from the registry, whose published metadata conflicts with the local graph whenever the family is mid-release (version-coupled sibling pins target the next, unpublished version).
+
+- [kc] shape-aware-nomono-requirements: Scope all-sibling path wiring and automatic local lock normalization to monorepo topology, and forward project-fact requirements through eval_nomono_gems in generated Gemfiles.
+
+- [kc] shared-nomono-overrides: Use Nomono 1.1.10 shared overrides instead of template-side dependency replacement in local coverage and templating Gemfiles; preserve fact requirements during repeated bootstrap normalization.
+
 ## [7.1.33] - 2026-10-19
 
 - TAG: [v7.1.33][7.1.33t]
@@ -2318,7 +2359,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.33...HEAD
+[Unreleased]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.35...HEAD
+[7.1.35]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.34...v7.1.35
+[7.1.35t]: https://github.com/structuredmerge/structuredmerge-ruby/releases/tag/v7.1.35
+[7.1.34]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.33...v7.1.34
+[7.1.34t]: https://github.com/structuredmerge/structuredmerge-ruby/releases/tag/v7.1.34
 [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

data/README.md

@@ -98,6 +98,61 @@ Merge analysis must enter parsing through `tree_haver`. Parser-specific gems reg
 [sm-family-rust]: https://github.com/structuredmerge/structuredmerge
 [sm-family-typescript]: https://github.com/structuredmerge/structuredmerge-typescript
 
+### Runtime and Platform Support
+
+Support tiers describe what this project's CI actually exercises, not what may
+work in an untested environment:
+
+- **Parallel support**: CI runs the test suite with multiple workers available.
+- **Unsupported**: the engine/platform combination is not covered by CI and is
+ not a project compatibility claim.
+
+| Ruby engine/version | Linux | macOS | Windows | Notes |
+|---------------------|-------|-------|---------|-------|
+| MRI 4.0-4.0 | Parallel support | Unsupported | Unsupported | Versioned Ruby workflows run on Linux. |
+| MRI current | Parallel support | Parallel support | Unsupported | Current Ruby workflow covers the declared OS platforms. |
+| MRI head | Parallel support | Unsupported | Unsupported | CI is allowed to fail while Ruby is in development. |
+| JRuby (all CI lanes) | Parallel support | Unsupported | Unsupported | Engine workflows run on Linux; macOS and Windows are not exercised by CI. |
+
+### Federated DVCS
+
+<details markdown="1">
+ <summary>Find this repo on federated forges (Coming soon!)</summary>
+
+| Federated [DVCS][💎d-in-dvcs] Repository | Status | Issues | PRs | Wiki | CI |
+|-------------------------------------------------|-------------------------------------------|-------------------|------------------|-----------------|----------------|
+| 🧪 [structuredmerge/structuredmerge-ruby on GitLab][📜src-gl] | The Truth | [💚][🤝gl-issues] | [💚][🤝gl-pulls] | [💚][📜gl-wiki] | 🐭 Tiny Matrix |
+| 🧊 [structuredmerge/structuredmerge-ruby on CodeBerg][📜src-cb] | An Ethical Mirror ([Donate][🤝cb-donate]) | [💚][🤝cb-issues] | [💚][🤝cb-pulls] | ➖ | ⭕️ No Matrix |
+| 🐙 [structuredmerge/structuredmerge-ruby on GitHub][📜src-gh] | Another Mirror | [💚][🤝gh-issues] | [💚][🤝gh-pulls] | [💚][📜gh-wiki] | 💯 Full Matrix |
+
+</details>
+
+### Enterprise Support
+
+[![Tidelift](https://tidelift.com/badges/package/rubygems/kettle-jem)](https://tidelift.com/subscription/pkg/rubygems-kettle-jem?utm_source=rubygems-kettle-jem&utm_medium=referral&utm_campaign=readme)
+
+Available as part of the Tidelift Subscription.
+
+<details markdown="1">
+ <summary>Need enterprise-level guarantees?</summary>
+
+The maintainers of this and thousands of other packages are working with Tidelift to deliver commercial support and maintenance for the open source packages you use to build your applications. Save time, reduce risk, and improve code health, while paying the maintainers of the exact packages you use.
+
+[![Get help from me on Tidelift][🏙️entsup-tidelift-img]][🏙️entsup-tidelift]
+
+- 💡Subscribe for support guarantees covering _all_ your FLOSS dependencies
+- 💡Tidelift is part of [Sonar][🏙️entsup-tidelift-sonar]
+- 💡Tidelift pays maintainers to maintain the software you depend on!<br/>📊`@`Pointy Haired Boss: An [enterprise support][🏙️entsup-tidelift] subscription is "[never gonna let you down][🧮kloc]", and *supports* open source maintainers
+
+Alternatively:
+
+- [![Ruby Users Forum][✉️ruby-forum-img]][✉️ruby-forum]
+- [![Live Chat on Discord][✉️discord-invite-img-ftb]][✉️discord-invite]
+- [![Get help from me on Upwork][👨🏼‍🏫expsup-upwork-img]][👨🏼‍🏫expsup-upwork]
+- [![Get help from me on Codementor][👨🏼‍🏫expsup-codementor-img]][👨🏼‍🏫expsup-codementor]
+
+</details>
+
 ## ✨ Installation
 
 Install the gem and add to the application's Gemfile by executing:
@@ -657,6 +712,30 @@ We [![Keep A Changelog][📗keep-changelog-img]][📗keep-changelog] so if you m
 
 See [CONTRIBUTING.md][🤝contributing] for more detailed instructions.
 
+### 🚀 Release Instructions
+
+See [CONTRIBUTING.md][🤝contributing].
+
+### Code Coverage
+
+<details markdown="1">
+<summary>Coverage service badges</summary>
+
+</details>
+
+### 🪇 Code of Conduct
+
+Everyone interacting with this project's codebases, issue trackers,
+chat rooms and mailing lists agrees to follow the [![Contributor Covenant 2.1][🪇conduct-img]][🪇conduct].
+
+## 🌈 Contributors
+
+[![Contributors][🖐contributors-img]][🖐contributors]
+
+Made with [contributors-img][🖐contrib-rocks].
+
+Also see GitLab Contributors: [https://gitlab.com/structuredmerge/structuredmerge-ruby/-/graphs/main][🚎contributors-gl]
+
 ## 📌 Versioning
 
 This library follows [![Semantic Versioning 2.0.0][📌semver-img]][📌semver] for its public API where practical.
@@ -690,6 +769,41 @@ See [LICENSE.md][📄license] for details.
 
 If none of the available licenses suit your use case, please [contact us](mailto:floss@galtzo.com) to discuss a custom commercial license.
 
+### © Copyright
+
+See [LICENSE.md][📄license] for the official copyright notice.
+
+<details markdown="1">
+<summary>Copyright holders</summary>
+
+- Required Notice: Copyright (c) 2026 Peter H. Boling
+
+</details>
+
+## 🤑 A request for help
+
+Maintainers have teeth and need to pay their dentists.
+After getting laid off in an RIF in March, and encountering difficulty finding a new one,
+I began spending most of my time building open source tools.
+I'm hoping to be able to pay for my kids' health insurance this month,
+so if you value the work I am doing, I need your support.
+Please consider sponsoring me or the project.
+
+To join the community or get help, use the RubyForum or Discord.
+
+[![Ruby Users Forum][✉️ruby-forum-img]][✉️ruby-forum]
+[![Live Chat on Discord][✉️discord-invite-img-ftb]][✉️discord-invite]
+
+To say "thanks!" ☝️ Join the community or 👇️ send money.
+
+[![Sponsor kettle-dev/kettle-jem on Open Source Collective][🖇osc-all-bottom-img]][🖇osc] 💌 [![Sponsor me on GitHub Sponsors][🖇sponsor-bottom-img]][🖇sponsor] 💌 [![Sponsor me on Liberapay][⛳liberapay-bottom-img]][⛳liberapay] 💌 [![Donate on PayPal][🖇paypal-bottom-img]][🖇paypal]
+
+### Please give the project a star ⭐ ♥.
+
+Many parts of this project are actively managed by a [kettle-jem](https://github.com/structuredmerge/structuredmerge-ruby/tree/main/gems/kettle-jem) smart template utilizing [StructuredMerge.org](https://structuredmerge.org) merge contracts.
+
+Thanks for RTFM. ☺️
+
 [⛳liberapay-img]: https://img.shields.io/liberapay/goal/pboling.svg?logo=liberapay&color=a51611&style=flat
 [⛳liberapay-bottom-img]: https://img.shields.io/liberapay/goal/pboling.svg?style=for-the-badge&logo=liberapay&color=a51611
 [⛳liberapay]: https://liberapay.com/pboling/donate
@@ -724,6 +838,7 @@ If none of the available licenses suit your use case, please [contact us](mailto
 [✉️ruby-forum-top-img]: https://img.shields.io/discourse/topics?server=https%3A%2F%2Fwww.rubyforum.org&style=flat&logo=discourse&label=Ruby%20Users%20Forum
 [✉️ruby-forum-img]: https://img.shields.io/discourse/topics?server=https%3A%2F%2Fwww.rubyforum.org&style=for-the-badge&logo=discourse&label=Ruby%20Users%20Forum
 [✉️ruby-forum]: https://www.rubyforum.org/tag/structuredmerge
+
 [✇bundle-group-pattern]: https://gist.github.com/pboling/4564780
 [⛳️gem-namespace]: https://github.com/structuredmerge/structuredmerge-ruby/tree/main/gems/kettle-jem
 [⛳️namespace-img]: https://img.shields.io/badge/namespace-Kettle::Jem-3C2D2D.svg?style=square&logo=ruby&logoColor=white
@@ -794,6 +909,7 @@ If none of the available licenses suit your use case, please [contact us](mailto
 [🖐contrib-rocks]: https://contrib.rocks
 [🖐contributors]: https://github.com/structuredmerge/structuredmerge-ruby/graphs/contributors
 [🖐contributors-img]: https://contrib.rocks/image?repo=structuredmerge/structuredmerge-ruby
+[🚎contributors-gl]: https://gitlab.com/structuredmerge/structuredmerge-ruby/-/graphs/main
 [🪇conduct]: https://github.com/structuredmerge/structuredmerge-ruby/blob/main/CODE_OF_CONDUCT.md
 [🪇conduct-img]: https://img.shields.io/badge/Contributor_Covenant-2.1-259D6C.svg
 [📌pvc]: http://guides.rubygems.org/patterns/#pessimistic-version-constraint
@@ -807,7 +923,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.162-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-12.182-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
@@ -816,6 +932,7 @@ If none of the available licenses suit your use case, please [contact us](mailto
 [📄license-img]: https://img.shields.io/badge/License-AGPL--3.0--only_OR_PolyForm--Small--Business--1.0.0-259D6C.svg
 [📄license-compat]: https://www.apache.org/legal/resolved.html#category-x
 [📄license-compat-img]: https://img.shields.io/badge/Apache_Incompatible:_Category_X-%E2%9C%97-C0392B.svg?style=flat&logo=Apache
+
 [📄ilo-declaration]: https://www.ilo.org/declaration/lang--en/index.htm
 [📄ilo-declaration-img]: https://img.shields.io/badge/ILO_Fundamental_Principles-✓-259D6C.svg?style=flat
 [🚎yard-current]: http://rubydoc.info/gems/kettle-jem
@@ -827,3 +944,14 @@ If none of the available licenses suit your use case, please [contact us](mailto
 [💎appraisal2]: https://github.com/appraisal-rb/appraisal2
 [💎appraisal2-img]: https://img.shields.io/badge/appraised_by-appraisal2-34495e.svg?plastic&logo=ruby&logoColor=white
 [💎d-in-dvcs]: https://railsbling.com/posts/dvcs/put_the_d_in_dvcs/
+
+<!-- kettle-jem:metadata:start -->
+| Field | Value |
+|---|---|
+| Package | kettle-jem |
+| Description | 🔮 Kettle::Jem provides gem scaffolding, templating, and setup automation using the *-merge gem family for AST-based file merging and token-resolver for template token resolution. Includes MergerConfig presets, YAML recipes, and a complete gem template scaffold. |
+| Homepage | https://github.com/structuredmerge/structuredmerge-ruby |
+| Source | https://github.com/structuredmerge/structuredmerge-ruby |
+| License | `AGPL-3.0-only` OR `PolyForm-Small-Business-1.0.0` |
+| Funding | https://github.com/sponsors/pboling, https://ko-fi.com/pboling, https://liberapay.com/pboling/donate, https://opencollective.com/kettle-dev, https://thanks.dev/u/gh/pboling, https://tidelift.com/funding/github/rubygems/kettle-jem, https://www.buymeacoffee.com/pboling |
+<!-- kettle-jem:metadata:end -->

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

@@ -49,7 +49,7 @@ module Kettle
           install_steps << appraisal_generate_step(project_root, env: setup_env, run_options: effective_run_options)
           install_steps << rubocop_gradual_autocorrect_step(project_root, env: setup_env, run_options: effective_run_options)
           install_steps << normalize_lockfile_platforms_step(project_root, env: setup_env, run_options: effective_run_options)
-          install_steps << normalize_lockfile_step(project_root, env: setup_env, run_options: effective_run_options)
+          install_steps << normalize_lockfile_step(project_root, env: setup_env, run_options: effective_run_options, repository: report.dig(:facts, :repository) || {})
           install_steps << bundled_handoff_step(project_root: project_root, env: env, run_options: effective_run_options)
           install_steps = execute_orchestration_steps(install_steps, project_root: project_root, env: setup_env, run_options: effective_run_options, command_runner: command_runner)
 
@@ -751,7 +751,7 @@ module Kettle
           stdout.lines.map(&:strip).include?(gem_name.to_s)
         end
 
-        def normalize_lockfile_step(project_root, env:, run_options: {})
+        def normalize_lockfile_step(project_root, env:, run_options: {}, repository: {})
           if Kettle::Jem::DecisionPolicy.value_to_boolean((run_options || {})[:skip_lock_normalization])
             return {
               name: "bundle_lock_normalization",
@@ -780,7 +780,7 @@ module Kettle
             name: "bundle_lock_normalization",
             command: lockfile_normalization_command(project_root),
             status: "ready",
-            env: normal_lockfile_env(project_root, env),
+            env: normal_lockfile_env(project_root, env, repository: repository),
             reason: "bundle_lock_update_preserving_platforms_without_templating_overrides"
           }
         end
@@ -982,7 +982,7 @@ module Kettle
           stdout.to_s.strip
         end
 
-        def normal_lockfile_env(project_root, env)
+        def normal_lockfile_env(project_root, env, repository: {})
           command_env = (env || {}).to_h.dup
           strip_inherited_bundler_activation!(command_env)
           command_env["K_JEM_TEMPLATING"] = "false"
@@ -991,7 +991,7 @@ module Kettle
           end
           gemfile = File.join(project_root.to_s, "Gemfile")
           command_env["BUNDLE_GEMFILE"] = gemfile if File.file?(gemfile)
-          apply_direct_sibling_lockfile_env!(project_root, command_env)
+          apply_direct_sibling_lockfile_env!(project_root, command_env, repository: repository)
           %w[
             BUNDLE_PATH
             BUNDLE_WITH
@@ -1002,7 +1002,9 @@ module Kettle
           command_env
         end
 
-        def apply_direct_sibling_lockfile_env!(project_root, command_env)
+        def apply_direct_sibling_lockfile_env!(project_root, command_env, repository: {})
+          return unless Kettle::Jem.send(:repository_monorepo_subproject?, repository)
+
           gemspec_path = Dir.glob(File.join(project_root.to_s, "*.gemspec")).min
           return unless gemspec_path
 
@@ -1012,7 +1014,8 @@ module Kettle
             :direct_sibling_runtime_gems,
             project_root,
             metadata,
-            package_name: package_name
+            package_name: package_name,
+            repository: repository
           )
           return if direct_sibling_gems.empty?
 

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.18")             # ruby >= {KJ|MIN_TEST_RUBY}
+  spec.add_development_dependency("kettle-dev", "~> 3.1", ">= 3.1.19")             # 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/coverage_local.gemfile.example

@@ -5,6 +5,8 @@
 
 {KJ|LOCAL_GEMFILE_NOMONO_BOOTSTRAP}
 
+local_gem_requirements = {KJ|LOCAL_GEM_REQUIREMENTS}
+
 local_gems = %w[{KJ|KETTLE_DEV_LOCAL_GEMS}]
 kettle_dev_nomono_options = {
   prefix: "KETTLE_DEV",
@@ -17,29 +19,18 @@ kettle_dev_nomono_options = {
 
 # export KETTLE_DEV_DEV=/path/to/my
 platform :mri do
-  # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler
-  # rejects duplicate declarations with different requirements or sources.
-  kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find { |dependency| dependency.name == "kettle-dev" }
-  kettle_dev_local_path = nomono_gems(
-    gems: %w[kettle-dev],
-    **kettle_dev_nomono_options
-  ).fetch("kettle-dev", nil)
-  if kettle_dev_dependency && kettle_dev_local_path
-    instance_variable_get(:@dependencies).delete(kettle_dev_dependency)
-    gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path
-  end
-
-  declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name)
-  local_gems_to_eval = local_gems - %w[{KJ|PACKAGE_NAME}] - declared_gems
+  local_gems_to_eval = local_gems - %w[{KJ|PACKAGE_NAME}]
 
   eval_nomono_gems(
     gems: local_gems_to_eval,
+    requirements: local_gem_requirements,
     **kettle_dev_nomono_options
   )
 
   if ENV.fetch("GALTZO_FLOSS_DEV", "false").casecmp("false") != 0
     eval_nomono_gems(
       gems: %w[turbo_tests2],
+      requirements: local_gem_requirements,
       prefix: "GALTZO_FLOSS",
       path_env: "GALTZO_FLOSS_DEV",
       vendored_gems_env: "GALTZO_FLOSS_VENDORED_GEMS",

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

@@ -64,6 +64,7 @@ gem "rubocop-packaging",
 platform :mri do
   eval_nomono_gems(
     gems: local_gems_to_eval,
+    requirements: local_gem_requirements,
     prefix: "RUBOCOP_LTS",
     path_env: "RUBOCOP_LTS_DEV",
     vendored_gems_env: "VENDORED_GEMS",

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

@@ -6,6 +6,9 @@
 
 {KJ|LOCAL_GEMFILE_NOMONO_BOOTSTRAP}
 
+# Declared dependency requirements, supplied by project facts.
+local_gem_requirements = {KJ|LOCAL_GEM_REQUIREMENTS}
+
 structuredmerge_local_gems = %w[
   tree_haver
   ast-merge
@@ -61,28 +64,17 @@ structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[{KJ|PACKAGE
 if ENV.fetch("STRUCTUREDMERGE_DEV", "false").casecmp("false") != 0
   eval_nomono_gems(
     gems: structuredmerge_local_gems_to_eval,
+    requirements: local_gem_requirements,
     **structuredmerge_nomono_options
   )
 end
 
 if ENV.fetch("KETTLE_DEV_DEV", "false").casecmp("false") != 0
-  # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler
-  # rejects duplicate declarations with different requirements or sources.
-  kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find { |dependency| dependency.name == "kettle-dev" }
-  kettle_dev_local_path = nomono_gems(
-    gems: %w[kettle-dev],
-    **kettle_dev_nomono_options
-  ).fetch("kettle-dev", nil)
-  if kettle_dev_dependency && kettle_dev_local_path
-    instance_variable_get(:@dependencies).delete(kettle_dev_dependency)
-    gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path
-  end
-
-  declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name)
-  kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[{KJ|PACKAGE_NAME}] - declared_gems
+  kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[{KJ|PACKAGE_NAME}]
 
   eval_nomono_gems(
     gems: kettle_dev_local_gems_to_eval,
+    requirements: local_gem_requirements,
     **kettle_dev_nomono_options
   )
 end

data/lib/kettle/jem/templates/shim/Gemfile.example

@@ -6,7 +6,7 @@ shimmed_gem_path = ENV["KETTLE_JEM_SHIMMED_GEM_PATH"].to_s
 gem "{KJ|SHIMMED_GEM_NAME}", path: shimmed_gem_path unless shimmed_gem_path.empty?
 
 # Local workspace dependency wiring for templating_local.gemfile overrides.
-gem "nomono", "~> 1.1", ">= 1.1.8", require: false # ruby >= 3.2.0
+gem "nomono", "~> 1.1", ">= 1.1.14", require: false # ruby >= 3.2.0
 
 # Templating and the StructuredMerge family share this modular Gemfile.
 # kettle-jem needs StructuredMerge to template, and kettle-changelog needs it at

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

data/lib/kettle/jem.rb

@@ -62,8 +62,8 @@ module Kettle
     # set in place before Bundler is allowed to evaluate that destination.
     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.18"], bootstrap: true},
+      {name: "nomono", requirements: ["~> 1.1", ">= 1.1.14"], bootstrap: true},
+      {name: "kettle-dev", requirements: ["~> 3.1", ">= 3.1.19"], bootstrap: true},
       {
         name: "kettle-changelog",
         requirements: ["~> 1.0", ">= 1.0.13"],
@@ -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.18"\n)},
+        {name: "kettle-dev", source: %(gem "kettle-dev", "~> 3.1", ">= 3.1.19"\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.22"\n)},
+        {name: "kettle-family", source: %(gem "kettle-family", "~> 1.3", ">= 1.3.25"\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)},
@@ -8764,6 +8764,10 @@ module Kettle
       if marker && activation_assignments.any?
         first_line = activation_assignments.map { |node| node.location.start_line }.min
         first_line = preceding_comment_block_start_line(output.lines, first_line)
+        requirements_record = local_variable_assignment_record(output, :local_gem_requirements)
+        if requirements_record&.fetch(:start_line)&.between?(first_line, marker.fetch(:start_line) - 1)
+          bootstrap = "#{bootstrap}#{requirements_record.fetch(:source)}\n\n"
+        end
         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)
@@ -9017,6 +9021,7 @@ module Kettle
         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, :structuredmerge_local_gems) ||
           local_variable_assignment_record(output, :declared_gems)
         return output unless anchor
 
@@ -9870,15 +9875,26 @@ module Kettle
       entries.any? do |entry|
         entry["gem"] == conflict.fetch(:name) &&
           entry["direct"] == conflict.fetch(:direct) &&
-          entry["modular"] == conflict.fetch(:modular)
+          modular_dependency_paths_match?(entry["modular"], conflict.fetch(:modular))
       end
     end
 
+    # Local modular Gemfiles are environment-selected counterparts of the
+    # released modular Gemfile. Treat their paths as one logical decision key;
+    # otherwise a decision for style.gemfile will not cover style_local.gemfile.
+    def modular_dependency_paths_match?(left, right)
+      normalize_modular_dependency_path(left) == normalize_modular_dependency_path(right)
+    end
+
+    def normalize_modular_dependency_path(path)
+      path.to_s.sub(/_local\.gemfile\z/, ".gemfile")
+    end
+
     def modular_dependency_conflict_decided?(decisions, conflict)
       decisions.any? do |decision|
         decision.fetch("gem") == conflict.fetch(:name) &&
           decision.fetch("direct") == conflict.fetch(:direct) &&
-          decision.fetch("modular") == conflict.fetch(:modular) &&
+          modular_dependency_paths_match?(decision.fetch("modular"), conflict.fetch(:modular)) &&
           case decision.fetch("action")
           when "remove_modular_gem", "remove_x_std_lib_eval", "remove_direct_gem"
             true
@@ -15533,7 +15549,8 @@ module Kettle
         project_root,
         gemspec_metadata,
         package_name: package_name,
-        local_modular_eval_paths: local_modular_eval_paths
+        local_modular_eval_paths: local_modular_eval_paths,
+        repository: repository
       )
       compact_hash(
         freeze_token: config.dig("defaults", "freeze_token").to_s.empty? ? "kettle-jem" : config.dig("defaults", "freeze_token").to_s,
@@ -15543,6 +15560,7 @@ module Kettle
         template_run_year: run_timestamp.year.to_s,
         kettle_dev_local_gems: kettle_dev_local_gems(config),
         local_gemfile_nomono_bootstrap: local_gemfile_nomono_bootstrap(package_name),
+        local_gem_requirements: gemspec_local_gem_requirements(gemspec_metadata),
         main_gemfile_kettle_family_gem: main_gemfile_kettle_family_gem(package_name),
         main_gemfile_nomono_bootstrap: main_gemfile_nomono_bootstrap(package_name),
         package_name: package_name.to_s,
@@ -15561,12 +15579,13 @@ module Kettle
           source_url: source_url,
           project_root: project_root,
           repository: repository,
+          requirements: gemspec_local_gem_requirements(gemspec_metadata),
           local_modular_eval_paths: local_modular_eval_paths.values.flatten
         )
       )
     end
 
-    def direct_sibling_runtime_gems(project_root, gemspec_metadata, package_name:, local_modular_eval_paths: {})
+    def direct_sibling_runtime_gems(project_root, gemspec_metadata, package_name:, local_modular_eval_paths: {}, repository: {})
       return [] unless project_root && gemspec_metadata.is_a?(Hash)
 
       sibling_root = File.expand_path("..", project_root.to_s)
@@ -15586,6 +15605,22 @@ module Kettle
         pending.concat(gemspec_runtime_dependency_names(sibling_metadata))
       end
 
+      # A monorepo of sibling gems must resolve every sibling from local
+      # paths, never from the registry: published registry metadata for
+      # released siblings conflicts with the local graph whenever the family
+      # is mid-release (version-coupled sibling pins target the next,
+      # unpublished version, and external tooling like kettle-family pulls
+      # family members transitively). Wire all family members, not just the
+      # dependency-reachable closure.
+      if repository_monorepo_subproject?(repository) && File.directory?(sibling_root)
+        Dir.children(sibling_root).sort.each do |name|
+          next if discovered.include?(name) || excluded.include?(name)
+          next unless direct_sibling_directory_defines_gem?(File.join(sibling_root, name), name)
+
+          discovered << name
+        end
+      end
+
       discovered.reject { |name| excluded.include?(name) }
     end
 
@@ -15650,6 +15685,19 @@ module Kettle
       end
     end
 
+    # Reuse the dependency objects in project facts. Never infer a requirement
+    # from a sibling's current version or scrape a rendered modular Gemfile.
+    def gemspec_local_gem_requirements(gemspec_metadata)
+      %i[runtime_dependencies development_dependencies].each_with_object({}) do |kind, requirements|
+        Array(gemspec_metadata[kind] || gemspec_metadata[kind.to_s]).each do |dependency|
+          next unless dependency.respond_to?(:name) && dependency.respond_to?(:requirements_list)
+
+          name = dependency.name.to_s
+          requirements[name] = (Array(requirements[name]) + dependency.requirements_list).uniq
+        end
+      end.sort.to_h
+    end
+
     def gemspec_runtime_dependency_names(gemspec_metadata)
       dependencies = Array(
         gemspec_metadata[:runtime_dependencies] || gemspec_metadata["runtime_dependencies"]
@@ -15662,7 +15710,7 @@ module Kettle
       end
     end
 
-    def main_gemfile_direct_sibling_block(gems, package_name:, source_url:, project_root:, repository: {}, local_modular_eval_paths: [])
+    def main_gemfile_direct_sibling_block(gems, package_name:, source_url:, project_root:, repository: {}, requirements: {}, local_modular_eval_paths: [])
       names = Array(gems).map(&:to_s).reject(&:empty?).uniq
       eval_paths = Array(local_modular_eval_paths).map(&:to_s).reject(&:empty?).uniq.sort
       return "" if names.empty? && eval_paths.empty?
@@ -15705,6 +15753,7 @@ module Kettle
 
             eval_nomono_gems(
               gems: direct_sibling_gems,
+              requirements: #{requirements.slice(*names).inspect},
               prefix: "#{prefix}",
               path_env: "#{dev_env}",
               root: #{root_literal}
@@ -15867,6 +15916,7 @@ module Kettle
         "KJ|TEMPLATE_RUN_YEAR" => project_runtime[:template_run_year].to_s,
         "KJ|KETTLE_DEV_LOCAL_GEMS" => project_runtime[:kettle_dev_local_gems].to_s,
         "KJ|LOCAL_GEMFILE_NOMONO_BOOTSTRAP" => project_runtime[:local_gemfile_nomono_bootstrap].to_s,
+        "KJ|LOCAL_GEM_REQUIREMENTS" => (project_runtime[:local_gem_requirements] || {}).inspect,
         "KJ|MAIN_GEMFILE_KETTLE_FAMILY_GEM" => project_runtime[:main_gemfile_kettle_family_gem].to_s,
         "KJ|MAIN_GEMFILE_NOMONO_BOOTSTRAP" => project_runtime[:main_gemfile_nomono_bootstrap].to_s,
         "KJ|MAIN_GEMFILE_DIRECT_SIBLING_BLOCK" => project_runtime[:main_gemfile_direct_sibling_block].to_s,
@@ -15895,7 +15945,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.22"\n)
+      %(gem "kettle-family", "~> 1.3", ">= 1.3.25"\n)
     end
 
     def main_gemfile_nomono_bootstrap(package_name)
@@ -15908,7 +15958,7 @@ module Kettle
     end
 
     def nomono_gemfile_declaration
-      %(gem "nomono", "~> 1.1", ">= 1.1.8", require: false # ruby >= 3.2.0)
+      %(gem "nomono", "~> 1.1", ">= 1.1.14", require: false # ruby >= 3.2.0)
     end
 
     def local_gemfile_nomono_bootstrap(_package_name)
@@ -15920,7 +15970,7 @@ module Kettle
         # Bootstrapping nomono here cannot rely on a plain `gem "nomono", ...` line.
         # Bundler records that dependency during Gemfile evaluation, but it does not
         # activate that exact version before the immediate `require "nomono/bundler"`.
-        nomono_activation_requirements = ["~> 1.1", ">= 1.1.8"]
+        nomono_activation_requirements = ["~> 1.1", ">= 1.1.14"]
         nomono_requirement = Gem::Requirement.new(nomono_activation_requirements)
         nomono_already_activated = Gem.loaded_specs["nomono"]
         nomono_lockfile = File.expand_path(#{lockfile_path.inspect}, __dir__)
@@ -20810,7 +20860,7 @@ module Kettle
         "actions/checkout" => "actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1",
         "actions/cache" => "actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0",
         "appraisal-rb/setup-ruby-flash" => "appraisal-rb/setup-ruby-flash@6f8ad36ba7488db591541483afb5464d01e8861b # v2.14",
-        "ruby/setup-ruby" => "ruby/setup-ruby@651ff0d62c5c79bed6d53ec518387aae20e72c1a # v1.329.0",
+        "ruby/setup-ruby" => "ruby/setup-ruby@824c0e29fdfc7d689c191c27acc969d2d04b7dd8 # v1.331.0",
         "coverallsapp/github-action" => "coverallsapp/github-action@8d6379e14d29928660c4ba802d8e85393440b329 # v2.3.8",
         "qltysh/qlty-action/coverage" => "qltysh/qlty-action/coverage@c9b09987143d1e4ac955f4803c7bea742102feb5 # v2.4.0",
         "codecov/codecov-action" => "codecov/codecov-action@303a32d7a59b442fa8d48b6a1cc6825c09c847a5 # v7.1.1",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-jem
 version: !ruby/object:Gem::Version
-  version: 7.1.33
+  version: 7.1.35
 platform: ruby
 authors:
 - Peter H. Boling
@@ -226,7 +226,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.9
+        version: 1.0.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -236,7 +236,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.9
+        version: 1.0.13
 - !ruby/object:Gem::Dependency
   name: kettle-dev
   requirement: !ruby/object:Gem::Requirement
@@ -246,7 +246,7 @@ dependencies:
         version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.9
+        version: 3.1.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -256,7 +256,7 @@ dependencies:
         version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.9
+        version: 3.1.18
 - !ruby/object:Gem::Dependency
   name: kettle-gha-pins
   requirement: !ruby/object:Gem::Requirement
@@ -676,7 +676,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.25
+        version: 2.0.27
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -686,27 +686,27 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.25
+        version: 2.0.27
 - !ruby/object:Gem::Dependency
   name: turbo_tests2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.16
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.16
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -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.33
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.33/CHANGELOG.md
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.35
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.35/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-jem/7.1.33
+  documentation_uri: https://www.rubydoc.info/gems/kettle-jem/7.1.35
   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