kettle-dev 3.1.0 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7fdd37cea8287569cfe883f3b0830022afe7e90be2582adf2046cadcdd687c7
-  data.tar.gz: 327f6277c15a6e780001e321192b72e5a10afc56718171e3324e24445c0466b5
+  metadata.gz: 43b362327936ebb689b258932474b16cc41f0654877ea6a41633ee1621e6a078
+  data.tar.gz: ee64106fa90db9443483eab9433fbecd3690e61c61a8afc436e6224cbe4d607f
 SHA512:
-  metadata.gz: f7cb591d2c7e73f063f11362091eb7efc51ff3d9b6a5cd4242260e3dd45fe1ffce867a77e218f606880f7cfd7bf5fd1f071391714b8164721c89860d4b63c737
-  data.tar.gz: 99531967a52f754cbda4a1d868e216de15d1dac6e6d27d1b4028dad9dae87681b1a88761f91d0931425d050f9ae0a6a18344c19f48621dfccac346f9a539c9ec
+  metadata.gz: 61aaf3cde5f12a6b2fc57144efd7dcee5c5a9d9f56d42c5b1715768816e64f393d8c3492b76cc85e0dd1f712fe25e7c32cce46cae0bd97748b34485d58b02759
+  data.tar.gz: 6f68bc9631eb4a2fddc50e7831464227d7526bcf8d073f986c3d533e1fcefa41bed0273bb6894e6b48a1cdb0e4fdc9a0970cf7d3bda831a402fb7448599d4161

checksums.yaml.gz.sig

@@ -1,2 +1,2 @@
-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
+Z3���f⛻�?a~����Y;}��e�����m�Ջ�	CB�<u��fP>O�`#&�X$�b,�޳����)�c�G�<�\_M���_��#P %?��W�?�+~sS+�k�9�\̦�-��^#���D,���k�lOq+��l�d�Z�\�B��q1�بl��ONJ3�x6�80cW{�c7��$h��O�J�ˊ���@B`>�1֦VWf�~���-AXχ�o�*��ސ�&�ڑcU89
+9��3�]���*YJ�m��r����E�o��5��f��jA/Rl_���!h*£K�QсTC�κ}7�v����Qe���ed�`G�}Q��O���e�u'�&'N��*���n�PS�F

data/CHANGELOG.md

@@ -30,6 +30,51 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [3.1.2] - 2026-09-27
+
+- TAG: [v3.1.2][3.1.2t]
+- COVERAGE: 91.60% -- 6149/6713 lines in 48 files
+- BRANCH COVERAGE: 76.10% -- 2347/3084 branches in 48 files
+- 51.02% documented
+
+### Added
+
+- kettle-jem-template-20260913-001 - Templating now also surfaces a review
+  entry in `dependency_conflicts.resolve` when a direct development
+  dependency doesn't support one or more of this project's declared
+  `engines:` and has no template-managed modular home (e.g. `sqlite3` on
+  `jruby`). Review each entry and pick a resolution per the project's own
+  engine support needs.
+
+### Changed
+
+- [kc] kettle-jem/prepare: updated 15 project files:
+  - configuration (1)
+  - dependencies (14)
+
+- [kc] kettle-jem/template: updated 35 project files:
+  - code and tests (3)
+  - dependencies (1)
+  - other (1)
+  - workflows (30)
+
+### Fixed
+
+- Handle macOS PTY EOF and canonicalize release-contract paths beneath symlinked temporary roots.
+
+- Run bundled YARD scripts through Ruby on Windows and accept absolute Windows RUBOCOP_LTS_LOCAL paths.
+
+## [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 +3905,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.0...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-dev/compare/v3.1.2...HEAD
+[3.1.2]: https://github.com/kettle-dev/kettle-dev/compare/v3.1.1...v3.1.2
+[3.1.2t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v3.1.2
+[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.713-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/changelog_cli.rb

@@ -968,7 +968,7 @@ module Kettle
 
         # Run the canonical docs task to get the documentation percentage.
         commands.each do |command|
-          prepare_yard_fence_tmp_files if command == [File.join(@root, "bin", "yard")]
+          prepare_yard_fence_tmp_files if command.include?(File.join(@root, "bin", "yard"))
           output, status = capture_yard_command(command)
           unless command_successful?(status)
             return handle_yard_documentation_failure(yard_command_failure_message(command, output, status))
@@ -1012,9 +1012,9 @@ module Kettle
 
       def yard_command_label(command)
         command = Array(command)
-        bin = command.first.to_s
+        bin = command.find { |part| [File.join(@root, "bin", "rake"), File.join(@root, "bin", "yard")].include?(part) }.to_s
         if bin == File.join(@root, "bin", "rake")
-          "bin/rake #{command.drop(1).join(" ")}".strip
+          "bin/rake #{command.drop_while { |part| part != bin }.drop(1).join(" ")}".strip
         elsif bin == File.join(@root, "bin", "yard")
           "bin/yard"
         else
@@ -1025,9 +1025,9 @@ module Kettle
       def yard_documentation_commands
         commands = []
         rake = File.join(@root, "bin", "rake")
-        commands << [rake, "yard"] if File.executable?(rake)
+        commands << [RbConfig.ruby, rake, "yard"] if File.file?(rake)
         yard = File.join(@root, "bin", "yard")
-        commands << [yard] if File.executable?(yard)
+        commands << [RbConfig.ruby, yard] if File.file?(yard)
         commands
       end
 

data/lib/kettle/dev/interactive_release_command.rb

@@ -50,8 +50,8 @@ module Kettle
                 end
               end
             end
-          rescue Errno::EIO
-            # PTY raises EIO when the child process exits after closing the slave.
+          rescue Errno::EIO, EOFError
+            # PTY platforms signal a closed child with EIO or EOFError.
           rescue Kettle::Dev::Error
             Process.kill("TERM", pid)
             raise

data/lib/kettle/dev/release_cli.rb

@@ -3,6 +3,7 @@
 # External stdlib
 require "digest"
 require "open3"
+require "pathname"
 require "shellwords"
 require "time"
 require "fileutils"
@@ -214,6 +215,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 +557,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
@@ -701,8 +708,8 @@ module Kettle
       end
 
       def same_path?(left, right)
-        File.realpath(left) == File.realpath(right)
-      rescue Errno::ENOENT
+        File.identical?(left, right)
+      rescue SystemCallError
         false
       end
 
@@ -710,7 +717,7 @@ module Kettle
         value = ENV["RUBOCOP_LTS_LOCAL"].to_s.strip
         return nil if value.empty? || %w[false 0 no off].include?(value.downcase)
         return File.join(Dir.home, "src", "rubocop-lts") if %w[true 1 yes on].include?(value.downcase)
-        return value if value.start_with?("/")
+        return value if Pathname.new(value).absolute?
 
         File.join(Dir.home, value)
       end
@@ -1460,11 +1467,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 +1500,7 @@ module Kettle
           "--state",
           "open",
           "--json",
-          "number,url",
+          "number,url,body",
           "--limit",
           "1"
         )
@@ -1503,9 +1523,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 +1795,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/release_graph_contract.rb

@@ -87,7 +87,18 @@ module Kettle
 
       def canonical_path(path)
         expanded = File.expand_path(path, @root)
-        File.realpath(expanded)
+        candidate = expanded
+        suffix = []
+
+        until File.exist?(candidate) || File.symlink?(candidate)
+          parent = File.dirname(candidate)
+          return expanded if parent == candidate
+
+          suffix.unshift(File.basename(candidate))
+          candidate = parent
+        end
+
+        suffix.reduce(File.realpath(candidate)) { |base, component| File.join(base, component) }
       rescue Errno::ENOENT
         expanded
       end

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.2"
     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.2
 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.16
   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.16
 - !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.18
   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.18
 - !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.15
   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.15
 - !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.23
   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.23
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -159,6 +159,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
+- !ruby/object:Gem::Dependency
+  name: version_gem
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.15
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.15
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -236,7 +256,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: 3.2.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -246,7 +266,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: 3.2.4
 - !ruby/object:Gem::Dependency
   name: turbo_tests2
   requirement: !ruby/object:Gem::Requirement
@@ -256,7 +276,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: 3.2.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -266,7 +286,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: 3.2.11
 - !ruby/object:Gem::Dependency
   name: stone_checksums
   requirement: !ruby/object:Gem::Requirement
@@ -276,7 +296,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 1.0.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -286,7 +306,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 1.0.9
 - !ruby/object:Gem::Dependency
   name: gitmoji-regex
   requirement: !ruby/object:Gem::Requirement
@@ -296,7 +316,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.12
+        version: 2.0.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -306,7 +326,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.12
+        version: 2.0.13
 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
@@ -401,10 +421,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.2
+  changelog_uri: https://github.com/kettle-dev/kettle-dev/blob/v3.1.2/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.2
   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
@@ -434,7 +454,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.17
+rubygems_version: 4.0.20
 specification_version: 4
 summary: "\U0001F372 A kettle-dev meta tool to streamline development and testing"
 test_files: []