kettle-dev 2.3.7 → 2.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e582c50d05608c5e338caeac74f7c339fb2d66010b58c8cce836a78d8e4ded5
-  data.tar.gz: e9ce2e0857dbf506017c8ddab46c5049ffc5003af5778a2e2954dd759cee8183
+  metadata.gz: fb500cfcc82a5cb325eb83ae9a5464e8333cce1c3ec03814b597063d41ec0e8a
+  data.tar.gz: 124a6c4ad4a3dd9172c131d6d5276a685d7e15f2be8f5fc51722c028fc83f136
 SHA512:
-  metadata.gz: cea8e2be14321cc1e70534197cd2b01dea382a62f6de651ebfb35ccf1025acdfb0a11ee74c31e7c5c78dfe216ec51fdbe21a02f4f1358b6e8b526365b9a5f5af
-  data.tar.gz: 47dada022728fd8414d252df3d01ecb992f18ccea69ed20ed8670dbd87ab3cf7f205bb488a48ab95039a4548a0b278c5e8aaf7099b7d94248539db5e7630c26b
+  metadata.gz: 1dd9b51023413bc9301d87dfc989dcec0844190b0cccfa90d8344bcd428403c70837f3972fdedc0cf2b4dee103af88923cc41ec43f80a869098a8a20da8a579d
+  data.tar.gz: 94084430abf75c714d2b5be26a25f1a9c1be691fc9c4f2fa760fc767e7ce1698e01ab71f5b978ec744f9981eeedc7b474a663b51504c6d842c0569ffe7e79cb0

data/CHANGELOG.md

@@ -30,6 +30,38 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [2.3.8] - 2026-07-21
+
+- TAG: [v2.3.8][2.3.8t]
+- COVERAGE: 91.98% -- 4379/4761 lines in 36 files
+- BRANCH COVERAGE: 73.91% -- 1711/2315 branches in 36 files
+- 56.04% documented
+
+### Added
+
+- `kettle-changelog --release-state` now reports an `ahead` value counting
+  commits from the latest release tag to the local default branch when
+  available.
+- `kettle-release` now accepts `--skip-remotes` and
+  `K_RELEASE_SKIP_REMOTES` to exclude temporarily unavailable git remotes from
+  release fetch/push parity checks.
+- `kettle-release` now creates or reuses an open GitHub pull request for
+  non-trunk release branches before waiting for GitHub Actions, so
+  pull-request-only workflows start after release branch pushes.
+
+### Changed
+
+- kettle-jem-template-20260720-001 - Generated READMEs can now render
+  template-managed corporate sponsor logos from project or family config.
+- kettle-jem-template-20260720-002 - Generated development Gemfiles now use the
+  released `tree_sitter_language_pack` gem 1.13.3 or newer by default.
+- kettle-jem-template-20260720-003 - Generated StructuredMerge Git diff driver
+  config now uses the installed `smorg-rb` Ruby driver name.
+- kettle-jem-template-20260720-004 - Generated multi-engine workflow files now
+  omit JRuby and TruffleRuby jobs when project config declares MRI-only engines.
+- kettle-jem-template-20260720-005 - Generated README Support & Community rows
+  now include a RubyForum help badge.
+
 ## [2.3.7] - 2026-07-18
 
 - TAG: [v2.3.7][2.3.7t]
@@ -2536,7 +2568,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/v2.3.7...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-dev/compare/v2.3.8...HEAD
+[2.3.8]: https://github.com/kettle-dev/kettle-dev/compare/v2.3.7...v2.3.8
+[2.3.8t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v2.3.8
 [2.3.7]: https://github.com/kettle-dev/kettle-dev/compare/v2.3.6...v2.3.7
 [2.3.7t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v2.3.7
 [2.3.6]: https://github.com/kettle-dev/kettle-dev/compare/v2.3.5...v2.3.6

data/README.md

@@ -93,7 +93,7 @@ bin/kettle-release
 | Works with MRI Ruby 4 | [![Ruby current Compat][💎ruby-c-i]][🚎11-c-wf] [![Ruby HEAD Compat][💎ruby-headi]][🚎3-hd-wf]|
 | Works with MRI Ruby 3 | [![Ruby 3.0 Compat][💎ruby-3.0i]][🚎ruby-3.0-wf] [![Ruby 3.1 Compat][💎ruby-3.1i]][🚎ruby-3.1-wf] [![Ruby 3.2 Compat][💎ruby-3.2i]][🚎ruby-3.2-wf] [![Ruby 3.3 Compat][💎ruby-3.3i]][🚎ruby-3.3-wf] [![Ruby 3.4 Compat][💎ruby-3.4i]][🚎ruby-3.4-wf]|
 | Works with MRI Ruby 2 | [![Ruby 2.4 Compat][💎ruby-2.4i]][🚎ruby-2.4-wf] [![Ruby 2.5 Compat][💎ruby-2.5i]][🚎ruby-2.5-wf] [![Ruby 2.6 Compat][💎ruby-2.6i]][🚎ruby-2.6-wf] [![Ruby 2.7 Compat][💎ruby-2.7i]][🚎ruby-2.7-wf]|
-| Support & Community | [![Join Me on Daily.dev's RubyFriends][✉️ruby-friends-img]][✉️ruby-friends] [![Live Chat on Discord][✉️discord-invite-img-ftb]][✉️discord-invite] [![Get help from me on Upwork][👨🏼‍🏫expsup-upwork-img]][👨🏼‍🏫expsup-upwork] [![Get help from me on Codementor][👨🏼‍🏫expsup-codementor-img]][👨🏼‍🏫expsup-codementor] |
+| Support & Community | [![Join Me on Daily.dev's RubyFriends][✉️ruby-friends-img]][✉️ruby-friends] [![Get help from RubyForum][✉️ruby-forum-img]][✉️ruby-forum] [![Live Chat on Discord][✉️discord-invite-img-ftb]][✉️discord-invite] [![Get help from me on Upwork][👨🏼‍🏫expsup-upwork-img]][👨🏼‍🏫expsup-upwork] [![Get help from me on Codementor][👨🏼‍🏫expsup-codementor-img]][👨🏼‍🏫expsup-codementor] |
 | Source | [![Source on GitLab.com][📜src-gl-img]][📜src-gl] [![Source on CodeBerg.org][📜src-cb-img]][📜src-cb] [![Source on Github.com][📜src-gh-img]][📜src-gh] [![The best SHA: dQw4w9WgXcQ!][🧮kloc-img]][🧮kloc] |
 | Documentation | [![Current release on RubyDoc.info][📜docs-cr-rd-img]][🚎yard-current] [![YARD on Galtzo.com][📜docs-head-rd-img]][🚎yard-head] [![Maintainer Blog][🚂maint-blog-img]][🚂maint-blog] [![GitLab Wiki][📜gl-wiki-img]][📜gl-wiki] [![GitHub Wiki][📜gh-wiki-img]][📜gh-wiki] |
 | Compliance | [![License: AGPL-3.0-only][📄license-img]][📄license] [![Apache license compatibility: Category X][📄license-compat-img]][📄license-compat] [![📄ilo-declaration-img]][📄ilo-declaration] [![Security Policy][🔐security-img]][🔐security] [![Contributor Covenant 2.1][🪇conduct-img]][🪇conduct] [![SemVer 2.0.0][📌semver-img]][📌semver] |
@@ -734,6 +734,8 @@ Thanks for RTFM. ☺️
 [✉️discord-invite-img-ftb]: https://img.shields.io/discord/1373797679469170758?style=for-the-badge&logo=discord
 [✉️ruby-friends-img]: https://img.shields.io/badge/daily.dev-%F0%9F%92%8E_Ruby_Friends-0A0A0A?style=for-the-badge&logo=dailydotdev&logoColor=white
 [✉️ruby-friends]: https://app.daily.dev/squads/rubyfriends
+[✉️ruby-forum-img]: https://img.shields.io/badge/RubyForum-Help-CC342D?style=for-the-badge&logo=ruby&logoColor=white
+[✉️ruby-forum]: https://www.rubyforum.org/c/help/8
 
 [✇bundle-group-pattern]: https://gist.github.com/pboling/4564780
 [⛳️gem-namespace]: https://github.com/kettle-dev/kettle-dev
@@ -887,7 +889,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-4.694-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-4.761-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

@@ -43,7 +43,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] [--appraisal-update] [--skip-bundle-audit] [--skip-steps STEPS] [--ci-workflows WORKFLOWS] [start_step=<0-19>]
+    Usage: kettle-release [--version VERSION] [--local-ci] [--appraisal-update] [--skip-bundle-audit] [--skip-steps STEPS] [--ci-workflows WORKFLOWS] [--skip-remotes REMOTES] [start_step=<0-19>]
 
     Automates the release flow for a Ruby gem in the host project.
 
@@ -82,6 +82,7 @@ if ARGV.include?("-h") || ARGV.include?("--help")
       --appraisal-update          # Use slower appraisal:update instead of default appraisal:generate
       --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
       --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
 
@@ -91,6 +92,7 @@ if ARGV.include?("-h") || ARGV.include?("--help")
       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_SKIP_REMOTES      # Comma-separated git remote names to exclude from release fetch/push parity
       KETTLE_RELEASE_APPRAISAL_TASK=appraisal:update
                                   # Use slower appraisal:update instead of default appraisal:generate
       KETTLE_DEV_SKIP_BUNDLE_AUDIT=true
@@ -168,6 +170,27 @@ def extract_ci_workflows_arg!(argv)
   workflows
 end
 
+def extract_skip_remotes_arg!(argv)
+  remotes = nil
+  if (idx = argv.index("--skip-remotes"))
+    remotes = argv[idx + 1]
+    if remotes.to_s.empty? || remotes.to_s.start_with?("-")
+      Kettle::Dev::ExitAdapter.abort("--skip-remotes requires a comma-separated remote list")
+    end
+    argv.slice!(idx, 2)
+  end
+  argv.delete_if do |arg|
+    if arg.start_with?("--skip-remotes=", "skip_remotes=")
+      remotes = arg.split("=", 2)[1]
+      Kettle::Dev::ExitAdapter.abort("--skip-remotes requires a comma-separated remote list") if remotes.to_s.empty?
+      true
+    else
+      false
+    end
+  end
+  remotes
+end
+
 local_ci = ARGV.include?("--local-ci")
 appraisal_task = ARGV.delete("--appraisal-update") ? "appraisal:update" : nil
 skip_bundle_audit = !!ARGV.delete("--skip-bundle-audit")
@@ -176,9 +199,10 @@ start_step = start_step_arg ? start_step_arg.split("=", 2)[1].to_i : 0
 version_override = extract_version_arg!(ARGV)
 skip_steps = extract_skip_steps_arg!(ARGV)
 ci_workflows = extract_ci_workflows_arg!(ARGV)
+skip_remotes = extract_skip_remotes_arg!(ARGV)
 
 begin
-  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).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_bundle_audit: skip_bundle_audit, ci_workflows: ci_workflows, skip_remotes: skip_remotes).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/changelog_cli.rb

@@ -150,6 +150,7 @@ module Kettle
         unless changelog_present
           latest_overall, latest_for_series, latest_for_major = latest_released_versions(gem_name, version)
           latest_target = latest_release_target(version, latest_overall, latest_for_series, latest_for_major)
+          ahead = commits_ahead_of_release(latest_target || latest_overall)
           return {
             root: @root,
             gem_name: gem_name,
@@ -164,7 +165,8 @@ module Kettle
             latest_released_overall: latest_overall,
             latest_released_for_current_major: latest_for_major,
             latest_released_for_current_series: latest_for_series,
-            latest_release_target: latest_target
+            latest_release_target: latest_target,
+            ahead: ahead
           }
         end
 
@@ -176,6 +178,7 @@ module Kettle
         latest_overall, latest_for_series, latest_for_major = latest_released_versions(gem_name, release_lookup_version)
         latest_target = latest_release_target(release_lookup_version, latest_overall, latest_for_series, latest_for_major)
         prepared_release_pending = !!latest_changelog_version && latest_target != latest_changelog_version
+        ahead = commits_ahead_of_release(latest_target || latest_overall)
 
         {
           root: @root,
@@ -191,18 +194,20 @@ module Kettle
           latest_released_overall: latest_overall,
           latest_released_for_current_major: latest_for_major,
           latest_released_for_current_series: latest_for_series,
-          latest_release_target: latest_target
+          latest_release_target: latest_target,
+          ahead: ahead
         }
       end
 
       def release_state_table(state = release_state)
         rows = [
-          ["gem", "version.rb", "latest released", "latest changelog", "unreleased", "prepared", "pending"],
+          ["gem", "version.rb", "latest released", "latest changelog", "ahead", "unreleased", "prepared", "pending"],
           [
             state.fetch(:gem_name),
             state.fetch(:version),
             state.fetch(:latest_released) || "unknown",
             state.fetch(:latest_changelog_version) || "none",
+            state.fetch(:ahead, nil).nil? ? "unknown" : state.fetch(:ahead).to_s,
             yes_no(state.fetch(:unreleased_entries)),
             yes_no(state.fetch(:prepared_release_pending)),
             yes_no(state.fetch(:pending_release))
@@ -239,6 +244,33 @@ module Kettle
         value ? "yes" : "no"
       end
 
+      def commits_ahead_of_release(version)
+        tag = release_tag_for_version(version)
+        branch = default_branch_ref
+        return nil unless tag && branch
+
+        stdout, _stderr, status = Open3.capture3("git", "rev-list", "--count", "#{tag}..#{branch}", chdir: @root)
+        status.success? ? stdout.to_i : nil
+      end
+
+      def release_tag_for_version(version)
+        return nil if version.to_s.empty?
+
+        ["v#{version}", version.to_s].find { |tag| git_ref_exists?("refs/tags/#{tag}^{commit}") }
+      end
+
+      def default_branch_ref
+        stdout, _stderr, status = Open3.capture3("git", "symbolic-ref", "--quiet", "--short", "refs/remotes/origin/HEAD", chdir: @root)
+        return stdout.strip if status.success? && !stdout.strip.empty?
+
+        %w[main master HEAD].find { |ref| git_ref_exists?(ref) }
+      end
+
+      def git_ref_exists?(ref)
+        _stdout, _stderr, status = Open3.capture3("git", "rev-parse", "--verify", "--quiet", ref, chdir: @root)
+        status.success?
+      end
+
       def detect_plan(changelog, version)
         latest_overall = nil
         latest_for_series = nil

data/lib/kettle/dev/rakelib/appraisal.rake

@@ -9,7 +9,7 @@ begin
     "KETTLE_JEM_QUIET" => "true",
     "KETTLE_JEM_DEBUG" => "false",
     "KETTLE_DEV_DEBUG" => "false",
-    "SMORG_RB_DEBUG" => "false",
+    "STRUCTUREDMERGE_DEBUG" => "false",
     "DEBUG" => nil,
     "BUNDLE_QUIET" => "true",
     "BUNDLE_DEBUG" => "false",

data/lib/kettle/dev/release_cli.rb

@@ -22,7 +22,7 @@ module Kettle
         "KETTLE_JEM_QUIET" => "true",
         "KETTLE_JEM_DEBUG" => "false",
         "KETTLE_DEV_DEBUG" => "false",
-        "SMORG_RB_DEBUG" => "false",
+        "STRUCTUREDMERGE_DEBUG" => "false",
         "DEBUG" => nil,
         "BUNDLE_QUIET" => "true",
         "BUNDLE_DEBUG" => "false",
@@ -108,13 +108,14 @@ 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, **options)
+      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, **options)
         @root = Kettle::Dev::CIHelpers.project_root
         @git = Kettle::Dev::GitAdapter.new
         @start_step = (start_step || 0).to_i
         @start_step = 0 if @start_step < 0
         @skip_steps = normalize_skip_steps(skip_steps)
         @ci_workflows = normalize_ci_workflows(ci_workflows || ENV["K_RELEASE_CI_WORKFLOWS"])
+        @skip_remotes = normalize_skip_remotes(skip_remotes || ENV["K_RELEASE_SKIP_REMOTES"])
         @local_ci = !!local_ci
         @skip_bundle_audit = truthy_value?(skip_bundle_audit) || truthy_value?(ENV["KETTLE_DEV_SKIP_BUNDLE_AUDIT"])
         @version_override = Kettle::Dev::Versioning.normalize_explicit_version(version)
@@ -411,6 +412,14 @@ module Kettle
         workflows.map { |workflow| workflow.match?(/\.ya?ml\z/) ? workflow : "#{workflow}.yml" }.uniq
       end
 
+      def normalize_skip_remotes(value)
+        remotes = Array(value).flat_map { |part| part.to_s.split(",") }.map(&:strip).reject(&:empty?)
+        invalid = remotes.find { |remote| !remote.match?(/\A[A-Za-z0-9_.-]+\z/) }
+        abort("Invalid skip remotes value #{invalid.inspect}; use comma-separated git remote names.") if invalid
+
+        remotes.uniq
+      end
+
       private
 
       def local_ci?
@@ -719,10 +728,85 @@ module Kettle
       end
 
       def monitor_workflows_after_push!
+        ensure_github_pull_request_for_ci!
         # Use abort-on-failure CI monitor to match historical behavior and specs
         Kettle::Dev::CIMonitor.monitor_all!(restart_hint: "bundle exec kettle-release start_step=10", workflows: @ci_workflows)
       end
 
+      def ensure_github_pull_request_for_ci!
+        branch = current_branch
+        return if branch.to_s.empty?
+
+        trunk = detect_trunk_branch
+        return if branch == trunk
+
+        gh_remote = preferred_github_remote
+        return unless gh_remote
+
+        owner, repo = parse_github_owner_repo(remote_url(gh_remote))
+        return unless owner && repo
+
+        pull_request = github_pull_request_for_branch(owner: owner, repo: repo, branch: branch, base: trunk)
+        if pull_request
+          puts "GitHub pull request ##{pull_request.fetch("number")} already open for #{branch} -> #{trunk}: #{pull_request.fetch("url")}"
+          return
+        end
+
+        create_github_pull_request!(owner: owner, repo: repo, branch: branch, base: trunk)
+      end
+
+      def github_pull_request_for_branch(owner:, repo:, branch:, base:)
+        output = gh_output!(
+          "pr",
+          "list",
+          "--repo",
+          "#{owner}/#{repo}",
+          "--head",
+          branch,
+          "--base",
+          base,
+          "--state",
+          "open",
+          "--json",
+          "number,url",
+          "--limit",
+          "1"
+        )
+        Array(JSON.parse(output)).first
+      rescue JSON::ParserError => e
+        Kettle::Dev.debug_error(e, __method__)
+        abort("Could not parse GitHub pull request list from gh CLI.")
+      end
+
+      def create_github_pull_request!(owner:, repo:, branch:, base:)
+        output = gh_output!(
+          "pr",
+          "create",
+          "--repo",
+          "#{owner}/#{repo}",
+          "--head",
+          branch,
+          "--base",
+          base,
+          "--title",
+          "Release #{branch}",
+          "--body",
+          "Automated release validation PR for `#{branch}`.\n\nThis PR lets GitHub Actions run before kettle-release merges the branch into `#{base}`."
+        )
+        puts "Created GitHub pull request for #{branch} -> #{base}: #{output.strip}"
+      end
+
+      def gh_output!(*args)
+        stdout_str, stderr_str, status = Open3.capture3(self.class.send(:command_env), "gh", *args)
+        return stdout_str if status.success?
+
+        exit_code = status.respond_to?(:exitstatus) ? status.exitstatus : 1
+        diag = stderr_str.to_s.empty? ? "" : "\n--- STDERR ---\n#{stderr_str}".rstrip
+        abort("GitHub pull request setup failed: gh #{args.join(" ")} (exit #{exit_code})#{diag}")
+      rescue Errno::ENOENT
+        abort("GitHub pull request setup failed: gh CLI is required to create or find the release PR.")
+      end
+
       def run_cmd!(cmd)
         cmd = bundle_audit_skip_command(cmd)
         with_bundle_audit_skip_env do
@@ -925,7 +1009,7 @@ module Kettle
         branch = current_branch
         abort("Could not determine current branch to push.") unless branch
 
-        if has_remote?("all")
+        if use_all_remote?
           puts "$ git push all #{branch}"
           success = @git.push("all", branch)
           unless success
@@ -936,7 +1020,7 @@ module Kettle
         end
 
         remotes = []
-        remotes << "origin" if has_remote?("origin")
+        remotes << "origin" if has_remote?("origin") && !skipped_remote?("origin")
         remotes |= github_remote_candidates
         remotes |= gitlab_remote_candidates
         remotes |= codeberg_remote_candidates
@@ -967,13 +1051,13 @@ module Kettle
         # 1) If a remote named "all" exists, push tags only to it.
         # 2) Otherwise, if other remotes exist, push tags to each of them.
         # 3) If no remotes are configured, push tags using default remote.
-        if has_remote?("all")
+        if use_all_remote?
           ok = @git.push_tags("all")
           warn("Push tags to 'all' reported failure.") unless ok
           return
         end
 
-        remotes = list_remotes
+        remotes = active_remotes
         remotes -= ["all"] if remotes
         if remotes.nil? || remotes.empty?
           ok = @git.push_tags(nil)
@@ -1021,15 +1105,15 @@ module Kettle
       end
 
       def github_remote_candidates
-        remotes_with_urls.select { |n, u| u.include?("github.com") }.keys
+        active_remote_candidates(remotes_with_urls.select { |n, u| u.include?("github.com") }.keys)
       end
 
       def gitlab_remote_candidates
-        remotes_with_urls.select { |n, u| u.include?("gitlab.com") }.keys
+        active_remote_candidates(remotes_with_urls.select { |n, u| u.include?("gitlab.com") }.keys)
       end
 
       def codeberg_remote_candidates
-        remotes_with_urls.select { |n, u| u.include?("codeberg.org") }.keys
+        active_remote_candidates(remotes_with_urls.select { |n, u| u.include?("codeberg.org") }.keys)
       end
 
       def preferred_github_remote
@@ -1052,6 +1136,22 @@ module Kettle
         list_remotes.include?(name)
       end
 
+      def skipped_remote?(name)
+        @skip_remotes.include?(name)
+      end
+
+      def active_remotes
+        list_remotes.reject { |remote| skipped_remote?(remote) }
+      end
+
+      def active_remote_candidates(candidates)
+        candidates.reject { |remote| skipped_remote?(remote) }
+      end
+
+      def use_all_remote?
+        has_remote?("all") && @skip_remotes.empty?
+      end
+
       def remote_branch_exists?(remote, branch)
         _out, ok = git_output(["show-ref", "--verify", "--quiet", "refs/remotes/#{remote}/#{branch}"])
         ok
@@ -1076,9 +1176,15 @@ module Kettle
 
       def ensure_trunk_synced_before_push!(trunk, feature)
         if has_remote?("all")
-          puts "Remote 'all' detected. Fetching from all remotes and enforcing strict trunk parity..."
-          run_cmd!("git fetch --all")
-          remotes = list_remotes
+          remotes = active_remotes
+          skipped = list_remotes.select { |remote| skipped_remote?(remote) }
+          puts "Remote 'all' detected. Fetching from active remotes and enforcing strict trunk parity..."
+          puts "Skipping configured remotes: #{skipped.join(", ")}" unless skipped.empty?
+          remotes.each do |remote|
+            next if remote == "all"
+
+            run_cmd!("git fetch #{Shellwords.escape(remote)}")
+          end
           missing_from = []
           remotes.each do |r|
             next if r == "all"

data/lib/kettle/dev/version.rb

@@ -3,7 +3,7 @@
 module Kettle
   module Dev
     module Version
-      VERSION = "2.3.7"
+      VERSION = "2.3.8"
     end
     VERSION = Version::VERSION # Traditional Constant Location
   end

data/sig/kettle/dev.rbs

@@ -21,7 +21,6 @@ module Kettle
     def self.defaults: () -> Array[String]
     def self.register_default: (String | Symbol task_name) -> Array[String]
     VERSION: String
-    # AST-driven merger for Appraisals files using Prism
     module AppraisalsAstMerger
       TRACKED_METHODS: Array[Symbol]
 
@@ -382,7 +381,7 @@ module Kettle
     end
 
     class ReleaseCLI
-      def initialize: (?start_step: Integer, ?local_ci: bool, ?version: String?, ?appraisal_task: String?, ?skip_steps: untyped, ?skip_bundle_audit: bool?, ?ci_workflows: untyped, **untyped) -> void
+      def initialize: (?start_step: Integer, ?local_ci: bool, ?version: String?, ?appraisal_task: String?, ?skip_steps: untyped, ?skip_bundle_audit: bool?, ?ci_workflows: untyped, ?skip_remotes: untyped, **untyped) -> void
       def run: () -> void
 
       private
@@ -469,9 +468,6 @@ module Kettle
     end
 
     module Tasks
-      # Namespace module for task-related classes and Rake task loaders.
-      # Namespace module for task-related classes and Rake task loaders.
-      # Namespace module for task-related classes and Rake task loaders.
       # Namespace module for task-related classes and Rake task loaders.
       module CITask
         def self.act: (?String opt) -> void

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-dev
 version: !ruby/object:Gem::Version
-  version: 2.3.7
+  version: 2.3.8
 platform: ruby
 authors:
 - Peter H. Boling
@@ -159,40 +159,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: turbo_tests2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.14
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.14
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: stone_checksums
   requirement: !ruby/object:Gem::Requirement
@@ -313,10 +313,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/v2.3.7
-  changelog_uri: https://github.com/kettle-dev/kettle-dev/blob/v2.3.7/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-dev/tree/v2.3.8
+  changelog_uri: https://github.com/kettle-dev/kettle-dev/blob/v2.3.8/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-dev/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/2.3.7
+  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/2.3.8
   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