kettle-family 1.3.34 → 1.3.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f998250246be593256749a248a7ae97b9e22eada3f522aeee55a760c7c69286
-  data.tar.gz: 5260947209c6e41c32d71daac0efc7aed14def50a68c6f26c9d7faf0934ce501
+  metadata.gz: df70ef40b82ccb54155fc57a43a1137d620d3cbd78cd74643d050b9056f3ecdb
+  data.tar.gz: aff84d0529ac6ef7b78a3248160eb72b4077f51609362c887837b1cd390a9a10
 SHA512:
-  metadata.gz: 83195b27096a7dc07f64984d5c28db5e5bbfbe101662216478550c644f90eba7eacc0d6fb86251dc6b8a88a48d39d3519582a9f038448bfea899c2b3507116c6
-  data.tar.gz: 512e1cb879df1ceb8e2dc1913e915beef55f696f0c6e97c453c3800e9bccb66293c178d9a30ce0a6384a20d6d48b8a83d6991311f23aa985109abb391fed2654
+  metadata.gz: e3ba12f341362839b45835afda346efa79c49aa886cf5d731980e0d9a2090ffe0297abb752bf72a293135e6ab4fa64c1f132210c882edfef2583c56204fb8355
+  data.tar.gz: 7cd500810f8b034e00be64dc03574d957c578be29ef1df6d17ca4bf73999c1c47a381d57799e445f1f4c0cabae3622c0ad44152b1152175c1a4b252e0800a034

data/CHANGELOG.md

@@ -30,6 +30,27 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.3.35] - 2026-10-26
+
+- TAG: [v1.3.35][1.3.35t]
+- COVERAGE: 93.07% -- 7558/8121 lines in 45 files
+- BRANCH COVERAGE: 77.45% -- 3016/3894 branches in 45 files
+- 38.89% documented
+
+### Changed
+
+- [kc] kettle-jem/prepare: updated 9 project files:
+  - dependencies (9)
+
+- [kc] kettle-jem/template: updated 4 project files:
+  - dependencies (2)
+  - other (1)
+  - workflows (1)
+
+### Fixed
+
+- [kc] duplicate-family-member-diagnostics: Duplicate gem names found in different directories now report both roots and gemspecs, with guidance for excluding scratch checkouts or disabling discovery when `members.roots` is complete.
+
 ## [1.3.34] - 2026-10-25
 
 - TAG: [v1.3.34][1.3.34t]
@@ -3278,7 +3299,9 @@ Please file a bug if you notice a violation of semantic versioning.
 - Fixed CI load failures on engines without compatible `pty` support by falling back to Open3 for interactive release commands.
 - Fixed Ruby 3.2 version-bump support by loading Prism lazily and wiring the Prism gem only for MRI versions that need it.
 
-[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.3.34...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.3.35...HEAD
+[1.3.35]: https://github.com/kettle-dev/kettle-family/compare/v1.3.34...v1.3.35
+[1.3.35t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.3.35
 [1.3.34]: https://github.com/kettle-dev/kettle-family/compare/v1.3.33...v1.3.34
 [1.3.34t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.3.34
 [1.3.33]: https://github.com/kettle-dev/kettle-family/compare/v1.3.32...v1.3.33

data/README.md

@@ -1191,7 +1191,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-8.118-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-8.121-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
 [🔐security]: https://github.com/kettle-dev/kettle-family/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/family/discovery.rb

@@ -37,7 +37,9 @@ module Kettle
 
         (configured + discovered).each do |member|
           existing = by_name[member.name]
-          raise Error, "duplicate family member #{member.name.inspect}" if existing && !same_directory?(existing.root, member.root)
+          if existing && !same_directory?(existing.root, member.root)
+            raise duplicate_member_error(existing, member)
+          end
 
           by_name[member.name] = member
         end
@@ -82,6 +84,18 @@ module Kettle
         release_dependency_member_names.include?(File.basename(File.expand_path(root)))
       end
 
+      def duplicate_member_error(first, second)
+        Error.new(<<~MESSAGE.strip)
+          duplicate family member #{first.name.inspect} found in different directories:
+            - #{first.root} (#{first.gemspec_path})
+            - #{second.root} (#{second.gemspec_path})
+          Each gem name must resolve to one family directory. If one is a scratch
+          checkout or worktree, move it outside the discovery roots or exclude it
+          with members.exclude. If members.roots lists the complete family, set
+          members.discover: false.
+        MESSAGE
+      end
+
       def primary_gemspec(root)
         gemspecs = Paths.glob(root, "*.gemspec")
         raise Error, "no gemspec found in #{root}" if gemspecs.empty?

data/lib/kettle/family/release_state_check.rb

@@ -803,7 +803,10 @@ module Kettle
         member_config = member_local_release_config(member)
         return unless member_config
 
-        self.class.new(config: member_config, members: [member]).results(event_handler: event_handler)
+        current_result = check_member(member, event_handler: event_handler)
+        return [current_result] unless current_result.ok?
+
+        [current_result, *self.class.new(config: member_config, members: [member]).results(event_handler: event_handler)]
       end
 
       def emit_event(event_handler, member:, branch:, action:, status:, **details)
@@ -997,9 +1000,18 @@ module Kettle
 
       def add_branch_worktree(root:, branch:, worktree_root:)
         WORKTREE_ADMIN_MUTEX.synchronize do
-          _stdout, stderr, status = Open3.capture3("git", "worktree", "add", "--detach", worktree_root, branch, chdir: root)
-          raise Error, "could not add worktree for #{branch}: #{stderr}" unless status.success?
+          ref = resolvable_branch_ref(root, branch)
+          _stdout, stderr, status = Open3.capture3("git", "worktree", "add", "--detach", worktree_root, ref, chdir: root)
+          raise Error, "could not add worktree for #{branch}: #{stderr.strip}; fetch the branch or create a local ref (git fetch origin #{branch})" unless status.success?
+        end
+      end
+
+      def resolvable_branch_ref(root, branch)
+        [branch, "refs/remotes/origin/#{branch}"].each do |ref|
+          _stdout, _stderr, status = Open3.capture3("git", "rev-parse", "--verify", "#{ref}^{commit}", chdir: root)
+          return ref if status.success?
         end
+        branch
       end
 
       def remove_branch_worktree(root:, worktree_root:)

data/lib/kettle/family/version.rb

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

data/lib/kettle/family/workflow.rb

@@ -2223,11 +2223,14 @@ module Kettle
         # repositories through one-at-a-time release workflows. Run those
         # members through the normal release scheduler first so configured
         # waves and their worker budget remain effective.
-        results.concat(current_branch_results(current_branch_members)) unless current_branch_members.empty?
+        current_members = start_branch ? current_branch_members : members
+        results.concat(current_branch_results(current_members)) unless current_members.empty?
         return results unless results.all?(&:ok?)
 
         target_members.each_with_object(results) do |member, memo|
           member_config = member_local_release_config(member)
+          next if start_branch.nil? && BranchTargetConfig.branch_targets_for(command, member_config.release_target_branches).empty?
+
           memo.concat(member_local_workflow(member: member, member_config: member_config).results)
           break memo unless memo.last&.ok?
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 1.3.34
+  version: 1.3.35
 platform: ruby
 authors:
 - Peter H. Boling
@@ -174,7 +174,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.18
+        version: 0.3.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -184,7 +184,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.18
+        version: 0.3.19
 - !ruby/object:Gem::Dependency
   name: kettle-jem
   requirement: !ruby/object:Gem::Requirement
@@ -214,7 +214,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.20
+        version: 0.1.22
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -224,7 +224,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.20
+        version: 0.1.22
 - !ruby/object:Gem::Dependency
   name: kettle-test
   requirement: !ruby/object:Gem::Requirement
@@ -234,7 +234,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.27
+        version: 2.0.28
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -244,7 +244,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.27
+        version: 2.0.28
 - !ruby/object:Gem::Dependency
   name: psych-merge
   requirement: !ruby/object:Gem::Requirement
@@ -336,7 +336,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.16
+        version: 1.1.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -346,7 +346,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.16
+        version: 1.1.17
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -404,7 +404,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -414,7 +414,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: appraisal2
   requirement: !ruby/object:Gem::Requirement
@@ -608,10 +608,10 @@ licenses:
 - AGPL-3.0-only
 metadata:
   homepage_uri: https://kettle-family.galtzo.com
-  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.3.34
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.3.34/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.3.35
+  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.3.35/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.3.34
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.3.35
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/kettle-dev/kettle-family/wiki
   news_uri: https://www.railsbling.com/tags/kettle-family