kettle-jem 7.1.29 → 7.1.30

data/lib/kettle/jem.rb

@@ -54,7 +54,7 @@ module Kettle
     MANAGED_BLOCK_OPEN = "# <<kettle-jem:generated>> do not edit below this line"
     MANAGED_BLOCK_CLOSE = "# <</kettle-jem:generated>>"
     GEMSPEC_DEPENDENCY_MINIMUM_REQUIREMENTS = {
-      "rspec-stubbed_env" => ">= 1.0.6"
+      "rspec-stubbed_env" => ">= 1.0.17"
     }.freeze
     # Template dependency transitions are location-independent. Prepare finds
     # declarations in the destination and reconciles their complete requirement
@@ -62,10 +62,10 @@ module Kettle
     TEMPLATE_MANAGED_DEPENDENCIES = [
       {name: PACKAGE_NAME, requirements: ["~> 7.1", ">= 7.1.28"], bootstrap: false},
       {name: "nomono", requirements: ["~> 1.1", ">= 1.1.7"], bootstrap: true},
-      {name: "kettle-dev", requirements: ["~> 3.1", ">= 3.1.11"], bootstrap: true},
+      {name: "kettle-dev", requirements: ["~> 3.1", ">= 3.1.13"], bootstrap: true},
       {
         name: "kettle-changelog",
-        requirements: ["~> 1.0", ">= 1.0.9"],
+        requirements: ["~> 1.0", ">= 1.0.10"],
         bootstrap: true,
         ruby_requirement: ">= 4.0.0"
       }
@@ -5118,15 +5118,15 @@ 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.11"\n)},
+        {name: "kettle-dev", source: %(gem "kettle-dev", "~> 3.1", ">= 3.1.13"\n)},
         {name: "kettle-drift", source: %(gem "kettle-drift", "~> 1.0", ">= 1.0.16"\n)},
         {name: "kettle-family", source: %(gem "kettle-family", "~> 1.3", ">= 1.3.10"\n)},
         {name: PACKAGE_NAME, source: kettle_jem_dependency_source},
-        {name: "kettle-test", source: %(gem "kettle-test", "~> 2.0", ">= 2.0.24"\n)},
+        {name: "kettle-test", source: %(gem "kettle-test", "~> 2.0", ">= 2.0.25"\n)},
         {name: "rake", source: %(gem "rake", "~> 13.0"\n)},
         {name: "rspec", source: %(gem "rspec", "~> 3.0"\n)},
         {name: "stone_checksums", source: %(gem "stone_checksums", "~> 1.0", ">= 1.0.9"\n)},
-        {name: "turbo_tests2", source: %(gem "turbo_tests2", "~> 3.2", ">= 3.2.14"\n)}
+        {name: "turbo_tests2", source: %(gem "turbo_tests2", "~> 4.0", ">= 4.0.0"\n)}
       ].freeze
     end
 
@@ -9565,6 +9565,7 @@ module Kettle
     # Both conflict sources share the same dependency_conflicts.resolve list,
     # decision-matching, and review gate.
     def validate_modular_dependency_conflicts!(project_root, recipe_reports)
+      validate_stale_modular_dependency_conflicts!(project_root)
       config = kettle_jem_config(project_root)
       conflicts = modular_dependency_conflicts(project_root, recipe_reports) +
         engine_dependency_conflicts(project_root, recipe_reports, config)
@@ -9618,6 +9619,45 @@ module Kettle
         "keep_both is valid only when the direct and modular requirements overlap."
     end
 
+    # A remove_modular_gem / remove_x_std_lib_eval / remove_direct_gem entry
+    # that cites a gemspec as its direct side claims the gemspec declares the
+    # gem ("the gemspec owns the dependency"). When the gemspec has since
+    # stopped declaring it, the entry is stale: every templating run strips a
+    # modular declaration the template would otherwise maintain, and downstream
+    # bundles quietly lose the gem (observed: appraisal2-rubocop failing with
+    # "Unable to find gem rubocop-lts" because .rubocop.yml inherit_gem needed
+    # a gem the conflict entry had been deleting). These are warnings, not
+    # errors — some stale entries are intentional deactivations (e.g. a member
+    # deliberately disabling the yard-junk task) — but each one deserves a
+    # human look, because the recorded reason no longer describes reality.
+    def validate_stale_modular_dependency_conflicts!(project_root)
+      config = kettle_jem_config(project_root)
+      decisions = modular_dependency_conflict_decisions(config)
+      return if decisions.empty?
+
+      gemspec_paths = Dir.glob(File.join(project_root.to_s, "*.gemspec"))
+      gemspec_content = gemspec_paths.filter_map { |path| File.read(path) if File.readable?(path) }.join("\n")
+      return if gemspec_paths.empty?
+
+      stale = decisions.select do |decision|
+        next false unless decision.fetch("direct", "").end_with?(".gemspec")
+        next false unless %w[remove_modular_gem remove_x_std_lib_eval].include?(decision.fetch("action"))
+
+        gem_name = decision.fetch("gem")
+        !gemspec_dependency_records(gemspec_content).any? { |record| record.fetch(:name) == gem_name }
+      end
+      return if stale.empty?
+
+      details = stale.map do |decision|
+        "#{decision.fetch("gem")} (#{decision.fetch("direct")} vs #{decision.fetch("modular")})"
+      end.join(", ")
+      warn(
+        "kettle-jem: stale dependency_conflicts entries — the gemspec no longer declares: #{details}. " \
+          "If the removal is intentional, update the reason in #{KETTLE_CONFIG_PATH} to say so; " \
+          "otherwise remove the entry so the template maintains the modular declaration."
+      )
+    end
+
     # Paths of a project's own directly-authored dependency manifests: the
     # root Gemfile plus any gemspec, whether already on disk or only present
     # as a pending recipe report (not yet written) for this templating run.
@@ -20716,7 +20756,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@e81a8fa391b11a595c1b7ed84177cc0fe02faf83 # v1.328.0",
+        "ruby/setup-ruby" => "ruby/setup-ruby@651ff0d62c5c79bed6d53ec518387aae20e72c1a # v1.329.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.29
+  version: 7.1.30
 platform: ruby
 authors:
 - Peter H. Boling
@@ -656,7 +656,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.24
+        version: 2.0.25
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -666,7 +666,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.24
+        version: 2.0.25
 - !ruby/object:Gem::Dependency
   name: turbo_tests2
   requirement: !ruby/object:Gem::Requirement
@@ -676,7 +676,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.14
+        version: 3.2.16
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -686,7 +686,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.14
+        version: 3.2.16
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -977,10 +977,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.29
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.29/CHANGELOG.md
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.30
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.30/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-jem/7.1.29
+  documentation_uri: https://www.rubydoc.info/gems/kettle-jem/7.1.30
   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