kettle-jem 7.1.35 → 7.1.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1760c5c4522f12469f4dd8b03571cc2fa22f93d364e2da8a54c3cc93d57e292
-  data.tar.gz: bf01a7571deabfabc42d7314f48b6198811221cdcda975b798ca8a9406ccc211
+  metadata.gz: 00e76622428f683234f6e7444e38f0b920addc704a31c4c5571efa84a347cfdd
+  data.tar.gz: 3d8b60bab2e1e8454ca9bb647bb683e6b84b6d1446d3ab761a764b01fa56111c
 SHA512:
-  metadata.gz: 2ad19f6e1bffb1959452eae2f59d31d203412ba9341dabc04746fb8202f72b31dcf8c7ad7f377a6e509c3db8ccbc13b21440ce9456921d55725fe85e8355b2b8
-  data.tar.gz: 06aeb688c7b0064d0dfc325a34666a01a51f42dcfcc272994583799e1f5c8e9438e88903073b436377550a4ae5c213905cdf171efd93514d70826b2b369ca855
+  metadata.gz: dd27b88f5310bd690f02665af0712e86ff2f3b77d820736bbc88ce70fd557fd1b9aa7fc1bb957d8443582ad17c7b756743b44bb7496c0a556e00346494de59e0
+  data.tar.gz: ea83632fce9913fa470fcbec625305e3dfe4f72d98c72e81666f5b044ab0266dd51d41f3d5c8f0adcc9c1cf7cf333707eb01a52082cd61c61d1306507288fe38

data/CHANGELOG.md

@@ -30,6 +30,50 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [7.1.37] - 2026-10-21
+
+- TAG: [v7.1.37][7.1.37t]
+- COVERAGE: 93.45% -- 11396/12195 lines in 17 files
+- BRANCH COVERAGE: 77.08% -- 4909/6369 branches in 17 files
+- 19.89% documented
+
+### Changed
+
+- [kc] kettle-jem/prepare: updated 6 project files:
+  - dependencies (6)
+
+- [kc] kettle-jem/template: updated 4 project files:
+  - code and tests (1)
+  - dependencies (2)
+  - other (1)
+
+- [kc] kettle-jem-deps-floor: Update kettle-jem template dependency floors:
+  - appraisal2 (>= 3.2.5 -> >= 3.2.6)
+  - appraisal2-rubocop (>= 1.0.4 -> >= 1.0.5)
+  - kettle-dev (>= 3.1.19 -> >= 3.1.20)
+  - kettle-family (>= 1.3.25 -> >= 1.3.28)
+
+### Fixed
+
+- VersionGem bootstrap: emit a compact `%w[version.rb version_gem.rb]` paths loader in the managed version coverage example so generated specs satisfy the default `RSpec/ExampleLength` (Max: 5), and rewrite both previously emitted multi-line array forms (with or without trailing comma) to the compact form on templating.
+
+- Stop materializing exact sibling version pins (= x.y.z) into generated Gemfile and modular *_local.gemfile nomono requirement hashes. The destination's own gemspec already enforces those constraints dynamically via the gemspec directive, so the literal copies only went stale on family version bumps and broke bundle resolution (prepare_lockfiles) before templating could refresh them. Flexible constraints (floors) are still materialized.
+
+- Include ast-crispr-toml in generated local StructuredMerge Gemfiles so Kettle-family and sibling TOML versions resolve from the same checkout.
+
+- Bound JRuby dep-heads bundle and native-extension build concurrency to prevent memory exhaustion on constrained runners
+
+## [7.1.36] - 2026-10-20
+
+- TAG: [v7.1.36][7.1.36t]
+- COVERAGE: 93.45% -- 11392/12191 lines in 17 files
+- BRANCH COVERAGE: 77.08% -- 4908/6367 branches in 17 files
+- 19.90% documented
+
+### Fixed
+
+- Recognize linked Git worktrees of the local RuboCop-LTS checkout and skip redundant branch switching during templating.
+
 ## [7.1.35] - 2026-10-20
 
 - TAG: [v7.1.35][7.1.35t]
@@ -2359,7 +2403,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.35...HEAD
+[Unreleased]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.37...HEAD
+[7.1.37]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.36...v7.1.37
+[7.1.37t]: https://github.com/structuredmerge/structuredmerge-ruby/releases/tag/v7.1.37
+[7.1.36]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.35...v7.1.36
+[7.1.36t]: https://github.com/structuredmerge/structuredmerge-ruby/releases/tag/v7.1.36
 [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

data/README.md

@@ -923,7 +923,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.182-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-12.195-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/install_task.rb

@@ -928,7 +928,7 @@ module Kettle
           end
 
           checkout = File.join(local_root, "rubocop-lts")
-          if project_root && same_path?(project_root, checkout)
+          if project_root && (same_path?(project_root, checkout) || same_git_repository?(project_root, checkout))
             return {
               name: "rubocop_lts_local_branch",
               status: "skipped",
@@ -963,6 +963,21 @@ module Kettle
           Kettle::Dev::Paths.same?(left.to_s, right.to_s)
         end
 
+        def same_git_repository?(left, right)
+          left_common_dir = git_common_dir(left)
+          right_common_dir = git_common_dir(right)
+          left_common_dir && right_common_dir && same_path?(left_common_dir, right_common_dir)
+        end
+
+        def git_common_dir(path)
+          stdout, _stderr, status = Open3.capture3("git", "-C", path.to_s, "rev-parse", "--git-common-dir")
+          return unless status.success?
+
+          File.expand_path(stdout.to_s.strip, path.to_s)
+        rescue Errno::ENOENT
+          nil
+        end
+
         def rubocop_lts_local_root(env)
           env ||= {}
           # RUBOCOP_LTS_LOCAL is a compatibility alias for projects generated

data/lib/kettle/jem/templates/.github/workflows/dep-heads.yml.example

@@ -88,7 +88,7 @@ jobs:
 
       - name: Bundle install
         if: ${{ !env.ACT && matrix.ruby == 'jruby' }}
-        run: bundle install --jobs 4
+        run: bundle install --jobs 1
 
       - name: Restore RSpec status log
         if: "${{!env.ACT}}"
@@ -161,7 +161,7 @@ jobs:
 
       - name: Bundle install
         if: ${{ !env.ACT && matrix.ruby == 'jruby' }}
-        run: bundle install --jobs 4
+        run: bundle install --jobs 1
 
       - name: Restore RSpec status log
         if: "${{!env.ACT}}"
@@ -184,6 +184,11 @@ jobs:
     continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.bundle_gemfile || 'Appraisal.root.gemfile' }}
+      # Keep JVM and native-extension build memory bounded on the constrained runner.
+      JRUBY_OPTS: "-J-Xmx1280m"
+      BUNDLE_JOBS: "1"
+      CARGO_BUILD_JOBS: "1"
+      TURBO_TESTS2_MAX_PROCESSES: 2
     strategy:
       fail-fast: true
       matrix:
@@ -235,7 +240,7 @@ jobs:
 
       - name: Bundle install
         if: ${{ !env.ACT && matrix.ruby == 'jruby' }}
-        run: bundle install --jobs 4
+        run: bundle install --jobs 1
 
       - name: Restore RSpec status log
         if: "${{!env.ACT}}"

data/lib/kettle/jem/templates/.github/workflows/truffle.yml.example

@@ -5,14 +5,12 @@ permissions:
 
 env:
   K_SOUP_COV_DO: false
-  # TruffleRuby intermittently stalls the parallel test worker pool; keep
-  # this lane serial while maintained runtimes exercise the parallel runner.
-  # Two workers: TruffleRuby parallelism is spawn-based like every other
-  # engine; serial-only lanes waste CI time and trip the stall watchdog on
-  # legitimately long tests.
+  # Cap worker concurrency to bound memory use on this JVM runtime.
+  # Previous worker failures were caused by memory exhaustion, not parallelism;
+  # retain two workers rather than disabling parallel execution.
   TURBO_TESTS2_MAX_PROCESSES: 2
-  # Serial lanes can legitimately run one long, silent test; give the stall
-  # watchdog a wider berth than the 4.0 default of 900s.
+  # Allow longer silent test windows before the worker watchdog fires.
+  # TruffleRuby can need more time than the default 900s threshold.
   TURBO_TESTS2_WATCHDOG_SECONDS: 1500
 
 on:

data/lib/kettle/jem/templates/.github/workflows/truffleruby-22.3.yml.example

@@ -5,14 +5,12 @@ permissions:
 
 env:
   K_SOUP_COV_DO: false
-  # TruffleRuby intermittently stalls the parallel test worker pool; keep
-  # this lane serial while maintained runtimes exercise the parallel runner.
-  # Two workers: TruffleRuby parallelism is spawn-based like every other
-  # engine; serial-only lanes waste CI time and trip the stall watchdog on
-  # legitimately long tests.
+  # Cap worker concurrency to bound memory use on this JVM runtime.
+  # Previous worker failures were caused by memory exhaustion, not parallelism;
+  # retain two workers rather than disabling parallel execution.
   TURBO_TESTS2_MAX_PROCESSES: 2
-  # Serial lanes can legitimately run one long, silent test; give the stall
-  # watchdog a wider berth than the 4.0 default of 900s.
+  # Allow longer silent test windows before the worker watchdog fires.
+  # TruffleRuby can need more time than the default 900s threshold.
   TURBO_TESTS2_WATCHDOG_SECONDS: 1500
 
 on:

data/lib/kettle/jem/templates/.github/workflows/truffleruby-23.1.yml.example

@@ -5,14 +5,12 @@ permissions:
 
 env:
   K_SOUP_COV_DO: false
-  # TruffleRuby intermittently stalls the parallel test worker pool; keep
-  # this lane serial while maintained runtimes exercise the parallel runner.
-  # Two workers: TruffleRuby parallelism is spawn-based like every other
-  # engine; serial-only lanes waste CI time and trip the stall watchdog on
-  # legitimately long tests.
+  # Cap worker concurrency to bound memory use on this JVM runtime.
+  # Previous worker failures were caused by memory exhaustion, not parallelism;
+  # retain two workers rather than disabling parallel execution.
   TURBO_TESTS2_MAX_PROCESSES: 2
-  # Serial lanes can legitimately run one long, silent test; give the stall
-  # watchdog a wider berth than the 4.0 default of 900s.
+  # Allow longer silent test windows before the worker watchdog fires.
+  # TruffleRuby can need more time than the default 900s threshold.
   TURBO_TESTS2_WATCHDOG_SECONDS: 1500
 
 on:

data/lib/kettle/jem/templates/.github/workflows/truffleruby-24.2.yml.example

@@ -5,14 +5,12 @@ permissions:
 
 env:
   K_SOUP_COV_DO: false
-  # TruffleRuby intermittently stalls the parallel test worker pool; keep
-  # this lane serial while maintained runtimes exercise the parallel runner.
-  # Two workers: TruffleRuby parallelism is spawn-based like every other
-  # engine; serial-only lanes waste CI time and trip the stall watchdog on
-  # legitimately long tests.
+  # Cap worker concurrency to bound memory use on this JVM runtime.
+  # Previous worker failures were caused by memory exhaustion, not parallelism;
+  # retain two workers rather than disabling parallel execution.
   TURBO_TESTS2_MAX_PROCESSES: 2
-  # Serial lanes can legitimately run one long, silent test; give the stall
-  # watchdog a wider berth than the 4.0 default of 900s.
+  # Allow longer silent test windows before the worker watchdog fires.
+  # TruffleRuby can need more time than the default 900s threshold.
   TURBO_TESTS2_WATCHDOG_SECONDS: 1500
 
 on:

data/lib/kettle/jem/templates/.github/workflows/truffleruby-25.0.yml.example

@@ -5,14 +5,12 @@ permissions:
 
 env:
   K_SOUP_COV_DO: false
-  # TruffleRuby intermittently stalls the parallel test worker pool; keep
-  # this lane serial while maintained runtimes exercise the parallel runner.
-  # Two workers: TruffleRuby parallelism is spawn-based like every other
-  # engine; serial-only lanes waste CI time and trip the stall watchdog on
-  # legitimately long tests.
+  # Cap worker concurrency to bound memory use on this JVM runtime.
+  # Previous worker failures were caused by memory exhaustion, not parallelism;
+  # retain two workers rather than disabling parallel execution.
   TURBO_TESTS2_MAX_PROCESSES: 2
-  # Serial lanes can legitimately run one long, silent test; give the stall
-  # watchdog a wider berth than the 4.0 default of 900s.
+  # Allow longer silent test windows before the worker watchdog fires.
+  # TruffleRuby can need more time than the default 900s threshold.
   TURBO_TESTS2_WATCHDOG_SECONDS: 1500
 
 on:

data/lib/kettle/jem/templates/.github/workflows/truffleruby-33.0.yml.example

@@ -5,14 +5,12 @@ permissions:
 
 env:
   K_SOUP_COV_DO: false
-  # TruffleRuby intermittently stalls the parallel test worker pool; keep
-  # this lane serial while maintained runtimes exercise the parallel runner.
-  # Two workers: TruffleRuby parallelism is spawn-based like every other
-  # engine; serial-only lanes waste CI time and trip the stall watchdog on
-  # legitimately long tests.
+  # Cap worker concurrency to bound memory use on this JVM runtime.
+  # Previous worker failures were caused by memory exhaustion, not parallelism;
+  # retain two workers rather than disabling parallel execution.
   TURBO_TESTS2_MAX_PROCESSES: 2
-  # Serial lanes can legitimately run one long, silent test; give the stall
-  # watchdog a wider berth than the 4.0 default of 900s.
+  # Allow longer silent test windows before the worker watchdog fires.
+  # TruffleRuby can need more time than the default 900s threshold.
   TURBO_TESTS2_WATCHDOG_SECONDS: 1500
 
 on:

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.19")             # ruby >= {KJ|MIN_TEST_RUBY}
+  spec.add_development_dependency("kettle-dev", "~> 3.1", ">= 3.1.20")             # ruby >= {KJ|MIN_TEST_RUBY}
 
   # Security
   spec.add_development_dependency("bundler-audit", "~> 0.9.3")                      # ruby >= 2.0.0
@@ -132,7 +132,7 @@ Gem::Specification.new do |spec|
   # Testing
   # Loads version files in anonymous namespaces for coverage without constant redefinition warnings.
   spec.add_development_dependency("anonymous_loader", "~> 0.1", ">= 0.1.3")         # ruby >= 2.2.0
-  spec.add_development_dependency("appraisal2", "~> 3.2", ">= 3.2.5")               # ruby >= 1.8.7, for testing against multiple versions of dependencies
+  spec.add_development_dependency("appraisal2", "~> 3.2", ">= 3.2.6")               # ruby >= 1.8.7, for testing against multiple versions of dependencies
   spec.add_development_dependency("kettle-test", "~> 2.0", ">= 2.0.27")            # ruby >= {KJ|MIN_TEST_RUBY}
   spec.add_development_dependency("turbo_tests2", "~> 4.0", ">= 4.0.0")           # ruby >= 2.4.0, default kettle-test runner
 

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

@@ -12,7 +12,7 @@
 gem "reek", "~> 6.6", ">= 6.6.0"
 
 platform :mri do
-  gem "appraisal2-rubocop", "~> 1.0", ">= 1.0.4", require: false
+  gem "appraisal2-rubocop", "~> 1.0", ">= 1.0.5", require: false
   gem "rubocop-gradual", "~> 0.4", ">= 0.4.0"
   # rubocop-minitest floor held at 0.40: 0.41.0 requires rubocop >= 1.89.0,
   # but standard (~> 1.56) caps rubocop at ~> 1.88.0, making the pair

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

@@ -37,6 +37,7 @@ structuredmerge_local_gems = %w[
   yaml-merge
   zip-merge
   ast-crispr
+  ast-crispr-toml
   ast-crispr-markdown-markly
   ast-crispr-ruby-prism
 ]

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

data/lib/kettle/jem.rb

@@ -63,7 +63,7 @@ module Kettle
     TEMPLATE_MANAGED_DEPENDENCIES = [
       {name: PACKAGE_NAME, requirements: ["~> 7.1", ">= 7.1.28"], bootstrap: false},
       {name: "nomono", requirements: ["~> 1.1", ">= 1.1.14"], bootstrap: true},
-      {name: "kettle-dev", requirements: ["~> 3.1", ">= 3.1.19"], bootstrap: true},
+      {name: "kettle-dev", requirements: ["~> 3.1", ">= 3.1.20"], bootstrap: true},
       {
         name: "kettle-changelog",
         requirements: ["~> 1.0", ">= 1.0.13"],
@@ -5118,11 +5118,11 @@ module Kettle
 
     def monorepo_root_gemfile_dependency_lines
       [
-        {name: "appraisal2", source: %(gem "appraisal2", "~> 3.2", ">= 3.2.5"\n)},
+        {name: "appraisal2", source: %(gem "appraisal2", "~> 3.2", ">= 3.2.6"\n)},
         {name: "bundler-audit", source: %(gem "bundler-audit", "~> 0.9.3"\n)},
-        {name: "kettle-dev", source: %(gem "kettle-dev", "~> 3.1", ">= 3.1.19"\n)},
+        {name: "kettle-dev", source: %(gem "kettle-dev", "~> 3.1", ">= 3.1.20"\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.25"\n)},
+        {name: "kettle-family", source: %(gem "kettle-family", "~> 1.3", ">= 1.3.28"\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)},
@@ -15687,13 +15687,21 @@ module Kettle
 
     # Reuse the dependency objects in project facts. Never infer a requirement
     # from a sibling's current version or scrape a rendered modular Gemfile.
+    # Exact pins (= x.y.z) are intentionally dropped: the destination's own
+    # gemspec declares them dynamically (e.g. "= #{spec.version}"), so the
+    # `gemspec` directive in the main Gemfile enforces them on every Bundler
+    # run. A materialized literal copy goes stale on the next family version
+    # bump and breaks bundle resolution (prepare_lockfiles) before templating
+    # can refresh it. Flexible constraints (floors) are kept: they survive
+    # bumps and feed local_gem_satisfies?-style gates.
     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
+          flexible = (Array(requirements[name]) + dependency.requirements_list).uniq.reject { |req| req.to_s.start_with?("=") }
+          requirements[name] = flexible unless flexible.empty?
         end
       end.sort.to_h
     end
@@ -15945,7 +15953,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.25"\n)
+      %(gem "kettle-family", "~> 1.3", ">= 1.3.28"\n)
     end
 
     def main_gemfile_nomono_bootstrap(package_name)
@@ -16406,28 +16414,51 @@ module Kettle
       version_path = version_spec_relative_version_path(version_spec_path, entrypoint_require)
       version_gem_path = version_spec_relative_version_gem_path(version_spec_path, entrypoint_require)
       path_loader = if include_version_gem_path
+        # Compact form: the whole example must stay within the default
+        # RSpec/ExampleLength Max of 5 counted lines, because destination
+        # dogfood configs (e.g. rubocop-lts-rspec) lint specs with shipped
+        # configs that do not disable that cop.
         <<~RUBY.chomp
+          dir = File.expand_path("#{File.dirname(version_path)}", __dir__)
+          paths = %w[version.rb version_gem.rb].map { |file| File.join(dir, file) }.select { |path| File.file?(path) }
+          anonymous_namespace = AnonymousLoader.load(files: paths)
+        RUBY
+      else
+        <<~RUBY.chomp
+          path = File.expand_path("#{version_path}", __dir__)
+          anonymous_namespace = AnonymousLoader.load(files: path)
+        RUBY
+      end
+      # Older emitted forms, rewritten on templating. The multi-line array was
+      # emitted both without and with a trailing comma (some destinations
+      # autocorrected to consistent_comma style); most specific first.
+      legacy_path_loaders = [
+        <<~RUBY.chomp,
+          paths = [
+            File.expand_path("#{version_path}", __dir__),
+            File.expand_path("#{version_gem_path}", __dir__),
+          ].select { |path| File.file?(path) }
+          anonymous_namespace = AnonymousLoader.load(files: paths)
+        RUBY
+        <<~RUBY.chomp,
           paths = [
             File.expand_path("#{version_path}", __dir__),
             File.expand_path("#{version_gem_path}", __dir__)
           ].select { |path| File.file?(path) }
           anonymous_namespace = AnonymousLoader.load(files: paths)
         RUBY
-      else
         <<~RUBY.chomp
           path = File.expand_path("#{version_path}", __dir__)
           anonymous_namespace = AnonymousLoader.load(files: path)
         RUBY
-      end
-      legacy_path_loader = <<~RUBY.chomp
-        path = File.expand_path("#{version_path}", __dir__)
-        anonymous_namespace = AnonymousLoader.load(files: path)
-      RUBY
-      indented_path_loader = path_loader.lines.map { |line| "    #{line}" }.join
-      indented_legacy_path_loader = legacy_path_loader.lines.map { |line| "    #{line}" }.join
-      return content.sub(indented_legacy_path_loader, indented_path_loader) if content.include?(indented_legacy_path_loader)
+      ]
+      indented_path_loader = indent_spec_lines(path_loader)
+      legacy_path_loaders.each do |legacy_path_loader|
+        indented_legacy_path_loader = indent_spec_lines(legacy_path_loader)
+        return content.sub(indented_legacy_path_loader, indented_path_loader) if content.include?(indented_legacy_path_loader)
 
-      return content.sub(legacy_path_loader, path_loader) if content.include?(legacy_path_loader)
+        return content.sub(legacy_path_loader, path_loader) if content.include?(legacy_path_loader)
+      end
 
       return content if version_spec_anonymous_loader_call?(content)
 
@@ -16467,6 +16498,10 @@ module Kettle
       "#{"../" * spec_depth}lib/#{entrypoint_require}/version_gem.rb"
     end
 
+    def indent_spec_lines(text)
+      text.lines.map { |line| "    #{line}" }.join
+    end
+
     def legacy_rbs_signature_paths(project_root, entrypoint_require)
       legacy_root = File.join(project_root, "sig", entrypoint_require.to_s)
       return [] unless Dir.exist?(legacy_root)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-jem
 version: !ruby/object:Gem::Version
-  version: 7.1.35
+  version: 7.1.37
 platform: ruby
 authors:
 - Peter H. Boling
@@ -246,7 +246,7 @@ dependencies:
         version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.18
+        version: 3.1.19
   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.18
+        version: 3.1.19
 - !ruby/object:Gem::Dependency
   name: kettle-gha-pins
   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.35
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.35/CHANGELOG.md
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.37
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.37/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-jem/7.1.35
+  documentation_uri: https://www.rubydoc.info/gems/kettle-jem/7.1.37
   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