kettle-jem 7.1.34 → 7.1.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e652034338fd5859484f79531a6d6a14e1e12379e3d2b72144f4df384bfb7d66
-  data.tar.gz: 0e96ba0332102c087f9f431569996228dd242b698076a9ca1536c29fa5205690
+  metadata.gz: '0094c748646fa2cd3b6323dd9f33a91fade4d50beccd1228fa3110a1fafb8eb4'
+  data.tar.gz: 0cc786c8fc4b58d259b83b3ed95f4415f40d42220f18d4a8de9014d9efe829ed
 SHA512:
-  metadata.gz: fecfbcc62374cf07646674827e23baabffaec9d7d294b1d6434d3806561b0c8a6c6573ee2a82bf99e765ae3fbc6063761a419f57e33c20e6b29edef84cf093dd
-  data.tar.gz: 8566b17caba41147787adf29ce20730f0a6ba5073b263ec05a96bb09f17d072bb6cb3387b5e05ef01746f73cde2b3132aa77dd5d0fef5a1e34e1fdd457326901
+  metadata.gz: b23a45cb7fe8737bd1a1fc0fe62b62b7b9639c7b7c9f9311cf178a4dd0dde4f9ea422e143eec8a91c923315251a081674566e29b0a88f7ce125d8d26f90e286d
+  data.tar.gz: 00e22914f132cce23ff0fceaa4d052d947a90460a7a60595db3b2367fb9b64d6d5c91990c71c8b219b0a01961a491fd00a07046475b99b910007f637784eb54d

data/CHANGELOG.md

@@ -30,6 +30,28 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [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]
+- 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]
@@ -2348,7 +2370,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.34...HEAD
+[Unreleased]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.36...HEAD
+[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
 [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

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.178-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-12.191-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/version.rb

@@ -5,7 +5,7 @@ module Kettle
     # Version namespace for this gem.
     module Version
       # Current gem version.
-      VERSION = "7.1.34"
+      VERSION = "7.1.36"
     end
     # Current gem version exposed at the traditional constant location.
     VERSION = Version::VERSION # Traditional Constant Location

data/lib/kettle/jem.rb

@@ -9875,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-jem
 version: !ruby/object:Gem::Version
-  version: 7.1.34
+  version: 7.1.36
 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.34
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.34/CHANGELOG.md
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.36
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.36/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-jem/7.1.34
+  documentation_uri: https://www.rubydoc.info/gems/kettle-jem/7.1.36
   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