kettle-family 1.2.44 → 1.2.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58ad6d307a8fcb8dc7a2911a7b1cb1c62928e130af9df80e13466158b5dc0441
-  data.tar.gz: 0e296343ddab05057267fc2f698cc0c9292d491bfd20c300dcc117d89b3b9346
+  metadata.gz: 0142ed9035a396a18beb14aeaee5371a3d64f42824d88a548cdddeebc74dc16b
+  data.tar.gz: 5f798e5f0ff01e273045396527200782fc54460aa3c5055bc797c144237c10c1
 SHA512:
-  metadata.gz: 3d6ffcef4f61673a66ad8c3dc816a8fcc37c09c8b07a3ef0f2fa8b3a777517f110689922edce9c9b7f76cc5f5d9a9c64409df30e73f9c5f49df4bdd0bf10b5e0
-  data.tar.gz: 58d68a7bc24ef399531c17f42fb3e6b6f8d3bc03db7dd5b18049721b0c9d4372c0f1ac4209d587f28d63e2665e7ee9c7a092cbfb1ae0ca7974b8146c4843ab22
+  metadata.gz: 2bbf9ecb021fc52055dd92992d0325972597690c1f46101d77e6d5cf1fb150b1ebb6519a76fc9aeeef72b891b7b05fad4d52698a49f85bc4933ad20a10683969
+  data.tar.gz: 675ddf3fb33b593341fcf5a53c7a0aff9a92d6df0449135f4541ea7a6ec39a423fe7ba945a8fd4770638aa9319bd5714c5f9d51d8d7b24f333d5f2501d9249a8

data/CHANGELOG.md

@@ -30,6 +30,21 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.2.45] - 2026-08-09
+
+- TAG: [v1.2.45][1.2.45t]
+- COVERAGE: 93.59% -- 5109/5459 lines in 32 files
+- BRANCH COVERAGE: 76.10% -- 2051/2695 branches in 32 files
+- 29.64% documented
+
+### Fixed
+
+- Run family release-state changelog probes outside the parent Bundler environment so --only pend can inspect all members.
+
+- Retry the existing gem artifact with a fresh OTP when RubyGems rejects the first MFA code during a family release.
+
+- Allow kettle-family to resolve against kettle-dev 3.x after the kettle-dev 3.0.0 executable split.
+
 ## [1.2.44] - 2026-08-09
 
 - TAG: [v1.2.44][1.2.44t]
@@ -1977,7 +1992,9 @@ Please file a bug if you notice a violation of semantic versioning.
 - Fixed CI load failures on engines without compatible `pty` support by falling back to Open3 for interactive release commands.
 - Fixed Ruby 3.2 version-bump support by loading Prism lazily and wiring the Prism gem only for MRI versions that need it.
 
-[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.2.44...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.2.45...HEAD
+[1.2.45]: https://github.com/kettle-dev/kettle-family/compare/v1.2.44...v1.2.45
+[1.2.45t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.45
 [1.2.44]: https://github.com/kettle-dev/kettle-family/compare/v1.2.43...v1.2.44
 [1.2.44t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.44
 [1.2.43]: https://github.com/kettle-dev/kettle-family/compare/v1.2.42...v1.2.43

data/README.md

@@ -850,7 +850,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-5.441-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-5.459-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
 [🔐security]: https://github.com/kettle-dev/kettle-family/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/lib/kettle/family/release_state_check.rb

@@ -75,7 +75,11 @@ module Kettle
         command = release_state_command
         emit_event(event_handler, member: member, branch: branch, action: "member_start", status: "running", command: command)
         emit_event(event_handler, member: member, branch: branch, action: "changelog_command", status: "running", command: command)
-        stdout, stderr, status = Open3.capture3(release_state_env(member), *command, chdir: release_state_workdir(member))
+        stdout, stderr, status = capture_release_state(
+          env: release_state_env(member),
+          command: command,
+          workdir: release_state_workdir(member)
+        )
         elapsed = Process.clock_gettime(Process::CLOCK_MONOTONIC) - started
         success = status.success?
         emit_event(event_handler, member: member, branch: branch, action: "changelog_command", status: success ? "ok" : "failed", elapsed_seconds: elapsed, status_code: status.exitstatus)
@@ -106,6 +110,15 @@ module Kettle
         [RbConfig.ruby, "-S", "kettle-changelog", "--release-state", "--json"]
       end
 
+      def capture_release_state(env:, command:, workdir:)
+        capture = -> { Open3.capture3(env, *command, chdir: workdir) }
+        # kettle-family can run as a standalone executable, but an active
+        # Bundler context must not leak into the standalone changelog probe.
+        return capture.call unless defined?(::Bundler)
+
+        ::Bundler.with_unbundled_env(&capture)
+      end
+
       def check_shared_changelog_member_or_local(member, branch: nil, event_handler: nil)
         return check_member(member, branch: branch, event_handler: event_handler) if member_local_changelog?(member)
 
@@ -117,7 +130,11 @@ module Kettle
         command = release_state_command
         emit_event(event_handler, member: member, branch: branch, action: "member_start", status: "running", command: command)
         emit_event(event_handler, member: member, branch: branch, action: "changelog_command", status: "running", command: command)
-        stdout, stderr, status = Open3.capture3(shared_changelog_env(member), *command, chdir: config.root)
+        stdout, stderr, status = capture_release_state(
+          env: shared_changelog_env(member),
+          command: command,
+          workdir: config.root
+        )
         elapsed = Process.clock_gettime(Process::CLOCK_MONOTONIC) - started
         success = status.success?
         emit_event(event_handler, member: member, branch: branch, action: "changelog_command", status: success ? "ok" : "failed", elapsed_seconds: elapsed, status_code: status.exitstatus)

data/lib/kettle/family/version.rb

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

data/lib/kettle/family/workflow.rb

@@ -17,6 +17,7 @@ module Kettle
   module Family
     class Workflow
       PreflightProgressMember = Struct.new(:name)
+      RUBYGEMS_INVALID_OTP = /Your OTP code is incorrect\. Please check it and retry\./
 
       DEFAULT_COMMANDS = {
         "template" => "bundle exec kettle-jem install",
@@ -1216,7 +1217,7 @@ module Kettle
           memo.last(2).each { |result| emit_member_result_progress(member, result, progress: progress) }
           return memo unless memo.last(2).all?(&:ok?)
 
-          memo << runner.call(
+          release_result = runner.call(
             member: member,
             phase: release_phase,
             command: release_command,
@@ -1226,6 +1227,8 @@ module Kettle
             log_path: release_command_log_path(member, release_phase),
             passthrough_output: release_command_passthrough_output?
           )
+          release_result = retry_release_gem_push_after_invalid_otp(member: member, failed_result: release_result, runner: runner)
+          memo << release_result
           emit_member_result_progress(member, memo.last, progress: progress)
           return memo unless memo.last.ok?
 
@@ -1924,6 +1927,38 @@ module Kettle
         verbose || debug
       end
 
+      # kettle-family normally owns the RubyGems OTP prompt so one code can be
+      # coordinated across concurrent member releases. If RubyGems rejects
+      # that code, the member's release command has already tagged and pushed
+      # the repository before attempting the gem upload. Retry only the
+      # existing artifact; rerunning the full release command would repeat git
+      # tagging and CI work and can fail for an unrelated reason.
+      def retry_release_gem_push_after_invalid_otp(member:, failed_result:, runner:)
+        return failed_result unless release_phase == "release_publish"
+        return failed_result if failed_result.ok?
+        return failed_result unless [failed_result.stdout, failed_result.stderr].any? { |output| output.to_s.match?(RUBYGEMS_INVALID_OTP) }
+
+        gem_path = release_gem_path(member)
+        return failed_result unless gem_path
+
+        puts "RubyGems rejected the first OTP; retrying the existing gem artifact with a fresh OTP..."
+        runner.call(
+          member: member,
+          phase: release_phase,
+          command: ["gem", "push", gem_path],
+          env: release_env_for_member(member),
+          interactive: true,
+          stdout_line_handler: release_event_line_handler(member, progress: @release_progress),
+          log_path: release_command_log_path(member, "release_publish_otp_retry"),
+          passthrough_output: release_command_passthrough_output?
+        )
+      end
+
+      def release_gem_path(member)
+        suffix = "-#{member.version}.gem"
+        Dir.glob(File.join(member.root, "pkg", "*.gem")).find { |path| File.basename(path).end_with?(suffix) }
+      end
+
       def kettle_release_command?(command)
         case command
         when Array

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 1.2.44
+  version: 1.2.45
 platform: ruby
 authors:
 - Peter H. Boling
@@ -69,22 +69,22 @@ dependencies:
   name: kettle-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.5.26
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.5.26
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: kettle-test
   requirement: !ruby/object:Gem::Requirement
@@ -360,10 +360,10 @@ licenses:
 - AGPL-3.0-only
 metadata:
   homepage_uri: https://kettle-family.galtzo.com
-  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.2.44
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.44/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.2.45
+  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.45/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.44
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.45
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/kettle-dev/kettle-family/wiki
   news_uri: https://www.railsbling.com/tags/kettle-family