kettle-family 1.2.70 → 1.2.72

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2288af511fb1a4739aaa21048c246fc943f37121fade2508036d3ab99118a23
-  data.tar.gz: dd96a3071d396abca33e2dc05747ed84d5b4071833e6397d18262e7b67a8ac8e
+  metadata.gz: 266e37644edc6018b8703bf55cd6f20bf4db15c69697d28ea11e6ff1940fef37
+  data.tar.gz: 19ee1e19fdead5782076ec358f5d9989995775f31c721532dc8c38de9933a234
 SHA512:
-  metadata.gz: 55c143def3d82260a48d92eb2a790d451b0870639f0824b8995acbf066111b5fb43f9522fb94d7a79de4fccc64f4a786fdd553621512316f0b51ffe81ed6f49c
-  data.tar.gz: e405c86386fd311f126a473fd7c2410626f1763ae739892c923fd03ea69a8bbff9251e6cb9f08504a3ad0189ec4b50d43b67cf74b5ecd3689fea6614ad15a086
+  metadata.gz: bec417de6edd7bea0c58cb336d854ff52c9744447b31b5a37bcf4cfeb1710810a3245f34095d206bd68a1de36d30fc5532818ccf09959a4053f3dff32ac69b29
+  data.tar.gz: 07d41736e1d2e3577725a9382c65fbaa10c0a1308ccae0effa86a434a78994ea2cfb56d803325098b09c40af3b9653112986136dc7a7bd0deabb44209aea41f7

data/CHANGELOG.md

@@ -30,6 +30,30 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.2.72] - 2026-08-30
+
+- TAG: [v1.2.72][1.2.72t]
+- COVERAGE: 93.32% -- 5535/5931 lines in 33 files
+- BRANCH COVERAGE: 76.73% -- 2275/2965 branches in 33 files
+- 30.50% documented
+
+### Fixed
+
+- Exclude already-bumped local-changelog members from shared family bump selection.
+
+- Propagate required shared-version bumps across shared-changelog members while keeping member-local changelogs independent.
+
+## [1.2.71] - 2026-08-30
+
+- TAG: [v1.2.71][1.2.71t]
+- COVERAGE: 93.30% -- 5544/5942 lines in 33 files
+- BRANCH COVERAGE: 76.62% -- 2281/2977 branches in 33 files
+- 30.50% documented
+
+### Fixed
+
+- Preserve explicitly enabled monorepo template dependency graphs while reconciling release lockfiles.
+
 ## [1.2.70] - 2026-08-30
 
 - TAG: [v1.2.70][1.2.70t]
@@ -2346,7 +2370,11 @@ Please file a bug if you notice a violation of semantic versioning.
 - Fixed CI load failures on engines without compatible `pty` support by falling back to Open3 for interactive release commands.
 - Fixed Ruby 3.2 version-bump support by loading Prism lazily and wiring the Prism gem only for MRI versions that need it.
 
-[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.2.70...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.2.72...HEAD
+[1.2.72]: https://github.com/kettle-dev/kettle-family/compare/v1.2.71...v1.2.72
+[1.2.72t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.72
+[1.2.71]: https://github.com/kettle-dev/kettle-family/compare/v1.2.70...v1.2.71
+[1.2.71t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.71
 [1.2.70]: https://github.com/kettle-dev/kettle-family/compare/v1.2.69...v1.2.70
 [1.2.70t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.70
 [1.2.69]: https://github.com/kettle-dev/kettle-family/compare/v1.2.68...v1.2.69

data/README.md

@@ -1049,7 +1049,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.902-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-5.942-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
 [🔐security]: https://github.com/kettle-dev/kettle-family/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/family/cli.rb

@@ -702,8 +702,7 @@ module Kettle
         )
         selected = Selection.new(
           members: ordered,
-          release_state_results: release_state_results,
-          shared_version: config.shared_changelog?
+          release_state_results: release_state_results
         ).apply(only: effective_only, exclude: options[:exclude], start_at: start_at.member)
         result_members = selected
         display_members = display_members_for(command: command, config: config, members: ordered, selected_members: selected)

data/lib/kettle/family/release_state_check.rb

@@ -777,23 +777,11 @@ module Kettle
       end
 
       def normalize_shared_version_bump(results)
-        return results unless results.any? { |result| result.ok? && result.state["bump_release_pending"] == true }
-
-        successful = results.select(&:ok?)
-        target_version = successful.filter_map { |result| parse_version(result.state["version"]) }.max
-        released_version = successful.filter_map { |result| parse_version(result.state["latest_released"]) }.max
-        target_already_bumped = target_version && released_version && target_version > released_version
+        shared_results = results.select { |result| result.ok? && shared_changelog_member_result?(result) }
+        return results unless shared_results.any? { |result| result.state["bump_release_pending"] == true }
 
         results.map do |result|
-          next result unless result.ok?
-
-          state = result.state
-          version = parse_version(state["version"])
-          bump_pending = if target_already_bumped && version == target_version
-            false
-          else
-            state["bump_release_pending"] == true
-          end
+          next result unless result.ok? && shared_changelog_member_result?(result)
 
           result.class.new(
             member_name: result.member_name,
@@ -804,17 +792,16 @@ module Kettle
             stdout: result.stdout,
             stderr: result.stderr,
             elapsed_seconds: result.elapsed_seconds,
-            state: state.merge("bump_release_pending" => bump_pending),
+            state: result.state.merge("bump_release_pending" => true),
             reason: result.reason,
             branch: result.branch
           )
         end
       end
 
-      def parse_version(value)
-        Gem::Version.new(value.to_s) unless value.to_s.empty?
-      rescue ArgumentError
-        nil
+      def shared_changelog_member_result?(result)
+        member = members.find { |candidate| candidate.name == result.member_name }
+        member && !member_local_changelog?(member)
       end
 
       def git_root

data/lib/kettle/family/selection.rb

@@ -30,10 +30,9 @@ module Kettle
         raise Error, "--only release-state tokens cannot be combined with member names: #{member_names.join(", ")}" unless member_names.empty?
       end
 
-      def initialize(members:, release_state_results: nil, shared_version: false)
+      def initialize(members:, release_state_results: nil)
         @members = members
         @release_state_results = release_state_results
-        @shared_version = shared_version
       end
 
       def apply(only: nil, exclude: nil, start_at: nil)
@@ -48,7 +47,7 @@ module Kettle
 
       private
 
-      attr_reader :members, :release_state_results, :shared_version
+      attr_reader :members, :release_state_results
 
       def select_only(selected, only)
         names = only.split(",").map(&:strip).reject(&:empty?)
@@ -89,10 +88,6 @@ module Kettle
         failed = results_by_member.values.select { |result| !result.ok? }
         raise Error, "release-state check failed for: #{failed.map(&:member_name).join(", ")}" unless failed.empty?
 
-        if shared_version && status_tokens.include?("bump")
-          return selected if selected.any? { |candidate| truthy_state?(results_by_member[candidate.name]&.state&.fetch("bump_release_pending", nil)) }
-        end
-
         selected.select do |candidate|
           result = results_by_member[candidate.name]
           result && status_tokens.all? { |token| truthy_state?(result.state[STATUS_TOKEN_KEYS.fetch(token)]) }

data/lib/kettle/family/version.rb

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

data/lib/kettle/family/workflow.rb

@@ -1761,11 +1761,16 @@ module Kettle
         return ["Gemfile.lock was not created by dependency floor lockfile refresh"] unless File.file?(lockfile)
 
         lockfile_source = File.read(lockfile)
-        diagnostics = Kettle::Dev::LockfileReset.local_path_remote_lines_from_source(lockfile_source).map do |line_number|
+        allowed_path_gems = dependency_floor_allowed_path_gems(member: member, lockfile_source: lockfile_source)
+        diagnostics = Kettle::Dev::LockfileReset.local_path_remote_lines_from_source(lockfile_source).reject do |line_number|
+          dependency_floor_allowed_path_remote?(member: member, lockfile_source: lockfile_source, line_number: line_number)
+        end.map do |line_number|
           "Gemfile.lock has local path remote at line #{line_number}"
         end
         checksum_entries = Kettle::Dev::LockfileReset.checksum_entries_from_source(lockfile_source) || {}
         diagnostics.concat(released_members.filter_map do |released_member|
+          next if allowed_path_gems.include?(released_member.name)
+
           checksum = checksum_entries[[released_member.name, released_member.version]]
           if checksum.nil?
             "Gemfile.lock CHECKSUMS is missing #{released_member.name} #{released_member.version}"
@@ -1776,6 +1781,48 @@ module Kettle
         diagnostics
       end
 
+      def dependency_floor_allowed_path_remote?(member:, lockfile_source:, line_number:)
+        remote = lockfile_source.each_line.with_index(1).find { |_line, index| index == line_number }.first
+          .to_s.split("remote:", 2).last.to_s.strip
+        remote_path = File.expand_path(remote, member.root)
+        release_allowed_local_path_roots.any? do |root|
+          remote_path == root || remote_path.start_with?("#{root}/")
+        end
+      end
+
+      def dependency_floor_allowed_path_gems(member:, lockfile_source:)
+        in_path = false
+        in_specs = false
+        allowed_remote = false
+        lockfile_source.each_line.each_with_object(Set.new) do |line, gems|
+          stripped = line.strip
+          if stripped.match?(/\A[A-Z][A-Z ]*\z/)
+            in_path = stripped == "PATH"
+            in_specs = false
+            allowed_remote = false
+            next
+          end
+          next unless in_path
+
+          if stripped.start_with?("remote:")
+            remote = stripped.split("remote:", 2).last.to_s.strip
+            remote_path = File.expand_path(remote, member.root)
+            allowed_remote = release_allowed_local_path_roots.any? do |root|
+              remote_path == root || remote_path.start_with?("#{root}/")
+            end
+            next
+          end
+          if stripped == "specs:"
+            in_specs = true
+            next
+          end
+          next unless allowed_remote && in_specs && line.start_with?("    ") && !line.start_with?("      ")
+
+          name = stripped.split(" (", 2).first
+          gems << name unless name.empty?
+        end
+      end
+
       def dependency_floor_lockfile_command(released_members)
         ["bundle", "lock", "--update", *released_members.map(&:name), "--add-checksums"]
       end
@@ -4130,7 +4177,9 @@ module Kettle
       end
 
       def release_allowed_local_path_env_names
-        config.release_allowed_local_path_env_names
+        names = config.release_allowed_local_path_env_names
+        names << "K_JEM_TEMPLATING" if preserve_monorepo_template_context?
+        names.uniq
       end
 
       def release_local_path_policy_env
@@ -4146,6 +4195,7 @@ module Kettle
 
       def release_lockfile_local_path_env_overrides(member = nil)
         explicit = config.release_disable_local_path_env.to_h { |key| [key.to_s, "false"] }
+        explicit.delete("K_JEM_TEMPLATING") if preserve_monorepo_template_context?
         derived = release_local_path_env_detection_sources.each_with_object({}) do |(key, value), memo|
           key = key.to_s
           next unless key.end_with?("_LOCAL", "_DEV")
@@ -4155,7 +4205,21 @@ module Kettle
           memo[key] = "false"
         end
         inferred = member ? release_lockfile_inferred_local_path_env(member).to_h { |key| [key, "false"] } : {}
-        explicit.merge(derived).merge(inferred).merge(release_member_local_path_env(member))
+        explicit
+          .merge(derived)
+          .merge(inferred)
+          .merge(release_member_local_path_env(member))
+          .merge(preserve_monorepo_template_context? ? {"K_JEM_TEMPLATING" => "true"} : {})
+      end
+
+      # K_JEM_TEMPLATING activates the generated monorepo dependency closure;
+      # it is not an unrelated local checkout switch. Preserve it only when
+      # the caller explicitly enabled it for a configured monorepo release.
+      def preserve_monorepo_template_context?
+        return false unless config.configured_monorepo_release?
+
+        value = release_local_path_env_sources["K_JEM_TEMPLATING"].to_s.strip.downcase
+        %w[true yes 1 on].include?(value)
       end
 
       def release_member_local_path_env(member)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 1.2.70
+  version: 1.2.72
 platform: ruby
 authors:
 - Peter H. Boling
@@ -441,10 +441,10 @@ licenses:
 - AGPL-3.0-only
 metadata:
   homepage_uri: https://kettle-family.galtzo.com
-  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.2.70
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.70/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.2.72
+  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.72/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.70
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.72
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/kettle-dev/kettle-family/wiki
   news_uri: https://www.railsbling.com/tags/kettle-family