kettle-family 1.3.23 → 1.3.25

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: 85b41ab4901247fce4692eda5e90a436ca09256d4264311bc3328ddfb3673ebe
4
- data.tar.gz: 1ca7772017565fe9b1b69ed24b85795eba4348ddc1e0909e6c868b696a41488a
3
+ metadata.gz: 5fd8e91edaffccff9ac6016c1dbf3ce50eb1c1453c344f1568d111797a2e838c
4
+ data.tar.gz: 1f25730d8c419d87600e48dc06793cb7aff484369e2ba05643d1ce6faa3a596e
5
5
  SHA512:
6
- metadata.gz: ee45401c4c2c6ce543664634ee9fa7c5606ca3c41abaaab0f554af3df2c06eaf45a3a580fad6ff90babb305df018cab14247eb68d2f511f7d39c079f08119121
7
- data.tar.gz: 7f4ef416a32a671282a8c5076f26c8654156928b4281347776942e9e8b648a74c0b32c82a780763c953a1a019d177c7eee019fa90800010d27947ec079b690cf
6
+ metadata.gz: 408834a4d45b2e802c857459f2c48930f25d2750928412770e81852eb063d8712896b13154f0953ac9034eef1d41cf72c4587b6456a512b15dfb14ada10b53b8
7
+ data.tar.gz: e3218229fdd996dc95bb2e1f9a5036d3e0366625e9b960593897f2b088cfc525f890c21b544d691eead4ceccda14fe9aeadb97fdaca631dd73e5074bd6364149
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.25] - 2026-10-20
34
+
35
+ - TAG: [v1.3.25][1.3.25t]
36
+ - COVERAGE: 93.02% -- 7381/7935 lines in 44 files
37
+ - BRANCH COVERAGE: 77.32% -- 2953/3819 branches in 44 files
38
+ - 37.68% documented
39
+
40
+ ### Fixed
41
+
42
+ - [kc] bup-nomono-bootstrap: Reconcile stale nomono floors and lockfiles before member bup; commit each bootstrap
43
+
44
+ ## [1.3.24] - 2026-10-19
45
+
46
+ - TAG: [v1.3.24][1.3.24t]
47
+ - COVERAGE: 93.01% -- 7372/7926 lines in 44 files
48
+ - BRANCH COVERAGE: 77.25% -- 2947/3815 branches in 44 files
49
+ - 37.55% documented
50
+
51
+ ### Fixed
52
+
53
+ - [kc] bup-nomono-bootstrap: Add a bup bootstrap phase that bumps stale nomono floors and reconciles member lockfiles with a pinned nomono update before member bundle update --all, so family-root floor raises no longer deadlock on older activated nomono releases. Dry-run bup plans the reconciliation without editing files.
54
+
33
55
  ## [1.3.23] - 2026-10-19
34
56
 
35
57
  - TAG: [v1.3.23][1.3.23t]
@@ -3132,7 +3154,11 @@ Please file a bug if you notice a violation of semantic versioning.
3132
3154
  - Fixed CI load failures on engines without compatible `pty` support by falling back to Open3 for interactive release commands.
3133
3155
  - Fixed Ruby 3.2 version-bump support by loading Prism lazily and wiring the Prism gem only for MRI versions that need it.
3134
3156
 
3135
- [Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.3.23...HEAD
3157
+ [Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.3.25...HEAD
3158
+ [1.3.25]: https://github.com/kettle-dev/kettle-family/compare/v1.3.24...v1.3.25
3159
+ [1.3.25t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.3.25
3160
+ [1.3.24]: https://github.com/kettle-dev/kettle-family/compare/v1.3.23...v1.3.24
3161
+ [1.3.24t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.3.24
3136
3162
  [1.3.23]: https://github.com/kettle-dev/kettle-family/compare/v1.3.22...v1.3.23
3137
3163
  [1.3.23t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.3.23
3138
3164
  [1.3.22]: https://github.com/kettle-dev/kettle-family/compare/v1.3.21...v1.3.22
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.905-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
1228
+ [🧮kloc-img]: https://img.shields.io/badge/KLOC-7.935-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
@@ -10,23 +10,30 @@ module Kettle
10
10
  class NomonoBootstrap
11
11
  GEM_NAME = "nomono"
12
12
 
13
- def initialize(latest_version:, mode: :dry_run)
13
+ def initialize(latest_version:, mode: :dry_run, phase: "template_bootstrap_dependencies")
14
14
  @latest_version = Gem::Version.new(latest_version.to_s)
15
15
  @mode = mode
16
+ @phase = phase
16
17
  end
17
18
 
18
- attr_reader :latest_version, :mode
19
+ attr_reader :latest_version, :mode, :phase
19
20
 
20
21
  def member_needs_bootstrap?(member)
21
22
  !!(gemfile_floor_outdated?(member) || lockfile_version_outdated?(member))
22
23
  end
23
24
 
25
+ # Return the project-relative Gemfile paths whose Nomono floor this
26
+ # bootstrap will raise. Capture before bootstrap_member writes them.
27
+ def paths_to_update(member)
28
+ gemfile_edits(member).map { |edit| Paths.relative(edit.fetch(:path), member.root) }.compact.uniq
29
+ end
30
+
24
31
  def bootstrap_member(member)
25
32
  edits = gemfile_edits(member)
26
33
  write_edits(edits)
27
34
  CommandResult.new(
28
35
  member.name,
29
- "template_bootstrap_dependencies",
36
+ phase,
30
37
  ["internal", "nomono-bootstrap", latest_version.to_s],
31
38
  member.root,
32
39
  0,
@@ -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.23"
8
+ VERSION = "1.3.25"
9
9
  end
10
10
  # Current gem version exposed at the traditional constant location.
11
11
  VERSION = Version::VERSION # Traditional Constant Location
@@ -578,6 +578,9 @@ module Kettle
578
578
  update_family_root_bundle(runner: runner, memo: results) if %w[bup bupb update-bundler].include?(command)
579
579
  return results unless results.all?(&:ok?)
580
580
 
581
+ results.concat(bup_bootstrap_dependency_results(workflow_members, runner: runner, memo: results)) if %w[bup bupb update-bundler].include?(command)
582
+ return results unless results.all?(&:ok?)
583
+
581
584
  if %w[bup bupb update-bundler].include?(command) && release_mode_bundle_update?
582
585
  results.concat(release_pre_clean_results(runner: runner))
583
586
  return results unless results.last.nil? || results.last.ok?
@@ -1324,6 +1327,73 @@ module Kettle
1324
1327
  )
1325
1328
  end
1326
1329
 
1330
+ # Before a bundle update resolves the dependency graph, the member's
1331
+ # bootstrap must declare and lock the newest Nomono floor, otherwise the
1332
+ # generated bootstrap activates an older installed release and Bundler
1333
+ # rejects the duplicate requirement raised by the family-root floor bump.
1334
+ # This is the bup analogue of template_bootstrap_dependency_results.
1335
+ def bup_bootstrap_dependency_results(workflow_members, runner:, memo:)
1336
+ return [] if workflow_members.empty?
1337
+
1338
+ candidate_members = workflow_members.select { |member| nomono_bootstrap_candidate?(member) }
1339
+ return [] if candidate_members.empty?
1340
+
1341
+ latest_nomono_version = latest_released_nomono_version
1342
+ bootstrap = NomonoBootstrap.new(
1343
+ latest_version: latest_nomono_version,
1344
+ mode: execute ? :execute : :dry_run,
1345
+ phase: "bup_bootstrap_dependencies"
1346
+ )
1347
+ candidate_members.each_with_object([]) do |member, results|
1348
+ next unless bootstrap.member_needs_bootstrap?(member)
1349
+
1350
+ floor_paths = bootstrap.paths_to_update(member)
1351
+ floor_result = bootstrap.bootstrap_member(member)
1352
+ results << floor_result
1353
+ break results unless results.last.ok?
1354
+
1355
+ results << runner.call(
1356
+ member: member,
1357
+ phase: "bup_bootstrap_dependencies",
1358
+ command: pinned_bundler_update_command(extra_gems: %w[nomono]),
1359
+ env: bup_bootstrap_dependency_env(member)
1360
+ )
1361
+ break results unless results.last.ok?
1362
+
1363
+ results << commit_bup_bootstrap(member: member, paths: floor_paths, runner: runner) if commit
1364
+ break results unless results.last.ok? || !commit
1365
+ end
1366
+ rescue => error
1367
+ [template_bootstrap_failure_result(workflow_members.first, error.message)]
1368
+ end
1369
+
1370
+ def commit_bup_bootstrap(member:, paths:, runner:)
1371
+ paths = (Array(paths) + ["Gemfile.lock"]).uniq
1372
+ pathspecs = paths.map { |path| Shellwords.escape(path) }.join(" ")
1373
+ runner.call(
1374
+ member: member,
1375
+ phase: "commit_bup_bootstrap",
1376
+ command: [
1377
+ "sh",
1378
+ "-lc",
1379
+ "git add -- #{pathspecs} && " \
1380
+ "if git diff --cached --quiet -- #{pathspecs}; then exit 0; fi; " \
1381
+ "git commit --only -m '🔒️ Update nomono bootstrap' -- #{pathspecs}"
1382
+ ]
1383
+ )
1384
+ end
1385
+
1386
+ def bup_bootstrap_dependency_env(member)
1387
+ bundle_update_env.merge(
1388
+ # A standalone update re-resolves against the member's own bundle. The
1389
+ # member Gemfile bootstrap floor has already been bumped; here we only
1390
+ # reconcile the member lockfile for that gem, so the subsequent member
1391
+ # Gemfile.lock is not stale and the new floor resolves from the family
1392
+ # root local path instead of activating an older installed release.
1393
+ "BUNDLE_GEMFILE" => "#{member.root}/Gemfile"
1394
+ )
1395
+ end
1396
+
1327
1397
  def template_bootstrap_dependency_results(workflow_members)
1328
1398
  return [] if workflow_members.empty?
1329
1399
 
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.23
4
+ version: 1.3.25
5
5
  platform: ruby
6
6
  authors:
7
7
  - Peter H. Boling
@@ -134,7 +134,7 @@ dependencies:
134
134
  version: '3.1'
135
135
  - - ">="
136
136
  - !ruby/object:Gem::Version
137
- version: 3.1.18
137
+ version: 3.1.19
138
138
  type: :runtime
139
139
  prerelease: false
140
140
  version_requirements: !ruby/object:Gem::Requirement
@@ -144,7 +144,7 @@ dependencies:
144
144
  version: '3.1'
145
145
  - - ">="
146
146
  - !ruby/object:Gem::Version
147
- version: 3.1.18
147
+ version: 3.1.19
148
148
  - !ruby/object:Gem::Dependency
149
149
  name: kettle-gha-pins
150
150
  requirement: !ruby/object:Gem::Requirement
@@ -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.23
571
- changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.3.23/CHANGELOG.md
570
+ source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.3.25
571
+ changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.3.25/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.23
573
+ documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.3.25
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