kettle-jem 7.1.35 → 7.1.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1760c5c4522f12469f4dd8b03571cc2fa22f93d364e2da8a54c3cc93d57e292
-  data.tar.gz: bf01a7571deabfabc42d7314f48b6198811221cdcda975b798ca8a9406ccc211
+  metadata.gz: '0094c748646fa2cd3b6323dd9f33a91fade4d50beccd1228fa3110a1fafb8eb4'
+  data.tar.gz: 0cc786c8fc4b58d259b83b3ed95f4415f40d42220f18d4a8de9014d9efe829ed
 SHA512:
-  metadata.gz: 2ad19f6e1bffb1959452eae2f59d31d203412ba9341dabc04746fb8202f72b31dcf8c7ad7f377a6e509c3db8ccbc13b21440ce9456921d55725fe85e8355b2b8
-  data.tar.gz: 06aeb688c7b0064d0dfc325a34666a01a51f42dcfcc272994583799e1f5c8e9438e88903073b436377550a4ae5c213905cdf171efd93514d70826b2b369ca855
+  metadata.gz: b23a45cb7fe8737bd1a1fc0fe62b62b7b9639c7b7c9f9311cf178a4dd0dde4f9ea422e143eec8a91c923315251a081674566e29b0a88f7ce125d8d26f90e286d
+  data.tar.gz: 00e22914f132cce23ff0fceaa4d052d947a90460a7a60595db3b2367fb9b64d6d5c91990c71c8b219b0a01961a491fd00a07046475b99b910007f637784eb54d

data/CHANGELOG.md

@@ -30,6 +30,17 @@ 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]
@@ -2359,7 +2370,9 @@ 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.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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-jem
 version: !ruby/object:Gem::Version
-  version: 7.1.35
+  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.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.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.35
+  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