kettle-family 1.3.16 → 1.3.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f253e54390fa922500f64d29bcf51abb4a17ad248e0cbe52301bbdb988e5b4ef
4
- data.tar.gz: 45faa9670646e280591bc6b6994cac62f33ce8ed97fd3ea0ea84fdab85a264a8
3
+ metadata.gz: f6166c5366a3a6175dd73b92d85266730bb16a2598c201785f596245e27eb1f2
4
+ data.tar.gz: e1120fcc387e5eca5ff2ae8e14f28e1761003f799c7861e0cd626e92b5497514
5
5
  SHA512:
6
- metadata.gz: 884847e0224a90bf844a1ba51680918ab367a959f3afd72ce1f8c891a4cca2a941233cb3f3d30138778358efb298c5943edaf8b1ff001983916921dbb6aa1ec1
7
- data.tar.gz: 6a5f198721e4bc6e32f95c9bdc9b73abb3f846399eb09d2f3a898fdbc52b7dab01c2030cd76724a414d123e86dcd4bdf5563aebefe939f170ffc037633716664
6
+ metadata.gz: '0818f112b4a9e37e726d4804db2a1b47ff11d78ae6e8773a5370e8faeba0532e3c1d299cd210f193365717fdf711c85cc687be67c35202ce087d36ca619d5986'
7
+ data.tar.gz: 68125b254ed371d6a2f3d721b223d8459514299fbbaa9b0e5f5402f00cf8340b20f599a5b8c6cd5da6b1499306e51d1313cba86dcf643166288eb4b8ab7050a5
checksums.yaml.gz.sig CHANGED
Binary file
data/CHANGELOG.md CHANGED
@@ -30,6 +30,28 @@ Please file a bug if you notice a violation of semantic versioning.
30
30
 
31
31
  ### Security
32
32
 
33
+ ## [1.3.18] - 2026-10-18
34
+
35
+ - TAG: [v1.3.18][1.3.18t]
36
+ - COVERAGE: 93.01% -- 7275/7822 lines in 44 files
37
+ - BRANCH COVERAGE: 77.31% -- 2909/3763 branches in 44 files
38
+ - 37.01% documented
39
+
40
+ ### Fixed
41
+
42
+ - Lockstep bump catches up siblings left behind the cohort line: a version-locked member whose checkout version sits behind the aggregate's version line is bump-pending on its own, independent of whether a sibling is actively bump-pending (the case after a cohort bump skips a brand-new member). The shared-changelog path (changelog mode: root) now applies lockstep normalization, and blank latest_released no longer parses as version 0 (Gem::Version.new("") => 0), which had made never-released members look mid-prep.
43
+
44
+ ## [1.3.17] - 2026-10-18
45
+
46
+ - TAG: [v1.3.17][1.3.17t]
47
+ - COVERAGE: 93.01% -- 7264/7810 lines in 44 files
48
+ - BRANCH COVERAGE: 77.32% -- 2905/3757 branches in 44 files
49
+ - 37.01% documented
50
+
51
+ ### Fixed
52
+
53
+ - Version-locked siblings bump in lockstep: when any member of an aggregate release (members not listed in release.aggregate_validation.exclude_members) needs a version bump, every member of that aggregate is marked bump-pending — including members without unreleased changelog entries of their own and brand-new members that have never been released. Independently releasable members (e.g. kettle-jem in structuredmerge-ruby) keep per-member bump semantics, and members already mid-prep (checkout version past their last release) are never double-bumped.
54
+
33
55
  ## [1.3.16] - 2026-10-18
34
56
 
35
57
  - TAG: [v1.3.16][1.3.16t]
@@ -3075,7 +3097,11 @@ Please file a bug if you notice a violation of semantic versioning.
3075
3097
  - Fixed CI load failures on engines without compatible `pty` support by falling back to Open3 for interactive release commands.
3076
3098
  - Fixed Ruby 3.2 version-bump support by loading Prism lazily and wiring the Prism gem only for MRI versions that need it.
3077
3099
 
3078
- [Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.3.16...HEAD
3100
+ [Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.3.18...HEAD
3101
+ [1.3.18]: https://github.com/kettle-dev/kettle-family/compare/v1.3.17...v1.3.18
3102
+ [1.3.18t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.3.18
3103
+ [1.3.17]: https://github.com/kettle-dev/kettle-family/compare/v1.3.16...v1.3.17
3104
+ [1.3.17t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.3.17
3079
3105
  [1.3.16]: https://github.com/kettle-dev/kettle-family/compare/v1.3.15...v1.3.16
3080
3106
  [1.3.16t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.3.16
3081
3107
  [1.3.15]: https://github.com/kettle-dev/kettle-family/compare/v1.3.14...v1.3.15
data/README.md CHANGED
@@ -1225,7 +1225,7 @@ Thanks for RTFM. ☺️
1225
1225
  [📌gitmoji]: https://gitmoji.dev
1226
1226
  [📌gitmoji-img]: https://img.shields.io/badge/gitmoji_commits-%20%F0%9F%98%9C%20%F0%9F%98%8D-34495e.svg?style=flat-square
1227
1227
  [🧮kloc]: https://www.youtube.com/watch?v=dQw4w9WgXcQ
1228
- [🧮kloc-img]: https://img.shields.io/badge/KLOC-7.797-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
1228
+ [🧮kloc-img]: https://img.shields.io/badge/KLOC-7.822-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
1229
1229
  [🔐security]: https://github.com/kettle-dev/kettle-family/blob/main/SECURITY.md
1230
1230
  [🔐security-img]: https://img.shields.io/badge/security-policy-259D6C.svg?style=flat
1231
1231
  [📄copyright-notice-explainer]: https://opensource.stackexchange.com/questions/5778/why-do-licenses-such-as-the-mit-license-specify-a-single-year
@@ -48,14 +48,14 @@ module Kettle
48
48
  return branch_results(event_handler: event_handler) unless release_target_branches.empty?
49
49
  if shared_changelog?
50
50
  results = parallel_map(members) { |member| check_shared_changelog_member_or_local(member, event_handler: event_handler) }
51
- return normalize_shared_version_bump(results)
51
+ return normalize_lockstep_version_bump(normalize_shared_version_bump(results))
52
52
  end
53
53
 
54
54
  member_results = parallel_map(members) do |member|
55
55
  member_branch_results = member_local_branch_results(member, event_handler: event_handler)
56
56
  member_branch_results || check_member(member, event_handler: event_handler)
57
57
  end
58
- member_results.flat_map { |result| Array(result) }
58
+ normalize_lockstep_version_bump(member_results.flat_map { |result| Array(result) })
59
59
  end
60
60
 
61
61
  private
@@ -827,6 +827,71 @@ module Kettle
827
827
  config&.shared_changelog?
828
828
  end
829
829
 
830
+ # Version-locked siblings move in lockstep. Members not declared
831
+ # independently releasable (release.aggregate_validation.exclude_members)
832
+ # share the family version line, so:
833
+ # 1. when any of them needs a version bump, all of them do — including
834
+ # members without unreleased changelog entries of their own and
835
+ # brand-new members that have never been released (empty
836
+ # latest_released);
837
+ # 2. a member whose checkout version sits behind the cohort's version
838
+ # line (e.g. a cohort that already bumped while it stayed put) needs
839
+ # a catch-up bump on its own.
840
+ # Independently releasable members keep per-member bump semantics: they
841
+ # bump only when their own unreleased entries require it. Members whose
842
+ # checkout version already moved past their last release are mid-prep
843
+ # and are never double-bumped.
844
+ def normalize_lockstep_version_bump(results)
845
+ excluded = Array(config&.release_aggregate_validation_excluded_members).map(&:to_s)
846
+ return results if excluded.empty?
847
+
848
+ aggregate = results.select do |result|
849
+ result.ok? && !excluded.include?(result.member_name.to_s)
850
+ end
851
+ return results if aggregate.empty?
852
+
853
+ cohort_version = aggregate.filter_map { |result| lockstep_version(result.state["version"]) }.max
854
+ pending_cohort = aggregate.any? { |result| result.state["bump_release_pending"] == true }
855
+ return results if cohort_version.nil? && !pending_cohort
856
+
857
+ results.map do |result|
858
+ next result unless result.ok? && !excluded.include?(result.member_name.to_s)
859
+
860
+ state = result.state
861
+ next result if state["bump_release_pending"] == true
862
+
863
+ version = lockstep_version(state["version"])
864
+ latest_released = lockstep_version(state["latest_released"])
865
+ catch_up = !cohort_version.nil? && !version.nil? && version < cohort_version
866
+ mid_prep = !latest_released.nil? && !version.nil? && version > latest_released
867
+ next result if mid_prep && !catch_up
868
+ next result if !catch_up && !pending_cohort
869
+
870
+ result.class.new(
871
+ member_name: result.member_name,
872
+ command: result.command,
873
+ workdir: result.workdir,
874
+ status: result.status,
875
+ success: result.success,
876
+ stdout: result.stdout,
877
+ stderr: result.stderr,
878
+ elapsed_seconds: result.elapsed_seconds,
879
+ state: state.merge("bump_release_pending" => true),
880
+ reason: result.reason,
881
+ branch: result.branch
882
+ )
883
+ end
884
+ end
885
+
886
+ def lockstep_version(value)
887
+ text = value.to_s
888
+ return nil if text.empty?
889
+
890
+ Gem::Version.new(text)
891
+ rescue ArgumentError
892
+ nil
893
+ end
894
+
830
895
  def normalize_shared_version_bump(results)
831
896
  shared_results = results.select { |result| result.ok? && shared_changelog_member_result?(result) }
832
897
  return results unless shared_results.any? { |result| result.state["bump_release_pending"] == true }
@@ -5,7 +5,7 @@ module Kettle
5
5
  # Version namespace for this gem.
6
6
  module Version
7
7
  # Current gem version.
8
- VERSION = "1.3.16"
8
+ VERSION = "1.3.18"
9
9
  end
10
10
  # Current gem version exposed at the traditional constant location.
11
11
  VERSION = Version::VERSION # Traditional Constant Location
data.tar.gz.sig CHANGED
Binary file
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: kettle-family
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.16
4
+ version: 1.3.18
5
5
  platform: ruby
6
6
  authors:
7
7
  - Peter H. Boling
@@ -567,10 +567,10 @@ licenses:
567
567
  - AGPL-3.0-only
568
568
  metadata:
569
569
  homepage_uri: https://kettle-family.galtzo.com
570
- source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.3.16
571
- changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.3.16/CHANGELOG.md
570
+ source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.3.18
571
+ changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.3.18/CHANGELOG.md
572
572
  bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
573
- documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.3.16
573
+ documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.3.18
574
574
  funding_uri: https://github.com/sponsors/pboling
575
575
  wiki_uri: https://github.com/kettle-dev/kettle-family/wiki
576
576
  news_uri: https://www.railsbling.com/tags/kettle-family
metadata.gz.sig CHANGED
Binary file