kettle-family 1.2.40 → 1.2.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ae02661d9a36e34dd38c321a3dfffdc01eb76e04fb56c2ea7dd1e88696e705d
-  data.tar.gz: 84346e531c984489bc1aefa38a7216b785e43d8e1b6cb644e3216f964337b6e1
+  metadata.gz: 06e650b41451e42fa21f02b33415452f6150a28f23a7201476d7b53898985836
+  data.tar.gz: 78d0efc3990b00ae0f89e9fb0e4ea1f187248cdfb23280492495cd119e4b5e42
 SHA512:
-  metadata.gz: d051b1afc05be2812619df64f07fb55bf6cc5c45cd1415456a6815b2c78328ec187e739ba440cd80790f69b23abaea203134fef53d5db74d11eb62ea34af87e2
-  data.tar.gz: '06388c5aeb7993996202b0876e5a71e156e0ea6a18284812d2dd1d42019aa933cdb7c9492aee0335dd539fc2d56cf33860ceaf77a97ea343d12b8057bbd81905'
+  metadata.gz: 73a92a80cfa7c1774bdf4af3cdd36f5e9d56eaab91a350b3ef9ac2478d3c142f8843c732b2d7a5c5690dfb317a0fad2d855bead22054e5044cd08504d978e87d
+  data.tar.gz: 3266c134547b5a0001c1979d706b2d68bee48deea4b4f4fa787a833e8a47379c5d94e4b121885f5f99a9f81c0b1fedcd1099babbce9807c91ee269a9c5c403d9

data/CHANGELOG.md

@@ -30,6 +30,21 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.2.41] - 2026-08-07
+
+- TAG: [v1.2.41][1.2.41t]
+- COVERAGE: 93.55% -- 5020/5366 lines in 32 files
+- BRANCH COVERAGE: 76.05% -- 2010/2643 branches in 32 files
+- 29.81% documented
+
+### Fixed
+
+- Propagate shared-version bump state across all family members.
+
+- Align incomplete shared-version bumps to one family target version.
+
+- Distinguish partial shared-version bumps from aligned family bumps.
+
 ## [1.2.40] - 2026-08-07
 
 - TAG: [v1.2.40][1.2.40t]
@@ -1909,7 +1924,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.2.40...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.2.41...HEAD
+[1.2.41]: https://github.com/kettle-dev/kettle-family/compare/v1.2.40...v1.2.41
+[1.2.41t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.41
 [1.2.40]: https://github.com/kettle-dev/kettle-family/compare/v1.2.39...v1.2.40
 [1.2.40t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.40
 [1.2.39]: https://github.com/kettle-dev/kettle-family/compare/v1.2.38...v1.2.39

data/README.md

@@ -837,7 +837,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-5.348-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-5.366-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/cli.rb

@@ -750,7 +750,7 @@ module Kettle
 
       def command_results_for_current_branch(command:, config:, members:, options:, start_at: StartAt.new(nil, nil), state_event_handler: nil)
         return mise_trust_results(config: config, members: members) if command == "mise-trust"
-        return bump_version_results(members: members, options: options, phase: command) if %w[bump bump-version].include?(command)
+        return bump_version_results(config: config, members: members, options: options, phase: command) if %w[bump bump-version].include?(command)
         return add_changelog_results(members: members, options: options) if command == "add-changelog"
         return clean_unreleased_results(config: config, members: members, options: options) if command == "clean-unreleased"
         return reconcile_release_results(config: config, members: members, options: options) if command == "reconcile-releases"
@@ -1003,12 +1003,13 @@ module Kettle
         StartAt.new(member, branch)
       end
 
-      def bump_version_results(members:, options:, phase:)
+      def bump_version_results(config:, members:, options:, phase:)
         require_relative "version_bump"
         require_relative "release_waves"
 
         results = []
         completed_target_versions = {}
+        shared_target_version = shared_bump_target_version(config: config, members: members, options: options)
         ReleaseWaves.new(members: members).waves.each do |wave|
           bump = VersionBump.new(
             members: wave,
@@ -1016,6 +1017,7 @@ module Kettle
             from_version: options[:from_version],
             mode: bump_version_mode(options),
             phase: phase,
+            shared_target_version: shared_target_version,
             dependency_target_versions: completed_target_versions
           )
           wave_results = bump.results
@@ -1042,6 +1044,17 @@ module Kettle
         end
       end
 
+      def shared_bump_target_version(config:, members:, options:)
+        return unless config.shared_changelog?
+        return unless Kettle::Dev::VersionBump::BUMP_TYPES.include?(options[:target_version].to_s)
+
+        versions = members.map { |member| Gem::Version.new(member.version.to_s) }.uniq
+        current = versions.max
+        return current.to_s if versions.length > 1
+
+        Kettle::Dev::VersionBump.resolve_target_version(options[:target_version].to_s, current.to_s)
+      end
+
       def add_changelog_results(members:, options:)
         section = options[:changelog_section].to_s
         entry = options[:changelog_entry].to_s

data/lib/kettle/family/release_state_check.rb

@@ -35,7 +35,10 @@ module Kettle
 
       def results(event_handler: nil)
         return branch_results(event_handler: event_handler) unless release_target_branches.empty?
-        return parallel_map(members) { |member| check_shared_changelog_member_or_local(member, event_handler: event_handler) } if shared_changelog?
+        if shared_changelog?
+          results = parallel_map(members) { |member| check_shared_changelog_member_or_local(member, event_handler: event_handler) }
+          return normalize_shared_version_bump(results)
+        end
 
         member_results = parallel_map(members) do |member|
           member_branch_results = member_local_branch_results(member, event_handler: event_handler)
@@ -55,7 +58,8 @@ module Kettle
           with_branch_worktree(root: root, branch: branch) do |worktree_root|
             branch_members = discover_branch_members(worktree_root: worktree_root, selected_names: selected_names)
             if shared_changelog?
-              memo.concat(parallel_map(branch_members) { |member| check_shared_changelog_member_or_local(member, branch: branch, event_handler: event_handler) })
+              results = parallel_map(branch_members) { |member| check_shared_changelog_member_or_local(member, branch: branch, event_handler: event_handler) }
+              memo.concat(normalize_shared_version_bump(results))
               next
             end
 
@@ -736,6 +740,28 @@ module Kettle
         config&.shared_changelog?
       end
 
+      def normalize_shared_version_bump(results)
+        return results unless results.any? { |result| result.ok? && result.state["bump_release_pending"] == true }
+
+        results.map do |result|
+          next result unless result.ok?
+
+          result.class.new(
+            member_name: result.member_name,
+            command: result.command,
+            workdir: result.workdir,
+            status: result.status,
+            success: result.success,
+            stdout: result.stdout,
+            stderr: result.stderr,
+            elapsed_seconds: result.elapsed_seconds,
+            state: result.state.merge("bump_release_pending" => true),
+            reason: result.reason,
+            branch: result.branch
+          )
+        end
+      end
+
       def git_root
         stdout, stderr, status = Open3.capture3("git", "rev-parse", "--show-toplevel", chdir: config.root)
         raise Error, "could not determine git root for #{config.root}: #{stderr}" unless status.success?

data/lib/kettle/family/version.rb

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

data/lib/kettle/family/version_bump.rb

@@ -7,13 +7,14 @@ module Kettle
     class VersionBump
       DEPENDENCY_METHODS = %i[add_dependency add_runtime_dependency add_development_dependency].freeze
 
-      def initialize(members:, target_version:, from_version: nil, mode: :dry_run, phase: "bump-version", dependency_target_versions: nil)
+      def initialize(members:, target_version:, from_version: nil, mode: :dry_run, phase: "bump-version", dependency_target_versions: nil, shared_target_version: nil)
         @members = members
         @target_version = target_version.to_s
         @explicit_target_version = validate_version(target_version) unless Kettle::Dev::VersionBump::BUMP_TYPES.include?(@target_version)
         @from_version = validate_version(from_version) if from_version
         @mode = mode
         @phase = phase
+        @shared_target_version = shared_target_version && validate_version(shared_target_version)
         @member_names = members.map(&:name)
         @member_target_versions = members.each_with_object({}) do |member, memo|
           memo[member.name] = resolve_target_version(member)
@@ -32,7 +33,7 @@ module Kettle
 
       private
 
-      attr_reader :members, :target_version, :explicit_target_version, :from_version, :mode, :phase, :member_target_versions, :dependency_target_versions, :dependency_member_names
+      attr_reader :members, :target_version, :explicit_target_version, :from_version, :mode, :phase, :member_target_versions, :dependency_target_versions, :dependency_member_names, :shared_target_version
 
       def validate_version(version)
         with_dev_errors { Kettle::Dev::VersionBump.validate_version(version) }
@@ -147,6 +148,7 @@ module Kettle
 
       def resolve_target_version(member)
         return explicit_target_version unless Kettle::Dev::VersionBump::BUMP_TYPES.include?(target_version)
+        return shared_target_version if shared_target_version
 
         with_dev_errors { Kettle::Dev::VersionBump.resolve_target_version(target_version, member.version) }
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 1.2.40
+  version: 1.2.41
 platform: ruby
 authors:
 - Peter H. Boling
@@ -360,10 +360,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.2.40
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.40/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.2.41
+  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.41/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.40
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.41
   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