kettle-dev 3.0.12 → 3.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 778a9528095541a29e4c6a15022c1fe312cf32ccb8f336972c046b02134bae32
-  data.tar.gz: bcc27b14726e3f17ad56b4e305e324c4ccb38df57df754f5f41b73e121f33a41
+  metadata.gz: '039cd8bb8df2cc898259f53fb65be82bca84a516067e02c61a31295475f92f79'
+  data.tar.gz: 6e0c274ac0c78a6e5960d076cd0cf63ad9639b806fb024a2712c4e81e2697856
 SHA512:
-  metadata.gz: 4f4b916aeb6714071d76ab84ae57e08650e42fe0607df2e7b366855932c66019ad3f8a2ba37befa0089b9261eb38092ab3bc33cce61237b0d9880139da3399de
-  data.tar.gz: 238a0802ae743f219f919a9fbdd2d1500aeea06ad8a756e5e377c4bc8c275e0d80bf07911f9a78b94e0095e9809afbb8eaeb9f98d9ee2e6db72242cfc2aa5fd9
+  metadata.gz: c756231572b2f1e2d446b2011942937032e089b05218560a20b73b5d1f087de688919eb7b8056b0638926b2e1ea9c80023eca85dd402a3ce99b20f9f90e45173
+  data.tar.gz: 87000a51e097e84a8d21ed9bf40e11792d2fd55937f728176c931df54715400ea5c07dfcdc76fce2979914dda7412b12b9287f68ec78e48f97cee255244f05b5

data/CHANGELOG.md

@@ -30,6 +30,46 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [3.0.14] - 2026-08-28
+
+- TAG: [v3.0.14][3.0.14t]
+- COVERAGE: 91.46% -- 5818/6361 lines in 47 files
+- BRANCH COVERAGE: 76.14% -- 2230/2929 branches in 47 files
+- 50.86% documented
+
+### Changed
+
+- [kc] kettle-jem/prepare: updated 9 project files:
+  - configuration (1)
+  - dependencies (8)
+
+- [kc] kettle-jem/template: updated 14 project files:
+  - code and tests (2)
+  - configuration (1)
+  - dependencies (1)
+  - documentation (1)
+  - other (1)
+  - workflows (8)
+
+### Fixed
+
+- Teach kettle-bump to update literal fallback versions in conditional gemspec loaders.
+
+- Release lockfile resets now update the locked Bundler version before the release preparation commit, preventing the release's own Bundler upgrade from dirtying the working tree during publication.
+
+- Standalone releases now commit Bundler lockfile updates separately before release preparation.
+
+## [3.0.13] - 2026-08-25
+
+- TAG: [v3.0.13][3.0.13t]
+- COVERAGE: 91.54% -- 5758/6290 lines in 47 files
+- BRANCH COVERAGE: 76.44% -- 2210/2891 branches in 47 files
+- 50.74% documented
+
+### Changed
+
+- Add named standalone release aliases for CI bypass and numbered-step recovery.
+
 ## [3.0.12] - 2026-08-25
 
 - TAG: [v3.0.12][3.0.12t]
@@ -3557,7 +3597,11 @@ Please file a bug if you notice a violation of semantic versioning.
   - Selecting will run the selected workflow via `act`
   - This may move to its own gem in the future.
 
-[Unreleased]: https://github.com/kettle-dev/kettle-dev/compare/v3.0.12...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-dev/compare/v3.0.14...HEAD
+[3.0.14]: https://github.com/kettle-dev/kettle-dev/compare/v3.0.13...v3.0.14
+[3.0.14t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v3.0.14
+[3.0.13]: https://github.com/kettle-dev/kettle-dev/compare/v3.0.12...v3.0.13
+[3.0.13t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v3.0.13
 [3.0.12]: https://github.com/kettle-dev/kettle-dev/compare/v3.0.11...v3.0.12
 [3.0.12t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v3.0.12
 [3.0.11]: https://github.com/kettle-dev/kettle-dev/compare/v3.0.10...v3.0.11

data/README.md

@@ -145,7 +145,9 @@ The _amazing_ test matrix is powered by the kettle-dev stack.
 
 </details>
 
-### Enterprise Support [![Tidelift](https://tidelift.com/badges/package/rubygems/kettle-dev)](https://tidelift.com/subscription/pkg/rubygems-kettle-dev?utm_source=rubygems-kettle-dev&utm_medium=referral&utm_campaign=readme)
+### Enterprise Support
+
+[![Tidelift](https://tidelift.com/badges/package/rubygems/kettle-dev)](https://tidelift.com/subscription/pkg/rubygems-kettle-dev?utm_source=rubygems-kettle-dev&utm_medium=referral&utm_campaign=readme)
 
 Available as part of the Tidelift Subscription.
 
@@ -412,7 +414,8 @@ What it does:
     - Validates Markdown reference definitions and local heading anchors across releasable documentation before network checks.
       Markdown fixtures under `spec/` and `test/`, along with `tmp/`, are intentionally excluded.
     - Skips pre-release checks for any `start_step` greater than `0`, so resumptions begin directly at the requested numbered step.
-    - Runs sanity checks (`bin/setup`, `bin/rake`), confirms version/changelog, optionally updates Appraisals, regenerates docs via `bin/rake yard`, commits “🔖 Prepare release vX.Y.Z”.
+    - Verifies Bundler >= 2.7, updates the primary and appraisal bundles with `bundle update --bundler`, and commits those lockfiles separately as `🔒️ Update bundle` before release preparation.
+    - Runs sanity checks (`bin/setup`, `bin/rake`), confirms version/changelog, optionally updates Appraisals, regenerates docs via `bin/rake yard`, and commits “🔖 Prepare release vX.Y.Z”.
     - Optionally runs your CI locally with `act` before any push:
         - Enable with env: `K_RELEASE_LOCAL_CI="true"` (run automatically) or `K_RELEASE_LOCAL_CI="ask"` (prompt \[Y/n\]).
         - Select workflow with `K_RELEASE_LOCAL_CI_WORKFLOW` (with or without .yml/.yaml). Defaults to `locked_deps.yml` if present; otherwise the first workflow discovered.
@@ -422,7 +425,7 @@ What it does:
 - Options:
     - `start_step` map (skip directly to a phase):
         0.  Run `kettle-pre-release` gates
-        1.  Verify Bundler \>= 2.7 (start at 1 to skip pre-release checks)
+        1.  Verify Bundler \>= 2.7; update and commit the primary/appraisal Bundler lockfiles (start at 1 to skip pre-release checks)
         2.  Detect version; RubyGems sanity check; confirm CHANGELOG/version; sync copyright years; update badges/headers
         3.  Run bin/setup
         4.  Run bin/rake (default task)
@@ -443,11 +446,11 @@ What it does:
         18. Create GitHub Release (requires `GITHUB_TOKEN`)
         19. Push tags to remotes (final)
 - Examples:
-    - After a transient CI or provider failure with no code, version, changelog, or lockfile changes, restart from monitoring: `bundle exec kettle-release start_step=10`
+    - After a transient CI or provider failure with no code, version, changelog, or lockfile changes, restart from monitoring: `bundle exec kettle-release --start-step 10` (the legacy `start_step=10` spelling remains supported)
     - If the failure required a code or release-metadata change, rerun `bundle exec kettle-release` from step 0 so the release checks, prep metadata, commit, and CI all describe the new release commit.
-    - For an intentional same-commit CI bypass, use `bundle exec kettle-release skip_steps=10` or `--skip-steps 10`; this skips remote CI monitoring only and does not claim that CI passed.
+    - For an intentional same-commit CI bypass, use `bundle exec kettle-release --skip-ci` (or `--skip-steps 10`); this skips remote CI monitoring only and does not claim that CI passed.
     - After fixing a failed pre-release gate, rerun from step 0: `bundle exec kettle-release`
-    - After intentionally handling a failed pre-release gate, skip it and start numbered release steps: `bundle exec kettle-release start_step=1`
+    - After intentionally handling a failed pre-release gate, skip it and start numbered release steps: `bundle exec kettle-release --start-step 1`
     - Auto-approve release confirmation prompts: `bundle exec kettle-release --yes`
     - Run direct release with 1Password secrets: `bundle exec kettle-release --secrets-provider 1password`
 - Lockfile recovery:
@@ -463,10 +466,26 @@ What it does:
       variables, known local-template toggles, and writes checksums while
       updating path-sourced and checksum-gap gems back to released registry
       versions.
-    - Release lockfile resets set `KETTLE_DEV_SKIP_CHANGELOG_DEPENDENCY=true`.
-      This does not skip changelog generation; it keeps the development-only
-      `kettle-changelog` gem out of the release bundle so unpublished family
-      gems cannot enter Bundler's resolution graph.
+    - Release lockfile resets normally keep the complete development Gemfile
+      graph, including the development-only `kettle-changelog` dependency.
+      `kettle-changelog` depends on `kettle-dev`, so including it in
+      `kettle-dev`'s development bundle creates a downstream development-cycle
+      when sibling versions are unpublished. The
+      `KETTLE_DEV_SKIP_CHANGELOG_DEPENDENCY=true` switch remains available for
+      an explicit bootstrap/release graph that cannot resolve that downstream
+      tool, but it is not used while rewriting the tracked development
+      lockfiles.
+    - At release step 1, `kettle-release` runs the equivalent of
+      `kettle-family bupb`: it updates the primary lockfile and, when present,
+      `Appraisal.root.gemfile.lock`, resets appraisal locks, and commits only
+      those lockfiles as `🔒️ Update bundle`. This keeps Bundler maintenance in
+      its own atomic commit. `kettle-changelog` writes changelog content but
+      does not own this commit; the release helper commits release metadata
+      separately.
+    - Release-target resets also pass `bundle lock --bundler`, recording the
+      Bundler that performed the final reset in each committed release
+      lockfile. This keeps the normalized lockfile consistent with the
+      Bundler used by the release.
     - During `kettle-release`, release lockfiles are reset before the release
       prep commit. Before pushing, `kettle-release` validates those committed
       lockfiles again; if local paths or checksum gaps reappear, it prints the
@@ -1014,7 +1033,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-6.290-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-6.361-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
 [🔐security]: https://github.com/kettle-dev/kettle-dev/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/exe/kettle-release

@@ -49,16 +49,16 @@ end
 # Do not guard with __FILE__ == $PROGRAM_NAME because binstubs use Kernel.load.
 if ARGV.include?("-h") || ARGV.include?("--help")
   puts <<~USAGE
-    Usage: kettle-release [--version VERSION] [--local-ci] [--yes] [--appraisal-update] [--skip-changelog] [--skip-bundle-audit] [--skip-steps STEPS] [--ci-workflows WORKFLOWS] [--skip-remotes REMOTES] [--required-remotes REMOTES] [--secrets-provider NAME] [--json|--events[=TYPES]] [--report PATH] [start_step=<0-19>]
+    Usage: kettle-release [--version VERSION] [--local-ci] [--yes] [--appraisal-update] [--skip-changelog] [--skip-bundle-audit] [--start-step STEP] [--skip-ci] [--skip-steps STEPS] [--ci-workflows WORKFLOWS] [--skip-remotes REMOTES] [--required-remotes REMOTES] [--secrets-provider NAME] [--json|--events[=TYPES]] [--report PATH] [start_step=<0-19>]
 
     Automates the release flow for a Ruby gem in the host project.
 
     Full releases start at step 0 and run `kettle-pre-release` plus
-    `kettle-changelog` before the numbered release steps. Any start_step
+    `kettle-changelog` before the numbered release steps. Any start step
     greater than 0 skips pre-release prep and resumes directly at the
     requested numbered step.
 
-    Start steps (use start_step=<n> to begin at that step):
+    Start steps (use --start-step <n>; start_step=<n> remains supported):
       0. Run kettle-pre-release gates and kettle-changelog
       1. Verify Bundler >= 2.7 (start at 1 to skip pre-release checks)
       2. Detect version; RubyGems sanity check; confirm CHANGELOG/version; sync copyright years; update badges/headers
@@ -82,7 +82,9 @@ if ARGV.include?("-h") || ARGV.include?("--help")
      19. Push tags to remotes (final)
 
     Options:
-      start_step=<number>         # Begin at the numbered step above; use 10 only for a transient CI failure on the same commit
+      --start-step NUMBER         # Begin at the numbered step above; use 10 only for a transient CI failure on the same commit
+      start_step=<number>         # Legacy alias for --start-step
+      --skip-ci                   # Alias for --skip-steps 10; skips remote CI monitoring while running the rest
       skip_steps=<numbers>        # Comma-separated numbered steps to skip while running the rest; 10 skips remote CI monitoring
       --skip-steps NUMBERS        # Alias for skip_steps=NUMBERS (e.g., --skip-steps 10 or --skip-steps 10,18)
       --version VERSION           # Use this version instead of detecting VERSION from lib/**/version.rb
@@ -101,9 +103,11 @@ if ARGV.include?("-h") || ARGV.include?("--help")
                                   # create the git tag locally, then push commits and tags after publish
 
     Recovery guidance:
-      start_step=10                # Retry only CI monitoring after a transient CI/provider failure; do not use after code or metadata changes
-      start_step=11                # Continue after CI monitoring only when that same release commit was intentionally accepted
-      skip_steps=10                # Skip remote CI monitoring for the same prepared release commit; this does not rerun or replace CI
+      --start-step 10              # Retry only CI monitoring after a transient CI/provider failure; do not use after code or metadata changes
+      --start-step 11              # Continue after CI monitoring only when that same release commit was intentionally accepted
+      --skip-ci                    # Skip remote CI monitoring for the same prepared release commit; this does not rerun or replace CI
+      start_step=10                # Legacy spelling of --start-step 10
+      skip_steps=10                # Legacy spelling of --skip-ci
       kettle-release               # After code, version, changelog, or lockfile changes, rerun the complete flow from step 0
 
     Environment:
@@ -139,10 +143,11 @@ if ARGV.include?("-h") || ARGV.include?("--help")
     Examples:
       kettle-release                       # full flow from the top (start_step=0)
       kettle-release --local-ci            # run local act CI, publish gem, then push commits/tags
-      kettle-release start_step=1          # skip pre-release checks and start numbered release steps
-      kettle-release start_step=10         # retry CI monitoring after a transient failure on the unchanged release commit
-      kettle-release skip_steps=10         # intentionally skip remote CI monitoring for the unchanged release commit
-      SKIP_GEM_SIGNING=true kettle-release start_step=14  # build+release without signing
+      kettle-release --start-step 1      # skip pre-release checks and start numbered release steps
+      kettle-release --start-step 10     # retry CI monitoring after a transient failure on the unchanged release commit
+      kettle-release --skip-ci           # intentionally skip remote CI monitoring for the unchanged release commit
+      kettle-release start_step=10       # legacy spelling of --start-step 10
+      SKIP_GEM_SIGNING=true kettle-release --start-step 14  # build+release without signing
   USAGE
   exit 0
 end
@@ -184,6 +189,31 @@ def extract_skip_steps_arg!(argv)
   skip_steps
 end
 
+def extract_start_step_arg!(argv)
+  start_step = nil
+  if (idx = argv.index("--start-step"))
+    start_step = argv[idx + 1]
+    if start_step.to_s.empty? || start_step.to_s.start_with?("-")
+      Kettle::Dev::ExitAdapter.abort("--start-step requires a numbered release step")
+    end
+    argv.slice!(idx, 2)
+  end
+  argv.delete_if do |arg|
+    if arg.start_with?("--start-step=", "start_step=")
+      start_step = arg.split("=", 2)[1]
+      Kettle::Dev::ExitAdapter.abort("--start-step requires a numbered release step") if start_step.to_s.empty?
+      true
+    else
+      false
+    end
+  end
+  start_step
+end
+
+def extract_skip_ci_arg!(argv)
+  !!argv.delete("--skip-ci")
+end
+
 def extract_skip_changelog_arg!(argv)
   skip_changelog = !!argv.delete("--skip-changelog")
   argv.delete_if do |arg|
@@ -326,10 +356,11 @@ skip_changelog = extract_skip_changelog_arg!(ARGV)
 json_output = !!ARGV.delete("--json")
 events_output, event_types = extract_events_arg!(ARGV)
 Kettle::Dev::ExitAdapter.abort("--events cannot be combined with --json") if events_output && json_output
-start_step_arg = ARGV.find { |a| a.start_with?("start_step=") }
-start_step = start_step_arg ? start_step_arg.split("=", 2)[1].to_i : 0
+start_step = extract_start_step_arg!(ARGV) || 0
+skip_ci = extract_skip_ci_arg!(ARGV)
 version_override = extract_version_arg!(ARGV)
 skip_steps = extract_skip_steps_arg!(ARGV)
+skip_steps = [skip_steps, "10"].compact.join(",") if skip_ci
 ci_workflows = extract_ci_workflows_arg!(ARGV)
 skip_remotes = extract_skip_remotes_arg!(ARGV)
 required_remotes = extract_required_remotes_arg!(ARGV)

data/lib/kettle/dev/ci_monitor.rb

@@ -49,7 +49,7 @@ module Kettle
       #
       # @param restart_hint [String] guidance command shown on failure
       # @return [Boolean] whether all configured CI providers passed
-      def monitor_all!(restart_hint: "bundle exec kettle-release start_step=10", workflows: nil, keepalive: nil, event_recorder: nil, **options)
+      def monitor_all!(restart_hint: "bundle exec kettle-release --start-step 10", workflows: nil, keepalive: nil, event_recorder: nil, **options)
         results = [
           monitor_github_internal!(restart_hint: restart_hint, workflows: workflows, keepalive: keepalive, event_recorder: event_recorder),
           monitor_gitlab_internal!(restart_hint: restart_hint, keepalive: keepalive, event_recorder: event_recorder)
@@ -69,7 +69,7 @@ module Kettle
       # Returns false when GitLab is not configured for this repo/branch.
       # @param restart_hint [String]
       # @return [Boolean]
-      def monitor_gitlab!(restart_hint: "bundle exec kettle-release start_step=10")
+      def monitor_gitlab!(restart_hint: "bundle exec kettle-release --start-step 10")
         result = monitor_gitlab_internal!(restart_hint: restart_hint)
         result.nil? ? false : result
       end
@@ -138,7 +138,7 @@ module Kettle
       # Designed for kettle-release.
       # @param restart_hint [String]
       # @return [void]
-      def monitor_and_prompt_for_release!(restart_hint: "bundle exec kettle-release start_step=10")
+      def monitor_and_prompt_for_release!(restart_hint: "bundle exec kettle-release --start-step 10")
         results = collect_all
         any_checks = !(results[:github].nil? || results[:github].empty?) || !!results[:gitlab]
         abort("CI configuration not detected (GitHub or GitLab). Ensure CI is configured and remotes point to the correct hosts.") unless any_checks

data/lib/kettle/dev/git_adapter.rb

@@ -82,6 +82,21 @@ module Kettle
         false
       end
 
+      # Commit only the changes already staged by the caller.
+      #
+      # This is intentionally different from +commit_all+: bundle maintenance
+      # must not sweep unrelated release-preparation changes into its own
+      # atomic commit.
+      #
+      # @param message [String]
+      # @return [Boolean]
+      def commit_staged(message)
+        git_system("commit", "-m", message.to_s)
+      rescue => e
+        Kettle::Dev.debug_error(e, __method__)
+        false
+      end
+
       # Amend the current commit without changing its message.
       #
       # @return [Boolean]

data/lib/kettle/dev/lockfile_reset.rb

@@ -116,7 +116,6 @@ module Kettle
         BundlerEnvGuard.warn_unexpected_env!
         paths = lockfile_paths_for(target)
         force_full_update = release_lockfiles_target?(target)
-        skip_changelog_dependency ||= force_full_update
         platforms = release_platforms_for(paths) if force_full_update
         uninstall_unreleased_local_gems(paths) if force_full_update
         paths.each do |path|
@@ -125,7 +124,8 @@ module Kettle
               path,
               full_update: force_full_update,
               platforms: platforms&.fetch(path),
-              skip_changelog_dependency: skip_changelog_dependency
+              skip_changelog_dependency: skip_changelog_dependency,
+              update_bundler: force_full_update
             )
           end
         end
@@ -135,7 +135,8 @@ module Kettle
               path,
               full_update: true,
               platforms: platforms.fetch(path),
-              skip_changelog_dependency: skip_changelog_dependency
+              skip_changelog_dependency: skip_changelog_dependency,
+              update_bundler: true
             )
           end
         end
@@ -145,7 +146,7 @@ module Kettle
         paths
       end
 
-      def reset_lockfile!(path, full_update: false, platforms: nil, skip_changelog_dependency: false)
+      def reset_lockfile!(path, full_update: false, platforms: nil, skip_changelog_dependency: false, update_bundler: false)
         gemfile = gemfile_for_lockfile(path)
         unless gemfile && File.file?(gemfile)
           warn("Cannot reset #{display_path(path)} because its Gemfile was not found.")
@@ -159,6 +160,7 @@ module Kettle
             full_update: full_update,
             platforms: platforms,
             skip_changelog_dependency: skip_changelog_dependency,
+            update_bundler: update_bundler,
             isolated_gem_home: gem_home
           )
           if full_update || has_local_path_remote?(path)
@@ -169,7 +171,7 @@ module Kettle
         end
       end
 
-      def reset_command(path:, gemfile:, full_update: false, platforms: nil, skip_changelog_dependency: false, isolated_gem_home: nil)
+      def reset_command(path:, gemfile:, full_update: false, platforms: nil, skip_changelog_dependency: false, update_bundler: false, isolated_gem_home: nil)
         update_gems = (full_update || has_local_path_remote?(path)) ? [] : reset_update_gems(path)
         platforms ||= reset_platforms(path)
         removed_platforms = full_update ? [] : lockfile_platforms(path) - platforms
@@ -198,6 +200,11 @@ module Kettle
         end
         command << " --update"
         command << " #{update_gems.map { |gem_name| Shellwords.escape(gem_name) }.join(" ")}" unless update_gems.empty?
+        # Bundler preserves BUNDLED WITH during a normal lockfile update.
+        # Release lockfiles must record the Bundler that performed the final
+        # reset, or the next release command can dirty them after the prep
+        # commit by reconciling to a newer installed Bundler.
+        command << " --bundler" if update_bundler
         command << " --add-checksums"
         command
       end

data/lib/kettle/dev/release_cli.rb

@@ -145,6 +145,7 @@ module Kettle
           words = effective_command_words(cmd)
           words == ["bin/setup"] ||
             words.first(1) == ["bin/rake"] ||
+            words.first(2) == ["bundle", "update"] ||
             words.first(3) == ["bundle", "exec", "rake"] ||
             words.first(3) == ["bundle", "exec", "kettle-changelog"]
         rescue ArgumentError
@@ -252,8 +253,12 @@ module Kettle
       def run_with_release_environment
         run_pre_release_checks! if run_step?(0)
 
-        # 1. Ensure Bundler version ✓
-        ensure_bundler_2_7_plus! if run_step?(1)
+        # 1. Ensure Bundler version and record its current release in the
+        # development lockfiles before any release-preparation commit.
+        if run_step?(1)
+          ensure_bundler_2_7_plus!
+          update_bundler_and_commit!
+        end
 
         version = nil
         committed = nil
@@ -690,8 +695,7 @@ module Kettle
           puts "Resetting release lockfiles with local path dependencies disabled #{stage} (attempt #{attempt}/#{attempts})..."
           begin
             lockfile_reset.reset(
-              Kettle::Dev::LockfileReset::RELEASE_LOCKFILES_TARGET,
-              skip_changelog_dependency: true
+              Kettle::Dev::LockfileReset::RELEASE_LOCKFILES_TARGET
             )
             emit_release_lockfile_event(action: "reset", status: "ok", stage: stage, attempt: attempt, attempts: attempts)
             break
@@ -778,7 +782,7 @@ module Kettle
       end
 
       def normalize_release_lockfile!(path)
-        lockfile_reset.reset_lockfile!(path, skip_changelog_dependency: true)
+        lockfile_reset.reset_lockfile!(path)
       end
 
       def release_gemfile_for_lockfile(path)
@@ -786,7 +790,7 @@ module Kettle
       end
 
       def release_lockfile_normalization_env
-        lockfile_reset.normalization_env.merge("KETTLE_DEV_SKIP_CHANGELOG_DEPENDENCY" => "true")
+        lockfile_reset.normalization_env
       end
 
       def release_lockfile_diagnostics(path)
@@ -1253,7 +1257,7 @@ module Kettle
       def monitor_workflows_after_push!
         ensure_github_pull_request_for_ci!
         keep_release_secrets_alive!("CI monitoring")
-        restart_hint = "bundle exec kettle-release start_step=10"
+        restart_hint = "bundle exec kettle-release --start-step 10"
         emit_ci_monitor_event(action: "start", status: "started", workflows: @ci_workflows, restart_hint: restart_hint)
         # The monitor preserves fail-fast behavior by default and returns false
         # when K_RELEASE_CI_CONTINUE explicitly allows failed CI checks.
@@ -1602,6 +1606,90 @@ module Kettle
         end
       end
 
+      # Keep Bundler maintenance separate from the release metadata commit.
+      # The project lockfiles are shared development state, so the update must
+      # be real and committed rather than hidden behind a temporary lockfile.
+      def update_bundler_and_commit!
+        run_cmd!(release_project_command("bundle update --bundler"))
+
+        appraisal_gemfile = File.join(@root, "Appraisal.root.gemfile")
+        if File.file?(appraisal_gemfile)
+          appraisal_lockfile = File.join(@root, "Appraisal.root.gemfile.lock")
+          appraisal_command = "BUNDLE_GEMFILE=#{Shellwords.escape(appraisal_gemfile)} " \
+            "BUNDLE_LOCKFILE=#{Shellwords.escape(appraisal_lockfile)} bundle update --bundler"
+          run_cmd!(release_project_command(appraisal_command))
+          run_cmd!(release_project_command("bundle exec rake appraisal:reset"))
+        end
+
+        commit_bundle_update!
+      end
+
+      def commit_bundle_update!
+        paths = changed_bundle_lockfile_paths
+        return false if paths.empty?
+
+        unexpected = staged_paths - paths
+        unless unexpected.empty?
+          abort(<<~MSG)
+            Cannot commit Bundler updates atomically because unrelated files are already staged:
+            #{unexpected.map { |path| "  - #{path}" }.join("\n")}
+            Commit or unstage those files, then retry the release.
+          MSG
+        end
+
+        puts "Committing Bundler update in #{paths.length} lockfile(s)."
+        abort("Failed to stage Bundler update lockfiles.") unless @git.add_paths(paths)
+        abort("Failed to commit Bundler update lockfiles.") unless @git.commit_staged("🔒️ Update bundle")
+        reconcile_bundle_update_commit!
+        true
+      end
+
+      def changed_bundle_lockfile_paths
+        tracked, tracked_ok = git_output(["diff", "--name-only", "HEAD", "--"])
+        untracked, untracked_ok = git_output(["ls-files", "--others", "--exclude-standard"])
+        return [] unless tracked_ok && untracked_ok
+
+        (tracked.lines + untracked.lines).map(&:strip).reject(&:empty?).select { |path| bundle_lockfile_path?(path) }.uniq
+      end
+
+      def staged_paths
+        output, ok = git_output(["diff", "--cached", "--name-only"])
+        return [] unless ok
+
+        output.lines.map(&:strip).reject(&:empty?).uniq
+      end
+
+      def bundle_lockfile_path?(path)
+        path == "Gemfile.lock" || File.basename(path).end_with?(".lock")
+      end
+
+      def reconcile_bundle_update_commit!
+        3.times do
+          paths = changed_bundle_lockfile_paths
+          return if paths.empty?
+
+          puts "Bundler changed lockfiles while committing; amending the bundle update commit."
+          abort("Failed to stage post-commit Bundler lockfile changes.") unless @git.add_paths(paths)
+          abort("Failed to amend the bundle update commit.") unless @git.commit_amend_no_edit
+        end
+
+        abort("Bundler continued changing lockfiles after the bundle update commit.") unless changed_bundle_lockfile_paths.empty?
+      end
+
+      def reconcile_release_prep_commit!
+        3.times do
+          output, = git_output(["status", "--porcelain"])
+          return if output.empty?
+
+          puts "Release commit hooks changed tracked files; amending the release preparation commit."
+          abort("Failed to stage post-commit release changes.") unless @git.add_all
+          abort("Failed to amend the release preparation commit.") unless @git.commit_amend_no_edit
+        end
+
+        output, = git_output(["status", "--porcelain"])
+        abort("Release commit hooks continued changing files after the release preparation commit.") unless output.empty?
+      end
+
       def maybe_run_local_ci_before_push!(committed, force: false)
         mode = (ENV["K_RELEASE_LOCAL_CI"] || "").strip.downcase
         run_it =
@@ -1898,6 +1986,7 @@ module Kettle
           false
         else
           abort("Failed to commit release prep changes.") unless @git.commit_all(msg)
+          reconcile_release_prep_commit!
           true
         end
       end
@@ -1982,6 +2071,7 @@ module Kettle
         return "gem_release" if joined == "bundle exec rake release"
         return "gem_push" if effective_words.first(2) == ["gem", "push"]
         return "gem_checksums" if effective_words.first == "bin/gem_checksums"
+        return "bundle_update" if effective_words.first(2) == ["bundle", "update"]
         return "bundle_lock" if effective_words.first(2) == ["bundle", "lock"]
         return "bin_setup" if effective_words == ["bin/setup"]
         return "default_task" if effective_words == ["bin/rake"]
@@ -2023,6 +2113,7 @@ module Kettle
         joined = effective_words.join(" ")
 
         return "changelog" if joined.start_with?("bundle exec kettle-changelog")
+        return "bundle update" if effective_words.first(2) == ["bundle", "update"]
         return command_event_bundle_lock_summary(words) if effective_words.first(2) == ["bundle", "lock"]
         return "setup" if effective_words == ["bin/setup"]
         return "default task" if effective_words == ["bin/rake"]

data/lib/kettle/dev/version.rb

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

data/lib/kettle/dev/version_bump.rb

@@ -189,11 +189,7 @@ module Kettle
 
         source = File.read(gemspec_path)
         parse_result = self.class.parse_source(source, gemspec_path)
-        self.class.each_node(parse_result.value).filter_map do |node|
-          next unless node.is_a?(Prism::CallNode) && node.name == :version=
-
-          version_node = node.arguments&.arguments&.first
-          next unless version_node.is_a?(Prism::StringNode)
+        gemspec_version_literal_nodes(parse_result).filter_map do |version_node|
           next unless version_node.unescaped == current_version
           next if version_node.unescaped == target_version
 
@@ -202,6 +198,34 @@ module Kettle
         end
       end
 
+      def gemspec_version_literal_nodes(parse_result)
+        version_assignments = self.class.each_node(parse_result.value).select do |node|
+          node.is_a?(Prism::CallNode) && node.name == :version=
+        end
+        local_version_assignments = self.class.each_node(parse_result.value).select do |node|
+          node.is_a?(Prism::LocalVariableWriteNode) && node.name == :gem_version
+        end
+
+        version_assignments.flat_map do |assignment|
+          value = assignment.arguments&.arguments&.first
+          if value.is_a?(Prism::StringNode)
+            [value]
+          elsif value.is_a?(Prism::LocalVariableReadNode) && value.name == :gem_version
+            local_version_assignments.flat_map { |node| version_literals(node.value) }
+          else
+            version_literals(value)
+          end
+        end.uniq
+      end
+
+      def version_literals(node)
+        return [] unless node
+
+        self.class.each_node(node).select do |candidate|
+          candidate.is_a?(Prism::StringNode)
+        end
+      end
+
       def gemspec_path_for_bump
         paths = Dir.glob(File.join(root, "*.gemspec")).sort
         return nil if paths.empty?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-dev
 version: !ruby/object:Gem::Version
-  version: 3.0.12
+  version: 3.0.14
 platform: ruby
 authors:
 - Peter H. Boling
@@ -60,7 +60,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.13
+        version: 0.3.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -70,7 +70,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.13
+        version: 0.3.14
 - !ruby/object:Gem::Dependency
   name: kettle-ndjson
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +80,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.12
+        version: 0.1.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.12
+        version: 0.1.13
 - !ruby/object:Gem::Dependency
   name: kettle-rb
   requirement: !ruby/object:Gem::Requirement
@@ -100,7 +100,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.10
+        version: 0.1.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -110,7 +110,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.10
+        version: 0.1.11
 - !ruby/object:Gem::Dependency
   name: kettle-test
   requirement: !ruby/object:Gem::Requirement
@@ -256,7 +256,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.5
+        version: 3.2.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -266,7 +266,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.5
+        version: 3.2.6
 - !ruby/object:Gem::Dependency
   name: stone_checksums
   requirement: !ruby/object:Gem::Requirement
@@ -296,7 +296,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.11
+        version: 2.0.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -306,7 +306,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.11
+        version: 2.0.12
 description: "\U0001F372 Kettle::Dev is a meta tool from kettle-dev to streamline
   development and testing. Acts as a shim dependency, pulling in many other dependencies,
   to give you OOTB productivity with a RubyGem, or Ruby app project. Configures a
@@ -400,10 +400,10 @@ licenses:
 - AGPL-3.0-only
 metadata:
   homepage_uri: https://kettle-dev.galtzo.com
-  source_code_uri: https://github.com/kettle-dev/kettle-dev/tree/v3.0.12
-  changelog_uri: https://github.com/kettle-dev/kettle-dev/blob/v3.0.12/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-dev/tree/v3.0.14
+  changelog_uri: https://github.com/kettle-dev/kettle-dev/blob/v3.0.14/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-dev/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/3.0.12
+  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/3.0.14
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/kettle-dev/kettle-dev/wiki
   news_uri: https://www.railsbling.com/tags/kettle-dev