kettle-jem 7.1.41 → 7.1.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f44a87b5964c590bf6eb74a9da0ae7900cac81230aea488043d27668c4339cee
-  data.tar.gz: 350675e9ec0c38f3104318288598c7bfc814c1a36c290ed1cb31ace8fd55093f
+  metadata.gz: 774ab005c760740284caae836c23a5962d65a2687d9cda7d870a1ac5399af4d6
+  data.tar.gz: 2fbeccdec4f1bd716dfe46d652ac0d52141ae2dc067458e55200860c09488838
 SHA512:
-  metadata.gz: 3b30a4785a25f30cff74549eb28b0c1ccc716d1f549572a385935f06d3191cd109df50589e48c50a401e47dcf4f4dec2715fd1b4ccfac58941ae71cf89f6ce40
-  data.tar.gz: 1c5335c6579f99a7a993d463287b3a7ffee8bff522dc58151ac35e3ed8c8e3fa37457117adb1b8f261449edd3179efd47e4fdd53a471f165e37fe986aba1e578
+  metadata.gz: aa11a578eec5dfdeafcf8975ef408af3f5c219bf2ad45741d2f905c8f97975c5bca997348e634a9296210d95b2f6aebed43fffa7b172338d6d91ac132a1d0781
+  data.tar.gz: ce0d1f9444959142894053cd2ea7e2b09f23ddec1ecb1b46b824057944aa0465028696d455635f4fb4d940080ba5082f38b9db5cd96a3646f205e1c97a02b215

data/CHANGELOG.md

@@ -33,7 +33,7 @@ Please file a bug if you notice a violation of semantic versioning.
   - other (1)
 
 - [kc] kettle-jem-deps-floor: Update kettle-jem template dependency floors:
-  - addressable (>= 2.9.0 -> >= 2.9.1)
+  - kettle-family (>= 1.3.36 -> >= 1.3.37)
 
 - [kc] kettle-jem-workflow-pins: Update pinned GitHub Actions in kettle-jem templates:
   - ruby/setup-ruby v1.335.0 (7f797815d8adceb1c412e7abefdd1ab4abc47a5f) -> v1.336.0 (de492cf36cbab201753d720ce4f4e336cd688c94)
@@ -44,6 +44,8 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Fixed
 
+- Template sweep no longer deletes per-Ruby-version modular gemfile variants (x_std_libs r2/r3/r3.1 libs.gemfile and the std-lib gem variants they load) while a committed version-split loader still eval_gemfile's them; gemfile sweep deletions now respect the reference closure of the loaders that remain, so only genuinely unreferenced variants are pruned.
+
 ### Security
 
 ## [7.1.41] - 2026-10-29

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

data/lib/kettle/jem.rb

@@ -5154,7 +5154,7 @@ module Kettle
         {name: "bundler-audit", source: %(gem "bundler-audit", "~> 0.9.3"\n)},
         {name: "kettle-dev", source: %(gem "kettle-dev", "~> 3.1", ">= 3.1.26"\n)},
         {name: "kettle-drift", source: %(gem "kettle-drift", "~> 1.0", ">= 1.0.19"\n)},
-        {name: "kettle-family", source: %(gem "kettle-family", "~> 1.3", ">= 1.3.36"\n)},
+        {name: "kettle-family", source: %(gem "kettle-family", "~> 1.3", ">= 1.3.37"\n)},
         {name: PACKAGE_NAME, source: kettle_jem_dependency_source},
         {name: "kettle-test", source: %(gem "kettle-test", "~> 2.0", ">= 2.0.29"\n)},
         {name: "rake", source: %(gem "rake", "~> 13.0"\n)},
@@ -16162,7 +16162,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.36"\n)
+      %(gem "kettle-family", "~> 1.3", ">= 1.3.37"\n)
     end
 
     def main_gemfile_nomono_bootstrap(package_name)
@@ -19390,9 +19390,78 @@ module Kettle
 
         {target_path: relative_path} if skip_packaged_gemfile_template?(relative_path, config)
       end
+      gemfile_cleanups = reject_loader_referenced_gemfile_cleanups(project_root, gemfile_cleanups)
       (gemfile_cleanups + disabled_integration_config_cleanups(project_root, config)).sort_by { |cleanup| cleanup.fetch(:target_path) }
     end
 
+    # Reference-closure guard for sweep deletions of per-Ruby-version modular
+    # gemfile variants. The committed loaders (e.g. gemfiles/modular/x_std_libs.gemfile)
+    # branch on RUBY_VERSION and eval_gemfile every bucket variant, so a bucket can
+    # be irrelevant to the destination's minimum test Ruby while older Rubies still
+    # resolve the loader's branch table to it. Observed: the 7.1.41 family sweep
+    # deleted the r2/r3/r3.1 variants (plus the std-lib gem variants they load)
+    # and CI's Ruby 3.3 probe hit Errno::ENOENT eval_gemfile'ing a deleted file.
+    # A variant may only be deleted when no loader that itself survives the sweep
+    # references it, directly or through another kept variant.
+    def reject_loader_referenced_gemfile_cleanups(project_root, cleanups)
+      deletable = cleanups.map { |cleanup| cleanup.fetch(:target_path).to_s }.select { |path| path.end_with?(".gemfile") }.uniq
+      return cleanups if deletable.empty?
+
+      referenced = loader_referenced_gemfile_closure(project_root, deletable.to_set)
+      return cleanups if referenced.empty?
+
+      cleanups.reject { |cleanup| referenced.include?(cleanup.fetch(:target_path).to_s) }
+    end
+
+    # Every +deletable+ gemfile path under the project reachable via
+    # eval_gemfile / require_relative from a gemfile that is NOT slated for
+    # deletion (the loaders that remain after the sweep). Kept variants join the
+    # scan, so reference chains survive whole: loader -> r3/libs.gemfile ->
+    # ../../erb/r3/v5.0.gemfile. References are collected from the AST call
+    # records (Prism), never from regex source scanning; branch tables inside
+    # if/elsif still yield every eval_gemfile call node they contain, which is
+    # exactly the closure the committed loader needs.
+    def loader_referenced_gemfile_closure(project_root, deletable)
+      root = File.expand_path(project_root.to_s)
+      raw_prefix = "#{project_root.to_s.chomp('/')}/"
+      queue = Dir.glob(File.join(root, "gemfiles/**/*.gemfile")).map { |path| path.delete_prefix("#{root}/").delete_prefix(raw_prefix) }
+      main_gemfile = File.join(root, "Gemfile")
+      queue << "Gemfile" if File.file?(main_gemfile)
+      queue.reject! { |path| deletable.include?(path) }
+
+      kept = Set.new
+      scanned = Set.new
+      until queue.empty?
+        relative = queue.pop
+        next unless scanned.add?(relative)
+
+        absolute = File.join(root, relative)
+        next unless File.file?(absolute)
+
+        gemfile_reference_targets(File.read(absolute), File.dirname(absolute)).each do |target|
+          next unless target.start_with?("#{root}/")
+
+          project_relative = target.delete_prefix("#{root}/")
+          next unless deletable.include?(project_relative)
+          next unless kept.add?(project_relative)
+
+          # The referenced variant survives the sweep, so its own references
+          # must survive too (iterated closure to a fixed point).
+          queue << project_relative
+        end
+      end
+      kept
+    end
+
+    # Absolute paths targeted by eval_gemfile / require_relative calls in a
+    # gemfile source. Both resolve relative to the referencing file's directory.
+    def gemfile_reference_targets(content, base_dir)
+      %i[eval_gemfile require_relative].flat_map { |call_name| ruby_call_records(content.to_s, call_name) }
+        .filter_map { |call| ruby_string_argument(call) }
+        .map { |reference| File.expand_path(reference.to_s, base_dir) }
+        .uniq
+    end
+
     def shim_profile_cleanups(project_root, facts, preferences, template_selection: {})
       return [] unless facts[:template_profile].to_s == SHIM_TEMPLATE_PROFILE
       return [] unless Array(template_selection[:only]).empty?

data.tar.gz.sig

@@ -1,2 +1,2 @@
-�9���Ս0]t�P��O�V2Q��%
|H�cC��t�W<\�'EFY�ȉ�
r�*"�����r^6
-{�n@6���x",���Hh6�/7Qi��mFzF#��T[��Uڧ{�������A������k��Q�K���d4{��ztݏ����4!�����06�'ݩ�|�8��'br8�X#�U�zOq|��(@�F�S�k��n�FI)D�M��z�+,u����(g��ج	�r=��`;8��巑R�#��
+"�DGp��
��@t/��N<�eTe��6�"���B�!2��J�,8X����1�� %�l��ோU�D�);p|�w]���u#����py��h�ם>7�쬥]U��^�@4Ei�5��������������!]�I�~U�����_Jv�D-j�K̵:�1�k#���h�������;�i����_�oB�����j�Rט
����Q�XQ�zA�$�!��YO3��V���&*_S�����@�6���7P�>���o���T�u�>�G�2�+�6`��%�`�KUt�D{�Z�x�&t��ī��m���u���@�rq9r|8����$�ՎC�ݩ�ש��8g��Ȉ��A���ԛ�
�/<�YI�
+��g"��v�

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-jem
 version: !ruby/object:Gem::Version
-  version: 7.1.41
+  version: 7.1.42
 platform: ruby
 authors:
 - Peter H. Boling
@@ -1021,10 +1021,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.41
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.41/CHANGELOG.md
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.42
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.42/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-jem/7.1.41
+  documentation_uri: https://www.rubydoc.info/gems/kettle-jem/7.1.42
   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