kettle-dev 3.1.5 → 3.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e99b028eb7b7f955a4d4c6bc4d62b812d9e8a6a6399d0aadf448e525d9680a4
-  data.tar.gz: f5432081e590c22460c4876eb1e2e35406bcb1617881eb9814eccd3449e4fb45
+  metadata.gz: 2de1266e7cdbbfd6174c040d8602cf8c3349a423bc301f071ba45da206cba969
+  data.tar.gz: f93264ee009dbede2c2ff3273a396916a31d51a70b1ac1cab817532e11f396f5
 SHA512:
-  metadata.gz: bffb2a5e07b7cb6ea1c225808e4a011c670a6768905052447112e4de5a9e15122fb9f0d3a1f65ed1a3cc80d290271e1844133cd4b64cb2c050b01d7d2f200552
-  data.tar.gz: 666f1974ea5d780e5b845039dc7923c769869faa50075074986cf165d9773e72848cfd2c200ced47a376ce08f15c01e317294e31a0811895880a25567d033059
+  metadata.gz: 6a10b65136115e119f2b24eea184c114ea09ae969bed38f71005f39f0fe2f1f0ef1a9869449cf70cf895f075c0c01387918b02bafb914237ca3136d2f4ef868f
+  data.tar.gz: 9e14f9945043f4f104c65e34dae30e11301e84caa63f474555d0befe80a35508d604b331da62306808a927eb881e2a41a66562582896b4145cf22e9051db8c65

data/CHANGELOG.md

@@ -30,6 +30,52 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [3.1.7] - 2026-10-04
+
+- TAG: [v3.1.7][3.1.7t]
+- COVERAGE: 91.75% -- 6261/6824 lines in 49 files
+- BRANCH COVERAGE: 76.08% -- 2388/3139 branches in 49 files
+- 51.34% documented
+
+### Added
+
+- kettle-release warns when the current branch is not among the release branches its family declares, naming the declaring config and the declared branches, instead of silently treating it as a feature branch destined for trunk.
+
+### Fixed
+
+- Branch-stack release detection now also reads `release.member_target_branches.<gem>` from the family root config, so a member whose templated local `.kettle-family.yml` is absent (a fresh branch, or a linked worktree) no longer degrades silently into a trunk pull request and a merge into trunk.
+
+- Branch-stack release detection no longer uses block-level `rescue` or `Array#filter_map`, which are Ruby 2.6+ and 2.7+ constructs; the gem supports Ruby 2.4. YAML loading is isolated in `safe_load_kettle_family_config` with a method-level rescue, restoring the explicit `begin`/`end` contract the surrounding code relies on.
+
+- Preserve the selected Gemfile and lockfile when Bundler restarts during release lockfile reset.
+
+### Changed
+
+- [kc] kettle-jem/prepare: updated 13 project files:
+  - dependencies (13)
+
+- [kc] kettle-jem/template: updated 7 project files:
+  - code and tests (2)
+  - dependencies (1)
+  - documentation (1)
+  - other (2)
+  - workflows (1)
+
+## [3.1.6] - 2026-10-02
+
+- TAG: [v3.1.6][3.1.6t]
+- COVERAGE: 91.66% -- 6210/6775 lines in 49 files
+- BRANCH COVERAGE: 76.13% -- 2370/3113 branches in 49 files
+- 51.34% documented
+
+### Fixed
+
+- Branch-stack releases now dispatch selected GitHub Actions workflows directly on the release branch instead of relying on a possibly conflicted validation PR.
+
+- Branch-stack release workflow validation now supports the older Psych API bundled with Ruby 2.4.
+
+- YAML loading now selects the supported Psych API by version, including Ruby 2.5 environments that report misleading keyword parameters.
+
 ## [3.1.5] - 2026-09-28
 
 - TAG: [v3.1.5][3.1.5t]
@@ -3938,7 +3984,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.1.5...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-dev/compare/v3.1.7...HEAD
+[3.1.7]: https://github.com/kettle-dev/kettle-dev/compare/v3.1.6...v3.1.7
+[3.1.7t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v3.1.7
+[3.1.6]: https://github.com/kettle-dev/kettle-dev/compare/v3.1.5...v3.1.6
+[3.1.6t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v3.1.6
 [3.1.5]: https://github.com/kettle-dev/kettle-dev/compare/v3.1.4...v3.1.5
 [3.1.5t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v3.1.5
 [3.1.4]: https://github.com/kettle-dev/kettle-dev/compare/v3.1.3...v3.1.4

data/README.md

@@ -420,7 +420,8 @@ What it does:
         - Enable with env: `K_RELEASE_LOCAL_CI="true"` (run automatically) or `K_RELEASE_LOCAL_CI="ask"` (prompt \[Y/n\]).
         - Select workflow with `K_RELEASE_LOCAL_CI_WORKFLOW` (with or without .yml/.yaml). Defaults to `locked_deps.yml` if present; otherwise the first workflow discovered.
         - On failure, the release prep commit is soft-rolled-back (`git reset --soft HEAD^`) and the process aborts.
-    - Ensures trunk sync and rebases feature as needed, pushes, monitors GitHub Actions with a progress bar, and merges feature to trunk on success.
+    - Ensures trunk sync and rebases feature branches as needed, pushes, monitors GitHub Actions with a progress bar, and merges feature to trunk on success.
+    - For release branches listed in `.kettle-family.yml` branch-stack targets, it intentionally does not pull/rebase from trunk or merge the leaf branch into trunk. Instead, it starts the selected GitHub Actions workflows directly on the pushed release branch; each selected workflow must declare `workflow_dispatch`. This validates the exact branch-stack commit without requiring an often-conflicting PR to trunk.
     - Exports `SOURCE_DATE_EPOCH`, builds (optionally signed), creates gem checksums, and runs `bundle exec rake release` (prompts for signing key + RubyGems MFA OTP as needed).
 - Options:
     - `start_step` map (skip directly to a phase):
@@ -433,11 +434,11 @@ What it does:
             (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
+        8.  Ensure trunk in sync across remotes; rebase feature as needed (skipped for configured branch-stack release targets)
         9.  Push current branch to remotes (or 'all' remote)
-        10. Monitor CI after push; abort on failures
-        11. Merge feature into trunk and push
-        12. Checkout trunk and pull latest
+        10. Monitor CI after push; configured branch-stack releases dispatch each selected workflow directly on the release branch
+        11. Merge feature into trunk and push (skipped for branch-stack release targets)
+        12. Checkout trunk and pull latest (skipped for branch-stack release targets)
         13. Gem signing checks/guidance (skip with `SKIP_GEM_SIGNING=true`)
         14. Build gem (bundle exec rake build)
         15. Release gem (bundle exec rake release)
@@ -1066,7 +1067,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.748-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-6.824-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/lib/kettle/dev/lockfile_reset.rb

@@ -201,6 +201,13 @@ module Kettle
           "BUNDLE_GEMFILE" => gemfile,
           "BUNDLE_LOCKFILE" => path
         )
+        if update_bundler
+          # Bundler's `update --bundler` restarts itself using its original
+          # environment. Preserve this reset's selected bundle across that
+          # restart instead of falling back to the member's default Gemfile.
+          env["BUNDLER_ORIG_BUNDLE_GEMFILE"] = gemfile
+          env["BUNDLER_ORIG_BUNDLE_LOCKFILE"] = path
+        end
         env["KETTLE_DEV_SKIP_CHANGELOG_DEPENDENCY"] = "true" if skip_changelog_dependency
         if isolated_gem_home
           env["GEM_HOME"] = isolated_gem_home

data/lib/kettle/dev/release_cli.rb

@@ -1419,7 +1419,7 @@ module Kettle
       end
 
       def monitor_workflows_after_push!
-        ensure_github_pull_request_for_ci!
+        ensure_ci_trigger_for_release_branch!
         keep_release_secrets_alive!("CI monitoring")
         restart_hint = "bundle exec kettle-release --start-step 10"
         emit_ci_monitor_event(action: "start", status: "started", workflows: @ci_workflows, restart_hint: restart_hint)
@@ -1452,13 +1452,18 @@ module Kettle
         end
       end
 
-      def ensure_github_pull_request_for_ci!
+      def ensure_ci_trigger_for_release_branch!
         branch = current_branch
         return if branch.to_s.empty?
 
         trunk = detect_trunk_branch
         return if branch == trunk
 
+        if branch_stack_release_branch?(branch, trunk)
+          dispatch_github_workflows!(branch: branch)
+          return
+        end
+
         gh_remote = preferred_github_remote
         return unless gh_remote
 
@@ -1487,6 +1492,44 @@ module Kettle
         }
       end
 
+      def dispatch_github_workflows!(branch:)
+        gh_remote = preferred_github_remote
+        return unless gh_remote
+
+        owner, repo = parse_github_owner_repo(remote_url(gh_remote))
+        return unless owner && repo
+
+        root = Kettle::Dev::CIHelpers.ci_project_root
+        workflows = @ci_workflows.empty? ? Kettle::Dev::CIHelpers.workflows_list(root) : @ci_workflows
+        unsupported = workflows.reject { |workflow| workflow_dispatch_configured?(root, workflow) }
+        unless unsupported.empty?
+          abort("Branch-stack release CI requires workflow_dispatch in every selected workflow; unsupported: #{unsupported.join(", ")}")
+        end
+
+        workflows.each do |workflow|
+          gh_output!("workflow", "run", workflow, "--repo", "#{owner}/#{repo}", "--ref", branch)
+          puts "Dispatched GitHub Actions workflow #{workflow} on branch #{branch}."
+        end
+      end
+
+      def workflow_dispatch_configured?(root, workflow)
+        path = File.join(root, ".github", "workflows", workflow)
+        return false unless File.file?(path)
+
+        document = Kettle::Dev.safe_load_yaml(File.read(path), aliases: true)
+        triggers = document.is_a?(Hash) ? (document["on"] || document[true]) : nil
+        case triggers
+        when Hash
+          triggers.key?("workflow_dispatch") || triggers.key?(:workflow_dispatch)
+        when Array
+          triggers.any? { |trigger| trigger.to_s == "workflow_dispatch" }
+        else
+          false
+        end
+      rescue Psych::Exception
+        false
+      end
+
       def github_pull_request_for_branch(owner:, repo:, branch:, base:)
         output = gh_output!(
           "pr",
@@ -1561,9 +1604,9 @@ module Kettle
 
         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}")
+        abort("GitHub CLI command 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.")
+        abort("GitHub CLI command failed: gh CLI is required for release CI setup.")
       end
 
       def run_cmd!(cmd, resume_step: @release_resume_step)
@@ -2885,23 +2928,117 @@ module Kettle
         return false if branch.to_s.empty?
         return false if trunk && branch == trunk
 
-        local_kettle_family_release_target_branches.include?(branch)
+        targets = local_kettle_family_release_target_branches
+        return true if targets.include?(branch)
+
+        warn_undeclared_branch_stack_release(branch, targets)
+        false
       end
 
+      # A member whose family declares a branch stack, releasing a branch that
+      # is not in that list, gets merged into trunk and validated by a trunk
+      # PR. That is almost always a wrong-branch release, not a feature
+      # branch, so say so loudly instead of silently degrading.
+      def warn_undeclared_branch_stack_release(branch, targets)
+        declaring_root = family_declared_branch_stack_roots.first
+        return unless declaring_root
+        return if Array(@warned_undeclared_stack_branches).include?(branch)
+
+        @warned_undeclared_stack_branches = Array(@warned_undeclared_stack_branches) + [branch]
+        warn(
+          "[kettle-release] #{branch} is not a declared release branch for #{family_stack_gem_name.inspect} " \
+          "in #{Kettle::Dev.display_path(declaring_root)}; it will be treated as a feature branch and merged into trunk. " \
+          "Declared release branches: #{targets.join(", ")}"
+        )
+      end
+
+      # The member-local `.kettle-family.yml` is a templated copy that can be
+      # absent on a fresh branch or in a worktree. The family root is the
+      # authoritative declaration (`release.member_target_branches.<gem>`), so
+      # consult it too and union the two. Silently returning [] when a family
+      # config *does* declare a stack for this gem is what produced
+      # PR-against-trunk releases and trunk merges for branch-stack members.
       def local_kettle_family_release_target_branches
+        branches = []
         local_kettle_family_config_paths.each do |path|
           next unless File.file?(path)
 
-          begin
-            data = Kettle::Dev.safe_load_yaml_file(path) || {}
-            branches = Array(dig_string_keys(data, "release", "target_branches")) +
-              Array(dig_string_keys(data, "branches", "release_targets"))
-            return branches.map(&:to_s).reject(&:empty?) unless branches.empty?
-          rescue Psych::Exception => e
-            warn("Ignoring invalid kettle-family config #{Kettle::Dev.display_path(path)}: #{e.message}")
-          end
+          data = safe_load_kettle_family_config(path)
+          next unless data
+
+          branches.concat(
+            Array(dig_string_keys(data, "release", "target_branches")),
+            Array(dig_string_keys(data, "branches", "release_targets"))
+          )
+        end
+        branches.concat(family_root_release_target_branches)
+        branches.map(&:to_s).reject(&:empty?).uniq
+      end
+
+      def family_root_release_target_branches
+        family_declared_branch_stack_roots.flat_map do |path|
+          data = safe_load_kettle_family_config(path) || {}
+          Array(dig_string_keys(data, "release", "member_target_branches", family_stack_gem_name))
+        end
+      end
+
+      # Family-root configs that declare a non-empty branch stack for this gem.
+      def family_declared_branch_stack_roots
+        gem_name = family_stack_gem_name
+        return [] unless gem_name
+
+        family_root_config_paths.select do |path|
+          data = safe_load_kettle_family_config(path)
+          next false unless data
+
+          declared_stack_branches(data, gem_name).any?
+        end
+      end
+
+      # Only treat a parent directory as the family root when its config
+      # actually lists this checkout as a member root.
+      def family_root_config_paths
+        [File.expand_path("..", @root)].map do |candidate|
+          path = File.join(candidate, ".kettle-family.yml")
+          next nil unless File.file?(path)
+
+          data = safe_load_kettle_family_config(path)
+          next nil unless data
+
+          roots = Array(dig_string_keys(data, "members", "roots")).map(&:to_s)
+          path if roots.include?(File.basename(@root))
+        end.compact
+      end
+
+      def declared_stack_branches(data, gem_name)
+        Array(dig_string_keys(data, "release", "member_target_branches", gem_name)).map(&:to_s).reject(&:empty?)
+      end
+
+      # YAML loading is isolated in a method body so a malformed config is
+      # reported once instead of raising inside a block. Block-level `rescue`
+      # is a Ruby 2.6+ construct and this gem supports Ruby 2.4.
+      def safe_load_kettle_family_config(path)
+        Kettle::Dev.safe_load_yaml_file(path) || {}
+      rescue Psych::Exception => e
+        warn("Ignoring invalid kettle-family config #{Kettle::Dev.display_path(path)}: #{e.message}")
+        nil
+      end
+
+      def family_stack_gem_name
+        @family_stack_gem_name ||= begin
+          name = ENV.fetch("K_CHANGELOG_GEM_NAME", "").to_s.strip
+          name = detect_family_stack_gem_name_from_gemspec if name.empty?
+          name.empty? ? nil : name
         end
-        []
+      end
+
+      def detect_family_stack_gem_name_from_gemspec
+        gemspecs = Dir[File.join(@root, "*.gemspec")]
+        path = gemspecs.min
+        return "" unless path
+
+        match = File.read(path).match(/spec\.name\s*=\s*(["'])([^"']+)\1/)
+        match ? match[2].to_s : ""
       end
 
       def local_kettle_family_config_paths

data/lib/kettle/dev/version.rb

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

data/lib/kettle/dev.rb

@@ -115,10 +115,11 @@ module Kettle
         text.to_s.gsub(VAR_HOME_TEXT, "/home")
       end
 
-      def safe_load_yaml(content)
-        YAML.safe_load(content, permitted_classes: [], aliases: false)
-      rescue ArgumentError
-        YAML.safe_load(content, [], [], false)
+      def safe_load_yaml(content, aliases: false)
+        supports_keyword_options = Gem::Version.new(Psych::VERSION) >= Gem::Version.new("4.0")
+        return YAML.safe_load(content, permitted_classes: [], aliases: aliases) if supports_keyword_options
+
+        YAML.safe_load(content, [], [], aliases)
       end
 
       def safe_load_yaml_file(path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-dev
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.1.7
 platform: ruby
 authors:
 - Peter H. Boling
@@ -256,7 +256,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.4
+        version: 3.2.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -266,7 +266,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.4
+        version: 3.2.5
 - !ruby/object:Gem::Dependency
   name: turbo_tests2
   requirement: !ruby/object:Gem::Requirement
@@ -276,7 +276,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.11
+        version: 3.2.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -286,7 +286,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.11
+        version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: stone_checksums
   requirement: !ruby/object:Gem::Requirement
@@ -316,7 +316,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.13
+        version: 2.0.15
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -326,7 +326,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.13
+        version: 2.0.15
 description: "\U0001F372 Kettle::Dev is a meta tool from kettle-dev to streamline
   development and testing. Acts as a shim dependency, pulling in many other dependencies,
   to give you OOTB productivity with a RubyGem, or Ruby app project. Configures a
@@ -422,10 +422,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.1.5
-  changelog_uri: https://github.com/kettle-dev/kettle-dev/blob/v3.1.5/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-dev/tree/v3.1.7
+  changelog_uri: https://github.com/kettle-dev/kettle-dev/blob/v3.1.7/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-dev/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/3.1.5
+  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/3.1.7
   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