kettle-dev 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 667298e18f32020c0774fe6499e6425de5ae71b44c40330ba9fc7e806620de66
-  data.tar.gz: d992bc999468d8fe27608d0ea470747d0497f98ca9cfbc02c8d82b79a5e0c773
+  metadata.gz: 84cc3b69661ffe69649459f3433c0fff925cac38111da9a8b57c0c50360393ac
+  data.tar.gz: 16acb8f6caae5d385a135be080b5ceb498fb00a622757851457e42f2d6d8eadf
 SHA512:
-  metadata.gz: a9690ba90e3745560e5fee1ab148dd541955fe9aec0a0c15126009da514d46ac1492f73943205a99efe5264dce1f8f07dcb9c87714f2868c23eee277354fc629
-  data.tar.gz: 90760f66a27b7ac2d6e4524976f2e0756906b7ea4d96b4c98d29862006d06ac4931b04e724a419e3559a955f025d91a59e85b7d8ab1cf2ce95037d449fb760f7
+  metadata.gz: 37a33518f764205039e9d58ec5f5cac1f06e5c0bee57779380a809ff7c12b4ba28b2e3c7738f3e723d9a8f4c3a61913603cbaebe8a575e58ee449fe5d7019889
+  data.tar.gz: 5530180b41c5654ca106d4d8d92fa496436ef282b035d6d1db4beb0fcc2763248e67326a2ddd104b0a93ed808fc941469bd6509253b6855f5c4507e48df5900f

data/CHANGELOG.md

@@ -30,6 +30,23 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [3.0.6] - 2026-08-11
+
+- TAG: [v3.0.6][3.0.6t]
+- COVERAGE: 91.47% -- 5670/6199 lines in 47 files
+- BRANCH COVERAGE: 76.17% -- 2161/2837 branches in 47 files
+- 50.62% documented
+
+### Added
+
+- Add --skip-changelog to release without skipping pre-release gates or the default task.
+
+### Fixed
+
+- Retry RubyGems publication outside the parent Bundler environment after an expired-edge OTP, with a short delay for TOTP refresh.
+
+- Make --skip-changelog releases omit the unpublished standalone kettle-changelog dependency during lockfile normalization.
+
 ## [3.0.5] - 2026-08-10
 
 - TAG: [v3.0.5][3.0.5t]
@@ -3464,7 +3481,9 @@ 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.5...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-dev/compare/v3.0.6...HEAD
+[3.0.6]: https://github.com/kettle-dev/kettle-dev/compare/v3.0.5...v3.0.6
+[3.0.6t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v3.0.6
 [3.0.5]: https://github.com/kettle-dev/kettle-dev/compare/v3.0.4...v3.0.5
 [3.0.5t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v3.0.5
 [3.0.4]: https://github.com/kettle-dev/kettle-dev/compare/v3.0.3...v3.0.4

data/README.md

@@ -107,7 +107,7 @@ out to `kettle-release` for each member that needs publishing.
 
 ### Compatibility
 
-Compatible with MRI Ruby 2.4.0+, and concordant releases of JRuby, and TruffleRuby.
+Compatible with MRI Ruby 2.4.0+, JRuby, and TruffleRuby.
 CI workflows and Appraisals are generated for MRI Ruby 2.4+.
 This test floor is configured by `ruby.test_minimum` in `.kettle-jem.yml` and
 may be higher than the gem's runtime compatibility floor when legacy Rubies are
@@ -702,8 +702,7 @@ See [SECURITY.md][🔐security].
 ## 🤝 Contributing
 
 If you need some ideas of where to help, you could work on adding more code coverage,
-or if it is already 💯 (see [below](#code-coverage)) check [issues][🤝gh-issues] or [PRs][🤝gh-pulls],
-or use the gem and think about how it could be better.
+check [issues][🤝gh-issues] or [PRs][🤝gh-pulls], or use the gem and think about how it could be better.
 
 We [![Keep A Changelog][📗keep-changelog-img]][📗keep-changelog] so if you make changes, remember to update it.
 
@@ -739,19 +738,6 @@ Made with [contributors-img][🖐contrib-rocks].
 
 Also see GitLab Contributors: [https://gitlab.com/kettle-dev/kettle-dev/-/graphs/main][🚎contributors-gl]
 
-<details markdown="1">
- <summary>⭐️ Star History</summary>
-
-<a href="https://star-history.com/kettle-dev/kettle-dev&Date">
- <picture>
- <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=kettle-dev/kettle-dev&type=Date&theme=dark" />
- <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=kettle-dev/kettle-dev&type=Date" />
- <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=kettle-dev/kettle-dev&type=Date" />
- </picture>
-</a>
-
-</details>
-
 ## 📌 Versioning
 
 This library follows [![Semantic Versioning 2.0.0][📌semver-img]][📌semver] for its public API where practical.
@@ -760,7 +746,7 @@ For most applications, prefer the [Pessimistic Version Constraint][📌pvc] with
 For example:
 
 ```ruby
-spec.add_dependency("kettle-dev", "~> 2.0")
+spec.add_dependency("kettle-dev", "~> 3.0")
 ```
 
 <details markdown="1">
@@ -1007,7 +993,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.179-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-6.199-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,7 +49,7 @@ 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-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] [--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.
 
@@ -87,6 +87,7 @@ if ARGV.include?("-h") || ARGV.include?("--help")
       --version VERSION           # Use this version instead of detecting VERSION from lib/**/version.rb
       --yes                       # Auto-approve release confirmation prompts
       --appraisal-update          # Use slower appraisal:update instead of default appraisal:generate
+      --skip-changelog            # Skip kettle-changelog but retain pre-release gates and the default task
       --skip-bundle-audit         # Skip bundle:audit/update during release rake checks
       --ci-workflows WORKFLOWS    # Comma-separated workflow files or stems to monitor at CI step 10
       --skip-remotes REMOTES      # Comma-separated git remote names to exclude from release fetch/push parity
@@ -175,6 +176,19 @@ def extract_skip_steps_arg!(argv)
   skip_steps
 end
 
+def extract_skip_changelog_arg!(argv)
+  skip_changelog = !!argv.delete("--skip-changelog")
+  argv.delete_if do |arg|
+    if arg.start_with?("skip_changelog=")
+      skip_changelog = arg.split("=", 2)[1].to_s.downcase != "false"
+      true
+    else
+      false
+    end
+  end
+  skip_changelog
+end
+
 def extract_ci_workflows_arg!(argv)
   workflows = nil
   if (idx = argv.index("--ci-workflows"))
@@ -300,6 +314,7 @@ local_ci = ARGV.include?("--local-ci")
 yes = !!ARGV.delete("--yes")
 appraisal_task = ARGV.delete("--appraisal-update") ? "appraisal:update" : nil
 skip_bundle_audit = !!ARGV.delete("--skip-bundle-audit")
+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
@@ -315,7 +330,7 @@ secrets_provider = extract_secrets_provider_arg!(ARGV)
 
 begin
   event_stream = events_output ? Kettle::Ndjson.event_stream($stdout, types: event_types) : nil
-  Kettle::Dev::ReleaseCLI.new(start_step: start_step, local_ci: local_ci, version: version_override, appraisal_task: appraisal_task, skip_steps: skip_steps, skip_bundle_audit: skip_bundle_audit, ci_workflows: ci_workflows, skip_remotes: skip_remotes, required_remotes: required_remotes, secrets_provider_name: secrets_provider, yes: yes, event_stream: event_stream, json_output: json_output, json_io: $stdout, report_path: report_path).run
+  Kettle::Dev::ReleaseCLI.new(start_step: start_step, local_ci: local_ci, version: version_override, appraisal_task: appraisal_task, skip_steps: skip_steps, skip_changelog: skip_changelog, skip_bundle_audit: skip_bundle_audit, ci_workflows: ci_workflows, skip_remotes: skip_remotes, required_remotes: required_remotes, secrets_provider_name: secrets_provider, yes: yes, event_stream: event_stream, json_output: json_output, json_io: $stdout, report_path: report_path).run
 rescue LoadError => e
   warn("#{script_basename}: could not load dependency: #{e.class}: #{e.message}")
   warn(Array(e.backtrace).join("\n")) if ENV["DEBUG"]

data/lib/kettle/dev/release_cli.rb

@@ -26,6 +26,7 @@ module Kettle
   module Dev
     class ReleaseCLI
       RUBYGEMS_INVALID_OTP = /Your OTP code is incorrect\. Please check it and retry\./.freeze
+      OTP_RETRY_DELAY_SECONDS = 2
       QUIET_ENV = {
         "KETTLE_JEM_QUIET" => "true",
         "KETTLE_JEM_DEBUG" => "false",
@@ -125,6 +126,14 @@ module Kettle
 
         def command_env_for(cmd)
           env_hash = command_env
+          if gem_push_command?(cmd)
+            # RubyGems publication is an unbundled operation. In particular, an
+            # OTP retry can run after the parent release task has selected a
+            # different Gemfile; carrying that bundle into `gem push` can make
+            # RubyGems load stale local dependency state before it publishes.
+            return env_hash.merge(BundlerEnvGuard.unbundled_env)
+          end
+
           return env_hash unless project_bundle_command?(cmd)
 
           env_hash.merge(BundlerEnvGuard.unbundled_env).merge(
@@ -142,6 +151,12 @@ module Kettle
           false
         end
 
+        def gem_push_command?(cmd)
+          effective_command_words(cmd).first(2) == ["gem", "push"]
+        rescue ArgumentError
+          false
+        end
+
         def effective_command_words(cmd)
           words = Shellwords.split(cmd.to_s)
           words.shift while words.first&.match?(/\A[A-Za-z_][A-Za-z0-9_]*=/)
@@ -175,12 +190,13 @@ module Kettle
 
       public
 
-      def initialize(start_step: 0, local_ci: false, version: nil, appraisal_task: nil, skip_steps: nil, skip_bundle_audit: nil, ci_workflows: nil, skip_remotes: nil, required_remotes: nil, secrets_provider_name: nil, yes: false, **options)
+      def initialize(start_step: 0, local_ci: false, version: nil, appraisal_task: nil, skip_steps: nil, skip_changelog: nil, skip_bundle_audit: nil, ci_workflows: nil, skip_remotes: nil, required_remotes: nil, secrets_provider_name: nil, yes: false, **options)
         @root = Kettle::Dev::CIHelpers.project_root
         @git = Kettle::Dev::GitAdapter.new(@root)
         @start_step = (start_step || 0).to_i
         @start_step = 0 if @start_step < 0
         @skip_steps = normalize_skip_steps(skip_steps)
+        @skip_changelog = truthy_value?(skip_changelog) || truthy_value?(ENV["KETTLE_DEV_SKIP_CHANGELOG"])
         @ci_workflows = normalize_ci_workflows(ci_workflows || ENV["K_RELEASE_CI_WORKFLOWS"])
         @skip_remotes = normalize_remote_names(skip_remotes || ENV["K_RELEASE_SKIP_REMOTES"], "skip remotes")
         @required_remotes = normalize_required_remotes(required_remotes)
@@ -209,8 +225,10 @@ module Kettle
         status = "ok"
         error = nil
         with_bundle_audit_skip_env do
-          with_machine_stdout_redirect do
-            run_with_release_environment
+          with_skip_changelog_env do
+            with_machine_stdout_redirect do
+              run_with_release_environment
+            end
           end
         end
       rescue SystemExit => e
@@ -637,7 +655,15 @@ module Kettle
       def run_pre_release_checks!
         puts "Running pre-release checks via kettle-pre-release..."
         Kettle::Dev::PreReleaseCLI.new(check_num: 1, event_recorder: @event_recorder).run
-        run_changelog!
+        if skip_changelog?
+          puts "Skipping kettle-changelog because --skip-changelog was provided."
+        else
+          run_changelog!
+        end
+      end
+
+      def skip_changelog?
+        @skip_changelog
       end
 
       def prepare_release_lockfiles_for_commit!
@@ -1368,6 +1394,10 @@ module Kettle
           status: "started",
           reason: "RubyGems rejected the first OTP"
         )
+        # A rejection at the TOTP boundary can leave the provider returning the
+        # same code for a moment. Wait briefly before starting the retry so the
+        # next prompt can obtain a refreshed code.
+        sleep(OTP_RETRY_DELAY_SECONDS)
         run_cmd!("gem push #{Shellwords.escape(gem_path)}")
         emit_secret_event(
           source: release_secrets_provider_label,
@@ -1489,6 +1519,18 @@ module Kettle
         end
       end
 
+      def with_skip_changelog_env
+        return yield unless skip_changelog?
+
+        previous = ENV["KETTLE_DEV_SKIP_CHANGELOG"]
+        ENV["KETTLE_DEV_SKIP_CHANGELOG"] = "true"
+        yield
+      ensure
+        if skip_changelog?
+          previous.nil? ? ENV.delete("KETTLE_DEV_SKIP_CHANGELOG") : ENV["KETTLE_DEV_SKIP_CHANGELOG"] = previous
+        end
+      end
+
       def git_output(args)
         # Route all git interactions through the GitAdapter so tests can safely mock them
         out, ok = @git.capture(args)

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.5"
+      VERSION = "3.0.6"
     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.5
+  version: 3.0.6
 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.5
-  changelog_uri: https://github.com/kettle-dev/kettle-dev/blob/v3.0.5/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-dev/tree/v3.0.6
+  changelog_uri: https://github.com/kettle-dev/kettle-dev/blob/v3.0.6/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-dev/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/3.0.5
+  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/3.0.6
   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