kettle-family 1.3.33 → 1.3.35

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: 646b0097f97ea1abfff730ac776a891aae9b6950c90b24ee577f6b82ba008e13
4
- data.tar.gz: ac19e11467c5c306b6bbc2d2db21cb0424c6acdb7f59a2cb20cf107d11a7789b
3
+ metadata.gz: df70ef40b82ccb54155fc57a43a1137d620d3cbd78cd74643d050b9056f3ecdb
4
+ data.tar.gz: aff84d0529ac6ef7b78a3248160eb72b4077f51609362c887837b1cd390a9a10
5
5
  SHA512:
6
- metadata.gz: bb4cb10981c8837f6db7b1d3e55291bc2e9e9ca18937dd5e460313b55e0acaf8d07a2ac4f1aa5f04d0b9533ac65b0c6bf6a302b3b8b64480cd80f6168431e3f8
7
- data.tar.gz: 01bf6b6a51116d62733a0e8216ad3cef2f690045e464944ce2a25af5507389878207abf4f775d3838fdeeeea46c5462fec4b7b6ad4026d5b2f6a28408dffdddc
6
+ metadata.gz: e3ba12f341362839b45835afda346efa79c49aa886cf5d731980e0d9a2090ffe0297abb752bf72a293135e6ab4fa64c1f132210c882edfef2583c56204fb8355
7
+ data.tar.gz: 7cd500810f8b034e00be64dc03574d957c578be29ef1df6d17ca4bf73999c1c47a381d57799e445f1f4c0cabae3622c0ad44152b1152175c1a4b252e0800a034
checksums.yaml.gz.sig CHANGED
Binary file
data/CHANGELOG.md CHANGED
@@ -30,6 +30,48 @@ Please file a bug if you notice a violation of semantic versioning.
30
30
 
31
31
  ### Security
32
32
 
33
+ ## [1.3.35] - 2026-10-26
34
+
35
+ - TAG: [v1.3.35][1.3.35t]
36
+ - COVERAGE: 93.07% -- 7558/8121 lines in 45 files
37
+ - BRANCH COVERAGE: 77.45% -- 3016/3894 branches in 45 files
38
+ - 38.89% documented
39
+
40
+ ### Changed
41
+
42
+ - [kc] kettle-jem/prepare: updated 9 project files:
43
+ - dependencies (9)
44
+
45
+ - [kc] kettle-jem/template: updated 4 project files:
46
+ - dependencies (2)
47
+ - other (1)
48
+ - workflows (1)
49
+
50
+ ### Fixed
51
+
52
+ - [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.
53
+
54
+ ## [1.3.34] - 2026-10-25
55
+
56
+ - TAG: [v1.3.34][1.3.34t]
57
+ - COVERAGE: 93.08% -- 7556/8118 lines in 45 files
58
+ - BRANCH COVERAGE: 77.48% -- 3017/3894 branches in 45 files
59
+ - 38.89% documented
60
+
61
+ ### Changed
62
+
63
+ - [kc] shared-dependency-floor-engine: Family workflows now emit and tape NDJSON through kettle-ndjson; the family runtime and local bundle declare kettle-ndjson directly. Dependency-floor updates use kettle-deps-floor with explicit sibling release targets and no registry lookups. Nomono bootstrap raises Gemfile and local activation-array floors.
64
+
65
+ - [kc] shared-ndjson-event-integration: Use kettle-ndjson for family command summaries and per-member event tape serialization; family child-event names and payloads remain compatible with downstream progress/report handling. Declare kettle-ndjson as a direct runtime and local development dependency.
66
+
67
+ - [kc] kettle-jem/prepare: updated 19 project files:
68
+ - dependencies (19)
69
+
70
+ - [kc] kettle-jem/template: updated 3 project files:
71
+ - code and tests (1)
72
+ - documentation (1)
73
+ - other (1)
74
+
33
75
  ## [1.3.33] - 2026-10-24
34
76
 
35
77
  - TAG: [v1.3.33][1.3.33t]
@@ -3257,7 +3299,11 @@ Please file a bug if you notice a violation of semantic versioning.
3257
3299
  - Fixed CI load failures on engines without compatible `pty` support by falling back to Open3 for interactive release commands.
3258
3300
  - Fixed Ruby 3.2 version-bump support by loading Prism lazily and wiring the Prism gem only for MRI versions that need it.
3259
3301
 
3260
- [Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.3.33...HEAD
3302
+ [Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.3.35...HEAD
3303
+ [1.3.35]: https://github.com/kettle-dev/kettle-family/compare/v1.3.34...v1.3.35
3304
+ [1.3.35t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.3.35
3305
+ [1.3.34]: https://github.com/kettle-dev/kettle-family/compare/v1.3.33...v1.3.34
3306
+ [1.3.34t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.3.34
3261
3307
  [1.3.33]: https://github.com/kettle-dev/kettle-family/compare/v1.3.32...v1.3.33
3262
3308
  [1.3.33t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.3.33
3263
3309
  [1.3.32]: https://github.com/kettle-dev/kettle-family/compare/v1.3.31...v1.3.32
data/README.md CHANGED
@@ -66,6 +66,7 @@ configuration, create their own GitHub Release through `kettle-release`.
66
66
 
67
67
  Compatible with MRI Ruby 4.0.0+.
68
68
  CI workflows and Appraisals are generated for MRI Ruby 4.0.0+.
69
+ The current MRI CI lane runs on Linux and macOS.
69
70
  This test floor is configured by `ruby.test_minimum` in `.kettle-jem.yml` and
70
71
  may be higher than the gem's runtime compatibility floor when legacy Rubies are
71
72
  not practical for the current toolchain.
@@ -90,21 +91,6 @@ The _amazing_ test matrix is powered by the kettle-dev stack.
90
91
 
91
92
  </details>
92
93
 
93
- ### Runtime and Platform Support
94
-
95
- Support tiers describe what this project's CI actually exercises, not what may
96
- work in an untested environment:
97
-
98
- - **Parallel support**: CI runs the test suite with multiple workers available.
99
- - **Unsupported**: the engine/platform combination is not covered by CI and is
100
- not a project compatibility claim.
101
-
102
- | Ruby engine/version | Linux | macOS | Windows | Notes |
103
- |---------------------|-------|-------|---------|-------|
104
- | MRI 4.0-4.0 | Parallel support | Unsupported | Unsupported | Versioned Ruby workflows run on Linux. |
105
- | MRI current | Parallel support | Parallel support | Unsupported | Current Ruby workflow covers the declared OS platforms. |
106
- | MRI head | Parallel support | Unsupported | Unsupported | CI is allowed to fail while Ruby is in development. |
107
-
108
94
  ### Federated DVCS
109
95
 
110
96
  <details markdown="1">
@@ -120,16 +106,12 @@ work in an untested environment:
120
106
 
121
107
  ### Enterprise Support
122
108
 
123
- [![Lifted through Tidelift](https://tidelift.com/badges/package/rubygems/kettle-family)][🏙️entsup-tidelift-sonar]
124
-
125
- Lifted through Tidelift, part of [Sonar][🏙️entsup-tidelift-sonar].
109
+ For enterprise support from the maintainer, use [Upwork][👨🏼‍🏫expsup-upwork] or [CodeMentor][👨🏼‍🏫expsup-codementor].
126
110
 
127
111
  Other support channels:
128
112
 
129
113
  - [![Ruby Users Forum][✉️ruby-forum-img]][✉️ruby-forum]
130
114
  - [![Live Chat on Discord][✉️discord-invite-img-ftb]][✉️discord-invite]
131
- - [![Get help from me on Upwork][👨🏼‍🏫expsup-upwork-img]][👨🏼‍🏫expsup-upwork]
132
- - [![Get help from me on Codementor][👨🏼‍🏫expsup-codementor-img]][👨🏼‍🏫expsup-codementor]
133
115
 
134
116
  ## ✨ Installation
135
117
 
@@ -1141,7 +1123,6 @@ Thanks for RTFM. ☺️
1141
1123
  [👨🏼‍🏫expsup-upwork-img]: https://img.shields.io/badge/UpWork-13544E?style=for-the-badge&logo=Upwork&logoColor=white
1142
1124
  [👨🏼‍🏫expsup-codementor]: https://www.codementor.io/peterboling?utm_source=github&utm_medium=button&utm_term=peterboling&utm_campaign=github
1143
1125
  [👨🏼‍🏫expsup-codementor-img]: https://img.shields.io/badge/CodeMentor-Get_Help-1abc9c?style=for-the-badge&logo=CodeMentor&logoColor=white
1144
- [🏙️entsup-tidelift-sonar]: https://blog.tidelift.com/tidelift-joins-sonar
1145
1126
  [💁🏼‍♂️peterboling]: http://www.peterboling.com
1146
1127
  [🚂railsbling]: http://www.railsbling.com
1147
1128
  [📜src-gl-img]: https://img.shields.io/badge/GitLab-FBA326?style=for-the-badge&logo=Gitlab&logoColor=orange
@@ -1210,7 +1191,7 @@ Thanks for RTFM. ☺️
1210
1191
  [📌gitmoji]: https://gitmoji.dev
1211
1192
  [📌gitmoji-img]: https://img.shields.io/badge/gitmoji_commits-%20%F0%9F%98%9C%20%F0%9F%98%8D-34495e.svg?style=flat-square
1212
1193
  [🧮kloc]: https://www.youtube.com/watch?v=dQw4w9WgXcQ
1213
- [🧮kloc-img]: https://img.shields.io/badge/KLOC-8.140-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
1194
+ [🧮kloc-img]: https://img.shields.io/badge/KLOC-8.121-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
1214
1195
  [🔐security]: https://github.com/kettle-dev/kettle-family/blob/main/SECURITY.md
1215
1196
  [🔐security-img]: https://img.shields.io/badge/security-policy-259D6C.svg?style=flat
1216
1197
  [📄copyright-notice-explainer]: https://opensource.stackexchange.com/questions/5778/why-do-licenses-such-as-the-mit-license-specify-a-single-year
@@ -3,6 +3,7 @@
3
3
  require "command_kit"
4
4
  require "command_kit/commands"
5
5
  require "fileutils"
6
+ require "kettle/ndjson"
6
7
  require "optparse"
7
8
 
8
9
  module Kettle
@@ -814,8 +815,11 @@ module Kettle
814
815
  def run_command(command, options)
815
816
  report = build_report(command, options)
816
817
  write_report(report, options)
817
- if options[:events] && command == "release-state"
818
- stdout.puts(JSON.generate("event_version" => 1, "type" => "summary", "report" => report.to_h))
818
+ if options[:events]
819
+ Kettle::Ndjson.emit_summary_event(
820
+ Kettle::Ndjson.event_stream(stdout, types: "summary"),
821
+ report: report.to_h
822
+ )
819
823
  else
820
824
  stdout.puts(options[:json] ? report.to_json : report.to_text)
821
825
  end
@@ -827,6 +831,33 @@ module Kettle
827
831
 
828
832
  private
829
833
 
834
+ def emit_command_result_events(event_tape, command, results)
835
+ return unless event_tape
836
+
837
+ results.each do |result|
838
+ event_tape.call(
839
+ "type" => "command_step",
840
+ "command" => command,
841
+ "name" => result.phase,
842
+ "member" => result.member_name,
843
+ "branch" => result.branch,
844
+ "phase" => result.phase,
845
+ "status" => command_result_event_status(result),
846
+ "status_code" => result.status,
847
+ "elapsed_seconds" => result.elapsed_seconds,
848
+ "reason" => result.reason,
849
+ "result" => result.to_h
850
+ )
851
+ end
852
+ end
853
+
854
+ def command_result_event_status(result)
855
+ return "skipped" if result.skipped
856
+ return "ok" if result.ok?
857
+
858
+ "failed"
859
+ end
860
+
830
861
  def build_report(command, options)
831
862
  config = Config.load(root: options[:root], path: options[:config])
832
863
  start_at = parse_start_at(options[:start_at])
@@ -888,6 +919,7 @@ module Kettle
888
919
  release_state_results: release_state_results
889
920
  )
890
921
  state_progress&.finish
922
+ emit_command_result_events(state_event_tape, command, results)
891
923
  elapsed_seconds = Process.clock_gettime(Process::CLOCK_MONOTONIC) - started_at
892
924
  Report.new(
893
925
  family_name: config.family_name,
@@ -1562,13 +1594,13 @@ module Kettle
1562
1594
  end
1563
1595
 
1564
1596
  def release_state_event_tape(command:, config:, options:)
1565
- return unless %w[release release-state].include?(command)
1597
+ return unless %w[release release-state].include?(command) || options[:events]
1566
1598
  # Release event taping requires execute mode: dry-run release has no
1567
1599
  # child event streams to tape.
1568
1600
  return if command == "release" && !options[:execute]
1569
1601
 
1570
1602
  tape = ReleaseStateEventTape.new(root: config.root, stream: options[:events] ? stdout : nil)
1571
- stderr.puts("release state event tapes: #{tape.directory}") unless options[:events]
1603
+ stderr.puts("family event tapes: #{tape.directory}") unless options[:events]
1572
1604
  tape
1573
1605
  end
1574
1606
 
@@ -199,7 +199,6 @@ module Kettle
199
199
  event_handler.call(
200
200
  member_name,
201
201
  {
202
- "event_version" => 1,
203
202
  "type" => "secret_provider",
204
203
  "action" => action,
205
204
  "label" => label,
@@ -1,27 +1,21 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require "kettle/dev"
3
+ require "kettle/deps/floor"
4
4
 
5
5
  module Kettle
6
6
  module Family
7
+ # Adapts family release versions and workflow results to the shared
8
+ # kettle-deps-floor updater. Parsing, floor eligibility, and AST edits live
9
+ # in the generic gem; this class supplies family context only.
7
10
  class DependencyFloor
8
- DEPENDENCY_METHODS = %i[add_dependency add_runtime_dependency add_development_dependency].freeze
9
-
10
- # Return only dependencies declared by the gemspec itself. Release
11
- # ordering also observes Gemfile-only tooling dependencies, but those
12
- # cannot have their published floor rewritten by this class.
13
11
  def self.gemspec_dependency_names(member)
14
12
  return [] unless member.gemspec_path && File.file?(member.gemspec_path)
15
13
 
16
- source = File.read(member.gemspec_path)
17
- parse_result = Kettle::Dev::VersionBump.parse_source(source, member.gemspec_path)
18
- Kettle::Dev::VersionBump.each_node(parse_result.value).filter_map do |node|
19
- next unless node.is_a?(Prism::CallNode) && DEPENDENCY_METHODS.include?(node.name)
20
-
21
- name_node = node.arguments&.arguments&.first
22
- name_node.unescaped if name_node.is_a?(Prism::StringNode)
23
- end.uniq
24
- rescue Kettle::Dev::Error => error
14
+ Kettle::Deps::Floor::Updater.dependency_names(
15
+ project_root: member.root,
16
+ sources: [File.basename(member.gemspec_path)]
17
+ )
18
+ rescue Kettle::Deps::Floor::Error => error
25
19
  raise Error, error.message
26
20
  end
27
21
 
@@ -29,7 +23,7 @@ module Kettle
29
23
  @released_members = released_members
30
24
  @dependent_members = dependent_members
31
25
  @mode = mode
32
- @released_versions = released_members.to_h { |member| [member.name, Gem::Version.new(member.version.to_s)] }
26
+ @released_versions = released_members.to_h { |member| [member.name, member.version.to_s] }
33
27
  end
34
28
 
35
29
  def results
@@ -41,10 +35,18 @@ module Kettle
41
35
  attr_reader :released_members, :dependent_members, :mode, :released_versions
42
36
 
43
37
  def result_for(member)
44
- edits = collect_edits(member)
45
- return if edits.empty?
38
+ return unless member.gemspec_path && File.file?(member.gemspec_path)
39
+
40
+ updater = Kettle::Deps::Floor::Updater.new(
41
+ project_root: member.root,
42
+ sources: [File.basename(member.gemspec_path)],
43
+ target_versions: released_versions,
44
+ registry_updates: false,
45
+ write: mode == :execute
46
+ )
47
+ changes = updater.run.fetch(:planned_changes)
48
+ return if changes.empty?
46
49
 
47
- write_edits(edits) if mode == :execute
48
50
  CommandResult.new(
49
51
  member_name: member.name,
50
52
  phase: "dependency_floor",
@@ -52,79 +54,20 @@ module Kettle
52
54
  workdir: member.root,
53
55
  status: 0,
54
56
  success: true,
55
- stdout: edit_summary(member: member, edits: edits),
57
+ stdout: edit_summary(member: member, changes: changes),
56
58
  stderr: "",
57
59
  elapsed_seconds: 0.0,
58
60
  skipped: mode != :execute,
59
61
  reason: (mode == :execute) ? nil : "dry-run; pass --execute to write"
60
62
  )
63
+ rescue Kettle::Deps::Floor::Error => error
64
+ raise Error, error.message
61
65
  end
62
66
 
63
- def collect_edits(member)
64
- return [] unless member.gemspec_path && File.file?(member.gemspec_path)
65
-
66
- source = File.read(member.gemspec_path)
67
- parse_result = with_dev_errors { Kettle::Dev::VersionBump.parse_source(source, member.gemspec_path) }
68
- Kettle::Dev::VersionBump.each_node(parse_result.value).filter_map do |node|
69
- dependency_edit_for(member.gemspec_path, source, node)
70
- end
71
- end
72
-
73
- def dependency_edit_for(path, source, node)
74
- return unless node.is_a?(Prism::CallNode) && DEPENDENCY_METHODS.include?(node.name)
75
-
76
- args = node.arguments&.arguments || []
77
- name_node = args.first
78
- return unless name_node.is_a?(Prism::StringNode)
79
-
80
- dependency_name = name_node.unescaped
81
- released_version = released_versions[dependency_name]
82
- return unless released_version
83
-
84
- floor_node = requirement_nodes(args.drop(1)).find do |requirement_node|
85
- requirement_node.unescaped.start_with?(">= ")
86
- end
87
- return unless floor_node
88
-
89
- current_floor = floor_node.unescaped.delete_prefix(">= ").strip
90
- return unless floor_lower_than?(current_floor, released_version)
91
-
92
- replacement = Kettle::Dev::VersionBump.quote_like(floor_node.location.slice, ">= #{released_version}")
93
- Kettle::Dev::VersionBump.file_edit(path, source, floor_node.location.start_offset, floor_node.location.end_offset, replacement)
94
- end
95
-
96
- def requirement_nodes(nodes)
97
- nodes.flat_map do |node|
98
- case node
99
- when Prism::StringNode
100
- [node]
101
- when Prism::ArrayNode
102
- requirement_nodes(node.elements)
103
- else
104
- []
105
- end
106
- end
107
- end
108
-
109
- def floor_lower_than?(current_floor, released_version)
110
- Gem::Version.new(current_floor) < released_version
111
- rescue ArgumentError
112
- false
113
- end
114
-
115
- def write_edits(edits)
116
- Kettle::Dev::VersionBump.write_edits(edits)
117
- end
118
-
119
- def edit_summary(member:, edits:)
67
+ def edit_summary(member:, changes:)
120
68
  verb = (mode == :execute) ? "updated" : "would update"
121
- ["#{verb} #{edits.length} family dependency floor(s) for #{member.name}", *edits.map { |edit| "#{verb} #{edit.fetch(:path)}" }.uniq].join("\n")
122
- end
123
-
124
- def with_dev_errors
125
- yield
126
- rescue Kettle::Dev::Error => error
127
- raise Error, error.message
69
+ paths = changes.map { |change| change.fetch(:relative_path) }.uniq
70
+ ["#{verb} #{changes.length} family dependency floor(s) for #{member.name}", *paths.map { |path| "#{verb} #{path}" }].join("\n")
128
71
  end
129
72
  end
130
73
  end
@@ -37,7 +37,9 @@ module Kettle
37
37
 
38
38
  (configured + discovered).each do |member|
39
39
  existing = by_name[member.name]
40
- raise Error, "duplicate family member #{member.name.inspect}" if existing && !same_directory?(existing.root, member.root)
40
+ if existing && !same_directory?(existing.root, member.root)
41
+ raise duplicate_member_error(existing, member)
42
+ end
41
43
 
42
44
  by_name[member.name] = member
43
45
  end
@@ -82,6 +84,18 @@ module Kettle
82
84
  release_dependency_member_names.include?(File.basename(File.expand_path(root)))
83
85
  end
84
86
 
87
+ def duplicate_member_error(first, second)
88
+ Error.new(<<~MESSAGE.strip)
89
+ duplicate family member #{first.name.inspect} found in different directories:
90
+ - #{first.root} (#{first.gemspec_path})
91
+ - #{second.root} (#{second.gemspec_path})
92
+ Each gem name must resolve to one family directory. If one is a scratch
93
+ checkout or worktree, move it outside the discovery roots or exclude it
94
+ with members.exclude. If members.roots lists the complete family, set
95
+ members.discover: false.
96
+ MESSAGE
97
+ end
98
+
85
99
  def primary_gemspec(root)
86
100
  gemspecs = Paths.glob(root, "*.gemspec")
87
101
  raise Error, "no gemspec found in #{root}" if gemspecs.empty?
@@ -89,9 +89,11 @@ module Kettle
89
89
  edits = if File.file?(gemfile)
90
90
  source = File.read(gemfile)
91
91
  parse_result = Kettle::Dev::VersionBump.parse_source(source, gemfile)
92
- Kettle::Dev::VersionBump.each_node(parse_result.value).filter_map do |node|
93
- nomono_floor_edit(gemfile, source, node)
94
- end
92
+ nodes = Kettle::Dev::VersionBump.each_node(parse_result.value)
93
+ [
94
+ *nodes.filter_map { |node| nomono_floor_edit(gemfile, source, node) },
95
+ *nodes.filter_map { |node| local_nomono_floor_edit(gemfile, source, node) }
96
+ ]
95
97
  else
96
98
  []
97
99
  end
@@ -803,7 +803,10 @@ module Kettle
803
803
  member_config = member_local_release_config(member)
804
804
  return unless member_config
805
805
 
806
- self.class.new(config: member_config, members: [member]).results(event_handler: event_handler)
806
+ current_result = check_member(member, event_handler: event_handler)
807
+ return [current_result] unless current_result.ok?
808
+
809
+ [current_result, *self.class.new(config: member_config, members: [member]).results(event_handler: event_handler)]
807
810
  end
808
811
 
809
812
  def emit_event(event_handler, member:, branch:, action:, status:, **details)
@@ -997,9 +1000,18 @@ module Kettle
997
1000
 
998
1001
  def add_branch_worktree(root:, branch:, worktree_root:)
999
1002
  WORKTREE_ADMIN_MUTEX.synchronize do
1000
- _stdout, stderr, status = Open3.capture3("git", "worktree", "add", "--detach", worktree_root, branch, chdir: root)
1001
- raise Error, "could not add worktree for #{branch}: #{stderr}" unless status.success?
1003
+ ref = resolvable_branch_ref(root, branch)
1004
+ _stdout, stderr, status = Open3.capture3("git", "worktree", "add", "--detach", worktree_root, ref, chdir: root)
1005
+ 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?
1006
+ end
1007
+ end
1008
+
1009
+ def resolvable_branch_ref(root, branch)
1010
+ [branch, "refs/remotes/origin/#{branch}"].each do |ref|
1011
+ _stdout, _stderr, status = Open3.capture3("git", "rev-parse", "--verify", "#{ref}^{commit}", chdir: root)
1012
+ return ref if status.success?
1002
1013
  end
1014
+ branch
1003
1015
  end
1004
1016
 
1005
1017
  def remove_branch_worktree(root:, worktree_root:)
@@ -1,8 +1,8 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require "fileutils"
4
- require "json"
5
4
  require "time"
5
+ require "kettle/ndjson"
6
6
 
7
7
  module Kettle
8
8
  module Family
@@ -34,10 +34,8 @@ module Kettle
34
34
  @mutex.synchronize do
35
35
  @sequence_by_member[target] += 1
36
36
  payload["sequence"] = @sequence_by_member.fetch(target)
37
- line = JSON.generate(payload)
38
- File.open(path_for(target), "a") { |file| file.puts(line) }
39
- @stream&.puts(line)
40
- @stream.flush if @stream&.respond_to?(:flush)
37
+ File.open(path_for(target), "a") { |file| emit_ndjson(file, payload) }
38
+ emit_ndjson(@stream, payload) if @stream
41
39
  end
42
40
  payload
43
41
  rescue
@@ -46,6 +44,17 @@ module Kettle
46
44
 
47
45
  private
48
46
 
47
+ def emit_ndjson(io, payload)
48
+ type = payload.fetch("type").to_s
49
+ stream = Kettle::Ndjson.event_stream(io, types: type, event_types: [type], aliases: {})
50
+ attributes = payload.each_with_object({}) do |(key, value), result|
51
+ next if %w[type event_version].include?(key.to_s)
52
+
53
+ result[key.to_sym] = value
54
+ end
55
+ Kettle::Ndjson.emit_event(stream, type, attributes)
56
+ end
57
+
49
58
  def target_key(payload)
50
59
  member = payload.fetch("member", "family").to_s
51
60
  branch = payload["branch"].to_s
@@ -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.33"
8
+ VERSION = "1.3.35"
9
9
  end
10
10
  # Current gem version exposed at the traditional constant location.
11
11
  VERSION = Version::VERSION # Traditional Constant Location
@@ -2223,11 +2223,14 @@ module Kettle
2223
2223
  # repositories through one-at-a-time release workflows. Run those
2224
2224
  # members through the normal release scheduler first so configured
2225
2225
  # waves and their worker budget remain effective.
2226
- results.concat(current_branch_results(current_branch_members)) unless current_branch_members.empty?
2226
+ current_members = start_branch ? current_branch_members : members
2227
+ results.concat(current_branch_results(current_members)) unless current_members.empty?
2227
2228
  return results unless results.all?(&:ok?)
2228
2229
 
2229
2230
  target_members.each_with_object(results) do |member, memo|
2230
2231
  member_config = member_local_release_config(member)
2232
+ next if start_branch.nil? && BranchTargetConfig.branch_targets_for(command, member_config.release_target_branches).empty?
2233
+
2231
2234
  memo.concat(member_local_workflow(member: member, member_config: member_config).results)
2232
2235
  break memo unless memo.last&.ok?
2233
2236
  end
@@ -5122,18 +5125,17 @@ module Kettle
5122
5125
  end
5123
5126
 
5124
5127
  def gha_sha_pins_event_line_handler(member)
5125
- return nil unless progress_io
5128
+ return nil unless progress_io || @event_tape
5126
5129
 
5127
5130
  lambda do |line|
5128
5131
  event = parse_template_event(line)
5129
5132
  next false unless event && event["type"].to_s.start_with?("gha_sha_pins")
5130
5133
 
5131
- if progress_io
5132
- if verbose || debug
5133
- emit_gha_sha_pins_event_progress(member, event)
5134
- elsif @gha_sha_pins_progress
5135
- emit_gha_sha_pins_event_status(member, event, progress: @gha_sha_pins_progress)
5136
- end
5134
+ @event_tape&.call(event.merge("member" => member.name))
5135
+ if progress_io && (verbose || debug)
5136
+ emit_gha_sha_pins_event_progress(member, event)
5137
+ elsif progress_io && @gha_sha_pins_progress
5138
+ emit_gha_sha_pins_event_status(member, event, progress: @gha_sha_pins_progress)
5137
5139
  end
5138
5140
  true
5139
5141
  end
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.33
4
+ version: 1.3.35
5
5
  platform: ruby
6
6
  authors:
7
7
  - Peter H. Boling
@@ -114,7 +114,7 @@ dependencies:
114
114
  version: '1.0'
115
115
  - - ">="
116
116
  - !ruby/object:Gem::Version
117
- version: 1.0.13
117
+ version: 1.0.14
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
@@ -124,7 +124,27 @@ dependencies:
124
124
  version: '1.0'
125
125
  - - ">="
126
126
  - !ruby/object:Gem::Version
127
- version: 1.0.13
127
+ version: 1.0.14
128
+ - !ruby/object:Gem::Dependency
129
+ name: kettle-deps-floor
130
+ requirement: !ruby/object:Gem::Requirement
131
+ requirements:
132
+ - - "~>"
133
+ - !ruby/object:Gem::Version
134
+ version: '0.1'
135
+ - - ">="
136
+ - !ruby/object:Gem::Version
137
+ version: 0.1.1
138
+ type: :runtime
139
+ prerelease: false
140
+ version_requirements: !ruby/object:Gem::Requirement
141
+ requirements:
142
+ - - "~>"
143
+ - !ruby/object:Gem::Version
144
+ version: '0.1'
145
+ - - ">="
146
+ - !ruby/object:Gem::Version
147
+ version: 0.1.1
128
148
  - !ruby/object:Gem::Dependency
129
149
  name: kettle-dev
130
150
  requirement: !ruby/object:Gem::Requirement
@@ -134,7 +154,7 @@ dependencies:
134
154
  version: '3.1'
135
155
  - - ">="
136
156
  - !ruby/object:Gem::Version
137
- version: 3.1.24
157
+ version: 3.1.25
138
158
  type: :runtime
139
159
  prerelease: false
140
160
  version_requirements: !ruby/object:Gem::Requirement
@@ -144,7 +164,7 @@ dependencies:
144
164
  version: '3.1'
145
165
  - - ">="
146
166
  - !ruby/object:Gem::Version
147
- version: 3.1.24
167
+ version: 3.1.25
148
168
  - !ruby/object:Gem::Dependency
149
169
  name: kettle-gha-pins
150
170
  requirement: !ruby/object:Gem::Requirement
@@ -154,7 +174,7 @@ dependencies:
154
174
  version: '0.3'
155
175
  - - ">="
156
176
  - !ruby/object:Gem::Version
157
- version: 0.3.18
177
+ version: 0.3.19
158
178
  type: :runtime
159
179
  prerelease: false
160
180
  version_requirements: !ruby/object:Gem::Requirement
@@ -164,7 +184,7 @@ dependencies:
164
184
  version: '0.3'
165
185
  - - ">="
166
186
  - !ruby/object:Gem::Version
167
- version: 0.3.18
187
+ version: 0.3.19
168
188
  - !ruby/object:Gem::Dependency
169
189
  name: kettle-jem
170
190
  requirement: !ruby/object:Gem::Requirement
@@ -185,6 +205,26 @@ dependencies:
185
205
  - - ">="
186
206
  - !ruby/object:Gem::Version
187
207
  version: 7.1.28
208
+ - !ruby/object:Gem::Dependency
209
+ name: kettle-ndjson
210
+ requirement: !ruby/object:Gem::Requirement
211
+ requirements:
212
+ - - "~>"
213
+ - !ruby/object:Gem::Version
214
+ version: '0.1'
215
+ - - ">="
216
+ - !ruby/object:Gem::Version
217
+ version: 0.1.22
218
+ type: :runtime
219
+ prerelease: false
220
+ version_requirements: !ruby/object:Gem::Requirement
221
+ requirements:
222
+ - - "~>"
223
+ - !ruby/object:Gem::Version
224
+ version: '0.1'
225
+ - - ">="
226
+ - !ruby/object:Gem::Version
227
+ version: 0.1.22
188
228
  - !ruby/object:Gem::Dependency
189
229
  name: kettle-test
190
230
  requirement: !ruby/object:Gem::Requirement
@@ -194,7 +234,7 @@ dependencies:
194
234
  version: '2.0'
195
235
  - - ">="
196
236
  - !ruby/object:Gem::Version
197
- version: 2.0.27
237
+ version: 2.0.28
198
238
  type: :runtime
199
239
  prerelease: false
200
240
  version_requirements: !ruby/object:Gem::Requirement
@@ -204,7 +244,7 @@ dependencies:
204
244
  version: '2.0'
205
245
  - - ">="
206
246
  - !ruby/object:Gem::Version
207
- version: 2.0.27
247
+ version: 2.0.28
208
248
  - !ruby/object:Gem::Dependency
209
249
  name: psych-merge
210
250
  requirement: !ruby/object:Gem::Requirement
@@ -296,7 +336,7 @@ dependencies:
296
336
  version: '1.1'
297
337
  - - ">="
298
338
  - !ruby/object:Gem::Version
299
- version: 1.1.16
339
+ version: 1.1.17
300
340
  type: :runtime
301
341
  prerelease: false
302
342
  version_requirements: !ruby/object:Gem::Requirement
@@ -306,7 +346,7 @@ dependencies:
306
346
  version: '1.1'
307
347
  - - ">="
308
348
  - !ruby/object:Gem::Version
309
- version: 1.1.16
349
+ version: 1.1.17
310
350
  - !ruby/object:Gem::Dependency
311
351
  name: bundler-audit
312
352
  requirement: !ruby/object:Gem::Requirement
@@ -364,7 +404,7 @@ dependencies:
364
404
  version: '0.1'
365
405
  - - ">="
366
406
  - !ruby/object:Gem::Version
367
- version: 0.1.4
407
+ version: 0.1.5
368
408
  type: :development
369
409
  prerelease: false
370
410
  version_requirements: !ruby/object:Gem::Requirement
@@ -374,7 +414,7 @@ dependencies:
374
414
  version: '0.1'
375
415
  - - ">="
376
416
  - !ruby/object:Gem::Version
377
- version: 0.1.4
417
+ version: 0.1.5
378
418
  - !ruby/object:Gem::Dependency
379
419
  name: appraisal2
380
420
  requirement: !ruby/object:Gem::Requirement
@@ -568,10 +608,10 @@ licenses:
568
608
  - AGPL-3.0-only
569
609
  metadata:
570
610
  homepage_uri: https://kettle-family.galtzo.com
571
- source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.3.33
572
- changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.3.33/CHANGELOG.md
611
+ source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.3.35
612
+ changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.3.35/CHANGELOG.md
573
613
  bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
574
- documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.3.33
614
+ documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.3.35
575
615
  funding_uri: https://github.com/sponsors/pboling
576
616
  wiki_uri: https://github.com/kettle-dev/kettle-family/wiki
577
617
  news_uri: https://www.railsbling.com/tags/kettle-family
metadata.gz.sig CHANGED
Binary file