kettle-dev 2.5.1 → 2.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9975348ccc03484b31a14bcb13b9da4191f2296547d72c7866b35cd603fd66cd
-  data.tar.gz: 87918a8f059258b36fe87ceb242eb1d8abe4ee8e18a7a5ddf9a04a0be8679b55
+  metadata.gz: 27bd22792f389003c84598a97928551098982336ecc8a8266c8c9d681aa842db
+  data.tar.gz: d152ad9402e99f1705b25c94512e5c547dbf81fe471c5f05e883a65defa29224
 SHA512:
-  metadata.gz: 21373f304fbeeae9a69c93596f68cf718ae0c61432e4bd527a447702f8f50357eb0b9ec226758438049415a3d222672388e01792ceb12ba64456463dff12ad2f
-  data.tar.gz: 78250942ecb9f4d6b5adc5635cf5e4b3151f82d8c5a968913361e984dede50852103c912eae25153e59c939e97b0d73f7bdfc9faf01c8bbc853a081a1316167f
+  metadata.gz: 0b41c1056e1cdf746e37a7cfe70e66bcc5a2a7c1b012867150fa48d607cbc86a5ed77f6021443cf32ac1ab76414b171a9fabd2db8a0c7d89d5a7e331564fea20
+  data.tar.gz: 86c5763509b503634019b7894fb69ab811a680698ca8a5f15dc4eb4f761238da1a9fcac60250b6733318e2ce09eb2e27bbf908af6fbdb2974526a6bd6f65ccf3

data/CHANGELOG.md

@@ -30,6 +30,41 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [2.5.3] - 2026-07-27
+
+- TAG: [v2.5.3][2.5.3t]
+- COVERAGE: 91.86% -- 4627/5037 lines in 42 files
+- BRANCH COVERAGE: 76.58% -- 1769/2310 branches in 42 files
+- 56.04% documented
+
+### Fixed
+
+- `kettle-release` now resets release lockfiles before release task bundle
+  installs, preventing stale `Appraisal.root.gemfile.lock` entries for
+  unreleased sibling gems from aborting appraisal generation.
+
+## [2.5.2] - 2026-07-27
+
+- TAG: [v2.5.2][2.5.2t]
+- COVERAGE: 91.92% -- 4619/5025 lines in 42 files
+- BRANCH COVERAGE: 76.50% -- 1761/2302 branches in 42 files
+- 56.04% documented
+
+### Fixed
+
+- `kettle-reset release-lockfiles` now detects local workspace gem versions
+  that Bundler locked as registry gems even when checksum entries are present,
+  so unreleased sibling versions are not committed into release lockfiles.
+
+- `kettle-reset` now scans workspace sibling directories with Ruby 2.4
+  compatible APIs, fixing Ruby 2.4 CI failures in lockfile reset specs.
+
+### Changed
+
+- kettle-jem-template-20260728-001 - Generated Ruby workflows now use clearer
+  setup-ruby-flash planning and can prepare appraisal-only jobs without
+  installing the main Gemfile bundle.
+
 ## [2.5.1] - 2026-07-27
 
 - TAG: [v2.5.1][2.5.1t]
@@ -2893,7 +2928,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/v2.5.1...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-dev/compare/v2.5.3...HEAD
+[2.5.3]: https://github.com/kettle-dev/kettle-dev/compare/v2.5.2...v2.5.3
+[2.5.3t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v2.5.3
+[2.5.2]: https://github.com/kettle-dev/kettle-dev/compare/v2.5.1...v2.5.2
+[2.5.2t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v2.5.2
 [2.5.1]: https://github.com/kettle-dev/kettle-dev/compare/v2.5.0...v2.5.1
 [2.5.1t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v2.5.1
 [2.5.0]: https://github.com/kettle-dev/kettle-dev/compare/v2.4.6...v2.5.0

data/README.md

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

@@ -91,12 +91,13 @@ module Kettle
         (
           path_source_gems(path).to_a |
           path_dependency_gems(path).to_a |
-          empty_registry_checksums(path).map(&:first)
+          empty_registry_checksums(path).map(&:first) |
+          unreleased_workspace_registry_specs(path).map(&:first)
         ).uniq.sort
       end
 
       def normalization_needed?(path)
-        has_local_path_remote?(path) || !empty_registry_checksums(path).empty?
+        has_local_path_remote?(path) || !empty_registry_checksums(path).empty? || !unreleased_workspace_registry_specs(path).empty?
       end
 
       def diagnostics(path)
@@ -107,6 +108,9 @@ module Kettle
         empty_registry_checksums(path).each do |name, version, line_number|
           diagnostics << "#{display_path(path)} CHECKSUMS has no sha256 for #{name} #{version} at line #{line_number}"
         end
+        unreleased_workspace_registry_specs(path).each do |name, version, line_number|
+          diagnostics << "#{display_path(path)} locks local workspace gem #{name} #{version} as a registry gem, but that version is not released on RubyGems.org at line #{line_number}"
+        end
         diagnostics
       end
 
@@ -224,6 +228,18 @@ module Kettle
         entries
       end
 
+      def unreleased_workspace_registry_specs(path)
+        local_names = local_workspace_gem_names
+        return [] if local_names.empty?
+
+        registry_specs_with_lines(path).filter_map do |name, version, line_number|
+          next unless local_names.include?(name)
+          next if ruby_gems_version_available?(name, version)
+
+          [name, version, line_number]
+        end
+      end
+
       def has_any_sha_checksum?(path)
         in_checksums = false
         File.readlines(path).any? do |line|
@@ -347,10 +363,14 @@ module Kettle
       end
 
       def registry_specs(path)
+        registry_specs_with_lines(path).map { |name, version, _line_number| [name, version] }
+      end
+
+      def registry_specs_with_lines(path)
         specs = []
         in_gem = false
         in_specs = false
-        File.readlines(path).each do |line|
+        File.readlines(path).each.with_index(1) do |line, line_number|
           stripped = line.chomp
           if stripped == "GEM"
             in_gem = true
@@ -367,7 +387,7 @@ module Kettle
           next unless in_specs
 
           match = stripped.match(/\A    ([A-Za-z0-9_.-]+) \(([^)]+)\)/)
-          specs << [match[1], match[2]] if match
+          specs << [match[1], match[2], line_number] if match
         end
         specs
       end
@@ -425,12 +445,28 @@ module Kettle
         paths.each_with_object(Set.new) do |path, names|
           next unless File.directory?(path)
 
-          Dir[File.join(path, "*", "*.gemspec")].each do |gemspec|
-            names << File.basename(gemspec, ".gemspec")
+          workspace_children(path).each do |child|
+            next unless directory?(child)
+
+            Dir[File.join(child, "*.gemspec")].each do |gemspec|
+              names << File.basename(gemspec, ".gemspec")
+            end
           end
         end
       end
 
+      def workspace_children(path)
+        Dir.entries(path).reject { |child| child == "." || child == ".." }.map { |child| File.join(path, child) }
+      rescue SystemCallError
+        []
+      end
+
+      def directory?(path)
+        File.stat(path).directory?
+      rescue SystemCallError
+        false
+      end
+
       def validation_message(target, diagnostics)
         <<~MSG
           Reset #{target} failed validation:

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

@@ -3,8 +3,12 @@
 # --- Appraisals (dev-only) ---
 begin
   require "appraisal/task"
+  require "kettle/dev/lockfile_reset"
 
   bundle = "bundle"
+  unbundled_env = Kettle::Dev::LockfileReset::UNBUNDLED_ENV_KEYS.each_with_object({}) do |key, env|
+    env[key] = nil
+  end
   quiet_env = {
     "KETTLE_JEM_QUIET" => "true",
     "KETTLE_JEM_DEBUG" => "false",
@@ -25,7 +29,14 @@ begin
     "BUNDLE_SILENCE_ROOT_WARNING" => "true",
     "BUNDLE_SUPPRESS_INSTALL_USING_MESSAGES" => "true"
   }
-  appraisal_env = quiet_env.merge("BUNDLE_GEMFILE" => "Appraisal.root.gemfile")
+  appraisal_env = quiet_env.merge(
+    Kettle::Dev::LockfileReset.new(root: Dir.pwd, command_runner: ->(_command) {}).normalization_env
+  ).merge(
+    unbundled_env
+  ).merge(
+    "BUNDLE_GEMFILE" => "Appraisal.root.gemfile",
+    "BUNDLE_LOCKFILE" => "Appraisal.root.gemfile.lock"
+  )
 
   run_command = lambda do |failure_message, *args|
     ok = system(*args)

data/lib/kettle/dev/release_cli.rb

@@ -272,6 +272,7 @@ module Kettle
         end
 
         prepare_rubocop_lts_local_branch! if rubocop_lts_release_preflight_needed?
+        prepare_release_lockfiles_for_release_tasks! if release_lockfile_preflight_needed?
 
         # 3. bin/setup
         run_cmd!("bin/setup") if run_step?(3)
@@ -509,6 +510,10 @@ module Kettle
         (3..5).any? { |step| run_step?(step) }
       end
 
+      def release_lockfile_preflight_needed?
+        (3..5).any? { |step| run_step?(step) }
+      end
+
       def prepare_rubocop_lts_local_branch!
         local_root = rubocop_lts_local_root
         return unless local_root
@@ -570,7 +575,18 @@ module Kettle
       end
 
       def prepare_release_lockfiles_for_commit!
-        puts "Resetting release lockfiles with local path dependencies disabled..."
+        reset_release_lockfiles!(stage: "before release prep commit") unless @release_lockfiles_reset_for_release_tasks
+        validate_release_lockfiles!(stage: "before release prep commit")
+      end
+
+      def prepare_release_lockfiles_for_release_tasks!
+        reset_release_lockfiles!(stage: "before release task bundle installs")
+      end
+
+      def reset_release_lockfiles!(stage:)
+        return if @release_lockfiles_reset_for_release_tasks && stage == "before release task bundle installs"
+
+        puts "Resetting release lockfiles with local path dependencies disabled #{stage}..."
         begin
           lockfile_reset.reset(Kettle::Dev::LockfileReset::RELEASE_LOCKFILES_TARGET)
         rescue Kettle::Dev::Error => error
@@ -585,7 +601,7 @@ module Kettle
         if diagnostics.empty?
           puts "Release lockfile reset complete: #{release_lockfile_paths.length} lockfile(s) checked, no diagnostics remain."
         end
-        validate_release_lockfiles!(stage: "before release prep commit")
+        @release_lockfiles_reset_for_release_tasks = true if stage == "before release task bundle installs"
       end
 
       def validate_release_lockfiles!(stage:)

data/lib/kettle/dev/version.rb

@@ -5,7 +5,7 @@ module Kettle
     # Version namespace for this gem.
     module Version
       # Current gem version.
-      VERSION = "2.5.1"
+      VERSION = "2.5.3"
     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: 2.5.1
+  version: 2.5.3
 platform: ruby
 authors:
 - Peter H. Boling
@@ -395,10 +395,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.5.1
-  changelog_uri: https://github.com/kettle-dev/kettle-dev/blob/v2.5.1/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-dev/tree/v2.5.3
+  changelog_uri: https://github.com/kettle-dev/kettle-dev/blob/v2.5.3/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-dev/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/2.5.1
+  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/2.5.3
   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