kettle-dev 3.0.8 → 3.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7124072093bb694c91e9f06b63821090cb992e1a8747f3f83e212a6b927dc25c
-  data.tar.gz: 861518ad52298f44bc8f76b9d6f4dbb5e9c11c80c4d97bf2c087d6e0ea20d90c
+  metadata.gz: 1e670b2a9da64f848886da0112d47c757607895c073ae8e0063583f9893c05a8
+  data.tar.gz: 9c395946450a91ee862b55922a1f5bf9bce6208c700098093d7c6050c535488b
 SHA512:
-  metadata.gz: 0f823bf26a24fcfcd3b52179dd960f9226c985a9cfc2d6962364dac67d329e6aa21e876f1bcf97a43e2e66158707d11325a56bb1d41d1327fdf4ecac977c4bce
-  data.tar.gz: 356bc62c3d680808bd5f89a73427dbfaac36157b29dabbe59bc584b37bc8a2aeaa0d62fd2d9198a32f1e0f8b3dc068b722e00214ae9b26a6e053bc60305c295b
+  metadata.gz: a9fd3e50a9f6315eec633c43dabd4447f0d2507e6b74ad9b17b3eb03497d4194895c65aa56010098e9a229e01115b4e0d3c1b3beefbaad26c76f4a6862e883c9
+  data.tar.gz: e493aa3febc35c6840001eca3b7f7ec127784b83c57e42feac1ab791a0aaac272e9094fb4589c18ba5e7e98cafb9d3fc256f059147c06f23f687768cb8191e52

data/CHANGELOG.md

@@ -30,6 +30,30 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [3.0.10] - 2026-08-23
+
+- TAG: [v3.0.10][3.0.10t]
+- COVERAGE: 91.15% -- 5688/6240 lines in 47 files
+- BRANCH COVERAGE: 76.13% -- 2175/2857 branches in 47 files
+- 50.62% documented
+
+### Fixed
+
+- Omit the standalone kettle-changelog dependency from normal release-time Bundler resolution, preventing unpublished downstream gem cycles in monorepo release waves.
+
+- Use a dependency-specific environment switch when omitting kettle-changelog from release Bundler resolution.
+
+## [3.0.9] - 2026-08-23
+
+- TAG: [v3.0.9][3.0.9t]
+- COVERAGE: 91.36% -- 5698/6237 lines in 47 files
+- BRANCH COVERAGE: 76.08% -- 2172/2855 branches in 47 files
+- 50.62% documented
+
+### Fixed
+
+- Keep Bundler platform reconciliation in an isolated lockfile during release builds and publication so normalized release lockfiles remain clean.
+
 ## [3.0.8] - 2026-08-23
 
 - TAG: [v3.0.8][3.0.8t]
@@ -3505,7 +3529,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.8...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-dev/compare/v3.0.10...HEAD
+[3.0.10]: https://github.com/kettle-dev/kettle-dev/compare/v3.0.9...v3.0.10
+[3.0.10t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v3.0.10
+[3.0.9]: https://github.com/kettle-dev/kettle-dev/compare/v3.0.8...v3.0.9
+[3.0.9t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v3.0.9
 [3.0.8]: https://github.com/kettle-dev/kettle-dev/compare/v3.0.7...v3.0.8
 [3.0.8t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v3.0.8
 [3.0.7]: https://github.com/kettle-dev/kettle-dev/compare/v3.0.6...v3.0.7

data/README.md

@@ -426,7 +426,8 @@ What it does:
         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)
-        5.  Run bin/rake appraisal:update if Appraisals present, then bin/rake yard
+        5.  Run bin/rake appraisal:generate if Appraisals are present, then bin/rake yard
+            (or appraisal:update with --appraisal-update)
         6.  Ensure git user configured; commit release prep
         7.  Optional local CI with `act` (controlled by `K_RELEASE_LOCAL_CI`)
         8.  Ensure trunk in sync across remotes; rebase feature as needed
@@ -442,7 +443,9 @@ What it does:
         18. Create GitHub Release (requires `GITHUB_TOKEN`)
         19. Push tags to remotes (final)
 - Examples:
-    - After intermittent CI failure, 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`
+    - 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.
     - 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`
     - Auto-approve release confirmation prompts: `bundle exec kettle-release --yes`
@@ -460,11 +463,27 @@ 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.
     - 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
       diagnostics, attempts one reset, amends the release prep commit if the
       reset changed tracked lockfiles, and aborts if diagnostics remain.
+    - Release build and publish tasks use a disposable copy of `Gemfile.lock`.
+      This is intentional: `bundle lock --add-platform` records the normalized
+      CI platforms, but it is not a permanent preservation directive. A later
+      non-frozen `bundle exec rake build` or `bundle exec rake release` can
+      reconcile the lockfile for the host platform and rewrite the tracked
+      file. RubyGems' `bundler/gem_tasks` then sees that rewrite and aborts at
+      its clean-tree guard, even though the release inputs were valid. The
+      temporary `BUNDLE_LOCKFILE` lets Bundler perform that runtime
+      reconciliation without changing the committed release lockfile; it is
+      removed when the release process exits. `BUNDLE_FROZEN=true` is not a
+      substitute because it converts the same reconciliation into a failure
+      when Bundler needs to write its resolved lockfile.
 - Tips:
     - The commit message helper `exe/kettle-commit-msg` prefers project-local `.git-hooks` (then falls back to `~/.git-hooks`).
     - The goalie file `commit-subjects-goalie.txt` controls when a footer is appended; customize `footer-template.erb.txt` as you like.
@@ -993,7 +1012,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.216-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-6.240-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

@@ -64,7 +64,8 @@ if ARGV.include?("-h") || ARGV.include?("--help")
       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)
-      5. Run bin/rake appraisal:generate if Appraisals present
+      5. Run bin/rake appraisal:generate if Appraisals are present
+         (or appraisal:update with --appraisal-update)
       6. Ensure git user configured; commit release prep
       7. Optional local CI with `act` (controlled by K_RELEASE_LOCAL_CI)
       8. Ensure trunk in sync across remotes; rebase feature as needed
@@ -81,8 +82,8 @@ if ARGV.include?("-h") || ARGV.include?("--help")
      19. Push tags to remotes (final)
 
     Options:
-      start_step=<number>         # Begin at the numbered step above (e.g., 10 to resume at CI monitoring)
-      skip_steps=<numbers>        # Comma-separated numbered steps to skip while running the rest
+      start_step=<number>         # Begin at the numbered step above; use 10 only for a transient CI failure on the same commit
+      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
       --yes                       # Auto-approve release confirmation prompts
@@ -99,12 +100,19 @@ if ARGV.include?("-h") || ARGV.include?("--help")
       --local-ci                  # Sensitive release mode: run act locally, publish before any git push,
                                   # 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
+      kettle-release               # After code, version, changelog, or lockfile changes, rerun the complete flow from step 0
+
     Environment:
       SKIP_GEM_SIGNING=true       # Build/release unsigned; avoids PEM password prompts
       GEM_CERT_USER=<user>        # Select certs/<user>.pem for signing
       K_RELEASE_LOCAL_CI=ask|1|0  # Use 'act' locally before push; 'ask' prompts, '1' forces, default off
       K_RELEASE_LOCAL_CI_WORKFLOW # Name of workflow (without .yml) for local CI; defaults to locked_deps or first
       K_RELEASE_CI_WORKFLOWS      # Comma-separated workflow files or stems to monitor at CI step 10
+      K_RELEASE_CI_CONTINUE=true  # Continue after a failed CI result; monitoring still runs and failures remain visible
       K_RELEASE_SKIP_REMOTES      # Comma-separated git remote names to exclude from release fetch/push parity
       K_RELEASE_REQUIRED_REMOTES  # Comma-separated remotes that must fetch for release parity; defaults to origin
       KETTLE_RELEASE_SECRETS_PROVIDER=1password
@@ -132,8 +140,8 @@ if ARGV.include?("-h") || ARGV.include?("--help")
       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         # resume by monitoring CI for the current branch
-      kettle-release skip_steps=10         # run the release but skip remote CI monitoring
+      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
   USAGE
   exit 0

data/lib/kettle/dev/lockfile_reset.rb

@@ -34,18 +34,31 @@ module Kettle
         @release_platforms = {}
       end
 
-      def reset(target)
+      def reset(target, skip_changelog_dependency: false)
         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|
-          reset_lockfile!(path, full_update: force_full_update, platforms: platforms&.fetch(path)) if force_full_update || normalization_needed?(path)
+          if force_full_update || normalization_needed?(path)
+            reset_lockfile!(
+              path,
+              full_update: force_full_update,
+              platforms: platforms&.fetch(path),
+              skip_changelog_dependency: skip_changelog_dependency
+            )
+          end
         end
         if force_full_update && uninstall_unreleased_local_gems(paths)
           paths.each do |path|
-            reset_lockfile!(path, full_update: true, platforms: platforms.fetch(path))
+            reset_lockfile!(
+              path,
+              full_update: true,
+              platforms: platforms.fetch(path),
+              skip_changelog_dependency: skip_changelog_dependency
+            )
           end
         end
         diagnostics = paths.flat_map { |path| diagnostics(path) }
@@ -54,7 +67,7 @@ module Kettle
         paths
       end
 
-      def reset_lockfile!(path, full_update: false, platforms: nil)
+      def reset_lockfile!(path, full_update: false, platforms: nil, skip_changelog_dependency: false)
         gemfile = gemfile_for_lockfile(path)
         unless gemfile && File.file?(gemfile)
           warn("Cannot reset #{display_path(path)} because its Gemfile was not found.")
@@ -67,6 +80,7 @@ module Kettle
             gemfile: gemfile,
             full_update: full_update,
             platforms: platforms,
+            skip_changelog_dependency: skip_changelog_dependency,
             isolated_gem_home: gem_home
           )
           if full_update || has_local_path_remote?(path)
@@ -77,7 +91,7 @@ module Kettle
         end
       end
 
-      def reset_command(path:, gemfile:, full_update: false, platforms: nil, isolated_gem_home: nil)
+      def reset_command(path:, gemfile:, full_update: false, platforms: nil, skip_changelog_dependency: 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
@@ -85,6 +99,7 @@ module Kettle
           "BUNDLE_GEMFILE" => gemfile,
           "BUNDLE_LOCKFILE" => path
         )
+        env["KETTLE_DEV_SKIP_CHANGELOG_DEPENDENCY"] = "true" if skip_changelog_dependency
         if isolated_gem_home
           env["GEM_HOME"] = isolated_gem_home
           env["GEM_PATH"] = isolated_gem_home

data/lib/kettle/dev/release_cli.rb

@@ -217,6 +217,7 @@ module Kettle
         @started_at = nil
         @finished_report = nil
         @changelog_generated_coverage = false
+        @release_task_lockfile_path = nil
       end
 
       def run
@@ -242,6 +243,7 @@ module Kettle
         record_diagnostic("release_error", "#{e.class}: #{e.message}", severity: "error", blocking: true)
         raise
       ensure
+        cleanup_release_task_lockfile!
         finish_release_report(status: status, error: error)
       end
 
@@ -687,7 +689,10 @@ module Kettle
           emit_release_lockfile_event(action: "reset", status: "started", stage: stage, attempt: attempt, attempts: attempts)
           puts "Resetting release lockfiles with local path dependencies disabled #{stage} (attempt #{attempt}/#{attempts})..."
           begin
-            lockfile_reset.reset(Kettle::Dev::LockfileReset::RELEASE_LOCKFILES_TARGET)
+            lockfile_reset.reset(
+              Kettle::Dev::LockfileReset::RELEASE_LOCKFILES_TARGET,
+              skip_changelog_dependency: true
+            )
             emit_release_lockfile_event(action: "reset", status: "ok", stage: stage, attempt: attempt, attempts: attempts)
             break
           rescue Kettle::Dev::Error => error
@@ -773,7 +778,7 @@ module Kettle
       end
 
       def normalize_release_lockfile!(path)
-        lockfile_reset.reset_lockfile!(path)
+        lockfile_reset.reset_lockfile!(path, skip_changelog_dependency: true)
       end
 
       def release_gemfile_for_lockfile(path)
@@ -781,7 +786,7 @@ module Kettle
       end
 
       def release_lockfile_normalization_env
-        lockfile_reset.normalization_env
+        lockfile_reset.normalization_env.merge("KETTLE_DEV_SKIP_CHANGELOG_DEPENDENCY" => "true")
       end
 
       def release_lockfile_diagnostics(path)
@@ -972,10 +977,47 @@ module Kettle
         release_lockfile_normalization_env.each do |key, value|
           command << " #{key}=#{Shellwords.escape(value)}"
         end
+        if release_task_command?(project_command)
+          if (lockfile = release_task_lockfile_path)
+            command << " BUNDLE_LOCKFILE=#{Shellwords.escape(lockfile)}"
+          end
+        end
         command << " #{project_command}"
         command
       end
 
+      def release_task_command?(command)
+        ["bundle exec rake build", "bundle exec rake release"].include?(command.to_s.strip)
+      end
+
+      # Bundler may reconcile the current machine's platform while loading a
+      # project bundle. That is useful during development, but it can dirty the
+      # release-preparation commit between the final lockfile reset and
+      # bundler/gem_tasks' release:guard_clean check. Keep that reconciliation
+      # in a disposable lockfile so the committed, normalized lockfile remains
+      # unchanged throughout build and publication.
+      def release_task_lockfile_path
+        return @release_task_lockfile_path if @release_task_lockfile_path
+
+        source = File.join(@root, "Gemfile.lock")
+        return unless File.file?(source)
+
+        directory = File.join(@root, "tmp", "kettle-release", "lockfiles")
+        FileUtils.mkdir_p(directory)
+        @release_task_lockfile_path = File.join(directory, "Gemfile-#{$$}.lock")
+        FileUtils.cp(source, @release_task_lockfile_path)
+        @release_task_lockfile_path
+      rescue SystemCallError => error
+        abort("Unable to isolate the release task lockfile: #{error.message}")
+      end
+
+      def cleanup_release_task_lockfile!
+        return unless @release_task_lockfile_path
+
+        FileUtils.rm_f(@release_task_lockfile_path)
+        @release_task_lockfile_path = nil
+      end
+
       def confirm_yes!(message, prompt, abort_message)
         puts(message)
         if @yes

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.8"
+      VERSION = "3.0.10"
     end
     # Current gem version exposed at the traditional constant location.
     VERSION = Version::VERSION # Traditional Constant Location

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-dev
 version: !ruby/object:Gem::Version
-  version: 3.0.8
+  version: 3.0.10
 platform: ruby
 authors:
 - Peter H. Boling
@@ -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.8
-  changelog_uri: https://github.com/kettle-dev/kettle-dev/blob/v3.0.8/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-dev/tree/v3.0.10
+  changelog_uri: https://github.com/kettle-dev/kettle-dev/blob/v3.0.10/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-dev/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/3.0.8
+  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/3.0.10
   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