kettle-dev 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7fdd37cea8287569cfe883f3b0830022afe7e90be2582adf2046cadcdd687c7
-  data.tar.gz: 327f6277c15a6e780001e321192b72e5a10afc56718171e3324e24445c0466b5
+  metadata.gz: eaf2fc5f85eac56d87d38a8029c740631c50410cfb76c35d5e488df48374f170
+  data.tar.gz: d229bb60bdd25990a7e9666dcd7f54f61c42b58ecb695c63f70db3e1a17f2802
 SHA512:
-  metadata.gz: f7cb591d2c7e73f063f11362091eb7efc51ff3d9b6a5cd4242260e3dd45fe1ffce867a77e218f606880f7cfd7bf5fd1f071391714b8164721c89860d4b63c737
-  data.tar.gz: 99531967a52f754cbda4a1d868e216de15d1dac6e6d27d1b4028dad9dae87681b1a88761f91d0931425d050f9ae0a6a18344c19f48621dfccac346f9a539c9ec
+  metadata.gz: c439b9406442d64e949a50fc2669eb1eb4a94a43e36cde5c71797e86d16e4278cff16bf582e212b54b1cf50ffbdaa982a334ffd25f4f8c12b6d887b6c8565aad
+  data.tar.gz: '0920ce88eb1b862b8071d1958ef9c638dc55166b68c6abab21b6b93d96fea1e8656187e00086c5a43ee2fb2dd408bb8c737cf5a524a86cab1fbd19e09d6fc90b'

checksums.yaml.gz.sig

@@ -1,2 +1,3 @@
-ZN�ȕ!s��UHm*6��u�5���o}�:ɓD�t�J�pn��[`�|=o��W�Q��4�x����t�� �|�<�z�VBb���aw�vX;�%�W!�*󴐍!�;m���I�����,���r�"x~���研����-ni������i��cZ����ykESy^k
-�a�9^�� B���
�]���*��X����8�� �]��-���sT��� s�k�q
+/Xl�j�ꪝ��kc$��b��)���.�Z�����2B��>{(�
+�}>��ŠU�����g��D?�Y�
+�r�!RX��̩J���c�v�!�k�o�L�H��̧�i��T����(��	�xGW[t<�^>Aq���#��R��eij=H�L`ԯr�TJ�S������Ӟ�q}�4E,a�ܤ��^�I(&�z�4�Qzx/l�Y��d����4�_�����6������t���2��`��B	��b<qR׶�:=g(�{��a��6���Z�1�*)��t��.[RhFC/�Źs��W��3�i�ۑw��z�,��`2
��A,J�r�ŕ�y�՛�K�=I�� J��l\.f�;nL6�`}��M�O'#.�	s��

data/CHANGELOG.md

@@ -30,6 +30,17 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [3.1.1] - 2026-09-14
+
+- TAG: [v3.1.1][3.1.1t]
+- COVERAGE: 91.54% -- 6138/6705 lines in 48 files
+- BRANCH COVERAGE: 76.08% -- 2344/3081 branches in 48 files
+- 51.02% documented
+
+### Fixed
+
+- Close release-created branch-stack validation PRs after successful publication instead of leaving obsolete conflicted PRs open.
+
 ## [3.1.0] - 2026-09-10
 
 - TAG: [v3.1.0][3.1.0t]
@@ -3860,7 +3871,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.0...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-dev/compare/v3.1.1...HEAD
+[3.1.1]: https://github.com/kettle-dev/kettle-dev/compare/v3.1.0...v3.1.1
+[3.1.1t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v3.1.1
 [3.1.0]: https://github.com/kettle-dev/kettle-dev/compare/v3.0.34...v3.1.0
 [3.1.0t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v3.1.0
 [3.0.34]: https://github.com/kettle-dev/kettle-dev/compare/v3.0.33...v3.0.34

data/README.md

@@ -1066,7 +1066,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.685-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-6.705-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

@@ -214,6 +214,7 @@ module Kettle
         @version_override = Kettle::Dev::Versioning.normalize_explicit_version(version)
         @appraisal_task = normalize_appraisal_task(appraisal_task || ENV["KETTLE_RELEASE_APPRAISAL_TASK"])
         @release_candidate = nil
+        @release_ci_pull_request = nil
         @event_stream = options[:event_stream]
         @event_recorder = Kettle::Ndjson.event_recorder(@event_stream, phase_timings: [])
         @secrets_provider = options[:secrets_provider] || Kettle::Dev::ReleaseSecrets::Factory.build(provider_name: secrets_provider_name)
@@ -555,6 +556,11 @@ module Kettle
         # 19. push tags to remotes (final step)
         push_tags! if run_step?(19) && !local_ci?
 
+        # Branch-stack PRs exist only to trigger pull-request-only CI. They are
+        # deliberately not merged into trunk, so close the release-created PR
+        # after the publication has completed successfully.
+        close_generated_branch_stack_pull_request!
+
         # Final success message
         begin
           version ||= detect_version
@@ -1460,11 +1466,24 @@ module Kettle
 
         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")}"
+          body = pull_request["body"]
+          @release_ci_pull_request = {
+            owner: owner,
+            repo: repo,
+            number: pull_request["number"],
+            cleanup: body.is_a?(String) && body.index("Automated release validation PR for") == 0
+          }
+          puts "GitHub pull request ##{pull_request["number"]} already open for #{branch} -> #{trunk}: #{pull_request["url"]}"
           return
         end
 
-        create_github_pull_request!(owner: owner, repo: repo, branch: branch, base: trunk)
+        number = create_github_pull_request!(owner: owner, repo: repo, branch: branch, base: trunk)
+        @release_ci_pull_request = {
+          owner: owner,
+          repo: repo,
+          number: number,
+          cleanup: true
+        }
       end
 
       def github_pull_request_for_branch(owner:, repo:, branch:, base:)
@@ -1480,7 +1499,7 @@ module Kettle
           "--state",
           "open",
           "--json",
-          "number,url",
+          "number,url,body",
           "--limit",
           "1"
         )
@@ -1503,9 +1522,36 @@ module Kettle
           "--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}`."
+          release_validation_pull_request_body(branch)
         )
         puts "Created GitHub pull request for #{branch} -> #{base}: #{output.strip}"
+        output[/\/pull\/(\d+)/, 1]
+      end
+
+      def release_validation_pull_request_body(branch)
+        "Automated release validation PR for `#{branch}`.\n\nThis PR exists only to run pull-request-only GitHub Actions before publishing the branch-stack release. Branch-stack releases are not merged into trunk."
+      end
+
+      def close_generated_branch_stack_pull_request!
+        pull_request = @release_ci_pull_request
+        return unless pull_request && pull_request[:cleanup]
+
+        branch = current_branch
+        trunk = detect_trunk_branch
+        return unless branch_stack_release_branch?(branch, trunk)
+
+        args = [
+          "pr", "close", pull_request[:number].to_s,
+          "--repo", "#{pull_request[:owner]}/#{pull_request[:repo]}",
+          "--comment", "Release completed successfully; closing the CI-only validation PR."
+        ]
+        stdout, stderr, status = Open3.capture3(self.class.send(:command_env), "gh", *args)
+        if status.success?
+          puts "Closed release validation PR ##{pull_request[:number]} for #{branch}."
+        else
+          detail = stderr.strip.empty? ? stdout.strip : stderr.strip
+          warn "Could not close release validation PR ##{pull_request[:number]}: #{detail}"
+        end
       end
 
       def gh_output!(*args)
@@ -1748,7 +1794,7 @@ module Kettle
       def git_output(args)
         # Route all git interactions through the GitAdapter so tests can safely mock them
         out, ok = @git.capture(args)
-        [out.to_s.strip, !!ok]
+        [out ? out.strip : "", !!ok]
       end
 
       def ensure_git_user!

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.0"
+      VERSION = "3.1.1"
     end
     # Current gem version exposed at the traditional constant location.
     VERSION = Version::VERSION # Traditional Constant Location

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-dev
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Peter H. Boling
@@ -60,7 +60,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.14
+        version: 0.3.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -70,7 +70,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.14
+        version: 0.3.15
 - !ruby/object:Gem::Dependency
   name: kettle-ndjson
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +80,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.15
+        version: 0.1.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.15
+        version: 0.1.16
 - !ruby/object:Gem::Dependency
   name: kettle-rb
   requirement: !ruby/object:Gem::Requirement
@@ -100,7 +100,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.12
+        version: 0.1.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -110,7 +110,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.12
+        version: 0.1.13
 - !ruby/object:Gem::Dependency
   name: kettle-test
   requirement: !ruby/object:Gem::Requirement
@@ -120,7 +120,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.21
+        version: 2.0.22
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.21
+        version: 2.0.22
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -401,10 +401,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.0
-  changelog_uri: https://github.com/kettle-dev/kettle-dev/blob/v3.1.0/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-dev/tree/v3.1.1
+  changelog_uri: https://github.com/kettle-dev/kettle-dev/blob/v3.1.1/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-dev/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/3.1.0
+  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/3.1.1
   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