kettle-family 1.2.23 → 1.2.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7444a3d6ecfad0866aae1d481043a9daebb360a185d628ffff7250dc46d8cf4
-  data.tar.gz: dbfa71d55c722830254b219d60b98e330918fc853e5d76f026c90e1b6929d971
+  metadata.gz: 02340a086bd67eddf799fba2205032d161ee089ed7bf9f8b093da0feea777d76
+  data.tar.gz: 81510157e19abba881846f840031eaac469b179bed0c694213e6d4d6ddbe4fb2
 SHA512:
-  metadata.gz: a10e4a4db9fe4bc4769c45757a93767286b19de7657b09b4e6cac32877510f5a46342c9a566dd35776d3ed26ac91e4b7c688deaf646107e8d162873331ed64de
-  data.tar.gz: dbb1cab4664586a13210038ac5e48a8fb8be2b7e5ec6022cc516f40f58da2c9587c7f3d884b6acc31c7afd89fc01b4b1e9d15b8296bff2986e037b9d5474f6c7
+  metadata.gz: 64446564bbc1e08eecad5f27bb3a31e6c81a781220e5ecb8b91a557621f656e7cae2187e03771656aa382e1793f7218f954b42a93281cbd7d3e3cb67c71a6ea2
+  data.tar.gz: 3da0f1d81b73649ecd3ab77ab5789b0407be5748584a4003907afc67bd6bc935e2cf597dc94c3c4aab7338cb4cceea86bbe0cfb3694895651536ed5263143a21

data/CHANGELOG.md

@@ -30,6 +30,27 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.2.24] - 2026-08-03
+
+- TAG: [v1.2.24][1.2.24t]
+- COVERAGE: 93.93% -- 4691/4994 lines in 31 files
+- BRANCH COVERAGE: 76.50% -- 1839/2404 branches in 31 files
+- 29.31% documented
+
+### Fixed
+
+- Preserve explicit local dependency paths during template dependency bootstrap.
+
+- Roll back failed member template output before restoring an autostash.
+
+- Pass checksum-validation overrides through template command execution.
+
+- Repair stale nomono floors in existing local modular Gemfiles before templating bootstrap Bundler evaluation.
+
+- Preserve explicit family-local dependency paths while bootstrapping template dependencies.
+
+- Serialize template waves for members that share a Git checkout.
+
 ## [1.2.23] - 2026-08-02
 
 - TAG: [v1.2.23][1.2.23t]
@@ -1660,7 +1681,9 @@ 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.23...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.2.24...HEAD
+[1.2.24]: https://github.com/kettle-dev/kettle-family/compare/v1.2.23...v1.2.24
+[1.2.24t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.24
 [1.2.23]: https://github.com/kettle-dev/kettle-family/compare/v1.2.22...v1.2.23
 [1.2.23t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.23
 [1.2.22]: https://github.com/kettle-dev/kettle-family/compare/v1.2.21...v1.2.22

data/README.md

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

@@ -77,13 +77,52 @@ module Kettle
 
       def gemfile_edits(member)
         gemfile = File.join(member.root, "Gemfile")
-        return [] unless File.file?(gemfile)
+        edits = if File.file?(gemfile)
+          source = File.read(gemfile)
+          parse_result = Kettle::Dev::VersionBump.parse_source(source, gemfile)
+          Kettle::Dev::VersionBump.each_node(parse_result.value).filter_map do |node|
+            nomono_floor_edit(gemfile, source, node)
+          end
+        else
+          []
+        end
+
+        edits + local_gemfile_edits(member)
+      end
+
+      def local_gemfile_edits(member)
+        Dir.glob(File.join(member.root, "gemfiles/modular/**/*_local.gemfile")).sort.flat_map do |path|
+          source = File.read(path)
+          parse_result = Kettle::Dev::VersionBump.parse_source(source, path)
+          Kettle::Dev::VersionBump.each_node(parse_result.value).filter_map do |node|
+            local_nomono_floor_edit(path, source, node)
+          end
+        rescue Prism::ParseError
+          []
+        end
+      end
+
+      def local_nomono_floor_edit(path, source, node)
+        return unless node.is_a?(Prism::LocalVariableWriteNode)
+        return unless node.name == :nomono_activation_requirements
+        return unless node.value.is_a?(Prism::ArrayNode)
 
-        source = File.read(gemfile)
-        parse_result = Kettle::Dev::VersionBump.parse_source(source, gemfile)
-        Kettle::Dev::VersionBump.each_node(parse_result.value).filter_map do |node|
-          nomono_floor_edit(gemfile, source, node)
+        floor_node = node.value.elements.find do |element|
+          element.is_a?(Prism::StringNode) && element.unescaped.start_with?(">= ")
         end
+        return unless floor_node
+
+        current_floor = Gem::Version.new(floor_node.unescaped.sub(/\A>=\s*/, ""))
+        return unless current_floor < latest_version
+
+        replacement = Kettle::Dev::VersionBump.quote_like(floor_node.location.slice, ">= #{latest_version}")
+        Kettle::Dev::VersionBump.file_edit(
+          path,
+          source,
+          floor_node.location.start_offset,
+          floor_node.location.end_offset,
+          replacement
+        )
       end
 
       def nomono_floor_edit(path, source, node)

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

data/lib/kettle/family/workflow.rb

@@ -191,7 +191,8 @@ module Kettle
           end
         end
 
-        checkout_preflight + sync_results + workflow_results + restore_template_autostashes(stashes, runner: runner)
+        rollback_results = rollback_failed_template_worktrees(stashes, workflow_results, runner: runner)
+        checkout_preflight + sync_results + workflow_results + rollback_results + restore_template_autostashes(stashes, runner: runner)
       end
 
       def template_worktree_sync_results(runner:)
@@ -252,6 +253,26 @@ module Kettle
         end
       end
 
+      def rollback_failed_template_worktrees(stashes, workflow_results, runner:)
+        failed_members = workflow_results.reject(&:ok?).map(&:member_name).compact.uniq
+        stashes.filter_map do |stash|
+          member = stash.fetch(:member)
+          next unless failed_members.include?(member.name)
+
+          runner.call(
+            member: member,
+            phase: "template_autostash_rollback",
+            command: [
+              "sh", "-lc",
+              "paths=$(git diff --name-only; git diff --cached --name-only); " \
+                "paths=$(printf '%s\\n' \"$paths\" | sed '/^\\.structuredmerge\\/kettle-jem\\.yml$/d; /^\\.kettle-jem\\.yml$/d' | sort -u); " \
+                "if [ -n \"$paths\" ]; then git restore --source=HEAD --staged --worktree -- $paths; fi; " \
+                "git clean -fd -e .structuredmerge/kettle-jem.yml -e .kettle-jem.yml"
+            ]
+          )
+        end
+      end
+
       def template_generated_lockfile_only_conflict?(member)
         stdout, _stderr, status = Open3.capture3("git", "diff", "--name-only", "--diff-filter=U", chdir: member.root)
         conflicts = stdout.lines.map(&:strip).reject(&:empty?).sort
@@ -450,7 +471,13 @@ module Kettle
         completed = Set.new
         [].tap do |waves|
           until remaining.empty?
-            wave = remaining.select { |member| (member.dependencies & by_name.keys).all? { |name| completed.include?(name) } }
+            ready = remaining.select do |member|
+              (member.dependencies & by_name.keys).all? { |name| completed.include?(name) }
+            end
+            # A Git checkout is a shared mutable transaction boundary. Nested
+            # gems in one checkout must not run kettle-jem concurrently, even
+            # when their dependency graph would otherwise place them together.
+            wave = ready.group_by { |member| git_root_for(member) }.values.map(&:first)
             raise Error, "template dependency wave could not resolve: #{remaining.map(&:name).join(", ")}" if wave.empty?
 
             waves << wave
@@ -532,7 +559,12 @@ module Kettle
       end
 
       def template_bootstrap_dependency_env(member)
-        env = workflow_env.merge(release_lockfile_local_path_env_overrides(member))
+        env = release_lockfile_local_path_env_overrides(member).merge(workflow_env)
+        env.each_key do |key|
+          env[key] = "false" if key.end_with?("_DEV") && !env_overrides.key?(key)
+        end
+        env["K_JEM_TEMPLATING"] = "false"
+        env["BUNDLE_DISABLE_CHECKSUM_VALIDATION"] = "true"
         family_env_name = config.family_local_path_env_name
         env[family_env_name] = "false" if family_env_name && !env_overrides.key?(family_env_name)
         env
@@ -2037,6 +2069,7 @@ module Kettle
         {}.tap do |env|
           env.merge!(workflow_family_local_path_env)
           if command == "template"
+            env["BUNDLE_DISABLE_CHECKSUM_VALIDATION"] = "true"
             env["KETTLE_JEM_TEMPLATE_PROFILE"] = config.template_profile if config.template_profile
             env["KJ_REPOSITORY_TOPOLOGY"] = config.template_repository_topology if config.template_repository_topology
             env["KETTLE_JEM_THREAD_WORKERS"] ||= template_thread_worker_budget.to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 1.2.23
+  version: 1.2.24
 platform: ruby
 authors:
 - Peter H. Boling
@@ -345,10 +345,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.23
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.23/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.2.24
+  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.24/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.23
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.24
   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