kettle-family 1.3.18 → 1.3.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6166c5366a3a6175dd73b92d85266730bb16a2598c201785f596245e27eb1f2
-  data.tar.gz: e1120fcc387e5eca5ff2ae8e14f28e1761003f799c7861e0cd626e92b5497514
+  metadata.gz: 96db982e6915d29a69f7d70da67d8bc64cba1ac9d2e5c98cfc6f25a0007a8915
+  data.tar.gz: 18df52948a5ed1578f0c1d65d1da40fe93b3c13cd16bec671849651eb3cade02
 SHA512:
-  metadata.gz: '0818f112b4a9e37e726d4804db2a1b47ff11d78ae6e8773a5370e8faeba0532e3c1d299cd210f193365717fdf711c85cc687be67c35202ce087d36ca619d5986'
-  data.tar.gz: 68125b254ed371d6a2f3d721b223d8459514299fbbaa9b0e5f5402f00cf8340b20f599a5b8c6cd5da6b1499306e51d1313cba86dcf643166288eb4b8ab7050a5
+  metadata.gz: 543de4d2b9c10fe77cb0ed64231b381bd3c2553def379d4af9d4c84429821f0ddda8f6c300fcad022fe529654d8d11eb496afd3927c2a4d9b83bc5a1d3417d69
+  data.tar.gz: 36b14df59d36b187d978391d3e0e4be771f241e8eb816be8e13b01e703b56c957ee51d5545aa8f68c85f3575c1a0227d72b0a69ede2b9b29bacfe2775f3450d8

data/CHANGELOG.md

@@ -30,6 +30,30 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.3.22] - 2026-10-19
+
+- TAG: [v1.3.22][1.3.22t]
+- COVERAGE: 93.00% -- 7348/7901 lines in 44 files
+- BRANCH COVERAGE: 77.29% -- 2930/3791 branches in 44 files
+- 37.55% documented
+
+### Fixed
+
+- Family releases execute kettle-release from the family root bundle (BUNDLE_GEMFILE points member children at the family root Gemfile), so a stale member worktree lock can never resolve an ancient kettle-release whose fixes silently never load (observed: a member lock pinning kettle-dev 3.1.16 / kettle-family 1.3.11 skipped 3.1.17's task-lockfile materialization and the build failed on kettle-family 1.3.13).
+
+## [1.3.21] - 2026-10-18
+
+- TAG: [v1.3.21][1.3.21t]
+- COVERAGE: 92.98% -- 7347/7902 lines in 44 files
+- BRANCH COVERAGE: 77.22% -- 2929/3793 branches in 44 files
+- 37.55% documented
+
+### Added
+
+- Managed family mise task suite generated from family config facts via a kettle-jem plugin: comprehensive delegations (test, lint, state, release-state, template, bump, changelog) plus bup/bupb/update-bundler with env wiring derived from family.local_path_env, release.disable_local_path_env, and family.members_root, replacing per-family hand-copied task definitions (and the buggy shell-spawned bundler pinning).
+
+- mise-tasks registers the kettle-family plugin in the destination kettle-jem config (psych-merge, destination-wins sequence append), so templating runs load it and materialize the managed task suite with no hand-edited configs.
+
 ## [1.3.18] - 2026-10-18
 
 - TAG: [v1.3.18][1.3.18t]
@@ -3097,7 +3121,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.3.18...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.3.22...HEAD
+[1.3.22]: https://github.com/kettle-dev/kettle-family/compare/v1.3.21...v1.3.22
+[1.3.22t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.3.22
+[1.3.21]: https://github.com/kettle-dev/kettle-family/compare/v1.3.18...v1.3.21
+[1.3.21t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.3.21
 [1.3.18]: https://github.com/kettle-dev/kettle-family/compare/v1.3.17...v1.3.18
 [1.3.18t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.3.18
 [1.3.17]: https://github.com/kettle-dev/kettle-family/compare/v1.3.16...v1.3.17

data/README.md

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

@@ -329,7 +329,9 @@ module Kettle
           end
 
           # Register the managed file in the destination's kettle-jem config
-          # when the project is kettle-jem-templated.
+          # when the project is kettle-jem-templated, and ensure kettle-family
+          # itself is listed under `plugins:` so templating runs load it and
+          # materialize the managed task suite automatically.
           %w[.structuredmerge/kettle-jem.yml .kettle-jem.yml].each do |config_relative|
             config_path = File.join(root, config_relative)
             next unless File.file?(config_path)
@@ -344,6 +346,16 @@ module Kettle
             else
               stdout.puts("#{task_file_name} already registered in #{config_relative}")
             end
+
+            plugin_registration = Kettle::Family::MiseTasks.register_plugin_in_jem_config(
+              config_content: File.read(config_path)
+            )
+            if plugin_registration.changed
+              File.write(config_path, plugin_registration.content)
+              stdout.puts("registered kettle-family plugin in #{config_relative}")
+            else
+              stdout.puts("kettle-family plugin already registered in #{config_relative}")
+            end
             break
           end
 
@@ -966,7 +978,7 @@ module Kettle
       def command_results_for_current_branch(command:, config:, members:, options:, family_members: members, start_at: StartAt.new(nil, nil), state_event_handler: nil, state_event_tape: nil, release_state_results: nil)
         return mise_trust_results(config: config, members: members) if command == "mise-trust"
         return bump_version_results(config: config, members: members, options: options, phase: command, release_state_results: release_state_results) if %w[bump bump-version].include?(command)
-        return add_changelog_results(members: members, options: options) if command == "add-changelog"
+        return add_changelog_results(config: config, members: members, options: options) if command == "add-changelog"
         return clean_unreleased_results(config: config, members: members, options: options) if command == "clean-unreleased"
         return clean_blockers_results(members: members, options: options) if command == "clean-blockers"
         return clean_installed_results(config: config, members: members, options: options) if command == "clean-installed"
@@ -1411,7 +1423,7 @@ module Kettle
         Kettle::Dev::VersionBump.resolve_target_version(options[:target_version].to_s, current.to_s)
       end
 
-      def add_changelog_results(members:, options:)
+      def add_changelog_results(config:, members:, options:)
         section = options[:changelog_section].to_s
         entry = options[:changelog_entry].to_s
         raise Error, "add-changelog requires --section" if section.empty?
@@ -1422,12 +1434,27 @@ module Kettle
           memo << runner.call(
             member: member,
             phase: "add-changelog",
-            command: [installed_executable("kettle-changelog"), "--add-unreleased-entry", "--section", section, "--entry", entry]
+            command: [installed_executable("kettle-changelog"), "--add-unreleased-entry", "--section", section, "--entry", entry],
+            env: changelog_target_env(config: config, member: member)
           )
           break memo unless memo.last.ok?
         end
       end
 
+      # Changelogs go where the family config says they go: a shared-changelog
+      # family writes its family root changelog, a member-local family writes
+      # each member's own. The env is explicit because kettle-changelog falls
+      # back to the invoking directory's CHANGELOG.md when K_CHANGELOG_PATH is
+      # unset, which is only correct for member-local families by accident.
+      def changelog_target_env(config:, member:)
+        path = if config&.shared_changelog?
+          File.expand_path(config.changelog_path, config.root)
+        else
+          File.join(member.root, "CHANGELOG.md")
+        end
+        {"K_CHANGELOG_PATH" => path}
+      end
+
       def installed_executable(name)
         File.join(Gem.bindir, name)
       end

data/lib/kettle/family/mise_tasks.rb

@@ -19,6 +19,10 @@ module Kettle
     module MiseTasks
       TomlSelectors = Ast::Crispr::Toml::Selectors
 
+      # Managed task file name, relative to the family root (the directory
+      # containing .kettle-family.yml and the root mise.toml that includes it).
+      DEFAULT_TASK_FILE_NAME = "mise-family.tasks.toml"
+
       # changed:         the root content was modified
       # include_present: the include reference is (now) present and correct
       # content:         the resulting root mise.toml content
@@ -100,6 +104,35 @@ module Kettle
         Result.new(changed: updated != config_content, include_present: true, content: updated, redefinitions: [])
       end
 
+      # Ensure kettle-family is listed under `plugins:` in the destination's
+      # kettle-jem config, so templating runs load it and materialize the
+      # managed task suite. Appends to an existing `plugins:` list without
+      # disturbing entries already there (sequence items present only in the
+      # fragment are added; destination items always win); a no-op when the
+      # plugin is already listed.
+      #
+      # @param config_content [String] destination kettle-jem config YAML
+      # @return [Result]-shaped Struct (changed, include_present, content, redefinitions: [])
+      def self.register_plugin_in_jem_config(config_content:)
+        fragment = <<~YAML
+          plugins:
+            - kettle-family
+        YAML
+
+        merge_result = Psych::Merge.merge_yaml(
+          fragment,
+          config_content,
+          "yaml",
+          add_template_only_nodes: true,
+          add_template_only_sequence_items: true,
+          preference: :destination
+        )
+        raise Error, Array(merge_result[:diagnostics]).map { |d| d[:message] || d["message"] }.join("; ") unless merge_result[:ok]
+
+        updated = merge_result[:output]
+        Result.new(changed: updated != config_content, include_present: true, content: updated, redefinitions: [])
+      end
+
       # Task names defined in BOTH the root mise.toml and the managed task file.
       #
       # @param root_content [String] destination mise.toml content
@@ -254,6 +287,152 @@ module Kettle
           result.updated_content
         end
       end
+
+      # kettle-jem plugin hook (kettle-jem-appraisals pattern). During
+      # templating of a family root, materialize the comprehensive managed
+      # task suite from the family config facts and ensure the root mise.toml
+      # includes it. Skips non-family roots (member dirs have no
+      # .kettle-family.yml).
+      #
+      # @param context [Hash] kettle-jem plugin context (:project_root)
+      def self.materialize_managed_suite(context:)
+        root = context[:project_root].to_s
+        return if root.empty?
+
+        root = File.expand_path(root)
+        return unless File.file?(File.join(root, ".kettle-family.yml"))
+
+        config = Config.load(root: root)
+        content = ManagedSuite.new(config).content
+        content += "\n" unless content.end_with?("\n")
+
+        task_file_path = File.join(root, DEFAULT_TASK_FILE_NAME)
+        File.write(task_file_path, content) unless File.exist?(task_file_path) && File.read(task_file_path) == content
+
+        root_mise = File.join(root, "mise.toml")
+        return unless File.file?(root_mise)
+
+        result = ensure_include(
+          root_content: File.read(root_mise),
+          task_file_name: DEFAULT_TASK_FILE_NAME,
+          task_file_content: content
+        )
+        File.write(root_mise, result.content) if result.changed
+      rescue Error, SystemCallError => e
+        warn("kettle-family: could not materialize managed mise tasks: #{e.class}: #{e.message}")
+      end
+
+      # Comprehensive managed family mise task suite, generated from family
+      # config facts. Tasks are thin delegations to kettle-family commands,
+      # which resolve changelog targets, local-path env, and members_root
+      # from the family config at run time. The bup/bupb env wiring is the
+      # one piece of shape baked at generation time, derived from the same
+      # config the workflow uses (family.local_path_env,
+      # release.disable_local_path_env, family.mode, family.members_root).
+      class ManagedSuite
+        TASK_DESCRIPTIONS = {
+          "test" => "Run each member gem suite with its own bundle",
+          "lint" => "Run read-only lint checks across family members",
+          "state" => "Report release state for every family member",
+          "release-state" => "Report changelog release state for every family member",
+          "template" => "Apply kettle-jem templates across family members",
+          "bump" => "Bump member gem versions",
+          "changelog" => "Add a structured entry to the family changelog",
+          "bup" => "Update dependencies and commit lockfiles; pass gems or options after --",
+          "bupb" => "Install latest stable Bundler and update family lockfiles; pass options after --",
+          "update-bundler" => "Install latest stable Bundler and update family lockfiles; pass options after --"
+        }.freeze
+
+        attr_reader :config
+
+        def initialize(config)
+          @config = config
+        end
+
+        def content
+          tasks = {
+            "test" => "bundle exec kettle-family test --execute",
+            "lint" => "bundle exec kettle-family lint",
+            "state" => "bundle exec kettle-family release-state",
+            "release-state" => "bundle exec kettle-family release-state",
+            "template" => "bundle exec kettle-family template",
+            "bump" => "bundle exec kettle-family bump --execute",
+            # Targeting is resolved by kettle-family from the family config:
+            # shared-changelog families write the root changelog, member-local
+            # families write each member's own.
+            "changelog" => "bundle exec kettle-family add-changelog --execute"
+          }
+          tasks["bup"] = "bundle exec kettle-family bup --execute --commit"
+          tasks["bupb"] = "bundle exec kettle-family update-bundler --execute --commit"
+          tasks["update-bundler"] = tasks["bupb"]
+
+          neutral = neutralize_assignments
+          wiring = env_wiring_flags
+          %w[bup bupb].each do |name|
+            prefix = neutral.empty? ? "" : "env #{neutral} -- "
+            tasks[name] = "#{prefix}#{tasks[name]}#{wiring}"
+          end
+          tasks["update-bundler"] = tasks["bupb"]
+
+          render(tasks)
+        end
+
+        private
+
+        # Neutralize ambient local-path wiring so the command starts from the
+        # family config, then hand kettle-family the intended overrides.
+        def neutralize_assignments
+          pairs = {}
+          if (name = config.family_local_path_env_name)
+            pairs[name] = "false"
+          end
+          config.release_disable_local_path_env.each { |name| pairs[name] = "false" }
+          pairs.map { |name, value| "#{name}=#{value}" }.join(" ")
+        end
+
+        def env_wiring_flags
+          flags = +""
+          return flags unless config.family_mode == "monorepo"
+          return flags unless (relative = members_root_relative)
+
+          if (name = config.family_local_path_env_name)
+            flags << " --env #{name}={{config_root}}/#{relative}"
+          end
+          flags << " --env K_JEM_TEMPLATING=true"
+          flags
+        end
+
+        def members_root_relative
+          require "pathname"
+          Pathname.new(config.members_root.to_s)
+            .relative_path_from(Pathname.new(config.root.to_s)).to_s
+        rescue ArgumentError
+          nil
+        end
+
+        def render(tasks)
+          out = +<<~HEADER
+            # kettle-family managed family mise tasks
+            #
+            # This file is owned by kettle-family and is overwritten on
+            # template updates (and on kettle-jem templating runs for this
+            # family). It uses the mise-task schema: each top-level table is a
+            # task, addressable from the destination root mise.toml via
+            # [task_config] includes.
+            #
+            # Family-specific tasks (for example a release task with the
+            # family's publish flags and secrets provider) belong in the root
+            # mise.toml, where they shadow the managed definitions.
+          HEADER
+          tasks.each do |name, run|
+            out << "\n[#{name}]\n"
+            out << "description = #{TASK_DESCRIPTIONS.fetch(name).inspect}\n"
+            out << "raw = true\n"
+            out << "run = #{run.inspect}\n"
+          end
+          out
+        end
+      end
     end
   end
 end

data/lib/kettle/family/version.rb

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

data/lib/kettle/family/workflow.rb

@@ -3919,15 +3919,17 @@ module Kettle
         local_kettle_dev_gemfile = local_kettle_dev_gemfile_path(local_kettle_dev)
         return local_kettle_dev_gemfile if local_kettle_dev_gemfile
 
-        # Release mode: do NOT hand the member child the family-root dev
-        # bundle. That bundle resolves the family's own members, which are
-        # unreleased by definition while any member is being released — a
-        # released-only child bundle cannot materialize it (observed:
-        # "Could not find kettle-family-1.3.9 ... in locally installed gems"
-        # killed every member's kettle-release). Without BUNDLE_GEMFILE the
-        # child resolves kettle-release from its own released dependency.
-        return nil unless local_path_env_value?(local_kettle_dev)
-
+        # Execute the release tool from the family root bundle. Each family
+        # has a Gemfile and must be allowed to version-manage its release
+        # tooling there. The member child worktree lockfile is NOT
+        # authoritative for the release tool itself: a stale member lock
+        # resolves an ancient kettle-release whose fixes can never load
+        # (observed: a member lock pinning kettle-dev 3.1.16 and
+        # kettle-family 1.3.11 meant 3.1.17's task-lockfile materialization
+        # never ran, and the build then died with "Could not find
+        # kettle-family-1.3.13 in locally installed gems"). The child env
+        # disables the family's local-path toggles, so the family root
+        # Gemfile resolves its registry declarations — released gems only.
         family_gemfile = File.join(config.root, "Gemfile")
         family_gemfile if File.file?(family_gemfile)
       end

data/lib/kettle/family.rb

@@ -42,5 +42,17 @@ require_relative "family/version"
 module Kettle
   module Family
     class Error < StandardError; end
+
+    # kettle-jem plugin registration (kettle-jem-appraisals pattern). The gem
+    # name "kettle-family" resolves to this module as the plugin handle, and
+    # kettle-jem calls +register_kettle_jem_plugin(registrar)+ on it when the
+    # family opts in via `plugins: [kettle-family]` in its kettle-jem config.
+    module_function
+
+    def register_kettle_jem_plugin(registrar)
+      registrar.on_phase("remaining_files", timing: :after) do |context:|
+        MiseTasks.materialize_managed_suite(context: context)
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 1.3.18
+  version: 1.3.22
 platform: ruby
 authors:
 - Peter H. Boling
@@ -134,7 +134,7 @@ dependencies:
         version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.16
+        version: 3.1.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -144,7 +144,7 @@ dependencies:
         version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.16
+        version: 3.1.18
 - !ruby/object:Gem::Dependency
   name: kettle-gha-pins
   requirement: !ruby/object:Gem::Requirement
@@ -567,10 +567,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.3.18
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.3.18/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.3.22
+  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.3.22/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.3.18
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.3.22
   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