kettle-dev 3.1.5 → 3.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e99b028eb7b7f955a4d4c6bc4d62b812d9e8a6a6399d0aadf448e525d9680a4
-  data.tar.gz: f5432081e590c22460c4876eb1e2e35406bcb1617881eb9814eccd3449e4fb45
+  metadata.gz: a3eedbe026cd767bf8c441626bcb96dea0701b1c03665ae754a1c1a9d8a5145c
+  data.tar.gz: 90750eaeb7d50a06b475fc893a5184e28a9526d7a439ecd74b4804fd152c43cc
 SHA512:
-  metadata.gz: bffb2a5e07b7cb6ea1c225808e4a011c670a6768905052447112e4de5a9e15122fb9f0d3a1f65ed1a3cc80d290271e1844133cd4b64cb2c050b01d7d2f200552
-  data.tar.gz: 666f1974ea5d780e5b845039dc7923c769869faa50075074986cf165d9773e72848cfd2c200ced47a376ce08f15c01e317294e31a0811895880a25567d033059
+  metadata.gz: 46e1634ec393b5e6f4dace446165c407002d81f94841066b2da98a183f0c5251886cac9c93daf6ebbd75bd8333be6fb278aec44c137dad2c7d34a2b1de82334e
+  data.tar.gz: 1e7b236a4e37268062b4c3ac7620ddc179c35aa615f53529c5490b681335aec8d2c710a740eb34b825c9248509664c8b808e85e2932375728a24a859f9d21778

checksums.yaml.gz.sig

@@ -1,3 +1 @@
-zi� �s�I?G3�i�J��u���T����>�r�¥4
-�/h�JU(�Fk��Zڧ9��h]�q
-;�7q<��؄��9����i�(��w�})�`t�h/O���ao�|;J��[��=#�T|]�("_#�:���(pj���g#��3S��M��Wpr�-�|�d����ED��cW�	C��b8{}���J��ZBc7t��.a(�j��2�嬱�l䶼����������Y�K/�V½��yx����f)���������ͮ4�
���z�3l��9�$k7�f�;}�W6|p�k?�r�W��^�z�U�
+a��%$a)��=QD���X��^½��G���ya��@hj��=�&9�ﲚG�MY(a����:lW�p⭴��r���L�'CY��u'�n�#J����?�O���1|�������!*{�~t�dv�tj���ep��9x;�g�A�O�4G^�~ph�
���l�����0���`~y��h`bZ�P��>~k����H�i�;:9ⲅ��!�����Yȭj@�3�
H7�m�j��Ӫ(l�N{)�2�)6%puW?��7ٿ/rħ��s9"ؼ>�.̻{��*��Jo}�F�H���cr����k�쬔V&�Ow�W�)��3�Y

data/CHANGELOG.md

@@ -30,6 +30,21 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [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 +3953,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.1.5...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-dev/compare/v3.1.6...HEAD
+[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.775-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/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)

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.6"
     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.6
 platform: ruby
 authors:
 - Peter H. Boling
@@ -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.6
+  changelog_uri: https://github.com/kettle-dev/kettle-dev/blob/v3.1.6/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.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