kettle-family 1.2.45 → 1.2.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0142ed9035a396a18beb14aeaee5371a3d64f42824d88a548cdddeebc74dc16b
-  data.tar.gz: 5f798e5f0ff01e273045396527200782fc54460aa3c5055bc797c144237c10c1
+  metadata.gz: 927dd8ea2185b00cfff68f01eb09a93d0a1b7f48fcb2fc3c2a9c52b0c76898aa
+  data.tar.gz: a2d7f81ebc0e07a395bfefbf72685c6dff5951e5440c7f4f6e53904a16dace28
 SHA512:
-  metadata.gz: 2bbf9ecb021fc52055dd92992d0325972597690c1f46101d77e6d5cf1fb150b1ebb6519a76fc9aeeef72b891b7b05fad4d52698a49f85bc4933ad20a10683969
-  data.tar.gz: 675ddf3fb33b593341fcf5a53c7a0aff9a92d6df0449135f4541ea7a6ec39a423fe7ba945a8fd4770638aa9319bd5714c5f9d51d8d7b24f333d5f2501d9249a8
+  metadata.gz: ff77a0078c229e82e5d04952006502e188f26df36621079af986af2807dd2117988f7dbd0e8d5159f67669198fd275860e757ac3f3f0b4b558a7697a619e6e03
+  data.tar.gz: 75eca26e357b3570335ac16bd3668c01b3ab8482f6813431ad22e550b47bc5961432bcc1e88f7f83b57411c75fa55983e25ca1c77d0b1d4f8c754c52bf3f1b31

data/CHANGELOG.md

@@ -30,6 +30,17 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.2.46] - 2026-08-10
+
+- TAG: [v1.2.46][1.2.46t]
+- COVERAGE: 93.63% -- 5083/5429 lines in 32 files
+- BRANCH COVERAGE: 76.32% -- 2040/2673 branches in 32 files
+- 29.72% documented
+
+### Fixed
+
+- Delegate configured release secrets to kettle-release so its native OTP retry can complete all remaining release steps.
+
 ## [1.2.45] - 2026-08-09
 
 - TAG: [v1.2.45][1.2.45t]
@@ -1992,7 +2003,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.45...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.2.46...HEAD
+[1.2.46]: https://github.com/kettle-dev/kettle-family/compare/v1.2.45...v1.2.46
+[1.2.46t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.46
 [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

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.459-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-5.429-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/version.rb

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

data/lib/kettle/family/workflow.rb

@@ -17,7 +17,6 @@ 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",
@@ -1128,7 +1127,6 @@ module Kettle
         wave_jobs = release_jobs(wave)
         mutex = Mutex.new
         stop = false
-        release_otp_coordinator&.queue_total = wave_jobs
         Array.new(wave_jobs) do
           Thread.new do # rubocop:disable ThreadSafety/NewThread -- family release intentionally runs independent members concurrently.
             runner = release_command_runner
@@ -1227,7 +1225,6 @@ 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?
@@ -1267,41 +1264,13 @@ module Kettle
           execute: execute,
           accept: release_command_uses_kettle_release_yes? ? false : accept,
           gem_signing_password: release_command_delegates_secrets_to_kettle_release? ? nil : @gem_signing_password,
-          otp_coordinator: release_command_delegates_secrets_to_kettle_release? ? nil : release_otp_coordinator
+          # RubyGems MFA belongs to the child release command. Keeping an OTP
+          # coordinator here can make a family-level gem retry look successful
+          # while skipping the child's checksums and GitHub release steps.
+          otp_coordinator: nil
         )
       end
 
-      def release_otp_coordinator
-        return nil unless execute && release_command_interactive?
-
-        @release_otp_coordinator ||= CommandRunner::OtpCoordinator.new(
-          secrets_provider: @secrets_provider,
-          event_handler: method(:handle_release_otp_event)
-        )
-      end
-
-      def handle_release_otp_event(member_name, event)
-        progress = @release_progress
-        return unless progress
-
-        member = release_progress_member_for(member_name)
-        if progress_io && suppress_release_secret_provider_event?(event, progress: progress)
-          return
-        end
-        if progress_io
-          if verbose || debug
-            emit_release_event_progress(member, event)
-          elsif progress.tty?
-            emit_release_event_status(member, event, progress: progress)
-          end
-        end
-      end
-
-      def release_progress_member_for(member_name)
-        @release_progress_members_by_name ||= members.to_h { |member| [member.name, member] }
-        @release_progress_members_by_name.fetch(member_name.to_s) { PreflightProgressMember.new(member_name.to_s) }
-      end
-
       def parallel_release_members?(release_members)
         execute &&
           release_jobs(release_members) > 1 &&
@@ -1927,38 +1896,6 @@ 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
@@ -1990,6 +1927,9 @@ module Kettle
         args << "--skip-bundle-audit" if skip_bundle_audit
         args << "--skip-remotes=#{skip_remotes}" if skip_remotes && !skip_remotes.to_s.empty?
         args << "--required-remotes=#{required_remotes}" if required_remotes && !required_remotes.to_s.empty?
+        if release_command_delegates_secrets_to_kettle_release? && !command_includes_arg?(command, "--secrets-provider")
+          args << "--secrets-provider=1password"
+        end
         args << "--yes" if release_command_uses_kettle_release_yes? && !command_includes_arg?(command, "--yes")
         args << "--events" unless command_includes_arg?(command, "--events")
         return command if args.empty?
@@ -2233,7 +2173,6 @@ module Kettle
       def release_command_delegates_secrets_to_kettle_release?
         kettle_release_supports_direct_secrets? &&
           kettle_release_command?(raw_release_command) &&
-          command_includes_arg?(raw_release_command, "--secrets-provider") &&
           release_secrets_provider_one_password?
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 1.2.45
+  version: 1.2.46
 platform: ruby
 authors:
 - Peter H. Boling
@@ -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.45
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.45/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.2.46
+  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.46/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.45
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.46
   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