From 2e54008a77730de79319d4a97bbdc7314acc3e81 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Tue, 8 Sep 2026 14:16:55 -0400 Subject: [PATCH 001/137] =?UTF-8?q?=F0=9F=90=9B=20Track=20distinct=20templ?= =?UTF-8?q?ate=20maintenance=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kettle-jem/.rubocop_gradual.lock | 2 +- gems/kettle-jem/CHANGELOG.md | 2 + gems/kettle-jem/lib/kettle/jem.rb | 31 +++++ .../lib/kettle/jem/maintenance_changelog.rb | 32 +++-- .../config_metadata_template_spec.rb | 6 +- .../kettle/jem/maintenance_changelog_spec.rb | 117 +++++++++++------- 6 files changed, 128 insertions(+), 62 deletions(-) diff --git a/gems/kettle-jem/.rubocop_gradual.lock b/gems/kettle-jem/.rubocop_gradual.lock index 433b010dd..999300eba 100644 --- a/gems/kettle-jem/.rubocop_gradual.lock +++ b/gems/kettle-jem/.rubocop_gradual.lock @@ -14,7 +14,7 @@ [3, 1, 63, "RSpec/SpecFilePathFormat: Spec path should end with `kettle/jem*Appraisals_and_Gemfile_templating*_spec.rb`.", 2367084249], [3, 29, 35, "RSpec/DescribeMethod: The second argument to describe should be the method being tested. '#instance' or '.class'.", 1539510212] ], - "spec/integration/config_metadata_template_spec.rb:2880665548": [ + "spec/integration/config_metadata_template_spec.rb:2144190883": [ [3, 1, 67, "RSpec/SpecFilePathFormat: Spec path should end with `kettle/jem*configuration_and_metadata_templating*_spec.rb`.", 3610099387], [3, 29, 39, "RSpec/DescribeMethod: The second argument to describe should be the method being tested. '#instance' or '.class'.", 1907259302] ], diff --git a/gems/kettle-jem/CHANGELOG.md b/gems/kettle-jem/CHANGELOG.md index 24d3b94e0..b13210078 100644 --- a/gems/kettle-jem/CHANGELOG.md +++ b/gems/kettle-jem/CHANGELOG.md @@ -28,6 +28,8 @@ Please file a bug if you notice a violation of semantic versioning. ### Fixed +- [kc] kettle-jem/template-file-tracking: Track distinct changed template files across repeated Unreleased template runs. + ### Security ## [7.1.25] - 2026-09-08 diff --git a/gems/kettle-jem/lib/kettle/jem.rb b/gems/kettle-jem/lib/kettle/jem.rb index d2d881a03..3d084172d 100644 --- a/gems/kettle-jem/lib/kettle/jem.rb +++ b/gems/kettle-jem/lib/kettle/jem.rb @@ -2087,6 +2087,7 @@ module TemplateLock VERSION = 1 TEMPLATE_STATE_KEY = "template_state" FILES_KEY = "files" + MAINTENANCE_CHANGELOG_SUBKEY = "maintenance_changelog" module_function @@ -2155,6 +2156,34 @@ def file_record(lock, relative_path) record.is_a?(Hash) ? record : {} end + def maintenance_changelog(lock) + value = lock.dig(TEMPLATE_STATE_KEY, MAINTENANCE_CHANGELOG_SUBKEY) + value.is_a?(Hash) ? value : {} + end + + def maintenance_changelog_paths(project_root:, key:) + state = maintenance_changelog(load(project_root: project_root)) + return unless state.key?(key.to_s) + + Array(state.fetch(key.to_s)).map(&:to_s).uniq.sort + end + + def update_maintenance_changelog_paths(project_root:, key:, paths:) + lock = load(project_root: project_root) + template_state = lock.fetch(TEMPLATE_STATE_KEY, {}).dup + changelog = maintenance_changelog(lock).dup + normalized_paths = Array(paths).map(&:to_s).uniq.sort + return false if changelog[key.to_s] == normalized_paths + + changelog[key.to_s] = normalized_paths + template_state[MAINTENANCE_CHANGELOG_SUBKEY] = changelog + lock[TEMPLATE_STATE_KEY] = template_state + lock["version"] ||= VERSION + lock[FILES_KEY] ||= {} + write(project_root: project_root, lock: lock) + true + end + def build_lock(template_state:, file_records:) { "version" => VERSION, @@ -5206,6 +5235,7 @@ def kettle_jem_state_sync_step(project_root, report) latest_replay = report.dig(:facts, :changelog, :latest_transfer_entry) existing_state = TemplateLock.load(project_root: project_root, config_path: config_path) existing_replay = existing_state.dig(TemplateLock::TEMPLATE_STATE_KEY, TemplateChecksums::CHANGELOG_REPLAY_SUBKEY) + maintenance_changelog = TemplateLock.maintenance_changelog(existing_state) changelog_replay = if latest_replay { TemplateChecksums::LAST_ENTRY_KEY_SUBKEY => latest_replay.fetch(:key), @@ -5218,6 +5248,7 @@ def kettle_jem_state_sync_step(project_root, report) "version" => VERSION, "applied_at" => Time.now.utc.strftime("%Y-%m-%d"), TemplateChecksums::CHANGELOG_REPLAY_SUBKEY => changelog_replay, + TemplateLock::MAINTENANCE_CHANGELOG_SUBKEY => maintenance_changelog, TemplateChecksums::CHECKSUMS_SUBKEY => TemplateChecksums.compute( template_root: template_root_path(project_root, config: kettle_jem_config(project_root)) ) diff --git a/gems/kettle-jem/lib/kettle/jem/maintenance_changelog.rb b/gems/kettle-jem/lib/kettle/jem/maintenance_changelog.rb index a572a4c40..0612484f5 100644 --- a/gems/kettle-jem/lib/kettle/jem/maintenance_changelog.rb +++ b/gems/kettle-jem/lib/kettle/jem/maintenance_changelog.rb @@ -104,14 +104,25 @@ def record_template_run(project_root:, report:, run_options: {}, label: "Apply k end key = TEMPLATE_CHANGELOG_KEYS.fetch(label, "kettle-jem/template") - entry = ->(matches) { template_run_entry(changed_files, matches) } + tracked_paths = nil + entry = lambda do |matches| + existing_paths = matches.empty? ? [] : TemplateLock.maintenance_changelog_paths(project_root: project_root, key: key).to_a + tracked_paths = (existing_paths + changed_files).uniq.sort + template_run_entry(tracked_paths) + end result = upsert_unreleased_entry(project_root: project_root, section: "Changed", key: key, entry: entry) - changelog = result.merge(changed_files: changed_files, entry: result.fetch(:entry)) + state_changed = TemplateLock.update_maintenance_changelog_paths( + project_root: project_root, + key: key, + paths: tracked_paths || changed_files + ) + changelog = result.merge(changed_files: changed_files, tracked_paths: tracked_paths, entry: result.fetch(:entry)) changed_files_with_changelog = if result.fetch(:status) == "updated" (Array(report.fetch(:changed_files, [])) + ["CHANGELOG.md"]).uniq.sort else Array(report.fetch(:changed_files, [])).uniq.sort end + changed_files_with_changelog << KETTLE_LOCK_PATH if state_changed report.merge(changelog: changelog, changed_files: changed_files_with_changelog) end @@ -121,8 +132,8 @@ def template_changed_files(changed_files) end end - def template_run_entry(changed_files, matches) - counts = template_entry_counts(matches) + def template_run_entry(changed_files) + counts = {} changed_files.group_by { |path| template_change_category(path) }.each do |category, paths| counts[category] = counts.fetch(category, 0) + paths.length end @@ -133,19 +144,6 @@ def template_run_entry(changed_files, matches) ["updated #{total} project file#{"s" unless total == 1}:", *details].join("\n") end - def template_entry_counts(matches) - source = Array(matches).first.to_h.fetch(:source, "") - source.lines.filter_map do |line| - match = line.match(/\A\s{2,}- (.+?) \((\d+)\)\s*\z/) - next unless match - - category = match[1].tr(" ", "_").to_sym - next unless TEMPLATE_CHANGE_CATEGORIES.key?(category) || category == :other - - [category, match[2].to_i] - end.to_h - end - def template_change_category(path) TEMPLATE_CHANGE_CATEGORIES.each do |category, matcher| return category if matcher.call(path) diff --git a/gems/kettle-jem/spec/integration/config_metadata_template_spec.rb b/gems/kettle-jem/spec/integration/config_metadata_template_spec.rb index 7b51cbfd9..e9bdaf0c0 100644 --- a/gems/kettle-jem/spec/integration/config_metadata_template_spec.rb +++ b/gems/kettle-jem/spec/integration/config_metadata_template_spec.rb @@ -1857,6 +1857,9 @@ version: 7.1.0 changelog_replay: last_entry_key: kettle-jem-template-20260720-001 + maintenance_changelog: + kettle-jem/template: + - README.md checksums: config.yml.example: old files: {} @@ -1878,7 +1881,8 @@ lock = YAML.safe_load_file(File.join(root, Kettle::Jem::KETTLE_LOCK_PATH)) expect(File).not_to exist(File.join(root, Kettle::Jem::LEGACY_KETTLE_LOCK_PATH)) - expect(lock.fetch("template_state")).to include("changelog_replay", "checksums") + expect(lock.fetch("template_state")).to include("changelog_replay", "maintenance_changelog", "checksums") + expect(lock.dig("template_state", "maintenance_changelog", "kettle-jem/template")).to eq(["README.md"]) expect(apply.fetch(:post_apply_steps).find { |step| step.fetch(:name) == "kettle_jem_state_sync" }).to include( changed_files: include(Kettle::Jem::KETTLE_LOCK_PATH, Kettle::Jem::LEGACY_KETTLE_LOCK_PATH) ) diff --git a/gems/kettle-jem/spec/kettle/jem/maintenance_changelog_spec.rb b/gems/kettle-jem/spec/kettle/jem/maintenance_changelog_spec.rb index db8d79e82..2445cd9fa 100644 --- a/gems/kettle-jem/spec/kettle/jem/maintenance_changelog_spec.rb +++ b/gems/kettle-jem/spec/kettle/jem/maintenance_changelog_spec.rb @@ -114,33 +114,32 @@ end it "records one keyed aggregate entry for actual template changes" do - options = nil - allow(File).to receive(:file?).with("/workspace/example/CHANGELOG.md").and_return(true) - allow(described_class).to receive(:upsert_unreleased_entry) do |**received_options| - options = received_options - {status: "updated", entry: "rendered entry"} - end + Dir.mktmpdir("kettle-jem-maintenance-changelog-entry") do |root| + options = nil + File.write(File.join(root, "CHANGELOG.md"), "# Changelog\n") + allow(described_class).to receive(:upsert_unreleased_entry) do |**received_options| + options = received_options + {status: "updated", entry: "rendered entry"} + end - result = described_class.record_template_run( - project_root: "/workspace/example", - report: report - ) + result = described_class.record_template_run(project_root: root, report: report) - expect(result.fetch(:changelog)).to include(status: "updated") - expect(result.fetch(:changed_files)).to include("CHANGELOG.md") - expect(described_class).to have_received(:upsert_unreleased_entry).with( - project_root: "/workspace/example", - section: "Changed", - key: "kettle-jem/template", - entry: an_instance_of(Proc) - ) - expect(options.fetch(:entry).call([])).to eq(<<~ENTRY.chomp) - updated 4 project files: - - code and tests (1) - - dependencies (1) - - documentation (1) - - workflows (1) - ENTRY + expect(result.fetch(:changelog)).to include(status: "updated") + expect(result.fetch(:changed_files)).to include("CHANGELOG.md") + expect(described_class).to have_received(:upsert_unreleased_entry).with( + project_root: root, + section: "Changed", + key: "kettle-jem/template", + entry: an_instance_of(Proc) + ) + expect(options.fetch(:entry).call([])).to eq(<<~ENTRY.chomp) + updated 4 project files: + - code and tests (1) + - dependencies (1) + - documentation (1) + - workflows (1) + ENTRY + end end it "does not invoke kettle-changelog when only bookkeeping changed" do @@ -194,27 +193,59 @@ expect(described_class).not_to have_received(:upsert_unreleased_entry) end - it "adds later template changes to the existing keyed category totals" do - allow(File).to receive(:file?).with("/workspace/example/CHANGELOG.md").and_return(true) - allow(described_class).to receive(:upsert_unreleased_entry) do |**options| - body = options.fetch(:entry).call([{source: <<~MARKDOWN}]) - - [kc] kettle-jem/template: updated 4 project files: - - dependencies (2) - - documentation (2) - MARKDOWN - {status: "updated", entry: body} + it "tracks distinct files across repeated runs of one Unreleased entry" do + Dir.mktmpdir("kettle-jem-maintenance-changelog-paths") do |root| + File.write(File.join(root, "CHANGELOG.md"), "# Changelog\n") + entries = [] + allow(described_class).to receive(:upsert_unreleased_entry) do |**options| + body = options.fetch(:entry).call(entries.empty? ? [] : [{source: entries.last}]) + entries << body + {status: "updated", entry: body} + end + + described_class.record_template_run( + project_root: root, + report: {changed_files: ["Gemfile", "README.md"]} + ) + result = described_class.record_template_run( + project_root: root, + report: {changed_files: ["Gemfile", "lib/example.rb"]} + ) + + expect(result.fetch(:changelog).fetch(:entry)).to include( + "updated 3 project files:", + "- code and tests (1)", + "- dependencies (1)", + "- documentation (1)" + ) + lock = Kettle::Jem::TemplateLock.load(project_root: root) + expect(lock.dig("template_state", "maintenance_changelog", "kettle-jem/template")).to eq( + ["Gemfile", "README.md", "lib/example.rb"] + ) end + end - result = described_class.record_template_run( - project_root: "/workspace/example", - report: {changed_files: ["Gemfile", "README.md"]} - ) + it "starts a fresh path set after the keyed Unreleased entry is removed" do + Dir.mktmpdir("kettle-jem-maintenance-changelog-reset") do |root| + File.write(File.join(root, "CHANGELOG.md"), "# Changelog\n") + Kettle::Jem::TemplateLock.update_maintenance_changelog_paths( + project_root: root, + key: "kettle-jem/template", + paths: ["Gemfile", "README.md"] + ) + allow(described_class).to receive(:upsert_unreleased_entry) do |**options| + {status: "updated", entry: options.fetch(:entry).call([])} + end - expect(result.fetch(:changelog).fetch(:entry)).to include( - "updated 6 project files:", - "- dependencies (3)", - "- documentation (3)" - ) + result = described_class.record_template_run( + project_root: root, + report: {changed_files: ["lib/example.rb"]} + ) + + expect(result.fetch(:changelog).fetch(:entry)).to include("updated 1 project file:") + lock = Kettle::Jem::TemplateLock.load(project_root: root) + expect(lock.dig("template_state", "maintenance_changelog", "kettle-jem/template")).to eq(["lib/example.rb"]) + end end end end From 38192c36151e00ef63405a1570fd710e5303737f Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Tue, 8 Sep 2026 18:46:06 -0400 Subject: [PATCH 002/137] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrade=20deps?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr-markdown-markly/Gemfile.lock | 450 ++++------------ gems/ast-crispr-ruby-prism/Gemfile.lock | 452 ++++------------ gems/ast-crispr/Gemfile.lock | 450 ++++------------ gems/ast-merge-git/Gemfile.lock | 490 ++++++------------ gems/ast-merge/Gemfile.lock | 450 ++++------------ gems/ast-template/Gemfile.lock | 457 +++++----------- gems/bash-merge/Gemfile.lock | 452 ++++------------ gems/binary-merge/Gemfile.lock | 453 +++++----------- gems/citrus-toml-merge/Gemfile.lock | 448 ++++------------ gems/commonmarker-merge/Gemfile.lock | 450 ++++------------ gems/dotenv-merge/Gemfile.lock | 448 ++++------------ gems/go-merge/Gemfile.lock | 453 +++++----------- gems/json-merge/Gemfile.lock | 450 ++++------------ gems/kettle-jem/Gemfile.lock | 167 +----- gems/kramdown-merge/Gemfile.lock | 450 ++++------------ gems/markdown-merge/Gemfile.lock | 450 ++++------------ gems/markly-merge/Gemfile.lock | 450 ++++------------ gems/parslet-toml-merge/Gemfile.lock | 451 +++++----------- gems/plain-merge/Gemfile.lock | 450 ++++------------ gems/prism-merge/Gemfile.lock | 446 ++++------------ gems/psych-merge/Gemfile.lock | 448 ++++------------ gems/rbs-merge/Gemfile.lock | 448 ++++------------ gems/ruby-merge/Gemfile.lock | 450 ++++------------ gems/rust-merge/Gemfile.lock | 453 +++++----------- gems/smorg-rb/Gemfile.lock | 450 +++++----------- gems/toml-merge/Gemfile.lock | 450 ++++------------ .../spec/fixtures_integration_spec.rb | 2 +- gems/tree_haver/Gemfile.lock | 445 ++++------------ gems/typescript-merge/Gemfile.lock | 453 +++++----------- gems/yaml-merge/Gemfile.lock | 450 ++++------------ gems/zip-merge/Gemfile.lock | 452 +++++----------- 31 files changed, 3437 insertions(+), 9831 deletions(-) diff --git a/gems/ast-crispr-markdown-markly/Gemfile.lock b/gems/ast-crispr-markdown-markly/Gemfile.lock index e3bcdd05a..9b2ecc2c8 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile.lock +++ b/gems/ast-crispr-markdown-markly/Gemfile.lock @@ -16,295 +16,6 @@ PATH markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.8) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge - specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.8) - toml (~> 0.3) - toml-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) - diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) - kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - GEM remote: https://gem.coop/ specs: @@ -322,7 +33,24 @@ GEM rubocop (>= 1.0) version_gem (~> 1.1, >= 1.1.15) ast (2.4.3) + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) + ast-crispr-ruby-prism (7.1.8) + ast-crispr (= 7.1.8) + prism-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + ast-merge (7.1.8) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) backports (3.25.3) + bash-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -330,6 +58,11 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -342,6 +75,10 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -355,6 +92,11 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -404,6 +146,10 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) @@ -416,8 +162,6 @@ GEM kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-drift (1.0.13) - version_gem (~> 1.1, >= 1.1.15) kettle-family (1.2.97) command_kit (~> 0.6) command_kit-completion (~> 0.1) @@ -434,6 +178,36 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) kettle-rb (0.1.11) @@ -459,12 +233,24 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) markly (0.17.0) + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -492,13 +278,28 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -507,6 +308,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -631,6 +437,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -691,11 +501,18 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -724,6 +541,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -761,49 +582,26 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) - ast-crispr! ast-crispr-markdown-markly! - ast-crispr-ruby-prism! - ast-merge! - ast-merge-git! - ast-template! - bash-merge! benchmark (~> 0.5, >= 0.5.0) - binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) - go-merge! - html-merge! irb (~> 1.17) - json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) - kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) - kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -813,20 +611,13 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) - toml-merge! - tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) - typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) - yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -834,7 +625,6 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -847,13 +637,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -891,16 +678,13 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) @@ -933,7 +717,6 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -986,7 +769,6 @@ CHECKSUMS ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +776,6 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,7 +791,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -1023,7 +803,6 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -1037,7 +816,6 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ast-crispr-ruby-prism/Gemfile.lock b/gems/ast-crispr-ruby-prism/Gemfile.lock index 377717ebc..5d0211dc0 100644 --- a/gems/ast-crispr-ruby-prism/Gemfile.lock +++ b/gems/ast-crispr-ruby-prism/Gemfile.lock @@ -15,296 +15,6 @@ PATH prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.8) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge - specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.8) - toml (~> 0.3) - toml-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) - diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) - kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - GEM remote: https://gem.coop/ specs: @@ -322,7 +32,25 @@ GEM rubocop (>= 1.0) version_gem (~> 1.1, >= 1.1.15) ast (2.4.3) + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) + ast-crispr-markdown-markly (7.1.8) + ast-crispr (= 7.1.8) + markdown-merge (= 7.1.8) + markly-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + ast-merge (7.1.8) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) backports (3.25.3) + bash-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -330,6 +58,11 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -342,6 +75,10 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -355,6 +92,11 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -404,6 +146,10 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) @@ -416,8 +162,6 @@ GEM kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-drift (1.0.13) - version_gem (~> 1.1, >= 1.1.15) kettle-family (1.2.97) command_kit (~> 0.6) command_kit-completion (~> 0.1) @@ -434,6 +178,36 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) kettle-rb (0.1.11) @@ -459,12 +233,24 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) markly (0.17.0) + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -492,13 +278,28 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -507,6 +308,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -631,6 +437,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -691,11 +501,18 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -724,6 +541,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -761,49 +582,26 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) - ast-crispr! - ast-crispr-markdown-markly! ast-crispr-ruby-prism! - ast-merge! - ast-merge-git! - ast-template! - bash-merge! benchmark (~> 0.5, >= 0.5.0) - binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) - go-merge! - html-merge! irb (~> 1.17) - json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) - kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) - kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -813,20 +611,13 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) - toml-merge! - tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) - typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) - yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -834,7 +625,6 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -847,13 +637,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -891,16 +678,13 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) @@ -933,7 +717,6 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -986,7 +769,6 @@ CHECKSUMS ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +776,6 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,7 +791,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -1023,7 +803,6 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -1037,7 +816,6 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ast-crispr/Gemfile.lock b/gems/ast-crispr/Gemfile.lock index 11ee1aa41..ae0745758 100644 --- a/gems/ast-crispr/Gemfile.lock +++ b/gems/ast-crispr/Gemfile.lock @@ -15,314 +15,42 @@ PATH service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.15) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly +GEM + remote: https://gem.coop/ specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: + backports (3.25.3) bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge - specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.8) - toml (~> 0.3) - toml-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) - diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) - kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -GEM - remote: https://gem.coop/ - specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -330,6 +58,11 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -342,6 +75,10 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -355,6 +92,11 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -404,6 +146,10 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) @@ -416,8 +162,6 @@ GEM kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-drift (1.0.13) - version_gem (~> 1.1, >= 1.1.15) kettle-family (1.2.97) command_kit (~> 0.6) command_kit-completion (~> 0.1) @@ -434,6 +178,36 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) kettle-rb (0.1.11) @@ -459,12 +233,24 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) markly (0.17.0) + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -492,13 +278,28 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -507,6 +308,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -631,6 +437,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -691,11 +501,18 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -724,6 +541,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -762,48 +583,25 @@ DEPENDENCIES appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) ast-crispr! - ast-crispr-markdown-markly! - ast-crispr-ruby-prism! - ast-merge! - ast-merge-git! - ast-template! - bash-merge! benchmark (~> 0.5, >= 0.5.0) - binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) - go-merge! - html-merge! irb (~> 1.17) - json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) - kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) - kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -813,20 +611,13 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) - toml-merge! - tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) - typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) - yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -834,7 +625,6 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -847,13 +637,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -891,16 +678,13 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) @@ -933,7 +717,6 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -986,7 +769,6 @@ CHECKSUMS ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +776,6 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,7 +791,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -1023,7 +803,6 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -1037,7 +816,6 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ast-merge-git/Gemfile.lock b/gems/ast-merge-git/Gemfile.lock index 7a46aa945..6e477add2 100644 --- a/gems/ast-merge-git/Gemfile.lock +++ b/gems/ast-merge-git/Gemfile.lock @@ -15,321 +15,62 @@ PATH tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly +GEM + remote: https://gem.coop/ specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: + backports (3.25.3) bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: + benchmark (0.5.0) + bigdecimal (4.1.2) binary-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge - specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.8) - toml (~> 0.3) - toml-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) - diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) - kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -GEM - remote: https://gem.coop/ - specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - backports (3.25.3) - benchmark (0.5.0) - bigdecimal (4.1.2) bundler-audit (0.9.3) bundler (>= 1.2.0) thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -342,6 +83,10 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -355,6 +100,11 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -392,11 +142,20 @@ GEM geom2d (0.4.1) gitmoji-regex (2.0.12) version_gem (~> 1.1, >= 1.1.15) + go-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) hexapdf (1.10.0) cmdparse (~> 3.0, >= 3.0.3) geom2d (~> 0.4, >= 0.4.1) openssl (>= 2.2.1) strscan (>= 3.1.2) + html-merge (7.1.8) + ast-crispr (= 7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) io-console (0.9.2) irb (1.18.0) pp (>= 0.6.0) @@ -404,6 +163,10 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) @@ -416,8 +179,6 @@ GEM kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-drift (1.0.13) - version_gem (~> 1.1, >= 1.1.15) kettle-family (1.2.97) command_kit (~> 0.6) command_kit-completion (~> 0.1) @@ -434,6 +195,36 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) kettle-rb (0.1.11) @@ -459,12 +250,24 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) markly (0.17.0) + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -492,13 +295,32 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) + parslet-toml-merge (7.1.8) + toml (~> 0.3) + toml-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -507,6 +329,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -631,9 +458,17 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + rust-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) service_actor (3.9.4) zeitwerk (>= 1.0) silent_stream (1.0.12) @@ -693,9 +528,18 @@ GEM version_gem (~> 1.1, >= 1.1.15) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -716,6 +560,10 @@ GEM parallel_tests (>= 3.3.0, < 6) rspec (>= 3.10) version_gem (~> 1.1, >= 1.1.15) + typescript-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) unicode-display_width (2.6.0) version_gem (1.1.15) webrick (1.9.2) @@ -724,6 +572,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -745,6 +597,10 @@ GEM version_gem (~> 1.1, >= 1.1.15) yaml-converter (~> 0.2) zeitwerk (2.8.3) + zip-merge (7.1.8) + binary-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) zlib (3.2.3) PLATFORMS @@ -761,49 +617,42 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) - ast-crispr! - ast-crispr-markdown-markly! - ast-crispr-ruby-prism! - ast-merge! ast-merge-git! - ast-template! - bash-merge! + bash-merge (~> 7.1, >= 7.1.4) benchmark (~> 0.5, >= 0.5.0) - binary-merge! + binary-merge (~> 7.1, >= 7.1.4) bundler-audit (~> 0.9.3) cgi (~> 0.5) - citrus-toml-merge! - commonmarker-merge! + citrus-toml-merge (~> 7.1, >= 7.1.4) + commonmarker-merge (~> 7.1, >= 7.1.4) debug (>= 1.1) - dotenv-merge! + dotenv-merge (~> 7.1, >= 7.1.4) erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) - go-merge! - html-merge! + go-merge (~> 7.1, >= 7.1.4) + html-merge (~> 7.1, >= 7.1.4) irb (~> 1.17) - json-merge! + json-merge (~> 7.1, >= 7.1.4) kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) - kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) - kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) - kramdown-merge! + kramdown-merge (~> 7.1, >= 7.1.4) kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! + markdown-merge (~> 7.1, >= 7.1.4) + markly-merge (~> 7.1, >= 7.1.4) mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! + parslet-toml-merge (~> 7.1, >= 7.1.4) + plain-merge (~> 7.1, >= 7.1.4) + prism-merge (~> 7.1, >= 7.1.4) + psych-merge (~> 7.1, >= 7.1.4) rake (~> 13.0) rbs (>= 3.0) - rbs-merge! + rbs-merge (~> 7.1, >= 7.1.4) reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -813,20 +662,18 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) - ruby-merge! + ruby-merge (~> 7.1, >= 7.1.4) ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! + rust-merge (~> 7.1, >= 7.1.4) standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) - toml-merge! - tree_haver! + toml-merge (~> 7.1, >= 7.1.4) turbo_tests2 (~> 3.2, >= 3.2.7) - typescript-merge! + typescript-merge (~> 7.1, >= 7.1.4) webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) - yaml-merge! + yaml-merge (~> 7.1, >= 7.1.4) yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -834,7 +681,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) - zip-merge! + zip-merge (~> 7.1, >= 7.1.4) CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -848,7 +695,6 @@ CHECKSUMS ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) ast-merge-git (7.1.8) - ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c @@ -900,7 +746,6 @@ CHECKSUMS json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) @@ -994,7 +839,6 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b diff --git a/gems/ast-merge/Gemfile.lock b/gems/ast-merge/Gemfile.lock index a21124610..44a919206 100644 --- a/gems/ast-merge/Gemfile.lock +++ b/gems/ast-merge/Gemfile.lock @@ -16,295 +16,6 @@ PATH tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge - specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.8) - toml (~> 0.3) - toml-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) - diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) - kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - GEM remote: https://gem.coop/ specs: @@ -322,7 +33,24 @@ GEM rubocop (>= 1.0) version_gem (~> 1.1, >= 1.1.15) ast (2.4.3) + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) + ast-crispr-markdown-markly (7.1.8) + ast-crispr (= 7.1.8) + markdown-merge (= 7.1.8) + markly-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + ast-crispr-ruby-prism (7.1.8) + ast-crispr (= 7.1.8) + prism-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) backports (3.25.3) + bash-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -330,6 +58,11 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -342,6 +75,10 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -355,6 +92,11 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -404,6 +146,10 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) @@ -416,8 +162,6 @@ GEM kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-drift (1.0.13) - version_gem (~> 1.1, >= 1.1.15) kettle-family (1.2.97) command_kit (~> 0.6) command_kit-completion (~> 0.1) @@ -434,6 +178,36 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) kettle-rb (0.1.11) @@ -459,12 +233,24 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) markly (0.17.0) + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -492,13 +278,28 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -507,6 +308,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -631,6 +437,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -691,11 +501,18 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -724,6 +541,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -761,49 +582,26 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) - ast-crispr! - ast-crispr-markdown-markly! - ast-crispr-ruby-prism! ast-merge! - ast-merge-git! - ast-template! - bash-merge! benchmark (~> 0.5, >= 0.5.0) - binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) - go-merge! - html-merge! irb (~> 1.17) - json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) - kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) - kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -813,20 +611,13 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) - toml-merge! - tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) - typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) - yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -834,7 +625,6 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -847,13 +637,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -891,16 +678,13 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) @@ -933,7 +717,6 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -986,7 +769,6 @@ CHECKSUMS ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +776,6 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,7 +791,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -1023,7 +803,6 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -1037,7 +816,6 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ast-template/Gemfile.lock b/gems/ast-template/Gemfile.lock index 8b2d06206..eca742d23 100644 --- a/gems/ast-template/Gemfile.lock +++ b/gems/ast-template/Gemfile.lock @@ -14,315 +14,46 @@ PATH ast-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly +GEM + remote: https://gem.coop/ specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: + backports (3.25.3) bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge - specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.8) - toml (~> 0.3) - toml-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) - diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) - kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -GEM - remote: https://gem.coop/ - specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -330,6 +61,11 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -342,6 +78,10 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -355,6 +95,11 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -404,6 +149,10 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) @@ -416,8 +165,6 @@ GEM kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-drift (1.0.13) - version_gem (~> 1.1, >= 1.1.15) kettle-family (1.2.97) command_kit (~> 0.6) command_kit-completion (~> 0.1) @@ -434,6 +181,36 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) kettle-rb (0.1.11) @@ -459,12 +236,24 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) markly (0.17.0) + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -492,13 +281,28 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -507,6 +311,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -631,6 +440,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -691,11 +504,18 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -724,6 +544,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -761,49 +585,28 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) - ast-crispr! - ast-crispr-markdown-markly! - ast-crispr-ruby-prism! - ast-merge! - ast-merge-git! ast-template! - bash-merge! benchmark (~> 0.5, >= 0.5.0) - binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) - go-merge! - html-merge! irb (~> 1.17) - json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) - kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) - kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! + markly-merge (~> 7.1, >= 7.1.0) mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! + prism-merge (~> 7.1, >= 7.1.0) rake (~> 13.0) rbs (>= 3.0) - rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -813,20 +616,14 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) - toml-merge! - tree_haver! + toml-merge (~> 7.1, >= 7.1.0) turbo_tests2 (~> 3.2, >= 3.2.7) - typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) - yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -834,7 +631,6 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -847,13 +643,11 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) - ast-merge-git (7.1.8) ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -891,16 +685,13 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) @@ -933,7 +724,6 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -986,7 +776,6 @@ CHECKSUMS ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +783,6 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,7 +798,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -1023,7 +810,6 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -1037,7 +823,6 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/bash-merge/Gemfile.lock b/gems/bash-merge/Gemfile.lock index 4b97ce078..d71c5a56a 100644 --- a/gems/bash-merge/Gemfile.lock +++ b/gems/bash-merge/Gemfile.lock @@ -15,296 +15,6 @@ PATH tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.8) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge - specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.8) - toml (~> 0.3) - toml-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) - diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) - kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - GEM remote: https://gem.coop/ specs: @@ -322,6 +32,24 @@ GEM rubocop (>= 1.0) version_gem (~> 1.1, >= 1.1.15) ast (2.4.3) + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) + ast-crispr-markdown-markly (7.1.8) + ast-crispr (= 7.1.8) + markdown-merge (= 7.1.8) + markly-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + ast-crispr-ruby-prism (7.1.8) + ast-crispr (= 7.1.8) + prism-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + ast-merge (7.1.8) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -330,6 +58,11 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -342,6 +75,10 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -355,6 +92,11 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -404,6 +146,10 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) @@ -416,8 +162,6 @@ GEM kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-drift (1.0.13) - version_gem (~> 1.1, >= 1.1.15) kettle-family (1.2.97) command_kit (~> 0.6) command_kit-completion (~> 0.1) @@ -434,6 +178,36 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) kettle-rb (0.1.11) @@ -459,12 +233,24 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) markly (0.17.0) + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -492,13 +278,28 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -507,6 +308,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -631,6 +437,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -691,11 +501,18 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -724,6 +541,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -761,49 +582,26 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) - ast-crispr! - ast-crispr-markdown-markly! - ast-crispr-ruby-prism! - ast-merge! - ast-merge-git! - ast-template! bash-merge! benchmark (~> 0.5, >= 0.5.0) - binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) - go-merge! - html-merge! irb (~> 1.17) - json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) - kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) - kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -813,20 +611,13 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) - toml-merge! - tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) - typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) - yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -834,7 +625,6 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -847,13 +637,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -891,16 +678,13 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) @@ -933,7 +717,6 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -986,7 +769,6 @@ CHECKSUMS ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +776,6 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,7 +791,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -1023,7 +803,6 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -1037,7 +816,6 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/binary-merge/Gemfile.lock b/gems/binary-merge/Gemfile.lock index 13d8193da..99a557ccf 100644 --- a/gems/binary-merge/Gemfile.lock +++ b/gems/binary-merge/Gemfile.lock @@ -15,314 +15,46 @@ PATH tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly +GEM + remote: https://gem.coop/ specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: + backports (3.25.3) bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge - specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.8) - toml (~> 0.3) - toml-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) - diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) - kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -GEM - remote: https://gem.coop/ - specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -330,6 +62,11 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -342,6 +79,10 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -355,6 +96,11 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -404,6 +150,10 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) @@ -416,8 +166,6 @@ GEM kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-drift (1.0.13) - version_gem (~> 1.1, >= 1.1.15) kettle-family (1.2.97) command_kit (~> 0.6) command_kit-completion (~> 0.1) @@ -434,6 +182,36 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) kettle-rb (0.1.11) @@ -459,12 +237,24 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) markly (0.17.0) + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -492,13 +282,28 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -507,6 +312,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -631,6 +441,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -691,11 +505,18 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -724,6 +545,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -761,49 +586,26 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) - ast-crispr! - ast-crispr-markdown-markly! - ast-crispr-ruby-prism! - ast-merge! - ast-merge-git! - ast-template! - bash-merge! benchmark (~> 0.5, >= 0.5.0) binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) - go-merge! - html-merge! irb (~> 1.17) - json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) - kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) - kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -813,20 +615,13 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) - toml-merge! - tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) - typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) - yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -834,7 +629,6 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -847,8 +641,6 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c @@ -891,16 +683,13 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) @@ -933,7 +722,6 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -986,7 +774,6 @@ CHECKSUMS ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +781,6 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,7 +796,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -1023,7 +808,6 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -1037,7 +821,6 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/citrus-toml-merge/Gemfile.lock b/gems/citrus-toml-merge/Gemfile.lock index 8f00698e0..b6365c153 100644 --- a/gems/citrus-toml-merge/Gemfile.lock +++ b/gems/citrus-toml-merge/Gemfile.lock @@ -16,313 +16,46 @@ PATH toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly +GEM + remote: https://gem.coop/ specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: + backports (3.25.3) bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge - specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.8) - toml (~> 0.3) - toml-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) - diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) - kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -GEM - remote: https://gem.coop/ - specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -342,6 +75,10 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -355,6 +92,11 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -404,6 +146,10 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) @@ -416,8 +162,6 @@ GEM kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-drift (1.0.13) - version_gem (~> 1.1, >= 1.1.15) kettle-family (1.2.97) command_kit (~> 0.6) command_kit-completion (~> 0.1) @@ -434,6 +178,36 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) kettle-rb (0.1.11) @@ -459,12 +233,24 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) markly (0.17.0) + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -492,13 +278,28 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -507,6 +308,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -631,6 +437,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -691,11 +501,18 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -724,6 +541,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -761,49 +582,26 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) - ast-crispr! - ast-crispr-markdown-markly! - ast-crispr-ruby-prism! - ast-merge! - ast-merge-git! - ast-template! - bash-merge! benchmark (~> 0.5, >= 0.5.0) - binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) - go-merge! - html-merge! irb (~> 1.17) - json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) - kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) - kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -813,20 +611,13 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) - toml-merge! - tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) - typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) - yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -834,7 +625,6 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -847,13 +637,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -891,16 +678,13 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) @@ -933,7 +717,6 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -986,7 +769,6 @@ CHECKSUMS ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +776,6 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,7 +791,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -1023,7 +803,6 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -1037,7 +816,6 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/commonmarker-merge/Gemfile.lock b/gems/commonmarker-merge/Gemfile.lock index 889079f10..7a995983a 100644 --- a/gems/commonmarker-merge/Gemfile.lock +++ b/gems/commonmarker-merge/Gemfile.lock @@ -15,314 +15,46 @@ PATH markdown-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly +GEM + remote: https://gem.coop/ specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: + backports (3.25.3) bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge - specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.8) - toml (~> 0.3) - toml-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) - diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) - kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -GEM - remote: https://gem.coop/ - specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -330,6 +62,11 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -355,6 +92,11 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -404,6 +146,10 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) @@ -416,8 +162,6 @@ GEM kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-drift (1.0.13) - version_gem (~> 1.1, >= 1.1.15) kettle-family (1.2.97) command_kit (~> 0.6) command_kit-completion (~> 0.1) @@ -434,6 +178,36 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) kettle-rb (0.1.11) @@ -459,12 +233,24 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) markly (0.17.0) + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -492,13 +278,28 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -507,6 +308,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -631,6 +437,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -691,11 +501,18 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -724,6 +541,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -761,49 +582,26 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) - ast-crispr! - ast-crispr-markdown-markly! - ast-crispr-ruby-prism! - ast-merge! - ast-merge-git! - ast-template! - bash-merge! benchmark (~> 0.5, >= 0.5.0) - binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) - citrus-toml-merge! commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) - go-merge! - html-merge! irb (~> 1.17) - json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) - kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) - kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -813,20 +611,13 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) - toml-merge! - tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) - typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) - yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -834,7 +625,6 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -847,13 +637,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -891,16 +678,13 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) @@ -933,7 +717,6 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -986,7 +769,6 @@ CHECKSUMS ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +776,6 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,7 +791,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -1023,7 +803,6 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -1037,7 +816,6 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/dotenv-merge/Gemfile.lock b/gems/dotenv-merge/Gemfile.lock index 5236620da..ef956112b 100644 --- a/gems/dotenv-merge/Gemfile.lock +++ b/gems/dotenv-merge/Gemfile.lock @@ -16,313 +16,46 @@ PATH tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly +GEM + remote: https://gem.coop/ specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: + backports (3.25.3) bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge - specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.8) - toml (~> 0.3) - toml-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) - diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) - kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -GEM - remote: https://gem.coop/ - specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -330,6 +63,11 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -342,6 +80,10 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -404,6 +146,10 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) @@ -416,8 +162,6 @@ GEM kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-drift (1.0.13) - version_gem (~> 1.1, >= 1.1.15) kettle-family (1.2.97) command_kit (~> 0.6) command_kit-completion (~> 0.1) @@ -434,6 +178,36 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) kettle-rb (0.1.11) @@ -459,12 +233,24 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) markly (0.17.0) + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -492,13 +278,28 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -507,6 +308,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -631,6 +437,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -691,11 +501,18 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -724,6 +541,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -761,49 +582,26 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) - ast-crispr! - ast-crispr-markdown-markly! - ast-crispr-ruby-prism! - ast-merge! - ast-merge-git! - ast-template! - bash-merge! benchmark (~> 0.5, >= 0.5.0) - binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) - go-merge! - html-merge! irb (~> 1.17) - json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) - kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) - kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -813,20 +611,13 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) - toml-merge! - tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) - typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) - yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -834,7 +625,6 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -847,13 +637,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -891,16 +678,13 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) @@ -933,7 +717,6 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -986,7 +769,6 @@ CHECKSUMS ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +776,6 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,7 +791,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -1023,7 +803,6 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -1037,7 +816,6 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/go-merge/Gemfile.lock b/gems/go-merge/Gemfile.lock index 9c4315070..6ebc2a90f 100644 --- a/gems/go-merge/Gemfile.lock +++ b/gems/go-merge/Gemfile.lock @@ -15,314 +15,46 @@ PATH tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly +GEM + remote: https://gem.coop/ specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: + backports (3.25.3) bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge - specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.8) - toml (~> 0.3) - toml-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) - diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) - kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -GEM - remote: https://gem.coop/ - specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -330,6 +62,11 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -342,6 +79,10 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -355,6 +96,11 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -404,6 +150,10 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) @@ -416,8 +166,6 @@ GEM kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-drift (1.0.13) - version_gem (~> 1.1, >= 1.1.15) kettle-family (1.2.97) command_kit (~> 0.6) command_kit-completion (~> 0.1) @@ -434,6 +182,36 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) kettle-rb (0.1.11) @@ -459,12 +237,24 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) markly (0.17.0) + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -492,13 +282,28 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -507,6 +312,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -631,6 +441,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -691,11 +505,18 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -724,6 +545,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -761,49 +586,26 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) - ast-crispr! - ast-crispr-markdown-markly! - ast-crispr-ruby-prism! - ast-merge! - ast-merge-git! - ast-template! - bash-merge! benchmark (~> 0.5, >= 0.5.0) - binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) go-merge! - html-merge! irb (~> 1.17) - json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) - kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) - kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -813,20 +615,13 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) - toml-merge! - tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) - typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) - yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -834,7 +629,6 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -847,13 +641,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -893,14 +684,12 @@ CHECKSUMS gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) @@ -933,7 +722,6 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -986,7 +774,6 @@ CHECKSUMS ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +781,6 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,7 +796,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -1023,7 +808,6 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -1037,7 +821,6 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/json-merge/Gemfile.lock b/gems/json-merge/Gemfile.lock index d1f346556..d503d455a 100644 --- a/gems/json-merge/Gemfile.lock +++ b/gems/json-merge/Gemfile.lock @@ -15,314 +15,46 @@ PATH tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly +GEM + remote: https://gem.coop/ specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: + backports (3.25.3) bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge - specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.8) - toml (~> 0.3) - toml-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) - diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) - kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -GEM - remote: https://gem.coop/ - specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -330,6 +62,11 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -342,6 +79,10 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -355,6 +96,11 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -416,8 +162,6 @@ GEM kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-drift (1.0.13) - version_gem (~> 1.1, >= 1.1.15) kettle-family (1.2.97) command_kit (~> 0.6) command_kit-completion (~> 0.1) @@ -434,6 +178,36 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) kettle-rb (0.1.11) @@ -459,12 +233,24 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) markly (0.17.0) + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -492,13 +278,28 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -507,6 +308,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -631,6 +437,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -691,11 +501,18 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -724,6 +541,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -761,49 +582,26 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) - ast-crispr! - ast-crispr-markdown-markly! - ast-crispr-ruby-prism! - ast-merge! - ast-merge-git! - ast-template! - bash-merge! benchmark (~> 0.5, >= 0.5.0) - binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) - go-merge! - html-merge! irb (~> 1.17) json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) - kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) - kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -813,20 +611,13 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) - toml-merge! - tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) - typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) - yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -834,7 +625,6 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -847,13 +637,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -891,16 +678,13 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) @@ -933,7 +717,6 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -986,7 +769,6 @@ CHECKSUMS ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +776,6 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,7 +791,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -1023,7 +803,6 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -1037,7 +816,6 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/kettle-jem/Gemfile.lock b/gems/kettle-jem/Gemfile.lock index a4badebf9..9635c6292 100644 --- a/gems/kettle-jem/Gemfile.lock +++ b/gems/kettle-jem/Gemfile.lock @@ -42,7 +42,7 @@ PATH yaml-merge (~> 7.1, >= 7.1.8) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) @@ -51,7 +51,7 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) @@ -59,7 +59,7 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: ast-crispr (7.1.8) ast-merge (= 7.1.8) @@ -67,15 +67,7 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.8) benchmark @@ -84,14 +76,7 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: bash-merge (7.1.8) ast-merge (= 7.1.8) @@ -99,15 +84,7 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: citrus-toml-merge (7.1.8) ast-merge (= 7.1.8) @@ -116,7 +93,7 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge specs: commonmarker-merge (7.1.8) commonmarker (~> 2.2) @@ -124,7 +101,7 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge specs: dotenv-merge (7.1.8) ast-merge (= 7.1.8) @@ -133,24 +110,7 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge - specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: json-merge (7.1.8) ast-merge (= 7.1.8) @@ -158,7 +118,7 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge specs: kramdown-merge (7.1.8) kramdown (~> 2.5) @@ -166,7 +126,7 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: markdown-merge (7.1.8) ast-merge (= 7.1.8) @@ -174,7 +134,7 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: markly-merge (7.1.8) markdown-merge (= 7.1.8) @@ -182,15 +142,7 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.8) - toml (~> 0.3) - toml-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: plain-merge (7.1.8) ast-merge (= 7.1.8) @@ -198,7 +150,7 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: prism-merge (7.1.8) ast-merge (= 7.1.8) @@ -208,7 +160,7 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge specs: psych-merge (7.1.8) ast-merge (= 7.1.8) @@ -217,7 +169,7 @@ PATH yaml-merge (= 7.1.8) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge specs: rbs-merge (7.1.8) ast-merge (= 7.1.8) @@ -226,7 +178,7 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: ruby-merge (7.1.8) ast-merge (= 7.1.8) @@ -234,38 +186,7 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) - diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) - kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: toml-merge (7.1.8) ast-merge (= 7.1.8) @@ -273,7 +194,7 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.8) citrus (~> 3.0) @@ -282,29 +203,13 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: yaml-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - GEM remote: https://gem.coop/ specs: @@ -691,8 +596,6 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) @@ -764,11 +667,8 @@ DEPENDENCIES ast-crispr-markdown-markly! ast-crispr-ruby-prism! ast-merge! - ast-merge-git! - ast-template! bash-merge! benchmark (~> 0.5, >= 0.5.0) - binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) citrus-toml-merge! @@ -778,8 +678,6 @@ DEPENDENCIES erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) - go-merge! - html-merge! irb (~> 1.17) json (~> 2.0, >= 2.21.2) json-merge! @@ -795,7 +693,6 @@ DEPENDENCIES markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) - parslet-toml-merge! plain-merge! prism-merge! psych-merge! @@ -812,15 +709,13 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0, >= 3.0.6) ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) toml-merge! tree_haver! + tree_sitter_language_pack (~> 1.16, >= 1.16.2) turbo_tests2 (~> 3.2, >= 3.2.7) - typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) yaml-merge! @@ -831,7 +726,6 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -844,13 +738,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -888,22 +779,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) - kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + kettle-changelog (1.0.7) + kettle-dev (3.0.33) + kettle-drift (1.0.13) kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f kettle-rb (0.1.11) sha256=3e50b413048906f2c5aea69ff805fbf8f7f2b5ea9d9e3d95151d38d97d6640f3 - kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd + kettle-soup-cover (3.0.10) kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa @@ -930,7 +819,6 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -983,7 +871,6 @@ CHECKSUMS ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -991,7 +878,6 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1007,7 +893,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -1020,7 +905,6 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -1034,7 +918,6 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/kramdown-merge/Gemfile.lock b/gems/kramdown-merge/Gemfile.lock index 782ac7fe5..1486a6af6 100644 --- a/gems/kramdown-merge/Gemfile.lock +++ b/gems/kramdown-merge/Gemfile.lock @@ -15,314 +15,46 @@ PATH markdown-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly +GEM + remote: https://gem.coop/ specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: + backports (3.25.3) bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge - specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.8) - toml (~> 0.3) - toml-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) - diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) - kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -GEM - remote: https://gem.coop/ - specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -330,6 +62,11 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -342,6 +79,10 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -355,6 +96,11 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -404,6 +150,10 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) @@ -416,8 +166,6 @@ GEM kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-drift (1.0.13) - version_gem (~> 1.1, >= 1.1.15) kettle-family (1.2.97) command_kit (~> 0.6) command_kit-completion (~> 0.1) @@ -434,6 +182,36 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) kettle-rb (0.1.11) @@ -464,7 +242,15 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) markly (0.17.0) + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -492,13 +278,28 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -507,6 +308,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -631,6 +437,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -691,11 +501,18 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -724,6 +541,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -761,48 +582,25 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) - ast-crispr! - ast-crispr-markdown-markly! - ast-crispr-ruby-prism! - ast-merge! - ast-merge-git! - ast-template! - bash-merge! benchmark (~> 0.5, >= 0.5.0) - binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) - go-merge! - html-merge! irb (~> 1.17) - json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) - kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) - kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -812,20 +610,13 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) - toml-merge! - tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) - typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) - yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -833,7 +624,6 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -846,13 +636,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -890,16 +677,13 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) @@ -932,7 +716,6 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -985,7 +768,6 @@ CHECKSUMS ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -993,7 +775,6 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1009,7 +790,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -1022,7 +802,6 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -1036,7 +815,6 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/markdown-merge/Gemfile.lock b/gems/markdown-merge/Gemfile.lock index 1a6f125d9..3a11f36f5 100644 --- a/gems/markdown-merge/Gemfile.lock +++ b/gems/markdown-merge/Gemfile.lock @@ -15,314 +15,46 @@ PATH tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly +GEM + remote: https://gem.coop/ specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: + backports (3.25.3) bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge - specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.8) - toml (~> 0.3) - toml-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) - diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) - kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -GEM - remote: https://gem.coop/ - specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -330,6 +62,11 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -342,6 +79,10 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -355,6 +96,11 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -404,6 +150,10 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) @@ -416,8 +166,6 @@ GEM kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-drift (1.0.13) - version_gem (~> 1.1, >= 1.1.15) kettle-family (1.2.97) command_kit (~> 0.6) command_kit-completion (~> 0.1) @@ -434,6 +182,36 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) kettle-rb (0.1.11) @@ -459,12 +237,20 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) markly (0.17.0) + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -492,13 +278,28 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -507,6 +308,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -631,6 +437,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -691,11 +501,18 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -724,6 +541,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -761,49 +582,26 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) - ast-crispr! - ast-crispr-markdown-markly! - ast-crispr-ruby-prism! - ast-merge! - ast-merge-git! - ast-template! - bash-merge! benchmark (~> 0.5, >= 0.5.0) - binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) - go-merge! - html-merge! irb (~> 1.17) - json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) - kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) - kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) - kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -813,20 +611,13 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) - toml-merge! - tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) - typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) - yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -834,7 +625,6 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -847,13 +637,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -891,16 +678,13 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) @@ -933,7 +717,6 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -986,7 +769,6 @@ CHECKSUMS ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +776,6 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,7 +791,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -1023,7 +803,6 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -1037,7 +816,6 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/markly-merge/Gemfile.lock b/gems/markly-merge/Gemfile.lock index 5512498ca..4757ef1b6 100644 --- a/gems/markly-merge/Gemfile.lock +++ b/gems/markly-merge/Gemfile.lock @@ -15,314 +15,46 @@ PATH markly (~> 0.9) version_gem (~> 1.1, >= 1.1.15) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly +GEM + remote: https://gem.coop/ specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: + backports (3.25.3) bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge - specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.8) - toml (~> 0.3) - toml-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) - diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) - kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -GEM - remote: https://gem.coop/ - specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -330,6 +62,11 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -342,6 +79,10 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -355,6 +96,11 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -404,6 +150,10 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) @@ -416,8 +166,6 @@ GEM kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-drift (1.0.13) - version_gem (~> 1.1, >= 1.1.15) kettle-family (1.2.97) command_kit (~> 0.6) command_kit-completion (~> 0.1) @@ -434,6 +182,36 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) kettle-rb (0.1.11) @@ -459,11 +237,19 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) markly (0.17.0) mister_bin (0.9.0) colsole (~> 1.0.0) @@ -492,13 +278,28 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -507,6 +308,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -631,6 +437,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -691,11 +501,18 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -724,6 +541,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -761,49 +582,26 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) - ast-crispr! - ast-crispr-markdown-markly! - ast-crispr-ruby-prism! - ast-merge! - ast-merge-git! - ast-template! - bash-merge! benchmark (~> 0.5, >= 0.5.0) - binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) - go-merge! - html-merge! irb (~> 1.17) - json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) - kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) - kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -813,20 +611,13 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) - toml-merge! - tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) - typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) - yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -834,7 +625,6 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -847,13 +637,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -891,16 +678,13 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) @@ -933,7 +717,6 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -986,7 +769,6 @@ CHECKSUMS ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +776,6 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,7 +791,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -1023,7 +803,6 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -1037,7 +816,6 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/parslet-toml-merge/Gemfile.lock b/gems/parslet-toml-merge/Gemfile.lock index a394bbc36..9b286a59a 100644 --- a/gems/parslet-toml-merge/Gemfile.lock +++ b/gems/parslet-toml-merge/Gemfile.lock @@ -15,314 +15,46 @@ PATH toml-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly +GEM + remote: https://gem.coop/ specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: + backports (3.25.3) bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge - specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) - diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) - kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -GEM - remote: https://gem.coop/ - specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -330,6 +62,11 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -342,6 +79,10 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -355,6 +96,11 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -404,6 +150,10 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) @@ -416,8 +166,6 @@ GEM kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-drift (1.0.13) - version_gem (~> 1.1, >= 1.1.15) kettle-family (1.2.97) command_kit (~> 0.6) command_kit-completion (~> 0.1) @@ -434,6 +182,36 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) kettle-rb (0.1.11) @@ -459,12 +237,24 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) markly (0.17.0) + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -492,13 +282,28 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -507,6 +312,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -631,6 +441,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -693,9 +507,18 @@ GEM version_gem (~> 1.1, >= 1.1.15) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -724,6 +547,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -761,49 +588,27 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) - ast-crispr! - ast-crispr-markdown-markly! - ast-crispr-ruby-prism! - ast-merge! - ast-merge-git! - ast-template! - bash-merge! benchmark (~> 0.5, >= 0.5.0) - binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) - citrus-toml-merge (>= 0, = 7.1.8)! - commonmarker-merge! + citrus-toml-merge (= 7.1.8) debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) - go-merge! - html-merge! irb (~> 1.17) - json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) - kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) - kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -813,20 +618,13 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) - toml-merge! - tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) - typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) - yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -834,7 +632,6 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -847,13 +644,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -891,16 +685,13 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) @@ -986,7 +777,6 @@ CHECKSUMS ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +784,6 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1023,7 +812,6 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -1037,7 +825,6 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/plain-merge/Gemfile.lock b/gems/plain-merge/Gemfile.lock index 62b1c8b12..b8e11e278 100644 --- a/gems/plain-merge/Gemfile.lock +++ b/gems/plain-merge/Gemfile.lock @@ -15,314 +15,46 @@ PATH tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly +GEM + remote: https://gem.coop/ specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: + backports (3.25.3) bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge - specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.8) - toml (~> 0.3) - toml-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) - diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) - kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -GEM - remote: https://gem.coop/ - specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -330,6 +62,11 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -342,6 +79,10 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -355,6 +96,11 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -404,6 +150,10 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) @@ -416,8 +166,6 @@ GEM kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-drift (1.0.13) - version_gem (~> 1.1, >= 1.1.15) kettle-family (1.2.97) command_kit (~> 0.6) command_kit-completion (~> 0.1) @@ -434,6 +182,36 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) kettle-rb (0.1.11) @@ -459,12 +237,24 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) markly (0.17.0) + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -496,9 +286,20 @@ GEM prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -507,6 +308,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -631,6 +437,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -691,11 +501,18 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -724,6 +541,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -761,49 +582,26 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) - ast-crispr! - ast-crispr-markdown-markly! - ast-crispr-ruby-prism! - ast-merge! - ast-merge-git! - ast-template! - bash-merge! benchmark (~> 0.5, >= 0.5.0) - binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) - go-merge! - html-merge! irb (~> 1.17) - json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) - kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) - kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) - parslet-toml-merge! plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -813,20 +611,13 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) - toml-merge! - tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) - typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) - yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -834,7 +625,6 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -847,13 +637,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -891,16 +678,13 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) @@ -933,7 +717,6 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -986,7 +769,6 @@ CHECKSUMS ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +776,6 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,7 +791,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -1023,7 +803,6 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -1037,7 +816,6 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/prism-merge/Gemfile.lock b/gems/prism-merge/Gemfile.lock index 38bc0f124..5d39a9bad 100644 --- a/gems/prism-merge/Gemfile.lock +++ b/gems/prism-merge/Gemfile.lock @@ -17,312 +17,46 @@ PATH tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly +GEM + remote: https://gem.coop/ specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: + backports (3.25.3) bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge - specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.8) - toml (~> 0.3) - toml-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) - diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) - kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -GEM - remote: https://gem.coop/ - specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -330,6 +64,11 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -342,6 +81,10 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -355,6 +98,11 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -404,6 +152,10 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) @@ -416,8 +168,6 @@ GEM kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-drift (1.0.13) - version_gem (~> 1.1, >= 1.1.15) kettle-family (1.2.97) command_kit (~> 0.6) command_kit-completion (~> 0.1) @@ -434,6 +184,36 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) kettle-rb (0.1.11) @@ -459,12 +239,24 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) markly (0.17.0) + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -492,6 +284,10 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) @@ -499,6 +295,11 @@ GEM psych (5.5.0) date stringio + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -507,6 +308,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -631,6 +437,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -691,11 +501,18 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -724,6 +541,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -761,49 +582,26 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) - ast-crispr! - ast-crispr-markdown-markly! - ast-crispr-ruby-prism! - ast-merge! - ast-merge-git! - ast-template! - bash-merge! benchmark (~> 0.5, >= 0.5.0) - binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) - go-merge! - html-merge! irb (~> 1.17) - json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) - kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) - kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) - parslet-toml-merge! - plain-merge! prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -813,20 +611,13 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) - toml-merge! - tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) - typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) - yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -834,7 +625,6 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -847,13 +637,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -891,16 +678,13 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) @@ -933,7 +717,6 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -986,7 +769,6 @@ CHECKSUMS ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +776,6 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,7 +791,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -1023,7 +803,6 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -1037,7 +816,6 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/psych-merge/Gemfile.lock b/gems/psych-merge/Gemfile.lock index 1f8ec270e..260ba82cb 100644 --- a/gems/psych-merge/Gemfile.lock +++ b/gems/psych-merge/Gemfile.lock @@ -16,313 +16,46 @@ PATH version_gem (~> 1.1, >= 1.1.15) yaml-merge (= 7.1.8) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly +GEM + remote: https://gem.coop/ specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: + backports (3.25.3) bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge - specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.8) - toml (~> 0.3) - toml-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) - diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) - kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -GEM - remote: https://gem.coop/ - specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -330,6 +63,11 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -342,6 +80,10 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -355,6 +97,11 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -404,6 +151,10 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) @@ -416,8 +167,6 @@ GEM kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-drift (1.0.13) - version_gem (~> 1.1, >= 1.1.15) kettle-family (1.2.97) command_kit (~> 0.6) command_kit-completion (~> 0.1) @@ -434,6 +183,36 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) kettle-rb (0.1.11) @@ -459,12 +238,24 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) markly (0.17.0) + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -492,10 +283,20 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio @@ -507,6 +308,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -631,6 +437,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -691,11 +501,18 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -724,6 +541,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -761,49 +582,26 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) - ast-crispr! - ast-crispr-markdown-markly! - ast-crispr-ruby-prism! - ast-merge! - ast-merge-git! - ast-template! - bash-merge! benchmark (~> 0.5, >= 0.5.0) - binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) - go-merge! - html-merge! irb (~> 1.17) - json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) - kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) - kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) - parslet-toml-merge! - plain-merge! - prism-merge! psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -813,20 +611,13 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) - toml-merge! - tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) - typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) - yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -834,7 +625,6 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -847,13 +637,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -891,16 +678,13 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) @@ -933,7 +717,6 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -986,7 +769,6 @@ CHECKSUMS ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +776,6 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,7 +791,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -1023,7 +803,6 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -1037,7 +816,6 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/rbs-merge/Gemfile.lock b/gems/rbs-merge/Gemfile.lock index 88d5240f8..c989ff044 100644 --- a/gems/rbs-merge/Gemfile.lock +++ b/gems/rbs-merge/Gemfile.lock @@ -16,313 +16,46 @@ PATH tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly +GEM + remote: https://gem.coop/ specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: + backports (3.25.3) bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge - specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.8) - toml (~> 0.3) - toml-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) - diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) - kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -GEM - remote: https://gem.coop/ - specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -330,6 +63,11 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -342,6 +80,10 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -355,6 +97,11 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -404,6 +151,10 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) @@ -416,8 +167,6 @@ GEM kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-drift (1.0.13) - version_gem (~> 1.1, >= 1.1.15) kettle-family (1.2.97) command_kit (~> 0.6) command_kit-completion (~> 0.1) @@ -434,6 +183,36 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) kettle-rb (0.1.11) @@ -459,12 +238,24 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) markly (0.17.0) + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -492,13 +283,28 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -631,6 +437,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -691,11 +501,18 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -724,6 +541,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -761,46 +582,23 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) - ast-crispr! - ast-crispr-markdown-markly! - ast-crispr-ruby-prism! - ast-merge! - ast-merge-git! - ast-template! - bash-merge! benchmark (~> 0.5, >= 0.5.0) - binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) - go-merge! - html-merge! irb (~> 1.17) - json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) - kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) - kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs-merge! reek (~> 6.5, >= 6.5.0) @@ -812,20 +610,13 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) - toml-merge! - tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) - typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) - yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -833,7 +624,6 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -846,13 +636,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -890,16 +677,13 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) @@ -932,7 +716,6 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -985,7 +768,6 @@ CHECKSUMS ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -993,7 +775,6 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1009,7 +790,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -1022,7 +802,6 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -1036,7 +815,6 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ruby-merge/Gemfile.lock b/gems/ruby-merge/Gemfile.lock index 2e5f08daa..60d918dcc 100644 --- a/gems/ruby-merge/Gemfile.lock +++ b/gems/ruby-merge/Gemfile.lock @@ -15,314 +15,46 @@ PATH tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly +GEM + remote: https://gem.coop/ specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: + backports (3.25.3) bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge - specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.8) - toml (~> 0.3) - toml-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) - diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) - kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -GEM - remote: https://gem.coop/ - specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -330,6 +62,11 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -342,6 +79,10 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -355,6 +96,11 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -404,6 +150,10 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) @@ -416,8 +166,6 @@ GEM kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-drift (1.0.13) - version_gem (~> 1.1, >= 1.1.15) kettle-family (1.2.97) command_kit (~> 0.6) command_kit-completion (~> 0.1) @@ -434,6 +182,36 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) kettle-rb (0.1.11) @@ -459,12 +237,24 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) markly (0.17.0) + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -492,13 +282,28 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -507,6 +312,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -691,11 +501,18 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -724,6 +541,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -761,49 +582,25 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) - ast-crispr! - ast-crispr-markdown-markly! - ast-crispr-ruby-prism! - ast-merge! - ast-merge-git! - ast-template! - bash-merge! benchmark (~> 0.5, >= 0.5.0) - binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) - go-merge! - html-merge! irb (~> 1.17) - json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) - kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) - kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -815,18 +612,12 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0, >= 3.0.6) ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) - toml-merge! - tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) - typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) - yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -834,7 +625,6 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -847,13 +637,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -891,16 +678,13 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) @@ -933,7 +717,6 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -986,7 +769,6 @@ CHECKSUMS ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +776,6 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,7 +791,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -1023,7 +803,6 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -1037,7 +816,6 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/rust-merge/Gemfile.lock b/gems/rust-merge/Gemfile.lock index cb1fb42ed..1c99438b1 100644 --- a/gems/rust-merge/Gemfile.lock +++ b/gems/rust-merge/Gemfile.lock @@ -15,314 +15,46 @@ PATH tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly +GEM + remote: https://gem.coop/ specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: + backports (3.25.3) bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge - specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.8) - toml (~> 0.3) - toml-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) - diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) - kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -GEM - remote: https://gem.coop/ - specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -330,6 +62,11 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -342,6 +79,10 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -355,6 +96,11 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -404,6 +150,10 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) @@ -416,8 +166,6 @@ GEM kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-drift (1.0.13) - version_gem (~> 1.1, >= 1.1.15) kettle-family (1.2.97) command_kit (~> 0.6) command_kit-completion (~> 0.1) @@ -434,6 +182,36 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) kettle-rb (0.1.11) @@ -459,12 +237,24 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) markly (0.17.0) + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -492,13 +282,28 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -507,6 +312,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -631,6 +441,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -691,11 +505,18 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -724,6 +545,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -761,49 +586,25 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) - ast-crispr! - ast-crispr-markdown-markly! - ast-crispr-ruby-prism! - ast-merge! - ast-merge-git! - ast-template! - bash-merge! benchmark (~> 0.5, >= 0.5.0) - binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) - go-merge! - html-merge! irb (~> 1.17) - json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) - kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) - kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -813,20 +614,14 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) - ruby-merge! ruby-progressbar (~> 1.13) rust-merge! - smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) - toml-merge! - tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) - typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) - yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -834,7 +629,6 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -847,13 +641,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -891,16 +682,13 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) @@ -933,7 +721,6 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -994,7 +781,6 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,7 +796,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -1023,7 +808,6 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -1037,7 +821,6 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/smorg-rb/Gemfile.lock b/gems/smorg-rb/Gemfile.lock index 41c6cd755..95e0492fd 100644 --- a/gems/smorg-rb/Gemfile.lock +++ b/gems/smorg-rb/Gemfile.lock @@ -30,299 +30,50 @@ PATH typescript-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly +GEM + remote: https://gem.coop/ specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge - specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.8) - toml (~> 0.3) - toml-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.8) + ast-merge-git (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.8) + backports (3.25.3) + bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -GEM - remote: https://gem.coop/ - specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -330,6 +81,11 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -342,6 +98,10 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -355,6 +115,11 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -392,11 +157,20 @@ GEM geom2d (0.4.1) gitmoji-regex (2.0.12) version_gem (~> 1.1, >= 1.1.15) + go-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) hexapdf (1.10.0) cmdparse (~> 3.0, >= 3.0.3) geom2d (~> 0.4, >= 0.4.1) openssl (>= 2.2.1) strscan (>= 3.1.2) + html-merge (7.1.8) + ast-crispr (= 7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) io-console (0.9.2) irb (1.18.0) pp (>= 0.6.0) @@ -404,6 +178,10 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) @@ -416,8 +194,6 @@ GEM kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-drift (1.0.13) - version_gem (~> 1.1, >= 1.1.15) kettle-family (1.2.97) command_kit (~> 0.6) command_kit-completion (~> 0.1) @@ -434,6 +210,36 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) kettle-rb (0.1.11) @@ -459,12 +265,24 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) markly (0.17.0) + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -492,13 +310,28 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -507,6 +340,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -631,9 +469,17 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + rust-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) service_actor (3.9.4) zeitwerk (>= 1.0) silent_stream (1.0.12) @@ -691,11 +537,18 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -716,6 +569,10 @@ GEM parallel_tests (>= 3.3.0, < 6) rspec (>= 3.10) version_gem (~> 1.1, >= 1.1.15) + typescript-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) unicode-display_width (2.6.0) version_gem (1.1.15) webrick (1.9.2) @@ -724,6 +581,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -762,49 +623,25 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) - ast-crispr! - ast-crispr-markdown-markly! - ast-crispr-ruby-prism! - ast-merge! - ast-merge-git! - ast-template! - bash-merge! benchmark (~> 0.5, >= 0.5.0) - binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) - go-merge! - html-merge! irb (~> 1.17) - json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) - kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) - kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -814,20 +651,14 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) - toml-merge! - tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) - typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) - yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -835,7 +666,6 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -849,12 +679,10 @@ CHECKSUMS ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) ast-merge-git (7.1.8) - ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -901,7 +729,6 @@ CHECKSUMS json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) @@ -934,7 +761,6 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -1011,7 +837,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -1038,7 +863,6 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/toml-merge/Gemfile.lock b/gems/toml-merge/Gemfile.lock index 3079b5b9c..6135aee67 100644 --- a/gems/toml-merge/Gemfile.lock +++ b/gems/toml-merge/Gemfile.lock @@ -15,314 +15,46 @@ PATH tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly +GEM + remote: https://gem.coop/ specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: + backports (3.25.3) bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge - specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.8) - toml (~> 0.3) - toml-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) - diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) - kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -GEM - remote: https://gem.coop/ - specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -330,6 +62,11 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -342,6 +79,10 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -355,6 +96,11 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -404,6 +150,10 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) @@ -416,8 +166,6 @@ GEM kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-drift (1.0.13) - version_gem (~> 1.1, >= 1.1.15) kettle-family (1.2.97) command_kit (~> 0.6) command_kit-completion (~> 0.1) @@ -434,6 +182,36 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) kettle-rb (0.1.11) @@ -459,12 +237,24 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) markly (0.17.0) + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -492,13 +282,28 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -507,6 +312,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -631,6 +441,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -691,11 +505,14 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -724,6 +541,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -761,49 +582,25 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) - ast-crispr! - ast-crispr-markdown-markly! - ast-crispr-ruby-prism! - ast-merge! - ast-merge-git! - ast-template! - bash-merge! benchmark (~> 0.5, >= 0.5.0) - binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) - go-merge! - html-merge! irb (~> 1.17) - json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) - kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) - kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -813,20 +610,14 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) toml-merge! - tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) - typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) - yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -834,7 +625,6 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -847,13 +637,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -891,16 +678,13 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) @@ -933,7 +717,6 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -986,7 +769,6 @@ CHECKSUMS ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +776,6 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,7 +791,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -1023,7 +803,6 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -1037,7 +816,6 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/toml-merge/spec/fixtures_integration_spec.rb b/gems/toml-merge/spec/fixtures_integration_spec.rb index b1eb0eb16..fc4ba93ea 100644 --- a/gems/toml-merge/spec/fixtures_integration_spec.rb +++ b/gems/toml-merge/spec/fixtures_integration_spec.rb @@ -277,7 +277,7 @@ def json_ready(value) path = ["exe", "bin"] [tools] - ruby = "4.0.2" + ruby = "4.0.6" TOML analysis = described_class::FileAnalysis.new(source) diff --git a/gems/tree_haver/Gemfile.lock b/gems/tree_haver/Gemfile.lock index 7b049e3c5..459101eaf 100644 --- a/gems/tree_haver/Gemfile.lock +++ b/gems/tree_haver/Gemfile.lock @@ -16,313 +16,46 @@ PATH tree_sitter_language_pack (>= 1.16.2, < 2.0) version_gem (~> 1.1, >= 1.1.15) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly +GEM + remote: https://gem.coop/ specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: + backports (3.25.3) bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge - specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.8) - toml (~> 0.3) - toml-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) - diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) - kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -GEM - remote: https://gem.coop/ - specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -330,6 +63,11 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -337,6 +75,10 @@ GEM command_kit (~> 0.1) completely (~> 0.6) commonmarker (2.10.0-x86_64-linux) + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -350,6 +92,11 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -399,6 +146,10 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) @@ -411,8 +162,6 @@ GEM kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-drift (1.0.13) - version_gem (~> 1.1, >= 1.1.15) kettle-family (1.2.97) command_kit (~> 0.6) command_kit-completion (~> 0.1) @@ -429,6 +178,36 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) kettle-rb (0.1.11) @@ -454,12 +233,24 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) markly (0.17.0) + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -477,13 +268,28 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -492,6 +298,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -616,6 +427,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -678,6 +493,10 @@ GEM version_gem (~> 1.1, >= 1.1.15) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) @@ -703,6 +522,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -734,49 +557,25 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) - ast-crispr! - ast-crispr-markdown-markly! - ast-crispr-ruby-prism! - ast-merge! - ast-merge-git! - ast-template! - bash-merge! benchmark (~> 0.5, >= 0.5.0) - binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) - go-merge! - html-merge! irb (~> 1.17) - json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) - kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) - kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -786,22 +585,16 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) toml (~> 0.3) - toml-merge! toml-rb (~> 4.1) tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) - typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) - yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -809,7 +602,6 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -822,13 +614,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -861,16 +650,13 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) @@ -898,7 +684,6 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -951,7 +736,6 @@ CHECKSUMS ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -959,7 +743,6 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -985,7 +768,6 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -999,7 +781,6 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/typescript-merge/Gemfile.lock b/gems/typescript-merge/Gemfile.lock index 9aeffda07..f4f190d89 100644 --- a/gems/typescript-merge/Gemfile.lock +++ b/gems/typescript-merge/Gemfile.lock @@ -15,314 +15,46 @@ PATH tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly +GEM + remote: https://gem.coop/ specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: + backports (3.25.3) bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge - specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.8) - toml (~> 0.3) - toml-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) - diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) - kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -GEM - remote: https://gem.coop/ - specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -330,6 +62,11 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -342,6 +79,10 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -355,6 +96,11 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -404,6 +150,10 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) @@ -416,8 +166,6 @@ GEM kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-drift (1.0.13) - version_gem (~> 1.1, >= 1.1.15) kettle-family (1.2.97) command_kit (~> 0.6) command_kit-completion (~> 0.1) @@ -434,6 +182,36 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) kettle-rb (0.1.11) @@ -459,12 +237,24 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) markly (0.17.0) + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -492,13 +282,28 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -507,6 +312,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -631,6 +441,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -691,11 +505,18 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -724,6 +545,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -761,49 +586,25 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) - ast-crispr! - ast-crispr-markdown-markly! - ast-crispr-ruby-prism! - ast-merge! - ast-merge-git! - ast-template! - bash-merge! benchmark (~> 0.5, >= 0.5.0) - binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) - go-merge! - html-merge! irb (~> 1.17) - json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) - kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) - kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -813,20 +614,14 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) - toml-merge! - tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) - yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -834,7 +629,6 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -847,13 +641,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -891,16 +682,13 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) @@ -933,7 +721,6 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -986,7 +773,6 @@ CHECKSUMS ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +780,6 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,7 +795,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -1037,7 +821,6 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/yaml-merge/Gemfile.lock b/gems/yaml-merge/Gemfile.lock index a45832f8d..a07d373a4 100644 --- a/gems/yaml-merge/Gemfile.lock +++ b/gems/yaml-merge/Gemfile.lock @@ -15,314 +15,46 @@ PATH tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly +GEM + remote: https://gem.coop/ specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: + backports (3.25.3) bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge - specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.8) - toml (~> 0.3) - toml-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) - diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) - kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -GEM - remote: https://gem.coop/ - specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -330,6 +62,11 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -342,6 +79,10 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -355,6 +96,11 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -404,6 +150,10 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) @@ -416,8 +166,6 @@ GEM kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-drift (1.0.13) - version_gem (~> 1.1, >= 1.1.15) kettle-family (1.2.97) command_kit (~> 0.6) command_kit-completion (~> 0.1) @@ -434,6 +182,36 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) kettle-rb (0.1.11) @@ -459,12 +237,24 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) markly (0.17.0) + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -492,13 +282,28 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -507,6 +312,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -631,6 +441,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -691,11 +505,18 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -761,49 +582,25 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) - ast-crispr! - ast-crispr-markdown-markly! - ast-crispr-ruby-prism! - ast-merge! - ast-merge-git! - ast-template! - bash-merge! benchmark (~> 0.5, >= 0.5.0) - binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) - go-merge! - html-merge! irb (~> 1.17) - json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) - kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) - kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -813,17 +610,11 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) - toml-merge! - tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) - typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) yaml-merge! @@ -834,7 +625,6 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -847,13 +637,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -891,16 +678,13 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) @@ -933,7 +717,6 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -986,7 +769,6 @@ CHECKSUMS ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +776,6 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,7 +791,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -1023,7 +803,6 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -1037,7 +816,6 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/zip-merge/Gemfile.lock b/gems/zip-merge/Gemfile.lock index 80e5cf2ca..dcee4c99f 100644 --- a/gems/zip-merge/Gemfile.lock +++ b/gems/zip-merge/Gemfile.lock @@ -15,321 +15,62 @@ PATH tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly +GEM + remote: https://gem.coop/ specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: + backports (3.25.3) bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: + benchmark (0.5.0) + bigdecimal (4.1.2) binary-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge - specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.8) - toml (~> 0.3) - toml-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) - diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) - kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - -GEM - remote: https://gem.coop/ - specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - backports (3.25.3) - benchmark (0.5.0) - bigdecimal (4.1.2) bundler-audit (0.9.3) bundler (>= 1.2.0) thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -342,6 +83,10 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -355,6 +100,11 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -404,6 +154,10 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) @@ -416,8 +170,6 @@ GEM kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-drift (1.0.13) - version_gem (~> 1.1, >= 1.1.15) kettle-family (1.2.97) command_kit (~> 0.6) command_kit-completion (~> 0.1) @@ -434,6 +186,36 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) kettle-rb (0.1.11) @@ -459,12 +241,24 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) markly (0.17.0) + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -492,13 +286,28 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -507,6 +316,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -631,6 +445,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -691,11 +509,18 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -724,6 +549,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -761,49 +590,25 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) - ast-crispr! - ast-crispr-markdown-markly! - ast-crispr-ruby-prism! - ast-merge! - ast-merge-git! - ast-template! - bash-merge! benchmark (~> 0.5, >= 0.5.0) - binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) - go-merge! - html-merge! irb (~> 1.17) - json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) - kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) - kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -813,20 +618,13 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) - toml-merge! - tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) - typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) - yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -847,8 +645,6 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c @@ -891,16 +687,13 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) @@ -933,7 +726,6 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -986,7 +778,6 @@ CHECKSUMS ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +785,6 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,7 +800,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -1023,7 +812,6 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 From c3bfa9a966c04dddba70845d162538776b8d4646 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Tue, 8 Sep 2026 20:01:18 -0400 Subject: [PATCH 003/137] Add rubocop-gradual to curated Bundler binstub generation `bin/rubocop-gradual` was only surviving in destination projects because it happened to be git-tracked and `tracked_binstub?` (added in 349681653) protects tracked non-curated binstubs from pruning. That's a preservation safety net, not a generation path: a project that never manually created the binstub in the first place got nothing from the template. rubocop-gradual is already a template-declared dependency in gemfiles/modular/style.gemfile.example, so any project using the style gemfile has it in its bundle. Add it to CURATED_BINSTUB_GEMS so `kettle-jem install`'s curated `bundle binstubs` step generates bin/rubocop-gradual itself, the same as it does for rake, rbs, rspec-core, and yard. Co-Authored-By: Claude Sonnet 5 Claude-Session: https://claude.ai/code/session_01SkhdTh8WyqNdRkUZ1aAgVi --- gems/kettle-jem/CHANGELOG.md | 2 ++ gems/kettle-jem/lib/kettle/jem/tasks/install_task.rb | 2 +- .../spec/integration/structural_merge_template_spec.rb | 2 +- .../spec/system/install_orchestration_spec.rb | 10 +++++----- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/gems/kettle-jem/CHANGELOG.md b/gems/kettle-jem/CHANGELOG.md index b13210078..6119c12b7 100644 --- a/gems/kettle-jem/CHANGELOG.md +++ b/gems/kettle-jem/CHANGELOG.md @@ -20,6 +20,8 @@ Please file a bug if you notice a violation of semantic versioning. ### Added +- Curated Bundler binstub generation now includes `rubocop-gradual`. + ### Changed ### Deprecated diff --git a/gems/kettle-jem/lib/kettle/jem/tasks/install_task.rb b/gems/kettle-jem/lib/kettle/jem/tasks/install_task.rb index 7593c1775..266f8ff9e 100644 --- a/gems/kettle-jem/lib/kettle/jem/tasks/install_task.rb +++ b/gems/kettle-jem/lib/kettle/jem/tasks/install_task.rb @@ -16,7 +16,7 @@ module Tasks module InstallTask module_function - CURATED_BINSTUB_GEMS = %w[appraisal2 rake rbs rspec-core yard kettle-dev kettle-test kettle-soup-cover kettle-gha-pins stone_checksums].freeze + CURATED_BINSTUB_GEMS = %w[appraisal2 rake rbs rspec-core yard rubocop-gradual kettle-dev kettle-test kettle-soup-cover kettle-gha-pins stone_checksums].freeze CURATED_BINSTUB_DISCRETE_EXECUTABLES = %w[ kettle-drift yard diff --git a/gems/kettle-jem/spec/integration/structural_merge_template_spec.rb b/gems/kettle-jem/spec/integration/structural_merge_template_spec.rb index 27a1ea8f5..d0af582ce 100644 --- a/gems/kettle-jem/spec/integration/structural_merge_template_spec.rb +++ b/gems/kettle-jem/spec/integration/structural_merge_template_spec.rb @@ -522,7 +522,7 @@ module Version expect(signature).to include("module Version") expect(signature).to include("VERSION: String") expect(commands).to include( - %w[bundle binstubs appraisal2 rake rbs rspec-core yard kettle-dev kettle-test kettle-soup-cover kettle-gha-pins stone_checksums], + %w[bundle binstubs appraisal2 rake rbs rspec-core yard rubocop-gradual kettle-dev kettle-test kettle-soup-cover kettle-gha-pins stone_checksums], kettle_jem_handoff_command("--skip-commit", "--only", "example-gem.gemspec") ) end diff --git a/gems/kettle-jem/spec/system/install_orchestration_spec.rb b/gems/kettle-jem/spec/system/install_orchestration_spec.rb index 6f5500ea0..a0d28f293 100644 --- a/gems/kettle-jem/spec/system/install_orchestration_spec.rb +++ b/gems/kettle-jem/spec/system/install_orchestration_spec.rb @@ -301,7 +301,7 @@ it "runs install as active apply plus local post-template checks" do tmp_root = File.expand_path("../tmp", __dir__) FileUtils.mkdir_p(tmp_root) - curated_binstubs = %w[bundle binstubs appraisal2 rake rbs rspec-core yard kettle-dev kettle-test kettle-soup-cover kettle-gha-pins stone_checksums] + curated_binstubs = %w[bundle binstubs appraisal2 rake rbs rspec-core yard rubocop-gradual kettle-dev kettle-test kettle-soup-cover kettle-gha-pins stone_checksums] Dir.mktmpdir("kettle-jem-install-post-template-slice", tmp_root) do |root| write_tree(root, { "example.gemspec" => <<~RUBY, @@ -756,7 +756,7 @@ it "applies full templates after accepting a newly bootstrapped config before bundled handoff" do tmp_root = File.expand_path("../tmp", __dir__) FileUtils.mkdir_p(tmp_root) - curated_binstubs = %w[bundle binstubs appraisal2 rake rbs rspec-core yard kettle-dev kettle-test kettle-soup-cover kettle-gha-pins stone_checksums] + curated_binstubs = %w[bundle binstubs appraisal2 rake rbs rspec-core yard rubocop-gradual kettle-dev kettle-test kettle-soup-cover kettle-gha-pins stone_checksums] Dir.mktmpdir("kettle-jem-install-bootstrap-followup", tmp_root) do |root| write_tree(root, { "Gemfile" => <<~RUBY, @@ -881,20 +881,20 @@ allow(Open3).to receive(:capture3).and_return(["", "", status]) expect(Kettle::Jem::Tasks::InstallTask.bundle_binstubs_command).to eq( - %w[bundle binstubs appraisal2 rake rbs rspec-core yard kettle-dev kettle-test kettle-soup-cover kettle-gha-pins stone_checksums] + %w[bundle binstubs appraisal2 rake rbs rspec-core yard rubocop-gradual kettle-dev kettle-test kettle-soup-cover kettle-gha-pins stone_checksums] ) end it "omits curated binstubs for gems missing from the destination bundle" do status = instance_double(Process::Status, success?: true) allow(Open3).to receive(:capture3).and_return([ - "appraisal2\nrake\nrbs\nrspec-core\nkettle-dev\nkettle-test\nkettle-soup-cover\nstone_checksums\n", + "appraisal2\nrake\nrbs\nrspec-core\nrubocop-gradual\nkettle-dev\nkettle-test\nkettle-soup-cover\nstone_checksums\n", "", status ]) expect(Kettle::Jem::Tasks::InstallTask.bundle_binstubs_command("/example", env: {})).to eq( - %w[bundle binstubs appraisal2 rake rbs rspec-core kettle-dev kettle-test kettle-soup-cover stone_checksums] + %w[bundle binstubs appraisal2 rake rbs rspec-core rubocop-gradual kettle-dev kettle-test kettle-soup-cover stone_checksums] ) end From 18d77d3b564566b9ffe03f5fa017e8b5970b0fde Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 02:00:49 -0400 Subject: [PATCH 004/137] =?UTF-8?q?=F0=9F=90=9B=20Keep=20CI=20active=20for?= =?UTF-8?q?=20branch-stack=20releases?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kettle-jem/CHANGELOG.md | 2 ++ gems/kettle-jem/README.md | 8 ++++++++ gems/kettle-jem/lib/kettle/jem.rb | 5 ++++- .../integration/appraisals_and_gemfile_template_spec.rb | 2 +- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/gems/kettle-jem/CHANGELOG.md b/gems/kettle-jem/CHANGELOG.md index 6119c12b7..4b09b58ce 100644 --- a/gems/kettle-jem/CHANGELOG.md +++ b/gems/kettle-jem/CHANGELOG.md @@ -32,6 +32,8 @@ Please file a bug if you notice a violation of semantic versioning. - [kc] kettle-jem/template-file-tracking: Track distinct changed template files across repeated Unreleased template runs. +- Keep branch-stack release CI active by managing the r*_*-*-v* GitHub Actions push trigger. + ### Security ## [7.1.25] - 2026-09-08 diff --git a/gems/kettle-jem/README.md b/gems/kettle-jem/README.md index d142dd1b9..b34a91ff3 100644 --- a/gems/kettle-jem/README.md +++ b/gems/kettle-jem/README.md @@ -293,6 +293,14 @@ workflows: truffleruby-22.3: kettle-test --tag ~type:acceptance --example-status-log .rspec_status ``` +### Branch-Stack CI + +Generated GitHub Actions workflows run on the default branch, `*-stable`, and +branch-stack release names matching `r*_*-*-v*` (for example, +`r3_2-even-v24`). This keeps release CI active for every target that +`kettle-family` publishes from a branch stack. Existing project-specific push +branch patterns remain preserved during templating. + ### Default Local Test Bundle The root `Gemfile` is the default bundle for local commands such as diff --git a/gems/kettle-jem/lib/kettle/jem.rb b/gems/kettle-jem/lib/kettle/jem.rb index 3d084172d..83a400478 100644 --- a/gems/kettle-jem/lib/kettle/jem.rb +++ b/gems/kettle-jem/lib/kettle/jem.rb @@ -19878,7 +19878,10 @@ def github_actions_push_branches_yaml(content, default_branch:, indent: " end def github_actions_push_branches(content, default_branch:) - managed = [default_branch.to_s, "*-stable"] + # Branch-stack releases use names such as r3_2-even-v24. They must run + # the same push workflows as stable branches because kettle-release + # monitors those runs before publishing the branch release. + managed = [default_branch.to_s, "*-stable", "r*_*-*-v*"] existing = yaml_scalar_sequence_at_path(content, %w[on push branches]) (managed + existing).uniq end diff --git a/gems/kettle-jem/spec/integration/appraisals_and_gemfile_template_spec.rb b/gems/kettle-jem/spec/integration/appraisals_and_gemfile_template_spec.rb index 43c191a0c..cbc1fde80 100644 --- a/gems/kettle-jem/spec/integration/appraisals_and_gemfile_template_spec.rb +++ b/gems/kettle-jem/spec/integration/appraisals_and_gemfile_template_spec.rb @@ -862,7 +862,7 @@ }) ] - expect(workflows + [coverage_workflow]).not_to include(include(' - "r*_*-*-v*"')) + expect(workflows + [coverage_workflow]).to all(include(' - "r*_*-*-v*"')) expect(preserved_workflows).to all(include(' - "r*_*-*-v*"')) expect(workflows).to all(include("bundler-cache: ${{ matrix.ruby != 'ruby-2.4' && matrix.ruby != 'ruby-2.5' && matrix.ruby != 'ruby-2.6' && matrix.ruby != 'ruby-2.7' && matrix.ruby != 'truffleruby-25.0' && matrix.ruby != 'jruby-9.2' && matrix.ruby != 'jruby-9.3' && matrix.ruby != 'jruby-9.4' }}")) expect(workflows).to all(include(" - name: Bundle install for legacy Ruby engine")) From 1712309cb02047609d6adb9803566cc9602099cb Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 02:01:06 -0400 Subject: [PATCH 005/137] =?UTF-8?q?=F0=9F=8E=A8=20Refresh=20RuboCop=20Grad?= =?UTF-8?q?ual=20worklist?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kettle-jem/.rubocop_gradual.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/kettle-jem/.rubocop_gradual.lock b/gems/kettle-jem/.rubocop_gradual.lock index 999300eba..51182ed0b 100644 --- a/gems/kettle-jem/.rubocop_gradual.lock +++ b/gems/kettle-jem/.rubocop_gradual.lock @@ -10,7 +10,7 @@ [3, 1, 67, "RSpec/SpecFilePathFormat: Spec path should end with `kettle/jem*appraisal_helpers_and_template_tokens*_spec.rb`.", 1438226331], [3, 29, 39, "RSpec/DescribeMethod: The second argument to describe should be the method being tested. '#instance' or '.class'.", 1357968070] ], - "spec/integration/appraisals_and_gemfile_template_spec.rb:1874368535": [ + "spec/integration/appraisals_and_gemfile_template_spec.rb:1951355232": [ [3, 1, 63, "RSpec/SpecFilePathFormat: Spec path should end with `kettle/jem*Appraisals_and_Gemfile_templating*_spec.rb`.", 2367084249], [3, 29, 35, "RSpec/DescribeMethod: The second argument to describe should be the method being tested. '#instance' or '.class'.", 1539510212] ], From bc629387716eaf72722b22337faa3510792fbf01 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 12:38:37 -0400 Subject: [PATCH 006/137] =?UTF-8?q?=F0=9F=90=9B=20Honor=20local=20kettle-d?= =?UTF-8?q?ev=20overrides=20in=20coverage=20Gemfiles?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kettle-jem/.rubocop_gradual.lock | 6 +++--- gems/kettle-jem/CHANGELOG.md | 2 ++ gems/kettle-jem/gemfiles/modular/coverage_local.gemfile | 2 +- .../gemfiles/modular/coverage_local.gemfile.example | 2 +- .../integration/appraisals_and_gemfile_template_spec.rb | 4 ++++ 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/gems/kettle-jem/.rubocop_gradual.lock b/gems/kettle-jem/.rubocop_gradual.lock index 51182ed0b..224c9df7a 100644 --- a/gems/kettle-jem/.rubocop_gradual.lock +++ b/gems/kettle-jem/.rubocop_gradual.lock @@ -10,7 +10,7 @@ [3, 1, 67, "RSpec/SpecFilePathFormat: Spec path should end with `kettle/jem*appraisal_helpers_and_template_tokens*_spec.rb`.", 1438226331], [3, 29, 39, "RSpec/DescribeMethod: The second argument to describe should be the method being tested. '#instance' or '.class'.", 1357968070] ], - "spec/integration/appraisals_and_gemfile_template_spec.rb:1951355232": [ + "spec/integration/appraisals_and_gemfile_template_spec.rb:3090409691": [ [3, 1, 63, "RSpec/SpecFilePathFormat: Spec path should end with `kettle/jem*Appraisals_and_Gemfile_templating*_spec.rb`.", 2367084249], [3, 29, 35, "RSpec/DescribeMethod: The second argument to describe should be the method being tested. '#instance' or '.class'.", 1539510212] ], @@ -42,7 +42,7 @@ [3, 1, 53, "RSpec/SpecFilePathFormat: Spec path should end with `kettle/jem*shim_profile_templating*_spec.rb`.", 837334745], [3, 29, 25, "RSpec/DescribeMethod: The second argument to describe should be the method being tested. '#instance' or '.class'.", 2022445956] ], - "spec/integration/structural_merge_template_spec.rb:3622399347": [ + "spec/integration/structural_merge_template_spec.rb:425128448": [ [3, 1, 64, "RSpec/SpecFilePathFormat: Spec path should end with `kettle/jem*structural_merge_template_behavior*_spec.rb`.", 1693815617], [3, 29, 36, "RSpec/DescribeMethod: The second argument to describe should be the method being tested. '#instance' or '.class'.", 3903270460] ], @@ -50,7 +50,7 @@ [3, 1, 71, "RSpec/SpecFilePathFormat: Spec path should end with `kettle/jem*template_selection_and_bootstrap_behavior*_spec.rb`.", 2832878461], [3, 29, 43, "RSpec/DescribeMethod: The second argument to describe should be the method being tested. '#instance' or '.class'.", 1664161888] ], - "spec/system/install_orchestration_spec.rb:3812250873": [ + "spec/system/install_orchestration_spec.rb:3071678840": [ [3, 1, 70, "RSpec/SpecFilePathFormat: Spec path should end with `kettle/jem*install_and_local_orchestration_behavior*_spec.rb`.", 1687390280], [3, 29, 42, "RSpec/DescribeMethod: The second argument to describe should be the method being tested. '#instance' or '.class'.", 2090400053] ] diff --git a/gems/kettle-jem/CHANGELOG.md b/gems/kettle-jem/CHANGELOG.md index 4b09b58ce..0e98ea87d 100644 --- a/gems/kettle-jem/CHANGELOG.md +++ b/gems/kettle-jem/CHANGELOG.md @@ -34,6 +34,8 @@ Please file a bug if you notice a violation of semantic versioning. - Keep branch-stack release CI active by managing the r*_*-*-v* GitHub Actions push trigger. +- Allow KETTLE_DEV_DEV to override a directly declared kettle-dev development dependency in local coverage Gemfiles. + ### Security ## [7.1.25] - 2026-09-08 diff --git a/gems/kettle-jem/gemfiles/modular/coverage_local.gemfile b/gems/kettle-jem/gemfiles/modular/coverage_local.gemfile index 51445ca33..f67278b29 100644 --- a/gems/kettle-jem/gemfiles/modular/coverage_local.gemfile +++ b/gems/kettle-jem/gemfiles/modular/coverage_local.gemfile @@ -30,7 +30,7 @@ require "nomono/bundler" local_gems = %w[kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift] declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -local_gems_to_eval = local_gems - %w[] - declared_gems +local_gems_to_eval = local_gems - %w[] - (declared_gems - %w[kettle-dev]) # export KETTLE_DEV_DEV=/path/to/my platform :mri do diff --git a/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/coverage_local.gemfile.example b/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/coverage_local.gemfile.example index 270af67dc..f518ca282 100644 --- a/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/coverage_local.gemfile.example +++ b/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/coverage_local.gemfile.example @@ -7,7 +7,7 @@ local_gems = %w[{KJ|KETTLE_DEV_LOCAL_GEMS}] declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -local_gems_to_eval = local_gems - %w[{KJ|PACKAGE_NAME}] - declared_gems +local_gems_to_eval = local_gems - %w[{KJ|PACKAGE_NAME}] - (declared_gems - %w[kettle-dev]) # export KETTLE_DEV_DEV=/path/to/my platform :mri do diff --git a/gems/kettle-jem/spec/integration/appraisals_and_gemfile_template_spec.rb b/gems/kettle-jem/spec/integration/appraisals_and_gemfile_template_spec.rb index cbc1fde80..9d52bee4d 100644 --- a/gems/kettle-jem/spec/integration/appraisals_and_gemfile_template_spec.rb +++ b/gems/kettle-jem/spec/integration/appraisals_and_gemfile_template_spec.rb @@ -1443,6 +1443,7 @@ it "keeps kettle-dev local overrides available for kettle-jem transitive runtime dependencies" do template = File.read(File.expand_path("../../lib/kettle/jem/templates/gemfiles/modular/templating_local.gemfile.example", __dir__)) + coverage_template = File.read(File.expand_path("../../lib/kettle/jem/templates/gemfiles/modular/coverage_local.gemfile.example", __dir__)) expect(template).to include(" html-merge\n") expect(template).to include( @@ -1454,6 +1455,9 @@ expect(template).to include( "kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[{KJ|PACKAGE_NAME}] - (declared_gems - %w[kettle-dev])" ) + expect(coverage_template).to include( + "local_gems_to_eval = local_gems - %w[{KJ|PACKAGE_NAME}] - (declared_gems - %w[kettle-dev])" + ) expect(template).not_to include("platform :mri do") end From 25f4692adfcb7570553d5aff0265dc35352c1cba Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 13:56:49 -0400 Subject: [PATCH 007/137] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Raise=20kettle-jem?= =?UTF-8?q?=20dependency=20floors?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kettle-jem/CHANGELOG.md | 4 ++++ gems/kettle-jem/lib/kettle/jem.rb | 4 ++-- .../jem/templates/gemfiles/modular/style.gemfile.example | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gems/kettle-jem/CHANGELOG.md b/gems/kettle-jem/CHANGELOG.md index 0e98ea87d..cc1d68b91 100644 --- a/gems/kettle-jem/CHANGELOG.md +++ b/gems/kettle-jem/CHANGELOG.md @@ -24,6 +24,10 @@ Please file a bug if you notice a violation of semantic versioning. ### Changed +- [kc] kettle-jem-deps-floor: Update kettle-jem template dependency floors: + - kettle-family (>= 1.2.97 -> >= 1.2.99) + - rubocop-lts-rspec (>= 1.0.5 -> >= 1.0.6) + ### Deprecated ### Removed diff --git a/gems/kettle-jem/lib/kettle/jem.rb b/gems/kettle-jem/lib/kettle/jem.rb index 83a400478..9df2ee08f 100644 --- a/gems/kettle-jem/lib/kettle/jem.rb +++ b/gems/kettle-jem/lib/kettle/jem.rb @@ -5498,7 +5498,7 @@ def monorepo_root_gemfile_dependency_lines {name: "bundler-audit", source: %(gem "bundler-audit", "~> 0.9.3"\n)}, {name: "kettle-dev", source: %(gem "kettle-dev", "~> 3.0", ">= 3.0.33"\n)}, {name: "kettle-drift", source: %(gem "kettle-drift", "~> 1.0", ">= 1.0.13"\n)}, - {name: "kettle-family", source: %(gem "kettle-family", "~> 1.2", ">= 1.2.97"\n)}, + {name: "kettle-family", source: %(gem "kettle-family", "~> 1.2", ">= 1.2.99"\n)}, {name: PACKAGE_NAME, source: kettle_jem_dependency_source}, {name: "kettle-test", source: %(gem "kettle-test", "~> 2.0", ">= 2.0.21"\n)}, {name: "rake", source: %(gem "rake", "~> 13.0"\n)}, @@ -15526,7 +15526,7 @@ def kettle_dev_local_gems(config) def main_gemfile_kettle_family_gem(package_name) return "" if package_name.to_s == "kettle-family" - %(gem "kettle-family", "~> 1.2", ">= 1.2.97"\n) + %(gem "kettle-family", "~> 1.2", ">= 1.2.99"\n) end def main_gemfile_nomono_bootstrap(package_name) diff --git a/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/style.gemfile.example b/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/style.gemfile.example index a47b54b71..072b2964b 100644 --- a/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/style.gemfile.example +++ b/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/style.gemfile.example @@ -25,7 +25,7 @@ platform :mri do if ENV.fetch("RUBOCOP_LTS_DEV", "false").casecmp("false").zero? declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) gem "rubocop-lts", {KJ|RUBOCOP_LTS_CONSTRAINT} unless declared_gems.include?("rubocop-lts") - gem "rubocop-lts-rspec", "~> 1.0", ">= 1.0.5" unless declared_gems.include?("rubocop-lts-rspec") + gem "rubocop-lts-rspec", "~> 1.0", ">= 1.0.6" unless declared_gems.include?("rubocop-lts-rspec") gem "{KJ|RUBOCOP_RUBY_GEM}", {KJ|RUBOCOP_RUBY_CONSTRAINT} unless declared_gems.include?("{KJ|RUBOCOP_RUBY_GEM}") else eval_gemfile("style_local.gemfile") From 4bfc8c40e39f51fcc93954ef0c23773d0144d472 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 17:42:53 -0400 Subject: [PATCH 008/137] =?UTF-8?q?=F0=9F=94=A7=20Upgrade=20family=20actio?= =?UTF-8?q?n=20pins=20by=20major?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 2 ++ mise.toml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac5c17a28..464e08c0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ Please file a bug if you notice a violation of semantic versioning. ### Changed +- Make the family GitHub Actions pin task request major upgrades. + ### Deprecated ### Removed diff --git a/mise.toml b/mise.toml index c2154ca3b..52d27c2e6 100644 --- a/mise.toml +++ b/mise.toml @@ -98,7 +98,7 @@ run = "bundle exec kettle-family clean-unreleased --execute" [tasks.pins] raw = true description = "Review and update GitHub Actions pins across the family" -run = "bundle exec kettle-family gha-sha-pins --execute" +run = "bundle exec kettle-family gha-sha-pins --upgrade major --execute" [tasks.release] description = "Publish dependency waves with the local templating graph available to aggregate coverage" From e99b3cd2304edbe456cc422dc5231d3a4c9db1cb Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 21:18:26 -0400 Subject: [PATCH 009/137] =?UTF-8?q?=F0=9F=90=9B=20Predeclare=20version=20g?= =?UTF-8?q?em=20heads=20overlap?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kettle-jem/.rubocop_gradual.lock | 2 +- gems/kettle-jem/CHANGELOG.md | 2 ++ gems/kettle-jem/lib/kettle/jem.rb | 2 ++ .../.structuredmerge/kettle-jem.yml.example | 10 ++++++- .../integration/template_bootstrap_spec.rb | 29 +++++++++++++++++-- 5 files changed, 41 insertions(+), 4 deletions(-) diff --git a/gems/kettle-jem/.rubocop_gradual.lock b/gems/kettle-jem/.rubocop_gradual.lock index 224c9df7a..1144ee0d4 100644 --- a/gems/kettle-jem/.rubocop_gradual.lock +++ b/gems/kettle-jem/.rubocop_gradual.lock @@ -46,7 +46,7 @@ [3, 1, 64, "RSpec/SpecFilePathFormat: Spec path should end with `kettle/jem*structural_merge_template_behavior*_spec.rb`.", 1693815617], [3, 29, 36, "RSpec/DescribeMethod: The second argument to describe should be the method being tested. '#instance' or '.class'.", 3903270460] ], - "spec/integration/template_bootstrap_spec.rb:2994664124": [ + "spec/integration/template_bootstrap_spec.rb:2276953371": [ [3, 1, 71, "RSpec/SpecFilePathFormat: Spec path should end with `kettle/jem*template_selection_and_bootstrap_behavior*_spec.rb`.", 2832878461], [3, 29, 43, "RSpec/DescribeMethod: The second argument to describe should be the method being tested. '#instance' or '.class'.", 1664161888] ], diff --git a/gems/kettle-jem/CHANGELOG.md b/gems/kettle-jem/CHANGELOG.md index cc1d68b91..ffa3a574c 100644 --- a/gems/kettle-jem/CHANGELOG.md +++ b/gems/kettle-jem/CHANGELOG.md @@ -40,6 +40,8 @@ Please file a bug if you notice a violation of semantic versioning. - Allow KETTLE_DEV_DEV to override a directly declared kettle-dev development dependency in local coverage Gemfiles. +- Predeclare the intentional version_gem runtime-heads dependency overlap in generated Kettle Jem configuration. + ### Security ## [7.1.25] - 2026-09-08 diff --git a/gems/kettle-jem/lib/kettle/jem.rb b/gems/kettle-jem/lib/kettle/jem.rb index 9df2ee08f..e973b71bd 100644 --- a/gems/kettle-jem/lib/kettle/jem.rb +++ b/gems/kettle-jem/lib/kettle/jem.rb @@ -14397,6 +14397,7 @@ def template_tokens(facts, funding) github_org = facts.fetch(:repository, {})[:slug].to_s.split("/", 2).first.to_s if github_org.empty? tokens = { "KJ|GEM_NAME" => package.fetch(:name).to_s, + "KJ|GEMSPEC_PATH" => rubygems.fetch(:gemspec_path, "").to_s, "KJ|PACKAGE_SUMMARY" => package.fetch(:summary, package.fetch(:description, "")).to_s, "KJ|PACKAGE_DESCRIPTION" => package.fetch(:description, package.fetch(:summary, "")).to_s, "KJ|GEMSPEC_PACKAGE_SUMMARY" => ruby_double_quoted_string_body(strip_leading_decorative_graphemes(package.fetch(:summary, package.fetch(:description, "")).to_s)), @@ -18626,6 +18627,7 @@ def kettle_config_bootstrap_recipe(bootstrap) ) recipe[:template_preference] = bootstrap.fetch(:template_preference) recipe[:template_tokens] = { + "KJ|GEMSPEC_PATH" => bootstrap[:gemspec_path].to_s, "KJ|MIN_DIVERGENCE_THRESHOLD" => bootstrap.fetch(:min_divergence_threshold).to_s, "KJ|MIN_RUBY" => bootstrap[:min_ruby].to_s, "KJ|MIN_TEST_RUBY" => bootstrap[:test_min_ruby].to_s, diff --git a/gems/kettle-jem/lib/kettle/jem/templates/.structuredmerge/kettle-jem.yml.example b/gems/kettle-jem/lib/kettle/jem/templates/.structuredmerge/kettle-jem.yml.example index e6f0c911c..500207c63 100644 --- a/gems/kettle-jem/lib/kettle/jem/templates/.structuredmerge/kettle-jem.yml.example +++ b/gems/kettle-jem/lib/kettle/jem/templates/.structuredmerge/kettle-jem.yml.example @@ -108,7 +108,15 @@ author_aliases: dependency_conflicts: # Set true only after every discovered conflict has an intentional action. reviewed: false - resolve: [] + resolve: + # The gemspec defines the released runtime contract. runtime_heads + # intentionally resolves version_gem from main to detect upstream changes + # before release, so both declarations must remain. + - gem: version_gem + direct: "{KJ|GEMSPEC_PATH}" + modular: gemfiles/modular/runtime_heads.gemfile + action: keep_both + reason: "The gemspec declares the released runtime contract while runtime_heads intentionally tests version_gem from main." # This project's identifying emoji. # Used as the leading emoji in the README H1 heading and in the gemspec diff --git a/gems/kettle-jem/spec/integration/template_bootstrap_spec.rb b/gems/kettle-jem/spec/integration/template_bootstrap_spec.rb index 3de2c4c60..fb8c8cd02 100644 --- a/gems/kettle-jem/spec/integration/template_bootstrap_spec.rb +++ b/gems/kettle-jem/spec/integration/template_bootstrap_spec.rb @@ -179,6 +179,7 @@ packaged_config_template = File.read(File.join(described_class::PACKAGED_TEMPLATE_ROOT, ".structuredmerge/kettle-jem.yml.example")) expect(packaged_config_template).to include('family_tag: "{KJ|RUBYFORUM:FAMILY_TAG}"') expect(packaged_config_template).to include('project_tag: "{KJ|RUBYFORUM:PROJECT_TAG}"') + expect(packaged_config_template).to include('direct: "{KJ|GEMSPEC_PATH}"') write_tree(root, { "example.gemspec" => <<~RUBY @@ -204,8 +205,18 @@ expect(bootstrap_report.fetch(:final_content)).to include("# kettle-jem configuration file") expect(bootstrap_report.fetch(:final_content)).to include("min_divergence_threshold: 7") expect(bootstrap_report.fetch(:final_content)).to include("# tokens - values for {KJ|...} placeholders used across template files") - expect(YAML.safe_load(bootstrap_report.fetch(:final_content)).dig("rubyforum", "family_tag")).to eq("") - expect(YAML.safe_load(bootstrap_report.fetch(:final_content)).dig("rubyforum", "project_tag")).to eq("") + bootstrap_config = YAML.safe_load(bootstrap_report.fetch(:final_content)) + expect(bootstrap_config.dig("rubyforum", "family_tag")).to eq("") + expect(bootstrap_config.dig("rubyforum", "project_tag")).to eq("") + expect(bootstrap_config.dig("dependency_conflicts", "resolve")).to include( + { + "gem" => "version_gem", + "direct" => "example.gemspec", + "modular" => "gemfiles/modular/runtime_heads.gemfile", + "action" => "keep_both", + "reason" => "The gemspec declares the released runtime contract while runtime_heads intentionally tests version_gem from main." + } + ) described_class.apply_project(root, env: {"KJ_MIN_DIVERGENCE_THRESHOLD" => "7"}) applied_config = File.read(File.join(root, ".structuredmerge/kettle-jem.yml")) @@ -215,6 +226,20 @@ "version" => described_class::VERSION, "checksums" => a_kind_of(Hash) ) + + reports = [ + { + relative_path: "example.gemspec", + final_content: %(spec.add_dependency("version_gem", "~> 1.1", ">= 1.1.15")\n) + }, + { + relative_path: "gemfiles/modular/runtime_heads.gemfile", + final_content: %(gem "version_gem", github: "ruby-oauth/version_gem", branch: "main"\n) + } + ] + expect { + described_class.validate_modular_dependency_conflicts!(root, reports) + }.not_to raise_error end end From 1d65c8193a181563732a3942b52398c5f715b037 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:36:50 -0400 Subject: [PATCH 010/137] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Raise=20kettle-jem?= =?UTF-8?q?=20dependency=20floors?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kettle-jem/CHANGELOG.md | 4 ++-- gems/kettle-jem/lib/kettle/jem.rb | 8 ++++---- .../lib/kettle/jem/templates/gem.gemspec.example | 2 +- .../lib/kettle/jem/templates/shim/gem.gemspec.example | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gems/kettle-jem/CHANGELOG.md b/gems/kettle-jem/CHANGELOG.md index ffa3a574c..fa859b301 100644 --- a/gems/kettle-jem/CHANGELOG.md +++ b/gems/kettle-jem/CHANGELOG.md @@ -25,8 +25,8 @@ Please file a bug if you notice a violation of semantic versioning. ### Changed - [kc] kettle-jem-deps-floor: Update kettle-jem template dependency floors: - - kettle-family (>= 1.2.97 -> >= 1.2.99) - - rubocop-lts-rspec (>= 1.0.5 -> >= 1.0.6) + - kettle-dev (>= 3.0.33 -> >= 3.0.34) + - kettle-family (>= 1.2.97 -> >= 1.2.100) ### Deprecated diff --git a/gems/kettle-jem/lib/kettle/jem.rb b/gems/kettle-jem/lib/kettle/jem.rb index e973b71bd..16241b7ed 100644 --- a/gems/kettle-jem/lib/kettle/jem.rb +++ b/gems/kettle-jem/lib/kettle/jem.rb @@ -58,7 +58,7 @@ class Error < StandardError; end # set in place before Bundler is allowed to evaluate that destination. TEMPLATE_MANAGED_DEPENDENCIES = [ {name: "nomono", requirements: ["~> 1.1", ">= 1.1.5"], bootstrap: true}, - {name: "kettle-dev", requirements: ["~> 3.0", ">= 3.0.33"], bootstrap: true}, + {name: "kettle-dev", requirements: ["~> 3.0", ">= 3.0.34"], bootstrap: true}, { name: "kettle-changelog", requirements: ["~> 1.0", ">= 1.0.7"], @@ -5496,9 +5496,9 @@ def monorepo_root_gemfile_dependency_lines [ {name: "appraisal2", source: %(gem "appraisal2", "~> 3.2", ">= 3.2.3"\n)}, {name: "bundler-audit", source: %(gem "bundler-audit", "~> 0.9.3"\n)}, - {name: "kettle-dev", source: %(gem "kettle-dev", "~> 3.0", ">= 3.0.33"\n)}, + {name: "kettle-dev", source: %(gem "kettle-dev", "~> 3.0", ">= 3.0.34"\n)}, {name: "kettle-drift", source: %(gem "kettle-drift", "~> 1.0", ">= 1.0.13"\n)}, - {name: "kettle-family", source: %(gem "kettle-family", "~> 1.2", ">= 1.2.99"\n)}, + {name: "kettle-family", source: %(gem "kettle-family", "~> 1.2", ">= 1.2.100"\n)}, {name: PACKAGE_NAME, source: kettle_jem_dependency_source}, {name: "kettle-test", source: %(gem "kettle-test", "~> 2.0", ">= 2.0.21"\n)}, {name: "rake", source: %(gem "rake", "~> 13.0"\n)}, @@ -15527,7 +15527,7 @@ def kettle_dev_local_gems(config) def main_gemfile_kettle_family_gem(package_name) return "" if package_name.to_s == "kettle-family" - %(gem "kettle-family", "~> 1.2", ">= 1.2.99"\n) + %(gem "kettle-family", "~> 1.2", ">= 1.2.100"\n) end def main_gemfile_nomono_bootstrap(package_name) diff --git a/gems/kettle-jem/lib/kettle/jem/templates/gem.gemspec.example b/gems/kettle-jem/lib/kettle/jem/templates/gem.gemspec.example index 8242bab7b..362ff238c 100644 --- a/gems/kettle-jem/lib/kettle/jem/templates/gem.gemspec.example +++ b/gems/kettle-jem/lib/kettle/jem/templates/gem.gemspec.example @@ -118,7 +118,7 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency("kettle-dev", "~> 3.0", ">= 3.0.33") # ruby >= {KJ|MIN_TEST_RUBY} + spec.add_development_dependency("kettle-dev", "~> 3.0", ">= 3.0.34") # ruby >= {KJ|MIN_TEST_RUBY} # Security spec.add_development_dependency("bundler-audit", "~> 0.9.3") # ruby >= 2.0.0 diff --git a/gems/kettle-jem/lib/kettle/jem/templates/shim/gem.gemspec.example b/gems/kettle-jem/lib/kettle/jem/templates/shim/gem.gemspec.example index ad86e073c..b58cc6679 100644 --- a/gems/kettle-jem/lib/kettle/jem/templates/shim/gem.gemspec.example +++ b/gems/kettle-jem/lib/kettle/jem/templates/shim/gem.gemspec.example @@ -30,7 +30,7 @@ Gem::Specification.new do |spec| spec.add_dependency "{KJ|SHIMMED_GEM_NAME}" # Dev, Test, & Release Tasks - spec.add_development_dependency("kettle-dev", "~> 3.0", ">= 3.0.33") # ruby >= {KJ|MIN_TEST_RUBY} + spec.add_development_dependency("kettle-dev", "~> 3.0", ">= 3.0.34") # ruby >= {KJ|MIN_TEST_RUBY} # Tasks spec.add_development_dependency "rake", "~> 13.0" From 649dd554345298c93754cfdcb62bc6749e6fc9f7 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:44:14 -0400 Subject: [PATCH 011/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Update=20family?= =?UTF-8?q?=20root=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile.lock | 58 ++++++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 42382da4e..ca8053378 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -394,21 +394,21 @@ GEM ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) version_gem (~> 1.1, >= 1.1.15) - kettle-dev (3.0.33) + kettle-dev (3.0.34) emoji_regex (>= 15.0) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.15) - kettle-rb (~> 0.1, >= 0.1.11) + kettle-rb (~> 0.1, >= 0.1.12) kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) kettle-drift (1.0.13) version_gem (~> 1.1, >= 1.1.15) - kettle-family (1.2.97) + kettle-family (1.2.100) command_kit (~> 0.6) command_kit-completion (~> 0.1) kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.33) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-jem (~> 7.1, >= 7.1.23) kettle-test (~> 2.0, >= 2.0.21) @@ -422,7 +422,7 @@ GEM version_gem (~> 1.1, >= 1.1.15) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) - kettle-rb (0.1.11) + kettle-rb (0.1.12) kettle-soup-cover (3.0.10) kettle-wash (~> 0.1, >= 0.1.6) simplecov (>= 1.0) @@ -450,7 +450,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.17.0) + markly (0.19.0) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -548,11 +548,11 @@ GEM parallel (~> 1.10) rainbow (>= 2.2.2, < 4.0) rubocop (~> 1.0) - rubocop-lts (24.2.2) - rubocop-ruby3_2 (~> 3.0, >= 3.0.1) - standard-rubocop-lts (~> 2.0, >= 2.0.3) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-rspec (1.0.5) + rubocop-lts (24.2.3) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-rspec (1.0.6) rubocop (~> 1.84, >= 1.84.2) rubocop-env (~> 0.1, >= 0.1.0) rubocop-factory_bot (~> 2.28, >= 2.28.0) @@ -560,8 +560,8 @@ GEM rubocop-rspec-extra (~> 0.3, >= 0.3.0) standard (~> 1.54, >= 1.54.0) standard-rspec (~> 0.5, >= 0.5.0) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-ruby (0.1.3) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-ruby (0.1.4) lint_roller (~> 1.1) rubocop (>= 1.72.1, < 2.0) version_gem (~> 1.1, >= 1.1.15) @@ -598,13 +598,13 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-rspec (~> 3.5) - rubocop-ruby3_2 (3.0.7) + rubocop-ruby3_2 (3.0.8) rubocop-gradual (~> 0.3, >= 0.3.6) rubocop-md (~> 2.0, >= 2.0.4) rubocop-rake (~> 0.7, >= 0.7.1) rubocop-thread_safety (~> 0.7, >= 0.7.3) - standard-rubocop-lts (~> 2.0, >= 2.0.9) - version_gem (~> 1.1, >= 1.1.13) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) rubocop-thread_safety (0.7.3) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) @@ -629,7 +629,7 @@ GEM simplecov (>= 0.4.1) simplecov_lcov_formatter (0.9.0) simplecov (>= 0.18) - sorbet-runtime (0.6.13486) + sorbet-runtime (0.6.13490) standard (1.56.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) @@ -648,8 +648,8 @@ GEM rubocop-factory_bot (~> 2.27) rubocop-rspec (~> 3.9) rubocop-rspec_rails (~> 2.31) - standard-rubocop-lts (2.0.12) - rubocop-lts-ruby (~> 0.1, >= 0.1.0) + standard-rubocop-lts (2.0.13) + rubocop-lts-ruby (~> 0.1, >= 0.1.4) standard (~> 1.54, >= 1.54.0) standard-custom (~> 1.0, >= 1.0.2) standard-performance (~> 1.9, >= 1.9.0) @@ -865,13 +865,13 @@ CHECKSUMS json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f + kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 - kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 + kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f - kettle-rb (0.1.11) sha256=3e50b413048906f2c5aea69ff805fbf8f7f2b5ea9d9e3d95151d38d97d6640f3 + kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed @@ -882,7 +882,7 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.8) - markly (0.17.0) sha256=fab61b604f7c4c8f771c3b7f2f16b971034bb72ddd27009b90c3fae1990b17e6 + markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca markly-merge (7.1.8) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 @@ -928,9 +928,9 @@ CHECKSUMS rubocop-env (0.1.0) sha256=5ab9a259e71822bf514c8e900a9b68cc2f74ccc87d5493efcd03213f3068e718 rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb rubocop-gradual (0.4.0) sha256=9c7e584e6fef6c2539266a193a4572c970c22f99046fd6b0305bdde6228f96ad - rubocop-lts (24.2.2) sha256=be6c745e1bb61daebd6af3cc3227c60f95be9f642a080773cad7df14c5f9f174 - rubocop-lts-rspec (1.0.5) sha256=439552fd27440802cc499889e013bffa28aadc41adae5d4dfff3d984a2a809b4 - rubocop-lts-ruby (0.1.3) sha256=fa002117b94c5eb403eb476d5fde393913dbcc4253b6151ed9a3393c73fd3916 + rubocop-lts (24.2.3) sha256=510ca38a90393c7c5cac0e0defa35151805797b1ff9a2d130b649c20c2ca0842 + rubocop-lts-rspec (1.0.6) sha256=b7f7dae919c9712dee09df76b027563e154f510d9b4423bb0453394b5474cf38 + rubocop-lts-ruby (0.1.4) sha256=eb0039d61d645d2b6754abd4006842945b7848a916a664f522f5e2f7a5a69bf1 rubocop-md (2.0.4) sha256=0d076b6b5e99dea2ddc928c4bd702497decb9a8400da7808091e02ebcafcfb93 rubocop-minitest (0.40.0) sha256=353c698199115f12151144cf0b5a96f69bb9d77b660cf6536df2c4250c672a9d rubocop-on-rbs (2.0.0) sha256=ce74d1b3d5daead19f4b611623656c185821dfc9aed9c7079bb1e5d7d7c464be @@ -940,7 +940,7 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-rspec-extra (0.3.0) sha256=ee4b6484d0332a0d23c4a465eeb607e41888eb3d4ed479f850b9f5212514f787 rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 - rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 + rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 ruby-merge (7.1.8) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 @@ -955,12 +955,12 @@ CHECKSUMS simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.8) - sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f + sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2 standard-rspec (0.5.0) sha256=64d396524a65af47f5331b423d8cdd313e0267401647bb7892489ca89dad2973 - standard-rubocop-lts (2.0.12) sha256=4b55efc56691d4edef197df8df27ffebdb4a273e26d7bf00799d00ac6a71532f + standard-rubocop-lts (2.0.13) sha256=acc0f7e73db0215a50b5e2df01fbf1b6bbcc68bb128f429f970db3fdd62a8243 stone_checksums (1.0.8) sha256=91c5453d6c67c468653bf5396a33936c85d7731077be756ed0ff7eb78f981117 stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1 strings-ansi (0.2.0) sha256=90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88 From f628beec6a0edfb4cab967535e9f474f6cd5a82f Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:44:16 -0400 Subject: [PATCH 012/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/tree_haver/Gemfile.lock | 503 +++++++++++++++++++++++++---------- 1 file changed, 361 insertions(+), 142 deletions(-) diff --git a/gems/tree_haver/Gemfile.lock b/gems/tree_haver/Gemfile.lock index 459101eaf..713796a1b 100644 --- a/gems/tree_haver/Gemfile.lock +++ b/gems/tree_haver/Gemfile.lock @@ -16,46 +16,313 @@ PATH tree_sitter_language_pack (>= 1.16.2, < 2.0) version_gem (~> 1.1, >= 1.1.15) -GEM - remote: https://gem.coop/ +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - backports (3.25.3) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.8) + ast-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge + specs: + html-merge (7.1.8) + ast-crispr (= 7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.8) + toml (~> 0.3) + toml-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.8) + ast-merge (= 7.1.8) + ast-merge-git (= 7.1.8) + bash-merge (= 7.1.8) + diff-lcs (~> 1.5) + dotenv-merge (= 7.1.8) + go-merge (= 7.1.8) + html-merge (= 7.1.8) + json-merge (= 7.1.8) + kettle-jem (~> 7.1, >= 7.1.18) + markdown-merge (= 7.1.8) + plain-merge (= 7.1.8) + prism-merge (= 7.1.8) + psych-merge (= 7.1.8) + rbs-merge (= 7.1.8) + rust-merge (= 7.1.8) + toml-merge (= 7.1.8) + typescript-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.8) + binary-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +GEM + remote: https://gem.coop/ + specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -63,11 +330,6 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -75,10 +337,6 @@ GEM command_kit (~> 0.1) completely (~> 0.6) commonmarker (2.10.0-x86_64-linux) - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -92,11 +350,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -146,27 +399,25 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) version_gem (~> 1.1, >= 1.1.15) - kettle-dev (3.0.33) + kettle-dev (3.0.34) emoji_regex (>= 15.0) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.15) - kettle-rb (~> 0.1, >= 0.1.11) + kettle-rb (~> 0.1, >= 0.1.12) kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-family (1.2.97) + kettle-drift (1.0.13) + version_gem (~> 1.1, >= 1.1.15) + kettle-family (1.2.100) command_kit (~> 0.6) command_kit-completion (~> 0.1) kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.33) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-jem (~> 7.1, >= 7.1.23) kettle-test (~> 2.0, >= 2.0.21) @@ -178,39 +429,9 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) - kettle-rb (0.1.11) + kettle-rb (0.1.12) kettle-soup-cover (3.0.10) kettle-wash (~> 0.1, >= 0.1.6) simplecov (>= 1.0) @@ -233,24 +454,12 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - markly (0.17.0) - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) + markly (0.19.0) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -268,28 +477,13 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -298,11 +492,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -369,11 +558,11 @@ GEM parallel (~> 1.10) rainbow (>= 2.2.2, < 4.0) rubocop (~> 1.0) - rubocop-lts (24.2.2) - rubocop-ruby3_2 (~> 3.0, >= 3.0.1) - standard-rubocop-lts (~> 2.0, >= 2.0.3) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-rspec (1.0.5) + rubocop-lts (24.2.3) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-rspec (1.0.6) rubocop (~> 1.84, >= 1.84.2) rubocop-env (~> 0.1, >= 0.1.0) rubocop-factory_bot (~> 2.28, >= 2.28.0) @@ -381,8 +570,8 @@ GEM rubocop-rspec-extra (~> 0.3, >= 0.3.0) standard (~> 1.54, >= 1.54.0) standard-rspec (~> 0.5, >= 0.5.0) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-ruby (0.1.3) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-ruby (0.1.4) lint_roller (~> 1.1) rubocop (>= 1.72.1, < 2.0) version_gem (~> 1.1, >= 1.1.15) @@ -416,21 +605,17 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-rspec (~> 3.5) - rubocop-ruby3_2 (3.0.7) + rubocop-ruby3_2 (3.0.8) rubocop-gradual (~> 0.3, >= 0.3.6) rubocop-md (~> 2.0, >= 2.0.4) rubocop-rake (~> 0.7, >= 0.7.1) rubocop-thread_safety (~> 0.7, >= 0.7.3) - standard-rubocop-lts (~> 2.0, >= 2.0.9) - version_gem (~> 1.1, >= 1.1.13) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) rubocop-thread_safety (0.7.3) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -451,7 +636,7 @@ GEM simplecov (>= 0.4.1) simplecov_lcov_formatter (0.9.0) simplecov (>= 0.18) - sorbet-runtime (0.6.13486) + sorbet-runtime (0.6.13490) standard (1.56.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) @@ -470,8 +655,8 @@ GEM rubocop-factory_bot (~> 2.27) rubocop-rspec (~> 3.9) rubocop-rspec_rails (~> 2.31) - standard-rubocop-lts (2.0.12) - rubocop-lts-ruby (~> 0.1, >= 0.1.0) + standard-rubocop-lts (2.0.13) + rubocop-lts-ruby (~> 0.1, >= 0.1.4) standard (~> 1.54, >= 1.54.0) standard-custom (~> 1.0, >= 1.0.2) standard-performance (~> 1.9, >= 1.9.0) @@ -493,10 +678,6 @@ GEM version_gem (~> 1.1, >= 1.1.15) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) @@ -522,10 +703,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -557,25 +734,49 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) + ast-crispr! + ast-crispr-markdown-markly! + ast-crispr-ruby-prism! + ast-merge! + ast-merge-git! + ast-template! + bash-merge! benchmark (~> 0.5, >= 0.5.0) + binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) + go-merge! + html-merge! irb (~> 1.17) + json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) + kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) + kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -585,16 +786,22 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) toml (~> 0.3) + toml-merge! toml-rb (~> 4.1) tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) + yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -602,6 +809,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -614,10 +822,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) + ast-merge-git (7.1.8) + ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -650,18 +861,21 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d + go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 + html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 + kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 + kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f - kettle-rb (0.1.11) sha256=3e50b413048906f2c5aea69ff805fbf8f7f2b5ea9d9e3d95151d38d97d6640f3 + kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed @@ -672,7 +886,7 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.8) - markly (0.17.0) sha256=fab61b604f7c4c8f771c3b7f2f16b971034bb72ddd27009b90c3fae1990b17e6 + markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca markly-merge (7.1.8) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 @@ -684,6 +898,7 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 + parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -718,9 +933,9 @@ CHECKSUMS rubocop-env (0.1.0) sha256=5ab9a259e71822bf514c8e900a9b68cc2f74ccc87d5493efcd03213f3068e718 rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb rubocop-gradual (0.4.0) sha256=9c7e584e6fef6c2539266a193a4572c970c22f99046fd6b0305bdde6228f96ad - rubocop-lts (24.2.2) sha256=be6c745e1bb61daebd6af3cc3227c60f95be9f642a080773cad7df14c5f9f174 - rubocop-lts-rspec (1.0.5) sha256=439552fd27440802cc499889e013bffa28aadc41adae5d4dfff3d984a2a809b4 - rubocop-lts-ruby (0.1.3) sha256=fa002117b94c5eb403eb476d5fde393913dbcc4253b6151ed9a3393c73fd3916 + rubocop-lts (24.2.3) sha256=510ca38a90393c7c5cac0e0defa35151805797b1ff9a2d130b649c20c2ca0842 + rubocop-lts-rspec (1.0.6) sha256=b7f7dae919c9712dee09df76b027563e154f510d9b4423bb0453394b5474cf38 + rubocop-lts-ruby (0.1.4) sha256=eb0039d61d645d2b6754abd4006842945b7848a916a664f522f5e2f7a5a69bf1 rubocop-md (2.0.4) sha256=0d076b6b5e99dea2ddc928c4bd702497decb9a8400da7808091e02ebcafcfb93 rubocop-minitest (0.40.0) sha256=353c698199115f12151144cf0b5a96f69bb9d77b660cf6536df2c4250c672a9d rubocop-on-rbs (2.0.0) sha256=ce74d1b3d5daead19f4b611623656c185821dfc9aed9c7079bb1e5d7d7c464be @@ -730,12 +945,13 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-rspec-extra (0.3.0) sha256=ee4b6484d0332a0d23c4a465eeb607e41888eb3d4ed479f850b9f5212514f787 rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 - rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 + rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 ruby-merge (7.1.8) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 + rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -743,12 +959,13 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f + smorg-rb (7.1.8) + sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2 standard-rspec (0.5.0) sha256=64d396524a65af47f5331b423d8cdd313e0267401647bb7892489ca89dad2973 - standard-rubocop-lts (2.0.12) sha256=4b55efc56691d4edef197df8df27ffebdb4a273e26d7bf00799d00ac6a71532f + standard-rubocop-lts (2.0.13) sha256=acc0f7e73db0215a50b5e2df01fbf1b6bbcc68bb128f429f970db3fdd62a8243 stone_checksums (1.0.8) sha256=91c5453d6c67c468653bf5396a33936c85d7731077be756ed0ff7eb78f981117 stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1 strings-ansi (0.2.0) sha256=90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88 @@ -768,6 +985,7 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 + typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -781,6 +999,7 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 + zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From ad126bb83ba61749ff5540a55517f6fe90e5aa15 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:44:18 -0400 Subject: [PATCH 013/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge/Gemfile.lock | 508 ++++++++++++++++++++++++++---------- 1 file changed, 365 insertions(+), 143 deletions(-) diff --git a/gems/ast-merge/Gemfile.lock b/gems/ast-merge/Gemfile.lock index 44a919206..905dd539e 100644 --- a/gems/ast-merge/Gemfile.lock +++ b/gems/ast-merge/Gemfile.lock @@ -16,6 +16,295 @@ PATH tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.8) + ast-crispr (= 7.1.8) + markdown-merge (= 7.1.8) + markly-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.8) + ast-crispr (= 7.1.8) + prism-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.8) + ast-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge + specs: + html-merge (7.1.8) + ast-crispr (= 7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.8) + toml (~> 0.3) + toml-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.8) + ast-merge (= 7.1.8) + ast-merge-git (= 7.1.8) + bash-merge (= 7.1.8) + diff-lcs (~> 1.5) + dotenv-merge (= 7.1.8) + go-merge (= 7.1.8) + html-merge (= 7.1.8) + json-merge (= 7.1.8) + kettle-jem (~> 7.1, >= 7.1.18) + markdown-merge (= 7.1.8) + plain-merge (= 7.1.8) + prism-merge (= 7.1.8) + psych-merge (= 7.1.8) + rbs-merge (= 7.1.8) + rust-merge (= 7.1.8) + toml-merge (= 7.1.8) + typescript-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.8) + binary-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + GEM remote: https://gem.coop/ specs: @@ -33,24 +322,7 @@ GEM rubocop (>= 1.0) version_gem (~> 1.1, >= 1.1.15) ast (2.4.3) - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) backports (3.25.3) - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -58,11 +330,6 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -75,10 +342,6 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -92,11 +355,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -146,27 +404,25 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) version_gem (~> 1.1, >= 1.1.15) - kettle-dev (3.0.33) + kettle-dev (3.0.34) emoji_regex (>= 15.0) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.15) - kettle-rb (~> 0.1, >= 0.1.11) + kettle-rb (~> 0.1, >= 0.1.12) kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-family (1.2.97) + kettle-drift (1.0.13) + version_gem (~> 1.1, >= 1.1.15) + kettle-family (1.2.100) command_kit (~> 0.6) command_kit-completion (~> 0.1) kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.33) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-jem (~> 7.1, >= 7.1.23) kettle-test (~> 2.0, >= 2.0.21) @@ -178,39 +434,9 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) - kettle-rb (0.1.11) + kettle-rb (0.1.12) kettle-soup-cover (3.0.10) kettle-wash (~> 0.1, >= 0.1.6) simplecov (>= 1.0) @@ -233,24 +459,12 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - markly (0.17.0) - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) + markly (0.19.0) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -278,28 +492,13 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -308,11 +507,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -379,11 +573,11 @@ GEM parallel (~> 1.10) rainbow (>= 2.2.2, < 4.0) rubocop (~> 1.0) - rubocop-lts (24.2.2) - rubocop-ruby3_2 (~> 3.0, >= 3.0.1) - standard-rubocop-lts (~> 2.0, >= 2.0.3) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-rspec (1.0.5) + rubocop-lts (24.2.3) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-rspec (1.0.6) rubocop (~> 1.84, >= 1.84.2) rubocop-env (~> 0.1, >= 0.1.0) rubocop-factory_bot (~> 2.28, >= 2.28.0) @@ -391,8 +585,8 @@ GEM rubocop-rspec-extra (~> 0.3, >= 0.3.0) standard (~> 1.54, >= 1.54.0) standard-rspec (~> 0.5, >= 0.5.0) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-ruby (0.1.3) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-ruby (0.1.4) lint_roller (~> 1.1) rubocop (>= 1.72.1, < 2.0) version_gem (~> 1.1, >= 1.1.15) @@ -426,21 +620,17 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-rspec (~> 3.5) - rubocop-ruby3_2 (3.0.7) + rubocop-ruby3_2 (3.0.8) rubocop-gradual (~> 0.3, >= 0.3.6) rubocop-md (~> 2.0, >= 2.0.4) rubocop-rake (~> 0.7, >= 0.7.1) rubocop-thread_safety (~> 0.7, >= 0.7.3) - standard-rubocop-lts (~> 2.0, >= 2.0.9) - version_gem (~> 1.1, >= 1.1.13) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) rubocop-thread_safety (0.7.3) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -461,7 +651,7 @@ GEM simplecov (>= 0.4.1) simplecov_lcov_formatter (0.9.0) simplecov (>= 0.18) - sorbet-runtime (0.6.13486) + sorbet-runtime (0.6.13490) standard (1.56.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) @@ -480,8 +670,8 @@ GEM rubocop-factory_bot (~> 2.27) rubocop-rspec (~> 3.9) rubocop-rspec_rails (~> 2.31) - standard-rubocop-lts (2.0.12) - rubocop-lts-ruby (~> 0.1, >= 0.1.0) + standard-rubocop-lts (2.0.13) + rubocop-lts-ruby (~> 0.1, >= 0.1.4) standard (~> 1.54, >= 1.54.0) standard-custom (~> 1.0, >= 1.0.2) standard-performance (~> 1.9, >= 1.9.0) @@ -501,18 +691,11 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -541,10 +724,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -582,26 +761,49 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) + ast-crispr! + ast-crispr-markdown-markly! + ast-crispr-ruby-prism! ast-merge! + ast-merge-git! + ast-template! + bash-merge! benchmark (~> 0.5, >= 0.5.0) + binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) + go-merge! + html-merge! irb (~> 1.17) + json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) + kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) + kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -611,13 +813,20 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) + toml-merge! + tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) + yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -625,6 +834,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -637,10 +847,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) + ast-merge-git (7.1.8) + ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -678,18 +891,21 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d + go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 + html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 + kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 + kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f - kettle-rb (0.1.11) sha256=3e50b413048906f2c5aea69ff805fbf8f7f2b5ea9d9e3d95151d38d97d6640f3 + kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed @@ -700,7 +916,7 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.8) - markly (0.17.0) sha256=fab61b604f7c4c8f771c3b7f2f16b971034bb72ddd27009b90c3fae1990b17e6 + markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca markly-merge (7.1.8) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 @@ -717,6 +933,7 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 + parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -751,9 +968,9 @@ CHECKSUMS rubocop-env (0.1.0) sha256=5ab9a259e71822bf514c8e900a9b68cc2f74ccc87d5493efcd03213f3068e718 rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb rubocop-gradual (0.4.0) sha256=9c7e584e6fef6c2539266a193a4572c970c22f99046fd6b0305bdde6228f96ad - rubocop-lts (24.2.2) sha256=be6c745e1bb61daebd6af3cc3227c60f95be9f642a080773cad7df14c5f9f174 - rubocop-lts-rspec (1.0.5) sha256=439552fd27440802cc499889e013bffa28aadc41adae5d4dfff3d984a2a809b4 - rubocop-lts-ruby (0.1.3) sha256=fa002117b94c5eb403eb476d5fde393913dbcc4253b6151ed9a3393c73fd3916 + rubocop-lts (24.2.3) sha256=510ca38a90393c7c5cac0e0defa35151805797b1ff9a2d130b649c20c2ca0842 + rubocop-lts-rspec (1.0.6) sha256=b7f7dae919c9712dee09df76b027563e154f510d9b4423bb0453394b5474cf38 + rubocop-lts-ruby (0.1.4) sha256=eb0039d61d645d2b6754abd4006842945b7848a916a664f522f5e2f7a5a69bf1 rubocop-md (2.0.4) sha256=0d076b6b5e99dea2ddc928c4bd702497decb9a8400da7808091e02ebcafcfb93 rubocop-minitest (0.40.0) sha256=353c698199115f12151144cf0b5a96f69bb9d77b660cf6536df2c4250c672a9d rubocop-on-rbs (2.0.0) sha256=ce74d1b3d5daead19f4b611623656c185821dfc9aed9c7079bb1e5d7d7c464be @@ -763,12 +980,13 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-rspec-extra (0.3.0) sha256=ee4b6484d0332a0d23c4a465eeb607e41888eb3d4ed479f850b9f5212514f787 rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 - rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 + rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 ruby-merge (7.1.8) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 + rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -776,12 +994,13 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f + smorg-rb (7.1.8) + sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2 standard-rspec (0.5.0) sha256=64d396524a65af47f5331b423d8cdd313e0267401647bb7892489ca89dad2973 - standard-rubocop-lts (2.0.12) sha256=4b55efc56691d4edef197df8df27ffebdb4a273e26d7bf00799d00ac6a71532f + standard-rubocop-lts (2.0.13) sha256=acc0f7e73db0215a50b5e2df01fbf1b6bbcc68bb128f429f970db3fdd62a8243 stone_checksums (1.0.8) sha256=91c5453d6c67c468653bf5396a33936c85d7731077be756ed0ff7eb78f981117 stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1 strings-ansi (0.2.0) sha256=90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88 @@ -791,6 +1010,7 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -803,6 +1023,7 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 + typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -816,6 +1037,7 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 + zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 61148e7be2f69eb00088837d13a7410d8aa27cc4 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:44:20 -0400 Subject: [PATCH 014/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr/Gemfile.lock | 508 +++++++++++++++++++++++++---------- 1 file changed, 365 insertions(+), 143 deletions(-) diff --git a/gems/ast-crispr/Gemfile.lock b/gems/ast-crispr/Gemfile.lock index ae0745758..62b9692fd 100644 --- a/gems/ast-crispr/Gemfile.lock +++ b/gems/ast-crispr/Gemfile.lock @@ -15,42 +15,314 @@ PATH service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.15) -GEM - remote: https://gem.coop/ +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - backports (3.25.3) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.8) + ast-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge + specs: + html-merge (7.1.8) + ast-crispr (= 7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.8) + toml (~> 0.3) + toml-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.8) + ast-merge (= 7.1.8) + ast-merge-git (= 7.1.8) + bash-merge (= 7.1.8) + diff-lcs (~> 1.5) + dotenv-merge (= 7.1.8) + go-merge (= 7.1.8) + html-merge (= 7.1.8) + json-merge (= 7.1.8) + kettle-jem (~> 7.1, >= 7.1.18) + markdown-merge (= 7.1.8) + plain-merge (= 7.1.8) + prism-merge (= 7.1.8) + psych-merge (= 7.1.8) + rbs-merge (= 7.1.8) + rust-merge (= 7.1.8) + toml-merge (= 7.1.8) + typescript-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.8) + binary-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +GEM + remote: https://gem.coop/ + specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -58,11 +330,6 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -75,10 +342,6 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -92,11 +355,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -146,27 +404,25 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) version_gem (~> 1.1, >= 1.1.15) - kettle-dev (3.0.33) + kettle-dev (3.0.34) emoji_regex (>= 15.0) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.15) - kettle-rb (~> 0.1, >= 0.1.11) + kettle-rb (~> 0.1, >= 0.1.12) kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-family (1.2.97) + kettle-drift (1.0.13) + version_gem (~> 1.1, >= 1.1.15) + kettle-family (1.2.100) command_kit (~> 0.6) command_kit-completion (~> 0.1) kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.33) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-jem (~> 7.1, >= 7.1.23) kettle-test (~> 2.0, >= 2.0.21) @@ -178,39 +434,9 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) - kettle-rb (0.1.11) + kettle-rb (0.1.12) kettle-soup-cover (3.0.10) kettle-wash (~> 0.1, >= 0.1.6) simplecov (>= 1.0) @@ -233,24 +459,12 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - markly (0.17.0) - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) + markly (0.19.0) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -278,28 +492,13 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -308,11 +507,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -379,11 +573,11 @@ GEM parallel (~> 1.10) rainbow (>= 2.2.2, < 4.0) rubocop (~> 1.0) - rubocop-lts (24.2.2) - rubocop-ruby3_2 (~> 3.0, >= 3.0.1) - standard-rubocop-lts (~> 2.0, >= 2.0.3) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-rspec (1.0.5) + rubocop-lts (24.2.3) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-rspec (1.0.6) rubocop (~> 1.84, >= 1.84.2) rubocop-env (~> 0.1, >= 0.1.0) rubocop-factory_bot (~> 2.28, >= 2.28.0) @@ -391,8 +585,8 @@ GEM rubocop-rspec-extra (~> 0.3, >= 0.3.0) standard (~> 1.54, >= 1.54.0) standard-rspec (~> 0.5, >= 0.5.0) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-ruby (0.1.3) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-ruby (0.1.4) lint_roller (~> 1.1) rubocop (>= 1.72.1, < 2.0) version_gem (~> 1.1, >= 1.1.15) @@ -426,21 +620,17 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-rspec (~> 3.5) - rubocop-ruby3_2 (3.0.7) + rubocop-ruby3_2 (3.0.8) rubocop-gradual (~> 0.3, >= 0.3.6) rubocop-md (~> 2.0, >= 2.0.4) rubocop-rake (~> 0.7, >= 0.7.1) rubocop-thread_safety (~> 0.7, >= 0.7.3) - standard-rubocop-lts (~> 2.0, >= 2.0.9) - version_gem (~> 1.1, >= 1.1.13) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) rubocop-thread_safety (0.7.3) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -461,7 +651,7 @@ GEM simplecov (>= 0.4.1) simplecov_lcov_formatter (0.9.0) simplecov (>= 0.18) - sorbet-runtime (0.6.13486) + sorbet-runtime (0.6.13490) standard (1.56.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) @@ -480,8 +670,8 @@ GEM rubocop-factory_bot (~> 2.27) rubocop-rspec (~> 3.9) rubocop-rspec_rails (~> 2.31) - standard-rubocop-lts (2.0.12) - rubocop-lts-ruby (~> 0.1, >= 0.1.0) + standard-rubocop-lts (2.0.13) + rubocop-lts-ruby (~> 0.1, >= 0.1.4) standard (~> 1.54, >= 1.54.0) standard-custom (~> 1.0, >= 1.0.2) standard-performance (~> 1.9, >= 1.9.0) @@ -501,18 +691,11 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -541,10 +724,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -583,25 +762,48 @@ DEPENDENCIES appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) ast-crispr! + ast-crispr-markdown-markly! + ast-crispr-ruby-prism! + ast-merge! + ast-merge-git! + ast-template! + bash-merge! benchmark (~> 0.5, >= 0.5.0) + binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) + go-merge! + html-merge! irb (~> 1.17) + json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) + kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) + kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -611,13 +813,20 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) + toml-merge! + tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) + yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -625,6 +834,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -637,10 +847,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) + ast-merge-git (7.1.8) + ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -678,18 +891,21 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d + go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 + html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 + kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 + kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f - kettle-rb (0.1.11) sha256=3e50b413048906f2c5aea69ff805fbf8f7f2b5ea9d9e3d95151d38d97d6640f3 + kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed @@ -700,7 +916,7 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.8) - markly (0.17.0) sha256=fab61b604f7c4c8f771c3b7f2f16b971034bb72ddd27009b90c3fae1990b17e6 + markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca markly-merge (7.1.8) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 @@ -717,6 +933,7 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 + parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -751,9 +968,9 @@ CHECKSUMS rubocop-env (0.1.0) sha256=5ab9a259e71822bf514c8e900a9b68cc2f74ccc87d5493efcd03213f3068e718 rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb rubocop-gradual (0.4.0) sha256=9c7e584e6fef6c2539266a193a4572c970c22f99046fd6b0305bdde6228f96ad - rubocop-lts (24.2.2) sha256=be6c745e1bb61daebd6af3cc3227c60f95be9f642a080773cad7df14c5f9f174 - rubocop-lts-rspec (1.0.5) sha256=439552fd27440802cc499889e013bffa28aadc41adae5d4dfff3d984a2a809b4 - rubocop-lts-ruby (0.1.3) sha256=fa002117b94c5eb403eb476d5fde393913dbcc4253b6151ed9a3393c73fd3916 + rubocop-lts (24.2.3) sha256=510ca38a90393c7c5cac0e0defa35151805797b1ff9a2d130b649c20c2ca0842 + rubocop-lts-rspec (1.0.6) sha256=b7f7dae919c9712dee09df76b027563e154f510d9b4423bb0453394b5474cf38 + rubocop-lts-ruby (0.1.4) sha256=eb0039d61d645d2b6754abd4006842945b7848a916a664f522f5e2f7a5a69bf1 rubocop-md (2.0.4) sha256=0d076b6b5e99dea2ddc928c4bd702497decb9a8400da7808091e02ebcafcfb93 rubocop-minitest (0.40.0) sha256=353c698199115f12151144cf0b5a96f69bb9d77b660cf6536df2c4250c672a9d rubocop-on-rbs (2.0.0) sha256=ce74d1b3d5daead19f4b611623656c185821dfc9aed9c7079bb1e5d7d7c464be @@ -763,12 +980,13 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-rspec-extra (0.3.0) sha256=ee4b6484d0332a0d23c4a465eeb607e41888eb3d4ed479f850b9f5212514f787 rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 - rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 + rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 ruby-merge (7.1.8) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 + rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -776,12 +994,13 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f + smorg-rb (7.1.8) + sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2 standard-rspec (0.5.0) sha256=64d396524a65af47f5331b423d8cdd313e0267401647bb7892489ca89dad2973 - standard-rubocop-lts (2.0.12) sha256=4b55efc56691d4edef197df8df27ffebdb4a273e26d7bf00799d00ac6a71532f + standard-rubocop-lts (2.0.13) sha256=acc0f7e73db0215a50b5e2df01fbf1b6bbcc68bb128f429f970db3fdd62a8243 stone_checksums (1.0.8) sha256=91c5453d6c67c468653bf5396a33936c85d7731077be756ed0ff7eb78f981117 stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1 strings-ansi (0.2.0) sha256=90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88 @@ -791,6 +1010,7 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -803,6 +1023,7 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 + typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -816,6 +1037,7 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 + zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 6d472134872a7039aadbc2b6b949c0a8b8d6e5ec Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:44:22 -0400 Subject: [PATCH 015/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ruby-merge/Gemfile.lock | 508 +++++++++++++++++++++++++---------- 1 file changed, 365 insertions(+), 143 deletions(-) diff --git a/gems/ruby-merge/Gemfile.lock b/gems/ruby-merge/Gemfile.lock index 60d918dcc..843490442 100644 --- a/gems/ruby-merge/Gemfile.lock +++ b/gems/ruby-merge/Gemfile.lock @@ -15,46 +15,314 @@ PATH tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -GEM - remote: https://gem.coop/ +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - backports (3.25.3) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.8) + ast-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge + specs: + html-merge (7.1.8) + ast-crispr (= 7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.8) + toml (~> 0.3) + toml-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.8) + ast-merge (= 7.1.8) + ast-merge-git (= 7.1.8) + bash-merge (= 7.1.8) + diff-lcs (~> 1.5) + dotenv-merge (= 7.1.8) + go-merge (= 7.1.8) + html-merge (= 7.1.8) + json-merge (= 7.1.8) + kettle-jem (~> 7.1, >= 7.1.18) + markdown-merge (= 7.1.8) + plain-merge (= 7.1.8) + prism-merge (= 7.1.8) + psych-merge (= 7.1.8) + rbs-merge (= 7.1.8) + rust-merge (= 7.1.8) + toml-merge (= 7.1.8) + typescript-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.8) + binary-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +GEM + remote: https://gem.coop/ + specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -62,11 +330,6 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -79,10 +342,6 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -96,11 +355,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -150,27 +404,25 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) version_gem (~> 1.1, >= 1.1.15) - kettle-dev (3.0.33) + kettle-dev (3.0.34) emoji_regex (>= 15.0) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.15) - kettle-rb (~> 0.1, >= 0.1.11) + kettle-rb (~> 0.1, >= 0.1.12) kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-family (1.2.97) + kettle-drift (1.0.13) + version_gem (~> 1.1, >= 1.1.15) + kettle-family (1.2.100) command_kit (~> 0.6) command_kit-completion (~> 0.1) kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.33) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-jem (~> 7.1, >= 7.1.23) kettle-test (~> 2.0, >= 2.0.21) @@ -182,39 +434,9 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) - kettle-rb (0.1.11) + kettle-rb (0.1.12) kettle-soup-cover (3.0.10) kettle-wash (~> 0.1, >= 0.1.6) simplecov (>= 1.0) @@ -237,24 +459,12 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - markly (0.17.0) - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) + markly (0.19.0) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -282,28 +492,13 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -312,11 +507,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -383,11 +573,11 @@ GEM parallel (~> 1.10) rainbow (>= 2.2.2, < 4.0) rubocop (~> 1.0) - rubocop-lts (24.2.2) - rubocop-ruby3_2 (~> 3.0, >= 3.0.1) - standard-rubocop-lts (~> 2.0, >= 2.0.3) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-rspec (1.0.5) + rubocop-lts (24.2.3) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-rspec (1.0.6) rubocop (~> 1.84, >= 1.84.2) rubocop-env (~> 0.1, >= 0.1.0) rubocop-factory_bot (~> 2.28, >= 2.28.0) @@ -395,8 +585,8 @@ GEM rubocop-rspec-extra (~> 0.3, >= 0.3.0) standard (~> 1.54, >= 1.54.0) standard-rspec (~> 0.5, >= 0.5.0) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-ruby (0.1.3) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-ruby (0.1.4) lint_roller (~> 1.1) rubocop (>= 1.72.1, < 2.0) version_gem (~> 1.1, >= 1.1.15) @@ -430,13 +620,13 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-rspec (~> 3.5) - rubocop-ruby3_2 (3.0.7) + rubocop-ruby3_2 (3.0.8) rubocop-gradual (~> 0.3, >= 0.3.6) rubocop-md (~> 2.0, >= 2.0.4) rubocop-rake (~> 0.7, >= 0.7.1) rubocop-thread_safety (~> 0.7, >= 0.7.3) - standard-rubocop-lts (~> 2.0, >= 2.0.9) - version_gem (~> 1.1, >= 1.1.13) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) rubocop-thread_safety (0.7.3) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) @@ -461,7 +651,7 @@ GEM simplecov (>= 0.4.1) simplecov_lcov_formatter (0.9.0) simplecov (>= 0.18) - sorbet-runtime (0.6.13486) + sorbet-runtime (0.6.13490) standard (1.56.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) @@ -480,8 +670,8 @@ GEM rubocop-factory_bot (~> 2.27) rubocop-rspec (~> 3.9) rubocop-rspec_rails (~> 2.31) - standard-rubocop-lts (2.0.12) - rubocop-lts-ruby (~> 0.1, >= 0.1.0) + standard-rubocop-lts (2.0.13) + rubocop-lts-ruby (~> 0.1, >= 0.1.4) standard (~> 1.54, >= 1.54.0) standard-custom (~> 1.0, >= 1.0.2) standard-performance (~> 1.9, >= 1.9.0) @@ -501,18 +691,11 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -541,10 +724,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -582,25 +761,49 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) + ast-crispr! + ast-crispr-markdown-markly! + ast-crispr-ruby-prism! + ast-merge! + ast-merge-git! + ast-template! + bash-merge! benchmark (~> 0.5, >= 0.5.0) + binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) + go-merge! + html-merge! irb (~> 1.17) + json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) + kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) + kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -612,12 +815,18 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0, >= 3.0.6) ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) + toml-merge! + tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) + yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -625,6 +834,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -637,10 +847,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) + ast-merge-git (7.1.8) + ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -678,18 +891,21 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d + go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 + html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 + kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 + kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f - kettle-rb (0.1.11) sha256=3e50b413048906f2c5aea69ff805fbf8f7f2b5ea9d9e3d95151d38d97d6640f3 + kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed @@ -700,7 +916,7 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.8) - markly (0.17.0) sha256=fab61b604f7c4c8f771c3b7f2f16b971034bb72ddd27009b90c3fae1990b17e6 + markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca markly-merge (7.1.8) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 @@ -717,6 +933,7 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 + parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -751,9 +968,9 @@ CHECKSUMS rubocop-env (0.1.0) sha256=5ab9a259e71822bf514c8e900a9b68cc2f74ccc87d5493efcd03213f3068e718 rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb rubocop-gradual (0.4.0) sha256=9c7e584e6fef6c2539266a193a4572c970c22f99046fd6b0305bdde6228f96ad - rubocop-lts (24.2.2) sha256=be6c745e1bb61daebd6af3cc3227c60f95be9f642a080773cad7df14c5f9f174 - rubocop-lts-rspec (1.0.5) sha256=439552fd27440802cc499889e013bffa28aadc41adae5d4dfff3d984a2a809b4 - rubocop-lts-ruby (0.1.3) sha256=fa002117b94c5eb403eb476d5fde393913dbcc4253b6151ed9a3393c73fd3916 + rubocop-lts (24.2.3) sha256=510ca38a90393c7c5cac0e0defa35151805797b1ff9a2d130b649c20c2ca0842 + rubocop-lts-rspec (1.0.6) sha256=b7f7dae919c9712dee09df76b027563e154f510d9b4423bb0453394b5474cf38 + rubocop-lts-ruby (0.1.4) sha256=eb0039d61d645d2b6754abd4006842945b7848a916a664f522f5e2f7a5a69bf1 rubocop-md (2.0.4) sha256=0d076b6b5e99dea2ddc928c4bd702497decb9a8400da7808091e02ebcafcfb93 rubocop-minitest (0.40.0) sha256=353c698199115f12151144cf0b5a96f69bb9d77b660cf6536df2c4250c672a9d rubocop-on-rbs (2.0.0) sha256=ce74d1b3d5daead19f4b611623656c185821dfc9aed9c7079bb1e5d7d7c464be @@ -763,12 +980,13 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-rspec-extra (0.3.0) sha256=ee4b6484d0332a0d23c4a465eeb607e41888eb3d4ed479f850b9f5212514f787 rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 - rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 + rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 ruby-merge (7.1.8) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 + rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -776,12 +994,13 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f + smorg-rb (7.1.8) + sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2 standard-rspec (0.5.0) sha256=64d396524a65af47f5331b423d8cdd313e0267401647bb7892489ca89dad2973 - standard-rubocop-lts (2.0.12) sha256=4b55efc56691d4edef197df8df27ffebdb4a273e26d7bf00799d00ac6a71532f + standard-rubocop-lts (2.0.13) sha256=acc0f7e73db0215a50b5e2df01fbf1b6bbcc68bb128f429f970db3fdd62a8243 stone_checksums (1.0.8) sha256=91c5453d6c67c468653bf5396a33936c85d7731077be756ed0ff7eb78f981117 stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1 strings-ansi (0.2.0) sha256=90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88 @@ -791,6 +1010,7 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -803,6 +1023,7 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 + typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -816,6 +1037,7 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 + zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 4123d0b0af6ea33c6762dbea811b18d848051e41 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:44:24 -0400 Subject: [PATCH 016/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/prism-merge/Gemfile.lock | 504 ++++++++++++++++++++++++---------- 1 file changed, 363 insertions(+), 141 deletions(-) diff --git a/gems/prism-merge/Gemfile.lock b/gems/prism-merge/Gemfile.lock index 5d39a9bad..4fd7a88ce 100644 --- a/gems/prism-merge/Gemfile.lock +++ b/gems/prism-merge/Gemfile.lock @@ -17,46 +17,312 @@ PATH tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -GEM - remote: https://gem.coop/ +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - backports (3.25.3) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.8) + ast-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge + specs: + html-merge (7.1.8) + ast-crispr (= 7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.8) + toml (~> 0.3) + toml-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.8) + ast-merge (= 7.1.8) + ast-merge-git (= 7.1.8) + bash-merge (= 7.1.8) + diff-lcs (~> 1.5) + dotenv-merge (= 7.1.8) + go-merge (= 7.1.8) + html-merge (= 7.1.8) + json-merge (= 7.1.8) + kettle-jem (~> 7.1, >= 7.1.18) + markdown-merge (= 7.1.8) + plain-merge (= 7.1.8) + prism-merge (= 7.1.8) + psych-merge (= 7.1.8) + rbs-merge (= 7.1.8) + rust-merge (= 7.1.8) + toml-merge (= 7.1.8) + typescript-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.8) + binary-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +GEM + remote: https://gem.coop/ + specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -64,11 +330,6 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -81,10 +342,6 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -98,11 +355,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -152,27 +404,25 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) version_gem (~> 1.1, >= 1.1.15) - kettle-dev (3.0.33) + kettle-dev (3.0.34) emoji_regex (>= 15.0) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.15) - kettle-rb (~> 0.1, >= 0.1.11) + kettle-rb (~> 0.1, >= 0.1.12) kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-family (1.2.97) + kettle-drift (1.0.13) + version_gem (~> 1.1, >= 1.1.15) + kettle-family (1.2.100) command_kit (~> 0.6) command_kit-completion (~> 0.1) kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.33) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-jem (~> 7.1, >= 7.1.23) kettle-test (~> 2.0, >= 2.0.21) @@ -184,39 +434,9 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) - kettle-rb (0.1.11) + kettle-rb (0.1.12) kettle-soup-cover (3.0.10) kettle-wash (~> 0.1, >= 0.1.6) simplecov (>= 1.0) @@ -239,24 +459,12 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - markly (0.17.0) - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) + markly (0.19.0) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -284,10 +492,6 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) @@ -295,11 +499,6 @@ GEM psych (5.5.0) date stringio - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -308,11 +507,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -379,11 +573,11 @@ GEM parallel (~> 1.10) rainbow (>= 2.2.2, < 4.0) rubocop (~> 1.0) - rubocop-lts (24.2.2) - rubocop-ruby3_2 (~> 3.0, >= 3.0.1) - standard-rubocop-lts (~> 2.0, >= 2.0.3) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-rspec (1.0.5) + rubocop-lts (24.2.3) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-rspec (1.0.6) rubocop (~> 1.84, >= 1.84.2) rubocop-env (~> 0.1, >= 0.1.0) rubocop-factory_bot (~> 2.28, >= 2.28.0) @@ -391,8 +585,8 @@ GEM rubocop-rspec-extra (~> 0.3, >= 0.3.0) standard (~> 1.54, >= 1.54.0) standard-rspec (~> 0.5, >= 0.5.0) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-ruby (0.1.3) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-ruby (0.1.4) lint_roller (~> 1.1) rubocop (>= 1.72.1, < 2.0) version_gem (~> 1.1, >= 1.1.15) @@ -426,21 +620,17 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-rspec (~> 3.5) - rubocop-ruby3_2 (3.0.7) + rubocop-ruby3_2 (3.0.8) rubocop-gradual (~> 0.3, >= 0.3.6) rubocop-md (~> 2.0, >= 2.0.4) rubocop-rake (~> 0.7, >= 0.7.1) rubocop-thread_safety (~> 0.7, >= 0.7.3) - standard-rubocop-lts (~> 2.0, >= 2.0.9) - version_gem (~> 1.1, >= 1.1.13) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) rubocop-thread_safety (0.7.3) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -461,7 +651,7 @@ GEM simplecov (>= 0.4.1) simplecov_lcov_formatter (0.9.0) simplecov (>= 0.18) - sorbet-runtime (0.6.13486) + sorbet-runtime (0.6.13490) standard (1.56.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) @@ -480,8 +670,8 @@ GEM rubocop-factory_bot (~> 2.27) rubocop-rspec (~> 3.9) rubocop-rspec_rails (~> 2.31) - standard-rubocop-lts (2.0.12) - rubocop-lts-ruby (~> 0.1, >= 0.1.0) + standard-rubocop-lts (2.0.13) + rubocop-lts-ruby (~> 0.1, >= 0.1.4) standard (~> 1.54, >= 1.54.0) standard-custom (~> 1.0, >= 1.0.2) standard-performance (~> 1.9, >= 1.9.0) @@ -501,18 +691,11 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -541,10 +724,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -582,26 +761,49 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) + ast-crispr! + ast-crispr-markdown-markly! + ast-crispr-ruby-prism! + ast-merge! + ast-merge-git! + ast-template! + bash-merge! benchmark (~> 0.5, >= 0.5.0) + binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) + go-merge! + html-merge! irb (~> 1.17) + json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) + kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) + kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) + parslet-toml-merge! + plain-merge! prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -611,13 +813,20 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) + toml-merge! + tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) + yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -625,6 +834,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -637,10 +847,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) + ast-merge-git (7.1.8) + ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -678,18 +891,21 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d + go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 + html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 + kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 + kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f - kettle-rb (0.1.11) sha256=3e50b413048906f2c5aea69ff805fbf8f7f2b5ea9d9e3d95151d38d97d6640f3 + kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed @@ -700,7 +916,7 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.8) - markly (0.17.0) sha256=fab61b604f7c4c8f771c3b7f2f16b971034bb72ddd27009b90c3fae1990b17e6 + markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca markly-merge (7.1.8) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 @@ -717,6 +933,7 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 + parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -751,9 +968,9 @@ CHECKSUMS rubocop-env (0.1.0) sha256=5ab9a259e71822bf514c8e900a9b68cc2f74ccc87d5493efcd03213f3068e718 rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb rubocop-gradual (0.4.0) sha256=9c7e584e6fef6c2539266a193a4572c970c22f99046fd6b0305bdde6228f96ad - rubocop-lts (24.2.2) sha256=be6c745e1bb61daebd6af3cc3227c60f95be9f642a080773cad7df14c5f9f174 - rubocop-lts-rspec (1.0.5) sha256=439552fd27440802cc499889e013bffa28aadc41adae5d4dfff3d984a2a809b4 - rubocop-lts-ruby (0.1.3) sha256=fa002117b94c5eb403eb476d5fde393913dbcc4253b6151ed9a3393c73fd3916 + rubocop-lts (24.2.3) sha256=510ca38a90393c7c5cac0e0defa35151805797b1ff9a2d130b649c20c2ca0842 + rubocop-lts-rspec (1.0.6) sha256=b7f7dae919c9712dee09df76b027563e154f510d9b4423bb0453394b5474cf38 + rubocop-lts-ruby (0.1.4) sha256=eb0039d61d645d2b6754abd4006842945b7848a916a664f522f5e2f7a5a69bf1 rubocop-md (2.0.4) sha256=0d076b6b5e99dea2ddc928c4bd702497decb9a8400da7808091e02ebcafcfb93 rubocop-minitest (0.40.0) sha256=353c698199115f12151144cf0b5a96f69bb9d77b660cf6536df2c4250c672a9d rubocop-on-rbs (2.0.0) sha256=ce74d1b3d5daead19f4b611623656c185821dfc9aed9c7079bb1e5d7d7c464be @@ -763,12 +980,13 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-rspec-extra (0.3.0) sha256=ee4b6484d0332a0d23c4a465eeb607e41888eb3d4ed479f850b9f5212514f787 rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 - rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 + rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 ruby-merge (7.1.8) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 + rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -776,12 +994,13 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f + smorg-rb (7.1.8) + sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2 standard-rspec (0.5.0) sha256=64d396524a65af47f5331b423d8cdd313e0267401647bb7892489ca89dad2973 - standard-rubocop-lts (2.0.12) sha256=4b55efc56691d4edef197df8df27ffebdb4a273e26d7bf00799d00ac6a71532f + standard-rubocop-lts (2.0.13) sha256=acc0f7e73db0215a50b5e2df01fbf1b6bbcc68bb128f429f970db3fdd62a8243 stone_checksums (1.0.8) sha256=91c5453d6c67c468653bf5396a33936c85d7731077be756ed0ff7eb78f981117 stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1 strings-ansi (0.2.0) sha256=90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88 @@ -791,6 +1010,7 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -803,6 +1023,7 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 + typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -816,6 +1037,7 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 + zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From b83f950fd415e177cec75b93bcbd071f1f8cc2fe Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:44:26 -0400 Subject: [PATCH 017/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr-ruby-prism/Gemfile.lock | 510 +++++++++++++++++------- 1 file changed, 366 insertions(+), 144 deletions(-) diff --git a/gems/ast-crispr-ruby-prism/Gemfile.lock b/gems/ast-crispr-ruby-prism/Gemfile.lock index 5d0211dc0..2cef44d1b 100644 --- a/gems/ast-crispr-ruby-prism/Gemfile.lock +++ b/gems/ast-crispr-ruby-prism/Gemfile.lock @@ -15,6 +15,296 @@ PATH prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.8) + ast-crispr (= 7.1.8) + markdown-merge (= 7.1.8) + markly-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.8) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.8) + ast-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge + specs: + html-merge (7.1.8) + ast-crispr (= 7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.8) + toml (~> 0.3) + toml-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.8) + ast-merge (= 7.1.8) + ast-merge-git (= 7.1.8) + bash-merge (= 7.1.8) + diff-lcs (~> 1.5) + dotenv-merge (= 7.1.8) + go-merge (= 7.1.8) + html-merge (= 7.1.8) + json-merge (= 7.1.8) + kettle-jem (~> 7.1, >= 7.1.18) + markdown-merge (= 7.1.8) + plain-merge (= 7.1.8) + prism-merge (= 7.1.8) + psych-merge (= 7.1.8) + rbs-merge (= 7.1.8) + rust-merge (= 7.1.8) + toml-merge (= 7.1.8) + typescript-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.8) + binary-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + GEM remote: https://gem.coop/ specs: @@ -32,25 +322,7 @@ GEM rubocop (>= 1.0) version_gem (~> 1.1, >= 1.1.15) ast (2.4.3) - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - ast-merge (7.1.8) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) backports (3.25.3) - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -58,11 +330,6 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -75,10 +342,6 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -92,11 +355,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -146,27 +404,25 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) version_gem (~> 1.1, >= 1.1.15) - kettle-dev (3.0.33) + kettle-dev (3.0.34) emoji_regex (>= 15.0) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.15) - kettle-rb (~> 0.1, >= 0.1.11) + kettle-rb (~> 0.1, >= 0.1.12) kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-family (1.2.97) + kettle-drift (1.0.13) + version_gem (~> 1.1, >= 1.1.15) + kettle-family (1.2.100) command_kit (~> 0.6) command_kit-completion (~> 0.1) kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.33) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-jem (~> 7.1, >= 7.1.23) kettle-test (~> 2.0, >= 2.0.21) @@ -178,39 +434,9 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) - kettle-rb (0.1.11) + kettle-rb (0.1.12) kettle-soup-cover (3.0.10) kettle-wash (~> 0.1, >= 0.1.6) simplecov (>= 1.0) @@ -233,24 +459,12 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - markly (0.17.0) - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) + markly (0.19.0) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -278,28 +492,13 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -308,11 +507,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -379,11 +573,11 @@ GEM parallel (~> 1.10) rainbow (>= 2.2.2, < 4.0) rubocop (~> 1.0) - rubocop-lts (24.2.2) - rubocop-ruby3_2 (~> 3.0, >= 3.0.1) - standard-rubocop-lts (~> 2.0, >= 2.0.3) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-rspec (1.0.5) + rubocop-lts (24.2.3) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-rspec (1.0.6) rubocop (~> 1.84, >= 1.84.2) rubocop-env (~> 0.1, >= 0.1.0) rubocop-factory_bot (~> 2.28, >= 2.28.0) @@ -391,8 +585,8 @@ GEM rubocop-rspec-extra (~> 0.3, >= 0.3.0) standard (~> 1.54, >= 1.54.0) standard-rspec (~> 0.5, >= 0.5.0) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-ruby (0.1.3) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-ruby (0.1.4) lint_roller (~> 1.1) rubocop (>= 1.72.1, < 2.0) version_gem (~> 1.1, >= 1.1.15) @@ -426,21 +620,17 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-rspec (~> 3.5) - rubocop-ruby3_2 (3.0.7) + rubocop-ruby3_2 (3.0.8) rubocop-gradual (~> 0.3, >= 0.3.6) rubocop-md (~> 2.0, >= 2.0.4) rubocop-rake (~> 0.7, >= 0.7.1) rubocop-thread_safety (~> 0.7, >= 0.7.3) - standard-rubocop-lts (~> 2.0, >= 2.0.9) - version_gem (~> 1.1, >= 1.1.13) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) rubocop-thread_safety (0.7.3) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -461,7 +651,7 @@ GEM simplecov (>= 0.4.1) simplecov_lcov_formatter (0.9.0) simplecov (>= 0.18) - sorbet-runtime (0.6.13486) + sorbet-runtime (0.6.13490) standard (1.56.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) @@ -480,8 +670,8 @@ GEM rubocop-factory_bot (~> 2.27) rubocop-rspec (~> 3.9) rubocop-rspec_rails (~> 2.31) - standard-rubocop-lts (2.0.12) - rubocop-lts-ruby (~> 0.1, >= 0.1.0) + standard-rubocop-lts (2.0.13) + rubocop-lts-ruby (~> 0.1, >= 0.1.4) standard (~> 1.54, >= 1.54.0) standard-custom (~> 1.0, >= 1.0.2) standard-performance (~> 1.9, >= 1.9.0) @@ -501,18 +691,11 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -541,10 +724,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -582,26 +761,49 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) + ast-crispr! + ast-crispr-markdown-markly! ast-crispr-ruby-prism! + ast-merge! + ast-merge-git! + ast-template! + bash-merge! benchmark (~> 0.5, >= 0.5.0) + binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) + go-merge! + html-merge! irb (~> 1.17) + json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) + kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) + kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -611,13 +813,20 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) + toml-merge! + tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) + yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -625,6 +834,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -637,10 +847,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) + ast-merge-git (7.1.8) + ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -678,18 +891,21 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d + go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 + html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 + kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 + kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f - kettle-rb (0.1.11) sha256=3e50b413048906f2c5aea69ff805fbf8f7f2b5ea9d9e3d95151d38d97d6640f3 + kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed @@ -700,7 +916,7 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.8) - markly (0.17.0) sha256=fab61b604f7c4c8f771c3b7f2f16b971034bb72ddd27009b90c3fae1990b17e6 + markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca markly-merge (7.1.8) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 @@ -717,6 +933,7 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 + parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -751,9 +968,9 @@ CHECKSUMS rubocop-env (0.1.0) sha256=5ab9a259e71822bf514c8e900a9b68cc2f74ccc87d5493efcd03213f3068e718 rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb rubocop-gradual (0.4.0) sha256=9c7e584e6fef6c2539266a193a4572c970c22f99046fd6b0305bdde6228f96ad - rubocop-lts (24.2.2) sha256=be6c745e1bb61daebd6af3cc3227c60f95be9f642a080773cad7df14c5f9f174 - rubocop-lts-rspec (1.0.5) sha256=439552fd27440802cc499889e013bffa28aadc41adae5d4dfff3d984a2a809b4 - rubocop-lts-ruby (0.1.3) sha256=fa002117b94c5eb403eb476d5fde393913dbcc4253b6151ed9a3393c73fd3916 + rubocop-lts (24.2.3) sha256=510ca38a90393c7c5cac0e0defa35151805797b1ff9a2d130b649c20c2ca0842 + rubocop-lts-rspec (1.0.6) sha256=b7f7dae919c9712dee09df76b027563e154f510d9b4423bb0453394b5474cf38 + rubocop-lts-ruby (0.1.4) sha256=eb0039d61d645d2b6754abd4006842945b7848a916a664f522f5e2f7a5a69bf1 rubocop-md (2.0.4) sha256=0d076b6b5e99dea2ddc928c4bd702497decb9a8400da7808091e02ebcafcfb93 rubocop-minitest (0.40.0) sha256=353c698199115f12151144cf0b5a96f69bb9d77b660cf6536df2c4250c672a9d rubocop-on-rbs (2.0.0) sha256=ce74d1b3d5daead19f4b611623656c185821dfc9aed9c7079bb1e5d7d7c464be @@ -763,12 +980,13 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-rspec-extra (0.3.0) sha256=ee4b6484d0332a0d23c4a465eeb607e41888eb3d4ed479f850b9f5212514f787 rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 - rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 + rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 ruby-merge (7.1.8) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 + rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -776,12 +994,13 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f + smorg-rb (7.1.8) + sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2 standard-rspec (0.5.0) sha256=64d396524a65af47f5331b423d8cdd313e0267401647bb7892489ca89dad2973 - standard-rubocop-lts (2.0.12) sha256=4b55efc56691d4edef197df8df27ffebdb4a273e26d7bf00799d00ac6a71532f + standard-rubocop-lts (2.0.13) sha256=acc0f7e73db0215a50b5e2df01fbf1b6bbcc68bb128f429f970db3fdd62a8243 stone_checksums (1.0.8) sha256=91c5453d6c67c468653bf5396a33936c85d7731077be756ed0ff7eb78f981117 stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1 strings-ansi (0.2.0) sha256=90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88 @@ -791,6 +1010,7 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -803,6 +1023,7 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 + typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -816,6 +1037,7 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 + zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From bb71bbfe213669e7f1762b218b84f90a72767459 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:44:28 -0400 Subject: [PATCH 018/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/markdown-merge/Gemfile.lock | 508 ++++++++++++++++++++++--------- 1 file changed, 365 insertions(+), 143 deletions(-) diff --git a/gems/markdown-merge/Gemfile.lock b/gems/markdown-merge/Gemfile.lock index 3a11f36f5..326bd57aa 100644 --- a/gems/markdown-merge/Gemfile.lock +++ b/gems/markdown-merge/Gemfile.lock @@ -15,46 +15,314 @@ PATH tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -GEM - remote: https://gem.coop/ +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - backports (3.25.3) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.8) + ast-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge + specs: + html-merge (7.1.8) + ast-crispr (= 7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.8) + toml (~> 0.3) + toml-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.8) + ast-merge (= 7.1.8) + ast-merge-git (= 7.1.8) + bash-merge (= 7.1.8) + diff-lcs (~> 1.5) + dotenv-merge (= 7.1.8) + go-merge (= 7.1.8) + html-merge (= 7.1.8) + json-merge (= 7.1.8) + kettle-jem (~> 7.1, >= 7.1.18) + markdown-merge (= 7.1.8) + plain-merge (= 7.1.8) + prism-merge (= 7.1.8) + psych-merge (= 7.1.8) + rbs-merge (= 7.1.8) + rust-merge (= 7.1.8) + toml-merge (= 7.1.8) + typescript-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.8) + binary-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +GEM + remote: https://gem.coop/ + specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -62,11 +330,6 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -79,10 +342,6 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -96,11 +355,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -150,27 +404,25 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) version_gem (~> 1.1, >= 1.1.15) - kettle-dev (3.0.33) + kettle-dev (3.0.34) emoji_regex (>= 15.0) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.15) - kettle-rb (~> 0.1, >= 0.1.11) + kettle-rb (~> 0.1, >= 0.1.12) kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-family (1.2.97) + kettle-drift (1.0.13) + version_gem (~> 1.1, >= 1.1.15) + kettle-family (1.2.100) command_kit (~> 0.6) command_kit-completion (~> 0.1) kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.33) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-jem (~> 7.1, >= 7.1.23) kettle-test (~> 2.0, >= 2.0.21) @@ -182,39 +434,9 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) - kettle-rb (0.1.11) + kettle-rb (0.1.12) kettle-soup-cover (3.0.10) kettle-wash (~> 0.1, >= 0.1.6) simplecov (>= 1.0) @@ -237,20 +459,12 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.17.0) - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) + markly (0.19.0) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -278,28 +492,13 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -308,11 +507,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -379,11 +573,11 @@ GEM parallel (~> 1.10) rainbow (>= 2.2.2, < 4.0) rubocop (~> 1.0) - rubocop-lts (24.2.2) - rubocop-ruby3_2 (~> 3.0, >= 3.0.1) - standard-rubocop-lts (~> 2.0, >= 2.0.3) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-rspec (1.0.5) + rubocop-lts (24.2.3) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-rspec (1.0.6) rubocop (~> 1.84, >= 1.84.2) rubocop-env (~> 0.1, >= 0.1.0) rubocop-factory_bot (~> 2.28, >= 2.28.0) @@ -391,8 +585,8 @@ GEM rubocop-rspec-extra (~> 0.3, >= 0.3.0) standard (~> 1.54, >= 1.54.0) standard-rspec (~> 0.5, >= 0.5.0) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-ruby (0.1.3) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-ruby (0.1.4) lint_roller (~> 1.1) rubocop (>= 1.72.1, < 2.0) version_gem (~> 1.1, >= 1.1.15) @@ -426,21 +620,17 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-rspec (~> 3.5) - rubocop-ruby3_2 (3.0.7) + rubocop-ruby3_2 (3.0.8) rubocop-gradual (~> 0.3, >= 0.3.6) rubocop-md (~> 2.0, >= 2.0.4) rubocop-rake (~> 0.7, >= 0.7.1) rubocop-thread_safety (~> 0.7, >= 0.7.3) - standard-rubocop-lts (~> 2.0, >= 2.0.9) - version_gem (~> 1.1, >= 1.1.13) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) rubocop-thread_safety (0.7.3) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -461,7 +651,7 @@ GEM simplecov (>= 0.4.1) simplecov_lcov_formatter (0.9.0) simplecov (>= 0.18) - sorbet-runtime (0.6.13486) + sorbet-runtime (0.6.13490) standard (1.56.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) @@ -480,8 +670,8 @@ GEM rubocop-factory_bot (~> 2.27) rubocop-rspec (~> 3.9) rubocop-rspec_rails (~> 2.31) - standard-rubocop-lts (2.0.12) - rubocop-lts-ruby (~> 0.1, >= 0.1.0) + standard-rubocop-lts (2.0.13) + rubocop-lts-ruby (~> 0.1, >= 0.1.4) standard (~> 1.54, >= 1.54.0) standard-custom (~> 1.0, >= 1.0.2) standard-performance (~> 1.9, >= 1.9.0) @@ -501,18 +691,11 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -541,10 +724,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -582,26 +761,49 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) + ast-crispr! + ast-crispr-markdown-markly! + ast-crispr-ruby-prism! + ast-merge! + ast-merge-git! + ast-template! + bash-merge! benchmark (~> 0.5, >= 0.5.0) + binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) + go-merge! + html-merge! irb (~> 1.17) + json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) + kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) + kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) + kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -611,13 +813,20 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) + toml-merge! + tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) + yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -625,6 +834,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -637,10 +847,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) + ast-merge-git (7.1.8) + ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -678,18 +891,21 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d + go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 + html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 + kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 + kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f - kettle-rb (0.1.11) sha256=3e50b413048906f2c5aea69ff805fbf8f7f2b5ea9d9e3d95151d38d97d6640f3 + kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed @@ -700,7 +916,7 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.8) - markly (0.17.0) sha256=fab61b604f7c4c8f771c3b7f2f16b971034bb72ddd27009b90c3fae1990b17e6 + markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca markly-merge (7.1.8) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 @@ -717,6 +933,7 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 + parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -751,9 +968,9 @@ CHECKSUMS rubocop-env (0.1.0) sha256=5ab9a259e71822bf514c8e900a9b68cc2f74ccc87d5493efcd03213f3068e718 rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb rubocop-gradual (0.4.0) sha256=9c7e584e6fef6c2539266a193a4572c970c22f99046fd6b0305bdde6228f96ad - rubocop-lts (24.2.2) sha256=be6c745e1bb61daebd6af3cc3227c60f95be9f642a080773cad7df14c5f9f174 - rubocop-lts-rspec (1.0.5) sha256=439552fd27440802cc499889e013bffa28aadc41adae5d4dfff3d984a2a809b4 - rubocop-lts-ruby (0.1.3) sha256=fa002117b94c5eb403eb476d5fde393913dbcc4253b6151ed9a3393c73fd3916 + rubocop-lts (24.2.3) sha256=510ca38a90393c7c5cac0e0defa35151805797b1ff9a2d130b649c20c2ca0842 + rubocop-lts-rspec (1.0.6) sha256=b7f7dae919c9712dee09df76b027563e154f510d9b4423bb0453394b5474cf38 + rubocop-lts-ruby (0.1.4) sha256=eb0039d61d645d2b6754abd4006842945b7848a916a664f522f5e2f7a5a69bf1 rubocop-md (2.0.4) sha256=0d076b6b5e99dea2ddc928c4bd702497decb9a8400da7808091e02ebcafcfb93 rubocop-minitest (0.40.0) sha256=353c698199115f12151144cf0b5a96f69bb9d77b660cf6536df2c4250c672a9d rubocop-on-rbs (2.0.0) sha256=ce74d1b3d5daead19f4b611623656c185821dfc9aed9c7079bb1e5d7d7c464be @@ -763,12 +980,13 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-rspec-extra (0.3.0) sha256=ee4b6484d0332a0d23c4a465eeb607e41888eb3d4ed479f850b9f5212514f787 rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 - rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 + rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 ruby-merge (7.1.8) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 + rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -776,12 +994,13 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f + smorg-rb (7.1.8) + sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2 standard-rspec (0.5.0) sha256=64d396524a65af47f5331b423d8cdd313e0267401647bb7892489ca89dad2973 - standard-rubocop-lts (2.0.12) sha256=4b55efc56691d4edef197df8df27ffebdb4a273e26d7bf00799d00ac6a71532f + standard-rubocop-lts (2.0.13) sha256=acc0f7e73db0215a50b5e2df01fbf1b6bbcc68bb128f429f970db3fdd62a8243 stone_checksums (1.0.8) sha256=91c5453d6c67c468653bf5396a33936c85d7731077be756ed0ff7eb78f981117 stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1 strings-ansi (0.2.0) sha256=90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88 @@ -791,6 +1010,7 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -803,6 +1023,7 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 + typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -816,6 +1037,7 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 + zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From d6bbbe4abfa680f6957d4139dc9aff61fc4185e6 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:44:29 -0400 Subject: [PATCH 019/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/markly-merge/Gemfile.lock | 508 +++++++++++++++++++++++---------- 1 file changed, 365 insertions(+), 143 deletions(-) diff --git a/gems/markly-merge/Gemfile.lock b/gems/markly-merge/Gemfile.lock index 4757ef1b6..94a9d7487 100644 --- a/gems/markly-merge/Gemfile.lock +++ b/gems/markly-merge/Gemfile.lock @@ -15,46 +15,314 @@ PATH markly (~> 0.9) version_gem (~> 1.1, >= 1.1.15) -GEM - remote: https://gem.coop/ +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - backports (3.25.3) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.8) + ast-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge + specs: + html-merge (7.1.8) + ast-crispr (= 7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.8) + toml (~> 0.3) + toml-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.8) + ast-merge (= 7.1.8) + ast-merge-git (= 7.1.8) + bash-merge (= 7.1.8) + diff-lcs (~> 1.5) + dotenv-merge (= 7.1.8) + go-merge (= 7.1.8) + html-merge (= 7.1.8) + json-merge (= 7.1.8) + kettle-jem (~> 7.1, >= 7.1.18) + markdown-merge (= 7.1.8) + plain-merge (= 7.1.8) + prism-merge (= 7.1.8) + psych-merge (= 7.1.8) + rbs-merge (= 7.1.8) + rust-merge (= 7.1.8) + toml-merge (= 7.1.8) + typescript-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.8) + binary-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +GEM + remote: https://gem.coop/ + specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -62,11 +330,6 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -79,10 +342,6 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -96,11 +355,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -150,27 +404,25 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) version_gem (~> 1.1, >= 1.1.15) - kettle-dev (3.0.33) + kettle-dev (3.0.34) emoji_regex (>= 15.0) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.15) - kettle-rb (~> 0.1, >= 0.1.11) + kettle-rb (~> 0.1, >= 0.1.12) kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-family (1.2.97) + kettle-drift (1.0.13) + version_gem (~> 1.1, >= 1.1.15) + kettle-family (1.2.100) command_kit (~> 0.6) command_kit-completion (~> 0.1) kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.33) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-jem (~> 7.1, >= 7.1.23) kettle-test (~> 2.0, >= 2.0.21) @@ -182,39 +434,9 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) - kettle-rb (0.1.11) + kettle-rb (0.1.12) kettle-soup-cover (3.0.10) kettle-wash (~> 0.1, >= 0.1.6) simplecov (>= 1.0) @@ -237,20 +459,12 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - markly (0.17.0) + markly (0.19.0) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -278,28 +492,13 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -308,11 +507,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -379,11 +573,11 @@ GEM parallel (~> 1.10) rainbow (>= 2.2.2, < 4.0) rubocop (~> 1.0) - rubocop-lts (24.2.2) - rubocop-ruby3_2 (~> 3.0, >= 3.0.1) - standard-rubocop-lts (~> 2.0, >= 2.0.3) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-rspec (1.0.5) + rubocop-lts (24.2.3) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-rspec (1.0.6) rubocop (~> 1.84, >= 1.84.2) rubocop-env (~> 0.1, >= 0.1.0) rubocop-factory_bot (~> 2.28, >= 2.28.0) @@ -391,8 +585,8 @@ GEM rubocop-rspec-extra (~> 0.3, >= 0.3.0) standard (~> 1.54, >= 1.54.0) standard-rspec (~> 0.5, >= 0.5.0) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-ruby (0.1.3) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-ruby (0.1.4) lint_roller (~> 1.1) rubocop (>= 1.72.1, < 2.0) version_gem (~> 1.1, >= 1.1.15) @@ -426,21 +620,17 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-rspec (~> 3.5) - rubocop-ruby3_2 (3.0.7) + rubocop-ruby3_2 (3.0.8) rubocop-gradual (~> 0.3, >= 0.3.6) rubocop-md (~> 2.0, >= 2.0.4) rubocop-rake (~> 0.7, >= 0.7.1) rubocop-thread_safety (~> 0.7, >= 0.7.3) - standard-rubocop-lts (~> 2.0, >= 2.0.9) - version_gem (~> 1.1, >= 1.1.13) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) rubocop-thread_safety (0.7.3) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -461,7 +651,7 @@ GEM simplecov (>= 0.4.1) simplecov_lcov_formatter (0.9.0) simplecov (>= 0.18) - sorbet-runtime (0.6.13486) + sorbet-runtime (0.6.13490) standard (1.56.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) @@ -480,8 +670,8 @@ GEM rubocop-factory_bot (~> 2.27) rubocop-rspec (~> 3.9) rubocop-rspec_rails (~> 2.31) - standard-rubocop-lts (2.0.12) - rubocop-lts-ruby (~> 0.1, >= 0.1.0) + standard-rubocop-lts (2.0.13) + rubocop-lts-ruby (~> 0.1, >= 0.1.4) standard (~> 1.54, >= 1.54.0) standard-custom (~> 1.0, >= 1.0.2) standard-performance (~> 1.9, >= 1.9.0) @@ -501,18 +691,11 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -541,10 +724,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -582,26 +761,49 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) + ast-crispr! + ast-crispr-markdown-markly! + ast-crispr-ruby-prism! + ast-merge! + ast-merge-git! + ast-template! + bash-merge! benchmark (~> 0.5, >= 0.5.0) + binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) + go-merge! + html-merge! irb (~> 1.17) + json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) + kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) + kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -611,13 +813,20 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) + toml-merge! + tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) + yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -625,6 +834,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -637,10 +847,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) + ast-merge-git (7.1.8) + ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -678,18 +891,21 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d + go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 + html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 + kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 + kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f - kettle-rb (0.1.11) sha256=3e50b413048906f2c5aea69ff805fbf8f7f2b5ea9d9e3d95151d38d97d6640f3 + kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed @@ -700,7 +916,7 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.8) - markly (0.17.0) sha256=fab61b604f7c4c8f771c3b7f2f16b971034bb72ddd27009b90c3fae1990b17e6 + markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca markly-merge (7.1.8) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 @@ -717,6 +933,7 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 + parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -751,9 +968,9 @@ CHECKSUMS rubocop-env (0.1.0) sha256=5ab9a259e71822bf514c8e900a9b68cc2f74ccc87d5493efcd03213f3068e718 rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb rubocop-gradual (0.4.0) sha256=9c7e584e6fef6c2539266a193a4572c970c22f99046fd6b0305bdde6228f96ad - rubocop-lts (24.2.2) sha256=be6c745e1bb61daebd6af3cc3227c60f95be9f642a080773cad7df14c5f9f174 - rubocop-lts-rspec (1.0.5) sha256=439552fd27440802cc499889e013bffa28aadc41adae5d4dfff3d984a2a809b4 - rubocop-lts-ruby (0.1.3) sha256=fa002117b94c5eb403eb476d5fde393913dbcc4253b6151ed9a3393c73fd3916 + rubocop-lts (24.2.3) sha256=510ca38a90393c7c5cac0e0defa35151805797b1ff9a2d130b649c20c2ca0842 + rubocop-lts-rspec (1.0.6) sha256=b7f7dae919c9712dee09df76b027563e154f510d9b4423bb0453394b5474cf38 + rubocop-lts-ruby (0.1.4) sha256=eb0039d61d645d2b6754abd4006842945b7848a916a664f522f5e2f7a5a69bf1 rubocop-md (2.0.4) sha256=0d076b6b5e99dea2ddc928c4bd702497decb9a8400da7808091e02ebcafcfb93 rubocop-minitest (0.40.0) sha256=353c698199115f12151144cf0b5a96f69bb9d77b660cf6536df2c4250c672a9d rubocop-on-rbs (2.0.0) sha256=ce74d1b3d5daead19f4b611623656c185821dfc9aed9c7079bb1e5d7d7c464be @@ -763,12 +980,13 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-rspec-extra (0.3.0) sha256=ee4b6484d0332a0d23c4a465eeb607e41888eb3d4ed479f850b9f5212514f787 rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 - rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 + rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 ruby-merge (7.1.8) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 + rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -776,12 +994,13 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f + smorg-rb (7.1.8) + sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2 standard-rspec (0.5.0) sha256=64d396524a65af47f5331b423d8cdd313e0267401647bb7892489ca89dad2973 - standard-rubocop-lts (2.0.12) sha256=4b55efc56691d4edef197df8df27ffebdb4a273e26d7bf00799d00ac6a71532f + standard-rubocop-lts (2.0.13) sha256=acc0f7e73db0215a50b5e2df01fbf1b6bbcc68bb128f429f970db3fdd62a8243 stone_checksums (1.0.8) sha256=91c5453d6c67c468653bf5396a33936c85d7731077be756ed0ff7eb78f981117 stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1 strings-ansi (0.2.0) sha256=90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88 @@ -791,6 +1010,7 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -803,6 +1023,7 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 + typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -816,6 +1037,7 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 + zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 3aa9c028ec45a52d094376a94a3d92764d75eca3 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:44:32 -0400 Subject: [PATCH 020/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr-markdown-markly/Gemfile.lock | 508 +++++++++++++------ 1 file changed, 365 insertions(+), 143 deletions(-) diff --git a/gems/ast-crispr-markdown-markly/Gemfile.lock b/gems/ast-crispr-markdown-markly/Gemfile.lock index 9b2ecc2c8..fb860da64 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile.lock +++ b/gems/ast-crispr-markdown-markly/Gemfile.lock @@ -16,6 +16,295 @@ PATH markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.8) + ast-crispr (= 7.1.8) + prism-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.8) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.8) + ast-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge + specs: + html-merge (7.1.8) + ast-crispr (= 7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.8) + toml (~> 0.3) + toml-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.8) + ast-merge (= 7.1.8) + ast-merge-git (= 7.1.8) + bash-merge (= 7.1.8) + diff-lcs (~> 1.5) + dotenv-merge (= 7.1.8) + go-merge (= 7.1.8) + html-merge (= 7.1.8) + json-merge (= 7.1.8) + kettle-jem (~> 7.1, >= 7.1.18) + markdown-merge (= 7.1.8) + plain-merge (= 7.1.8) + prism-merge (= 7.1.8) + psych-merge (= 7.1.8) + rbs-merge (= 7.1.8) + rust-merge (= 7.1.8) + toml-merge (= 7.1.8) + typescript-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.8) + binary-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + GEM remote: https://gem.coop/ specs: @@ -33,24 +322,7 @@ GEM rubocop (>= 1.0) version_gem (~> 1.1, >= 1.1.15) ast (2.4.3) - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - ast-merge (7.1.8) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) backports (3.25.3) - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -58,11 +330,6 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -75,10 +342,6 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -92,11 +355,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -146,27 +404,25 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) version_gem (~> 1.1, >= 1.1.15) - kettle-dev (3.0.33) + kettle-dev (3.0.34) emoji_regex (>= 15.0) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.15) - kettle-rb (~> 0.1, >= 0.1.11) + kettle-rb (~> 0.1, >= 0.1.12) kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-family (1.2.97) + kettle-drift (1.0.13) + version_gem (~> 1.1, >= 1.1.15) + kettle-family (1.2.100) command_kit (~> 0.6) command_kit-completion (~> 0.1) kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.33) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-jem (~> 7.1, >= 7.1.23) kettle-test (~> 2.0, >= 2.0.21) @@ -178,39 +434,9 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) - kettle-rb (0.1.11) + kettle-rb (0.1.12) kettle-soup-cover (3.0.10) kettle-wash (~> 0.1, >= 0.1.6) simplecov (>= 1.0) @@ -233,24 +459,12 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - markly (0.17.0) - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) + markly (0.19.0) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -278,28 +492,13 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -308,11 +507,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -379,11 +573,11 @@ GEM parallel (~> 1.10) rainbow (>= 2.2.2, < 4.0) rubocop (~> 1.0) - rubocop-lts (24.2.2) - rubocop-ruby3_2 (~> 3.0, >= 3.0.1) - standard-rubocop-lts (~> 2.0, >= 2.0.3) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-rspec (1.0.5) + rubocop-lts (24.2.3) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-rspec (1.0.6) rubocop (~> 1.84, >= 1.84.2) rubocop-env (~> 0.1, >= 0.1.0) rubocop-factory_bot (~> 2.28, >= 2.28.0) @@ -391,8 +585,8 @@ GEM rubocop-rspec-extra (~> 0.3, >= 0.3.0) standard (~> 1.54, >= 1.54.0) standard-rspec (~> 0.5, >= 0.5.0) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-ruby (0.1.3) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-ruby (0.1.4) lint_roller (~> 1.1) rubocop (>= 1.72.1, < 2.0) version_gem (~> 1.1, >= 1.1.15) @@ -426,21 +620,17 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-rspec (~> 3.5) - rubocop-ruby3_2 (3.0.7) + rubocop-ruby3_2 (3.0.8) rubocop-gradual (~> 0.3, >= 0.3.6) rubocop-md (~> 2.0, >= 2.0.4) rubocop-rake (~> 0.7, >= 0.7.1) rubocop-thread_safety (~> 0.7, >= 0.7.3) - standard-rubocop-lts (~> 2.0, >= 2.0.9) - version_gem (~> 1.1, >= 1.1.13) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) rubocop-thread_safety (0.7.3) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -461,7 +651,7 @@ GEM simplecov (>= 0.4.1) simplecov_lcov_formatter (0.9.0) simplecov (>= 0.18) - sorbet-runtime (0.6.13486) + sorbet-runtime (0.6.13490) standard (1.56.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) @@ -480,8 +670,8 @@ GEM rubocop-factory_bot (~> 2.27) rubocop-rspec (~> 3.9) rubocop-rspec_rails (~> 2.31) - standard-rubocop-lts (2.0.12) - rubocop-lts-ruby (~> 0.1, >= 0.1.0) + standard-rubocop-lts (2.0.13) + rubocop-lts-ruby (~> 0.1, >= 0.1.4) standard (~> 1.54, >= 1.54.0) standard-custom (~> 1.0, >= 1.0.2) standard-performance (~> 1.9, >= 1.9.0) @@ -501,18 +691,11 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -541,10 +724,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -582,26 +761,49 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) + ast-crispr! ast-crispr-markdown-markly! + ast-crispr-ruby-prism! + ast-merge! + ast-merge-git! + ast-template! + bash-merge! benchmark (~> 0.5, >= 0.5.0) + binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) + go-merge! + html-merge! irb (~> 1.17) + json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) + kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) + kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -611,13 +813,20 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) + toml-merge! + tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) + yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -625,6 +834,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -637,10 +847,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) + ast-merge-git (7.1.8) + ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -678,18 +891,21 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d + go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 + html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 + kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 + kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f - kettle-rb (0.1.11) sha256=3e50b413048906f2c5aea69ff805fbf8f7f2b5ea9d9e3d95151d38d97d6640f3 + kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed @@ -700,7 +916,7 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.8) - markly (0.17.0) sha256=fab61b604f7c4c8f771c3b7f2f16b971034bb72ddd27009b90c3fae1990b17e6 + markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca markly-merge (7.1.8) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 @@ -717,6 +933,7 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 + parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -751,9 +968,9 @@ CHECKSUMS rubocop-env (0.1.0) sha256=5ab9a259e71822bf514c8e900a9b68cc2f74ccc87d5493efcd03213f3068e718 rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb rubocop-gradual (0.4.0) sha256=9c7e584e6fef6c2539266a193a4572c970c22f99046fd6b0305bdde6228f96ad - rubocop-lts (24.2.2) sha256=be6c745e1bb61daebd6af3cc3227c60f95be9f642a080773cad7df14c5f9f174 - rubocop-lts-rspec (1.0.5) sha256=439552fd27440802cc499889e013bffa28aadc41adae5d4dfff3d984a2a809b4 - rubocop-lts-ruby (0.1.3) sha256=fa002117b94c5eb403eb476d5fde393913dbcc4253b6151ed9a3393c73fd3916 + rubocop-lts (24.2.3) sha256=510ca38a90393c7c5cac0e0defa35151805797b1ff9a2d130b649c20c2ca0842 + rubocop-lts-rspec (1.0.6) sha256=b7f7dae919c9712dee09df76b027563e154f510d9b4423bb0453394b5474cf38 + rubocop-lts-ruby (0.1.4) sha256=eb0039d61d645d2b6754abd4006842945b7848a916a664f522f5e2f7a5a69bf1 rubocop-md (2.0.4) sha256=0d076b6b5e99dea2ddc928c4bd702497decb9a8400da7808091e02ebcafcfb93 rubocop-minitest (0.40.0) sha256=353c698199115f12151144cf0b5a96f69bb9d77b660cf6536df2c4250c672a9d rubocop-on-rbs (2.0.0) sha256=ce74d1b3d5daead19f4b611623656c185821dfc9aed9c7079bb1e5d7d7c464be @@ -763,12 +980,13 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-rspec-extra (0.3.0) sha256=ee4b6484d0332a0d23c4a465eeb607e41888eb3d4ed479f850b9f5212514f787 rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 - rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 + rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 ruby-merge (7.1.8) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 + rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -776,12 +994,13 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f + smorg-rb (7.1.8) + sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2 standard-rspec (0.5.0) sha256=64d396524a65af47f5331b423d8cdd313e0267401647bb7892489ca89dad2973 - standard-rubocop-lts (2.0.12) sha256=4b55efc56691d4edef197df8df27ffebdb4a273e26d7bf00799d00ac6a71532f + standard-rubocop-lts (2.0.13) sha256=acc0f7e73db0215a50b5e2df01fbf1b6bbcc68bb128f429f970db3fdd62a8243 stone_checksums (1.0.8) sha256=91c5453d6c67c468653bf5396a33936c85d7731077be756ed0ff7eb78f981117 stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1 strings-ansi (0.2.0) sha256=90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88 @@ -791,6 +1010,7 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -803,6 +1023,7 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 + typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -816,6 +1037,7 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 + zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From fa0906d177f3b11019c7ff48c81ddb80e15fb357 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:44:34 -0400 Subject: [PATCH 021/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge-git/Gemfile.lock | 548 ++++++++++++++++++++------------ 1 file changed, 352 insertions(+), 196 deletions(-) diff --git a/gems/ast-merge-git/Gemfile.lock b/gems/ast-merge-git/Gemfile.lock index 6e477add2..75cd49e52 100644 --- a/gems/ast-merge-git/Gemfile.lock +++ b/gems/ast-merge-git/Gemfile.lock @@ -15,62 +15,321 @@ PATH tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -GEM - remote: https://gem.coop/ +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - backports (3.25.3) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.8) + ast-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - benchmark (0.5.0) - bigdecimal (4.1.2) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: binary-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - bundler-audit (0.9.3) - bundler (>= 1.2.0) - thor (~> 1.0) - cgi (0.5.2) - citrus (3.0.2) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: citrus-toml-merge (7.1.8) ast-merge (= 7.1.8) toml-merge (= 7.1.8) toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge + specs: + html-merge (7.1.8) + ast-crispr (= 7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.8) + toml (~> 0.3) + toml-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.8) + ast-merge (= 7.1.8) + ast-merge-git (= 7.1.8) + bash-merge (= 7.1.8) + diff-lcs (~> 1.5) + dotenv-merge (= 7.1.8) + go-merge (= 7.1.8) + html-merge (= 7.1.8) + json-merge (= 7.1.8) + kettle-jem (~> 7.1, >= 7.1.18) + markdown-merge (= 7.1.8) + plain-merge (= 7.1.8) + prism-merge (= 7.1.8) + psych-merge (= 7.1.8) + rbs-merge (= 7.1.8) + rust-merge (= 7.1.8) + toml-merge (= 7.1.8) + typescript-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.8) + binary-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +GEM + remote: https://gem.coop/ + specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + backports (3.25.3) + benchmark (0.5.0) + bigdecimal (4.1.2) + bundler-audit (0.9.3) + bundler (>= 1.2.0) + thor (~> 1.0) + cgi (0.5.2) + citrus (3.0.2) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -83,10 +342,6 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -100,11 +355,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -142,20 +392,11 @@ GEM geom2d (0.4.1) gitmoji-regex (2.0.12) version_gem (~> 1.1, >= 1.1.15) - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) hexapdf (1.10.0) cmdparse (~> 3.0, >= 3.0.3) geom2d (~> 0.4, >= 0.4.1) openssl (>= 2.2.1) strscan (>= 3.1.2) - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) io-console (0.9.2) irb (1.18.0) pp (>= 0.6.0) @@ -163,27 +404,25 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) version_gem (~> 1.1, >= 1.1.15) - kettle-dev (3.0.33) + kettle-dev (3.0.34) emoji_regex (>= 15.0) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.15) - kettle-rb (~> 0.1, >= 0.1.11) + kettle-rb (~> 0.1, >= 0.1.12) kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-family (1.2.97) + kettle-drift (1.0.13) + version_gem (~> 1.1, >= 1.1.15) + kettle-family (1.2.100) command_kit (~> 0.6) command_kit-completion (~> 0.1) kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.33) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-jem (~> 7.1, >= 7.1.23) kettle-test (~> 2.0, >= 2.0.21) @@ -195,39 +434,9 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) - kettle-rb (0.1.11) + kettle-rb (0.1.12) kettle-soup-cover (3.0.10) kettle-wash (~> 0.1, >= 0.1.6) simplecov (>= 1.0) @@ -250,24 +459,12 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - markly (0.17.0) - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) + markly (0.19.0) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -295,32 +492,13 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) - parslet-toml-merge (7.1.8) - toml (~> 0.3) - toml-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -329,11 +507,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -400,11 +573,11 @@ GEM parallel (~> 1.10) rainbow (>= 2.2.2, < 4.0) rubocop (~> 1.0) - rubocop-lts (24.2.2) - rubocop-ruby3_2 (~> 3.0, >= 3.0.1) - standard-rubocop-lts (~> 2.0, >= 2.0.3) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-rspec (1.0.5) + rubocop-lts (24.2.3) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-rspec (1.0.6) rubocop (~> 1.84, >= 1.84.2) rubocop-env (~> 0.1, >= 0.1.0) rubocop-factory_bot (~> 2.28, >= 2.28.0) @@ -412,8 +585,8 @@ GEM rubocop-rspec-extra (~> 0.3, >= 0.3.0) standard (~> 1.54, >= 1.54.0) standard-rspec (~> 0.5, >= 0.5.0) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-ruby (0.1.3) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-ruby (0.1.4) lint_roller (~> 1.1) rubocop (>= 1.72.1, < 2.0) version_gem (~> 1.1, >= 1.1.15) @@ -447,28 +620,20 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-rspec (~> 3.5) - rubocop-ruby3_2 (3.0.7) + rubocop-ruby3_2 (3.0.8) rubocop-gradual (~> 0.3, >= 0.3.6) rubocop-md (~> 2.0, >= 2.0.4) rubocop-rake (~> 0.7, >= 0.7.1) rubocop-thread_safety (~> 0.7, >= 0.7.3) - standard-rubocop-lts (~> 2.0, >= 2.0.9) - version_gem (~> 1.1, >= 1.1.13) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) rubocop-thread_safety (0.7.3) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) service_actor (3.9.4) zeitwerk (>= 1.0) silent_stream (1.0.12) @@ -486,7 +651,7 @@ GEM simplecov (>= 0.4.1) simplecov_lcov_formatter (0.9.0) simplecov (>= 0.18) - sorbet-runtime (0.6.13486) + sorbet-runtime (0.6.13490) standard (1.56.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) @@ -505,8 +670,8 @@ GEM rubocop-factory_bot (~> 2.27) rubocop-rspec (~> 3.9) rubocop-rspec_rails (~> 2.31) - standard-rubocop-lts (2.0.12) - rubocop-lts-ruby (~> 0.1, >= 0.1.0) + standard-rubocop-lts (2.0.13) + rubocop-lts-ruby (~> 0.1, >= 0.1.4) standard (~> 1.54, >= 1.54.0) standard-custom (~> 1.0, >= 1.0.2) standard-performance (~> 1.9, >= 1.9.0) @@ -528,18 +693,9 @@ GEM version_gem (~> 1.1, >= 1.1.15) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -560,10 +716,6 @@ GEM parallel_tests (>= 3.3.0, < 6) rspec (>= 3.10) version_gem (~> 1.1, >= 1.1.15) - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) unicode-display_width (2.6.0) version_gem (1.1.15) webrick (1.9.2) @@ -572,10 +724,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -597,10 +745,6 @@ GEM version_gem (~> 1.1, >= 1.1.15) yaml-converter (~> 0.2) zeitwerk (2.8.3) - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) zlib (3.2.3) PLATFORMS @@ -617,42 +761,49 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) + ast-crispr! + ast-crispr-markdown-markly! + ast-crispr-ruby-prism! + ast-merge! ast-merge-git! - bash-merge (~> 7.1, >= 7.1.4) + ast-template! + bash-merge! benchmark (~> 0.5, >= 0.5.0) - binary-merge (~> 7.1, >= 7.1.4) + binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) - citrus-toml-merge (~> 7.1, >= 7.1.4) - commonmarker-merge (~> 7.1, >= 7.1.4) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) - dotenv-merge (~> 7.1, >= 7.1.4) + dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) - go-merge (~> 7.1, >= 7.1.4) - html-merge (~> 7.1, >= 7.1.4) + go-merge! + html-merge! irb (~> 1.17) - json-merge (~> 7.1, >= 7.1.4) + json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) + kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) + kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) - kramdown-merge (~> 7.1, >= 7.1.4) + kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge (~> 7.1, >= 7.1.4) - markly-merge (~> 7.1, >= 7.1.4) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) - parslet-toml-merge (~> 7.1, >= 7.1.4) - plain-merge (~> 7.1, >= 7.1.4) - prism-merge (~> 7.1, >= 7.1.4) - psych-merge (~> 7.1, >= 7.1.4) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge (~> 7.1, >= 7.1.4) + rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -662,18 +813,20 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) - ruby-merge (~> 7.1, >= 7.1.4) + ruby-merge! ruby-progressbar (~> 1.13) - rust-merge (~> 7.1, >= 7.1.4) + rust-merge! + smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) - toml-merge (~> 7.1, >= 7.1.4) + toml-merge! + tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) - typescript-merge (~> 7.1, >= 7.1.4) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) - yaml-merge (~> 7.1, >= 7.1.4) + yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -681,7 +834,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) - zip-merge (~> 7.1, >= 7.1.4) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -695,6 +848,7 @@ CHECKSUMS ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) ast-merge-git (7.1.8) + ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c @@ -745,12 +899,13 @@ CHECKSUMS json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 + kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 + kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f - kettle-rb (0.1.11) sha256=3e50b413048906f2c5aea69ff805fbf8f7f2b5ea9d9e3d95151d38d97d6640f3 + kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed @@ -761,7 +916,7 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.8) - markly (0.17.0) sha256=fab61b604f7c4c8f771c3b7f2f16b971034bb72ddd27009b90c3fae1990b17e6 + markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca markly-merge (7.1.8) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 @@ -813,9 +968,9 @@ CHECKSUMS rubocop-env (0.1.0) sha256=5ab9a259e71822bf514c8e900a9b68cc2f74ccc87d5493efcd03213f3068e718 rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb rubocop-gradual (0.4.0) sha256=9c7e584e6fef6c2539266a193a4572c970c22f99046fd6b0305bdde6228f96ad - rubocop-lts (24.2.2) sha256=be6c745e1bb61daebd6af3cc3227c60f95be9f642a080773cad7df14c5f9f174 - rubocop-lts-rspec (1.0.5) sha256=439552fd27440802cc499889e013bffa28aadc41adae5d4dfff3d984a2a809b4 - rubocop-lts-ruby (0.1.3) sha256=fa002117b94c5eb403eb476d5fde393913dbcc4253b6151ed9a3393c73fd3916 + rubocop-lts (24.2.3) sha256=510ca38a90393c7c5cac0e0defa35151805797b1ff9a2d130b649c20c2ca0842 + rubocop-lts-rspec (1.0.6) sha256=b7f7dae919c9712dee09df76b027563e154f510d9b4423bb0453394b5474cf38 + rubocop-lts-ruby (0.1.4) sha256=eb0039d61d645d2b6754abd4006842945b7848a916a664f522f5e2f7a5a69bf1 rubocop-md (2.0.4) sha256=0d076b6b5e99dea2ddc928c4bd702497decb9a8400da7808091e02ebcafcfb93 rubocop-minitest (0.40.0) sha256=353c698199115f12151144cf0b5a96f69bb9d77b660cf6536df2c4250c672a9d rubocop-on-rbs (2.0.0) sha256=ce74d1b3d5daead19f4b611623656c185821dfc9aed9c7079bb1e5d7d7c464be @@ -825,7 +980,7 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-rspec-extra (0.3.0) sha256=ee4b6484d0332a0d23c4a465eeb607e41888eb3d4ed479f850b9f5212514f787 rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 - rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 + rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 ruby-merge (7.1.8) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 @@ -839,12 +994,13 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f + smorg-rb (7.1.8) + sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2 standard-rspec (0.5.0) sha256=64d396524a65af47f5331b423d8cdd313e0267401647bb7892489ca89dad2973 - standard-rubocop-lts (2.0.12) sha256=4b55efc56691d4edef197df8df27ffebdb4a273e26d7bf00799d00ac6a71532f + standard-rubocop-lts (2.0.13) sha256=acc0f7e73db0215a50b5e2df01fbf1b6bbcc68bb128f429f970db3fdd62a8243 stone_checksums (1.0.8) sha256=91c5453d6c67c468653bf5396a33936c85d7731077be756ed0ff7eb78f981117 stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1 strings-ansi (0.2.0) sha256=90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88 From 1390484acc35c7b86b51efd5f146b20bc004419d Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:44:37 -0400 Subject: [PATCH 022/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/plain-merge/Gemfile.lock | 508 ++++++++++++++++++++++++---------- 1 file changed, 365 insertions(+), 143 deletions(-) diff --git a/gems/plain-merge/Gemfile.lock b/gems/plain-merge/Gemfile.lock index b8e11e278..068212df2 100644 --- a/gems/plain-merge/Gemfile.lock +++ b/gems/plain-merge/Gemfile.lock @@ -15,46 +15,314 @@ PATH tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -GEM - remote: https://gem.coop/ +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - backports (3.25.3) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.8) + ast-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge + specs: + html-merge (7.1.8) + ast-crispr (= 7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.8) + toml (~> 0.3) + toml-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.8) + ast-merge (= 7.1.8) + ast-merge-git (= 7.1.8) + bash-merge (= 7.1.8) + diff-lcs (~> 1.5) + dotenv-merge (= 7.1.8) + go-merge (= 7.1.8) + html-merge (= 7.1.8) + json-merge (= 7.1.8) + kettle-jem (~> 7.1, >= 7.1.18) + markdown-merge (= 7.1.8) + plain-merge (= 7.1.8) + prism-merge (= 7.1.8) + psych-merge (= 7.1.8) + rbs-merge (= 7.1.8) + rust-merge (= 7.1.8) + toml-merge (= 7.1.8) + typescript-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.8) + binary-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +GEM + remote: https://gem.coop/ + specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -62,11 +330,6 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -79,10 +342,6 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -96,11 +355,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -150,27 +404,25 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) version_gem (~> 1.1, >= 1.1.15) - kettle-dev (3.0.33) + kettle-dev (3.0.34) emoji_regex (>= 15.0) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.15) - kettle-rb (~> 0.1, >= 0.1.11) + kettle-rb (~> 0.1, >= 0.1.12) kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-family (1.2.97) + kettle-drift (1.0.13) + version_gem (~> 1.1, >= 1.1.15) + kettle-family (1.2.100) command_kit (~> 0.6) command_kit-completion (~> 0.1) kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.33) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-jem (~> 7.1, >= 7.1.23) kettle-test (~> 2.0, >= 2.0.21) @@ -182,39 +434,9 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) - kettle-rb (0.1.11) + kettle-rb (0.1.12) kettle-soup-cover (3.0.10) kettle-wash (~> 0.1, >= 0.1.6) simplecov (>= 1.0) @@ -237,24 +459,12 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - markly (0.17.0) - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) + markly (0.19.0) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -286,20 +496,9 @@ GEM prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -308,11 +507,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -379,11 +573,11 @@ GEM parallel (~> 1.10) rainbow (>= 2.2.2, < 4.0) rubocop (~> 1.0) - rubocop-lts (24.2.2) - rubocop-ruby3_2 (~> 3.0, >= 3.0.1) - standard-rubocop-lts (~> 2.0, >= 2.0.3) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-rspec (1.0.5) + rubocop-lts (24.2.3) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-rspec (1.0.6) rubocop (~> 1.84, >= 1.84.2) rubocop-env (~> 0.1, >= 0.1.0) rubocop-factory_bot (~> 2.28, >= 2.28.0) @@ -391,8 +585,8 @@ GEM rubocop-rspec-extra (~> 0.3, >= 0.3.0) standard (~> 1.54, >= 1.54.0) standard-rspec (~> 0.5, >= 0.5.0) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-ruby (0.1.3) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-ruby (0.1.4) lint_roller (~> 1.1) rubocop (>= 1.72.1, < 2.0) version_gem (~> 1.1, >= 1.1.15) @@ -426,21 +620,17 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-rspec (~> 3.5) - rubocop-ruby3_2 (3.0.7) + rubocop-ruby3_2 (3.0.8) rubocop-gradual (~> 0.3, >= 0.3.6) rubocop-md (~> 2.0, >= 2.0.4) rubocop-rake (~> 0.7, >= 0.7.1) rubocop-thread_safety (~> 0.7, >= 0.7.3) - standard-rubocop-lts (~> 2.0, >= 2.0.9) - version_gem (~> 1.1, >= 1.1.13) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) rubocop-thread_safety (0.7.3) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -461,7 +651,7 @@ GEM simplecov (>= 0.4.1) simplecov_lcov_formatter (0.9.0) simplecov (>= 0.18) - sorbet-runtime (0.6.13486) + sorbet-runtime (0.6.13490) standard (1.56.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) @@ -480,8 +670,8 @@ GEM rubocop-factory_bot (~> 2.27) rubocop-rspec (~> 3.9) rubocop-rspec_rails (~> 2.31) - standard-rubocop-lts (2.0.12) - rubocop-lts-ruby (~> 0.1, >= 0.1.0) + standard-rubocop-lts (2.0.13) + rubocop-lts-ruby (~> 0.1, >= 0.1.4) standard (~> 1.54, >= 1.54.0) standard-custom (~> 1.0, >= 1.0.2) standard-performance (~> 1.9, >= 1.9.0) @@ -501,18 +691,11 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -541,10 +724,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -582,26 +761,49 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) + ast-crispr! + ast-crispr-markdown-markly! + ast-crispr-ruby-prism! + ast-merge! + ast-merge-git! + ast-template! + bash-merge! benchmark (~> 0.5, >= 0.5.0) + binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) + go-merge! + html-merge! irb (~> 1.17) + json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) + kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) + kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) + parslet-toml-merge! plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -611,13 +813,20 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) + toml-merge! + tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) + yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -625,6 +834,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -637,10 +847,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) + ast-merge-git (7.1.8) + ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -678,18 +891,21 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d + go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 + html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 + kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 + kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f - kettle-rb (0.1.11) sha256=3e50b413048906f2c5aea69ff805fbf8f7f2b5ea9d9e3d95151d38d97d6640f3 + kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed @@ -700,7 +916,7 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.8) - markly (0.17.0) sha256=fab61b604f7c4c8f771c3b7f2f16b971034bb72ddd27009b90c3fae1990b17e6 + markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca markly-merge (7.1.8) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 @@ -717,6 +933,7 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 + parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -751,9 +968,9 @@ CHECKSUMS rubocop-env (0.1.0) sha256=5ab9a259e71822bf514c8e900a9b68cc2f74ccc87d5493efcd03213f3068e718 rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb rubocop-gradual (0.4.0) sha256=9c7e584e6fef6c2539266a193a4572c970c22f99046fd6b0305bdde6228f96ad - rubocop-lts (24.2.2) sha256=be6c745e1bb61daebd6af3cc3227c60f95be9f642a080773cad7df14c5f9f174 - rubocop-lts-rspec (1.0.5) sha256=439552fd27440802cc499889e013bffa28aadc41adae5d4dfff3d984a2a809b4 - rubocop-lts-ruby (0.1.3) sha256=fa002117b94c5eb403eb476d5fde393913dbcc4253b6151ed9a3393c73fd3916 + rubocop-lts (24.2.3) sha256=510ca38a90393c7c5cac0e0defa35151805797b1ff9a2d130b649c20c2ca0842 + rubocop-lts-rspec (1.0.6) sha256=b7f7dae919c9712dee09df76b027563e154f510d9b4423bb0453394b5474cf38 + rubocop-lts-ruby (0.1.4) sha256=eb0039d61d645d2b6754abd4006842945b7848a916a664f522f5e2f7a5a69bf1 rubocop-md (2.0.4) sha256=0d076b6b5e99dea2ddc928c4bd702497decb9a8400da7808091e02ebcafcfb93 rubocop-minitest (0.40.0) sha256=353c698199115f12151144cf0b5a96f69bb9d77b660cf6536df2c4250c672a9d rubocop-on-rbs (2.0.0) sha256=ce74d1b3d5daead19f4b611623656c185821dfc9aed9c7079bb1e5d7d7c464be @@ -763,12 +980,13 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-rspec-extra (0.3.0) sha256=ee4b6484d0332a0d23c4a465eeb607e41888eb3d4ed479f850b9f5212514f787 rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 - rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 + rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 ruby-merge (7.1.8) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 + rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -776,12 +994,13 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f + smorg-rb (7.1.8) + sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2 standard-rspec (0.5.0) sha256=64d396524a65af47f5331b423d8cdd313e0267401647bb7892489ca89dad2973 - standard-rubocop-lts (2.0.12) sha256=4b55efc56691d4edef197df8df27ffebdb4a273e26d7bf00799d00ac6a71532f + standard-rubocop-lts (2.0.13) sha256=acc0f7e73db0215a50b5e2df01fbf1b6bbcc68bb128f429f970db3fdd62a8243 stone_checksums (1.0.8) sha256=91c5453d6c67c468653bf5396a33936c85d7731077be756ed0ff7eb78f981117 stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1 strings-ansi (0.2.0) sha256=90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88 @@ -791,6 +1010,7 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -803,6 +1023,7 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 + typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -816,6 +1037,7 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 + zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 6d97f81be5665728d002814200a70c52363c8ad1 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:44:39 -0400 Subject: [PATCH 023/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/bash-merge/Gemfile.lock | 510 +++++++++++++++++++++++++---------- 1 file changed, 366 insertions(+), 144 deletions(-) diff --git a/gems/bash-merge/Gemfile.lock b/gems/bash-merge/Gemfile.lock index d71c5a56a..a85bbf3eb 100644 --- a/gems/bash-merge/Gemfile.lock +++ b/gems/bash-merge/Gemfile.lock @@ -15,6 +15,296 @@ PATH tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.8) + ast-crispr (= 7.1.8) + markdown-merge (= 7.1.8) + markly-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.8) + ast-crispr (= 7.1.8) + prism-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.8) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.8) + ast-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge + specs: + html-merge (7.1.8) + ast-crispr (= 7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.8) + toml (~> 0.3) + toml-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.8) + ast-merge (= 7.1.8) + ast-merge-git (= 7.1.8) + bash-merge (= 7.1.8) + diff-lcs (~> 1.5) + dotenv-merge (= 7.1.8) + go-merge (= 7.1.8) + html-merge (= 7.1.8) + json-merge (= 7.1.8) + kettle-jem (~> 7.1, >= 7.1.18) + markdown-merge (= 7.1.8) + plain-merge (= 7.1.8) + prism-merge (= 7.1.8) + psych-merge (= 7.1.8) + rbs-merge (= 7.1.8) + rust-merge (= 7.1.8) + toml-merge (= 7.1.8) + typescript-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.8) + binary-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + GEM remote: https://gem.coop/ specs: @@ -32,24 +322,6 @@ GEM rubocop (>= 1.0) version_gem (~> 1.1, >= 1.1.15) ast (2.4.3) - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - ast-merge (7.1.8) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -58,11 +330,6 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -75,10 +342,6 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -92,11 +355,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -146,27 +404,25 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) version_gem (~> 1.1, >= 1.1.15) - kettle-dev (3.0.33) + kettle-dev (3.0.34) emoji_regex (>= 15.0) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.15) - kettle-rb (~> 0.1, >= 0.1.11) + kettle-rb (~> 0.1, >= 0.1.12) kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-family (1.2.97) + kettle-drift (1.0.13) + version_gem (~> 1.1, >= 1.1.15) + kettle-family (1.2.100) command_kit (~> 0.6) command_kit-completion (~> 0.1) kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.33) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-jem (~> 7.1, >= 7.1.23) kettle-test (~> 2.0, >= 2.0.21) @@ -178,39 +434,9 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) - kettle-rb (0.1.11) + kettle-rb (0.1.12) kettle-soup-cover (3.0.10) kettle-wash (~> 0.1, >= 0.1.6) simplecov (>= 1.0) @@ -233,24 +459,12 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - markly (0.17.0) - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) + markly (0.19.0) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -278,28 +492,13 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -308,11 +507,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -379,11 +573,11 @@ GEM parallel (~> 1.10) rainbow (>= 2.2.2, < 4.0) rubocop (~> 1.0) - rubocop-lts (24.2.2) - rubocop-ruby3_2 (~> 3.0, >= 3.0.1) - standard-rubocop-lts (~> 2.0, >= 2.0.3) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-rspec (1.0.5) + rubocop-lts (24.2.3) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-rspec (1.0.6) rubocop (~> 1.84, >= 1.84.2) rubocop-env (~> 0.1, >= 0.1.0) rubocop-factory_bot (~> 2.28, >= 2.28.0) @@ -391,8 +585,8 @@ GEM rubocop-rspec-extra (~> 0.3, >= 0.3.0) standard (~> 1.54, >= 1.54.0) standard-rspec (~> 0.5, >= 0.5.0) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-ruby (0.1.3) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-ruby (0.1.4) lint_roller (~> 1.1) rubocop (>= 1.72.1, < 2.0) version_gem (~> 1.1, >= 1.1.15) @@ -426,21 +620,17 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-rspec (~> 3.5) - rubocop-ruby3_2 (3.0.7) + rubocop-ruby3_2 (3.0.8) rubocop-gradual (~> 0.3, >= 0.3.6) rubocop-md (~> 2.0, >= 2.0.4) rubocop-rake (~> 0.7, >= 0.7.1) rubocop-thread_safety (~> 0.7, >= 0.7.3) - standard-rubocop-lts (~> 2.0, >= 2.0.9) - version_gem (~> 1.1, >= 1.1.13) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) rubocop-thread_safety (0.7.3) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -461,7 +651,7 @@ GEM simplecov (>= 0.4.1) simplecov_lcov_formatter (0.9.0) simplecov (>= 0.18) - sorbet-runtime (0.6.13486) + sorbet-runtime (0.6.13490) standard (1.56.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) @@ -480,8 +670,8 @@ GEM rubocop-factory_bot (~> 2.27) rubocop-rspec (~> 3.9) rubocop-rspec_rails (~> 2.31) - standard-rubocop-lts (2.0.12) - rubocop-lts-ruby (~> 0.1, >= 0.1.0) + standard-rubocop-lts (2.0.13) + rubocop-lts-ruby (~> 0.1, >= 0.1.4) standard (~> 1.54, >= 1.54.0) standard-custom (~> 1.0, >= 1.0.2) standard-performance (~> 1.9, >= 1.9.0) @@ -501,18 +691,11 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -541,10 +724,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -582,26 +761,49 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) + ast-crispr! + ast-crispr-markdown-markly! + ast-crispr-ruby-prism! + ast-merge! + ast-merge-git! + ast-template! bash-merge! benchmark (~> 0.5, >= 0.5.0) + binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) + go-merge! + html-merge! irb (~> 1.17) + json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) + kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) + kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -611,13 +813,20 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) + toml-merge! + tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) + yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -625,6 +834,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -637,10 +847,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) + ast-merge-git (7.1.8) + ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -678,18 +891,21 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d + go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 + html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 + kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 + kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f - kettle-rb (0.1.11) sha256=3e50b413048906f2c5aea69ff805fbf8f7f2b5ea9d9e3d95151d38d97d6640f3 + kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed @@ -700,7 +916,7 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.8) - markly (0.17.0) sha256=fab61b604f7c4c8f771c3b7f2f16b971034bb72ddd27009b90c3fae1990b17e6 + markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca markly-merge (7.1.8) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 @@ -717,6 +933,7 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 + parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -751,9 +968,9 @@ CHECKSUMS rubocop-env (0.1.0) sha256=5ab9a259e71822bf514c8e900a9b68cc2f74ccc87d5493efcd03213f3068e718 rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb rubocop-gradual (0.4.0) sha256=9c7e584e6fef6c2539266a193a4572c970c22f99046fd6b0305bdde6228f96ad - rubocop-lts (24.2.2) sha256=be6c745e1bb61daebd6af3cc3227c60f95be9f642a080773cad7df14c5f9f174 - rubocop-lts-rspec (1.0.5) sha256=439552fd27440802cc499889e013bffa28aadc41adae5d4dfff3d984a2a809b4 - rubocop-lts-ruby (0.1.3) sha256=fa002117b94c5eb403eb476d5fde393913dbcc4253b6151ed9a3393c73fd3916 + rubocop-lts (24.2.3) sha256=510ca38a90393c7c5cac0e0defa35151805797b1ff9a2d130b649c20c2ca0842 + rubocop-lts-rspec (1.0.6) sha256=b7f7dae919c9712dee09df76b027563e154f510d9b4423bb0453394b5474cf38 + rubocop-lts-ruby (0.1.4) sha256=eb0039d61d645d2b6754abd4006842945b7848a916a664f522f5e2f7a5a69bf1 rubocop-md (2.0.4) sha256=0d076b6b5e99dea2ddc928c4bd702497decb9a8400da7808091e02ebcafcfb93 rubocop-minitest (0.40.0) sha256=353c698199115f12151144cf0b5a96f69bb9d77b660cf6536df2c4250c672a9d rubocop-on-rbs (2.0.0) sha256=ce74d1b3d5daead19f4b611623656c185821dfc9aed9c7079bb1e5d7d7c464be @@ -763,12 +980,13 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-rspec-extra (0.3.0) sha256=ee4b6484d0332a0d23c4a465eeb607e41888eb3d4ed479f850b9f5212514f787 rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 - rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 + rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 ruby-merge (7.1.8) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 + rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -776,12 +994,13 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f + smorg-rb (7.1.8) + sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2 standard-rspec (0.5.0) sha256=64d396524a65af47f5331b423d8cdd313e0267401647bb7892489ca89dad2973 - standard-rubocop-lts (2.0.12) sha256=4b55efc56691d4edef197df8df27ffebdb4a273e26d7bf00799d00ac6a71532f + standard-rubocop-lts (2.0.13) sha256=acc0f7e73db0215a50b5e2df01fbf1b6bbcc68bb128f429f970db3fdd62a8243 stone_checksums (1.0.8) sha256=91c5453d6c67c468653bf5396a33936c85d7731077be756ed0ff7eb78f981117 stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1 strings-ansi (0.2.0) sha256=90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88 @@ -791,6 +1010,7 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -803,6 +1023,7 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 + typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -816,6 +1037,7 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 + zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 747e157583480349bfeb627471adaf7546def259 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:44:41 -0400 Subject: [PATCH 024/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/dotenv-merge/Gemfile.lock | 506 ++++++++++++++++++++++++--------- 1 file changed, 364 insertions(+), 142 deletions(-) diff --git a/gems/dotenv-merge/Gemfile.lock b/gems/dotenv-merge/Gemfile.lock index ef956112b..b45d64ddf 100644 --- a/gems/dotenv-merge/Gemfile.lock +++ b/gems/dotenv-merge/Gemfile.lock @@ -16,46 +16,313 @@ PATH tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -GEM - remote: https://gem.coop/ +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - backports (3.25.3) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.8) + ast-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge + specs: + html-merge (7.1.8) + ast-crispr (= 7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.8) + toml (~> 0.3) + toml-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.8) + ast-merge (= 7.1.8) + ast-merge-git (= 7.1.8) + bash-merge (= 7.1.8) + diff-lcs (~> 1.5) + dotenv-merge (= 7.1.8) + go-merge (= 7.1.8) + html-merge (= 7.1.8) + json-merge (= 7.1.8) + kettle-jem (~> 7.1, >= 7.1.18) + markdown-merge (= 7.1.8) + plain-merge (= 7.1.8) + prism-merge (= 7.1.8) + psych-merge (= 7.1.8) + rbs-merge (= 7.1.8) + rust-merge (= 7.1.8) + toml-merge (= 7.1.8) + typescript-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.8) + binary-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +GEM + remote: https://gem.coop/ + specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -63,11 +330,6 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -80,10 +342,6 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -146,27 +404,25 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) version_gem (~> 1.1, >= 1.1.15) - kettle-dev (3.0.33) + kettle-dev (3.0.34) emoji_regex (>= 15.0) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.15) - kettle-rb (~> 0.1, >= 0.1.11) + kettle-rb (~> 0.1, >= 0.1.12) kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-family (1.2.97) + kettle-drift (1.0.13) + version_gem (~> 1.1, >= 1.1.15) + kettle-family (1.2.100) command_kit (~> 0.6) command_kit-completion (~> 0.1) kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.33) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-jem (~> 7.1, >= 7.1.23) kettle-test (~> 2.0, >= 2.0.21) @@ -178,39 +434,9 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) - kettle-rb (0.1.11) + kettle-rb (0.1.12) kettle-soup-cover (3.0.10) kettle-wash (~> 0.1, >= 0.1.6) simplecov (>= 1.0) @@ -233,24 +459,12 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - markly (0.17.0) - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) + markly (0.19.0) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -278,28 +492,13 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -308,11 +507,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -379,11 +573,11 @@ GEM parallel (~> 1.10) rainbow (>= 2.2.2, < 4.0) rubocop (~> 1.0) - rubocop-lts (24.2.2) - rubocop-ruby3_2 (~> 3.0, >= 3.0.1) - standard-rubocop-lts (~> 2.0, >= 2.0.3) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-rspec (1.0.5) + rubocop-lts (24.2.3) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-rspec (1.0.6) rubocop (~> 1.84, >= 1.84.2) rubocop-env (~> 0.1, >= 0.1.0) rubocop-factory_bot (~> 2.28, >= 2.28.0) @@ -391,8 +585,8 @@ GEM rubocop-rspec-extra (~> 0.3, >= 0.3.0) standard (~> 1.54, >= 1.54.0) standard-rspec (~> 0.5, >= 0.5.0) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-ruby (0.1.3) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-ruby (0.1.4) lint_roller (~> 1.1) rubocop (>= 1.72.1, < 2.0) version_gem (~> 1.1, >= 1.1.15) @@ -426,21 +620,17 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-rspec (~> 3.5) - rubocop-ruby3_2 (3.0.7) + rubocop-ruby3_2 (3.0.8) rubocop-gradual (~> 0.3, >= 0.3.6) rubocop-md (~> 2.0, >= 2.0.4) rubocop-rake (~> 0.7, >= 0.7.1) rubocop-thread_safety (~> 0.7, >= 0.7.3) - standard-rubocop-lts (~> 2.0, >= 2.0.9) - version_gem (~> 1.1, >= 1.1.13) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) rubocop-thread_safety (0.7.3) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -461,7 +651,7 @@ GEM simplecov (>= 0.4.1) simplecov_lcov_formatter (0.9.0) simplecov (>= 0.18) - sorbet-runtime (0.6.13486) + sorbet-runtime (0.6.13490) standard (1.56.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) @@ -480,8 +670,8 @@ GEM rubocop-factory_bot (~> 2.27) rubocop-rspec (~> 3.9) rubocop-rspec_rails (~> 2.31) - standard-rubocop-lts (2.0.12) - rubocop-lts-ruby (~> 0.1, >= 0.1.0) + standard-rubocop-lts (2.0.13) + rubocop-lts-ruby (~> 0.1, >= 0.1.4) standard (~> 1.54, >= 1.54.0) standard-custom (~> 1.0, >= 1.0.2) standard-performance (~> 1.9, >= 1.9.0) @@ -501,18 +691,11 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -541,10 +724,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -582,26 +761,49 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) + ast-crispr! + ast-crispr-markdown-markly! + ast-crispr-ruby-prism! + ast-merge! + ast-merge-git! + ast-template! + bash-merge! benchmark (~> 0.5, >= 0.5.0) + binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) + go-merge! + html-merge! irb (~> 1.17) + json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) + kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) + kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -611,13 +813,20 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) + toml-merge! + tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) + yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -625,6 +834,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -637,10 +847,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) + ast-merge-git (7.1.8) + ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -678,18 +891,21 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d + go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 + html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 + kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 + kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f - kettle-rb (0.1.11) sha256=3e50b413048906f2c5aea69ff805fbf8f7f2b5ea9d9e3d95151d38d97d6640f3 + kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed @@ -700,7 +916,7 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.8) - markly (0.17.0) sha256=fab61b604f7c4c8f771c3b7f2f16b971034bb72ddd27009b90c3fae1990b17e6 + markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca markly-merge (7.1.8) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 @@ -717,6 +933,7 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 + parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -751,9 +968,9 @@ CHECKSUMS rubocop-env (0.1.0) sha256=5ab9a259e71822bf514c8e900a9b68cc2f74ccc87d5493efcd03213f3068e718 rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb rubocop-gradual (0.4.0) sha256=9c7e584e6fef6c2539266a193a4572c970c22f99046fd6b0305bdde6228f96ad - rubocop-lts (24.2.2) sha256=be6c745e1bb61daebd6af3cc3227c60f95be9f642a080773cad7df14c5f9f174 - rubocop-lts-rspec (1.0.5) sha256=439552fd27440802cc499889e013bffa28aadc41adae5d4dfff3d984a2a809b4 - rubocop-lts-ruby (0.1.3) sha256=fa002117b94c5eb403eb476d5fde393913dbcc4253b6151ed9a3393c73fd3916 + rubocop-lts (24.2.3) sha256=510ca38a90393c7c5cac0e0defa35151805797b1ff9a2d130b649c20c2ca0842 + rubocop-lts-rspec (1.0.6) sha256=b7f7dae919c9712dee09df76b027563e154f510d9b4423bb0453394b5474cf38 + rubocop-lts-ruby (0.1.4) sha256=eb0039d61d645d2b6754abd4006842945b7848a916a664f522f5e2f7a5a69bf1 rubocop-md (2.0.4) sha256=0d076b6b5e99dea2ddc928c4bd702497decb9a8400da7808091e02ebcafcfb93 rubocop-minitest (0.40.0) sha256=353c698199115f12151144cf0b5a96f69bb9d77b660cf6536df2c4250c672a9d rubocop-on-rbs (2.0.0) sha256=ce74d1b3d5daead19f4b611623656c185821dfc9aed9c7079bb1e5d7d7c464be @@ -763,12 +980,13 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-rspec-extra (0.3.0) sha256=ee4b6484d0332a0d23c4a465eeb607e41888eb3d4ed479f850b9f5212514f787 rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 - rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 + rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 ruby-merge (7.1.8) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 + rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -776,12 +994,13 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f + smorg-rb (7.1.8) + sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2 standard-rspec (0.5.0) sha256=64d396524a65af47f5331b423d8cdd313e0267401647bb7892489ca89dad2973 - standard-rubocop-lts (2.0.12) sha256=4b55efc56691d4edef197df8df27ffebdb4a273e26d7bf00799d00ac6a71532f + standard-rubocop-lts (2.0.13) sha256=acc0f7e73db0215a50b5e2df01fbf1b6bbcc68bb128f429f970db3fdd62a8243 stone_checksums (1.0.8) sha256=91c5453d6c67c468653bf5396a33936c85d7731077be756ed0ff7eb78f981117 stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1 strings-ansi (0.2.0) sha256=90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88 @@ -791,6 +1010,7 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -803,6 +1023,7 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 + typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -816,6 +1037,7 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 + zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From b9c8b79ed559e199b30c5efa03a8483cd898fbcf Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:44:44 -0400 Subject: [PATCH 025/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/rbs-merge/Gemfile.lock | 506 ++++++++++++++++++++++++++---------- 1 file changed, 364 insertions(+), 142 deletions(-) diff --git a/gems/rbs-merge/Gemfile.lock b/gems/rbs-merge/Gemfile.lock index c989ff044..78890f000 100644 --- a/gems/rbs-merge/Gemfile.lock +++ b/gems/rbs-merge/Gemfile.lock @@ -16,46 +16,313 @@ PATH tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -GEM - remote: https://gem.coop/ +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - backports (3.25.3) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.8) + ast-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge + specs: + html-merge (7.1.8) + ast-crispr (= 7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.8) + toml (~> 0.3) + toml-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.8) + ast-merge (= 7.1.8) + ast-merge-git (= 7.1.8) + bash-merge (= 7.1.8) + diff-lcs (~> 1.5) + dotenv-merge (= 7.1.8) + go-merge (= 7.1.8) + html-merge (= 7.1.8) + json-merge (= 7.1.8) + kettle-jem (~> 7.1, >= 7.1.18) + markdown-merge (= 7.1.8) + plain-merge (= 7.1.8) + prism-merge (= 7.1.8) + psych-merge (= 7.1.8) + rbs-merge (= 7.1.8) + rust-merge (= 7.1.8) + toml-merge (= 7.1.8) + typescript-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.8) + binary-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +GEM + remote: https://gem.coop/ + specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -63,11 +330,6 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -80,10 +342,6 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -97,11 +355,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -151,27 +404,25 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) version_gem (~> 1.1, >= 1.1.15) - kettle-dev (3.0.33) + kettle-dev (3.0.34) emoji_regex (>= 15.0) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.15) - kettle-rb (~> 0.1, >= 0.1.11) + kettle-rb (~> 0.1, >= 0.1.12) kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-family (1.2.97) + kettle-drift (1.0.13) + version_gem (~> 1.1, >= 1.1.15) + kettle-family (1.2.100) command_kit (~> 0.6) command_kit-completion (~> 0.1) kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.33) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-jem (~> 7.1, >= 7.1.23) kettle-test (~> 2.0, >= 2.0.21) @@ -183,39 +434,9 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) - kettle-rb (0.1.11) + kettle-rb (0.1.12) kettle-soup-cover (3.0.10) kettle-wash (~> 0.1, >= 0.1.6) simplecov (>= 1.0) @@ -238,24 +459,12 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - markly (0.17.0) - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) + markly (0.19.0) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -283,28 +492,13 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -379,11 +573,11 @@ GEM parallel (~> 1.10) rainbow (>= 2.2.2, < 4.0) rubocop (~> 1.0) - rubocop-lts (24.2.2) - rubocop-ruby3_2 (~> 3.0, >= 3.0.1) - standard-rubocop-lts (~> 2.0, >= 2.0.3) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-rspec (1.0.5) + rubocop-lts (24.2.3) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-rspec (1.0.6) rubocop (~> 1.84, >= 1.84.2) rubocop-env (~> 0.1, >= 0.1.0) rubocop-factory_bot (~> 2.28, >= 2.28.0) @@ -391,8 +585,8 @@ GEM rubocop-rspec-extra (~> 0.3, >= 0.3.0) standard (~> 1.54, >= 1.54.0) standard-rspec (~> 0.5, >= 0.5.0) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-ruby (0.1.3) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-ruby (0.1.4) lint_roller (~> 1.1) rubocop (>= 1.72.1, < 2.0) version_gem (~> 1.1, >= 1.1.15) @@ -426,21 +620,17 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-rspec (~> 3.5) - rubocop-ruby3_2 (3.0.7) + rubocop-ruby3_2 (3.0.8) rubocop-gradual (~> 0.3, >= 0.3.6) rubocop-md (~> 2.0, >= 2.0.4) rubocop-rake (~> 0.7, >= 0.7.1) rubocop-thread_safety (~> 0.7, >= 0.7.3) - standard-rubocop-lts (~> 2.0, >= 2.0.9) - version_gem (~> 1.1, >= 1.1.13) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) rubocop-thread_safety (0.7.3) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -461,7 +651,7 @@ GEM simplecov (>= 0.4.1) simplecov_lcov_formatter (0.9.0) simplecov (>= 0.18) - sorbet-runtime (0.6.13486) + sorbet-runtime (0.6.13490) standard (1.56.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) @@ -480,8 +670,8 @@ GEM rubocop-factory_bot (~> 2.27) rubocop-rspec (~> 3.9) rubocop-rspec_rails (~> 2.31) - standard-rubocop-lts (2.0.12) - rubocop-lts-ruby (~> 0.1, >= 0.1.0) + standard-rubocop-lts (2.0.13) + rubocop-lts-ruby (~> 0.1, >= 0.1.4) standard (~> 1.54, >= 1.54.0) standard-custom (~> 1.0, >= 1.0.2) standard-performance (~> 1.9, >= 1.9.0) @@ -501,18 +691,11 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -541,10 +724,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -582,23 +761,46 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) + ast-crispr! + ast-crispr-markdown-markly! + ast-crispr-ruby-prism! + ast-merge! + ast-merge-git! + ast-template! + bash-merge! benchmark (~> 0.5, >= 0.5.0) + binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) + go-merge! + html-merge! irb (~> 1.17) + json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) + kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) + kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs-merge! reek (~> 6.5, >= 6.5.0) @@ -610,13 +812,20 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) + toml-merge! + tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) + yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -624,6 +833,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -636,10 +846,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) + ast-merge-git (7.1.8) + ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -677,18 +890,21 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d + go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 + html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 + kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 + kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f - kettle-rb (0.1.11) sha256=3e50b413048906f2c5aea69ff805fbf8f7f2b5ea9d9e3d95151d38d97d6640f3 + kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed @@ -699,7 +915,7 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.8) - markly (0.17.0) sha256=fab61b604f7c4c8f771c3b7f2f16b971034bb72ddd27009b90c3fae1990b17e6 + markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca markly-merge (7.1.8) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 @@ -716,6 +932,7 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 + parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -750,9 +967,9 @@ CHECKSUMS rubocop-env (0.1.0) sha256=5ab9a259e71822bf514c8e900a9b68cc2f74ccc87d5493efcd03213f3068e718 rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb rubocop-gradual (0.4.0) sha256=9c7e584e6fef6c2539266a193a4572c970c22f99046fd6b0305bdde6228f96ad - rubocop-lts (24.2.2) sha256=be6c745e1bb61daebd6af3cc3227c60f95be9f642a080773cad7df14c5f9f174 - rubocop-lts-rspec (1.0.5) sha256=439552fd27440802cc499889e013bffa28aadc41adae5d4dfff3d984a2a809b4 - rubocop-lts-ruby (0.1.3) sha256=fa002117b94c5eb403eb476d5fde393913dbcc4253b6151ed9a3393c73fd3916 + rubocop-lts (24.2.3) sha256=510ca38a90393c7c5cac0e0defa35151805797b1ff9a2d130b649c20c2ca0842 + rubocop-lts-rspec (1.0.6) sha256=b7f7dae919c9712dee09df76b027563e154f510d9b4423bb0453394b5474cf38 + rubocop-lts-ruby (0.1.4) sha256=eb0039d61d645d2b6754abd4006842945b7848a916a664f522f5e2f7a5a69bf1 rubocop-md (2.0.4) sha256=0d076b6b5e99dea2ddc928c4bd702497decb9a8400da7808091e02ebcafcfb93 rubocop-minitest (0.40.0) sha256=353c698199115f12151144cf0b5a96f69bb9d77b660cf6536df2c4250c672a9d rubocop-on-rbs (2.0.0) sha256=ce74d1b3d5daead19f4b611623656c185821dfc9aed9c7079bb1e5d7d7c464be @@ -762,12 +979,13 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-rspec-extra (0.3.0) sha256=ee4b6484d0332a0d23c4a465eeb607e41888eb3d4ed479f850b9f5212514f787 rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 - rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 + rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 ruby-merge (7.1.8) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 + rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -775,12 +993,13 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f + smorg-rb (7.1.8) + sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2 standard-rspec (0.5.0) sha256=64d396524a65af47f5331b423d8cdd313e0267401647bb7892489ca89dad2973 - standard-rubocop-lts (2.0.12) sha256=4b55efc56691d4edef197df8df27ffebdb4a273e26d7bf00799d00ac6a71532f + standard-rubocop-lts (2.0.13) sha256=acc0f7e73db0215a50b5e2df01fbf1b6bbcc68bb128f429f970db3fdd62a8243 stone_checksums (1.0.8) sha256=91c5453d6c67c468653bf5396a33936c85d7731077be756ed0ff7eb78f981117 stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1 strings-ansi (0.2.0) sha256=90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88 @@ -790,6 +1009,7 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -802,6 +1022,7 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 + typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -815,6 +1036,7 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 + zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 84c01428e1b7cbacf2be5679b56608a5e471e444 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:44:46 -0400 Subject: [PATCH 026/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/html-merge/Gemfile.lock | 58 ++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/gems/html-merge/Gemfile.lock b/gems/html-merge/Gemfile.lock index c278e95c5..786dac475 100644 --- a/gems/html-merge/Gemfile.lock +++ b/gems/html-merge/Gemfile.lock @@ -408,21 +408,21 @@ GEM ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) version_gem (~> 1.1, >= 1.1.15) - kettle-dev (3.0.33) + kettle-dev (3.0.34) emoji_regex (>= 15.0) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.15) - kettle-rb (~> 0.1, >= 0.1.11) + kettle-rb (~> 0.1, >= 0.1.12) kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) kettle-drift (1.0.13) version_gem (~> 1.1, >= 1.1.15) - kettle-family (1.2.97) + kettle-family (1.2.100) command_kit (~> 0.6) command_kit-completion (~> 0.1) kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.33) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-jem (~> 7.1, >= 7.1.23) kettle-test (~> 2.0, >= 2.0.21) @@ -436,7 +436,7 @@ GEM version_gem (~> 1.1, >= 1.1.15) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) - kettle-rb (0.1.11) + kettle-rb (0.1.12) kettle-soup-cover (3.0.10) kettle-wash (~> 0.1, >= 0.1.6) simplecov (>= 1.0) @@ -464,7 +464,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.17.0) + markly (0.19.0) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -573,11 +573,11 @@ GEM parallel (~> 1.10) rainbow (>= 2.2.2, < 4.0) rubocop (~> 1.0) - rubocop-lts (24.2.2) - rubocop-ruby3_2 (~> 3.0, >= 3.0.1) - standard-rubocop-lts (~> 2.0, >= 2.0.3) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-rspec (1.0.5) + rubocop-lts (24.2.3) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-rspec (1.0.6) rubocop (~> 1.84, >= 1.84.2) rubocop-env (~> 0.1, >= 0.1.0) rubocop-factory_bot (~> 2.28, >= 2.28.0) @@ -585,8 +585,8 @@ GEM rubocop-rspec-extra (~> 0.3, >= 0.3.0) standard (~> 1.54, >= 1.54.0) standard-rspec (~> 0.5, >= 0.5.0) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-ruby (0.1.3) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-ruby (0.1.4) lint_roller (~> 1.1) rubocop (>= 1.72.1, < 2.0) version_gem (~> 1.1, >= 1.1.15) @@ -620,13 +620,13 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-rspec (~> 3.5) - rubocop-ruby3_2 (3.0.7) + rubocop-ruby3_2 (3.0.8) rubocop-gradual (~> 0.3, >= 0.3.6) rubocop-md (~> 2.0, >= 2.0.4) rubocop-rake (~> 0.7, >= 0.7.1) rubocop-thread_safety (~> 0.7, >= 0.7.3) - standard-rubocop-lts (~> 2.0, >= 2.0.9) - version_gem (~> 1.1, >= 1.1.13) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) rubocop-thread_safety (0.7.3) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) @@ -651,7 +651,7 @@ GEM simplecov (>= 0.4.1) simplecov_lcov_formatter (0.9.0) simplecov (>= 0.18) - sorbet-runtime (0.6.13486) + sorbet-runtime (0.6.13490) standard (1.56.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) @@ -670,8 +670,8 @@ GEM rubocop-factory_bot (~> 2.27) rubocop-rspec (~> 3.9) rubocop-rspec_rails (~> 2.31) - standard-rubocop-lts (2.0.12) - rubocop-lts-ruby (~> 0.1, >= 0.1.0) + standard-rubocop-lts (2.0.13) + rubocop-lts-ruby (~> 0.1, >= 0.1.4) standard (~> 1.54, >= 1.54.0) standard-custom (~> 1.0, >= 1.0.2) standard-performance (~> 1.9, >= 1.9.0) @@ -899,13 +899,13 @@ CHECKSUMS json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f + kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 - kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 + kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f - kettle-rb (0.1.11) sha256=3e50b413048906f2c5aea69ff805fbf8f7f2b5ea9d9e3d95151d38d97d6640f3 + kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed @@ -916,7 +916,7 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.8) - markly (0.17.0) sha256=fab61b604f7c4c8f771c3b7f2f16b971034bb72ddd27009b90c3fae1990b17e6 + markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca markly-merge (7.1.8) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 @@ -968,9 +968,9 @@ CHECKSUMS rubocop-env (0.1.0) sha256=5ab9a259e71822bf514c8e900a9b68cc2f74ccc87d5493efcd03213f3068e718 rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb rubocop-gradual (0.4.0) sha256=9c7e584e6fef6c2539266a193a4572c970c22f99046fd6b0305bdde6228f96ad - rubocop-lts (24.2.2) sha256=be6c745e1bb61daebd6af3cc3227c60f95be9f642a080773cad7df14c5f9f174 - rubocop-lts-rspec (1.0.5) sha256=439552fd27440802cc499889e013bffa28aadc41adae5d4dfff3d984a2a809b4 - rubocop-lts-ruby (0.1.3) sha256=fa002117b94c5eb403eb476d5fde393913dbcc4253b6151ed9a3393c73fd3916 + rubocop-lts (24.2.3) sha256=510ca38a90393c7c5cac0e0defa35151805797b1ff9a2d130b649c20c2ca0842 + rubocop-lts-rspec (1.0.6) sha256=b7f7dae919c9712dee09df76b027563e154f510d9b4423bb0453394b5474cf38 + rubocop-lts-ruby (0.1.4) sha256=eb0039d61d645d2b6754abd4006842945b7848a916a664f522f5e2f7a5a69bf1 rubocop-md (2.0.4) sha256=0d076b6b5e99dea2ddc928c4bd702497decb9a8400da7808091e02ebcafcfb93 rubocop-minitest (0.40.0) sha256=353c698199115f12151144cf0b5a96f69bb9d77b660cf6536df2c4250c672a9d rubocop-on-rbs (2.0.0) sha256=ce74d1b3d5daead19f4b611623656c185821dfc9aed9c7079bb1e5d7d7c464be @@ -980,7 +980,7 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-rspec-extra (0.3.0) sha256=ee4b6484d0332a0d23c4a465eeb607e41888eb3d4ed479f850b9f5212514f787 rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 - rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 + rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 ruby-merge (7.1.8) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 @@ -995,12 +995,12 @@ CHECKSUMS simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.8) - sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f + sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2 standard-rspec (0.5.0) sha256=64d396524a65af47f5331b423d8cdd313e0267401647bb7892489ca89dad2973 - standard-rubocop-lts (2.0.12) sha256=4b55efc56691d4edef197df8df27ffebdb4a273e26d7bf00799d00ac6a71532f + standard-rubocop-lts (2.0.13) sha256=acc0f7e73db0215a50b5e2df01fbf1b6bbcc68bb128f429f970db3fdd62a8243 stone_checksums (1.0.8) sha256=91c5453d6c67c468653bf5396a33936c85d7731077be756ed0ff7eb78f981117 stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1 strings-ansi (0.2.0) sha256=90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88 From ecadc566a28ed62f667c76b03768e20d070e519e Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:44:48 -0400 Subject: [PATCH 027/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/json-merge/Gemfile.lock | 508 +++++++++++++++++++++++++---------- 1 file changed, 365 insertions(+), 143 deletions(-) diff --git a/gems/json-merge/Gemfile.lock b/gems/json-merge/Gemfile.lock index d503d455a..979b24b02 100644 --- a/gems/json-merge/Gemfile.lock +++ b/gems/json-merge/Gemfile.lock @@ -15,46 +15,314 @@ PATH tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -GEM - remote: https://gem.coop/ +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - backports (3.25.3) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.8) + ast-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge + specs: + html-merge (7.1.8) + ast-crispr (= 7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.8) + toml (~> 0.3) + toml-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.8) + ast-merge (= 7.1.8) + ast-merge-git (= 7.1.8) + bash-merge (= 7.1.8) + diff-lcs (~> 1.5) + dotenv-merge (= 7.1.8) + go-merge (= 7.1.8) + html-merge (= 7.1.8) + json-merge (= 7.1.8) + kettle-jem (~> 7.1, >= 7.1.18) + markdown-merge (= 7.1.8) + plain-merge (= 7.1.8) + prism-merge (= 7.1.8) + psych-merge (= 7.1.8) + rbs-merge (= 7.1.8) + rust-merge (= 7.1.8) + toml-merge (= 7.1.8) + typescript-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.8) + binary-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +GEM + remote: https://gem.coop/ + specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -62,11 +330,6 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -79,10 +342,6 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -96,11 +355,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -154,19 +408,21 @@ GEM ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) version_gem (~> 1.1, >= 1.1.15) - kettle-dev (3.0.33) + kettle-dev (3.0.34) emoji_regex (>= 15.0) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.15) - kettle-rb (~> 0.1, >= 0.1.11) + kettle-rb (~> 0.1, >= 0.1.12) kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-family (1.2.97) + kettle-drift (1.0.13) + version_gem (~> 1.1, >= 1.1.15) + kettle-family (1.2.100) command_kit (~> 0.6) command_kit-completion (~> 0.1) kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.33) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-jem (~> 7.1, >= 7.1.23) kettle-test (~> 2.0, >= 2.0.21) @@ -178,39 +434,9 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) - kettle-rb (0.1.11) + kettle-rb (0.1.12) kettle-soup-cover (3.0.10) kettle-wash (~> 0.1, >= 0.1.6) simplecov (>= 1.0) @@ -233,24 +459,12 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - markly (0.17.0) - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) + markly (0.19.0) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -278,28 +492,13 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -308,11 +507,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -379,11 +573,11 @@ GEM parallel (~> 1.10) rainbow (>= 2.2.2, < 4.0) rubocop (~> 1.0) - rubocop-lts (24.2.2) - rubocop-ruby3_2 (~> 3.0, >= 3.0.1) - standard-rubocop-lts (~> 2.0, >= 2.0.3) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-rspec (1.0.5) + rubocop-lts (24.2.3) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-rspec (1.0.6) rubocop (~> 1.84, >= 1.84.2) rubocop-env (~> 0.1, >= 0.1.0) rubocop-factory_bot (~> 2.28, >= 2.28.0) @@ -391,8 +585,8 @@ GEM rubocop-rspec-extra (~> 0.3, >= 0.3.0) standard (~> 1.54, >= 1.54.0) standard-rspec (~> 0.5, >= 0.5.0) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-ruby (0.1.3) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-ruby (0.1.4) lint_roller (~> 1.1) rubocop (>= 1.72.1, < 2.0) version_gem (~> 1.1, >= 1.1.15) @@ -426,21 +620,17 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-rspec (~> 3.5) - rubocop-ruby3_2 (3.0.7) + rubocop-ruby3_2 (3.0.8) rubocop-gradual (~> 0.3, >= 0.3.6) rubocop-md (~> 2.0, >= 2.0.4) rubocop-rake (~> 0.7, >= 0.7.1) rubocop-thread_safety (~> 0.7, >= 0.7.3) - standard-rubocop-lts (~> 2.0, >= 2.0.9) - version_gem (~> 1.1, >= 1.1.13) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) rubocop-thread_safety (0.7.3) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -461,7 +651,7 @@ GEM simplecov (>= 0.4.1) simplecov_lcov_formatter (0.9.0) simplecov (>= 0.18) - sorbet-runtime (0.6.13486) + sorbet-runtime (0.6.13490) standard (1.56.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) @@ -480,8 +670,8 @@ GEM rubocop-factory_bot (~> 2.27) rubocop-rspec (~> 3.9) rubocop-rspec_rails (~> 2.31) - standard-rubocop-lts (2.0.12) - rubocop-lts-ruby (~> 0.1, >= 0.1.0) + standard-rubocop-lts (2.0.13) + rubocop-lts-ruby (~> 0.1, >= 0.1.4) standard (~> 1.54, >= 1.54.0) standard-custom (~> 1.0, >= 1.0.2) standard-performance (~> 1.9, >= 1.9.0) @@ -501,18 +691,11 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -541,10 +724,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -582,26 +761,49 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) + ast-crispr! + ast-crispr-markdown-markly! + ast-crispr-ruby-prism! + ast-merge! + ast-merge-git! + ast-template! + bash-merge! benchmark (~> 0.5, >= 0.5.0) + binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) + go-merge! + html-merge! irb (~> 1.17) json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) + kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) + kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -611,13 +813,20 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) + toml-merge! + tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) + yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -625,6 +834,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -637,10 +847,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) + ast-merge-git (7.1.8) + ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -678,18 +891,21 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d + go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 + html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 + kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 + kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f - kettle-rb (0.1.11) sha256=3e50b413048906f2c5aea69ff805fbf8f7f2b5ea9d9e3d95151d38d97d6640f3 + kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed @@ -700,7 +916,7 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.8) - markly (0.17.0) sha256=fab61b604f7c4c8f771c3b7f2f16b971034bb72ddd27009b90c3fae1990b17e6 + markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca markly-merge (7.1.8) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 @@ -717,6 +933,7 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 + parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -751,9 +968,9 @@ CHECKSUMS rubocop-env (0.1.0) sha256=5ab9a259e71822bf514c8e900a9b68cc2f74ccc87d5493efcd03213f3068e718 rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb rubocop-gradual (0.4.0) sha256=9c7e584e6fef6c2539266a193a4572c970c22f99046fd6b0305bdde6228f96ad - rubocop-lts (24.2.2) sha256=be6c745e1bb61daebd6af3cc3227c60f95be9f642a080773cad7df14c5f9f174 - rubocop-lts-rspec (1.0.5) sha256=439552fd27440802cc499889e013bffa28aadc41adae5d4dfff3d984a2a809b4 - rubocop-lts-ruby (0.1.3) sha256=fa002117b94c5eb403eb476d5fde393913dbcc4253b6151ed9a3393c73fd3916 + rubocop-lts (24.2.3) sha256=510ca38a90393c7c5cac0e0defa35151805797b1ff9a2d130b649c20c2ca0842 + rubocop-lts-rspec (1.0.6) sha256=b7f7dae919c9712dee09df76b027563e154f510d9b4423bb0453394b5474cf38 + rubocop-lts-ruby (0.1.4) sha256=eb0039d61d645d2b6754abd4006842945b7848a916a664f522f5e2f7a5a69bf1 rubocop-md (2.0.4) sha256=0d076b6b5e99dea2ddc928c4bd702497decb9a8400da7808091e02ebcafcfb93 rubocop-minitest (0.40.0) sha256=353c698199115f12151144cf0b5a96f69bb9d77b660cf6536df2c4250c672a9d rubocop-on-rbs (2.0.0) sha256=ce74d1b3d5daead19f4b611623656c185821dfc9aed9c7079bb1e5d7d7c464be @@ -763,12 +980,13 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-rspec-extra (0.3.0) sha256=ee4b6484d0332a0d23c4a465eeb607e41888eb3d4ed479f850b9f5212514f787 rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 - rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 + rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 ruby-merge (7.1.8) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 + rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -776,12 +994,13 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f + smorg-rb (7.1.8) + sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2 standard-rspec (0.5.0) sha256=64d396524a65af47f5331b423d8cdd313e0267401647bb7892489ca89dad2973 - standard-rubocop-lts (2.0.12) sha256=4b55efc56691d4edef197df8df27ffebdb4a273e26d7bf00799d00ac6a71532f + standard-rubocop-lts (2.0.13) sha256=acc0f7e73db0215a50b5e2df01fbf1b6bbcc68bb128f429f970db3fdd62a8243 stone_checksums (1.0.8) sha256=91c5453d6c67c468653bf5396a33936c85d7731077be756ed0ff7eb78f981117 stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1 strings-ansi (0.2.0) sha256=90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88 @@ -791,6 +1010,7 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -803,6 +1023,7 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 + typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -816,6 +1037,7 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 + zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From d915177e20d7a1e3b02feb71a3404e80e7905c9f Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:44:51 -0400 Subject: [PATCH 028/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/yaml-merge/Gemfile.lock | 508 +++++++++++++++++++++++++---------- 1 file changed, 365 insertions(+), 143 deletions(-) diff --git a/gems/yaml-merge/Gemfile.lock b/gems/yaml-merge/Gemfile.lock index a07d373a4..455104b91 100644 --- a/gems/yaml-merge/Gemfile.lock +++ b/gems/yaml-merge/Gemfile.lock @@ -15,46 +15,314 @@ PATH tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -GEM - remote: https://gem.coop/ +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - backports (3.25.3) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.8) + ast-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge + specs: + html-merge (7.1.8) + ast-crispr (= 7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.8) + toml (~> 0.3) + toml-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.8) + ast-merge (= 7.1.8) + ast-merge-git (= 7.1.8) + bash-merge (= 7.1.8) + diff-lcs (~> 1.5) + dotenv-merge (= 7.1.8) + go-merge (= 7.1.8) + html-merge (= 7.1.8) + json-merge (= 7.1.8) + kettle-jem (~> 7.1, >= 7.1.18) + markdown-merge (= 7.1.8) + plain-merge (= 7.1.8) + prism-merge (= 7.1.8) + psych-merge (= 7.1.8) + rbs-merge (= 7.1.8) + rust-merge (= 7.1.8) + toml-merge (= 7.1.8) + typescript-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.8) + binary-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +GEM + remote: https://gem.coop/ + specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -62,11 +330,6 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -79,10 +342,6 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -96,11 +355,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -150,27 +404,25 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) version_gem (~> 1.1, >= 1.1.15) - kettle-dev (3.0.33) + kettle-dev (3.0.34) emoji_regex (>= 15.0) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.15) - kettle-rb (~> 0.1, >= 0.1.11) + kettle-rb (~> 0.1, >= 0.1.12) kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-family (1.2.97) + kettle-drift (1.0.13) + version_gem (~> 1.1, >= 1.1.15) + kettle-family (1.2.100) command_kit (~> 0.6) command_kit-completion (~> 0.1) kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.33) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-jem (~> 7.1, >= 7.1.23) kettle-test (~> 2.0, >= 2.0.21) @@ -182,39 +434,9 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) - kettle-rb (0.1.11) + kettle-rb (0.1.12) kettle-soup-cover (3.0.10) kettle-wash (~> 0.1, >= 0.1.6) simplecov (>= 1.0) @@ -237,24 +459,12 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - markly (0.17.0) - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) + markly (0.19.0) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -282,28 +492,13 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -312,11 +507,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -383,11 +573,11 @@ GEM parallel (~> 1.10) rainbow (>= 2.2.2, < 4.0) rubocop (~> 1.0) - rubocop-lts (24.2.2) - rubocop-ruby3_2 (~> 3.0, >= 3.0.1) - standard-rubocop-lts (~> 2.0, >= 2.0.3) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-rspec (1.0.5) + rubocop-lts (24.2.3) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-rspec (1.0.6) rubocop (~> 1.84, >= 1.84.2) rubocop-env (~> 0.1, >= 0.1.0) rubocop-factory_bot (~> 2.28, >= 2.28.0) @@ -395,8 +585,8 @@ GEM rubocop-rspec-extra (~> 0.3, >= 0.3.0) standard (~> 1.54, >= 1.54.0) standard-rspec (~> 0.5, >= 0.5.0) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-ruby (0.1.3) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-ruby (0.1.4) lint_roller (~> 1.1) rubocop (>= 1.72.1, < 2.0) version_gem (~> 1.1, >= 1.1.15) @@ -430,21 +620,17 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-rspec (~> 3.5) - rubocop-ruby3_2 (3.0.7) + rubocop-ruby3_2 (3.0.8) rubocop-gradual (~> 0.3, >= 0.3.6) rubocop-md (~> 2.0, >= 2.0.4) rubocop-rake (~> 0.7, >= 0.7.1) rubocop-thread_safety (~> 0.7, >= 0.7.3) - standard-rubocop-lts (~> 2.0, >= 2.0.9) - version_gem (~> 1.1, >= 1.1.13) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) rubocop-thread_safety (0.7.3) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -465,7 +651,7 @@ GEM simplecov (>= 0.4.1) simplecov_lcov_formatter (0.9.0) simplecov (>= 0.18) - sorbet-runtime (0.6.13486) + sorbet-runtime (0.6.13490) standard (1.56.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) @@ -484,8 +670,8 @@ GEM rubocop-factory_bot (~> 2.27) rubocop-rspec (~> 3.9) rubocop-rspec_rails (~> 2.31) - standard-rubocop-lts (2.0.12) - rubocop-lts-ruby (~> 0.1, >= 0.1.0) + standard-rubocop-lts (2.0.13) + rubocop-lts-ruby (~> 0.1, >= 0.1.4) standard (~> 1.54, >= 1.54.0) standard-custom (~> 1.0, >= 1.0.2) standard-performance (~> 1.9, >= 1.9.0) @@ -505,18 +691,11 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -582,25 +761,49 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) + ast-crispr! + ast-crispr-markdown-markly! + ast-crispr-ruby-prism! + ast-merge! + ast-merge-git! + ast-template! + bash-merge! benchmark (~> 0.5, >= 0.5.0) + binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) + go-merge! + html-merge! irb (~> 1.17) + json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) + kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) + kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -610,11 +813,17 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) + toml-merge! + tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) yaml-merge! @@ -625,6 +834,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -637,10 +847,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) + ast-merge-git (7.1.8) + ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -678,18 +891,21 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d + go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 + html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 + kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 + kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f - kettle-rb (0.1.11) sha256=3e50b413048906f2c5aea69ff805fbf8f7f2b5ea9d9e3d95151d38d97d6640f3 + kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed @@ -700,7 +916,7 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.8) - markly (0.17.0) sha256=fab61b604f7c4c8f771c3b7f2f16b971034bb72ddd27009b90c3fae1990b17e6 + markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca markly-merge (7.1.8) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 @@ -717,6 +933,7 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 + parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -751,9 +968,9 @@ CHECKSUMS rubocop-env (0.1.0) sha256=5ab9a259e71822bf514c8e900a9b68cc2f74ccc87d5493efcd03213f3068e718 rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb rubocop-gradual (0.4.0) sha256=9c7e584e6fef6c2539266a193a4572c970c22f99046fd6b0305bdde6228f96ad - rubocop-lts (24.2.2) sha256=be6c745e1bb61daebd6af3cc3227c60f95be9f642a080773cad7df14c5f9f174 - rubocop-lts-rspec (1.0.5) sha256=439552fd27440802cc499889e013bffa28aadc41adae5d4dfff3d984a2a809b4 - rubocop-lts-ruby (0.1.3) sha256=fa002117b94c5eb403eb476d5fde393913dbcc4253b6151ed9a3393c73fd3916 + rubocop-lts (24.2.3) sha256=510ca38a90393c7c5cac0e0defa35151805797b1ff9a2d130b649c20c2ca0842 + rubocop-lts-rspec (1.0.6) sha256=b7f7dae919c9712dee09df76b027563e154f510d9b4423bb0453394b5474cf38 + rubocop-lts-ruby (0.1.4) sha256=eb0039d61d645d2b6754abd4006842945b7848a916a664f522f5e2f7a5a69bf1 rubocop-md (2.0.4) sha256=0d076b6b5e99dea2ddc928c4bd702497decb9a8400da7808091e02ebcafcfb93 rubocop-minitest (0.40.0) sha256=353c698199115f12151144cf0b5a96f69bb9d77b660cf6536df2c4250c672a9d rubocop-on-rbs (2.0.0) sha256=ce74d1b3d5daead19f4b611623656c185821dfc9aed9c7079bb1e5d7d7c464be @@ -763,12 +980,13 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-rspec-extra (0.3.0) sha256=ee4b6484d0332a0d23c4a465eeb607e41888eb3d4ed479f850b9f5212514f787 rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 - rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 + rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 ruby-merge (7.1.8) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 + rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -776,12 +994,13 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f + smorg-rb (7.1.8) + sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2 standard-rspec (0.5.0) sha256=64d396524a65af47f5331b423d8cdd313e0267401647bb7892489ca89dad2973 - standard-rubocop-lts (2.0.12) sha256=4b55efc56691d4edef197df8df27ffebdb4a273e26d7bf00799d00ac6a71532f + standard-rubocop-lts (2.0.13) sha256=acc0f7e73db0215a50b5e2df01fbf1b6bbcc68bb128f429f970db3fdd62a8243 stone_checksums (1.0.8) sha256=91c5453d6c67c468653bf5396a33936c85d7731077be756ed0ff7eb78f981117 stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1 strings-ansi (0.2.0) sha256=90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88 @@ -791,6 +1010,7 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -803,6 +1023,7 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 + typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -816,6 +1037,7 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 + zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 8bb31be6aac04162f5d3c5ec22518b5baa696062 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:44:53 -0400 Subject: [PATCH 029/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/toml-merge/Gemfile.lock | 508 +++++++++++++++++++++++++---------- 1 file changed, 365 insertions(+), 143 deletions(-) diff --git a/gems/toml-merge/Gemfile.lock b/gems/toml-merge/Gemfile.lock index 6135aee67..8c842cd58 100644 --- a/gems/toml-merge/Gemfile.lock +++ b/gems/toml-merge/Gemfile.lock @@ -15,46 +15,314 @@ PATH tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -GEM - remote: https://gem.coop/ +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - backports (3.25.3) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.8) + ast-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge + specs: + html-merge (7.1.8) + ast-crispr (= 7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.8) + toml (~> 0.3) + toml-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.8) + ast-merge (= 7.1.8) + ast-merge-git (= 7.1.8) + bash-merge (= 7.1.8) + diff-lcs (~> 1.5) + dotenv-merge (= 7.1.8) + go-merge (= 7.1.8) + html-merge (= 7.1.8) + json-merge (= 7.1.8) + kettle-jem (~> 7.1, >= 7.1.18) + markdown-merge (= 7.1.8) + plain-merge (= 7.1.8) + prism-merge (= 7.1.8) + psych-merge (= 7.1.8) + rbs-merge (= 7.1.8) + rust-merge (= 7.1.8) + toml-merge (= 7.1.8) + typescript-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.8) + binary-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +GEM + remote: https://gem.coop/ + specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -62,11 +330,6 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -79,10 +342,6 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -96,11 +355,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -150,27 +404,25 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) version_gem (~> 1.1, >= 1.1.15) - kettle-dev (3.0.33) + kettle-dev (3.0.34) emoji_regex (>= 15.0) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.15) - kettle-rb (~> 0.1, >= 0.1.11) + kettle-rb (~> 0.1, >= 0.1.12) kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-family (1.2.97) + kettle-drift (1.0.13) + version_gem (~> 1.1, >= 1.1.15) + kettle-family (1.2.100) command_kit (~> 0.6) command_kit-completion (~> 0.1) kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.33) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-jem (~> 7.1, >= 7.1.23) kettle-test (~> 2.0, >= 2.0.21) @@ -182,39 +434,9 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) - kettle-rb (0.1.11) + kettle-rb (0.1.12) kettle-soup-cover (3.0.10) kettle-wash (~> 0.1, >= 0.1.6) simplecov (>= 1.0) @@ -237,24 +459,12 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - markly (0.17.0) - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) + markly (0.19.0) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -282,28 +492,13 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -312,11 +507,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -383,11 +573,11 @@ GEM parallel (~> 1.10) rainbow (>= 2.2.2, < 4.0) rubocop (~> 1.0) - rubocop-lts (24.2.2) - rubocop-ruby3_2 (~> 3.0, >= 3.0.1) - standard-rubocop-lts (~> 2.0, >= 2.0.3) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-rspec (1.0.5) + rubocop-lts (24.2.3) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-rspec (1.0.6) rubocop (~> 1.84, >= 1.84.2) rubocop-env (~> 0.1, >= 0.1.0) rubocop-factory_bot (~> 2.28, >= 2.28.0) @@ -395,8 +585,8 @@ GEM rubocop-rspec-extra (~> 0.3, >= 0.3.0) standard (~> 1.54, >= 1.54.0) standard-rspec (~> 0.5, >= 0.5.0) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-ruby (0.1.3) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-ruby (0.1.4) lint_roller (~> 1.1) rubocop (>= 1.72.1, < 2.0) version_gem (~> 1.1, >= 1.1.15) @@ -430,21 +620,17 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-rspec (~> 3.5) - rubocop-ruby3_2 (3.0.7) + rubocop-ruby3_2 (3.0.8) rubocop-gradual (~> 0.3, >= 0.3.6) rubocop-md (~> 2.0, >= 2.0.4) rubocop-rake (~> 0.7, >= 0.7.1) rubocop-thread_safety (~> 0.7, >= 0.7.3) - standard-rubocop-lts (~> 2.0, >= 2.0.9) - version_gem (~> 1.1, >= 1.1.13) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) rubocop-thread_safety (0.7.3) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -465,7 +651,7 @@ GEM simplecov (>= 0.4.1) simplecov_lcov_formatter (0.9.0) simplecov (>= 0.18) - sorbet-runtime (0.6.13486) + sorbet-runtime (0.6.13490) standard (1.56.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) @@ -484,8 +670,8 @@ GEM rubocop-factory_bot (~> 2.27) rubocop-rspec (~> 3.9) rubocop-rspec_rails (~> 2.31) - standard-rubocop-lts (2.0.12) - rubocop-lts-ruby (~> 0.1, >= 0.1.0) + standard-rubocop-lts (2.0.13) + rubocop-lts-ruby (~> 0.1, >= 0.1.4) standard (~> 1.54, >= 1.54.0) standard-custom (~> 1.0, >= 1.0.2) standard-performance (~> 1.9, >= 1.9.0) @@ -505,14 +691,11 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -541,10 +724,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -582,25 +761,49 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) + ast-crispr! + ast-crispr-markdown-markly! + ast-crispr-ruby-prism! + ast-merge! + ast-merge-git! + ast-template! + bash-merge! benchmark (~> 0.5, >= 0.5.0) + binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) + go-merge! + html-merge! irb (~> 1.17) + json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) + kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) + kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -610,14 +813,20 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) toml-merge! + tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) + yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -625,6 +834,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -637,10 +847,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) + ast-merge-git (7.1.8) + ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -678,18 +891,21 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d + go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 + html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 + kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 + kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f - kettle-rb (0.1.11) sha256=3e50b413048906f2c5aea69ff805fbf8f7f2b5ea9d9e3d95151d38d97d6640f3 + kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed @@ -700,7 +916,7 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.8) - markly (0.17.0) sha256=fab61b604f7c4c8f771c3b7f2f16b971034bb72ddd27009b90c3fae1990b17e6 + markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca markly-merge (7.1.8) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 @@ -717,6 +933,7 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 + parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -751,9 +968,9 @@ CHECKSUMS rubocop-env (0.1.0) sha256=5ab9a259e71822bf514c8e900a9b68cc2f74ccc87d5493efcd03213f3068e718 rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb rubocop-gradual (0.4.0) sha256=9c7e584e6fef6c2539266a193a4572c970c22f99046fd6b0305bdde6228f96ad - rubocop-lts (24.2.2) sha256=be6c745e1bb61daebd6af3cc3227c60f95be9f642a080773cad7df14c5f9f174 - rubocop-lts-rspec (1.0.5) sha256=439552fd27440802cc499889e013bffa28aadc41adae5d4dfff3d984a2a809b4 - rubocop-lts-ruby (0.1.3) sha256=fa002117b94c5eb403eb476d5fde393913dbcc4253b6151ed9a3393c73fd3916 + rubocop-lts (24.2.3) sha256=510ca38a90393c7c5cac0e0defa35151805797b1ff9a2d130b649c20c2ca0842 + rubocop-lts-rspec (1.0.6) sha256=b7f7dae919c9712dee09df76b027563e154f510d9b4423bb0453394b5474cf38 + rubocop-lts-ruby (0.1.4) sha256=eb0039d61d645d2b6754abd4006842945b7848a916a664f522f5e2f7a5a69bf1 rubocop-md (2.0.4) sha256=0d076b6b5e99dea2ddc928c4bd702497decb9a8400da7808091e02ebcafcfb93 rubocop-minitest (0.40.0) sha256=353c698199115f12151144cf0b5a96f69bb9d77b660cf6536df2c4250c672a9d rubocop-on-rbs (2.0.0) sha256=ce74d1b3d5daead19f4b611623656c185821dfc9aed9c7079bb1e5d7d7c464be @@ -763,12 +980,13 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-rspec-extra (0.3.0) sha256=ee4b6484d0332a0d23c4a465eeb607e41888eb3d4ed479f850b9f5212514f787 rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 - rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 + rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 ruby-merge (7.1.8) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 + rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -776,12 +994,13 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f + smorg-rb (7.1.8) + sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2 standard-rspec (0.5.0) sha256=64d396524a65af47f5331b423d8cdd313e0267401647bb7892489ca89dad2973 - standard-rubocop-lts (2.0.12) sha256=4b55efc56691d4edef197df8df27ffebdb4a273e26d7bf00799d00ac6a71532f + standard-rubocop-lts (2.0.13) sha256=acc0f7e73db0215a50b5e2df01fbf1b6bbcc68bb128f429f970db3fdd62a8243 stone_checksums (1.0.8) sha256=91c5453d6c67c468653bf5396a33936c85d7731077be756ed0ff7eb78f981117 stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1 strings-ansi (0.2.0) sha256=90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88 @@ -791,6 +1010,7 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -803,6 +1023,7 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 + typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -816,6 +1037,7 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 + zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 41ad0361329bb6c204c7fbc18ea5f0c208859ded Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:44:55 -0400 Subject: [PATCH 030/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/go-merge/Gemfile.lock | 511 ++++++++++++++++++++++++++----------- 1 file changed, 364 insertions(+), 147 deletions(-) diff --git a/gems/go-merge/Gemfile.lock b/gems/go-merge/Gemfile.lock index 6ebc2a90f..e6cd76781 100644 --- a/gems/go-merge/Gemfile.lock +++ b/gems/go-merge/Gemfile.lock @@ -15,46 +15,314 @@ PATH tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -GEM - remote: https://gem.coop/ +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - backports (3.25.3) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.8) + ast-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge + specs: + html-merge (7.1.8) + ast-crispr (= 7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.8) + toml (~> 0.3) + toml-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.8) + ast-merge (= 7.1.8) + ast-merge-git (= 7.1.8) + bash-merge (= 7.1.8) + diff-lcs (~> 1.5) + dotenv-merge (= 7.1.8) + go-merge (= 7.1.8) + html-merge (= 7.1.8) + json-merge (= 7.1.8) + kettle-jem (~> 7.1, >= 7.1.18) + markdown-merge (= 7.1.8) + plain-merge (= 7.1.8) + prism-merge (= 7.1.8) + psych-merge (= 7.1.8) + rbs-merge (= 7.1.8) + rust-merge (= 7.1.8) + toml-merge (= 7.1.8) + typescript-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.8) + binary-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +GEM + remote: https://gem.coop/ + specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -62,11 +330,6 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -79,10 +342,6 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -96,11 +355,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -150,27 +404,25 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) version_gem (~> 1.1, >= 1.1.15) - kettle-dev (3.0.33) + kettle-dev (3.0.34) emoji_regex (>= 15.0) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.15) - kettle-rb (~> 0.1, >= 0.1.11) + kettle-rb (~> 0.1, >= 0.1.12) kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-family (1.2.97) + kettle-drift (1.0.13) + version_gem (~> 1.1, >= 1.1.15) + kettle-family (1.2.100) command_kit (~> 0.6) command_kit-completion (~> 0.1) kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.33) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-jem (~> 7.1, >= 7.1.23) kettle-test (~> 2.0, >= 2.0.21) @@ -182,39 +434,9 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) - kettle-rb (0.1.11) + kettle-rb (0.1.12) kettle-soup-cover (3.0.10) kettle-wash (~> 0.1, >= 0.1.6) simplecov (>= 1.0) @@ -237,24 +459,12 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - markly (0.17.0) - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) + markly (0.19.0) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -282,28 +492,13 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -312,11 +507,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -383,11 +573,11 @@ GEM parallel (~> 1.10) rainbow (>= 2.2.2, < 4.0) rubocop (~> 1.0) - rubocop-lts (24.2.2) - rubocop-ruby3_2 (~> 3.0, >= 3.0.1) - standard-rubocop-lts (~> 2.0, >= 2.0.3) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-rspec (1.0.5) + rubocop-lts (24.2.3) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-rspec (1.0.6) rubocop (~> 1.84, >= 1.84.2) rubocop-env (~> 0.1, >= 0.1.0) rubocop-factory_bot (~> 2.28, >= 2.28.0) @@ -395,8 +585,8 @@ GEM rubocop-rspec-extra (~> 0.3, >= 0.3.0) standard (~> 1.54, >= 1.54.0) standard-rspec (~> 0.5, >= 0.5.0) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-ruby (0.1.3) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-ruby (0.1.4) lint_roller (~> 1.1) rubocop (>= 1.72.1, < 2.0) version_gem (~> 1.1, >= 1.1.15) @@ -430,21 +620,17 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-rspec (~> 3.5) - rubocop-ruby3_2 (3.0.7) + rubocop-ruby3_2 (3.0.8) rubocop-gradual (~> 0.3, >= 0.3.6) rubocop-md (~> 2.0, >= 2.0.4) rubocop-rake (~> 0.7, >= 0.7.1) rubocop-thread_safety (~> 0.7, >= 0.7.3) - standard-rubocop-lts (~> 2.0, >= 2.0.9) - version_gem (~> 1.1, >= 1.1.13) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) rubocop-thread_safety (0.7.3) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -465,7 +651,7 @@ GEM simplecov (>= 0.4.1) simplecov_lcov_formatter (0.9.0) simplecov (>= 0.18) - sorbet-runtime (0.6.13486) + sorbet-runtime (0.6.13490) standard (1.56.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) @@ -484,8 +670,8 @@ GEM rubocop-factory_bot (~> 2.27) rubocop-rspec (~> 3.9) rubocop-rspec_rails (~> 2.31) - standard-rubocop-lts (2.0.12) - rubocop-lts-ruby (~> 0.1, >= 0.1.0) + standard-rubocop-lts (2.0.13) + rubocop-lts-ruby (~> 0.1, >= 0.1.4) standard (~> 1.54, >= 1.54.0) standard-custom (~> 1.0, >= 1.0.2) standard-performance (~> 1.9, >= 1.9.0) @@ -505,18 +691,11 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -545,10 +724,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -586,26 +761,49 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) + ast-crispr! + ast-crispr-markdown-markly! + ast-crispr-ruby-prism! + ast-merge! + ast-merge-git! + ast-template! + bash-merge! benchmark (~> 0.5, >= 0.5.0) + binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) go-merge! + html-merge! irb (~> 1.17) + json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) + kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) + kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -615,13 +813,20 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) + toml-merge! + tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) + yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -629,6 +834,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -641,10 +847,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) + ast-merge-git (7.1.8) + ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -684,17 +893,19 @@ CHECKSUMS gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 + html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 + kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 + kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f - kettle-rb (0.1.11) sha256=3e50b413048906f2c5aea69ff805fbf8f7f2b5ea9d9e3d95151d38d97d6640f3 + kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed @@ -705,7 +916,7 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.8) - markly (0.17.0) sha256=fab61b604f7c4c8f771c3b7f2f16b971034bb72ddd27009b90c3fae1990b17e6 + markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca markly-merge (7.1.8) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 @@ -722,6 +933,7 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 + parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -756,9 +968,9 @@ CHECKSUMS rubocop-env (0.1.0) sha256=5ab9a259e71822bf514c8e900a9b68cc2f74ccc87d5493efcd03213f3068e718 rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb rubocop-gradual (0.4.0) sha256=9c7e584e6fef6c2539266a193a4572c970c22f99046fd6b0305bdde6228f96ad - rubocop-lts (24.2.2) sha256=be6c745e1bb61daebd6af3cc3227c60f95be9f642a080773cad7df14c5f9f174 - rubocop-lts-rspec (1.0.5) sha256=439552fd27440802cc499889e013bffa28aadc41adae5d4dfff3d984a2a809b4 - rubocop-lts-ruby (0.1.3) sha256=fa002117b94c5eb403eb476d5fde393913dbcc4253b6151ed9a3393c73fd3916 + rubocop-lts (24.2.3) sha256=510ca38a90393c7c5cac0e0defa35151805797b1ff9a2d130b649c20c2ca0842 + rubocop-lts-rspec (1.0.6) sha256=b7f7dae919c9712dee09df76b027563e154f510d9b4423bb0453394b5474cf38 + rubocop-lts-ruby (0.1.4) sha256=eb0039d61d645d2b6754abd4006842945b7848a916a664f522f5e2f7a5a69bf1 rubocop-md (2.0.4) sha256=0d076b6b5e99dea2ddc928c4bd702497decb9a8400da7808091e02ebcafcfb93 rubocop-minitest (0.40.0) sha256=353c698199115f12151144cf0b5a96f69bb9d77b660cf6536df2c4250c672a9d rubocop-on-rbs (2.0.0) sha256=ce74d1b3d5daead19f4b611623656c185821dfc9aed9c7079bb1e5d7d7c464be @@ -768,12 +980,13 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-rspec-extra (0.3.0) sha256=ee4b6484d0332a0d23c4a465eeb607e41888eb3d4ed479f850b9f5212514f787 rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 - rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 + rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 ruby-merge (7.1.8) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 + rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -781,12 +994,13 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f + smorg-rb (7.1.8) + sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2 standard-rspec (0.5.0) sha256=64d396524a65af47f5331b423d8cdd313e0267401647bb7892489ca89dad2973 - standard-rubocop-lts (2.0.12) sha256=4b55efc56691d4edef197df8df27ffebdb4a273e26d7bf00799d00ac6a71532f + standard-rubocop-lts (2.0.13) sha256=acc0f7e73db0215a50b5e2df01fbf1b6bbcc68bb128f429f970db3fdd62a8243 stone_checksums (1.0.8) sha256=91c5453d6c67c468653bf5396a33936c85d7731077be756ed0ff7eb78f981117 stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1 strings-ansi (0.2.0) sha256=90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88 @@ -796,6 +1010,7 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -808,6 +1023,7 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 + typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -821,6 +1037,7 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 + zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From fa317eeccb3d068caeb1c1e639c9ad68b9fa5271 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:44:57 -0400 Subject: [PATCH 031/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/rust-merge/Gemfile.lock | 511 +++++++++++++++++++++++++---------- 1 file changed, 364 insertions(+), 147 deletions(-) diff --git a/gems/rust-merge/Gemfile.lock b/gems/rust-merge/Gemfile.lock index 1c99438b1..ba4d3a70c 100644 --- a/gems/rust-merge/Gemfile.lock +++ b/gems/rust-merge/Gemfile.lock @@ -15,46 +15,314 @@ PATH tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -GEM - remote: https://gem.coop/ +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - backports (3.25.3) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.8) + ast-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge + specs: + html-merge (7.1.8) + ast-crispr (= 7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.8) + toml (~> 0.3) + toml-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.8) + ast-merge (= 7.1.8) + ast-merge-git (= 7.1.8) + bash-merge (= 7.1.8) + diff-lcs (~> 1.5) + dotenv-merge (= 7.1.8) + go-merge (= 7.1.8) + html-merge (= 7.1.8) + json-merge (= 7.1.8) + kettle-jem (~> 7.1, >= 7.1.18) + markdown-merge (= 7.1.8) + plain-merge (= 7.1.8) + prism-merge (= 7.1.8) + psych-merge (= 7.1.8) + rbs-merge (= 7.1.8) + rust-merge (= 7.1.8) + toml-merge (= 7.1.8) + typescript-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.8) + binary-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +GEM + remote: https://gem.coop/ + specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -62,11 +330,6 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -79,10 +342,6 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -96,11 +355,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -150,27 +404,25 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) version_gem (~> 1.1, >= 1.1.15) - kettle-dev (3.0.33) + kettle-dev (3.0.34) emoji_regex (>= 15.0) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.15) - kettle-rb (~> 0.1, >= 0.1.11) + kettle-rb (~> 0.1, >= 0.1.12) kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-family (1.2.97) + kettle-drift (1.0.13) + version_gem (~> 1.1, >= 1.1.15) + kettle-family (1.2.100) command_kit (~> 0.6) command_kit-completion (~> 0.1) kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.33) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-jem (~> 7.1, >= 7.1.23) kettle-test (~> 2.0, >= 2.0.21) @@ -182,39 +434,9 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) - kettle-rb (0.1.11) + kettle-rb (0.1.12) kettle-soup-cover (3.0.10) kettle-wash (~> 0.1, >= 0.1.6) simplecov (>= 1.0) @@ -237,24 +459,12 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - markly (0.17.0) - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) + markly (0.19.0) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -282,28 +492,13 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -312,11 +507,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -383,11 +573,11 @@ GEM parallel (~> 1.10) rainbow (>= 2.2.2, < 4.0) rubocop (~> 1.0) - rubocop-lts (24.2.2) - rubocop-ruby3_2 (~> 3.0, >= 3.0.1) - standard-rubocop-lts (~> 2.0, >= 2.0.3) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-rspec (1.0.5) + rubocop-lts (24.2.3) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-rspec (1.0.6) rubocop (~> 1.84, >= 1.84.2) rubocop-env (~> 0.1, >= 0.1.0) rubocop-factory_bot (~> 2.28, >= 2.28.0) @@ -395,8 +585,8 @@ GEM rubocop-rspec-extra (~> 0.3, >= 0.3.0) standard (~> 1.54, >= 1.54.0) standard-rspec (~> 0.5, >= 0.5.0) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-ruby (0.1.3) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-ruby (0.1.4) lint_roller (~> 1.1) rubocop (>= 1.72.1, < 2.0) version_gem (~> 1.1, >= 1.1.15) @@ -430,21 +620,17 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-rspec (~> 3.5) - rubocop-ruby3_2 (3.0.7) + rubocop-ruby3_2 (3.0.8) rubocop-gradual (~> 0.3, >= 0.3.6) rubocop-md (~> 2.0, >= 2.0.4) rubocop-rake (~> 0.7, >= 0.7.1) rubocop-thread_safety (~> 0.7, >= 0.7.3) - standard-rubocop-lts (~> 2.0, >= 2.0.9) - version_gem (~> 1.1, >= 1.1.13) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) rubocop-thread_safety (0.7.3) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -465,7 +651,7 @@ GEM simplecov (>= 0.4.1) simplecov_lcov_formatter (0.9.0) simplecov (>= 0.18) - sorbet-runtime (0.6.13486) + sorbet-runtime (0.6.13490) standard (1.56.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) @@ -484,8 +670,8 @@ GEM rubocop-factory_bot (~> 2.27) rubocop-rspec (~> 3.9) rubocop-rspec_rails (~> 2.31) - standard-rubocop-lts (2.0.12) - rubocop-lts-ruby (~> 0.1, >= 0.1.0) + standard-rubocop-lts (2.0.13) + rubocop-lts-ruby (~> 0.1, >= 0.1.4) standard (~> 1.54, >= 1.54.0) standard-custom (~> 1.0, >= 1.0.2) standard-performance (~> 1.9, >= 1.9.0) @@ -505,18 +691,11 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -545,10 +724,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -586,25 +761,49 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) + ast-crispr! + ast-crispr-markdown-markly! + ast-crispr-ruby-prism! + ast-merge! + ast-merge-git! + ast-template! + bash-merge! benchmark (~> 0.5, >= 0.5.0) + binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) + go-merge! + html-merge! irb (~> 1.17) + json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) + kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) + kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -614,14 +813,20 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + ruby-merge! ruby-progressbar (~> 1.13) rust-merge! + smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) + toml-merge! + tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) + yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -629,6 +834,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -641,10 +847,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) + ast-merge-git (7.1.8) + ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -682,18 +891,21 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d + go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 + html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 + kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 + kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f - kettle-rb (0.1.11) sha256=3e50b413048906f2c5aea69ff805fbf8f7f2b5ea9d9e3d95151d38d97d6640f3 + kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed @@ -704,7 +916,7 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.8) - markly (0.17.0) sha256=fab61b604f7c4c8f771c3b7f2f16b971034bb72ddd27009b90c3fae1990b17e6 + markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca markly-merge (7.1.8) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 @@ -721,6 +933,7 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 + parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -755,9 +968,9 @@ CHECKSUMS rubocop-env (0.1.0) sha256=5ab9a259e71822bf514c8e900a9b68cc2f74ccc87d5493efcd03213f3068e718 rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb rubocop-gradual (0.4.0) sha256=9c7e584e6fef6c2539266a193a4572c970c22f99046fd6b0305bdde6228f96ad - rubocop-lts (24.2.2) sha256=be6c745e1bb61daebd6af3cc3227c60f95be9f642a080773cad7df14c5f9f174 - rubocop-lts-rspec (1.0.5) sha256=439552fd27440802cc499889e013bffa28aadc41adae5d4dfff3d984a2a809b4 - rubocop-lts-ruby (0.1.3) sha256=fa002117b94c5eb403eb476d5fde393913dbcc4253b6151ed9a3393c73fd3916 + rubocop-lts (24.2.3) sha256=510ca38a90393c7c5cac0e0defa35151805797b1ff9a2d130b649c20c2ca0842 + rubocop-lts-rspec (1.0.6) sha256=b7f7dae919c9712dee09df76b027563e154f510d9b4423bb0453394b5474cf38 + rubocop-lts-ruby (0.1.4) sha256=eb0039d61d645d2b6754abd4006842945b7848a916a664f522f5e2f7a5a69bf1 rubocop-md (2.0.4) sha256=0d076b6b5e99dea2ddc928c4bd702497decb9a8400da7808091e02ebcafcfb93 rubocop-minitest (0.40.0) sha256=353c698199115f12151144cf0b5a96f69bb9d77b660cf6536df2c4250c672a9d rubocop-on-rbs (2.0.0) sha256=ce74d1b3d5daead19f4b611623656c185821dfc9aed9c7079bb1e5d7d7c464be @@ -767,7 +980,7 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-rspec-extra (0.3.0) sha256=ee4b6484d0332a0d23c4a465eeb607e41888eb3d4ed479f850b9f5212514f787 rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 - rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 + rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 ruby-merge (7.1.8) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 @@ -781,12 +994,13 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f + smorg-rb (7.1.8) + sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2 standard-rspec (0.5.0) sha256=64d396524a65af47f5331b423d8cdd313e0267401647bb7892489ca89dad2973 - standard-rubocop-lts (2.0.12) sha256=4b55efc56691d4edef197df8df27ffebdb4a273e26d7bf00799d00ac6a71532f + standard-rubocop-lts (2.0.13) sha256=acc0f7e73db0215a50b5e2df01fbf1b6bbcc68bb128f429f970db3fdd62a8243 stone_checksums (1.0.8) sha256=91c5453d6c67c468653bf5396a33936c85d7731077be756ed0ff7eb78f981117 stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1 strings-ansi (0.2.0) sha256=90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88 @@ -796,6 +1010,7 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -808,6 +1023,7 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 + typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -821,6 +1037,7 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 + zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 6320a3bbcc5b950e099296c2d62f6e6a7faeeae8 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:44:59 -0400 Subject: [PATCH 032/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/typescript-merge/Gemfile.lock | 511 ++++++++++++++++++++--------- 1 file changed, 364 insertions(+), 147 deletions(-) diff --git a/gems/typescript-merge/Gemfile.lock b/gems/typescript-merge/Gemfile.lock index f4f190d89..66a3dc307 100644 --- a/gems/typescript-merge/Gemfile.lock +++ b/gems/typescript-merge/Gemfile.lock @@ -15,46 +15,314 @@ PATH tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -GEM - remote: https://gem.coop/ +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - backports (3.25.3) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.8) + ast-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge + specs: + html-merge (7.1.8) + ast-crispr (= 7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.8) + toml (~> 0.3) + toml-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.8) + ast-merge (= 7.1.8) + ast-merge-git (= 7.1.8) + bash-merge (= 7.1.8) + diff-lcs (~> 1.5) + dotenv-merge (= 7.1.8) + go-merge (= 7.1.8) + html-merge (= 7.1.8) + json-merge (= 7.1.8) + kettle-jem (~> 7.1, >= 7.1.18) + markdown-merge (= 7.1.8) + plain-merge (= 7.1.8) + prism-merge (= 7.1.8) + psych-merge (= 7.1.8) + rbs-merge (= 7.1.8) + rust-merge (= 7.1.8) + toml-merge (= 7.1.8) + typescript-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.8) + binary-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +GEM + remote: https://gem.coop/ + specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -62,11 +330,6 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -79,10 +342,6 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -96,11 +355,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -150,27 +404,25 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) version_gem (~> 1.1, >= 1.1.15) - kettle-dev (3.0.33) + kettle-dev (3.0.34) emoji_regex (>= 15.0) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.15) - kettle-rb (~> 0.1, >= 0.1.11) + kettle-rb (~> 0.1, >= 0.1.12) kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-family (1.2.97) + kettle-drift (1.0.13) + version_gem (~> 1.1, >= 1.1.15) + kettle-family (1.2.100) command_kit (~> 0.6) command_kit-completion (~> 0.1) kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.33) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-jem (~> 7.1, >= 7.1.23) kettle-test (~> 2.0, >= 2.0.21) @@ -182,39 +434,9 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) - kettle-rb (0.1.11) + kettle-rb (0.1.12) kettle-soup-cover (3.0.10) kettle-wash (~> 0.1, >= 0.1.6) simplecov (>= 1.0) @@ -237,24 +459,12 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - markly (0.17.0) - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) + markly (0.19.0) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -282,28 +492,13 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -312,11 +507,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -383,11 +573,11 @@ GEM parallel (~> 1.10) rainbow (>= 2.2.2, < 4.0) rubocop (~> 1.0) - rubocop-lts (24.2.2) - rubocop-ruby3_2 (~> 3.0, >= 3.0.1) - standard-rubocop-lts (~> 2.0, >= 2.0.3) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-rspec (1.0.5) + rubocop-lts (24.2.3) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-rspec (1.0.6) rubocop (~> 1.84, >= 1.84.2) rubocop-env (~> 0.1, >= 0.1.0) rubocop-factory_bot (~> 2.28, >= 2.28.0) @@ -395,8 +585,8 @@ GEM rubocop-rspec-extra (~> 0.3, >= 0.3.0) standard (~> 1.54, >= 1.54.0) standard-rspec (~> 0.5, >= 0.5.0) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-ruby (0.1.3) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-ruby (0.1.4) lint_roller (~> 1.1) rubocop (>= 1.72.1, < 2.0) version_gem (~> 1.1, >= 1.1.15) @@ -430,21 +620,17 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-rspec (~> 3.5) - rubocop-ruby3_2 (3.0.7) + rubocop-ruby3_2 (3.0.8) rubocop-gradual (~> 0.3, >= 0.3.6) rubocop-md (~> 2.0, >= 2.0.4) rubocop-rake (~> 0.7, >= 0.7.1) rubocop-thread_safety (~> 0.7, >= 0.7.3) - standard-rubocop-lts (~> 2.0, >= 2.0.9) - version_gem (~> 1.1, >= 1.1.13) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) rubocop-thread_safety (0.7.3) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -465,7 +651,7 @@ GEM simplecov (>= 0.4.1) simplecov_lcov_formatter (0.9.0) simplecov (>= 0.18) - sorbet-runtime (0.6.13486) + sorbet-runtime (0.6.13490) standard (1.56.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) @@ -484,8 +670,8 @@ GEM rubocop-factory_bot (~> 2.27) rubocop-rspec (~> 3.9) rubocop-rspec_rails (~> 2.31) - standard-rubocop-lts (2.0.12) - rubocop-lts-ruby (~> 0.1, >= 0.1.0) + standard-rubocop-lts (2.0.13) + rubocop-lts-ruby (~> 0.1, >= 0.1.4) standard (~> 1.54, >= 1.54.0) standard-custom (~> 1.0, >= 1.0.2) standard-performance (~> 1.9, >= 1.9.0) @@ -505,18 +691,11 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -545,10 +724,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -586,25 +761,49 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) + ast-crispr! + ast-crispr-markdown-markly! + ast-crispr-ruby-prism! + ast-merge! + ast-merge-git! + ast-template! + bash-merge! benchmark (~> 0.5, >= 0.5.0) + binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) + go-merge! + html-merge! irb (~> 1.17) + json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) + kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) + kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -614,14 +813,20 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) + toml-merge! + tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) + yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -629,6 +834,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -641,10 +847,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) + ast-merge-git (7.1.8) + ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -682,18 +891,21 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d + go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 + html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 + kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 + kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f - kettle-rb (0.1.11) sha256=3e50b413048906f2c5aea69ff805fbf8f7f2b5ea9d9e3d95151d38d97d6640f3 + kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed @@ -704,7 +916,7 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.8) - markly (0.17.0) sha256=fab61b604f7c4c8f771c3b7f2f16b971034bb72ddd27009b90c3fae1990b17e6 + markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca markly-merge (7.1.8) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 @@ -721,6 +933,7 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 + parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -755,9 +968,9 @@ CHECKSUMS rubocop-env (0.1.0) sha256=5ab9a259e71822bf514c8e900a9b68cc2f74ccc87d5493efcd03213f3068e718 rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb rubocop-gradual (0.4.0) sha256=9c7e584e6fef6c2539266a193a4572c970c22f99046fd6b0305bdde6228f96ad - rubocop-lts (24.2.2) sha256=be6c745e1bb61daebd6af3cc3227c60f95be9f642a080773cad7df14c5f9f174 - rubocop-lts-rspec (1.0.5) sha256=439552fd27440802cc499889e013bffa28aadc41adae5d4dfff3d984a2a809b4 - rubocop-lts-ruby (0.1.3) sha256=fa002117b94c5eb403eb476d5fde393913dbcc4253b6151ed9a3393c73fd3916 + rubocop-lts (24.2.3) sha256=510ca38a90393c7c5cac0e0defa35151805797b1ff9a2d130b649c20c2ca0842 + rubocop-lts-rspec (1.0.6) sha256=b7f7dae919c9712dee09df76b027563e154f510d9b4423bb0453394b5474cf38 + rubocop-lts-ruby (0.1.4) sha256=eb0039d61d645d2b6754abd4006842945b7848a916a664f522f5e2f7a5a69bf1 rubocop-md (2.0.4) sha256=0d076b6b5e99dea2ddc928c4bd702497decb9a8400da7808091e02ebcafcfb93 rubocop-minitest (0.40.0) sha256=353c698199115f12151144cf0b5a96f69bb9d77b660cf6536df2c4250c672a9d rubocop-on-rbs (2.0.0) sha256=ce74d1b3d5daead19f4b611623656c185821dfc9aed9c7079bb1e5d7d7c464be @@ -767,12 +980,13 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-rspec-extra (0.3.0) sha256=ee4b6484d0332a0d23c4a465eeb607e41888eb3d4ed479f850b9f5212514f787 rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 - rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 + rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 ruby-merge (7.1.8) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 + rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -780,12 +994,13 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f + smorg-rb (7.1.8) + sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2 standard-rspec (0.5.0) sha256=64d396524a65af47f5331b423d8cdd313e0267401647bb7892489ca89dad2973 - standard-rubocop-lts (2.0.12) sha256=4b55efc56691d4edef197df8df27ffebdb4a273e26d7bf00799d00ac6a71532f + standard-rubocop-lts (2.0.13) sha256=acc0f7e73db0215a50b5e2df01fbf1b6bbcc68bb128f429f970db3fdd62a8243 stone_checksums (1.0.8) sha256=91c5453d6c67c468653bf5396a33936c85d7731077be756ed0ff7eb78f981117 stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1 strings-ansi (0.2.0) sha256=90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88 @@ -795,6 +1010,7 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -821,6 +1037,7 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 + zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 9ce2f5a84bad6288cfbcdde9b499f5dcd9616b38 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:45:02 -0400 Subject: [PATCH 033/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-template/Gemfile.lock | 515 +++++++++++++++++++++++---------- 1 file changed, 365 insertions(+), 150 deletions(-) diff --git a/gems/ast-template/Gemfile.lock b/gems/ast-template/Gemfile.lock index eca742d23..27f35119e 100644 --- a/gems/ast-template/Gemfile.lock +++ b/gems/ast-template/Gemfile.lock @@ -14,46 +14,315 @@ PATH ast-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -GEM - remote: https://gem.coop/ +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - backports (3.25.3) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge + specs: + html-merge (7.1.8) + ast-crispr (= 7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.8) + toml (~> 0.3) + toml-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.8) + ast-merge (= 7.1.8) + ast-merge-git (= 7.1.8) + bash-merge (= 7.1.8) + diff-lcs (~> 1.5) + dotenv-merge (= 7.1.8) + go-merge (= 7.1.8) + html-merge (= 7.1.8) + json-merge (= 7.1.8) + kettle-jem (~> 7.1, >= 7.1.18) + markdown-merge (= 7.1.8) + plain-merge (= 7.1.8) + prism-merge (= 7.1.8) + psych-merge (= 7.1.8) + rbs-merge (= 7.1.8) + rust-merge (= 7.1.8) + toml-merge (= 7.1.8) + typescript-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.8) + binary-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +GEM + remote: https://gem.coop/ + specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -61,11 +330,6 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -78,10 +342,6 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -95,11 +355,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -149,27 +404,25 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) version_gem (~> 1.1, >= 1.1.15) - kettle-dev (3.0.33) + kettle-dev (3.0.34) emoji_regex (>= 15.0) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.15) - kettle-rb (~> 0.1, >= 0.1.11) + kettle-rb (~> 0.1, >= 0.1.12) kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-family (1.2.97) + kettle-drift (1.0.13) + version_gem (~> 1.1, >= 1.1.15) + kettle-family (1.2.100) command_kit (~> 0.6) command_kit-completion (~> 0.1) kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.33) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-jem (~> 7.1, >= 7.1.23) kettle-test (~> 2.0, >= 2.0.21) @@ -181,39 +434,9 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) - kettle-rb (0.1.11) + kettle-rb (0.1.12) kettle-soup-cover (3.0.10) kettle-wash (~> 0.1, >= 0.1.6) simplecov (>= 1.0) @@ -236,24 +459,12 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - markly (0.17.0) - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) + markly (0.19.0) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -281,28 +492,13 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -311,11 +507,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -382,11 +573,11 @@ GEM parallel (~> 1.10) rainbow (>= 2.2.2, < 4.0) rubocop (~> 1.0) - rubocop-lts (24.2.2) - rubocop-ruby3_2 (~> 3.0, >= 3.0.1) - standard-rubocop-lts (~> 2.0, >= 2.0.3) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-rspec (1.0.5) + rubocop-lts (24.2.3) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-rspec (1.0.6) rubocop (~> 1.84, >= 1.84.2) rubocop-env (~> 0.1, >= 0.1.0) rubocop-factory_bot (~> 2.28, >= 2.28.0) @@ -394,8 +585,8 @@ GEM rubocop-rspec-extra (~> 0.3, >= 0.3.0) standard (~> 1.54, >= 1.54.0) standard-rspec (~> 0.5, >= 0.5.0) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-ruby (0.1.3) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-ruby (0.1.4) lint_roller (~> 1.1) rubocop (>= 1.72.1, < 2.0) version_gem (~> 1.1, >= 1.1.15) @@ -429,21 +620,17 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-rspec (~> 3.5) - rubocop-ruby3_2 (3.0.7) + rubocop-ruby3_2 (3.0.8) rubocop-gradual (~> 0.3, >= 0.3.6) rubocop-md (~> 2.0, >= 2.0.4) rubocop-rake (~> 0.7, >= 0.7.1) rubocop-thread_safety (~> 0.7, >= 0.7.3) - standard-rubocop-lts (~> 2.0, >= 2.0.9) - version_gem (~> 1.1, >= 1.1.13) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) rubocop-thread_safety (0.7.3) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -464,7 +651,7 @@ GEM simplecov (>= 0.4.1) simplecov_lcov_formatter (0.9.0) simplecov (>= 0.18) - sorbet-runtime (0.6.13486) + sorbet-runtime (0.6.13490) standard (1.56.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) @@ -483,8 +670,8 @@ GEM rubocop-factory_bot (~> 2.27) rubocop-rspec (~> 3.9) rubocop-rspec_rails (~> 2.31) - standard-rubocop-lts (2.0.12) - rubocop-lts-ruby (~> 0.1, >= 0.1.0) + standard-rubocop-lts (2.0.13) + rubocop-lts-ruby (~> 0.1, >= 0.1.4) standard (~> 1.54, >= 1.54.0) standard-custom (~> 1.0, >= 1.0.2) standard-performance (~> 1.9, >= 1.9.0) @@ -504,18 +691,11 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -544,10 +724,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -585,28 +761,49 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) + ast-crispr! + ast-crispr-markdown-markly! + ast-crispr-ruby-prism! + ast-merge! + ast-merge-git! ast-template! + bash-merge! benchmark (~> 0.5, >= 0.5.0) + binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) + go-merge! + html-merge! irb (~> 1.17) + json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) + kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) + kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) + kramdown-merge! kramdown-parser-gfm (~> 1.1) - markly-merge (~> 7.1, >= 7.1.0) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) - prism-merge (~> 7.1, >= 7.1.0) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -616,14 +813,20 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) - toml-merge (~> 7.1, >= 7.1.0) + toml-merge! + tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) + yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -631,6 +834,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -643,11 +847,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) + ast-merge-git (7.1.8) ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -685,18 +891,21 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d + go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 + html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 + kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 + kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f - kettle-rb (0.1.11) sha256=3e50b413048906f2c5aea69ff805fbf8f7f2b5ea9d9e3d95151d38d97d6640f3 + kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed @@ -707,7 +916,7 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.8) - markly (0.17.0) sha256=fab61b604f7c4c8f771c3b7f2f16b971034bb72ddd27009b90c3fae1990b17e6 + markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca markly-merge (7.1.8) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 @@ -724,6 +933,7 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 + parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -758,9 +968,9 @@ CHECKSUMS rubocop-env (0.1.0) sha256=5ab9a259e71822bf514c8e900a9b68cc2f74ccc87d5493efcd03213f3068e718 rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb rubocop-gradual (0.4.0) sha256=9c7e584e6fef6c2539266a193a4572c970c22f99046fd6b0305bdde6228f96ad - rubocop-lts (24.2.2) sha256=be6c745e1bb61daebd6af3cc3227c60f95be9f642a080773cad7df14c5f9f174 - rubocop-lts-rspec (1.0.5) sha256=439552fd27440802cc499889e013bffa28aadc41adae5d4dfff3d984a2a809b4 - rubocop-lts-ruby (0.1.3) sha256=fa002117b94c5eb403eb476d5fde393913dbcc4253b6151ed9a3393c73fd3916 + rubocop-lts (24.2.3) sha256=510ca38a90393c7c5cac0e0defa35151805797b1ff9a2d130b649c20c2ca0842 + rubocop-lts-rspec (1.0.6) sha256=b7f7dae919c9712dee09df76b027563e154f510d9b4423bb0453394b5474cf38 + rubocop-lts-ruby (0.1.4) sha256=eb0039d61d645d2b6754abd4006842945b7848a916a664f522f5e2f7a5a69bf1 rubocop-md (2.0.4) sha256=0d076b6b5e99dea2ddc928c4bd702497decb9a8400da7808091e02ebcafcfb93 rubocop-minitest (0.40.0) sha256=353c698199115f12151144cf0b5a96f69bb9d77b660cf6536df2c4250c672a9d rubocop-on-rbs (2.0.0) sha256=ce74d1b3d5daead19f4b611623656c185821dfc9aed9c7079bb1e5d7d7c464be @@ -770,12 +980,13 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-rspec-extra (0.3.0) sha256=ee4b6484d0332a0d23c4a465eeb607e41888eb3d4ed479f850b9f5212514f787 rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 - rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 + rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 ruby-merge (7.1.8) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 + rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -783,12 +994,13 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f + smorg-rb (7.1.8) + sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2 standard-rspec (0.5.0) sha256=64d396524a65af47f5331b423d8cdd313e0267401647bb7892489ca89dad2973 - standard-rubocop-lts (2.0.12) sha256=4b55efc56691d4edef197df8df27ffebdb4a273e26d7bf00799d00ac6a71532f + standard-rubocop-lts (2.0.13) sha256=acc0f7e73db0215a50b5e2df01fbf1b6bbcc68bb128f429f970db3fdd62a8243 stone_checksums (1.0.8) sha256=91c5453d6c67c468653bf5396a33936c85d7731077be756ed0ff7eb78f981117 stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1 strings-ansi (0.2.0) sha256=90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88 @@ -798,6 +1010,7 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -810,6 +1023,7 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 + typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -823,6 +1037,7 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 + zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From e728875b7911f7a83964d09d5c8372107b08bd0b Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:45:04 -0400 Subject: [PATCH 034/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/binary-merge/Gemfile.lock | 511 +++++++++++++++++++++++---------- 1 file changed, 364 insertions(+), 147 deletions(-) diff --git a/gems/binary-merge/Gemfile.lock b/gems/binary-merge/Gemfile.lock index 99a557ccf..7ae72513c 100644 --- a/gems/binary-merge/Gemfile.lock +++ b/gems/binary-merge/Gemfile.lock @@ -15,46 +15,314 @@ PATH tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -GEM - remote: https://gem.coop/ +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - backports (3.25.3) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.8) + ast-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge + specs: + html-merge (7.1.8) + ast-crispr (= 7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.8) + toml (~> 0.3) + toml-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.8) + ast-merge (= 7.1.8) + ast-merge-git (= 7.1.8) + bash-merge (= 7.1.8) + diff-lcs (~> 1.5) + dotenv-merge (= 7.1.8) + go-merge (= 7.1.8) + html-merge (= 7.1.8) + json-merge (= 7.1.8) + kettle-jem (~> 7.1, >= 7.1.18) + markdown-merge (= 7.1.8) + plain-merge (= 7.1.8) + prism-merge (= 7.1.8) + psych-merge (= 7.1.8) + rbs-merge (= 7.1.8) + rust-merge (= 7.1.8) + toml-merge (= 7.1.8) + typescript-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.8) + binary-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +GEM + remote: https://gem.coop/ + specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -62,11 +330,6 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -79,10 +342,6 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -96,11 +355,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -150,27 +404,25 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) version_gem (~> 1.1, >= 1.1.15) - kettle-dev (3.0.33) + kettle-dev (3.0.34) emoji_regex (>= 15.0) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.15) - kettle-rb (~> 0.1, >= 0.1.11) + kettle-rb (~> 0.1, >= 0.1.12) kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-family (1.2.97) + kettle-drift (1.0.13) + version_gem (~> 1.1, >= 1.1.15) + kettle-family (1.2.100) command_kit (~> 0.6) command_kit-completion (~> 0.1) kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.33) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-jem (~> 7.1, >= 7.1.23) kettle-test (~> 2.0, >= 2.0.21) @@ -182,39 +434,9 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) - kettle-rb (0.1.11) + kettle-rb (0.1.12) kettle-soup-cover (3.0.10) kettle-wash (~> 0.1, >= 0.1.6) simplecov (>= 1.0) @@ -237,24 +459,12 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - markly (0.17.0) - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) + markly (0.19.0) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -282,28 +492,13 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -312,11 +507,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -383,11 +573,11 @@ GEM parallel (~> 1.10) rainbow (>= 2.2.2, < 4.0) rubocop (~> 1.0) - rubocop-lts (24.2.2) - rubocop-ruby3_2 (~> 3.0, >= 3.0.1) - standard-rubocop-lts (~> 2.0, >= 2.0.3) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-rspec (1.0.5) + rubocop-lts (24.2.3) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-rspec (1.0.6) rubocop (~> 1.84, >= 1.84.2) rubocop-env (~> 0.1, >= 0.1.0) rubocop-factory_bot (~> 2.28, >= 2.28.0) @@ -395,8 +585,8 @@ GEM rubocop-rspec-extra (~> 0.3, >= 0.3.0) standard (~> 1.54, >= 1.54.0) standard-rspec (~> 0.5, >= 0.5.0) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-ruby (0.1.3) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-ruby (0.1.4) lint_roller (~> 1.1) rubocop (>= 1.72.1, < 2.0) version_gem (~> 1.1, >= 1.1.15) @@ -430,21 +620,17 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-rspec (~> 3.5) - rubocop-ruby3_2 (3.0.7) + rubocop-ruby3_2 (3.0.8) rubocop-gradual (~> 0.3, >= 0.3.6) rubocop-md (~> 2.0, >= 2.0.4) rubocop-rake (~> 0.7, >= 0.7.1) rubocop-thread_safety (~> 0.7, >= 0.7.3) - standard-rubocop-lts (~> 2.0, >= 2.0.9) - version_gem (~> 1.1, >= 1.1.13) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) rubocop-thread_safety (0.7.3) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -465,7 +651,7 @@ GEM simplecov (>= 0.4.1) simplecov_lcov_formatter (0.9.0) simplecov (>= 0.18) - sorbet-runtime (0.6.13486) + sorbet-runtime (0.6.13490) standard (1.56.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) @@ -484,8 +670,8 @@ GEM rubocop-factory_bot (~> 2.27) rubocop-rspec (~> 3.9) rubocop-rspec_rails (~> 2.31) - standard-rubocop-lts (2.0.12) - rubocop-lts-ruby (~> 0.1, >= 0.1.0) + standard-rubocop-lts (2.0.13) + rubocop-lts-ruby (~> 0.1, >= 0.1.4) standard (~> 1.54, >= 1.54.0) standard-custom (~> 1.0, >= 1.0.2) standard-performance (~> 1.9, >= 1.9.0) @@ -505,18 +691,11 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -545,10 +724,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -586,26 +761,49 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) + ast-crispr! + ast-crispr-markdown-markly! + ast-crispr-ruby-prism! + ast-merge! + ast-merge-git! + ast-template! + bash-merge! benchmark (~> 0.5, >= 0.5.0) binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) + go-merge! + html-merge! irb (~> 1.17) + json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) + kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) + kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -615,13 +813,20 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) + toml-merge! + tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) + yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -629,6 +834,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -641,6 +847,8 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) + ast-merge-git (7.1.8) + ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c @@ -683,18 +891,21 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d + go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 + html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 + kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 + kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f - kettle-rb (0.1.11) sha256=3e50b413048906f2c5aea69ff805fbf8f7f2b5ea9d9e3d95151d38d97d6640f3 + kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed @@ -705,7 +916,7 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.8) - markly (0.17.0) sha256=fab61b604f7c4c8f771c3b7f2f16b971034bb72ddd27009b90c3fae1990b17e6 + markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca markly-merge (7.1.8) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 @@ -722,6 +933,7 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 + parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -756,9 +968,9 @@ CHECKSUMS rubocop-env (0.1.0) sha256=5ab9a259e71822bf514c8e900a9b68cc2f74ccc87d5493efcd03213f3068e718 rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb rubocop-gradual (0.4.0) sha256=9c7e584e6fef6c2539266a193a4572c970c22f99046fd6b0305bdde6228f96ad - rubocop-lts (24.2.2) sha256=be6c745e1bb61daebd6af3cc3227c60f95be9f642a080773cad7df14c5f9f174 - rubocop-lts-rspec (1.0.5) sha256=439552fd27440802cc499889e013bffa28aadc41adae5d4dfff3d984a2a809b4 - rubocop-lts-ruby (0.1.3) sha256=fa002117b94c5eb403eb476d5fde393913dbcc4253b6151ed9a3393c73fd3916 + rubocop-lts (24.2.3) sha256=510ca38a90393c7c5cac0e0defa35151805797b1ff9a2d130b649c20c2ca0842 + rubocop-lts-rspec (1.0.6) sha256=b7f7dae919c9712dee09df76b027563e154f510d9b4423bb0453394b5474cf38 + rubocop-lts-ruby (0.1.4) sha256=eb0039d61d645d2b6754abd4006842945b7848a916a664f522f5e2f7a5a69bf1 rubocop-md (2.0.4) sha256=0d076b6b5e99dea2ddc928c4bd702497decb9a8400da7808091e02ebcafcfb93 rubocop-minitest (0.40.0) sha256=353c698199115f12151144cf0b5a96f69bb9d77b660cf6536df2c4250c672a9d rubocop-on-rbs (2.0.0) sha256=ce74d1b3d5daead19f4b611623656c185821dfc9aed9c7079bb1e5d7d7c464be @@ -768,12 +980,13 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-rspec-extra (0.3.0) sha256=ee4b6484d0332a0d23c4a465eeb607e41888eb3d4ed479f850b9f5212514f787 rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 - rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 + rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 ruby-merge (7.1.8) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 + rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -781,12 +994,13 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f + smorg-rb (7.1.8) + sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2 standard-rspec (0.5.0) sha256=64d396524a65af47f5331b423d8cdd313e0267401647bb7892489ca89dad2973 - standard-rubocop-lts (2.0.12) sha256=4b55efc56691d4edef197df8df27ffebdb4a273e26d7bf00799d00ac6a71532f + standard-rubocop-lts (2.0.13) sha256=acc0f7e73db0215a50b5e2df01fbf1b6bbcc68bb128f429f970db3fdd62a8243 stone_checksums (1.0.8) sha256=91c5453d6c67c468653bf5396a33936c85d7731077be756ed0ff7eb78f981117 stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1 strings-ansi (0.2.0) sha256=90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88 @@ -796,6 +1010,7 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -808,6 +1023,7 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 + typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -821,6 +1037,7 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 + zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 738b60d101dff82df0215ffeb5c781d67af48eaa Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:45:07 -0400 Subject: [PATCH 035/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/zip-merge/Gemfile.lock | 510 +++++++++++++++++++++++++----------- 1 file changed, 361 insertions(+), 149 deletions(-) diff --git a/gems/zip-merge/Gemfile.lock b/gems/zip-merge/Gemfile.lock index dcee4c99f..65cbdd6d0 100644 --- a/gems/zip-merge/Gemfile.lock +++ b/gems/zip-merge/Gemfile.lock @@ -15,62 +15,321 @@ PATH tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -GEM - remote: https://gem.coop/ +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - backports (3.25.3) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.8) + ast-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - benchmark (0.5.0) - bigdecimal (4.1.2) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: binary-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - bundler-audit (0.9.3) - bundler (>= 1.2.0) - thor (~> 1.0) - cgi (0.5.2) - citrus (3.0.2) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: citrus-toml-merge (7.1.8) ast-merge (= 7.1.8) toml-merge (= 7.1.8) toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge + specs: + html-merge (7.1.8) + ast-crispr (= 7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.8) + toml (~> 0.3) + toml-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.8) + ast-merge (= 7.1.8) + ast-merge-git (= 7.1.8) + bash-merge (= 7.1.8) + diff-lcs (~> 1.5) + dotenv-merge (= 7.1.8) + go-merge (= 7.1.8) + html-merge (= 7.1.8) + json-merge (= 7.1.8) + kettle-jem (~> 7.1, >= 7.1.18) + markdown-merge (= 7.1.8) + plain-merge (= 7.1.8) + prism-merge (= 7.1.8) + psych-merge (= 7.1.8) + rbs-merge (= 7.1.8) + rust-merge (= 7.1.8) + toml-merge (= 7.1.8) + typescript-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +GEM + remote: https://gem.coop/ + specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + backports (3.25.3) + benchmark (0.5.0) + bigdecimal (4.1.2) + bundler-audit (0.9.3) + bundler (>= 1.2.0) + thor (~> 1.0) + cgi (0.5.2) + citrus (3.0.2) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -83,10 +342,6 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -100,11 +355,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -154,27 +404,25 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) version_gem (~> 1.1, >= 1.1.15) - kettle-dev (3.0.33) + kettle-dev (3.0.34) emoji_regex (>= 15.0) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.15) - kettle-rb (~> 0.1, >= 0.1.11) + kettle-rb (~> 0.1, >= 0.1.12) kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-family (1.2.97) + kettle-drift (1.0.13) + version_gem (~> 1.1, >= 1.1.15) + kettle-family (1.2.100) command_kit (~> 0.6) command_kit-completion (~> 0.1) kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.33) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-jem (~> 7.1, >= 7.1.23) kettle-test (~> 2.0, >= 2.0.21) @@ -186,39 +434,9 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) - kettle-rb (0.1.11) + kettle-rb (0.1.12) kettle-soup-cover (3.0.10) kettle-wash (~> 0.1, >= 0.1.6) simplecov (>= 1.0) @@ -241,24 +459,12 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - markly (0.17.0) - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) + markly (0.19.0) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -286,28 +492,13 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -316,11 +507,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -387,11 +573,11 @@ GEM parallel (~> 1.10) rainbow (>= 2.2.2, < 4.0) rubocop (~> 1.0) - rubocop-lts (24.2.2) - rubocop-ruby3_2 (~> 3.0, >= 3.0.1) - standard-rubocop-lts (~> 2.0, >= 2.0.3) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-rspec (1.0.5) + rubocop-lts (24.2.3) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-rspec (1.0.6) rubocop (~> 1.84, >= 1.84.2) rubocop-env (~> 0.1, >= 0.1.0) rubocop-factory_bot (~> 2.28, >= 2.28.0) @@ -399,8 +585,8 @@ GEM rubocop-rspec-extra (~> 0.3, >= 0.3.0) standard (~> 1.54, >= 1.54.0) standard-rspec (~> 0.5, >= 0.5.0) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-ruby (0.1.3) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-ruby (0.1.4) lint_roller (~> 1.1) rubocop (>= 1.72.1, < 2.0) version_gem (~> 1.1, >= 1.1.15) @@ -434,21 +620,17 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-rspec (~> 3.5) - rubocop-ruby3_2 (3.0.7) + rubocop-ruby3_2 (3.0.8) rubocop-gradual (~> 0.3, >= 0.3.6) rubocop-md (~> 2.0, >= 2.0.4) rubocop-rake (~> 0.7, >= 0.7.1) rubocop-thread_safety (~> 0.7, >= 0.7.3) - standard-rubocop-lts (~> 2.0, >= 2.0.9) - version_gem (~> 1.1, >= 1.1.13) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) rubocop-thread_safety (0.7.3) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -469,7 +651,7 @@ GEM simplecov (>= 0.4.1) simplecov_lcov_formatter (0.9.0) simplecov (>= 0.18) - sorbet-runtime (0.6.13486) + sorbet-runtime (0.6.13490) standard (1.56.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) @@ -488,8 +670,8 @@ GEM rubocop-factory_bot (~> 2.27) rubocop-rspec (~> 3.9) rubocop-rspec_rails (~> 2.31) - standard-rubocop-lts (2.0.12) - rubocop-lts-ruby (~> 0.1, >= 0.1.0) + standard-rubocop-lts (2.0.13) + rubocop-lts-ruby (~> 0.1, >= 0.1.4) standard (~> 1.54, >= 1.54.0) standard-custom (~> 1.0, >= 1.0.2) standard-performance (~> 1.9, >= 1.9.0) @@ -509,18 +691,11 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -549,10 +724,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -590,25 +761,49 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) + ast-crispr! + ast-crispr-markdown-markly! + ast-crispr-ruby-prism! + ast-merge! + ast-merge-git! + ast-template! + bash-merge! benchmark (~> 0.5, >= 0.5.0) + binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) + go-merge! + html-merge! irb (~> 1.17) + json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) + kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) + kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -618,13 +813,20 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) + toml-merge! + tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) + yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -645,6 +847,8 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) + ast-merge-git (7.1.8) + ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c @@ -687,18 +891,21 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d + go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 + html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 + kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 + kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f - kettle-rb (0.1.11) sha256=3e50b413048906f2c5aea69ff805fbf8f7f2b5ea9d9e3d95151d38d97d6640f3 + kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed @@ -709,7 +916,7 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.8) - markly (0.17.0) sha256=fab61b604f7c4c8f771c3b7f2f16b971034bb72ddd27009b90c3fae1990b17e6 + markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca markly-merge (7.1.8) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 @@ -726,6 +933,7 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 + parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -760,9 +968,9 @@ CHECKSUMS rubocop-env (0.1.0) sha256=5ab9a259e71822bf514c8e900a9b68cc2f74ccc87d5493efcd03213f3068e718 rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb rubocop-gradual (0.4.0) sha256=9c7e584e6fef6c2539266a193a4572c970c22f99046fd6b0305bdde6228f96ad - rubocop-lts (24.2.2) sha256=be6c745e1bb61daebd6af3cc3227c60f95be9f642a080773cad7df14c5f9f174 - rubocop-lts-rspec (1.0.5) sha256=439552fd27440802cc499889e013bffa28aadc41adae5d4dfff3d984a2a809b4 - rubocop-lts-ruby (0.1.3) sha256=fa002117b94c5eb403eb476d5fde393913dbcc4253b6151ed9a3393c73fd3916 + rubocop-lts (24.2.3) sha256=510ca38a90393c7c5cac0e0defa35151805797b1ff9a2d130b649c20c2ca0842 + rubocop-lts-rspec (1.0.6) sha256=b7f7dae919c9712dee09df76b027563e154f510d9b4423bb0453394b5474cf38 + rubocop-lts-ruby (0.1.4) sha256=eb0039d61d645d2b6754abd4006842945b7848a916a664f522f5e2f7a5a69bf1 rubocop-md (2.0.4) sha256=0d076b6b5e99dea2ddc928c4bd702497decb9a8400da7808091e02ebcafcfb93 rubocop-minitest (0.40.0) sha256=353c698199115f12151144cf0b5a96f69bb9d77b660cf6536df2c4250c672a9d rubocop-on-rbs (2.0.0) sha256=ce74d1b3d5daead19f4b611623656c185821dfc9aed9c7079bb1e5d7d7c464be @@ -772,12 +980,13 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-rspec-extra (0.3.0) sha256=ee4b6484d0332a0d23c4a465eeb607e41888eb3d4ed479f850b9f5212514f787 rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 - rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 + rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 ruby-merge (7.1.8) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 + rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -785,12 +994,13 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f + smorg-rb (7.1.8) + sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2 standard-rspec (0.5.0) sha256=64d396524a65af47f5331b423d8cdd313e0267401647bb7892489ca89dad2973 - standard-rubocop-lts (2.0.12) sha256=4b55efc56691d4edef197df8df27ffebdb4a273e26d7bf00799d00ac6a71532f + standard-rubocop-lts (2.0.13) sha256=acc0f7e73db0215a50b5e2df01fbf1b6bbcc68bb128f429f970db3fdd62a8243 stone_checksums (1.0.8) sha256=91c5453d6c67c468653bf5396a33936c85d7731077be756ed0ff7eb78f981117 stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1 strings-ansi (0.2.0) sha256=90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88 @@ -800,6 +1010,7 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -812,6 +1023,7 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 + typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 From 204e39653d510a8b5fbd8318c7469bcfb3fd7f05 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:45:09 -0400 Subject: [PATCH 036/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/psych-merge/Gemfile.lock | 506 ++++++++++++++++++++++++---------- 1 file changed, 364 insertions(+), 142 deletions(-) diff --git a/gems/psych-merge/Gemfile.lock b/gems/psych-merge/Gemfile.lock index 260ba82cb..37584a704 100644 --- a/gems/psych-merge/Gemfile.lock +++ b/gems/psych-merge/Gemfile.lock @@ -16,46 +16,313 @@ PATH version_gem (~> 1.1, >= 1.1.15) yaml-merge (= 7.1.8) -GEM - remote: https://gem.coop/ +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - backports (3.25.3) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.8) + ast-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge + specs: + html-merge (7.1.8) + ast-crispr (= 7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.8) + toml (~> 0.3) + toml-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.8) + ast-merge (= 7.1.8) + ast-merge-git (= 7.1.8) + bash-merge (= 7.1.8) + diff-lcs (~> 1.5) + dotenv-merge (= 7.1.8) + go-merge (= 7.1.8) + html-merge (= 7.1.8) + json-merge (= 7.1.8) + kettle-jem (~> 7.1, >= 7.1.18) + markdown-merge (= 7.1.8) + plain-merge (= 7.1.8) + prism-merge (= 7.1.8) + psych-merge (= 7.1.8) + rbs-merge (= 7.1.8) + rust-merge (= 7.1.8) + toml-merge (= 7.1.8) + typescript-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.8) + binary-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +GEM + remote: https://gem.coop/ + specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -63,11 +330,6 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -80,10 +342,6 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -97,11 +355,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -151,27 +404,25 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) version_gem (~> 1.1, >= 1.1.15) - kettle-dev (3.0.33) + kettle-dev (3.0.34) emoji_regex (>= 15.0) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.15) - kettle-rb (~> 0.1, >= 0.1.11) + kettle-rb (~> 0.1, >= 0.1.12) kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-family (1.2.97) + kettle-drift (1.0.13) + version_gem (~> 1.1, >= 1.1.15) + kettle-family (1.2.100) command_kit (~> 0.6) command_kit-completion (~> 0.1) kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.33) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-jem (~> 7.1, >= 7.1.23) kettle-test (~> 2.0, >= 2.0.21) @@ -183,39 +434,9 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) - kettle-rb (0.1.11) + kettle-rb (0.1.12) kettle-soup-cover (3.0.10) kettle-wash (~> 0.1, >= 0.1.6) simplecov (>= 1.0) @@ -238,24 +459,12 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - markly (0.17.0) - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) + markly (0.19.0) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -283,20 +492,10 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio @@ -308,11 +507,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -379,11 +573,11 @@ GEM parallel (~> 1.10) rainbow (>= 2.2.2, < 4.0) rubocop (~> 1.0) - rubocop-lts (24.2.2) - rubocop-ruby3_2 (~> 3.0, >= 3.0.1) - standard-rubocop-lts (~> 2.0, >= 2.0.3) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-rspec (1.0.5) + rubocop-lts (24.2.3) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-rspec (1.0.6) rubocop (~> 1.84, >= 1.84.2) rubocop-env (~> 0.1, >= 0.1.0) rubocop-factory_bot (~> 2.28, >= 2.28.0) @@ -391,8 +585,8 @@ GEM rubocop-rspec-extra (~> 0.3, >= 0.3.0) standard (~> 1.54, >= 1.54.0) standard-rspec (~> 0.5, >= 0.5.0) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-ruby (0.1.3) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-ruby (0.1.4) lint_roller (~> 1.1) rubocop (>= 1.72.1, < 2.0) version_gem (~> 1.1, >= 1.1.15) @@ -426,21 +620,17 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-rspec (~> 3.5) - rubocop-ruby3_2 (3.0.7) + rubocop-ruby3_2 (3.0.8) rubocop-gradual (~> 0.3, >= 0.3.6) rubocop-md (~> 2.0, >= 2.0.4) rubocop-rake (~> 0.7, >= 0.7.1) rubocop-thread_safety (~> 0.7, >= 0.7.3) - standard-rubocop-lts (~> 2.0, >= 2.0.9) - version_gem (~> 1.1, >= 1.1.13) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) rubocop-thread_safety (0.7.3) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -461,7 +651,7 @@ GEM simplecov (>= 0.4.1) simplecov_lcov_formatter (0.9.0) simplecov (>= 0.18) - sorbet-runtime (0.6.13486) + sorbet-runtime (0.6.13490) standard (1.56.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) @@ -480,8 +670,8 @@ GEM rubocop-factory_bot (~> 2.27) rubocop-rspec (~> 3.9) rubocop-rspec_rails (~> 2.31) - standard-rubocop-lts (2.0.12) - rubocop-lts-ruby (~> 0.1, >= 0.1.0) + standard-rubocop-lts (2.0.13) + rubocop-lts-ruby (~> 0.1, >= 0.1.4) standard (~> 1.54, >= 1.54.0) standard-custom (~> 1.0, >= 1.0.2) standard-performance (~> 1.9, >= 1.9.0) @@ -501,18 +691,11 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -541,10 +724,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -582,26 +761,49 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) + ast-crispr! + ast-crispr-markdown-markly! + ast-crispr-ruby-prism! + ast-merge! + ast-merge-git! + ast-template! + bash-merge! benchmark (~> 0.5, >= 0.5.0) + binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) + go-merge! + html-merge! irb (~> 1.17) + json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) + kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) + kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) + parslet-toml-merge! + plain-merge! + prism-merge! psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -611,13 +813,20 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) + toml-merge! + tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) + yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -625,6 +834,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -637,10 +847,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) + ast-merge-git (7.1.8) + ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -678,18 +891,21 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d + go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 + html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 + kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 + kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f - kettle-rb (0.1.11) sha256=3e50b413048906f2c5aea69ff805fbf8f7f2b5ea9d9e3d95151d38d97d6640f3 + kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed @@ -700,7 +916,7 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.8) - markly (0.17.0) sha256=fab61b604f7c4c8f771c3b7f2f16b971034bb72ddd27009b90c3fae1990b17e6 + markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca markly-merge (7.1.8) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 @@ -717,6 +933,7 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 + parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -751,9 +968,9 @@ CHECKSUMS rubocop-env (0.1.0) sha256=5ab9a259e71822bf514c8e900a9b68cc2f74ccc87d5493efcd03213f3068e718 rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb rubocop-gradual (0.4.0) sha256=9c7e584e6fef6c2539266a193a4572c970c22f99046fd6b0305bdde6228f96ad - rubocop-lts (24.2.2) sha256=be6c745e1bb61daebd6af3cc3227c60f95be9f642a080773cad7df14c5f9f174 - rubocop-lts-rspec (1.0.5) sha256=439552fd27440802cc499889e013bffa28aadc41adae5d4dfff3d984a2a809b4 - rubocop-lts-ruby (0.1.3) sha256=fa002117b94c5eb403eb476d5fde393913dbcc4253b6151ed9a3393c73fd3916 + rubocop-lts (24.2.3) sha256=510ca38a90393c7c5cac0e0defa35151805797b1ff9a2d130b649c20c2ca0842 + rubocop-lts-rspec (1.0.6) sha256=b7f7dae919c9712dee09df76b027563e154f510d9b4423bb0453394b5474cf38 + rubocop-lts-ruby (0.1.4) sha256=eb0039d61d645d2b6754abd4006842945b7848a916a664f522f5e2f7a5a69bf1 rubocop-md (2.0.4) sha256=0d076b6b5e99dea2ddc928c4bd702497decb9a8400da7808091e02ebcafcfb93 rubocop-minitest (0.40.0) sha256=353c698199115f12151144cf0b5a96f69bb9d77b660cf6536df2c4250c672a9d rubocop-on-rbs (2.0.0) sha256=ce74d1b3d5daead19f4b611623656c185821dfc9aed9c7079bb1e5d7d7c464be @@ -763,12 +980,13 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-rspec-extra (0.3.0) sha256=ee4b6484d0332a0d23c4a465eeb607e41888eb3d4ed479f850b9f5212514f787 rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 - rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 + rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 ruby-merge (7.1.8) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 + rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -776,12 +994,13 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f + smorg-rb (7.1.8) + sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2 standard-rspec (0.5.0) sha256=64d396524a65af47f5331b423d8cdd313e0267401647bb7892489ca89dad2973 - standard-rubocop-lts (2.0.12) sha256=4b55efc56691d4edef197df8df27ffebdb4a273e26d7bf00799d00ac6a71532f + standard-rubocop-lts (2.0.13) sha256=acc0f7e73db0215a50b5e2df01fbf1b6bbcc68bb128f429f970db3fdd62a8243 stone_checksums (1.0.8) sha256=91c5453d6c67c468653bf5396a33936c85d7731077be756ed0ff7eb78f981117 stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1 strings-ansi (0.2.0) sha256=90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88 @@ -791,6 +1010,7 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -803,6 +1023,7 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 + typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -816,6 +1037,7 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 + zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From ad56598c500e079fb25c5cb717369ebd671b6878 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:45:11 -0400 Subject: [PATCH 037/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/citrus-toml-merge/Gemfile.lock | 506 ++++++++++++++++++++-------- 1 file changed, 364 insertions(+), 142 deletions(-) diff --git a/gems/citrus-toml-merge/Gemfile.lock b/gems/citrus-toml-merge/Gemfile.lock index b6365c153..8c4316133 100644 --- a/gems/citrus-toml-merge/Gemfile.lock +++ b/gems/citrus-toml-merge/Gemfile.lock @@ -16,46 +16,313 @@ PATH toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) -GEM - remote: https://gem.coop/ +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - backports (3.25.3) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.8) + ast-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge + specs: + html-merge (7.1.8) + ast-crispr (= 7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.8) + toml (~> 0.3) + toml-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.8) + ast-merge (= 7.1.8) + ast-merge-git (= 7.1.8) + bash-merge (= 7.1.8) + diff-lcs (~> 1.5) + dotenv-merge (= 7.1.8) + go-merge (= 7.1.8) + html-merge (= 7.1.8) + json-merge (= 7.1.8) + kettle-jem (~> 7.1, >= 7.1.18) + markdown-merge (= 7.1.8) + plain-merge (= 7.1.8) + prism-merge (= 7.1.8) + psych-merge (= 7.1.8) + rbs-merge (= 7.1.8) + rust-merge (= 7.1.8) + toml-merge (= 7.1.8) + typescript-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.8) + binary-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +GEM + remote: https://gem.coop/ + specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -75,10 +342,6 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -92,11 +355,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -146,27 +404,25 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) version_gem (~> 1.1, >= 1.1.15) - kettle-dev (3.0.33) + kettle-dev (3.0.34) emoji_regex (>= 15.0) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.15) - kettle-rb (~> 0.1, >= 0.1.11) + kettle-rb (~> 0.1, >= 0.1.12) kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-family (1.2.97) + kettle-drift (1.0.13) + version_gem (~> 1.1, >= 1.1.15) + kettle-family (1.2.100) command_kit (~> 0.6) command_kit-completion (~> 0.1) kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.33) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-jem (~> 7.1, >= 7.1.23) kettle-test (~> 2.0, >= 2.0.21) @@ -178,39 +434,9 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) - kettle-rb (0.1.11) + kettle-rb (0.1.12) kettle-soup-cover (3.0.10) kettle-wash (~> 0.1, >= 0.1.6) simplecov (>= 1.0) @@ -233,24 +459,12 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - markly (0.17.0) - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) + markly (0.19.0) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -278,28 +492,13 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -308,11 +507,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -379,11 +573,11 @@ GEM parallel (~> 1.10) rainbow (>= 2.2.2, < 4.0) rubocop (~> 1.0) - rubocop-lts (24.2.2) - rubocop-ruby3_2 (~> 3.0, >= 3.0.1) - standard-rubocop-lts (~> 2.0, >= 2.0.3) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-rspec (1.0.5) + rubocop-lts (24.2.3) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-rspec (1.0.6) rubocop (~> 1.84, >= 1.84.2) rubocop-env (~> 0.1, >= 0.1.0) rubocop-factory_bot (~> 2.28, >= 2.28.0) @@ -391,8 +585,8 @@ GEM rubocop-rspec-extra (~> 0.3, >= 0.3.0) standard (~> 1.54, >= 1.54.0) standard-rspec (~> 0.5, >= 0.5.0) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-ruby (0.1.3) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-ruby (0.1.4) lint_roller (~> 1.1) rubocop (>= 1.72.1, < 2.0) version_gem (~> 1.1, >= 1.1.15) @@ -426,21 +620,17 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-rspec (~> 3.5) - rubocop-ruby3_2 (3.0.7) + rubocop-ruby3_2 (3.0.8) rubocop-gradual (~> 0.3, >= 0.3.6) rubocop-md (~> 2.0, >= 2.0.4) rubocop-rake (~> 0.7, >= 0.7.1) rubocop-thread_safety (~> 0.7, >= 0.7.3) - standard-rubocop-lts (~> 2.0, >= 2.0.9) - version_gem (~> 1.1, >= 1.1.13) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) rubocop-thread_safety (0.7.3) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -461,7 +651,7 @@ GEM simplecov (>= 0.4.1) simplecov_lcov_formatter (0.9.0) simplecov (>= 0.18) - sorbet-runtime (0.6.13486) + sorbet-runtime (0.6.13490) standard (1.56.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) @@ -480,8 +670,8 @@ GEM rubocop-factory_bot (~> 2.27) rubocop-rspec (~> 3.9) rubocop-rspec_rails (~> 2.31) - standard-rubocop-lts (2.0.12) - rubocop-lts-ruby (~> 0.1, >= 0.1.0) + standard-rubocop-lts (2.0.13) + rubocop-lts-ruby (~> 0.1, >= 0.1.4) standard (~> 1.54, >= 1.54.0) standard-custom (~> 1.0, >= 1.0.2) standard-performance (~> 1.9, >= 1.9.0) @@ -501,18 +691,11 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -541,10 +724,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -582,26 +761,49 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) + ast-crispr! + ast-crispr-markdown-markly! + ast-crispr-ruby-prism! + ast-merge! + ast-merge-git! + ast-template! + bash-merge! benchmark (~> 0.5, >= 0.5.0) + binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) + go-merge! + html-merge! irb (~> 1.17) + json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) + kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) + kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -611,13 +813,20 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) + toml-merge! + tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) + yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -625,6 +834,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -637,10 +847,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) + ast-merge-git (7.1.8) + ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -678,18 +891,21 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d + go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 + html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 + kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 + kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f - kettle-rb (0.1.11) sha256=3e50b413048906f2c5aea69ff805fbf8f7f2b5ea9d9e3d95151d38d97d6640f3 + kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed @@ -700,7 +916,7 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.8) - markly (0.17.0) sha256=fab61b604f7c4c8f771c3b7f2f16b971034bb72ddd27009b90c3fae1990b17e6 + markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca markly-merge (7.1.8) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 @@ -717,6 +933,7 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 + parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -751,9 +968,9 @@ CHECKSUMS rubocop-env (0.1.0) sha256=5ab9a259e71822bf514c8e900a9b68cc2f74ccc87d5493efcd03213f3068e718 rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb rubocop-gradual (0.4.0) sha256=9c7e584e6fef6c2539266a193a4572c970c22f99046fd6b0305bdde6228f96ad - rubocop-lts (24.2.2) sha256=be6c745e1bb61daebd6af3cc3227c60f95be9f642a080773cad7df14c5f9f174 - rubocop-lts-rspec (1.0.5) sha256=439552fd27440802cc499889e013bffa28aadc41adae5d4dfff3d984a2a809b4 - rubocop-lts-ruby (0.1.3) sha256=fa002117b94c5eb403eb476d5fde393913dbcc4253b6151ed9a3393c73fd3916 + rubocop-lts (24.2.3) sha256=510ca38a90393c7c5cac0e0defa35151805797b1ff9a2d130b649c20c2ca0842 + rubocop-lts-rspec (1.0.6) sha256=b7f7dae919c9712dee09df76b027563e154f510d9b4423bb0453394b5474cf38 + rubocop-lts-ruby (0.1.4) sha256=eb0039d61d645d2b6754abd4006842945b7848a916a664f522f5e2f7a5a69bf1 rubocop-md (2.0.4) sha256=0d076b6b5e99dea2ddc928c4bd702497decb9a8400da7808091e02ebcafcfb93 rubocop-minitest (0.40.0) sha256=353c698199115f12151144cf0b5a96f69bb9d77b660cf6536df2c4250c672a9d rubocop-on-rbs (2.0.0) sha256=ce74d1b3d5daead19f4b611623656c185821dfc9aed9c7079bb1e5d7d7c464be @@ -763,12 +980,13 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-rspec-extra (0.3.0) sha256=ee4b6484d0332a0d23c4a465eeb607e41888eb3d4ed479f850b9f5212514f787 rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 - rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 + rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 ruby-merge (7.1.8) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 + rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -776,12 +994,13 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f + smorg-rb (7.1.8) + sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2 standard-rspec (0.5.0) sha256=64d396524a65af47f5331b423d8cdd313e0267401647bb7892489ca89dad2973 - standard-rubocop-lts (2.0.12) sha256=4b55efc56691d4edef197df8df27ffebdb4a273e26d7bf00799d00ac6a71532f + standard-rubocop-lts (2.0.13) sha256=acc0f7e73db0215a50b5e2df01fbf1b6bbcc68bb128f429f970db3fdd62a8243 stone_checksums (1.0.8) sha256=91c5453d6c67c468653bf5396a33936c85d7731077be756ed0ff7eb78f981117 stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1 strings-ansi (0.2.0) sha256=90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88 @@ -791,6 +1010,7 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -803,6 +1023,7 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 + typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -816,6 +1037,7 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 + zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 9adb524a81a9b80b831b35f1b51f9dffb2d35f49 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:45:14 -0400 Subject: [PATCH 038/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/parslet-toml-merge/Gemfile.lock | 509 +++++++++++++++++++-------- 1 file changed, 361 insertions(+), 148 deletions(-) diff --git a/gems/parslet-toml-merge/Gemfile.lock b/gems/parslet-toml-merge/Gemfile.lock index 9b286a59a..6841a64b5 100644 --- a/gems/parslet-toml-merge/Gemfile.lock +++ b/gems/parslet-toml-merge/Gemfile.lock @@ -15,46 +15,314 @@ PATH toml-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -GEM - remote: https://gem.coop/ +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - backports (3.25.3) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.8) + ast-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge + specs: + html-merge (7.1.8) + ast-crispr (= 7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.8) + ast-merge (= 7.1.8) + ast-merge-git (= 7.1.8) + bash-merge (= 7.1.8) + diff-lcs (~> 1.5) + dotenv-merge (= 7.1.8) + go-merge (= 7.1.8) + html-merge (= 7.1.8) + json-merge (= 7.1.8) + kettle-jem (~> 7.1, >= 7.1.18) + markdown-merge (= 7.1.8) + plain-merge (= 7.1.8) + prism-merge (= 7.1.8) + psych-merge (= 7.1.8) + rbs-merge (= 7.1.8) + rust-merge (= 7.1.8) + toml-merge (= 7.1.8) + typescript-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.8) + binary-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +GEM + remote: https://gem.coop/ + specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -62,11 +330,6 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -79,10 +342,6 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -96,11 +355,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -150,27 +404,25 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) version_gem (~> 1.1, >= 1.1.15) - kettle-dev (3.0.33) + kettle-dev (3.0.34) emoji_regex (>= 15.0) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.15) - kettle-rb (~> 0.1, >= 0.1.11) + kettle-rb (~> 0.1, >= 0.1.12) kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-family (1.2.97) + kettle-drift (1.0.13) + version_gem (~> 1.1, >= 1.1.15) + kettle-family (1.2.100) command_kit (~> 0.6) command_kit-completion (~> 0.1) kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.33) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-jem (~> 7.1, >= 7.1.23) kettle-test (~> 2.0, >= 2.0.21) @@ -182,39 +434,9 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) - kettle-rb (0.1.11) + kettle-rb (0.1.12) kettle-soup-cover (3.0.10) kettle-wash (~> 0.1, >= 0.1.6) simplecov (>= 1.0) @@ -237,24 +459,12 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - markly (0.17.0) - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) + markly (0.19.0) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -282,28 +492,13 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -312,11 +507,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -383,11 +573,11 @@ GEM parallel (~> 1.10) rainbow (>= 2.2.2, < 4.0) rubocop (~> 1.0) - rubocop-lts (24.2.2) - rubocop-ruby3_2 (~> 3.0, >= 3.0.1) - standard-rubocop-lts (~> 2.0, >= 2.0.3) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-rspec (1.0.5) + rubocop-lts (24.2.3) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-rspec (1.0.6) rubocop (~> 1.84, >= 1.84.2) rubocop-env (~> 0.1, >= 0.1.0) rubocop-factory_bot (~> 2.28, >= 2.28.0) @@ -395,8 +585,8 @@ GEM rubocop-rspec-extra (~> 0.3, >= 0.3.0) standard (~> 1.54, >= 1.54.0) standard-rspec (~> 0.5, >= 0.5.0) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-ruby (0.1.3) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-ruby (0.1.4) lint_roller (~> 1.1) rubocop (>= 1.72.1, < 2.0) version_gem (~> 1.1, >= 1.1.15) @@ -430,21 +620,17 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-rspec (~> 3.5) - rubocop-ruby3_2 (3.0.7) + rubocop-ruby3_2 (3.0.8) rubocop-gradual (~> 0.3, >= 0.3.6) rubocop-md (~> 2.0, >= 2.0.4) rubocop-rake (~> 0.7, >= 0.7.1) rubocop-thread_safety (~> 0.7, >= 0.7.3) - standard-rubocop-lts (~> 2.0, >= 2.0.9) - version_gem (~> 1.1, >= 1.1.13) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) rubocop-thread_safety (0.7.3) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -465,7 +651,7 @@ GEM simplecov (>= 0.4.1) simplecov_lcov_formatter (0.9.0) simplecov (>= 0.18) - sorbet-runtime (0.6.13486) + sorbet-runtime (0.6.13490) standard (1.56.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) @@ -484,8 +670,8 @@ GEM rubocop-factory_bot (~> 2.27) rubocop-rspec (~> 3.9) rubocop-rspec_rails (~> 2.31) - standard-rubocop-lts (2.0.12) - rubocop-lts-ruby (~> 0.1, >= 0.1.0) + standard-rubocop-lts (2.0.13) + rubocop-lts-ruby (~> 0.1, >= 0.1.4) standard (~> 1.54, >= 1.54.0) standard-custom (~> 1.0, >= 1.0.2) standard-performance (~> 1.9, >= 1.9.0) @@ -507,18 +693,9 @@ GEM version_gem (~> 1.1, >= 1.1.15) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -547,10 +724,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -588,27 +761,49 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) + ast-crispr! + ast-crispr-markdown-markly! + ast-crispr-ruby-prism! + ast-merge! + ast-merge-git! + ast-template! + bash-merge! benchmark (~> 0.5, >= 0.5.0) + binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) - citrus-toml-merge (= 7.1.8) + citrus-toml-merge (>= 0, = 7.1.8)! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) + go-merge! + html-merge! irb (~> 1.17) + json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) + kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) + kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -618,13 +813,20 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) + toml-merge! + tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) + yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -632,6 +834,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -644,10 +847,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) + ast-merge-git (7.1.8) + ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -685,18 +891,21 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d + go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 + html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 + kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 + kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f - kettle-rb (0.1.11) sha256=3e50b413048906f2c5aea69ff805fbf8f7f2b5ea9d9e3d95151d38d97d6640f3 + kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed @@ -707,7 +916,7 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.8) - markly (0.17.0) sha256=fab61b604f7c4c8f771c3b7f2f16b971034bb72ddd27009b90c3fae1990b17e6 + markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca markly-merge (7.1.8) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 @@ -759,9 +968,9 @@ CHECKSUMS rubocop-env (0.1.0) sha256=5ab9a259e71822bf514c8e900a9b68cc2f74ccc87d5493efcd03213f3068e718 rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb rubocop-gradual (0.4.0) sha256=9c7e584e6fef6c2539266a193a4572c970c22f99046fd6b0305bdde6228f96ad - rubocop-lts (24.2.2) sha256=be6c745e1bb61daebd6af3cc3227c60f95be9f642a080773cad7df14c5f9f174 - rubocop-lts-rspec (1.0.5) sha256=439552fd27440802cc499889e013bffa28aadc41adae5d4dfff3d984a2a809b4 - rubocop-lts-ruby (0.1.3) sha256=fa002117b94c5eb403eb476d5fde393913dbcc4253b6151ed9a3393c73fd3916 + rubocop-lts (24.2.3) sha256=510ca38a90393c7c5cac0e0defa35151805797b1ff9a2d130b649c20c2ca0842 + rubocop-lts-rspec (1.0.6) sha256=b7f7dae919c9712dee09df76b027563e154f510d9b4423bb0453394b5474cf38 + rubocop-lts-ruby (0.1.4) sha256=eb0039d61d645d2b6754abd4006842945b7848a916a664f522f5e2f7a5a69bf1 rubocop-md (2.0.4) sha256=0d076b6b5e99dea2ddc928c4bd702497decb9a8400da7808091e02ebcafcfb93 rubocop-minitest (0.40.0) sha256=353c698199115f12151144cf0b5a96f69bb9d77b660cf6536df2c4250c672a9d rubocop-on-rbs (2.0.0) sha256=ce74d1b3d5daead19f4b611623656c185821dfc9aed9c7079bb1e5d7d7c464be @@ -771,12 +980,13 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-rspec-extra (0.3.0) sha256=ee4b6484d0332a0d23c4a465eeb607e41888eb3d4ed479f850b9f5212514f787 rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 - rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 + rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 ruby-merge (7.1.8) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 + rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -784,12 +994,13 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f + smorg-rb (7.1.8) + sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2 standard-rspec (0.5.0) sha256=64d396524a65af47f5331b423d8cdd313e0267401647bb7892489ca89dad2973 - standard-rubocop-lts (2.0.12) sha256=4b55efc56691d4edef197df8df27ffebdb4a273e26d7bf00799d00ac6a71532f + standard-rubocop-lts (2.0.13) sha256=acc0f7e73db0215a50b5e2df01fbf1b6bbcc68bb128f429f970db3fdd62a8243 stone_checksums (1.0.8) sha256=91c5453d6c67c468653bf5396a33936c85d7731077be756ed0ff7eb78f981117 stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1 strings-ansi (0.2.0) sha256=90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88 @@ -812,6 +1023,7 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 + typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -825,6 +1037,7 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 + zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From bdd765b4a0809c1624d1484f9d61f193d5531052 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:45:16 -0400 Subject: [PATCH 039/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/commonmarker-merge/Gemfile.lock | 508 +++++++++++++++++++-------- 1 file changed, 365 insertions(+), 143 deletions(-) diff --git a/gems/commonmarker-merge/Gemfile.lock b/gems/commonmarker-merge/Gemfile.lock index 7a995983a..53aa82675 100644 --- a/gems/commonmarker-merge/Gemfile.lock +++ b/gems/commonmarker-merge/Gemfile.lock @@ -15,46 +15,314 @@ PATH markdown-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -GEM - remote: https://gem.coop/ +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - backports (3.25.3) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.8) + ast-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge + specs: + html-merge (7.1.8) + ast-crispr (= 7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.8) + toml (~> 0.3) + toml-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.8) + ast-merge (= 7.1.8) + ast-merge-git (= 7.1.8) + bash-merge (= 7.1.8) + diff-lcs (~> 1.5) + dotenv-merge (= 7.1.8) + go-merge (= 7.1.8) + html-merge (= 7.1.8) + json-merge (= 7.1.8) + kettle-jem (~> 7.1, >= 7.1.18) + markdown-merge (= 7.1.8) + plain-merge (= 7.1.8) + prism-merge (= 7.1.8) + psych-merge (= 7.1.8) + rbs-merge (= 7.1.8) + rust-merge (= 7.1.8) + toml-merge (= 7.1.8) + typescript-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.8) + binary-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +GEM + remote: https://gem.coop/ + specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -62,11 +330,6 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -92,11 +355,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -146,27 +404,25 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) version_gem (~> 1.1, >= 1.1.15) - kettle-dev (3.0.33) + kettle-dev (3.0.34) emoji_regex (>= 15.0) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.15) - kettle-rb (~> 0.1, >= 0.1.11) + kettle-rb (~> 0.1, >= 0.1.12) kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-family (1.2.97) + kettle-drift (1.0.13) + version_gem (~> 1.1, >= 1.1.15) + kettle-family (1.2.100) command_kit (~> 0.6) command_kit-completion (~> 0.1) kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.33) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-jem (~> 7.1, >= 7.1.23) kettle-test (~> 2.0, >= 2.0.21) @@ -178,39 +434,9 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) - kettle-rb (0.1.11) + kettle-rb (0.1.12) kettle-soup-cover (3.0.10) kettle-wash (~> 0.1, >= 0.1.6) simplecov (>= 1.0) @@ -233,24 +459,12 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - markly (0.17.0) - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) + markly (0.19.0) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -278,28 +492,13 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -308,11 +507,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -379,11 +573,11 @@ GEM parallel (~> 1.10) rainbow (>= 2.2.2, < 4.0) rubocop (~> 1.0) - rubocop-lts (24.2.2) - rubocop-ruby3_2 (~> 3.0, >= 3.0.1) - standard-rubocop-lts (~> 2.0, >= 2.0.3) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-rspec (1.0.5) + rubocop-lts (24.2.3) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-rspec (1.0.6) rubocop (~> 1.84, >= 1.84.2) rubocop-env (~> 0.1, >= 0.1.0) rubocop-factory_bot (~> 2.28, >= 2.28.0) @@ -391,8 +585,8 @@ GEM rubocop-rspec-extra (~> 0.3, >= 0.3.0) standard (~> 1.54, >= 1.54.0) standard-rspec (~> 0.5, >= 0.5.0) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-ruby (0.1.3) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-ruby (0.1.4) lint_roller (~> 1.1) rubocop (>= 1.72.1, < 2.0) version_gem (~> 1.1, >= 1.1.15) @@ -426,21 +620,17 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-rspec (~> 3.5) - rubocop-ruby3_2 (3.0.7) + rubocop-ruby3_2 (3.0.8) rubocop-gradual (~> 0.3, >= 0.3.6) rubocop-md (~> 2.0, >= 2.0.4) rubocop-rake (~> 0.7, >= 0.7.1) rubocop-thread_safety (~> 0.7, >= 0.7.3) - standard-rubocop-lts (~> 2.0, >= 2.0.9) - version_gem (~> 1.1, >= 1.1.13) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) rubocop-thread_safety (0.7.3) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -461,7 +651,7 @@ GEM simplecov (>= 0.4.1) simplecov_lcov_formatter (0.9.0) simplecov (>= 0.18) - sorbet-runtime (0.6.13486) + sorbet-runtime (0.6.13490) standard (1.56.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) @@ -480,8 +670,8 @@ GEM rubocop-factory_bot (~> 2.27) rubocop-rspec (~> 3.9) rubocop-rspec_rails (~> 2.31) - standard-rubocop-lts (2.0.12) - rubocop-lts-ruby (~> 0.1, >= 0.1.0) + standard-rubocop-lts (2.0.13) + rubocop-lts-ruby (~> 0.1, >= 0.1.4) standard (~> 1.54, >= 1.54.0) standard-custom (~> 1.0, >= 1.0.2) standard-performance (~> 1.9, >= 1.9.0) @@ -501,18 +691,11 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -541,10 +724,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -582,26 +761,49 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) + ast-crispr! + ast-crispr-markdown-markly! + ast-crispr-ruby-prism! + ast-merge! + ast-merge-git! + ast-template! + bash-merge! benchmark (~> 0.5, >= 0.5.0) + binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) + citrus-toml-merge! commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) + go-merge! + html-merge! irb (~> 1.17) + json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) + kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) + kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -611,13 +813,20 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) + toml-merge! + tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) + yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -625,6 +834,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -637,10 +847,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) + ast-merge-git (7.1.8) + ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -678,18 +891,21 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d + go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 + html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 + kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 + kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f - kettle-rb (0.1.11) sha256=3e50b413048906f2c5aea69ff805fbf8f7f2b5ea9d9e3d95151d38d97d6640f3 + kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed @@ -700,7 +916,7 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.8) - markly (0.17.0) sha256=fab61b604f7c4c8f771c3b7f2f16b971034bb72ddd27009b90c3fae1990b17e6 + markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca markly-merge (7.1.8) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 @@ -717,6 +933,7 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 + parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -751,9 +968,9 @@ CHECKSUMS rubocop-env (0.1.0) sha256=5ab9a259e71822bf514c8e900a9b68cc2f74ccc87d5493efcd03213f3068e718 rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb rubocop-gradual (0.4.0) sha256=9c7e584e6fef6c2539266a193a4572c970c22f99046fd6b0305bdde6228f96ad - rubocop-lts (24.2.2) sha256=be6c745e1bb61daebd6af3cc3227c60f95be9f642a080773cad7df14c5f9f174 - rubocop-lts-rspec (1.0.5) sha256=439552fd27440802cc499889e013bffa28aadc41adae5d4dfff3d984a2a809b4 - rubocop-lts-ruby (0.1.3) sha256=fa002117b94c5eb403eb476d5fde393913dbcc4253b6151ed9a3393c73fd3916 + rubocop-lts (24.2.3) sha256=510ca38a90393c7c5cac0e0defa35151805797b1ff9a2d130b649c20c2ca0842 + rubocop-lts-rspec (1.0.6) sha256=b7f7dae919c9712dee09df76b027563e154f510d9b4423bb0453394b5474cf38 + rubocop-lts-ruby (0.1.4) sha256=eb0039d61d645d2b6754abd4006842945b7848a916a664f522f5e2f7a5a69bf1 rubocop-md (2.0.4) sha256=0d076b6b5e99dea2ddc928c4bd702497decb9a8400da7808091e02ebcafcfb93 rubocop-minitest (0.40.0) sha256=353c698199115f12151144cf0b5a96f69bb9d77b660cf6536df2c4250c672a9d rubocop-on-rbs (2.0.0) sha256=ce74d1b3d5daead19f4b611623656c185821dfc9aed9c7079bb1e5d7d7c464be @@ -763,12 +980,13 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-rspec-extra (0.3.0) sha256=ee4b6484d0332a0d23c4a465eeb607e41888eb3d4ed479f850b9f5212514f787 rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 - rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 + rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 ruby-merge (7.1.8) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 + rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -776,12 +994,13 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f + smorg-rb (7.1.8) + sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2 standard-rspec (0.5.0) sha256=64d396524a65af47f5331b423d8cdd313e0267401647bb7892489ca89dad2973 - standard-rubocop-lts (2.0.12) sha256=4b55efc56691d4edef197df8df27ffebdb4a273e26d7bf00799d00ac6a71532f + standard-rubocop-lts (2.0.13) sha256=acc0f7e73db0215a50b5e2df01fbf1b6bbcc68bb128f429f970db3fdd62a8243 stone_checksums (1.0.8) sha256=91c5453d6c67c468653bf5396a33936c85d7731077be756ed0ff7eb78f981117 stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1 strings-ansi (0.2.0) sha256=90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88 @@ -791,6 +1010,7 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -803,6 +1023,7 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 + typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -816,6 +1037,7 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 + zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 87105f56fe2dc687e2e207a9e42c6b97e7f41a85 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:45:18 -0400 Subject: [PATCH 040/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kramdown-merge/Gemfile.lock | 508 ++++++++++++++++++++++--------- 1 file changed, 365 insertions(+), 143 deletions(-) diff --git a/gems/kramdown-merge/Gemfile.lock b/gems/kramdown-merge/Gemfile.lock index 1486a6af6..4301768e7 100644 --- a/gems/kramdown-merge/Gemfile.lock +++ b/gems/kramdown-merge/Gemfile.lock @@ -15,46 +15,314 @@ PATH markdown-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -GEM - remote: https://gem.coop/ +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - backports (3.25.3) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.8) + ast-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge + specs: + html-merge (7.1.8) + ast-crispr (= 7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.8) + toml (~> 0.3) + toml-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.8) + ast-merge (= 7.1.8) + ast-merge-git (= 7.1.8) + bash-merge (= 7.1.8) + diff-lcs (~> 1.5) + dotenv-merge (= 7.1.8) + go-merge (= 7.1.8) + html-merge (= 7.1.8) + json-merge (= 7.1.8) + kettle-jem (~> 7.1, >= 7.1.18) + markdown-merge (= 7.1.8) + plain-merge (= 7.1.8) + prism-merge (= 7.1.8) + psych-merge (= 7.1.8) + rbs-merge (= 7.1.8) + rust-merge (= 7.1.8) + toml-merge (= 7.1.8) + typescript-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.8) + binary-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +GEM + remote: https://gem.coop/ + specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -62,11 +330,6 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -79,10 +342,6 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -96,11 +355,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -150,27 +404,25 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) version_gem (~> 1.1, >= 1.1.15) - kettle-dev (3.0.33) + kettle-dev (3.0.34) emoji_regex (>= 15.0) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.15) - kettle-rb (~> 0.1, >= 0.1.11) + kettle-rb (~> 0.1, >= 0.1.12) kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-family (1.2.97) + kettle-drift (1.0.13) + version_gem (~> 1.1, >= 1.1.15) + kettle-family (1.2.100) command_kit (~> 0.6) command_kit-completion (~> 0.1) kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.33) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-jem (~> 7.1, >= 7.1.23) kettle-test (~> 2.0, >= 2.0.21) @@ -182,39 +434,9 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) - kettle-rb (0.1.11) + kettle-rb (0.1.12) kettle-soup-cover (3.0.10) kettle-wash (~> 0.1, >= 0.1.6) simplecov (>= 1.0) @@ -242,15 +464,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - markly (0.17.0) - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) + markly (0.19.0) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -278,28 +492,13 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -308,11 +507,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -379,11 +573,11 @@ GEM parallel (~> 1.10) rainbow (>= 2.2.2, < 4.0) rubocop (~> 1.0) - rubocop-lts (24.2.2) - rubocop-ruby3_2 (~> 3.0, >= 3.0.1) - standard-rubocop-lts (~> 2.0, >= 2.0.3) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-rspec (1.0.5) + rubocop-lts (24.2.3) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-rspec (1.0.6) rubocop (~> 1.84, >= 1.84.2) rubocop-env (~> 0.1, >= 0.1.0) rubocop-factory_bot (~> 2.28, >= 2.28.0) @@ -391,8 +585,8 @@ GEM rubocop-rspec-extra (~> 0.3, >= 0.3.0) standard (~> 1.54, >= 1.54.0) standard-rspec (~> 0.5, >= 0.5.0) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-ruby (0.1.3) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-ruby (0.1.4) lint_roller (~> 1.1) rubocop (>= 1.72.1, < 2.0) version_gem (~> 1.1, >= 1.1.15) @@ -426,21 +620,17 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-rspec (~> 3.5) - rubocop-ruby3_2 (3.0.7) + rubocop-ruby3_2 (3.0.8) rubocop-gradual (~> 0.3, >= 0.3.6) rubocop-md (~> 2.0, >= 2.0.4) rubocop-rake (~> 0.7, >= 0.7.1) rubocop-thread_safety (~> 0.7, >= 0.7.3) - standard-rubocop-lts (~> 2.0, >= 2.0.9) - version_gem (~> 1.1, >= 1.1.13) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) rubocop-thread_safety (0.7.3) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -461,7 +651,7 @@ GEM simplecov (>= 0.4.1) simplecov_lcov_formatter (0.9.0) simplecov (>= 0.18) - sorbet-runtime (0.6.13486) + sorbet-runtime (0.6.13490) standard (1.56.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) @@ -480,8 +670,8 @@ GEM rubocop-factory_bot (~> 2.27) rubocop-rspec (~> 3.9) rubocop-rspec_rails (~> 2.31) - standard-rubocop-lts (2.0.12) - rubocop-lts-ruby (~> 0.1, >= 0.1.0) + standard-rubocop-lts (2.0.13) + rubocop-lts-ruby (~> 0.1, >= 0.1.4) standard (~> 1.54, >= 1.54.0) standard-custom (~> 1.0, >= 1.0.2) standard-performance (~> 1.9, >= 1.9.0) @@ -501,18 +691,11 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -541,10 +724,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -582,25 +761,48 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) + ast-crispr! + ast-crispr-markdown-markly! + ast-crispr-ruby-prism! + ast-merge! + ast-merge-git! + ast-template! + bash-merge! benchmark (~> 0.5, >= 0.5.0) + binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) + go-merge! + html-merge! irb (~> 1.17) + json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) + kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) + kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -610,13 +812,20 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) + toml-merge! + tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) + yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -624,6 +833,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -636,10 +846,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) + ast-merge-git (7.1.8) + ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -677,18 +890,21 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d + go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 + html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 + kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 + kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f - kettle-rb (0.1.11) sha256=3e50b413048906f2c5aea69ff805fbf8f7f2b5ea9d9e3d95151d38d97d6640f3 + kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed @@ -699,7 +915,7 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.8) - markly (0.17.0) sha256=fab61b604f7c4c8f771c3b7f2f16b971034bb72ddd27009b90c3fae1990b17e6 + markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca markly-merge (7.1.8) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 @@ -716,6 +932,7 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 + parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -750,9 +967,9 @@ CHECKSUMS rubocop-env (0.1.0) sha256=5ab9a259e71822bf514c8e900a9b68cc2f74ccc87d5493efcd03213f3068e718 rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb rubocop-gradual (0.4.0) sha256=9c7e584e6fef6c2539266a193a4572c970c22f99046fd6b0305bdde6228f96ad - rubocop-lts (24.2.2) sha256=be6c745e1bb61daebd6af3cc3227c60f95be9f642a080773cad7df14c5f9f174 - rubocop-lts-rspec (1.0.5) sha256=439552fd27440802cc499889e013bffa28aadc41adae5d4dfff3d984a2a809b4 - rubocop-lts-ruby (0.1.3) sha256=fa002117b94c5eb403eb476d5fde393913dbcc4253b6151ed9a3393c73fd3916 + rubocop-lts (24.2.3) sha256=510ca38a90393c7c5cac0e0defa35151805797b1ff9a2d130b649c20c2ca0842 + rubocop-lts-rspec (1.0.6) sha256=b7f7dae919c9712dee09df76b027563e154f510d9b4423bb0453394b5474cf38 + rubocop-lts-ruby (0.1.4) sha256=eb0039d61d645d2b6754abd4006842945b7848a916a664f522f5e2f7a5a69bf1 rubocop-md (2.0.4) sha256=0d076b6b5e99dea2ddc928c4bd702497decb9a8400da7808091e02ebcafcfb93 rubocop-minitest (0.40.0) sha256=353c698199115f12151144cf0b5a96f69bb9d77b660cf6536df2c4250c672a9d rubocop-on-rbs (2.0.0) sha256=ce74d1b3d5daead19f4b611623656c185821dfc9aed9c7079bb1e5d7d7c464be @@ -762,12 +979,13 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-rspec-extra (0.3.0) sha256=ee4b6484d0332a0d23c4a465eeb607e41888eb3d4ed479f850b9f5212514f787 rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 - rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 + rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 ruby-merge (7.1.8) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 + rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -775,12 +993,13 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f + smorg-rb (7.1.8) + sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2 standard-rspec (0.5.0) sha256=64d396524a65af47f5331b423d8cdd313e0267401647bb7892489ca89dad2973 - standard-rubocop-lts (2.0.12) sha256=4b55efc56691d4edef197df8df27ffebdb4a273e26d7bf00799d00ac6a71532f + standard-rubocop-lts (2.0.13) sha256=acc0f7e73db0215a50b5e2df01fbf1b6bbcc68bb128f429f970db3fdd62a8243 stone_checksums (1.0.8) sha256=91c5453d6c67c468653bf5396a33936c85d7731077be756ed0ff7eb78f981117 stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1 strings-ansi (0.2.0) sha256=90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88 @@ -790,6 +1009,7 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -802,6 +1022,7 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 + typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -815,6 +1036,7 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 + zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From b882d5147abacb6f9a001f99d14a45f21a1c3304 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:45:21 -0400 Subject: [PATCH 041/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kettle-jem/Gemfile.lock | 223 ++++++++++++++++++++++++++--------- 1 file changed, 170 insertions(+), 53 deletions(-) diff --git a/gems/kettle-jem/Gemfile.lock b/gems/kettle-jem/Gemfile.lock index 9635c6292..7f8bdda1a 100644 --- a/gems/kettle-jem/Gemfile.lock +++ b/gems/kettle-jem/Gemfile.lock @@ -42,7 +42,7 @@ PATH yaml-merge (~> 7.1, >= 7.1.8) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) @@ -51,7 +51,7 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) @@ -59,7 +59,7 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: ast-crispr (7.1.8) ast-merge (= 7.1.8) @@ -67,7 +67,15 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.8) benchmark @@ -76,7 +84,14 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.8) + ast-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: bash-merge (7.1.8) ast-merge (= 7.1.8) @@ -84,7 +99,15 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: citrus-toml-merge (7.1.8) ast-merge (= 7.1.8) @@ -93,7 +116,7 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge specs: commonmarker-merge (7.1.8) commonmarker (~> 2.2) @@ -101,7 +124,7 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge specs: dotenv-merge (7.1.8) ast-merge (= 7.1.8) @@ -110,7 +133,24 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge + specs: + html-merge (7.1.8) + ast-crispr (= 7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: json-merge (7.1.8) ast-merge (= 7.1.8) @@ -118,7 +158,7 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge specs: kramdown-merge (7.1.8) kramdown (~> 2.5) @@ -126,7 +166,7 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: markdown-merge (7.1.8) ast-merge (= 7.1.8) @@ -134,7 +174,7 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: markly-merge (7.1.8) markdown-merge (= 7.1.8) @@ -142,7 +182,15 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.8) + toml (~> 0.3) + toml-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: plain-merge (7.1.8) ast-merge (= 7.1.8) @@ -150,7 +198,7 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: prism-merge (7.1.8) ast-merge (= 7.1.8) @@ -160,7 +208,7 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge specs: psych-merge (7.1.8) ast-merge (= 7.1.8) @@ -169,7 +217,7 @@ PATH yaml-merge (= 7.1.8) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge specs: rbs-merge (7.1.8) ast-merge (= 7.1.8) @@ -178,7 +226,7 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: ruby-merge (7.1.8) ast-merge (= 7.1.8) @@ -186,7 +234,38 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.8) + ast-merge (= 7.1.8) + ast-merge-git (= 7.1.8) + bash-merge (= 7.1.8) + diff-lcs (~> 1.5) + dotenv-merge (= 7.1.8) + go-merge (= 7.1.8) + html-merge (= 7.1.8) + json-merge (= 7.1.8) + kettle-jem (~> 7.1, >= 7.1.18) + markdown-merge (= 7.1.8) + plain-merge (= 7.1.8) + prism-merge (= 7.1.8) + psych-merge (= 7.1.8) + rbs-merge (= 7.1.8) + rust-merge (= 7.1.8) + toml-merge (= 7.1.8) + typescript-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: toml-merge (7.1.8) ast-merge (= 7.1.8) @@ -194,7 +273,7 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.8) citrus (~> 3.0) @@ -203,13 +282,29 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: yaml-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.8) + binary-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + GEM remote: https://gem.coop/ specs: @@ -313,21 +408,21 @@ GEM ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) version_gem (~> 1.1, >= 1.1.15) - kettle-dev (3.0.33) + kettle-dev (3.0.34) emoji_regex (>= 15.0) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.15) - kettle-rb (~> 0.1, >= 0.1.11) + kettle-rb (~> 0.1, >= 0.1.12) kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) kettle-drift (1.0.13) version_gem (~> 1.1, >= 1.1.15) - kettle-family (1.2.97) + kettle-family (1.2.100) command_kit (~> 0.6) command_kit-completion (~> 0.1) kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.33) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-jem (~> 7.1, >= 7.1.23) kettle-test (~> 2.0, >= 2.0.21) @@ -341,7 +436,7 @@ GEM version_gem (~> 1.1, >= 1.1.15) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) - kettle-rb (0.1.11) + kettle-rb (0.1.12) kettle-soup-cover (3.0.10) kettle-wash (~> 0.1, >= 0.1.6) simplecov (>= 1.0) @@ -369,7 +464,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.17.0) + markly (0.19.0) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -478,11 +573,11 @@ GEM parallel (~> 1.10) rainbow (>= 2.2.2, < 4.0) rubocop (~> 1.0) - rubocop-lts (24.2.2) - rubocop-ruby3_2 (~> 3.0, >= 3.0.1) - standard-rubocop-lts (~> 2.0, >= 2.0.3) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-rspec (1.0.5) + rubocop-lts (24.2.3) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-rspec (1.0.6) rubocop (~> 1.84, >= 1.84.2) rubocop-env (~> 0.1, >= 0.1.0) rubocop-factory_bot (~> 2.28, >= 2.28.0) @@ -490,8 +585,8 @@ GEM rubocop-rspec-extra (~> 0.3, >= 0.3.0) standard (~> 1.54, >= 1.54.0) standard-rspec (~> 0.5, >= 0.5.0) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-ruby (0.1.3) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-ruby (0.1.4) lint_roller (~> 1.1) rubocop (>= 1.72.1, < 2.0) version_gem (~> 1.1, >= 1.1.15) @@ -525,13 +620,13 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-rspec (~> 3.5) - rubocop-ruby3_2 (3.0.7) + rubocop-ruby3_2 (3.0.8) rubocop-gradual (~> 0.3, >= 0.3.6) rubocop-md (~> 2.0, >= 2.0.4) rubocop-rake (~> 0.7, >= 0.7.1) rubocop-thread_safety (~> 0.7, >= 0.7.3) - standard-rubocop-lts (~> 2.0, >= 2.0.9) - version_gem (~> 1.1, >= 1.1.13) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) rubocop-thread_safety (0.7.3) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) @@ -556,7 +651,7 @@ GEM simplecov (>= 0.4.1) simplecov_lcov_formatter (0.9.0) simplecov (>= 0.18) - sorbet-runtime (0.6.13486) + sorbet-runtime (0.6.13490) standard (1.56.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) @@ -575,8 +670,8 @@ GEM rubocop-factory_bot (~> 2.27) rubocop-rspec (~> 3.9) rubocop-rspec_rails (~> 2.31) - standard-rubocop-lts (2.0.12) - rubocop-lts-ruby (~> 0.1, >= 0.1.0) + standard-rubocop-lts (2.0.13) + rubocop-lts-ruby (~> 0.1, >= 0.1.4) standard (~> 1.54, >= 1.54.0) standard-custom (~> 1.0, >= 1.0.2) standard-performance (~> 1.9, >= 1.9.0) @@ -596,6 +691,8 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) @@ -667,8 +764,11 @@ DEPENDENCIES ast-crispr-markdown-markly! ast-crispr-ruby-prism! ast-merge! + ast-merge-git! + ast-template! bash-merge! benchmark (~> 0.5, >= 0.5.0) + binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) citrus-toml-merge! @@ -678,6 +778,8 @@ DEPENDENCIES erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) + go-merge! + html-merge! irb (~> 1.17) json (~> 2.0, >= 2.21.2) json-merge! @@ -693,6 +795,7 @@ DEPENDENCIES markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) + parslet-toml-merge! plain-merge! prism-merge! psych-merge! @@ -709,13 +812,15 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0, >= 3.0.6) ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) toml-merge! tree_haver! - tree_sitter_language_pack (~> 1.16, >= 1.16.2) turbo_tests2 (~> 3.2, >= 3.2.7) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) yaml-merge! @@ -726,6 +831,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -738,10 +844,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.8) ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) + ast-merge-git (7.1.8) + ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -779,20 +888,22 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d + go-merge (7.1.8) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 + html-merge (7.1.8) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) - kettle-changelog (1.0.7) - kettle-dev (3.0.33) - kettle-drift (1.0.13) - kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 + kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff + kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 + kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f - kettle-rb (0.1.11) sha256=3e50b413048906f2c5aea69ff805fbf8f7f2b5ea9d9e3d95151d38d97d6640f3 - kettle-soup-cover (3.0.10) + kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 + kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa @@ -802,7 +913,7 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.8) - markly (0.17.0) sha256=fab61b604f7c4c8f771c3b7f2f16b971034bb72ddd27009b90c3fae1990b17e6 + markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca markly-merge (7.1.8) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 @@ -819,6 +930,7 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 + parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -853,9 +965,9 @@ CHECKSUMS rubocop-env (0.1.0) sha256=5ab9a259e71822bf514c8e900a9b68cc2f74ccc87d5493efcd03213f3068e718 rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb rubocop-gradual (0.4.0) sha256=9c7e584e6fef6c2539266a193a4572c970c22f99046fd6b0305bdde6228f96ad - rubocop-lts (24.2.2) sha256=be6c745e1bb61daebd6af3cc3227c60f95be9f642a080773cad7df14c5f9f174 - rubocop-lts-rspec (1.0.5) sha256=439552fd27440802cc499889e013bffa28aadc41adae5d4dfff3d984a2a809b4 - rubocop-lts-ruby (0.1.3) sha256=fa002117b94c5eb403eb476d5fde393913dbcc4253b6151ed9a3393c73fd3916 + rubocop-lts (24.2.3) sha256=510ca38a90393c7c5cac0e0defa35151805797b1ff9a2d130b649c20c2ca0842 + rubocop-lts-rspec (1.0.6) sha256=b7f7dae919c9712dee09df76b027563e154f510d9b4423bb0453394b5474cf38 + rubocop-lts-ruby (0.1.4) sha256=eb0039d61d645d2b6754abd4006842945b7848a916a664f522f5e2f7a5a69bf1 rubocop-md (2.0.4) sha256=0d076b6b5e99dea2ddc928c4bd702497decb9a8400da7808091e02ebcafcfb93 rubocop-minitest (0.40.0) sha256=353c698199115f12151144cf0b5a96f69bb9d77b660cf6536df2c4250c672a9d rubocop-on-rbs (2.0.0) sha256=ce74d1b3d5daead19f4b611623656c185821dfc9aed9c7079bb1e5d7d7c464be @@ -865,12 +977,13 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-rspec-extra (0.3.0) sha256=ee4b6484d0332a0d23c4a465eeb607e41888eb3d4ed479f850b9f5212514f787 rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 - rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 + rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 ruby-merge (7.1.8) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 + rust-merge (7.1.8) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -878,12 +991,13 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f + smorg-rb (7.1.8) + sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2 standard-rspec (0.5.0) sha256=64d396524a65af47f5331b423d8cdd313e0267401647bb7892489ca89dad2973 - standard-rubocop-lts (2.0.12) sha256=4b55efc56691d4edef197df8df27ffebdb4a273e26d7bf00799d00ac6a71532f + standard-rubocop-lts (2.0.13) sha256=acc0f7e73db0215a50b5e2df01fbf1b6bbcc68bb128f429f970db3fdd62a8243 stone_checksums (1.0.8) sha256=91c5453d6c67c468653bf5396a33936c85d7731077be756ed0ff7eb78f981117 stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1 strings-ansi (0.2.0) sha256=90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88 @@ -893,6 +1007,7 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -905,6 +1020,7 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 + typescript-merge (7.1.8) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -918,6 +1034,7 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 + zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 716d44f78c4b46c3e1c4e6422d5e825a071b04f3 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:45:23 -0400 Subject: [PATCH 042/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/smorg-rb/Gemfile.lock | 508 +++++++++++++++++++++++++------------ 1 file changed, 342 insertions(+), 166 deletions(-) diff --git a/gems/smorg-rb/Gemfile.lock b/gems/smorg-rb/Gemfile.lock index 95e0492fd..036fbe7c5 100644 --- a/gems/smorg-rb/Gemfile.lock +++ b/gems/smorg-rb/Gemfile.lock @@ -30,50 +30,299 @@ PATH typescript-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) -GEM - remote: https://gem.coop/ +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - ast-crispr (7.1.8) - ast-merge (= 7.1.8) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.8) ast-crispr (= 7.1.8) markdown-merge (= 7.1.8) markly-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: ast-crispr-ruby-prism (7.1.8) ast-crispr (= 7.1.8) prism-merge (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.8) + ast-merge (= 7.1.8) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: ast-merge (7.1.8) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - ast-merge-git (7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.8) ast-merge (= 7.1.8) - tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) - backports (3.25.3) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: bash-merge (7.1.8) ast-merge (= 7.1.8) tree_haver (= 7.1.8) version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.8) + ast-merge (= 7.1.8) + toml-merge (= 7.1.8) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.8) + commonmarker (~> 2.2) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.8) + ast-merge (= 7.1.8) + plain-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge + specs: + html-merge (7.1.8) + ast-crispr (= 7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.8) + kramdown (~> 2.5) + markdown-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.8) + markdown-merge (= 7.1.8) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.8) + toml (~> 0.3) + toml-merge (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.8) + ast-merge (= 7.1.8) + prism (~> 1.6) + ruby-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.8) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.8) + ast-merge (= 7.1.8) + rbs (>= 3.10) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.8) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.8) + ast-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.8) + binary-merge (= 7.1.8) + tree_haver (= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + +GEM + remote: https://gem.coop/ + specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -81,11 +330,6 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) @@ -98,10 +342,6 @@ GEM commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) - commonmarker-merge (7.1.8) - commonmarker (~> 2.2) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -115,11 +355,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -157,20 +392,11 @@ GEM geom2d (0.4.1) gitmoji-regex (2.0.12) version_gem (~> 1.1, >= 1.1.15) - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) hexapdf (1.10.0) cmdparse (~> 3.0, >= 3.0.3) geom2d (~> 0.4, >= 0.4.1) openssl (>= 2.2.1) strscan (>= 3.1.2) - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) io-console (0.9.2) irb (1.18.0) pp (>= 0.6.0) @@ -178,27 +404,25 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) version_gem (~> 1.1, >= 1.1.15) - kettle-dev (3.0.33) + kettle-dev (3.0.34) emoji_regex (>= 15.0) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.15) - kettle-rb (~> 0.1, >= 0.1.11) + kettle-rb (~> 0.1, >= 0.1.12) kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-family (1.2.97) + kettle-drift (1.0.13) + version_gem (~> 1.1, >= 1.1.15) + kettle-family (1.2.100) command_kit (~> 0.6) command_kit-completion (~> 0.1) kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.33) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-jem (~> 7.1, >= 7.1.23) kettle-test (~> 2.0, >= 2.0.21) @@ -210,39 +434,9 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) - kettle-jem (7.1.25) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) - kettle-rb (0.1.11) + kettle-rb (0.1.12) kettle-soup-cover (3.0.10) kettle-wash (~> 0.1, >= 0.1.6) simplecov (>= 1.0) @@ -265,24 +459,12 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.8) - kramdown (~> 2.5) - markdown-merge (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - markly (0.17.0) - markly-merge (7.1.8) - markdown-merge (= 7.1.8) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) + markly (0.19.0) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) @@ -310,28 +492,13 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.8) - ast-merge (= 7.1.8) - prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -340,11 +507,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.8) - ast-merge (= 7.1.8) - rbs (>= 3.10) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -411,11 +573,11 @@ GEM parallel (~> 1.10) rainbow (>= 2.2.2, < 4.0) rubocop (~> 1.0) - rubocop-lts (24.2.2) - rubocop-ruby3_2 (~> 3.0, >= 3.0.1) - standard-rubocop-lts (~> 2.0, >= 2.0.3) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-rspec (1.0.5) + rubocop-lts (24.2.3) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-rspec (1.0.6) rubocop (~> 1.84, >= 1.84.2) rubocop-env (~> 0.1, >= 0.1.0) rubocop-factory_bot (~> 2.28, >= 2.28.0) @@ -423,8 +585,8 @@ GEM rubocop-rspec-extra (~> 0.3, >= 0.3.0) standard (~> 1.54, >= 1.54.0) standard-rspec (~> 0.5, >= 0.5.0) - version_gem (~> 1.1, >= 1.1.13) - rubocop-lts-ruby (0.1.3) + version_gem (~> 1.1, >= 1.1.15) + rubocop-lts-ruby (0.1.4) lint_roller (~> 1.1) rubocop (>= 1.72.1, < 2.0) version_gem (~> 1.1, >= 1.1.15) @@ -458,28 +620,20 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-rspec (~> 3.5) - rubocop-ruby3_2 (3.0.7) + rubocop-ruby3_2 (3.0.8) rubocop-gradual (~> 0.3, >= 0.3.6) rubocop-md (~> 2.0, >= 2.0.4) rubocop-rake (~> 0.7, >= 0.7.1) rubocop-thread_safety (~> 0.7, >= 0.7.3) - standard-rubocop-lts (~> 2.0, >= 2.0.9) - version_gem (~> 1.1, >= 1.1.13) + standard-rubocop-lts (~> 2.0, >= 2.0.13) + version_gem (~> 1.1, >= 1.1.15) rubocop-thread_safety (0.7.3) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) service_actor (3.9.4) zeitwerk (>= 1.0) silent_stream (1.0.12) @@ -497,7 +651,7 @@ GEM simplecov (>= 0.4.1) simplecov_lcov_formatter (0.9.0) simplecov (>= 0.18) - sorbet-runtime (0.6.13486) + sorbet-runtime (0.6.13490) standard (1.56.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) @@ -516,8 +670,8 @@ GEM rubocop-factory_bot (~> 2.27) rubocop-rspec (~> 3.9) rubocop-rspec_rails (~> 2.31) - standard-rubocop-lts (2.0.12) - rubocop-lts-ruby (~> 0.1, >= 0.1.0) + standard-rubocop-lts (2.0.13) + rubocop-lts-ruby (~> 0.1, >= 0.1.4) standard (~> 1.54, >= 1.54.0) standard-custom (~> 1.0, >= 1.0.2) standard-performance (~> 1.9, >= 1.9.0) @@ -537,18 +691,11 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.8) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -569,10 +716,6 @@ GEM parallel_tests (>= 3.3.0, < 6) rspec (>= 3.10) version_gem (~> 1.1, >= 1.1.15) - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) unicode-display_width (2.6.0) version_gem (1.1.15) webrick (1.9.2) @@ -581,10 +724,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -623,25 +762,49 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) + ast-crispr! + ast-crispr-markdown-markly! + ast-crispr-ruby-prism! + ast-merge! + ast-merge-git! + ast-template! + bash-merge! benchmark (~> 0.5, >= 0.5.0) + binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) + go-merge! + html-merge! irb (~> 1.17) + json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.31) + kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) + kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -651,14 +814,20 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) + toml-merge! + tree_haver! turbo_tests2 (~> 3.2, >= 3.2.7) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) + yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -666,6 +835,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -679,10 +849,12 @@ CHECKSUMS ast-crispr-ruby-prism (7.1.8) ast-merge (7.1.8) ast-merge-git (7.1.8) + ast-template (7.1.8) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.8) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.8) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb @@ -728,12 +900,13 @@ CHECKSUMS json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.8) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.33) sha256=973ecd9c4729b857a83e1c3541ae64e86dac888eadc1fb696df6744b5acf668f - kettle-family (1.2.97) sha256=3145aefa33178089a5fafadd1099a361ba1f4c65e2808a519243a8fbf8eb1c25 + kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 + kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.25) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f - kettle-rb (0.1.11) sha256=3e50b413048906f2c5aea69ff805fbf8f7f2b5ea9d9e3d95151d38d97d6640f3 + kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed @@ -744,7 +917,7 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.8) - markly (0.17.0) sha256=fab61b604f7c4c8f771c3b7f2f16b971034bb72ddd27009b90c3fae1990b17e6 + markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca markly-merge (7.1.8) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 @@ -761,6 +934,7 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 + parslet-toml-merge (7.1.8) plain-merge (7.1.8) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -795,9 +969,9 @@ CHECKSUMS rubocop-env (0.1.0) sha256=5ab9a259e71822bf514c8e900a9b68cc2f74ccc87d5493efcd03213f3068e718 rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb rubocop-gradual (0.4.0) sha256=9c7e584e6fef6c2539266a193a4572c970c22f99046fd6b0305bdde6228f96ad - rubocop-lts (24.2.2) sha256=be6c745e1bb61daebd6af3cc3227c60f95be9f642a080773cad7df14c5f9f174 - rubocop-lts-rspec (1.0.5) sha256=439552fd27440802cc499889e013bffa28aadc41adae5d4dfff3d984a2a809b4 - rubocop-lts-ruby (0.1.3) sha256=fa002117b94c5eb403eb476d5fde393913dbcc4253b6151ed9a3393c73fd3916 + rubocop-lts (24.2.3) sha256=510ca38a90393c7c5cac0e0defa35151805797b1ff9a2d130b649c20c2ca0842 + rubocop-lts-rspec (1.0.6) sha256=b7f7dae919c9712dee09df76b027563e154f510d9b4423bb0453394b5474cf38 + rubocop-lts-ruby (0.1.4) sha256=eb0039d61d645d2b6754abd4006842945b7848a916a664f522f5e2f7a5a69bf1 rubocop-md (2.0.4) sha256=0d076b6b5e99dea2ddc928c4bd702497decb9a8400da7808091e02ebcafcfb93 rubocop-minitest (0.40.0) sha256=353c698199115f12151144cf0b5a96f69bb9d77b660cf6536df2c4250c672a9d rubocop-on-rbs (2.0.0) sha256=ce74d1b3d5daead19f4b611623656c185821dfc9aed9c7079bb1e5d7d7c464be @@ -807,7 +981,7 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-rspec-extra (0.3.0) sha256=ee4b6484d0332a0d23c4a465eeb607e41888eb3d4ed479f850b9f5212514f787 rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 - rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 + rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 ruby-merge (7.1.8) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 @@ -822,12 +996,12 @@ CHECKSUMS simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.8) - sorbet-runtime (0.6.13486) sha256=5bf87f227b38c87fecc8be6d3a2e5a5a21d06c2a5136e78f73ac22c95ce7274f + sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2 standard-rspec (0.5.0) sha256=64d396524a65af47f5331b423d8cdd313e0267401647bb7892489ca89dad2973 - standard-rubocop-lts (2.0.12) sha256=4b55efc56691d4edef197df8df27ffebdb4a273e26d7bf00799d00ac6a71532f + standard-rubocop-lts (2.0.13) sha256=acc0f7e73db0215a50b5e2df01fbf1b6bbcc68bb128f429f970db3fdd62a8243 stone_checksums (1.0.8) sha256=91c5453d6c67c468653bf5396a33936c85d7731077be756ed0ff7eb78f981117 stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1 strings-ansi (0.2.0) sha256=90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88 @@ -837,6 +1011,7 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.8) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.8) @@ -863,6 +1038,7 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 + zip-merge (7.1.8) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From dc49e0d518522cc018c6206430d3ecc9b902b6ec Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:56:02 -0400 Subject: [PATCH 043/137] =?UTF-8?q?=F0=9F=94=96=20Bump=20gem=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/tree_haver/lib/tree_haver/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/tree_haver/lib/tree_haver/version.rb b/gems/tree_haver/lib/tree_haver/version.rb index 198fd5fdf..8d7ced5b9 100644 --- a/gems/tree_haver/lib/tree_haver/version.rb +++ b/gems/tree_haver/lib/tree_haver/version.rb @@ -4,7 +4,7 @@ module TreeHaver # Version namespace for this gem. module Version # Current gem version. - VERSION = '7.1.8' + VERSION = '7.1.9' end # Current gem version exposed at the traditional constant location. VERSION = Version::VERSION # Traditional Constant Location From a0832334c11605ba6cf55b049642b13bb907254a Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:56:02 -0400 Subject: [PATCH 044/137] =?UTF-8?q?=F0=9F=94=96=20Bump=20gem=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge/lib/ast/merge/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/ast-merge/lib/ast/merge/version.rb b/gems/ast-merge/lib/ast/merge/version.rb index a6c6929ed..ce876ec25 100644 --- a/gems/ast-merge/lib/ast/merge/version.rb +++ b/gems/ast-merge/lib/ast/merge/version.rb @@ -5,7 +5,7 @@ module Merge # Version namespace for this gem. module Version # Current gem version. - VERSION = '7.1.8' + VERSION = '7.1.9' end # Current gem version exposed at the traditional constant location. VERSION = Version::VERSION # Traditional Constant Location From c9d9847586d6c8519ff97031b880faff12969119 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:56:03 -0400 Subject: [PATCH 045/137] =?UTF-8?q?=F0=9F=94=96=20Bump=20gem=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr/lib/ast/crispr/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/ast-crispr/lib/ast/crispr/version.rb b/gems/ast-crispr/lib/ast/crispr/version.rb index 7118ce5a2..68e3946d8 100644 --- a/gems/ast-crispr/lib/ast/crispr/version.rb +++ b/gems/ast-crispr/lib/ast/crispr/version.rb @@ -5,7 +5,7 @@ module Crispr # Version namespace for this gem. module Version # Current gem version. - VERSION = '7.1.8' + VERSION = '7.1.9' end # Current gem version exposed at the traditional constant location. VERSION = Version::VERSION # Traditional Constant Location From 11f0c041d89084112df3b11e4f8a420542c091f0 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:56:03 -0400 Subject: [PATCH 046/137] =?UTF-8?q?=F0=9F=94=96=20Bump=20gem=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ruby-merge/lib/ruby/merge/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/ruby-merge/lib/ruby/merge/version.rb b/gems/ruby-merge/lib/ruby/merge/version.rb index 3d2153bfb..7a2d7e0e9 100644 --- a/gems/ruby-merge/lib/ruby/merge/version.rb +++ b/gems/ruby-merge/lib/ruby/merge/version.rb @@ -5,7 +5,7 @@ module Merge # Version namespace for this gem. module Version # Current gem version. - VERSION = '7.1.8' + VERSION = '7.1.9' end # Current gem version exposed at the traditional constant location. VERSION = Version::VERSION # Traditional Constant Location From 0e8f3cf0ddd223274a6b12a0b60c29f789f57518 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:56:03 -0400 Subject: [PATCH 047/137] =?UTF-8?q?=F0=9F=94=96=20Bump=20gem=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/prism-merge/lib/prism/merge/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/prism-merge/lib/prism/merge/version.rb b/gems/prism-merge/lib/prism/merge/version.rb index cf26cca2b..dc94706b6 100644 --- a/gems/prism-merge/lib/prism/merge/version.rb +++ b/gems/prism-merge/lib/prism/merge/version.rb @@ -5,7 +5,7 @@ module Merge # Version namespace for this gem. module Version # Current gem version. - VERSION = '7.1.8' + VERSION = '7.1.9' end # Current gem version exposed at the traditional constant location. VERSION = Version::VERSION # Traditional Constant Location From 65344066f6acfea8f3c4aceaa8bfa4987edf4297 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:56:03 -0400 Subject: [PATCH 048/137] =?UTF-8?q?=F0=9F=94=96=20Bump=20gem=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr-ruby-prism/lib/ast/crispr/ruby/prism/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/ast-crispr-ruby-prism/lib/ast/crispr/ruby/prism/version.rb b/gems/ast-crispr-ruby-prism/lib/ast/crispr/ruby/prism/version.rb index 86c5c282c..e73f34a43 100644 --- a/gems/ast-crispr-ruby-prism/lib/ast/crispr/ruby/prism/version.rb +++ b/gems/ast-crispr-ruby-prism/lib/ast/crispr/ruby/prism/version.rb @@ -7,7 +7,7 @@ module Prism # Version namespace for this gem. module Version # Current gem version. - VERSION = '7.1.8' + VERSION = '7.1.9' end # Current gem version exposed at the traditional constant location. VERSION = Version::VERSION # Traditional Constant Location From b1c861a22c63bf12ae5749eb999ae269413448ea Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:56:03 -0400 Subject: [PATCH 049/137] =?UTF-8?q?=F0=9F=94=96=20Bump=20gem=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/markdown-merge/lib/markdown/merge/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/markdown-merge/lib/markdown/merge/version.rb b/gems/markdown-merge/lib/markdown/merge/version.rb index 1f4494f93..9a8742419 100644 --- a/gems/markdown-merge/lib/markdown/merge/version.rb +++ b/gems/markdown-merge/lib/markdown/merge/version.rb @@ -5,7 +5,7 @@ module Merge # Version namespace for this gem. module Version # Current gem version. - VERSION = '7.1.8' + VERSION = '7.1.9' end # Current gem version exposed at the traditional constant location. VERSION = Version::VERSION # Traditional Constant Location From cc412a9589b4d5d90837f621f3d45d869afd4e41 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:56:04 -0400 Subject: [PATCH 050/137] =?UTF-8?q?=F0=9F=94=96=20Bump=20gem=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/markly-merge/lib/markly/merge/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/markly-merge/lib/markly/merge/version.rb b/gems/markly-merge/lib/markly/merge/version.rb index fcf2380c3..16a40521e 100644 --- a/gems/markly-merge/lib/markly/merge/version.rb +++ b/gems/markly-merge/lib/markly/merge/version.rb @@ -5,7 +5,7 @@ module Merge # Version namespace for this gem. module Version # Current gem version. - VERSION = '7.1.8' + VERSION = '7.1.9' end # Current gem version exposed at the traditional constant location. VERSION = Version::VERSION # Traditional Constant Location From e1913903b8a1bb2172fd27a4d66d6a3553945b46 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:56:04 -0400 Subject: [PATCH 051/137] =?UTF-8?q?=F0=9F=94=96=20Bump=20gem=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lib/ast/crispr/markdown/markly/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/ast-crispr-markdown-markly/lib/ast/crispr/markdown/markly/version.rb b/gems/ast-crispr-markdown-markly/lib/ast/crispr/markdown/markly/version.rb index 50deb159d..c681b73b7 100644 --- a/gems/ast-crispr-markdown-markly/lib/ast/crispr/markdown/markly/version.rb +++ b/gems/ast-crispr-markdown-markly/lib/ast/crispr/markdown/markly/version.rb @@ -7,7 +7,7 @@ module Markly # Version namespace for this gem. module Version # Current gem version. - VERSION = '7.1.8' + VERSION = '7.1.9' end # Current gem version exposed at the traditional constant location. VERSION = Version::VERSION # Traditional Constant Location From fe074b9017fbb8fc5f1360d18d1ed55c0149efe9 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:56:04 -0400 Subject: [PATCH 052/137] =?UTF-8?q?=F0=9F=94=96=20Bump=20gem=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge-git/lib/ast/merge/git/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/ast-merge-git/lib/ast/merge/git/version.rb b/gems/ast-merge-git/lib/ast/merge/git/version.rb index 5d08ba476..55051e6e0 100644 --- a/gems/ast-merge-git/lib/ast/merge/git/version.rb +++ b/gems/ast-merge-git/lib/ast/merge/git/version.rb @@ -6,7 +6,7 @@ module Git # Version namespace for this gem. module Version # Current gem version. - VERSION = '7.1.8' + VERSION = '7.1.9' end # Current gem version exposed at the traditional constant location. VERSION = Version::VERSION # Traditional Constant Location From d0b4f253f269ded0a954140fdcc4f31e12370aee Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:56:04 -0400 Subject: [PATCH 053/137] =?UTF-8?q?=F0=9F=94=96=20Bump=20gem=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/plain-merge/lib/plain/merge/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/plain-merge/lib/plain/merge/version.rb b/gems/plain-merge/lib/plain/merge/version.rb index 33f51de2b..f93b304c0 100644 --- a/gems/plain-merge/lib/plain/merge/version.rb +++ b/gems/plain-merge/lib/plain/merge/version.rb @@ -5,7 +5,7 @@ module Merge # Version namespace for this gem. module Version # Current gem version. - VERSION = '7.1.8' + VERSION = '7.1.9' end # Current gem version exposed at the traditional constant location. VERSION = Version::VERSION # Traditional Constant Location From 3b9550e19149f1287069605598a20203d981d78f Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:56:04 -0400 Subject: [PATCH 054/137] =?UTF-8?q?=F0=9F=94=96=20Bump=20gem=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/bash-merge/lib/bash/merge/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/bash-merge/lib/bash/merge/version.rb b/gems/bash-merge/lib/bash/merge/version.rb index 7ba65af99..0a281115d 100644 --- a/gems/bash-merge/lib/bash/merge/version.rb +++ b/gems/bash-merge/lib/bash/merge/version.rb @@ -5,7 +5,7 @@ module Merge # Version namespace for this gem. module Version # Current gem version. - VERSION = '7.1.8' + VERSION = '7.1.9' end # Current gem version exposed at the traditional constant location. VERSION = Version::VERSION # Traditional Constant Location From d89a2d0e9eddf3061c59dec9d69c4b71e268a132 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:56:05 -0400 Subject: [PATCH 055/137] =?UTF-8?q?=F0=9F=94=96=20Bump=20gem=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/dotenv-merge/lib/dotenv/merge/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/dotenv-merge/lib/dotenv/merge/version.rb b/gems/dotenv-merge/lib/dotenv/merge/version.rb index 86f7c1c79..967ee650f 100644 --- a/gems/dotenv-merge/lib/dotenv/merge/version.rb +++ b/gems/dotenv-merge/lib/dotenv/merge/version.rb @@ -5,7 +5,7 @@ module Merge # Version namespace for this gem. module Version # Current gem version. - VERSION = '7.1.8' + VERSION = '7.1.9' end # Current gem version exposed at the traditional constant location. VERSION = Version::VERSION # Traditional Constant Location From 795b2a94538ab9544015628028e5320e0ad35db9 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:56:05 -0400 Subject: [PATCH 056/137] =?UTF-8?q?=F0=9F=94=96=20Bump=20gem=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/rbs-merge/lib/rbs/merge/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/rbs-merge/lib/rbs/merge/version.rb b/gems/rbs-merge/lib/rbs/merge/version.rb index 45a068e36..e608494be 100644 --- a/gems/rbs-merge/lib/rbs/merge/version.rb +++ b/gems/rbs-merge/lib/rbs/merge/version.rb @@ -5,7 +5,7 @@ module Merge # Version namespace for this gem. module Version # Current gem version. - VERSION = '7.1.8' + VERSION = '7.1.9' end # Current gem version exposed at the traditional constant location. VERSION = Version::VERSION # Traditional Constant Location From 549c573ba9fd739e5c37512fbc93cc5457dab6b3 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:56:05 -0400 Subject: [PATCH 057/137] =?UTF-8?q?=F0=9F=94=96=20Bump=20gem=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/html-merge/lib/html/merge/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/html-merge/lib/html/merge/version.rb b/gems/html-merge/lib/html/merge/version.rb index fb586de46..7e4e9097a 100644 --- a/gems/html-merge/lib/html/merge/version.rb +++ b/gems/html-merge/lib/html/merge/version.rb @@ -5,7 +5,7 @@ module Merge # Version namespace for this gem. module Version # Current gem version. - VERSION = "7.1.8" + VERSION = "7.1.9" end # Current gem version exposed at the traditional constant location. VERSION = Version::VERSION # Traditional Constant Location From e950e77eca6ca37a15df2582c17204251685ab03 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:56:05 -0400 Subject: [PATCH 058/137] =?UTF-8?q?=F0=9F=94=96=20Bump=20gem=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/json-merge/lib/json/merge/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/json-merge/lib/json/merge/version.rb b/gems/json-merge/lib/json/merge/version.rb index 09f7c0c6c..9a4ed02d7 100644 --- a/gems/json-merge/lib/json/merge/version.rb +++ b/gems/json-merge/lib/json/merge/version.rb @@ -5,7 +5,7 @@ module Merge # Version namespace for this gem. module Version # Current gem version. - VERSION = '7.1.8' + VERSION = '7.1.9' end # Current gem version exposed at the traditional constant location. VERSION = Version::VERSION # Traditional Constant Location From 397c412f66e962279c0bf60ae652203252345563 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:56:05 -0400 Subject: [PATCH 059/137] =?UTF-8?q?=F0=9F=94=96=20Bump=20gem=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/yaml-merge/lib/yaml/merge/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/yaml-merge/lib/yaml/merge/version.rb b/gems/yaml-merge/lib/yaml/merge/version.rb index b72054fec..f089ffeba 100644 --- a/gems/yaml-merge/lib/yaml/merge/version.rb +++ b/gems/yaml-merge/lib/yaml/merge/version.rb @@ -5,7 +5,7 @@ module Merge # Version namespace for this gem. module Version # Current gem version. - VERSION = '7.1.8' + VERSION = '7.1.9' end # Current gem version exposed at the traditional constant location. VERSION = Version::VERSION # Traditional Constant Location From 1846b2a1357cd50fb893d34426edd025bbd07225 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:56:06 -0400 Subject: [PATCH 060/137] =?UTF-8?q?=F0=9F=94=96=20Bump=20gem=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/toml-merge/lib/toml/merge/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/toml-merge/lib/toml/merge/version.rb b/gems/toml-merge/lib/toml/merge/version.rb index 157831798..e298d949b 100644 --- a/gems/toml-merge/lib/toml/merge/version.rb +++ b/gems/toml-merge/lib/toml/merge/version.rb @@ -5,7 +5,7 @@ module Merge # Version namespace for this gem. module Version # Current gem version. - VERSION = '7.1.8' + VERSION = '7.1.9' end # Current gem version exposed at the traditional constant location. VERSION = Version::VERSION # Traditional Constant Location From 09b7ea5038c1f23306ad12d0be095082555f1fce Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:56:06 -0400 Subject: [PATCH 061/137] =?UTF-8?q?=F0=9F=94=96=20Bump=20gem=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/go-merge/lib/go/merge/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/go-merge/lib/go/merge/version.rb b/gems/go-merge/lib/go/merge/version.rb index e229c5d3b..4715bc383 100644 --- a/gems/go-merge/lib/go/merge/version.rb +++ b/gems/go-merge/lib/go/merge/version.rb @@ -5,7 +5,7 @@ module Merge # Version namespace for this gem. module Version # Current gem version. - VERSION = '7.1.8' + VERSION = '7.1.9' end # Current gem version exposed at the traditional constant location. VERSION = Version::VERSION # Traditional Constant Location From 3302581687a96fe6b44b038519d9a0bd61de3baa Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:56:06 -0400 Subject: [PATCH 062/137] =?UTF-8?q?=F0=9F=94=96=20Bump=20gem=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/rust-merge/lib/rust/merge/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/rust-merge/lib/rust/merge/version.rb b/gems/rust-merge/lib/rust/merge/version.rb index 5303268a3..e8396b5f0 100644 --- a/gems/rust-merge/lib/rust/merge/version.rb +++ b/gems/rust-merge/lib/rust/merge/version.rb @@ -5,7 +5,7 @@ module Merge # Version namespace for this gem. module Version # Current gem version. - VERSION = '7.1.8' + VERSION = '7.1.9' end # Current gem version exposed at the traditional constant location. VERSION = Version::VERSION # Traditional Constant Location From 06ca04520925b78da648401b57f41d11440057b1 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:56:06 -0400 Subject: [PATCH 063/137] =?UTF-8?q?=F0=9F=94=96=20Bump=20gem=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/typescript-merge/lib/typescript/merge/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/typescript-merge/lib/typescript/merge/version.rb b/gems/typescript-merge/lib/typescript/merge/version.rb index 87142f481..2f54cd9ea 100644 --- a/gems/typescript-merge/lib/typescript/merge/version.rb +++ b/gems/typescript-merge/lib/typescript/merge/version.rb @@ -5,7 +5,7 @@ module Merge # Version namespace for this gem. module Version # Current gem version. - VERSION = '7.1.8' + VERSION = '7.1.9' end # Current gem version exposed at the traditional constant location. VERSION = Version::VERSION # Traditional Constant Location From c1e72c84d4ed4922257dae2be93d5b35598e05fe Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:56:06 -0400 Subject: [PATCH 064/137] =?UTF-8?q?=F0=9F=94=96=20Bump=20gem=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-template/lib/ast/template/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/ast-template/lib/ast/template/version.rb b/gems/ast-template/lib/ast/template/version.rb index 861312cbe..762df2e7b 100644 --- a/gems/ast-template/lib/ast/template/version.rb +++ b/gems/ast-template/lib/ast/template/version.rb @@ -5,7 +5,7 @@ module Template # Version namespace for this gem. module Version # Current gem version. - VERSION = '7.1.8' + VERSION = '7.1.9' end # Current gem version exposed at the traditional constant location. VERSION = Version::VERSION # Traditional Constant Location From b12c3919e4a3e9923530ce17212ad7aa7ff894ba Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:56:07 -0400 Subject: [PATCH 065/137] =?UTF-8?q?=F0=9F=94=96=20Bump=20gem=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/binary-merge/lib/binary/merge/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/binary-merge/lib/binary/merge/version.rb b/gems/binary-merge/lib/binary/merge/version.rb index 60d27fa6e..1c05217c5 100644 --- a/gems/binary-merge/lib/binary/merge/version.rb +++ b/gems/binary-merge/lib/binary/merge/version.rb @@ -5,7 +5,7 @@ module Merge # Version namespace for this gem. module Version # Current gem version. - VERSION = '7.1.8' + VERSION = '7.1.9' end # Current gem version exposed at the traditional constant location. VERSION = Version::VERSION # Traditional Constant Location From 6317fe6437f69df4afe6991b7acddc9b7a960951 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:56:07 -0400 Subject: [PATCH 066/137] =?UTF-8?q?=F0=9F=94=96=20Bump=20gem=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/zip-merge/lib/zip/merge/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/zip-merge/lib/zip/merge/version.rb b/gems/zip-merge/lib/zip/merge/version.rb index 1a32ee7fe..1ce9d8bc3 100644 --- a/gems/zip-merge/lib/zip/merge/version.rb +++ b/gems/zip-merge/lib/zip/merge/version.rb @@ -5,7 +5,7 @@ module Merge # Version namespace for this gem. module Version # Current gem version. - VERSION = '7.1.8' + VERSION = '7.1.9' end # Current gem version exposed at the traditional constant location. VERSION = Version::VERSION # Traditional Constant Location From ea5a0a947adef75e2eb83dfdfa3dce7524d84c1c Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:56:07 -0400 Subject: [PATCH 067/137] =?UTF-8?q?=F0=9F=94=96=20Bump=20gem=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/psych-merge/lib/psych/merge/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/psych-merge/lib/psych/merge/version.rb b/gems/psych-merge/lib/psych/merge/version.rb index 9e5691f14..f8d956a15 100644 --- a/gems/psych-merge/lib/psych/merge/version.rb +++ b/gems/psych-merge/lib/psych/merge/version.rb @@ -5,7 +5,7 @@ module Merge # Version namespace for this gem. module Version # Current gem version. - VERSION = '7.1.8' + VERSION = '7.1.9' end # Current gem version exposed at the traditional constant location. VERSION = Version::VERSION # Traditional Constant Location From af7e8bf4f2049c0545a00b6e3ec0198104edab9f Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:56:07 -0400 Subject: [PATCH 068/137] =?UTF-8?q?=F0=9F=94=96=20Bump=20gem=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/citrus-toml-merge/lib/citrus/toml/merge/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/citrus-toml-merge/lib/citrus/toml/merge/version.rb b/gems/citrus-toml-merge/lib/citrus/toml/merge/version.rb index 41bc32982..4c5334fe3 100644 --- a/gems/citrus-toml-merge/lib/citrus/toml/merge/version.rb +++ b/gems/citrus-toml-merge/lib/citrus/toml/merge/version.rb @@ -6,7 +6,7 @@ module Merge # Version namespace for this gem. module Version # Current gem version. - VERSION = '7.1.8' + VERSION = '7.1.9' end # Current gem version exposed at the traditional constant location. VERSION = Version::VERSION # Traditional Constant Location From 692112e5f0bc9e8d9fbd2b39d3a710dbccfe727e Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:56:07 -0400 Subject: [PATCH 069/137] =?UTF-8?q?=F0=9F=94=96=20Bump=20gem=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/parslet-toml-merge/lib/parslet/toml/merge/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/parslet-toml-merge/lib/parslet/toml/merge/version.rb b/gems/parslet-toml-merge/lib/parslet/toml/merge/version.rb index f5015614b..cf423beb6 100644 --- a/gems/parslet-toml-merge/lib/parslet/toml/merge/version.rb +++ b/gems/parslet-toml-merge/lib/parslet/toml/merge/version.rb @@ -6,7 +6,7 @@ module Merge # Version namespace for this gem. module Version # Current gem version. - VERSION = '7.1.8' + VERSION = '7.1.9' end # Current gem version exposed at the traditional constant location. VERSION = Version::VERSION # Traditional Constant Location From 7055abc07807885e6413488df5fca2b784db78ce Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:56:08 -0400 Subject: [PATCH 070/137] =?UTF-8?q?=F0=9F=94=96=20Bump=20gem=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/commonmarker-merge/lib/commonmarker/merge/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/commonmarker-merge/lib/commonmarker/merge/version.rb b/gems/commonmarker-merge/lib/commonmarker/merge/version.rb index de70d8422..44df165a7 100644 --- a/gems/commonmarker-merge/lib/commonmarker/merge/version.rb +++ b/gems/commonmarker-merge/lib/commonmarker/merge/version.rb @@ -5,7 +5,7 @@ module Merge # Version namespace for this gem. module Version # Current gem version. - VERSION = '7.1.8' + VERSION = '7.1.9' end # Current gem version exposed at the traditional constant location. VERSION = Version::VERSION # Traditional Constant Location From 95ea4dd6fd13bc8f5541c3182a98ac8dcf9cabd3 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:56:08 -0400 Subject: [PATCH 071/137] =?UTF-8?q?=F0=9F=94=96=20Bump=20gem=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kramdown-merge/lib/kramdown/merge/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/kramdown-merge/lib/kramdown/merge/version.rb b/gems/kramdown-merge/lib/kramdown/merge/version.rb index 3e6607e22..a9c14d3fb 100644 --- a/gems/kramdown-merge/lib/kramdown/merge/version.rb +++ b/gems/kramdown-merge/lib/kramdown/merge/version.rb @@ -5,7 +5,7 @@ module Merge # Version namespace for this gem. module Version # Current gem version. - VERSION = '7.1.8' + VERSION = '7.1.9' end # Current gem version exposed at the traditional constant location. VERSION = Version::VERSION # Traditional Constant Location From 1ffe7af36bf1df864d0a719527ce4e62a63c3306 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:56:08 -0400 Subject: [PATCH 072/137] =?UTF-8?q?=F0=9F=94=96=20Bump=20gem=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kettle-jem/lib/kettle/jem/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/kettle-jem/lib/kettle/jem/version.rb b/gems/kettle-jem/lib/kettle/jem/version.rb index e43057222..b7b603fd5 100644 --- a/gems/kettle-jem/lib/kettle/jem/version.rb +++ b/gems/kettle-jem/lib/kettle/jem/version.rb @@ -5,7 +5,7 @@ module Jem # Version namespace for this gem. module Version # Current gem version. - VERSION = "7.1.25" + VERSION = "7.1.26" end # Current gem version exposed at the traditional constant location. VERSION = Version::VERSION # Traditional Constant Location From 33b28638821ae0601272ae547ec29b5c9589572a Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 22:56:08 -0400 Subject: [PATCH 073/137] =?UTF-8?q?=F0=9F=94=96=20Bump=20gem=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/smorg-rb/lib/smorg/rb/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/smorg-rb/lib/smorg/rb/version.rb b/gems/smorg-rb/lib/smorg/rb/version.rb index f57145565..f0372c8d4 100644 --- a/gems/smorg-rb/lib/smorg/rb/version.rb +++ b/gems/smorg-rb/lib/smorg/rb/version.rb @@ -5,7 +5,7 @@ module RB # Version namespace for this gem. module Version # Current gem version. - VERSION = '7.1.8' + VERSION = '7.1.9' end # Current gem version exposed at the traditional constant location. VERSION = Version::VERSION # Traditional Constant Location From 85c81e78e13d94d150bfffb42a796416a11b982d Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 23:17:14 -0400 Subject: [PATCH 074/137] =?UTF-8?q?=F0=9F=90=9B=20Preserve=20local=20kettl?= =?UTF-8?q?e-dev=20dependency=20floors?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kettle-jem/.rubocop_gradual.lock | 52 -------------- gems/kettle-jem/CHANGELOG.md | 2 + .../modular/coverage_local.gemfile.example | 22 +++++- .../modular/templating_local.gemfile.example | 22 +++++- .../appraisals_and_gemfile_template_spec.rb | 68 ++++++++++++++++++- 5 files changed, 107 insertions(+), 59 deletions(-) diff --git a/gems/kettle-jem/.rubocop_gradual.lock b/gems/kettle-jem/.rubocop_gradual.lock index 1144ee0d4..d0a599232 100644 --- a/gems/kettle-jem/.rubocop_gradual.lock +++ b/gems/kettle-jem/.rubocop_gradual.lock @@ -1,57 +1,5 @@ { "lib/kettle/jem/tasks/template_task.rb:3125777708": [ [93, 11, 53, "Style/ComparableClamp: Use `Comparable#clamp` instead.", 3465008203] - ], - "spec/e2e/rubygems_thin_vertical_slice_spec.rb:3537117060": [ - [3, 1, 58, "RSpec/SpecFilePathFormat: Spec path should end with `kettle/jem*RubyGems_thin_vertical_slice*_spec.rb`.", 3968596449], - [3, 29, 30, "RSpec/DescribeMethod: The second argument to describe should be the method being tested. '#instance' or '.class'.", 3589370396] - ], - "spec/integration/appraisal_helper_and_token_spec.rb:2652892740": [ - [3, 1, 67, "RSpec/SpecFilePathFormat: Spec path should end with `kettle/jem*appraisal_helpers_and_template_tokens*_spec.rb`.", 1438226331], - [3, 29, 39, "RSpec/DescribeMethod: The second argument to describe should be the method being tested. '#instance' or '.class'.", 1357968070] - ], - "spec/integration/appraisals_and_gemfile_template_spec.rb:3090409691": [ - [3, 1, 63, "RSpec/SpecFilePathFormat: Spec path should end with `kettle/jem*Appraisals_and_Gemfile_templating*_spec.rb`.", 2367084249], - [3, 29, 35, "RSpec/DescribeMethod: The second argument to describe should be the method being tested. '#instance' or '.class'.", 1539510212] - ], - "spec/integration/config_metadata_template_spec.rb:2144190883": [ - [3, 1, 67, "RSpec/SpecFilePathFormat: Spec path should end with `kettle/jem*configuration_and_metadata_templating*_spec.rb`.", 3610099387], - [3, 29, 39, "RSpec/DescribeMethod: The second argument to describe should be the method being tested. '#instance' or '.class'.", 1907259302] - ], - "spec/integration/coverage_template_spec.rb:3775667817": [ - [3, 1, 66, "RSpec/SpecFilePathFormat: Spec path should end with `kettle/jem*coverage_bootstrap_template_behavior*_spec.rb`.", 823415992], - [3, 29, 38, "RSpec/DescribeMethod: The second argument to describe should be the method being tested. '#instance' or '.class'.", 151296325] - ], - "spec/integration/gemspec_template_spec.rb:1748953314": [ - [3, 1, 48, "RSpec/SpecFilePathFormat: Spec path should end with `kettle/jem*gemspec_templating*_spec.rb`.", 30263623], - [3, 29, 20, "RSpec/DescribeMethod: The second argument to describe should be the method being tested. '#instance' or '.class'.", 2014438586] - ], - "spec/integration/github_workflow_template_spec.rb:1177224131": [ - [3, 1, 56, "RSpec/SpecFilePathFormat: Spec path should end with `kettle/jem*GitHub_workflow_templating*_spec.rb`.", 446190427], - [3, 29, 28, "RSpec/DescribeMethod: The second argument to describe should be the method being tested. '#instance' or '.class'.", 855400678] - ], - "spec/integration/readme_changelog_template_spec.rb:38663511": [ - [3, 1, 61, "RSpec/SpecFilePathFormat: Spec path should end with `kettle/jem*README_and_changelog_templating*_spec.rb`.", 997155358], - [3, 29, 33, "RSpec/DescribeMethod: The second argument to describe should be the method being tested. '#instance' or '.class'.", 3993812611] - ], - "spec/integration/recipe_planning_spec.rb:3747405019": [ - [3, 1, 71, "RSpec/SpecFilePathFormat: Spec path should end with `kettle/jem*recipe_planning_and_writeintent_behavior*_spec.rb`.", 2828860406], - [3, 29, 43, "RSpec/DescribeMethod: The second argument to describe should be the method being tested. '#instance' or '.class'.", 2383456363] - ], - "spec/integration/shim_profile_spec.rb:634243060": [ - [3, 1, 53, "RSpec/SpecFilePathFormat: Spec path should end with `kettle/jem*shim_profile_templating*_spec.rb`.", 837334745], - [3, 29, 25, "RSpec/DescribeMethod: The second argument to describe should be the method being tested. '#instance' or '.class'.", 2022445956] - ], - "spec/integration/structural_merge_template_spec.rb:425128448": [ - [3, 1, 64, "RSpec/SpecFilePathFormat: Spec path should end with `kettle/jem*structural_merge_template_behavior*_spec.rb`.", 1693815617], - [3, 29, 36, "RSpec/DescribeMethod: The second argument to describe should be the method being tested. '#instance' or '.class'.", 3903270460] - ], - "spec/integration/template_bootstrap_spec.rb:2276953371": [ - [3, 1, 71, "RSpec/SpecFilePathFormat: Spec path should end with `kettle/jem*template_selection_and_bootstrap_behavior*_spec.rb`.", 2832878461], - [3, 29, 43, "RSpec/DescribeMethod: The second argument to describe should be the method being tested. '#instance' or '.class'.", 1664161888] - ], - "spec/system/install_orchestration_spec.rb:3071678840": [ - [3, 1, 70, "RSpec/SpecFilePathFormat: Spec path should end with `kettle/jem*install_and_local_orchestration_behavior*_spec.rb`.", 1687390280], - [3, 29, 42, "RSpec/DescribeMethod: The second argument to describe should be the method being tested. '#instance' or '.class'.", 2090400053] ] } diff --git a/gems/kettle-jem/CHANGELOG.md b/gems/kettle-jem/CHANGELOG.md index fa859b301..668b84f22 100644 --- a/gems/kettle-jem/CHANGELOG.md +++ b/gems/kettle-jem/CHANGELOG.md @@ -42,6 +42,8 @@ Please file a bug if you notice a violation of semantic versioning. - Predeclare the intentional version_gem runtime-heads dependency overlap in generated Kettle Jem configuration. +- Preserve declared kettle-dev requirements when local coverage and templating Gemfiles replace it with a workspace path. + ### Security ## [7.1.25] - 2026-09-08 diff --git a/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/coverage_local.gemfile.example b/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/coverage_local.gemfile.example index f518ca282..529b80836 100644 --- a/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/coverage_local.gemfile.example +++ b/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/coverage_local.gemfile.example @@ -6,11 +6,29 @@ {KJ|LOCAL_GEMFILE_NOMONO_BOOTSTRAP} local_gems = %w[{KJ|KETTLE_DEV_LOCAL_GEMS}] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -local_gems_to_eval = local_gems - %w[{KJ|PACKAGE_NAME}] - (declared_gems - %w[kettle-dev]) # export KETTLE_DEV_DEV=/path/to/my platform :mri do + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find { |dependency| dependency.name == "kettle-dev" } + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: "KETTLE_DEV", + path_env: "KETTLE_DEV_DEV", + vendored_gems_env: "VENDORED_GEMS", + vendor_gem_dir_env: "VENDOR_GEM_DIR", + debug_env: "KETTLE_DEV_DEBUG", + root: ["src", "my", "kettle-dev"] + ).fetch("kettle-dev", nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + local_gems_to_eval = local_gems - %w[{KJ|PACKAGE_NAME}] - declared_gems + eval_nomono_gems( gems: local_gems_to_eval, prefix: "KETTLE_DEV", diff --git a/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/templating_local.gemfile.example b/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/templating_local.gemfile.example index 4ceb1ad21..92ba37b75 100644 --- a/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/templating_local.gemfile.example +++ b/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/templating_local.gemfile.example @@ -43,9 +43,7 @@ structuredmerge_local_gems = %w[ kettle_dev_local_gems = %w[ {KJ|KETTLE_DEV_LOCAL_GEMS} ] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[{KJ|PACKAGE_NAME}] -kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[{KJ|PACKAGE_NAME}] - (declared_gems - %w[kettle-dev]) if ENV.fetch("STRUCTUREDMERGE_DEV", "false").casecmp("false") != 0 eval_nomono_gems( @@ -59,6 +57,26 @@ if ENV.fetch("STRUCTUREDMERGE_DEV", "false").casecmp("false") != 0 end if ENV.fetch("KETTLE_DEV_DEV", "false").casecmp("false") != 0 + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find { |dependency| dependency.name == "kettle-dev" } + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: "KETTLE_DEV", + path_env: "KETTLE_DEV_DEV", + vendored_gems_env: "VENDORED_GEMS", + vendor_gem_dir_env: "VENDOR_GEM_DIR", + debug_env: "KETTLE_DEV_DEBUG", + root: ["src", "my", "kettle-dev"] + ).fetch("kettle-dev", nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[{KJ|PACKAGE_NAME}] - declared_gems + eval_nomono_gems( gems: kettle_dev_local_gems_to_eval, prefix: "KETTLE_DEV", diff --git a/gems/kettle-jem/spec/integration/appraisals_and_gemfile_template_spec.rb b/gems/kettle-jem/spec/integration/appraisals_and_gemfile_template_spec.rb index 9d52bee4d..3c08f3f20 100644 --- a/gems/kettle-jem/spec/integration/appraisals_and_gemfile_template_spec.rb +++ b/gems/kettle-jem/spec/integration/appraisals_and_gemfile_template_spec.rb @@ -1441,7 +1441,7 @@ expect(updated).not_to include('gem "gem-release"') end - it "keeps kettle-dev local overrides available for kettle-jem transitive runtime dependencies" do + it "replaces declared kettle-dev dependencies with local paths without duplicate declarations" do template = File.read(File.expand_path("../../lib/kettle/jem/templates/gemfiles/modular/templating_local.gemfile.example", __dir__)) coverage_template = File.read(File.expand_path("../../lib/kettle/jem/templates/gemfiles/modular/coverage_local.gemfile.example", __dir__)) @@ -1453,14 +1453,76 @@ "structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[{KJ|PACKAGE_NAME}] - declared_gems" ) expect(template).to include( - "kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[{KJ|PACKAGE_NAME}] - (declared_gems - %w[kettle-dev])" + "gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path" ) expect(coverage_template).to include( - "local_gems_to_eval = local_gems - %w[{KJ|PACKAGE_NAME}] - (declared_gems - %w[kettle-dev])" + "gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path" + ) + expect(template).to include( + "kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[{KJ|PACKAGE_NAME}] - declared_gems" + ) + expect(coverage_template).to include( + "local_gems_to_eval = local_gems - %w[{KJ|PACKAGE_NAME}] - declared_gems" ) expect(template).not_to include("platform :mri do") end + it "evaluates a generated local coverage Gemfile with a declared kettle-dev path override" do + tmp_root = File.expand_path("../tmp", __dir__) + FileUtils.mkdir_p(tmp_root) + Dir.mktmpdir("kettle-jem-local-kettle-dev-override", tmp_root) do |root| + workspace_root = File.join(root, "workspace") + kettle_dev_path = File.join(workspace_root, "kettle-dev") + coverage_template = File.read( + File.expand_path("../../lib/kettle/jem/templates/gemfiles/modular/coverage_local.gemfile.example", __dir__) + ) + coverage_local_gemfile = coverage_template + .gsub("{KJ|LOCAL_GEMFILE_NOMONO_BOOTSTRAP}", 'require "nomono/bundler"') + .gsub("{KJ|KETTLE_DEV_LOCAL_GEMS}", "kettle-dev") + .gsub("{KJ|PACKAGE_NAME}", "example") + + write_tree(root, { + "Gemfile" => <<~RUBY, + source "https://gem.coop" + + gemspec + eval_gemfile "gemfiles/modular/coverage_local.gemfile" + RUBY + "example.gemspec" => <<~RUBY, + Gem::Specification.new do |spec| + spec.name = "example" + spec.version = "0.1.0" + spec.summary = "Example" + spec.authors = ["Example"] + spec.files = [] + spec.add_development_dependency "kettle-dev", "~> 3.0", ">= 3.0.34" + end + RUBY + "gemfiles/modular/coverage_local.gemfile" => coverage_local_gemfile, + "workspace/kettle-dev/kettle-dev.gemspec" => <<~RUBY + Gem::Specification.new do |spec| + spec.name = "kettle-dev" + spec.version = "3.0.34" + spec.summary = "Kettle Dev" + spec.authors = ["Example"] + spec.files = [] + end + RUBY + }) + + allow(ENV).to receive(:[]).and_call_original + allow(ENV).to receive(:[]).with("KETTLE_DEV_DEV").and_return(workspace_root) + allow(ENV).to receive(:fetch).and_call_original + allow(ENV).to receive(:fetch).with("KETTLE_DEV_DEV", "false").and_return(workspace_root) + definition = Bundler::Dsl.evaluate(File.join(root, "Gemfile"), nil, {}) + dependency = definition.dependencies.find { |candidate| candidate.name == "kettle-dev" } + + expect(definition.dependencies.count { |candidate| candidate.name == "kettle-dev" }).to eq(1) + expect(dependency.requirement).to eq(Gem::Requirement.new("~> 3.0", ">= 3.0.34")) + expect(dependency.source.path.to_s).to eq(kettle_dev_path) + end + end + it "omits kettle-family from its own main Gemfile dependency token" do runtime = described_class.send( :project_runtime_facts, From 22a8c5a44b275a9ac7271b278e21a047f1aec580 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 23:33:39 -0400 Subject: [PATCH 075/137] =?UTF-8?q?=F0=9F=8E=A8=20Template=20tree=5Fhaver?= =?UTF-8?q?=20by=20kettle-family?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/tree_haver/.kettle-drift.lock | 76 ++++- gems/tree_haver/.rubocop_gradual.lock | 7 +- .../.structuredmerge/kettle-jem.lock | 145 ++++----- gems/tree_haver/Gemfile.lock | 294 ++++++++++-------- gems/tree_haver/Rakefile | 2 +- gems/tree_haver/bin/rubocop-gradual | 16 + .../gemfiles/modular/coverage_local.gemfile | 24 +- .../gemfiles/modular/templating.gemfile | 2 +- .../gemfiles/modular/templating_local.gemfile | 24 +- gems/tree_haver/tree_haver.gemspec | 2 +- 10 files changed, 371 insertions(+), 221 deletions(-) create mode 100755 gems/tree_haver/bin/rubocop-gradual diff --git a/gems/tree_haver/.kettle-drift.lock b/gems/tree_haver/.kettle-drift.lock index 845e49ca2..1173bf2cb 100644 --- a/gems/tree_haver/.kettle-drift.lock +++ b/gems/tree_haver/.kettle-drift.lock @@ -26,12 +26,84 @@ ] } ], + "debug_env: 'KETTLE_DEV_DEBUG',\nroot: %w[src my kettle-dev]": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 46, + 63 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 93, + 110 + ] + } + ], + "path_env: 'KETTLE_DEV_DEV',\nvendored_gems_env: 'VENDORED_GEMS',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 43, + 60 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 90, + 107 + ] + } + ], + "prefix: 'KETTLE_DEV',\npath_env: 'KETTLE_DEV_DEV',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 42, + 59 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 89, + 106 + ] + } + ], + "vendor_gem_dir_env: 'VENDOR_GEM_DIR',\ndebug_env: 'KETTLE_DEV_DEBUG',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 45, + 62 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 92, + 109 + ] + } + ], "vendored_gems_env: 'VENDORED_GEMS',\nvendor_gem_dir_env: 'VENDOR_GEM_DIR',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 44, + 61 + ] + }, { "file": "gemfiles/modular/templating_local.gemfile", "lines": [ - 77, - 88 + 75, + 91, + 108 ] } ] diff --git a/gems/tree_haver/.rubocop_gradual.lock b/gems/tree_haver/.rubocop_gradual.lock index cc315dea5..7a9f80f29 100644 --- a/gems/tree_haver/.rubocop_gradual.lock +++ b/gems/tree_haver/.rubocop_gradual.lock @@ -2,7 +2,7 @@ ".simplecov:2169141317": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] ], - "Rakefile:3375671036": [ + "Rakefile:3372446142": [ [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], [81, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], [165, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], @@ -22,6 +22,9 @@ [1, 1, 0, "Naming/FileName: The name of this source file (`vHEAD.gemfile`) should use snake_case.", 5381], [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], + "gemfiles/modular/coverage_local.gemfile:2813372128": [ + [34, 1, 1586, "Metrics/BlockLength: Block has too many lines. [37/25]", 820328175] + ], "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], @@ -472,7 +475,7 @@ [5, 1, 3065, "Metrics/BlockLength: Block has too many lines. [51/25]", 4150338550], [19, 3, 2446, "Metrics/BlockLength: Block has too many lines. [39/25]", 552612354] ], - "tree_haver.gemspec:75561675": [ + "tree_haver.gemspec:2460071854": [ [16, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1512975621], [138, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4147388508], [149, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], diff --git a/gems/tree_haver/.structuredmerge/kettle-jem.lock b/gems/tree_haver/.structuredmerge/kettle-jem.lock index 13c874157..372c3462e 100644 --- a/gems/tree_haver/.structuredmerge/kettle-jem.lock +++ b/gems/tree_haver/.structuredmerge/kettle-jem.lock @@ -1,11 +1,12 @@ --- version: 1 template_state: - version: 7.1.18 - applied_at: '2026-09-06' + version: 7.1.26 + applied_at: '2026-09-10' changelog_replay: last_entry_key: kettle-jem-template-20260802-001 last_entry_date: '2026-08-02' + maintenance_changelog: {} checksums: ".aiignore.example": 48a5dfdd93afd1a15fdce39cc28ca9920263f00018b0968ab031fa744521e5ce ".config/mise/env.sh": aeea5a2ab489ba6e5467ae8de6e386ec8c8fe4ff31a044e69d0cd6a092dd6654 @@ -75,7 +76,7 @@ template_state: ".rubocop_rspec.yml.example": 288ad75e7eb14d87d80fafe6f7272217be5c57547536ee56c780a7d10ac7ec74 ".simplecov.example": 222f2e6ce8cf089c70a21f0f5e5423d4bd59a96fdb2ce7754b0fb3d6f430c229 ".structuredmerge/git-drivers.toml.example": 9d241a44c9edffcdbd3da018fa188a238089c3d1635040924df594a6929a4f97 - ".structuredmerge/kettle-jem.yml.example": 26949dc4ee0722415e72452cbc186bee6ef7b154eae33166d36f3fdb1ca6e46d + ".structuredmerge/kettle-jem.yml.example": ff65a738da1af7d60714026a81d3323a46c864e96ae3570b806afdf6e7149ff9 ".yard-lint.yml.example": 90def46867c9436b4e177c47d91fc8165f4602e335715aecc39f5587ae20b55b ".yardignore.example": 821f453c609df7d46145d675424b39dfbe6dfdca8edac5f367b85fff48502455 ".yardopts.example": 6fd6f2701713096a8a9ea095c213bbc68eeef37797c4754d97837e3229a3a5f6 @@ -88,7 +89,7 @@ template_state: CHANGELOG.transfer.md: 21331d8a9e58b4ff6e088b88eb408bcccb0f2f64e78f8f4d42ac3f11a24baad8 CITATION.cff.example: e404ea0a7919d78a83d53d80e211d17b9663576aa606583b709795dc023fd75c CODE_OF_CONDUCT.md.example: f1ad532f1860f73ef774c6b27a26d41f4bc1cb8813034f5957487766ebb0986b - CONTRIBUTING.md.example: 22570cfb3dde72be79b4b522b6d5ab13f95d778e40444483a096871fe0891b19 + CONTRIBUTING.md.example: 8d23cce2d061e0c20d619c3f66591df5f32821cd84c32d171df0b8ebe1217a55 FUNDING.md.example: 392d047904b1557b29f4b43d37ec403b7480edd5b6ab51180be979b57a91e6ba FUNDING.md.no-osc.example: 3ef0258dd3e3b7f7e17e8bc2d20dcbcb3e74aa5a5a6f51297075696645e34c77 Gemfile.example: 99500023987e81775a9b5ef14e92cb3992f2ac408e5f42454f2728eee9b49fb2 @@ -99,19 +100,19 @@ template_state: PolyForm-Small-Business-1.0.0.md.example: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 README.md.example: 21f491e3d73bfc1b74056a6dcba61f72c93dee3cfe5272ac164a20978454de21 REEK: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - RUBOCOP.md.example: c09e5533ccc59b70a2efa05c99f66e521137c1053d3c12eb43509cebd5b68b0e + RUBOCOP.md.example: d99871a0e4c1d323c92e7febf328f062bb4722069b2abfd0a83bf7daa8dcbf8c Rakefile.example: 569803e726b07ea26267fec6891367a3096a0dff3c266269a7081d36afe496af SECURITY.md.example: ee9411aa85f36d88363fdaea7a1baea4362b6ec112cf2688e711b05de1d3144c bin/setup.example: 0ac35089c95a91d8973fe7a318bf9fd98b9f8e00db92c5d9ca6cd858abb8d41b certs/pboling.pem.example: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - gem.gemspec.example: 83e834e8958a88e4817a57199f48f5ebb245548ce251c5c47372208693f03b17 + gem.gemspec.example: 12dcadc0b297ccd4e18b9d1e538b98ac8330ef9fb2a059ed6754ad59272b77fa gemfiles/modular/benchmark/r4/v0.5.gemfile.example: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 gemfiles/modular/benchmark/vHEAD.gemfile.example: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 gemfiles/modular/cgi/r4/v0.5.gemfile.example: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 gemfiles/modular/cgi/vHEAD.gemfile.example: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 gemfiles/modular/changelog.gemfile.example: 892598e0e7792eb205247ae28128cef6dfc647d2fb33968969152230d6f69288 gemfiles/modular/coverage.gemfile.example: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - gemfiles/modular/coverage_local.gemfile.example: 928d5f260d7b119c038baa56da9fb78dd524dee613aea33ab72894bbce5c506e + gemfiles/modular/coverage_local.gemfile.example: 92ea0d7a9d693553dc614afa2c43990f5c3778c2b00ef6c528e122c31bd506a1 gemfiles/modular/debug.gemfile.example: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 gemfiles/modular/documentation.gemfile.example: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c gemfiles/modular/documentation_local.gemfile.example: 84a20f5d4b0feb94c2cf2f7a8dce8f682f1483498e41484c2b447a5661fd1870 @@ -145,10 +146,10 @@ template_state: gemfiles/modular/stringio/r3/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/r4/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/vHEAD.gemfile.example: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - gemfiles/modular/style.gemfile.example: 3ad0585b4f2db8918580ca41ea8723f7a166d7a83cfd7f9613511094997106fd + gemfiles/modular/style.gemfile.example: 02fe3e8fd00e49b90c3ab30e19b51014ee50490f3eadcfd1d4a39f4c2c997dda gemfiles/modular/style_local.gemfile.example: c86beb711e766126a5be68be4be18255831625ac3650d5069383c4a83a9511f3 - gemfiles/modular/templating.gemfile.example: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - gemfiles/modular/templating_local.gemfile.example: 930057d3b909a72e39a39125c4e883a7ff71f5691e64426c0541f8c8fc75b83f + gemfiles/modular/templating.gemfile.example: 2b33c094677b53ad9dd2eafeb3a3be452f612380c61001a2e75b3c078b8ff72a + gemfiles/modular/templating_local.gemfile.example: ac7259516e69ffafb8b9342a897ddf6042adc46335743f474c342509cefd8f2e gemfiles/modular/webrick/r4/v1.9.gemfile.example: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea gemfiles/modular/webrick/vHEAD.gemfile.example: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b gemfiles/modular/x_std_libs.gemfile.example: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a @@ -175,7 +176,7 @@ template_state: shim/Gemfile.example: 0fb0d9d06fcfb1fd6ca6f0eeb5867253ca1ed221e03d28027719225f868b0637 shim/README.md.example: 3a2f7211b7f92a1dfae5e523b8e34b051a3d8af942144b05286eca0b3c8f6fbe shim/Rakefile.example: 572c94da7052083b39b62a6600785419e314a109efd7a3d8c3a96eb77ad34fd1 - shim/gem.gemspec.example: efae033238e4fd1355cfc134f5c9123f175d1ad1dc4a1a2e663899788c9e0870 + shim/gem.gemspec.example: 14a7015b3328005d1c3b5fda6886bd6da383707745f6eaaa781d6f9689600131 shim/lib/compat_require.rb.example: 94ee85e353a3ca08c8a35c9063d4ff789214ea594c7f803f6cf09d7142f48379 shim/lib/entrypoint.rb.example: dd57613520daca01d6f6bcaa9b83b00ff74505240dc04b84ceb686df3c0539d7 shim/lib/version.rb.example: 15e219ac3a928b5580035f891e415551213175020f1131f6e7ca0ccd55a1b2d6 @@ -189,370 +190,370 @@ files: recipe: template_source_application_simplecov action: write dest_sha256: ee544f488aed2cb115d9776cf3413deaf0e35788aa1deb4b381d444a4f1140d8 - input_fingerprint: '063921405fbf827edeb9f63237e2f4e19886b6d5f12e7fa79d7b1acb619880ea' + input_fingerprint: cce1657ca339ddabb94ba5baaf8fd4ef84e26139ae35b4a6888e26a90559fc22 template_sources: - ".simplecov.example" AGPL-3.0-only.md: recipe: template_source_application_AGPL_3_0_only_md action: write dest_sha256: d8a6cc31abc16b6748c7a21f21611f5a1ec33f67d22ca23d7da1c19b95496bee - input_fingerprint: 02c92b70dcc42a6bd0a7f45e7b5ccd2d226d3ae57e33b08fab95fc946d81bfb5 + input_fingerprint: 14d3ae7ab551cf02ecbbfd13af44f735e7c76f20c4fbb2caf527a35b9e081d6e template_sources: - AGPL-3.0-only.md.example Gemfile: recipe: template_source_application_Gemfile action: write - dest_sha256: e11b4ae9d559bd0f21c6bf23c050377ddadb2d4195eef85bd512b2216ade1d1a - input_fingerprint: d5f0c5e0b2e93304dbcb310e66acd555550c8f758e92683a87ef47eaeef7bd74 + dest_sha256: 52ca82ad4b27a9b505ebf3281330c53cf62b8264fc31bc7fd01b4f952bf39721 + input_fingerprint: e72fa188429777af8518949f4bf2b57f42e37e12b76b0a588deefd3786d86c5a template_sources: - Gemfile.example LICENSE.md: recipe: template_source_application_LICENSE_md action: write dest_sha256: f6188bfd474a636d2a526420ebb411250faa447d94c9b9ccee097128ce4101b5 - input_fingerprint: a487213aa83ba0bb6837d5187afa43cdf9494b78aa5d47f530c2d1a79940b585 + input_fingerprint: d91bee02d732989634790e2bc2b097543dfb76c0b7449a227ac028b99afcef0c template_sources: - LICENSE.md.example PolyForm-Small-Business-1.0.0.md: recipe: template_source_application_PolyForm_Small_Business_1_0_0_md action: write dest_sha256: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 - input_fingerprint: 4f0ade6df5c5b3ebd4410ac4b48cb69ae49e024c99152eb3ea8e4d6f33ad3345 + input_fingerprint: ff1f283f812aa2fa9bd133834c065385e1d833dffb0cef08deefeed1f68ce4ec template_sources: - PolyForm-Small-Business-1.0.0.md.example README.md: recipe: template_source_application_README_md action: write dest_sha256: 897a821170fc96e62821bd949f6e7fc30453fc7707f88388c9e3026dbb79d391 - input_fingerprint: ecaa6697ba248a7e1918788caf932e36ab5371bf4b2bc49165dd852e83bccc67 + input_fingerprint: 770234c6ed3368cfa4d1a4ce8e442d7a3041af5d0965671f3007e6f483499f9c template_sources: - README.md.example Rakefile: recipe: template_source_application_Rakefile action: write - dest_sha256: 30f882df8f9821afbf24930578fed956e4a1ed109ecfbb0b0f2abd95f3e065bd - input_fingerprint: a4bf27286e8d11352e91f2d0e5f1f327c83e83a4d44f23f344e7068e46c2ee86 + dest_sha256: 8b5a9dfbaea149401109a297b065b2d6a759bc58a48a45595f5c51132a332fff + input_fingerprint: 323d0ae4a6bde1a86eed0f2dc9d97a38701e9331e0f8a2098c3428a0d1135c7f template_sources: - Rakefile.example certs/pboling.pem: recipe: template_source_application_certs_pboling_pem action: write dest_sha256: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - input_fingerprint: f519e052bba8ef729e2af94904c822ef80ef2cff8c9ad083ec664448352122f6 + input_fingerprint: 5d65c6205fc096a6af319bce556cb6a582eca03b0c9deeea2f3a10a7d18f8908 template_sources: - certs/pboling.pem.example gemfiles/modular/benchmark/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_r4_v0_5_gemfile action: write dest_sha256: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 - input_fingerprint: b1a4dfb6f388e39d605424ba60e94819ea82ddc24c7f068f7f7773e2b505d365 + input_fingerprint: 6315f2cfe4ca4060f9fa2f03f83a58c2736a8ac3ab1701cda17119baee79869c template_sources: - gemfiles/modular/benchmark/r4/v0.5.gemfile.example gemfiles/modular/benchmark/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_vHEAD_gemfile action: write dest_sha256: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 - input_fingerprint: feaecd4304327fb1accd330d5178a6609a6adafaa4a3a94482a6ef0461c4132b + input_fingerprint: 5d24006894613e4c13c000eb96775cc1f110d4e02965b53666bdf2ad04b8a213 template_sources: - gemfiles/modular/benchmark/vHEAD.gemfile.example gemfiles/modular/cgi/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_cgi_r4_v0_5_gemfile action: write dest_sha256: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 - input_fingerprint: 8916a02d37dd492d5c69b6b03aa007d5ca0c05ca61d74d1d9905e4c7f82f9ae7 + input_fingerprint: bf0a986a4784ba740183b1221830da830b24b9ec673db31973076427e66caced template_sources: - gemfiles/modular/cgi/r4/v0.5.gemfile.example gemfiles/modular/cgi/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_cgi_vHEAD_gemfile action: write dest_sha256: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 - input_fingerprint: 67ccc625e0d4505179eb3c1ebb4c0f7d62e9d114805a5ea6b472d64f7546163f + input_fingerprint: 6e7c72e5ddcbdf6a5cc41b5a71751b10e9038b2a685a5f33b5fff7cdf8e1ea0d template_sources: - gemfiles/modular/cgi/vHEAD.gemfile.example gemfiles/modular/changelog.gemfile: recipe: template_source_application_gemfiles_modular_changelog_gemfile action: write dest_sha256: da669526144fbff33aef207db9541b6fd6c254437f94dec2fab70fc55a7757cd - input_fingerprint: 3d44e89ea1d3d758fb11364e08e077f5d3bd4a0a865e014254e596193038fcdb + input_fingerprint: 32673898e23ee7d7a29a5399fccd7eda61549a4a288d521e6977bf6de9223642 template_sources: - gemfiles/modular/changelog.gemfile.example gemfiles/modular/coverage.gemfile: recipe: template_source_application_gemfiles_modular_coverage_gemfile action: write dest_sha256: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - input_fingerprint: 77be33f64bc54ecd5f344a90f6d1929369c322a93d0bc230a6d58224560577df + input_fingerprint: ab9fa8b0ab5520236122328f361097bb7f35e12cdaa8447fcb7afa55d3d63a19 template_sources: - gemfiles/modular/coverage.gemfile.example gemfiles/modular/coverage_local.gemfile: recipe: template_source_application_gemfiles_modular_coverage_local_gemfile action: write - dest_sha256: 2b493414df06261ba8acb6f0eb18bf3fdd701d7cb5f967a9d15a3f42a4741827 - input_fingerprint: b03410adab68c4c1c55b85128e7bbcd40d7de736428de0d9444a6f70f4310880 + dest_sha256: 92c9a599c8f6867ec532880f73568f2736ac05d8973ec524b42fd5dbe6aeda3e + input_fingerprint: cac0fa9068fac42eb6c64171e5aa0d039360048980a8a4de87a452a8c4bd9462 template_sources: - gemfiles/modular/coverage_local.gemfile.example gemfiles/modular/debug.gemfile: recipe: template_source_application_gemfiles_modular_debug_gemfile action: write dest_sha256: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 - input_fingerprint: 6be49521ea1beb5be638540ec6282ba4ba395270945bd7813db655a0740b6bc4 + input_fingerprint: 9653d5ba5278e29af59c22802de3d8c4d619ff2526766f48b4bd27479fbadf02 template_sources: - gemfiles/modular/debug.gemfile.example gemfiles/modular/documentation.gemfile: recipe: template_source_application_gemfiles_modular_documentation_gemfile action: write dest_sha256: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c - input_fingerprint: e8706581188b2e53e0b10d6d6d24cb530d9f241f229fbd374a3a812f59ae5ada + input_fingerprint: aae97f6af0a1895e1cf43a2fba2c5e9faf40ad60c8d83562b6b4e62b799a18ec template_sources: - gemfiles/modular/documentation.gemfile.example gemfiles/modular/documentation_local.gemfile: recipe: template_source_application_gemfiles_modular_documentation_local_gemfile action: write dest_sha256: 2058173855b9a4acc6d5efa20520e49734243eef6cf0b5e9063e0e5866a08e9c - input_fingerprint: a0bc96d02ff16d49b571712a478f5658621e46457ea164beecef15df6a6c4f7f + input_fingerprint: f03dfd0cb79617fc4ae743fb8e97bc2cde06d75f8114e5ca00bbe8b4f72e831f template_sources: - gemfiles/modular/documentation_local.gemfile.example gemfiles/modular/erb/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r2_v3_0_gemfile action: write dest_sha256: 3793e7dc9ef23a7ccd893d48cbba092fd27594c63e65cca011cc658218425670 - input_fingerprint: fb85fc59c8a6fecce099ee48cd534bddd5eb5bc8858c50d1ec53833303defcdd + input_fingerprint: 26352d336d5cd846c2f9e972e52ae937fe7911554eeb4803ed47ad192c9a6690 template_sources: - gemfiles/modular/erb/r2/v3.0.gemfile.example gemfiles/modular/erb/r3/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r3_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: bd28cc2136b2d9d81542131bb9130508e24f13916fe311d576be43a3f5a78acb + input_fingerprint: 12ffccf611af44aff94d926131db67fb18db62e2df9cef86cac0d176e36f632d template_sources: - gemfiles/modular/erb/r3/v5.0.gemfile.example gemfiles/modular/erb/r4/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r4_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: a0883d6b4148bb6e32b84e23f832e600f0389278233ec68e42b5fde387972794 + input_fingerprint: faa04675a0f21d72754ebc5be872e05b336b9abc75bb2dabdd151380c14b1998 template_sources: - gemfiles/modular/erb/r4/v5.0.gemfile.example gemfiles/modular/erb/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_erb_vHEAD_gemfile action: write dest_sha256: ad6f104a49e80e0cf625440e3dc816343fe7e2f037fc4971df75e7bb4305c683 - input_fingerprint: e0a3569497a6e1a316b7e0ac0521176f6b4c2d39ddeebb60f2c799ab127b8109 + input_fingerprint: 4b0b8cbf0753498c4a3ad5d439c097bf5c261e79e4485f3f014f300a08d15997 template_sources: - gemfiles/modular/erb/vHEAD.gemfile.example gemfiles/modular/json/truffleruby_22_3.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_22_3_gemfile action: write dest_sha256: 249c12eacbe90f9d0d2e81e7a62c4c7e9102e504ededcda4ecf660cb3bb68be4 - input_fingerprint: d69b49c7da08e707199f125b36f359d298568ded7450a04368f0f773ae378063 + input_fingerprint: 0a5dafb4999e453345a9b4eb63c2bb75480a1fa6f1f8f5ec5759957a1f129f85 template_sources: - gemfiles/modular/json/truffleruby_22_3.gemfile.example gemfiles/modular/json/truffleruby_23_0.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_0_gemfile action: write dest_sha256: 66aa010567f7afa1af8244a74c3c88ecaaf84dc87b6a25180691bb480d02ed28 - input_fingerprint: f8c1e78b4f945689c11cb65075114ea2c621404f017ed2c582154fced964a932 + input_fingerprint: ad2a97f7a2cd37de6c1b5798561f46dd9ab1d69f07040ca17d7ea388159ef868 template_sources: - gemfiles/modular/json/truffleruby_23_0.gemfile.example gemfiles/modular/json/truffleruby_23_1.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_1_gemfile action: write dest_sha256: '080fcbdaf2bec73cad40832a3d51eebb380af789917b96f493d1460b0dd6361d' - input_fingerprint: 0a029c31fd97b9dd05ebccaf32c7826fb9b1f9b229c25bee531cb64e42cc593a + input_fingerprint: edb15c28780dc22144fc8b50224898865ac932639f85efa0f11ed41cfd4ecb54 template_sources: - gemfiles/modular/json/truffleruby_23_1.gemfile.example gemfiles/modular/mutex_m/r2/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r2_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 6b2b3b82db32935438132d819c24cb681e467164660544de59aa6744d0ac58ac + input_fingerprint: 7f0123d8d190f77e435430a685e668e23f4e1311d42641e1ba7d734f760db140 template_sources: - gemfiles/modular/mutex_m/r2/v0.3.gemfile.example gemfiles/modular/mutex_m/r3/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r3_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 598e1a125f3531f60ca70538d5f13f57e7ae643d00a2ecf66bcc7bdc8f64aa66 + input_fingerprint: da1a8494aff385e1906adc4bba8c646f0a9637aeea504b182441c7a78c889713 template_sources: - gemfiles/modular/mutex_m/r3/v0.3.gemfile.example gemfiles/modular/mutex_m/r4/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r4_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: f6c614d37a405fd9b7270a840792e757d7c02b6e8177037eaa32ac1f7b8664d6 + input_fingerprint: e1cbfd3f32496d14ed1e7345037e9bb9b2aba99b7519b799ae3735106be2ac2c template_sources: - gemfiles/modular/mutex_m/r4/v0.3.gemfile.example gemfiles/modular/mutex_m/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_vHEAD_gemfile action: write dest_sha256: '08018641c97f894788fa91b462da504ab2237213d18d95404136c393274ae3cb' - input_fingerprint: 54784cef43c84948f7082faa45b005263588aa0ee3c31d6b2a57162bda7093e6 + input_fingerprint: 9ed0116ae2378eb9c5e46cc36e97391135b8b526318b02e4c0136393c4ee1f29 template_sources: - gemfiles/modular/mutex_m/vHEAD.gemfile.example gemfiles/modular/optional.gemfile: recipe: template_source_application_gemfiles_modular_optional_gemfile action: write dest_sha256: f770e6e9a9dd2bd0f1f132e882d88038b2e21127dce3afe270908c7338c28bfd - input_fingerprint: 1695b2139de247eca5e1af5683942a083cbbedad6138943c6a33fc8661d3dffa + input_fingerprint: e4eeaee6924a423caf034e565f889bf93b17caa19eb0f49d89614ab0f67d678c template_sources: - gemfiles/modular/optional.gemfile.example gemfiles/modular/rspec.gemfile: recipe: template_source_application_gemfiles_modular_rspec_gemfile action: write dest_sha256: d043f5c9344f6435edb4607c5adaf42c78e7fb6b8b6726007de2bbedefb376c3 - input_fingerprint: 514622f73bfc276c1bb088f9824161778ffc8f9f785c3a8f58fa5eaff87e1369 + input_fingerprint: 44170f5789056b503c574f36fd0436efeaf391faaef10f8d93b3d7d322bafb43 template_sources: - gemfiles/modular/rspec.gemfile.example gemfiles/modular/runtime_heads.gemfile: recipe: template_source_application_gemfiles_modular_runtime_heads_gemfile action: write dest_sha256: 6ac7158c4a3088190f2a9082f01439eb27eca2172ab3464b15c9cb045aa885e1 - input_fingerprint: 733104b982fa4a5986236c2eec64ceab84f04ce34d282e9fb848beef56703f69 + input_fingerprint: 48875e03165e2292593192b33e6cd2da574ef7a54dfb595fe8198a54d1d24345 template_sources: - gemfiles/modular/runtime_heads.gemfile.example gemfiles/modular/stringio/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r2_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: e37edb6471e511c1eecbbe52ff9a3e2418f5cb454b2e21b9ea6b5aa733ffdf2c + input_fingerprint: 1978139136c6e806d8ef86f4ade2272a53195305b3dbed9f6e16ac69227fb1d0 template_sources: - gemfiles/modular/stringio/r2/v3.0.gemfile.example gemfiles/modular/stringio/r3/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r3_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: d1e7ab6a1892ec7f1646042222acb9bfbcdec6ab8a7d56f9206f368c2b3e16b0 + input_fingerprint: 58ebeca55c608414d7f8e1fe9d873f6d7028266e5b409b776e411fed698ededb template_sources: - gemfiles/modular/stringio/r3/v3.0.gemfile.example gemfiles/modular/stringio/r4/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r4_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 267f25a59e25ec48f5fe76722d39bc4db7d908f5a3a670f8e36748b0ce8a836e + input_fingerprint: a4824b107353f436a39528a8160aac5d2e80c7ba2f40429049ade34649fcb879 template_sources: - gemfiles/modular/stringio/r4/v3.0.gemfile.example gemfiles/modular/stringio/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_stringio_vHEAD_gemfile action: write dest_sha256: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - input_fingerprint: ceabc427429daa2269282a97e72e80145b52a6f30c1cd7836baaf7590c472801 + input_fingerprint: 4703d1a1685461afaca273f58f5067f72c871cdbc39f3a7df1cbac0b15373743 template_sources: - gemfiles/modular/stringio/vHEAD.gemfile.example gemfiles/modular/style.gemfile: recipe: template_source_application_gemfiles_modular_style_gemfile action: write - dest_sha256: 2a3d46dcb8a9394f595f273f5eb0403d0a552837754ab109afc9ba79a7159083 - input_fingerprint: ea11e4a43ea1b26ae79cd7c86a4ed247014bfff337744d4cc59aeb33042a016f + dest_sha256: 9a24acff0054573c30f5d84d0418cd465ba3794d075bb5a36801410ac40e0787 + input_fingerprint: 0645bfe4bbbea165de6b4a40c751edc74e6b4fd3c1011b859c5967ea98ea54f2 template_sources: - gemfiles/modular/style.gemfile.example gemfiles/modular/style_local.gemfile: recipe: template_source_application_gemfiles_modular_style_local_gemfile action: write dest_sha256: 55eb9c149cdb2f29c9f31abe2d55a4f334e00fb859681dd17c42149a3f28ca36 - input_fingerprint: aedaf386e1f6710a5b49b9dc6aa02abce65cc698dc74602ee36e86e51ed67841 + input_fingerprint: 84b758fb90fa6959544789274329bcd360096db40338827604629ab734c58b16 template_sources: - gemfiles/modular/style_local.gemfile.example gemfiles/modular/templating.gemfile: recipe: template_source_application_gemfiles_modular_templating_gemfile action: write - dest_sha256: fb9555f8e4fa2d641337256d8360d2aef45bf4f41ec621bd55e78705674471f3 - input_fingerprint: 56bf9cdf00853fbc33ec490678492c699e86e494bcbb39b844b91e7afb9915ae + dest_sha256: 1af1c14e43e00cccca03df2177f6bfcd59bc4bcbdb4d61be740159003bdc0577 + input_fingerprint: 22fded6b1378b2e512e251e8b45f5c068ed0ba99731da096a5bc320ac6d19bd2 template_sources: - gemfiles/modular/templating.gemfile.example gemfiles/modular/templating_local.gemfile: recipe: template_source_application_gemfiles_modular_templating_local_gemfile action: write - dest_sha256: 1f8b72c20e8e643c503c9d3c742b55fd980653bbada8390111ddb260155d22e8 - input_fingerprint: f769bb4648ed64f23b7b497bc1171652645fe414da29623228e3941c14eb0198 + dest_sha256: 493a2e5d92b4f39bf1412f06ae34ea117470036180933abe165b2c23081763ab + input_fingerprint: 225fd6651fc3ed4b309378b9198b465e14be8dce48ba8a80d933dfeb7024d237 template_sources: - gemfiles/modular/templating_local.gemfile.example gemfiles/modular/webrick/r4/v1.9.gemfile: recipe: template_source_application_gemfiles_modular_webrick_r4_v1_9_gemfile action: write dest_sha256: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea - input_fingerprint: 2464721c2257ad228212f6e6c047d949413d575f267bd8125bac40214a2d21ba + input_fingerprint: 30614a1dff761c8e656b92cffa424107e95753e07cf8f0aedac74f75217cdf2a template_sources: - gemfiles/modular/webrick/r4/v1.9.gemfile.example gemfiles/modular/webrick/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_webrick_vHEAD_gemfile action: write dest_sha256: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b - input_fingerprint: 4eb4601069267b79e46b5dbe2f50cdeffa1ebc64b6b3c75512ad913d14902a17 + input_fingerprint: dd298ecb43f6b3e26811a6fc71899329ad6701db67380a439c57950dc155fefe template_sources: - gemfiles/modular/webrick/vHEAD.gemfile.example gemfiles/modular/x_std_libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_gemfile action: write dest_sha256: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a - input_fingerprint: d2df1603d1ddf878a92f60d93392644088f385a2ff0d0d52d6a2749cb5556b20 + input_fingerprint: a62a162e69612cad3b873b6dea7fed01533fa3fbcb0c4c56cca7fffadd56206f template_sources: - gemfiles/modular/x_std_libs.gemfile.example gemfiles/modular/x_std_libs/r2/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r2_libs_gemfile action: write dest_sha256: e80ec8ad06cb1b31ac982bc25cf7696987fca131aa1001eaefd0bf5cd379c273 - input_fingerprint: 4033f33046280c9d2c7847e2f4e1d6d67c5a54de041e7f24a46e4f8f24ae5b1e + input_fingerprint: 7ed2819545edcd8ec8b0f8ce6852945a0f3c1d18d81f2ce36c3b41f630433688 template_sources: - gemfiles/modular/x_std_libs/r2/libs.gemfile.example gemfiles/modular/x_std_libs/r3.1/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_1_libs_gemfile action: write dest_sha256: 9f8565c40b09bea1bc4c2e2ad87fe11400c3c51a2b235655bfcd8e491ed88ca8 - input_fingerprint: 63a2084405ce46f9b2c0211ec9dafe78e6279027ff109087abbc6ea054acf96b + input_fingerprint: 261546a28b915fff890dc7a907df3a6c17fa1be8d6d2f47ab23b91eb0efa7a71 template_sources: - gemfiles/modular/x_std_libs/r3.1/libs.gemfile.example gemfiles/modular/x_std_libs/r3/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_libs_gemfile action: write dest_sha256: 546f8849f4267bb19aa10ff0de40be30957197f229e6887847181ea9127b2650 - input_fingerprint: 71063d2e1b00f349c50acee18efb02f1dc1e8bff3e84ca2d21f084f0ff44a57a + input_fingerprint: 65057d9671d326b2bdbb21b508a4a1a41658165511552773f390a73590ef9f27 template_sources: - gemfiles/modular/x_std_libs/r3/libs.gemfile.example gemfiles/modular/x_std_libs/r4/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r4_libs_gemfile action: write dest_sha256: 8c2582eaa218d216b98c86c933465295c8b4e43f3251ea388b9eaf6e471f8da6 - input_fingerprint: 9ae2ba60bc761d5026185f86a785070b048fc1483592fd535f23f2dc5e9b3b0f + input_fingerprint: 39dc59ce5d580b2a262f866dccf3684d935d07fea1e0ed95cc099758510c4c77 template_sources: - gemfiles/modular/x_std_libs/r4/libs.gemfile.example gemfiles/modular/x_std_libs/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_vHEAD_gemfile action: write dest_sha256: d3133ec4c0638363a7fb025d19be7e95a615fd61c35ddb8d17f2280ee74a7486 - input_fingerprint: 4b3d0c4bd4f16e548c175c7efb8f92fe76625508946244fc6cfcae0f036a14bb + input_fingerprint: 9159515aaf944d2fb3ac298bc231ce0de8cdbd8a9441ec70d7a57aea5df65a32 template_sources: - gemfiles/modular/x_std_libs/vHEAD.gemfile.example lib/tree_haver/version.rb: recipe: template_source_application_lib_tree_haver_version_rb action: write - dest_sha256: e8f0b6b1e922be66daf94d90219540c3c1c59ec9bde7067c880487097af3edc0 - input_fingerprint: 17a32a5053b38f15a3d8e924e35da883bf0391b851d5cf97ef41064e02db0b4a + dest_sha256: 208063e4bac78fa4fd5d93bf550b49c1ce628237835eab7a7914635acb259a88 + input_fingerprint: dfd08a12138d7ca320296a05c1b9d713aabacd5888096d8ebfa687cb3c60d1ec template_sources: - lib/gem/version.rb.example mise.toml: recipe: template_source_application_mise_toml action: write dest_sha256: ca23d2c3cd3f5969d28180f1d540d0660c7fb8d50d21da49d74a612edcd15b79 - input_fingerprint: 9a422eeed8e5900223411e8cc200a187a9dc16bc07de688366638ca038e6ba35 + input_fingerprint: de57985f0f659014dafc2a5baab20461b51c1feb2adcbca83f352093039c5736 template_sources: - mise.toml.no-osc.example sig/tree_haver.rbs: recipe: template_source_application_sig_tree_haver_rbs action: write dest_sha256: fd0747212750a45b23c85a132091b6d4f88b12b834d4a8aebe936d3b9dd9f515 - input_fingerprint: ee19a2ea427fedda54ca0f0deaf763f091867ac3eaf27fb7374374822db10c7b + input_fingerprint: 97243d983261e65bd8f2718721fa1814e36c715108028a1b0a19a3fc2a017969 template_sources: - sig/gem.rbs.example spec/spec_helper.rb: recipe: template_source_application_spec_spec_helper_rb action: write dest_sha256: 68b255358aa18b7ba3a5a6873d365c9218697742325ddac54a671bd26efb884e - input_fingerprint: 54e231f82490f46f0b8693aad84032d876827bb964aaa4b6d47d5f115220653a + input_fingerprint: c5ee24cf61777a742856e859ec7156d7cebfadaa7595388f2a802f79b79c1ab7 template_sources: - spec/spec_helper.rb.example tree_haver.gemspec: recipe: template_source_application_tree_haver_gemspec action: write - dest_sha256: db84f19dbc2d9990cd4cc99998142dad91c801d7702dae98489195198bc44b39 - input_fingerprint: e9d2b08ff7f17870697752febd19b2561c8acfab492fe31924b351c31a592ba2 + dest_sha256: 94afc95deb151a4d9b1dcaa4cb921d529f19dbec64a8b80a77242995ead25c22 + input_fingerprint: '087d2a6c4c3ce9c6be20abd1014103cb0fa394429923d5c11fccd3ac1ba8d023' template_sources: - gem.gemspec.example diff --git a/gems/tree_haver/Gemfile.lock b/gems/tree_haver/Gemfile.lock index 713796a1b..c69e631f0 100644 --- a/gems/tree_haver/Gemfile.lock +++ b/gems/tree_haver/Gemfile.lock @@ -10,7 +10,7 @@ GIT PATH remote: . specs: - tree_haver (7.1.8) + tree_haver (7.1.9) citrus (~> 3.0) parslet (~> 2.0) tree_sitter_language_pack (>= 1.16.2, < 2.0) @@ -19,123 +19,123 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) + ast-crispr-markdown-markly (7.1.9) + ast-crispr (= 7.1.9) + markdown-merge (= 7.1.9) + markly-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism specs: - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) + ast-crispr-ruby-prism (7.1.9) + ast-crispr (= 7.1.9) + prism-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) + ast-crispr (7.1.9) + ast-merge (= 7.1.9) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ast-merge-git (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: - ast-merge (7.1.8) + ast-merge (7.1.9) benchmark token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) + ast-template (7.1.9) + ast-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + bash-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + binary-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) + citrus-toml-merge (7.1.9) + ast-merge (= 7.1.9) + toml-merge (= 7.1.9) toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge specs: - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) commonmarker (~> 2.2) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) + dotenv-merge (7.1.9) + ast-merge (= 7.1.9) + plain-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + go-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + html-merge (7.1.9) + ast-crispr (= 7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + json-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: - kettle-jem (7.1.25) + kettle-jem (7.1.26) addressable (>= 2.8, < 3) ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) @@ -169,140 +169,140 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge specs: - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown (~> 2.5) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + markdown-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) + markly-merge (7.1.9) + markdown-merge (= 7.1.9) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge specs: - parslet-toml-merge (7.1.8) + parslet-toml-merge (7.1.9) toml (~> 0.3) - toml-merge (= 7.1.8) + toml-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + plain-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) + prism-merge (7.1.9) + ast-merge (= 7.1.9) prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + psych-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) + yaml-merge (= 7.1.9) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) + rbs-merge (7.1.9) + ast-merge (= 7.1.9) rbs (>= 3.10) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + rust-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) + smorg-rb (7.1.9) + ast-merge (= 7.1.9) + ast-merge-git (= 7.1.9) + bash-merge (= 7.1.9) diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) + dotenv-merge (= 7.1.9) + go-merge (= 7.1.9) + html-merge (= 7.1.9) + json-merge (= 7.1.9) kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) + markdown-merge (= 7.1.9) + plain-merge (= 7.1.9) + prism-merge (= 7.1.9) + psych-merge (= 7.1.9) + rbs-merge (= 7.1.9) + rust-merge (= 7.1.9) + toml-merge (= 7.1.9) + typescript-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + toml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + typescript-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + yaml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) + zip-merge (7.1.9) + binary-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) GEM @@ -336,6 +336,8 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) + commonmarker (2.10.0) + rb_sys (~> 0.9) commonmarker (2.10.0-x86_64-linux) completely (0.8.0) colsole (~> 1.0.0) @@ -460,11 +462,15 @@ GEM lint_roller (1.1.0) logger (1.7.0) markly (0.19.0) + mini_portile2 (2.8.9) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) reline (~> 0.6) mutex_m (0.3.0) + nokogiri (1.19.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) nokogiri (1.19.4-x86_64-linux-gnu) racc (~> 1.4) nomono (1.1.5) @@ -488,6 +494,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) + rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -681,6 +690,9 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_sitter_language_pack (1.16.2) + rb_sys (>= 0.9.130, < 0.10) + sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-x86_64-linux) sorbet-runtime (~> 0.5) tsort (0.2.0) @@ -757,7 +769,7 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.31) + kettle-dev (~> 3.0, >= 3.0.34) kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.97) kettle-jem! @@ -818,28 +830,29 @@ CHECKSUMS appraisal2 (3.2.3) sha256=3a6cfaf8a444e02707b9a34154af1c4902fbe99d9d2168d7e81dd83ec77e6db7 appraisal2-rubocop (1.0.2) sha256=1dae97c1be087cf9c098a3a72fd41f873435e9b8b39687e633b36c9ccb22bff4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.8) - ast-crispr-markdown-markly (7.1.8) - ast-crispr-ruby-prism (7.1.8) - ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) + ast-crispr (7.1.9) + ast-crispr-markdown-markly (7.1.9) + ast-crispr-ruby-prism (7.1.9) + ast-merge (7.1.9) + ast-merge-git (7.1.9) + ast-template (7.1.9) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.8) + bash-merge (7.1.9) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) - bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae + binary-merge (7.1.9) + bundler (4.1.0.beta1) sha256=8a2dac8ca276ff4eff5efc2c6457b0044080fc1e431534ad7c5cc6187232b800 bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.8) + citrus-toml-merge (7.1.9) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 + commonmarker (2.10.0) commonmarker (2.10.0-x86_64-linux) sha256=945c510c0bfca9022245928e2248468fe3ddad58c939be0c37b20082cc392880 - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) completely (0.8.0) sha256=e493cd5d84805f47917a41f277ecbfe5f35363bed670be5a957d3acaed8c6c5e concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 @@ -848,7 +861,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docopt_ng (0.7.1) sha256=a024148ee4fa3ab1a8a04411aa4370f39cf2b446e63562097d418b7974a15667 - dotenv-merge (7.1.8) + dotenv-merge (7.1.9) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -861,35 +874,37 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) + go-merge (7.1.9) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) + html-merge (7.1.9) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a - json-merge (7.1.8) - kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + json-merge (7.1.9) + kettle-changelog (1.0.7) + kettle-dev (3.0.34) + kettle-drift (1.0.13) kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 - kettle-jem (7.1.25) + kettle-jem (7.1.26) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 - kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd + kettle-soup-cover (3.0.10) kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 - markdown-merge (7.1.8) + markdown-merge (7.1.9) markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca - markly-merge (7.1.8) + markly-merge (7.1.9) + mini_portile2 (2.8.9) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 + nokogiri (1.19.4) nokogiri (1.19.4-x86_64-linux-gnu) sha256=379fae440b28915e3f19d752ce2dcf8465ed2b2fbefd2a7ca0dd497bc981a06a nomono (1.1.5) sha256=e8c739eb6a1cf216645af2722cf7d005744d507e2bb038e7232be1ad9a60eb01 openssl (4.0.2) sha256=1037ad2868ae58df9ad917891c0c0f9815a1172f6846d4bcdd508e4c2ee747c2 @@ -898,20 +913,22 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) - plain-merge (7.1.8) + parslet-toml-merge (7.1.9) + plain-merge (7.1.9) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.8) + prism-merge (7.1.9) psych (5.5.0) sha256=4b245bbbd0f3238df8ccee766ebc1a6b062b10e4ee1d3284eb588739ba156a0a - psych-merge (7.1.8) + psych-merge (7.1.9) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 - rbs-merge (7.1.8) + rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -947,11 +964,11 @@ CHECKSUMS rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.8) + ruby-merge (7.1.9) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) + rust-merge (7.1.9) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -959,7 +976,7 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) + smorg-rb (7.1.9) sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -976,21 +993,22 @@ CHECKSUMS timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.8) + toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb - tree_haver (7.1.8) + tree_haver (7.1.9) + tree_sitter_language_pack (1.16.2) tree_sitter_language_pack (1.16.2-x86_64-linux) sha256=d8151e6e44e35ace9de3611c76b730896beab17f427db06d8f76666332a5dc60 tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f tty-cursor (0.7.1) sha256=79534185e6a777888d88628b14b6a1fdf5154a603f285f80b1753e1908e0bf48 tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) + typescript-merge (7.1.9) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 yaml-converter (0.2.5) sha256=a5214fe1a6c2df88bd34a35bcded1b1dcd30135548130df2e03b54ca8c0f2423 - yaml-merge (7.1.8) + yaml-merge (7.1.9) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.8) sha256=73d935d43e3479d65ce8aff25c7d3100e8bb83528a2adaa0ed824e5046ac99e7 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -999,8 +1017,8 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) + zip-merge (7.1.9) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH - 4.0.20 + 4.1.0.beta1 diff --git a/gems/tree_haver/Rakefile b/gems/tree_haver/Rakefile index 7112c2ed1..722a9457e 100644 --- a/gems/tree_haver/Rakefile +++ b/gems/tree_haver/Rakefile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -# tree_haver Rakefile v7.1.18 - 2026-09-06 +# tree_haver Rakefile v7.1.26 - 2026-09-09 # Ruby 2.3 (Safe Navigation) or higher required # # See LICENSE.md for license information. diff --git a/gems/tree_haver/bin/rubocop-gradual b/gems/tree_haver/bin/rubocop-gradual new file mode 100755 index 000000000..7c7ff0635 --- /dev/null +++ b/gems/tree_haver/bin/rubocop-gradual @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'rubocop-gradual' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'rubygems' +require 'bundler/setup' + +load Gem.bin_path('rubocop-gradual', 'rubocop-gradual') diff --git a/gems/tree_haver/gemfiles/modular/coverage_local.gemfile b/gems/tree_haver/gemfiles/modular/coverage_local.gemfile index 37917caac..d6c890e46 100644 --- a/gems/tree_haver/gemfiles/modular/coverage_local.gemfile +++ b/gems/tree_haver/gemfiles/modular/coverage_local.gemfile @@ -29,11 +29,31 @@ Kernel.send(:gem, 'nomono', *nomono_activation_requirements) require 'nomono/bundler' local_gems = %w[kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -local_gems_to_eval = local_gems - %w[] - declared_gems # export KETTLE_DEV_DEV=/path/to/my platform :mri do + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + local_gems_to_eval = local_gems - %w[] - declared_gems + eval_nomono_gems( gems: local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/tree_haver/gemfiles/modular/templating.gemfile b/gems/tree_haver/gemfiles/modular/templating.gemfile index b44493441..a91adfadf 100644 --- a/gems/tree_haver/gemfiles/modular/templating.gemfile +++ b/gems/tree_haver/gemfiles/modular/templating.gemfile @@ -17,7 +17,7 @@ end if structuredmerge_remote # Merge recipes for released installs. - gem 'kettle-jem', '>= 7.0' + gem 'kettle-jem', '~> 7.1', '>= 7.1.26' end if kettle_remote diff --git a/gems/tree_haver/gemfiles/modular/templating_local.gemfile b/gems/tree_haver/gemfiles/modular/templating_local.gemfile index 36b8b7717..77d6ed53a 100644 --- a/gems/tree_haver/gemfiles/modular/templating_local.gemfile +++ b/gems/tree_haver/gemfiles/modular/templating_local.gemfile @@ -65,9 +65,7 @@ structuredmerge_local_gems = %w[ kettle_dev_local_gems = %w[ kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift ] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[] -kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - (declared_gems - %w[kettle-dev]) if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( @@ -81,6 +79,28 @@ if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 end if ENV.fetch('KETTLE_DEV_DEV', 'false').casecmp('false') != 0 + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - declared_gems + eval_nomono_gems( gems: kettle_dev_local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/tree_haver/tree_haver.gemspec b/gems/tree_haver/tree_haver.gemspec index c5a6a33d6..ba7f1bbf2 100644 --- a/gems/tree_haver/tree_haver.gemspec +++ b/gems/tree_haver/tree_haver.gemspec @@ -121,7 +121,7 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.31') # ruby >= 4.0.0 + spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.34') # ruby >= 4.0.0 # Security spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 From 6312163630b4a1a7d9da1ce5cf46bd8b783cbd04 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 23:45:31 -0400 Subject: [PATCH 076/137] =?UTF-8?q?=F0=9F=8E=A8=20Template=20ast-merge=20b?= =?UTF-8?q?y=20kettle-family?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge/.kettle-drift.lock | 76 ++++- gems/ast-merge/.rubocop_gradual.lock | 7 +- .../.structuredmerge/kettle-jem.lock | 145 ++++---- gems/ast-merge/Gemfile | 2 +- gems/ast-merge/Gemfile.lock | 314 +++++++++--------- gems/ast-merge/Rakefile | 2 +- gems/ast-merge/ast-merge.gemspec | 2 +- gems/ast-merge/bin/rubocop-gradual | 16 + .../gemfiles/modular/coverage_local.gemfile | 24 +- gems/ast-merge/gemfiles/modular/style.gemfile | 6 +- .../gemfiles/modular/templating.gemfile | 2 +- .../gemfiles/modular/templating_local.gemfile | 24 +- 12 files changed, 385 insertions(+), 235 deletions(-) create mode 100755 gems/ast-merge/bin/rubocop-gradual diff --git a/gems/ast-merge/.kettle-drift.lock b/gems/ast-merge/.kettle-drift.lock index 2f7215fbd..fed364497 100644 --- a/gems/ast-merge/.kettle-drift.lock +++ b/gems/ast-merge/.kettle-drift.lock @@ -1,4 +1,52 @@ { + "debug_env: 'KETTLE_DEV_DEBUG',\nroot: %w[src my kettle-dev]": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 46, + 63 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 93, + 110 + ] + } + ], + "path_env: 'KETTLE_DEV_DEV',\nvendored_gems_env: 'VENDORED_GEMS',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 43, + 60 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 90, + 107 + ] + } + ], + "prefix: 'KETTLE_DEV',\npath_env: 'KETTLE_DEV_DEV',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 42, + 59 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 89, + 106 + ] + } + ], "test_source: \"# Test\\n\\nParagraph\",\ncategory: :markdown": [ { "file": "spec/spec_helper.rb", @@ -8,12 +56,36 @@ ] } ], + "vendor_gem_dir_env: 'VENDOR_GEM_DIR',\ndebug_env: 'KETTLE_DEV_DEBUG',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 45, + 62 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 92, + 109 + ] + } + ], "vendored_gems_env: 'VENDORED_GEMS',\nvendor_gem_dir_env: 'VENDOR_GEM_DIR',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 44, + 61 + ] + }, { "file": "gemfiles/modular/templating_local.gemfile", "lines": [ - 77, - 88 + 75, + 91, + 108 ] } ] diff --git a/gems/ast-merge/.rubocop_gradual.lock b/gems/ast-merge/.rubocop_gradual.lock index db53149ba..7f0c00138 100644 --- a/gems/ast-merge/.rubocop_gradual.lock +++ b/gems/ast-merge/.rubocop_gradual.lock @@ -2,13 +2,13 @@ ".simplecov:3300221605": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] ], - "Rakefile:2923029276": [ + "Rakefile:2583540510": [ [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], [81, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], [165, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], [168, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] ], - "ast-merge.gemspec:2818768728": [ + "ast-merge.gemspec:2802290589": [ [16, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1168797721], [138, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4147388508], [149, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], @@ -28,6 +28,9 @@ [1, 1, 0, "Naming/FileName: The name of this source file (`vHEAD.gemfile`) should use snake_case.", 5381], [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], + "gemfiles/modular/coverage_local.gemfile:2813372128": [ + [34, 1, 1586, "Metrics/BlockLength: Block has too many lines. [37/25]", 820328175] + ], "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], diff --git a/gems/ast-merge/.structuredmerge/kettle-jem.lock b/gems/ast-merge/.structuredmerge/kettle-jem.lock index 78668a340..03655e202 100644 --- a/gems/ast-merge/.structuredmerge/kettle-jem.lock +++ b/gems/ast-merge/.structuredmerge/kettle-jem.lock @@ -1,11 +1,12 @@ --- version: 1 template_state: - version: 7.1.18 - applied_at: '2026-09-06' + version: 7.1.26 + applied_at: '2026-09-10' changelog_replay: last_entry_key: kettle-jem-template-20260802-001 last_entry_date: '2026-08-02' + maintenance_changelog: {} checksums: ".aiignore.example": 48a5dfdd93afd1a15fdce39cc28ca9920263f00018b0968ab031fa744521e5ce ".config/mise/env.sh": aeea5a2ab489ba6e5467ae8de6e386ec8c8fe4ff31a044e69d0cd6a092dd6654 @@ -75,7 +76,7 @@ template_state: ".rubocop_rspec.yml.example": 288ad75e7eb14d87d80fafe6f7272217be5c57547536ee56c780a7d10ac7ec74 ".simplecov.example": 222f2e6ce8cf089c70a21f0f5e5423d4bd59a96fdb2ce7754b0fb3d6f430c229 ".structuredmerge/git-drivers.toml.example": 9d241a44c9edffcdbd3da018fa188a238089c3d1635040924df594a6929a4f97 - ".structuredmerge/kettle-jem.yml.example": 26949dc4ee0722415e72452cbc186bee6ef7b154eae33166d36f3fdb1ca6e46d + ".structuredmerge/kettle-jem.yml.example": ff65a738da1af7d60714026a81d3323a46c864e96ae3570b806afdf6e7149ff9 ".yard-lint.yml.example": 90def46867c9436b4e177c47d91fc8165f4602e335715aecc39f5587ae20b55b ".yardignore.example": 821f453c609df7d46145d675424b39dfbe6dfdca8edac5f367b85fff48502455 ".yardopts.example": 6fd6f2701713096a8a9ea095c213bbc68eeef37797c4754d97837e3229a3a5f6 @@ -88,7 +89,7 @@ template_state: CHANGELOG.transfer.md: 21331d8a9e58b4ff6e088b88eb408bcccb0f2f64e78f8f4d42ac3f11a24baad8 CITATION.cff.example: e404ea0a7919d78a83d53d80e211d17b9663576aa606583b709795dc023fd75c CODE_OF_CONDUCT.md.example: f1ad532f1860f73ef774c6b27a26d41f4bc1cb8813034f5957487766ebb0986b - CONTRIBUTING.md.example: 22570cfb3dde72be79b4b522b6d5ab13f95d778e40444483a096871fe0891b19 + CONTRIBUTING.md.example: 8d23cce2d061e0c20d619c3f66591df5f32821cd84c32d171df0b8ebe1217a55 FUNDING.md.example: 392d047904b1557b29f4b43d37ec403b7480edd5b6ab51180be979b57a91e6ba FUNDING.md.no-osc.example: 3ef0258dd3e3b7f7e17e8bc2d20dcbcb3e74aa5a5a6f51297075696645e34c77 Gemfile.example: 99500023987e81775a9b5ef14e92cb3992f2ac408e5f42454f2728eee9b49fb2 @@ -99,19 +100,19 @@ template_state: PolyForm-Small-Business-1.0.0.md.example: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 README.md.example: 21f491e3d73bfc1b74056a6dcba61f72c93dee3cfe5272ac164a20978454de21 REEK: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - RUBOCOP.md.example: c09e5533ccc59b70a2efa05c99f66e521137c1053d3c12eb43509cebd5b68b0e + RUBOCOP.md.example: d99871a0e4c1d323c92e7febf328f062bb4722069b2abfd0a83bf7daa8dcbf8c Rakefile.example: 569803e726b07ea26267fec6891367a3096a0dff3c266269a7081d36afe496af SECURITY.md.example: ee9411aa85f36d88363fdaea7a1baea4362b6ec112cf2688e711b05de1d3144c bin/setup.example: 0ac35089c95a91d8973fe7a318bf9fd98b9f8e00db92c5d9ca6cd858abb8d41b certs/pboling.pem.example: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - gem.gemspec.example: 83e834e8958a88e4817a57199f48f5ebb245548ce251c5c47372208693f03b17 + gem.gemspec.example: 12dcadc0b297ccd4e18b9d1e538b98ac8330ef9fb2a059ed6754ad59272b77fa gemfiles/modular/benchmark/r4/v0.5.gemfile.example: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 gemfiles/modular/benchmark/vHEAD.gemfile.example: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 gemfiles/modular/cgi/r4/v0.5.gemfile.example: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 gemfiles/modular/cgi/vHEAD.gemfile.example: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 gemfiles/modular/changelog.gemfile.example: 892598e0e7792eb205247ae28128cef6dfc647d2fb33968969152230d6f69288 gemfiles/modular/coverage.gemfile.example: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - gemfiles/modular/coverage_local.gemfile.example: 928d5f260d7b119c038baa56da9fb78dd524dee613aea33ab72894bbce5c506e + gemfiles/modular/coverage_local.gemfile.example: 92ea0d7a9d693553dc614afa2c43990f5c3778c2b00ef6c528e122c31bd506a1 gemfiles/modular/debug.gemfile.example: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 gemfiles/modular/documentation.gemfile.example: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c gemfiles/modular/documentation_local.gemfile.example: 84a20f5d4b0feb94c2cf2f7a8dce8f682f1483498e41484c2b447a5661fd1870 @@ -145,10 +146,10 @@ template_state: gemfiles/modular/stringio/r3/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/r4/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/vHEAD.gemfile.example: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - gemfiles/modular/style.gemfile.example: 3ad0585b4f2db8918580ca41ea8723f7a166d7a83cfd7f9613511094997106fd + gemfiles/modular/style.gemfile.example: 02fe3e8fd00e49b90c3ab30e19b51014ee50490f3eadcfd1d4a39f4c2c997dda gemfiles/modular/style_local.gemfile.example: c86beb711e766126a5be68be4be18255831625ac3650d5069383c4a83a9511f3 - gemfiles/modular/templating.gemfile.example: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - gemfiles/modular/templating_local.gemfile.example: 930057d3b909a72e39a39125c4e883a7ff71f5691e64426c0541f8c8fc75b83f + gemfiles/modular/templating.gemfile.example: 2b33c094677b53ad9dd2eafeb3a3be452f612380c61001a2e75b3c078b8ff72a + gemfiles/modular/templating_local.gemfile.example: ac7259516e69ffafb8b9342a897ddf6042adc46335743f474c342509cefd8f2e gemfiles/modular/webrick/r4/v1.9.gemfile.example: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea gemfiles/modular/webrick/vHEAD.gemfile.example: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b gemfiles/modular/x_std_libs.gemfile.example: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a @@ -175,7 +176,7 @@ template_state: shim/Gemfile.example: 0fb0d9d06fcfb1fd6ca6f0eeb5867253ca1ed221e03d28027719225f868b0637 shim/README.md.example: 3a2f7211b7f92a1dfae5e523b8e34b051a3d8af942144b05286eca0b3c8f6fbe shim/Rakefile.example: 572c94da7052083b39b62a6600785419e314a109efd7a3d8c3a96eb77ad34fd1 - shim/gem.gemspec.example: efae033238e4fd1355cfc134f5c9123f175d1ad1dc4a1a2e663899788c9e0870 + shim/gem.gemspec.example: 14a7015b3328005d1c3b5fda6886bd6da383707745f6eaaa781d6f9689600131 shim/lib/compat_require.rb.example: 94ee85e353a3ca08c8a35c9063d4ff789214ea594c7f803f6cf09d7142f48379 shim/lib/entrypoint.rb.example: dd57613520daca01d6f6bcaa9b83b00ff74505240dc04b84ceb686df3c0539d7 shim/lib/version.rb.example: 15e219ac3a928b5580035f891e415551213175020f1131f6e7ca0ccd55a1b2d6 @@ -189,370 +190,370 @@ files: recipe: template_source_application_simplecov action: write dest_sha256: 5268939703051b363a02724b4ea84a1b0bb8e137c67c62f60adb491f61aeead1 - input_fingerprint: 7e970a1dc6fc2b4d5d548e1002bbb4e09dbdc5fd80beff360815bf682509a562 + input_fingerprint: 951b35faa51293307be7976d73d5fe8d1e3edf4a657101c572ccc2e8e83338a3 template_sources: - ".simplecov.example" AGPL-3.0-only.md: recipe: template_source_application_AGPL_3_0_only_md action: write dest_sha256: d8a6cc31abc16b6748c7a21f21611f5a1ec33f67d22ca23d7da1c19b95496bee - input_fingerprint: 39d8970f541dd55fae6f159c84a4c61013f1d55bdabd7eb4cf0702486bb1b36f + input_fingerprint: cb34d829f6877245ee3a0c7304e741a2d2d7e0ff0a85287d87704e3ca044ba9a template_sources: - AGPL-3.0-only.md.example Gemfile: recipe: template_source_application_Gemfile action: write - dest_sha256: 46aec5f1aa5d06f04a15be3b1cc99e4d8fae46970f57834dfb8603ad51bddc43 - input_fingerprint: 7bb33a1d7b3752628f2afcb786c5909038408a7da73546ee7f68ac44861a667c + dest_sha256: 7947230e54bccc56025478c07b2da64d58a1ef2cd6ddf439c637e63c29a3ea8a + input_fingerprint: 74d63bb681ced24e2d505333d05f0f9bb080de18d9342eb17d728c59e0bdc977 template_sources: - Gemfile.example LICENSE.md: recipe: template_source_application_LICENSE_md action: write dest_sha256: f6188bfd474a636d2a526420ebb411250faa447d94c9b9ccee097128ce4101b5 - input_fingerprint: 72f73ef9e411e9f1743de4eca776a308290b97e73b84af60dcccd6bf5eae3eb5 + input_fingerprint: a89caf4b281cf0e83f29cfd11a65b1609c7ae7ebe158c9d6cbedc0797b31e1b8 template_sources: - LICENSE.md.example PolyForm-Small-Business-1.0.0.md: recipe: template_source_application_PolyForm_Small_Business_1_0_0_md action: write dest_sha256: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 - input_fingerprint: 1c8aae213d243b01f4826f51331dea3d2971fa3f8171ca3ca92e41da154c8e76 + input_fingerprint: 9f1ad78bebea190331ce7b8ae492e5d8e3dc702ae34894299b5c5cf7747f2792 template_sources: - PolyForm-Small-Business-1.0.0.md.example README.md: recipe: template_source_application_README_md action: write dest_sha256: bb2626eb481a1ef9a61d38b949d49a03e358e611a46547b86a643f7fb59917b3 - input_fingerprint: 66455d99f3564e5ac3a57dc7a9933cb7a3e9dc96f8d19d391ea20579255e838a + input_fingerprint: d1ee3240ed8f8f1e9eab183c1509980e1e3f85aebab4dda0b1e453b8ace2cd2c template_sources: - README.md.example Rakefile: recipe: template_source_application_Rakefile action: write - dest_sha256: c57235c07dc8f4c3d3821d8e081ac0766cfc062f66ef5abf895afd63694b1aa8 - input_fingerprint: '0148d689a41eb6b19069e68650eaa35a9c35bff3d54ee6fb22ff5f935c2c3592' + dest_sha256: 9597447a420ebd4465cea586a9a1e54595fa4ade57bdb0b63df54357faf8044a + input_fingerprint: '092376136714410e415bc4d678ca15c979df41f8c5a01545283ca2190c391dc8' template_sources: - Rakefile.example ast-merge.gemspec: recipe: template_source_application_ast_merge_gemspec action: write - dest_sha256: 88d582ce905bce791fe75eec527df0e2d62c9fe0524907a788fdeb5fc7f08440 - input_fingerprint: c868c893a858d003b4dec555943bbb3714d7091c4119aae463705ff0cf935380 + dest_sha256: c4475945b39012ca47670b7f725a3030cf44cdfd213ddbf816697ec9a04e0b75 + input_fingerprint: de093c901001ba047ebd959b32a013c5a0a28e0e0de0df02cccbcac1183c8ae3 template_sources: - gem.gemspec.example certs/pboling.pem: recipe: template_source_application_certs_pboling_pem action: write dest_sha256: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - input_fingerprint: 9ffb82f9a4888538dc0e99a24dee53a9cceffc0ab609a90bda4282a85d114977 + input_fingerprint: 8dc9cebb57961c87b1bb1ebc33913736f0e78014a1a8bc363160d636f3fc6548 template_sources: - certs/pboling.pem.example gemfiles/modular/benchmark/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_r4_v0_5_gemfile action: write dest_sha256: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 - input_fingerprint: abec43330c0579c3791ff98e22238ad355698f035be0d2152683765e5f150395 + input_fingerprint: 25eacd56d5af59e05330f48de187e051bd6c62ffe2a4432c57f6d759ba6cac6e template_sources: - gemfiles/modular/benchmark/r4/v0.5.gemfile.example gemfiles/modular/benchmark/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_vHEAD_gemfile action: write dest_sha256: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 - input_fingerprint: 10a7ddba09ceff926c3106092be1b601c8e40c919316917e4c8e688fff9b6cd8 + input_fingerprint: c27f7a5c023f37c9e4a5061da33a176aab88e7b56824f2715548b96522ead5f8 template_sources: - gemfiles/modular/benchmark/vHEAD.gemfile.example gemfiles/modular/cgi/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_cgi_r4_v0_5_gemfile action: write dest_sha256: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 - input_fingerprint: d8c1589bfee20710f55045bad8dbf23d2e0a79a8ba6d46702c65b06bbc82e87e + input_fingerprint: f45ae4358bc8e32d2ba5d470b8642b8d689e834e794fda3ecd1c6d036b34e882 template_sources: - gemfiles/modular/cgi/r4/v0.5.gemfile.example gemfiles/modular/cgi/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_cgi_vHEAD_gemfile action: write dest_sha256: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 - input_fingerprint: bb524ddbc5e2b7207d9a2a924521320fdd762a4fc58524ff53169cb55743998b + input_fingerprint: de8adad03b1a07f8fdbd0bd91739b22b78fc13d62b00af98efe755ecb4e62484 template_sources: - gemfiles/modular/cgi/vHEAD.gemfile.example gemfiles/modular/changelog.gemfile: recipe: template_source_application_gemfiles_modular_changelog_gemfile action: write dest_sha256: da669526144fbff33aef207db9541b6fd6c254437f94dec2fab70fc55a7757cd - input_fingerprint: 074f6333575f295ef11ee427d86b0a8f7396ef12a5577715cf18cfedfdb84003 + input_fingerprint: 85bb78087c2660517aa2b0bdbbb0a08bc55017ba41c4c09d5036259027b17269 template_sources: - gemfiles/modular/changelog.gemfile.example gemfiles/modular/coverage.gemfile: recipe: template_source_application_gemfiles_modular_coverage_gemfile action: write dest_sha256: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - input_fingerprint: 404c69b2211036aafefa3e6fc5ad9010cc54318cb791ca2ff7d34585d3aec729 + input_fingerprint: c3f8b52059bbac5f9e61330f69c2200f4ce76eaa0136c12f40b764c4ffb714eb template_sources: - gemfiles/modular/coverage.gemfile.example gemfiles/modular/coverage_local.gemfile: recipe: template_source_application_gemfiles_modular_coverage_local_gemfile action: write - dest_sha256: 2b493414df06261ba8acb6f0eb18bf3fdd701d7cb5f967a9d15a3f42a4741827 - input_fingerprint: 33a2960f7e0baf8016a2e64c49f28b357623e73e37da172e41994ab3ffd0c3f2 + dest_sha256: 92c9a599c8f6867ec532880f73568f2736ac05d8973ec524b42fd5dbe6aeda3e + input_fingerprint: 890251bb071e83ccaceea5830ab0d6cb53998fa3bc5e44cd89a927ceb457dc1f template_sources: - gemfiles/modular/coverage_local.gemfile.example gemfiles/modular/debug.gemfile: recipe: template_source_application_gemfiles_modular_debug_gemfile action: write dest_sha256: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 - input_fingerprint: 825fcef4c7f56a1925dc8b7162570b2575f5fb5cf572785fa8c17614c385e43b + input_fingerprint: ec8c6a3d0e17e538366c6b81977ed79e7e1fc0eb290545e5db8df1138acf9782 template_sources: - gemfiles/modular/debug.gemfile.example gemfiles/modular/documentation.gemfile: recipe: template_source_application_gemfiles_modular_documentation_gemfile action: write dest_sha256: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c - input_fingerprint: bee6bd34a5de2dd00b0e26d59e7f23e0df85f2783127dfdc2a9ac3a2e64d05a0 + input_fingerprint: d5e26632a5aa51aa6943fe49716bce46a3a3f387419e593d4f1010c4c6e3834f template_sources: - gemfiles/modular/documentation.gemfile.example gemfiles/modular/documentation_local.gemfile: recipe: template_source_application_gemfiles_modular_documentation_local_gemfile action: write dest_sha256: 2058173855b9a4acc6d5efa20520e49734243eef6cf0b5e9063e0e5866a08e9c - input_fingerprint: 4ef5247754a14ddebac462bc0e4ff920df47d9eb571cfa10a29bb218e01457be + input_fingerprint: 5701e504ccf7c7ea6fb36ea783c525b74173dc04c5e5911254aa247dad9c9180 template_sources: - gemfiles/modular/documentation_local.gemfile.example gemfiles/modular/erb/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r2_v3_0_gemfile action: write dest_sha256: 3793e7dc9ef23a7ccd893d48cbba092fd27594c63e65cca011cc658218425670 - input_fingerprint: de6e73c5acd31b33819c7c94cdda5779654b30fd201d473cd681c775cb4b3ed6 + input_fingerprint: bdc4c65ba2756322854bedea561ccce3b06ee5f0a4849011d15ee6e0b4e73f14 template_sources: - gemfiles/modular/erb/r2/v3.0.gemfile.example gemfiles/modular/erb/r3/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r3_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: f386308891189aabb0201546380e25f8e0db6cd19d9f9516eaff9d4f7ce67df6 + input_fingerprint: bd0243fb1e696de21e7361d75a51fe92d890b91dde2aa5df0d4da08828fa5d07 template_sources: - gemfiles/modular/erb/r3/v5.0.gemfile.example gemfiles/modular/erb/r4/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r4_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 2040ada8b02bcacfe621530e674f12ce23b38402ae7c370e752de8218b520e5c + input_fingerprint: '031088b4bd310b7bb8d65245e029caea137110b8c5bd832d27d51997855b8c0d' template_sources: - gemfiles/modular/erb/r4/v5.0.gemfile.example gemfiles/modular/erb/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_erb_vHEAD_gemfile action: write dest_sha256: ad6f104a49e80e0cf625440e3dc816343fe7e2f037fc4971df75e7bb4305c683 - input_fingerprint: b905ab7a7a3f32f44cf42338724ded8a0ca2e2b947acb9f72a0d4ec1ce6f683f + input_fingerprint: fd73adf49436c48e4cc7352fe420b8f96be88efcf0f00a59d8bd99affe9ef18a template_sources: - gemfiles/modular/erb/vHEAD.gemfile.example gemfiles/modular/json/truffleruby_22_3.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_22_3_gemfile action: write dest_sha256: 249c12eacbe90f9d0d2e81e7a62c4c7e9102e504ededcda4ecf660cb3bb68be4 - input_fingerprint: 2b99e4d79c1899111023ce26a78cc02efcea2fa6418f3826cad390c6334bcf8c + input_fingerprint: 28e4ddd1529b8c8651ad47228a762c01a56a546999884a0464511889b1e0d35e template_sources: - gemfiles/modular/json/truffleruby_22_3.gemfile.example gemfiles/modular/json/truffleruby_23_0.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_0_gemfile action: write dest_sha256: 66aa010567f7afa1af8244a74c3c88ecaaf84dc87b6a25180691bb480d02ed28 - input_fingerprint: 4c2bf285fa3626cd204e6d88f9a14b29fe14e4330641ed012e058e101b1d46a2 + input_fingerprint: 3cd5d33bffa1d4d83d1d5b24b19a4bf06c340cf93f1809e237ff79ab46583e7a template_sources: - gemfiles/modular/json/truffleruby_23_0.gemfile.example gemfiles/modular/json/truffleruby_23_1.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_1_gemfile action: write dest_sha256: '080fcbdaf2bec73cad40832a3d51eebb380af789917b96f493d1460b0dd6361d' - input_fingerprint: 683ae0a5232d3853aae47fa0cec8eec4441be48486f306137ffcb599a7498c41 + input_fingerprint: 466833ccd099fbfe678f386006698999373d1f7425b5ebc96ec73894f740c7a5 template_sources: - gemfiles/modular/json/truffleruby_23_1.gemfile.example gemfiles/modular/mutex_m/r2/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r2_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 944c924aed07016e37eb73d39c899047ed13c3dfcd7d745efb494cbe05277526 + input_fingerprint: 536e95b4ef356105e5bb91d71d7107fc01390d3cb689e72840fead7ffb2fb7a5 template_sources: - gemfiles/modular/mutex_m/r2/v0.3.gemfile.example gemfiles/modular/mutex_m/r3/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r3_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 8dddeb4497c63f1edef26131ff14372567e75e2fe7e2e2c3a065a754964d4885 + input_fingerprint: 927dc7a29341e3eed7c68fba9e8ce66529e3909478badc66208f1e3cbc330609 template_sources: - gemfiles/modular/mutex_m/r3/v0.3.gemfile.example gemfiles/modular/mutex_m/r4/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r4_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: d574faa882b38d452178db49b619075b3676bb95f90f8ae296fb2bf29d4fec33 + input_fingerprint: c3464911856cd879026133533633971f2f3f2159f797a84c017f80d247598ad9 template_sources: - gemfiles/modular/mutex_m/r4/v0.3.gemfile.example gemfiles/modular/mutex_m/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_vHEAD_gemfile action: write dest_sha256: '08018641c97f894788fa91b462da504ab2237213d18d95404136c393274ae3cb' - input_fingerprint: 6a6221cb2c6447a60f00762f220c8ccc71b4bbb83b03d39b682679135146d8cb + input_fingerprint: 8f0a154ed5b2cf648a6c3107e765a597b860864a227afdd3aa2b39e96f47d28e template_sources: - gemfiles/modular/mutex_m/vHEAD.gemfile.example gemfiles/modular/optional.gemfile: recipe: template_source_application_gemfiles_modular_optional_gemfile action: write dest_sha256: f770e6e9a9dd2bd0f1f132e882d88038b2e21127dce3afe270908c7338c28bfd - input_fingerprint: 8098955d4cb5ba27bd8ac9b2b9017eb10f27c71b12cf46257a502b765b9faa82 + input_fingerprint: a824827cc0e672c999959ee2eb96fac36c8d415eb2b2cecb274c5553cdb3910a template_sources: - gemfiles/modular/optional.gemfile.example gemfiles/modular/rspec.gemfile: recipe: template_source_application_gemfiles_modular_rspec_gemfile action: write dest_sha256: d043f5c9344f6435edb4607c5adaf42c78e7fb6b8b6726007de2bbedefb376c3 - input_fingerprint: 81b0822870e14004acde01b4a9d9fcbd5453cb30f9a501496db82ff03f446f44 + input_fingerprint: c0599613ce40031bdadd9e730bc09c07915733153218135dbd6f4253a0249162 template_sources: - gemfiles/modular/rspec.gemfile.example gemfiles/modular/runtime_heads.gemfile: recipe: template_source_application_gemfiles_modular_runtime_heads_gemfile action: write dest_sha256: 6ac7158c4a3088190f2a9082f01439eb27eca2172ab3464b15c9cb045aa885e1 - input_fingerprint: 376277f99bbaae2aee9051dc22e91e084300e87de872421df7f35f816096352d + input_fingerprint: 2412ad57bc8785078a23e2553f5aa7b94d47f799ce75483635396da4275fc194 template_sources: - gemfiles/modular/runtime_heads.gemfile.example gemfiles/modular/stringio/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r2_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 4cf7b6dd8418100b971207947dc6083e08f23513c3bbb4327b39b1d9ba68c1a9 + input_fingerprint: f6a0fd463f0727c35e150160ba1fc746d3299f69b9e0fddeaafa7ecd924c3148 template_sources: - gemfiles/modular/stringio/r2/v3.0.gemfile.example gemfiles/modular/stringio/r3/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r3_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: a9c56e1e7fa1270305dea41657515d3ced5c4a725b558a1665338357d2a9587e + input_fingerprint: 8986bd2320df4c4a2c79b2fb3866c20b233133a2aa150d7e0c1013a82838d071 template_sources: - gemfiles/modular/stringio/r3/v3.0.gemfile.example gemfiles/modular/stringio/r4/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r4_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: c15d5b00f2747c2c68e47b9f697bff34522dab1e3b1f3774074bff8e649c0270 + input_fingerprint: 402dd8606ac787c7c1213e97b2c1826168adaa1e2d49088e460b596032577c13 template_sources: - gemfiles/modular/stringio/r4/v3.0.gemfile.example gemfiles/modular/stringio/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_stringio_vHEAD_gemfile action: write dest_sha256: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - input_fingerprint: 70fa38a46cb2cdf36fb3d7f65d6563cb636c45c9fab910c52474cfc4600aa41a + input_fingerprint: a7d05e522a0c7238069237de058e74b4161395f72646a45f8db92df19ca3e73d template_sources: - gemfiles/modular/stringio/vHEAD.gemfile.example gemfiles/modular/style.gemfile: recipe: template_source_application_gemfiles_modular_style_gemfile action: write - dest_sha256: 2a3d46dcb8a9394f595f273f5eb0403d0a552837754ab109afc9ba79a7159083 - input_fingerprint: 860af53e2ba3762b5394b25c2e6b9a3d049369b73f7d5e8a28b14adb87dd74b2 + dest_sha256: 9a24acff0054573c30f5d84d0418cd465ba3794d075bb5a36801410ac40e0787 + input_fingerprint: 424282aea9e1fee03b5de436a4c2af617ce5121f2097e45e70c6aa7befe88abc template_sources: - gemfiles/modular/style.gemfile.example gemfiles/modular/style_local.gemfile: recipe: template_source_application_gemfiles_modular_style_local_gemfile action: write dest_sha256: 55eb9c149cdb2f29c9f31abe2d55a4f334e00fb859681dd17c42149a3f28ca36 - input_fingerprint: 4d01ff2207e390951947772e9fe349c80e37c3233b81d1d6fa60b953445aede5 + input_fingerprint: a0ddba60b4ae9ae58c598a8bb7a1df3b4f94f89c1c4e27830a7d2b98a3a072c9 template_sources: - gemfiles/modular/style_local.gemfile.example gemfiles/modular/templating.gemfile: recipe: template_source_application_gemfiles_modular_templating_gemfile action: write - dest_sha256: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - input_fingerprint: c18a2bef04818ff123757451dec8146be0f905de359e19c466c04950d551cfc3 + dest_sha256: 432ba59798d31b899268257c432443a017c5a9bd2c0c7f9f2216617e14150cd3 + input_fingerprint: 70d05fa4b08f6a060a892aef0b34ebf9ce128e3623175de102d500a7c2e7fa35 template_sources: - gemfiles/modular/templating.gemfile.example gemfiles/modular/templating_local.gemfile: recipe: template_source_application_gemfiles_modular_templating_local_gemfile action: write - dest_sha256: e96736e6e76552074f6a19229d7cf3620083530a5610c4d244757654571d3759 - input_fingerprint: b7c1259764c368d5c4a74fcc143f9bcec3f8e15cf25a2399ea8c28cb7076c451 + dest_sha256: bb1bd4dc2d0b585a9588025c08f13082558c395e94b13e329b91092a7168cf02 + input_fingerprint: 86a68a922f7c1d0adbf18073adea161a0358aa6c9bdae99611c90e03fa2d0c8f template_sources: - gemfiles/modular/templating_local.gemfile.example gemfiles/modular/webrick/r4/v1.9.gemfile: recipe: template_source_application_gemfiles_modular_webrick_r4_v1_9_gemfile action: write dest_sha256: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea - input_fingerprint: 4c6f19b0de167a7cf6499634fa9f758717559ddf25e2d6e70f014e60323a548a + input_fingerprint: 6c6e74bc0c78ad1122f6e6a914f265eeb2cf0cc357d610206c321b5436697879 template_sources: - gemfiles/modular/webrick/r4/v1.9.gemfile.example gemfiles/modular/webrick/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_webrick_vHEAD_gemfile action: write dest_sha256: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b - input_fingerprint: b8b0edf29ffb6067d469c924e3a1ed92a0f12f1b4fb719e4505ddda369f4b56f + input_fingerprint: e59cc4c80e30120650e5ba2b3dab6db02f8363b3d837b07d8e2a8e1f34629bf7 template_sources: - gemfiles/modular/webrick/vHEAD.gemfile.example gemfiles/modular/x_std_libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_gemfile action: write dest_sha256: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a - input_fingerprint: 4691a62190945a2c72375ee4e432c9d9eec2865586b95a761851518560d296a3 + input_fingerprint: f932f292a0ccc268994c22ad1354c6a626b304bcd764cfd022c2f5353146aaca template_sources: - gemfiles/modular/x_std_libs.gemfile.example gemfiles/modular/x_std_libs/r2/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r2_libs_gemfile action: write dest_sha256: e80ec8ad06cb1b31ac982bc25cf7696987fca131aa1001eaefd0bf5cd379c273 - input_fingerprint: 210a9db553ed18f43e9d3c72cbd9a322d4bc729e982780c5817c0778dffe1d5d + input_fingerprint: e2de08e3ffb3930fce29eec1f817d8b4dfb3680e995fe0f8d7d8c1a3d0cee766 template_sources: - gemfiles/modular/x_std_libs/r2/libs.gemfile.example gemfiles/modular/x_std_libs/r3.1/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_1_libs_gemfile action: write dest_sha256: 9f8565c40b09bea1bc4c2e2ad87fe11400c3c51a2b235655bfcd8e491ed88ca8 - input_fingerprint: 254bedc1197c185bc0c400a4cb1c3fb085b184de66e0a94bcee54eaa0fd0bf9c + input_fingerprint: 68070f46e8ff6a90672f5bf68db326248f178b7cd9658933e6c6b02e7ae195cd template_sources: - gemfiles/modular/x_std_libs/r3.1/libs.gemfile.example gemfiles/modular/x_std_libs/r3/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_libs_gemfile action: write dest_sha256: 546f8849f4267bb19aa10ff0de40be30957197f229e6887847181ea9127b2650 - input_fingerprint: 471f8ba084dfc363e963490f4823f43a64e09227b8f7427d75b5d953f4b924f5 + input_fingerprint: c576a0a07ad20e9a44cbdae5dcd8ecbfe6dd4cc2c4e479bd1a58517538a0ef15 template_sources: - gemfiles/modular/x_std_libs/r3/libs.gemfile.example gemfiles/modular/x_std_libs/r4/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r4_libs_gemfile action: write dest_sha256: 8c2582eaa218d216b98c86c933465295c8b4e43f3251ea388b9eaf6e471f8da6 - input_fingerprint: 8284e8b50f65136c3b592a2e4553dd3a143c8e990e41aac770337129d6761133 + input_fingerprint: 93b6ee8b25b46dfb010b660ff7c42677dccc654919e73d999a717217235e3dbd template_sources: - gemfiles/modular/x_std_libs/r4/libs.gemfile.example gemfiles/modular/x_std_libs/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_vHEAD_gemfile action: write dest_sha256: d3133ec4c0638363a7fb025d19be7e95a615fd61c35ddb8d17f2280ee74a7486 - input_fingerprint: fa291b20e2a7f220abdf414dd8c7d84ac38d5a06c562a6accbf14df88c0b2dd7 + input_fingerprint: 1c5f33f982795de16a1707e05067ef5429044b2d4a2b3ef44ae96983a7ef7173 template_sources: - gemfiles/modular/x_std_libs/vHEAD.gemfile.example lib/ast/merge/version.rb: recipe: template_source_application_lib_ast_merge_version_rb action: write - dest_sha256: e7644f7c5f77bb63e1f56d2d27db99bd5dd1dc93cb1d026d07c9c1648265b0dd - input_fingerprint: 14b69c280a1a9eec16add8340a084e2eba638746f7168962331e280501040045 + dest_sha256: 167ca052526a96aa2f3565683ca43a84668b685982b4deb90a2c73ef80d6ecb7 + input_fingerprint: 75040cd78199af2e0b25f6c4bcce6830664628b3346e4289ca2cc4762ebf6135 template_sources: - lib/gem/version.rb.example mise.toml: recipe: template_source_application_mise_toml action: write dest_sha256: 7d267154ca4f081b0ac7da804c0180c2b091aec5f1c877417c1c320f4f369c88 - input_fingerprint: 56a7425112387c458ec8a368a3170aaf2adeb7a6a1285f15090ca180bc4fb091 + input_fingerprint: 30de40a40bcb61d7aabfe6b1116889953e86ffacc9c2025090c923f1e41ccd45 template_sources: - mise.toml.no-osc.example sig/ast/merge.rbs: recipe: template_source_application_sig_ast_merge_rbs action: write dest_sha256: 39c5c68f0c109f49c252a6de8035bbf0a936ad51f1f369232472079dc9142212 - input_fingerprint: c9bbafd8b7686fbf7e945c5f733d0c73473ea6cb55f97b576ba08a6baea216ab + input_fingerprint: 63570807df9e484694fd41b62f99358e07196222e3f6152cadcb08b9440e2081 template_sources: - sig/gem.rbs.example spec/spec_helper.rb: recipe: template_source_application_spec_spec_helper_rb action: write dest_sha256: 6b332ef0f7b62a1b372dcd655f9325fc57dafdca2851ea7d961b81ae355d2c94 - input_fingerprint: 35ec69f4eacdf2a52edeb775bfce91d18160895762f5da12a5b14021142d06ed + input_fingerprint: 0a95ac23c3c86eb8077def86ec961d569845f69c56a4cda992c486222f395ff6 template_sources: - spec/spec_helper.rb.example diff --git a/gems/ast-merge/Gemfile b/gems/ast-merge/Gemfile index 8b0c1903f..d1fbf2ca7 100644 --- a/gems/ast-merge/Gemfile +++ b/gems/ast-merge/Gemfile @@ -19,7 +19,7 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } # Include dependencies from ast-merge.gemspec gemspec -gem 'kettle-family', '~> 1.2', '>= 1.2.97' +gem 'kettle-family', '~> 1.2', '>= 1.2.100' # Local workspace dependency wiring for *_local.gemfile overrides gem 'nomono', '~> 1.1', '>= 1.1.5', require: false # ruby >= 3.2.0 diff --git a/gems/ast-merge/Gemfile.lock b/gems/ast-merge/Gemfile.lock index 905dd539e..32efb239f 100644 --- a/gems/ast-merge/Gemfile.lock +++ b/gems/ast-merge/Gemfile.lock @@ -7,126 +7,126 @@ GIT lint_roller (~> 1.1.0) rubocop (>= 1.72.1, < 2.0) +PATH + remote: ../ast-merge-git + specs: + ast-merge-git (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) + version_gem (~> 1.1, >= 1.1.15) + PATH remote: . specs: - ast-merge (7.1.8) + ast-merge (7.1.9) benchmark token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) + ast-crispr-markdown-markly (7.1.9) + ast-crispr (= 7.1.9) + markdown-merge (= 7.1.9) + markly-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism specs: - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) + ast-crispr-ruby-prism (7.1.9) + ast-crispr (= 7.1.9) + prism-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) + ast-crispr (7.1.9) + ast-merge (= 7.1.9) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.15) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) + ast-template (7.1.9) + ast-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + bash-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + binary-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) + citrus-toml-merge (7.1.9) + ast-merge (= 7.1.9) + toml-merge (= 7.1.9) toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge specs: - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) commonmarker (~> 2.2) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) + dotenv-merge (7.1.9) + ast-merge (= 7.1.9) + plain-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + go-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + html-merge (7.1.9) + ast-crispr (= 7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + json-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: - kettle-jem (7.1.25) + kettle-jem (7.1.26) addressable (>= 2.8, < 3) ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) @@ -160,122 +160,122 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge specs: - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown (~> 2.5) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + markdown-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) + markly-merge (7.1.9) + markdown-merge (= 7.1.9) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge specs: - parslet-toml-merge (7.1.8) + parslet-toml-merge (7.1.9) toml (~> 0.3) - toml-merge (= 7.1.8) + toml-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + plain-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) + prism-merge (7.1.9) + ast-merge (= 7.1.9) prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + psych-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) + yaml-merge (= 7.1.9) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) + rbs-merge (7.1.9) + ast-merge (= 7.1.9) rbs (>= 3.10) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + rust-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) + smorg-rb (7.1.9) + ast-merge (= 7.1.9) + ast-merge-git (= 7.1.9) + bash-merge (= 7.1.9) diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) + dotenv-merge (= 7.1.9) + go-merge (= 7.1.9) + html-merge (= 7.1.9) + json-merge (= 7.1.9) kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) + markdown-merge (= 7.1.9) + plain-merge (= 7.1.9) + prism-merge (= 7.1.9) + psych-merge (= 7.1.9) + rbs-merge (= 7.1.9) + rust-merge (= 7.1.9) + toml-merge (= 7.1.9) + typescript-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + toml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: - tree_haver (7.1.8) + tree_haver (7.1.9) citrus (~> 3.0) parslet (~> 2.0) tree_sitter_language_pack (>= 1.16.2, < 2.0) @@ -284,25 +284,25 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + typescript-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + yaml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) + zip-merge (7.1.9) + binary-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) GEM @@ -336,6 +336,8 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) + commonmarker (2.10.0) + rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -465,11 +467,15 @@ GEM lint_roller (1.1.0) logger (1.7.0) markly (0.19.0) + mini_portile2 (2.8.9) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) reline (~> 0.6) mutex_m (0.3.0) + nokogiri (1.19.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-musl) @@ -503,6 +509,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) + rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -696,6 +705,9 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_sitter_language_pack (1.16.2) + rb_sys (>= 0.9.130, < 0.10) + sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -784,9 +796,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.31) + kettle-dev (~> 3.0, >= 3.0.34) kettle-drift (~> 1.0, >= 1.0.13) - kettle-family (~> 1.2, >= 1.2.97) + kettle-family (~> 1.2, >= 1.2.100) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) @@ -807,12 +819,12 @@ DEPENDENCIES reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) - rubocop-lts (~> 24.2, >= 24.2.1) - rubocop-lts-rspec (~> 1.0, >= 1.0.5) + rubocop-lts (~> 24.2, >= 24.2.3) + rubocop-lts-rspec (~> 1.0, >= 1.0.6) rubocop-minitest (~> 0.40, >= 0.40.0) rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! - rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) ruby-merge! ruby-progressbar (~> 1.13) rust-merge! @@ -843,33 +855,34 @@ CHECKSUMS appraisal2 (3.2.3) sha256=3a6cfaf8a444e02707b9a34154af1c4902fbe99d9d2168d7e81dd83ec77e6db7 appraisal2-rubocop (1.0.2) sha256=1dae97c1be087cf9c098a3a72fd41f873435e9b8b39687e633b36c9ccb22bff4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.8) - ast-crispr-markdown-markly (7.1.8) - ast-crispr-ruby-prism (7.1.8) - ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) + ast-crispr (7.1.9) + ast-crispr-markdown-markly (7.1.9) + ast-crispr-ruby-prism (7.1.9) + ast-merge (7.1.9) + ast-merge-git (7.1.9) + ast-template (7.1.9) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.8) + bash-merge (7.1.9) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) - bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae + binary-merge (7.1.9) + bundler (4.1.0.beta1) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.8) + citrus-toml-merge (7.1.9) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 + commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e commonmarker (2.10.0-x86_64-darwin) sha256=01e0830ed0319825ecdc16411c90acd3f661d1568dfc178731b3f64d0ce2363d commonmarker (2.10.0-x86_64-linux) sha256=945c510c0bfca9022245928e2248468fe3ddad58c939be0c37b20082cc392880 commonmarker (2.10.0-x86_64-linux-musl) sha256=288cd4fb9f17eed2ffa73551ef241dcf594e0f484b2aee2a0999540333c0618e - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) completely (0.8.0) sha256=e493cd5d84805f47917a41f277ecbfe5f35363bed670be5a957d3acaed8c6c5e concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 @@ -878,7 +891,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docopt_ng (0.7.1) sha256=a024148ee4fa3ab1a8a04411aa4370f39cf2b446e63562097d418b7974a15667 - dotenv-merge (7.1.8) + dotenv-merge (7.1.9) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -891,35 +904,37 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) + go-merge (7.1.9) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) + html-merge (7.1.9) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a - json-merge (7.1.8) - kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + json-merge (7.1.9) + kettle-changelog (1.0.7) + kettle-dev (3.0.34) + kettle-drift (1.0.13) kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 - kettle-jem (7.1.25) + kettle-jem (7.1.26) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 - kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd + kettle-soup-cover (3.0.10) kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 - markdown-merge (7.1.8) + markdown-merge (7.1.9) markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca - markly-merge (7.1.8) + markly-merge (7.1.9) + mini_portile2 (2.8.9) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 + nokogiri (1.19.4) nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af nokogiri (1.19.4-arm64-darwin) sha256=a46db9853286e6597b36ebc6953817d15acf3a299583eb3f89fdc6f91dd63527 @@ -933,20 +948,22 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) - plain-merge (7.1.8) + parslet-toml-merge (7.1.9) + plain-merge (7.1.9) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.8) + prism-merge (7.1.9) psych (5.5.0) sha256=4b245bbbd0f3238df8ccee766ebc1a6b062b10e4ee1d3284eb588739ba156a0a - psych-merge (7.1.8) + psych-merge (7.1.9) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 - rbs-merge (7.1.8) + rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -982,11 +999,11 @@ CHECKSUMS rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.8) + ruby-merge (7.1.9) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) + rust-merge (7.1.9) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +1011,7 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) + smorg-rb (7.1.9) sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,10 +1027,11 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.8) + toml (0.3.0) + toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb - tree_haver (7.1.8) + tree_haver (7.1.9) + tree_sitter_language_pack (1.16.2) tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 @@ -1023,12 +1041,12 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) + typescript-merge (7.1.9) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 yaml-converter (0.2.5) sha256=a5214fe1a6c2df88bd34a35bcded1b1dcd30135548130df2e03b54ca8c0f2423 - yaml-merge (7.1.8) + yaml-merge (7.1.9) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.8) sha256=73d935d43e3479d65ce8aff25c7d3100e8bb83528a2adaa0ed824e5046ac99e7 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -1037,8 +1055,8 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) + zip-merge (7.1.9) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH - 4.0.20 + 4.1.0.beta1 diff --git a/gems/ast-merge/Rakefile b/gems/ast-merge/Rakefile index 698ec1487..5f91eb73d 100644 --- a/gems/ast-merge/Rakefile +++ b/gems/ast-merge/Rakefile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -# ast-merge Rakefile v7.1.18 - 2026-09-06 +# ast-merge Rakefile v7.1.26 - 2026-09-09 # Ruby 2.3 (Safe Navigation) or higher required # # See LICENSE.md for license information. diff --git a/gems/ast-merge/ast-merge.gemspec b/gems/ast-merge/ast-merge.gemspec index 73edb2763..27d0dc658 100644 --- a/gems/ast-merge/ast-merge.gemspec +++ b/gems/ast-merge/ast-merge.gemspec @@ -121,7 +121,7 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.31') # ruby >= 4.0.0 + spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.34') # ruby >= 4.0.0 # Security spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 diff --git a/gems/ast-merge/bin/rubocop-gradual b/gems/ast-merge/bin/rubocop-gradual new file mode 100755 index 000000000..7c7ff0635 --- /dev/null +++ b/gems/ast-merge/bin/rubocop-gradual @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'rubocop-gradual' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'rubygems' +require 'bundler/setup' + +load Gem.bin_path('rubocop-gradual', 'rubocop-gradual') diff --git a/gems/ast-merge/gemfiles/modular/coverage_local.gemfile b/gems/ast-merge/gemfiles/modular/coverage_local.gemfile index 37917caac..d6c890e46 100644 --- a/gems/ast-merge/gemfiles/modular/coverage_local.gemfile +++ b/gems/ast-merge/gemfiles/modular/coverage_local.gemfile @@ -29,11 +29,31 @@ Kernel.send(:gem, 'nomono', *nomono_activation_requirements) require 'nomono/bundler' local_gems = %w[kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -local_gems_to_eval = local_gems - %w[] - declared_gems # export KETTLE_DEV_DEV=/path/to/my platform :mri do + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + local_gems_to_eval = local_gems - %w[] - declared_gems + eval_nomono_gems( gems: local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/ast-merge/gemfiles/modular/style.gemfile b/gems/ast-merge/gemfiles/modular/style.gemfile index 59c5dc1a3..41ec99454 100644 --- a/gems/ast-merge/gemfiles/modular/style.gemfile +++ b/gems/ast-merge/gemfiles/modular/style.gemfile @@ -24,9 +24,9 @@ platform :mri do if ENV.fetch('RUBOCOP_LTS_DEV', 'false').casecmp('false').zero? declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) - gem 'rubocop-lts', '~> 24.2', '>= 24.2.1' unless declared_gems.include?('rubocop-lts') - gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.5' unless declared_gems.include?('rubocop-lts-rspec') - gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.6' unless declared_gems.include?('rubocop-ruby3_2') + gem 'rubocop-lts', '~> 24.2', '>= 24.2.3' unless declared_gems.include?('rubocop-lts') + gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.6' unless declared_gems.include?('rubocop-lts-rspec') + gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.8' unless declared_gems.include?('rubocop-ruby3_2') else eval_gemfile('style_local.gemfile') end diff --git a/gems/ast-merge/gemfiles/modular/templating.gemfile b/gems/ast-merge/gemfiles/modular/templating.gemfile index 6af159bd7..ce51a08ed 100644 --- a/gems/ast-merge/gemfiles/modular/templating.gemfile +++ b/gems/ast-merge/gemfiles/modular/templating.gemfile @@ -18,7 +18,7 @@ end if structuredmerge_remote # Merge recipes for released installs. - gem 'kettle-jem', '>= 7.0' + gem 'kettle-jem', '~> 7.1', '>= 7.1.26' end if kettle_remote diff --git a/gems/ast-merge/gemfiles/modular/templating_local.gemfile b/gems/ast-merge/gemfiles/modular/templating_local.gemfile index 60e184e01..70a80d5b9 100644 --- a/gems/ast-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/ast-merge/gemfiles/modular/templating_local.gemfile @@ -65,9 +65,7 @@ structuredmerge_local_gems = %w[ kettle_dev_local_gems = %w[ kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift ] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[] -kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - (declared_gems - %w[kettle-dev]) if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( @@ -81,6 +79,28 @@ if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 end if ENV.fetch('KETTLE_DEV_DEV', 'false').casecmp('false') != 0 + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - declared_gems + eval_nomono_gems( gems: kettle_dev_local_gems_to_eval, prefix: 'KETTLE_DEV', From 36abec2a6086b62733abcab09d788abeb96aba3b Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 23:50:44 -0400 Subject: [PATCH 077/137] =?UTF-8?q?=F0=9F=8E=A8=20Template=20ast-crispr=20?= =?UTF-8?q?by=20kettle-family?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr/.kettle-drift.lock | 76 ++++- gems/ast-crispr/.rubocop_gradual.lock | 7 +- .../.structuredmerge/kettle-jem.lock | 145 ++++----- gems/ast-crispr/Gemfile | 2 +- gems/ast-crispr/Gemfile.lock | 304 ++++++++++-------- gems/ast-crispr/Rakefile | 2 +- gems/ast-crispr/ast-crispr.gemspec | 2 +- gems/ast-crispr/bin/rubocop-gradual | 16 + .../gemfiles/modular/coverage_local.gemfile | 24 +- .../ast-crispr/gemfiles/modular/style.gemfile | 6 +- .../gemfiles/modular/templating.gemfile | 2 +- .../gemfiles/modular/templating_local.gemfile | 24 +- 12 files changed, 380 insertions(+), 230 deletions(-) create mode 100755 gems/ast-crispr/bin/rubocop-gradual diff --git a/gems/ast-crispr/.kettle-drift.lock b/gems/ast-crispr/.kettle-drift.lock index 98b009e1e..1b23f4793 100644 --- a/gems/ast-crispr/.kettle-drift.lock +++ b/gems/ast-crispr/.kettle-drift.lock @@ -1,10 +1,82 @@ { + "debug_env: 'KETTLE_DEV_DEBUG',\nroot: %w[src my kettle-dev]": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 46, + 63 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 93, + 110 + ] + } + ], + "path_env: 'KETTLE_DEV_DEV',\nvendored_gems_env: 'VENDORED_GEMS',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 43, + 60 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 90, + 107 + ] + } + ], + "prefix: 'KETTLE_DEV',\npath_env: 'KETTLE_DEV_DEV',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 42, + 59 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 89, + 106 + ] + } + ], + "vendor_gem_dir_env: 'VENDOR_GEM_DIR',\ndebug_env: 'KETTLE_DEV_DEBUG',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 45, + 62 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 92, + 109 + ] + } + ], "vendored_gems_env: 'VENDORED_GEMS',\nvendor_gem_dir_env: 'VENDOR_GEM_DIR',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 44, + 61 + ] + }, { "file": "gemfiles/modular/templating_local.gemfile", "lines": [ - 77, - 88 + 75, + 91, + 108 ] } ] diff --git a/gems/ast-crispr/.rubocop_gradual.lock b/gems/ast-crispr/.rubocop_gradual.lock index 4aa8596b3..3aa64baaf 100644 --- a/gems/ast-crispr/.rubocop_gradual.lock +++ b/gems/ast-crispr/.rubocop_gradual.lock @@ -2,13 +2,13 @@ ".simplecov:1693819493": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] ], - "Rakefile:461675613": [ + "Rakefile:3051721918": [ [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], [81, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], [165, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], [168, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] ], - "ast-crispr.gemspec:2970269655": [ + "ast-crispr.gemspec:1796256658": [ [137, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4147388508], [148, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], [149, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] @@ -27,6 +27,9 @@ [1, 1, 0, "Naming/FileName: The name of this source file (`vHEAD.gemfile`) should use snake_case.", 5381], [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], + "gemfiles/modular/coverage_local.gemfile:2813372128": [ + [34, 1, 1586, "Metrics/BlockLength: Block has too many lines. [37/25]", 820328175] + ], "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], diff --git a/gems/ast-crispr/.structuredmerge/kettle-jem.lock b/gems/ast-crispr/.structuredmerge/kettle-jem.lock index 57453e043..2e5913cfe 100644 --- a/gems/ast-crispr/.structuredmerge/kettle-jem.lock +++ b/gems/ast-crispr/.structuredmerge/kettle-jem.lock @@ -1,11 +1,12 @@ --- version: 1 template_state: - version: 7.1.18 - applied_at: '2026-09-07' + version: 7.1.26 + applied_at: '2026-09-10' changelog_replay: last_entry_key: kettle-jem-template-20260802-001 last_entry_date: '2026-08-02' + maintenance_changelog: {} checksums: ".aiignore.example": 48a5dfdd93afd1a15fdce39cc28ca9920263f00018b0968ab031fa744521e5ce ".config/mise/env.sh": aeea5a2ab489ba6e5467ae8de6e386ec8c8fe4ff31a044e69d0cd6a092dd6654 @@ -75,7 +76,7 @@ template_state: ".rubocop_rspec.yml.example": 288ad75e7eb14d87d80fafe6f7272217be5c57547536ee56c780a7d10ac7ec74 ".simplecov.example": 222f2e6ce8cf089c70a21f0f5e5423d4bd59a96fdb2ce7754b0fb3d6f430c229 ".structuredmerge/git-drivers.toml.example": 9d241a44c9edffcdbd3da018fa188a238089c3d1635040924df594a6929a4f97 - ".structuredmerge/kettle-jem.yml.example": 26949dc4ee0722415e72452cbc186bee6ef7b154eae33166d36f3fdb1ca6e46d + ".structuredmerge/kettle-jem.yml.example": ff65a738da1af7d60714026a81d3323a46c864e96ae3570b806afdf6e7149ff9 ".yard-lint.yml.example": 90def46867c9436b4e177c47d91fc8165f4602e335715aecc39f5587ae20b55b ".yardignore.example": 821f453c609df7d46145d675424b39dfbe6dfdca8edac5f367b85fff48502455 ".yardopts.example": 6fd6f2701713096a8a9ea095c213bbc68eeef37797c4754d97837e3229a3a5f6 @@ -88,7 +89,7 @@ template_state: CHANGELOG.transfer.md: 21331d8a9e58b4ff6e088b88eb408bcccb0f2f64e78f8f4d42ac3f11a24baad8 CITATION.cff.example: e404ea0a7919d78a83d53d80e211d17b9663576aa606583b709795dc023fd75c CODE_OF_CONDUCT.md.example: f1ad532f1860f73ef774c6b27a26d41f4bc1cb8813034f5957487766ebb0986b - CONTRIBUTING.md.example: 22570cfb3dde72be79b4b522b6d5ab13f95d778e40444483a096871fe0891b19 + CONTRIBUTING.md.example: 8d23cce2d061e0c20d619c3f66591df5f32821cd84c32d171df0b8ebe1217a55 FUNDING.md.example: 392d047904b1557b29f4b43d37ec403b7480edd5b6ab51180be979b57a91e6ba FUNDING.md.no-osc.example: 3ef0258dd3e3b7f7e17e8bc2d20dcbcb3e74aa5a5a6f51297075696645e34c77 Gemfile.example: 99500023987e81775a9b5ef14e92cb3992f2ac408e5f42454f2728eee9b49fb2 @@ -99,19 +100,19 @@ template_state: PolyForm-Small-Business-1.0.0.md.example: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 README.md.example: 21f491e3d73bfc1b74056a6dcba61f72c93dee3cfe5272ac164a20978454de21 REEK: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - RUBOCOP.md.example: c09e5533ccc59b70a2efa05c99f66e521137c1053d3c12eb43509cebd5b68b0e + RUBOCOP.md.example: d99871a0e4c1d323c92e7febf328f062bb4722069b2abfd0a83bf7daa8dcbf8c Rakefile.example: 569803e726b07ea26267fec6891367a3096a0dff3c266269a7081d36afe496af SECURITY.md.example: ee9411aa85f36d88363fdaea7a1baea4362b6ec112cf2688e711b05de1d3144c bin/setup.example: 0ac35089c95a91d8973fe7a318bf9fd98b9f8e00db92c5d9ca6cd858abb8d41b certs/pboling.pem.example: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - gem.gemspec.example: 83e834e8958a88e4817a57199f48f5ebb245548ce251c5c47372208693f03b17 + gem.gemspec.example: 12dcadc0b297ccd4e18b9d1e538b98ac8330ef9fb2a059ed6754ad59272b77fa gemfiles/modular/benchmark/r4/v0.5.gemfile.example: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 gemfiles/modular/benchmark/vHEAD.gemfile.example: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 gemfiles/modular/cgi/r4/v0.5.gemfile.example: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 gemfiles/modular/cgi/vHEAD.gemfile.example: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 gemfiles/modular/changelog.gemfile.example: 892598e0e7792eb205247ae28128cef6dfc647d2fb33968969152230d6f69288 gemfiles/modular/coverage.gemfile.example: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - gemfiles/modular/coverage_local.gemfile.example: 928d5f260d7b119c038baa56da9fb78dd524dee613aea33ab72894bbce5c506e + gemfiles/modular/coverage_local.gemfile.example: 92ea0d7a9d693553dc614afa2c43990f5c3778c2b00ef6c528e122c31bd506a1 gemfiles/modular/debug.gemfile.example: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 gemfiles/modular/documentation.gemfile.example: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c gemfiles/modular/documentation_local.gemfile.example: 84a20f5d4b0feb94c2cf2f7a8dce8f682f1483498e41484c2b447a5661fd1870 @@ -145,10 +146,10 @@ template_state: gemfiles/modular/stringio/r3/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/r4/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/vHEAD.gemfile.example: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - gemfiles/modular/style.gemfile.example: 3ad0585b4f2db8918580ca41ea8723f7a166d7a83cfd7f9613511094997106fd + gemfiles/modular/style.gemfile.example: 02fe3e8fd00e49b90c3ab30e19b51014ee50490f3eadcfd1d4a39f4c2c997dda gemfiles/modular/style_local.gemfile.example: c86beb711e766126a5be68be4be18255831625ac3650d5069383c4a83a9511f3 - gemfiles/modular/templating.gemfile.example: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - gemfiles/modular/templating_local.gemfile.example: 930057d3b909a72e39a39125c4e883a7ff71f5691e64426c0541f8c8fc75b83f + gemfiles/modular/templating.gemfile.example: 2b33c094677b53ad9dd2eafeb3a3be452f612380c61001a2e75b3c078b8ff72a + gemfiles/modular/templating_local.gemfile.example: ac7259516e69ffafb8b9342a897ddf6042adc46335743f474c342509cefd8f2e gemfiles/modular/webrick/r4/v1.9.gemfile.example: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea gemfiles/modular/webrick/vHEAD.gemfile.example: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b gemfiles/modular/x_std_libs.gemfile.example: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a @@ -175,7 +176,7 @@ template_state: shim/Gemfile.example: 0fb0d9d06fcfb1fd6ca6f0eeb5867253ca1ed221e03d28027719225f868b0637 shim/README.md.example: 3a2f7211b7f92a1dfae5e523b8e34b051a3d8af942144b05286eca0b3c8f6fbe shim/Rakefile.example: 572c94da7052083b39b62a6600785419e314a109efd7a3d8c3a96eb77ad34fd1 - shim/gem.gemspec.example: efae033238e4fd1355cfc134f5c9123f175d1ad1dc4a1a2e663899788c9e0870 + shim/gem.gemspec.example: 14a7015b3328005d1c3b5fda6886bd6da383707745f6eaaa781d6f9689600131 shim/lib/compat_require.rb.example: 94ee85e353a3ca08c8a35c9063d4ff789214ea594c7f803f6cf09d7142f48379 shim/lib/entrypoint.rb.example: dd57613520daca01d6f6bcaa9b83b00ff74505240dc04b84ceb686df3c0539d7 shim/lib/version.rb.example: 15e219ac3a928b5580035f891e415551213175020f1131f6e7ca0ccd55a1b2d6 @@ -189,370 +190,370 @@ files: recipe: template_source_application_simplecov action: write dest_sha256: 4dfdaf8b1177eb43511bcca96fafb2ebfbfb7cb3dba1baf3c4fc370f92b8bd59 - input_fingerprint: ced345b447ffc7247dfb52aabf7f144751d2860421bfa428a2a27b8522846520 + input_fingerprint: 9c4163f8b3336b88459249edfcf8e54e717fbb9430651d7dd9cc661e06f94797 template_sources: - ".simplecov.example" AGPL-3.0-only.md: recipe: template_source_application_AGPL_3_0_only_md action: write dest_sha256: d8a6cc31abc16b6748c7a21f21611f5a1ec33f67d22ca23d7da1c19b95496bee - input_fingerprint: fa580f4d659e96cb7e15976acf3094e65d0ae8e9bb3c4b0fbce5258e527767c4 + input_fingerprint: b6284fc06055c2d3212f79fac9d625d5a2f57a20be259ef1cfadd688bab5c06a template_sources: - AGPL-3.0-only.md.example Gemfile: recipe: template_source_application_Gemfile action: write - dest_sha256: d52b85dfa296638a88c9fb2fbc03f3382dde68f33778dc8781961a2db22541e3 - input_fingerprint: d6a07a1a631c6b9300ced28e823703ab12ad42d593364a2d106469fa39aca4bf + dest_sha256: 2192a6011c47262c40f547b896eece0c989d0369a52b7a482ba9ea6cc5eb1d58 + input_fingerprint: ce8008b7b172679dce08398a73970ad9d2d9cfee768c7792c715821d35805e47 template_sources: - Gemfile.example LICENSE.md: recipe: template_source_application_LICENSE_md action: write dest_sha256: f6188bfd474a636d2a526420ebb411250faa447d94c9b9ccee097128ce4101b5 - input_fingerprint: 6995e53436e98586465a2707432534a5e805124efe8f7ab26567ad0a584a0598 + input_fingerprint: 03a31793addebf653e3dc2a3fddcb69c2a13725c5823692a2d211a864d6b0c7d template_sources: - LICENSE.md.example PolyForm-Small-Business-1.0.0.md: recipe: template_source_application_PolyForm_Small_Business_1_0_0_md action: write dest_sha256: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 - input_fingerprint: '08cfba630f9ca035f6aa64bd022dcf522e92b6c429bcb0acb3a1a94d69df34da' + input_fingerprint: b1b5dc4cd4f2fa369f7e7c855c48d0cafd3008373cf319dba7b518453fdcd5b0 template_sources: - PolyForm-Small-Business-1.0.0.md.example README.md: recipe: template_source_application_README_md action: write dest_sha256: 2ee9aa63c88df3847cbc09d58bfdc354225b2b31a17f6c8cd033e27613b3dbd1 - input_fingerprint: 0757e0f289073b8be8c04c08c1bde410aedc02a035e8e5f6c0cca2f85c3b9af5 + input_fingerprint: b8019069b3c4a79726c44ece01bd7abf5754af9f5e0c0618d1a601259e11bcaa template_sources: - README.md.example Rakefile: recipe: template_source_application_Rakefile action: write - dest_sha256: af0dd571e4a5d76c43fa8fcfa100f9d27d2466a27f4a8dbf3b2f55ed3a1cb0a7 - input_fingerprint: 78b7cdad245e6359322eb5dd705648e0b7e6f285a4c9247bf766ba5c8cfcc13c + dest_sha256: d6f745707f2372e674e458e454c038f837ab193ed514c4f8d3a8e2524e0a5c85 + input_fingerprint: 37928e3f6b4830ddb267fc9f89f6f1fd4189c3ade951df718e668e5d6f437e32 template_sources: - Rakefile.example ast-crispr.gemspec: recipe: template_source_application_ast_crispr_gemspec action: write - dest_sha256: 6b0fbe4d2f3ce68f22926270b3e97de2ea78a3450986ed85a37304e39cdec329 - input_fingerprint: 755b7d06c9b5332eb02763bb4afd07ea2e78b48cc54a94f435369b888dd209c3 + dest_sha256: 70c91f4ae5739b75c909d7ac532c4495d88fbf2b27acfd73c8be4a7f60b41a44 + input_fingerprint: dc1caba13b164cc76340c6fa8cc2c6d292488d9fe57f2772c7a3c0cc6b563026 template_sources: - gem.gemspec.example certs/pboling.pem: recipe: template_source_application_certs_pboling_pem action: write dest_sha256: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - input_fingerprint: c2d9b77563e5b946231950fad909bac9e0614d94c7ce2d5b76ab18c26f1012af + input_fingerprint: db7bf069fcd24f8b4001713c6a5ab7056cc3b612dd4df1539ed8418c031c4704 template_sources: - certs/pboling.pem.example gemfiles/modular/benchmark/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_r4_v0_5_gemfile action: write dest_sha256: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 - input_fingerprint: 55764d69b8511ac50ae1d5884e9c3885e4e106c0e88398e5a9219b4857548e6e + input_fingerprint: f01c4f69ed639e9c217f9cc3b4cc4bd46afc496dcf9065ecb52dacaa1e86daf6 template_sources: - gemfiles/modular/benchmark/r4/v0.5.gemfile.example gemfiles/modular/benchmark/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_vHEAD_gemfile action: write dest_sha256: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 - input_fingerprint: bd9828f14d0353a99b4b2deab02cb011d515026a4722abfdc75d293a91640a41 + input_fingerprint: db8b688e05fbfb790f683e4f6a2c210baaa53e837976779e9551d377a011f686 template_sources: - gemfiles/modular/benchmark/vHEAD.gemfile.example gemfiles/modular/cgi/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_cgi_r4_v0_5_gemfile action: write dest_sha256: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 - input_fingerprint: c578696262aa4056e8a646b3e8cddd8d510fcfcf9df526727ef4c65a18207187 + input_fingerprint: 1ed660b44106a7f3d0b9507dddb3a286101efae89481720c493c01f8b425bb24 template_sources: - gemfiles/modular/cgi/r4/v0.5.gemfile.example gemfiles/modular/cgi/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_cgi_vHEAD_gemfile action: write dest_sha256: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 - input_fingerprint: c320377f2dc6af6ad0a0ef66a63065d08dd998a43e69bc01a268262981aa81c6 + input_fingerprint: c4e11c95f9612c32f5af448293b42a5e031012be23ed1bd543ccdeb33bc740b7 template_sources: - gemfiles/modular/cgi/vHEAD.gemfile.example gemfiles/modular/changelog.gemfile: recipe: template_source_application_gemfiles_modular_changelog_gemfile action: write dest_sha256: da669526144fbff33aef207db9541b6fd6c254437f94dec2fab70fc55a7757cd - input_fingerprint: 13bd30b450d5b69f75c75f4fec8491674de4d94c8f1498975935814bf15e0116 + input_fingerprint: e28514a4b4ece8b1192e16ad47dde8fc33438e05325ef1b21c958160d6299def template_sources: - gemfiles/modular/changelog.gemfile.example gemfiles/modular/coverage.gemfile: recipe: template_source_application_gemfiles_modular_coverage_gemfile action: write dest_sha256: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - input_fingerprint: fd39c28fd083619e47f88ab860883adf3e7fc3f5bd8b3acf9dc61cd911348926 + input_fingerprint: 86d4f12d800a5b0cdae6fba39bfb70d3ae4743457c30131af5a72d90a17053b2 template_sources: - gemfiles/modular/coverage.gemfile.example gemfiles/modular/coverage_local.gemfile: recipe: template_source_application_gemfiles_modular_coverage_local_gemfile action: write - dest_sha256: 2b493414df06261ba8acb6f0eb18bf3fdd701d7cb5f967a9d15a3f42a4741827 - input_fingerprint: 729331d937c72359798af7e9248d8117ea297e8f63c4ff0cb01886f508834287 + dest_sha256: 92c9a599c8f6867ec532880f73568f2736ac05d8973ec524b42fd5dbe6aeda3e + input_fingerprint: bcbc0404e3d0da099e68fa34fdc00a6bf584dfd4368661eb31c9c68a47f46878 template_sources: - gemfiles/modular/coverage_local.gemfile.example gemfiles/modular/debug.gemfile: recipe: template_source_application_gemfiles_modular_debug_gemfile action: write dest_sha256: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 - input_fingerprint: '097eda229951245b0fdd2ef602f1259a4463cfd40fcf2090e416f84e57682871' + input_fingerprint: bf8af287d46e36612267922eb0747955e126eb14c5d4fb2d0fa857442129c29b template_sources: - gemfiles/modular/debug.gemfile.example gemfiles/modular/documentation.gemfile: recipe: template_source_application_gemfiles_modular_documentation_gemfile action: write dest_sha256: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c - input_fingerprint: 621c7f205182c609fb9dae16f3718fabde2585d6906023d30f5255483ee07862 + input_fingerprint: edb2eaa92426d8e84b9a03c43f19a4668dfe1406499b8037c9eb3dbc55edc04d template_sources: - gemfiles/modular/documentation.gemfile.example gemfiles/modular/documentation_local.gemfile: recipe: template_source_application_gemfiles_modular_documentation_local_gemfile action: write dest_sha256: 2058173855b9a4acc6d5efa20520e49734243eef6cf0b5e9063e0e5866a08e9c - input_fingerprint: 944acff450a581e393c6bd0f4ddf8dfa6f707505d41fbffb3bf272054272c901 + input_fingerprint: 9e316bd16800e07925ecdb0f12924e583c0801e8306eb8a042e7080f335d5fdd template_sources: - gemfiles/modular/documentation_local.gemfile.example gemfiles/modular/erb/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r2_v3_0_gemfile action: write dest_sha256: 3793e7dc9ef23a7ccd893d48cbba092fd27594c63e65cca011cc658218425670 - input_fingerprint: bb7953ddb89611bd26f99248c632ca9bb8172ab6b0dc4be4d82c288c4e3afe1a + input_fingerprint: 9acb5c25c815a2914d7b5634aab3539739c4295bb78f666535174cbbae134838 template_sources: - gemfiles/modular/erb/r2/v3.0.gemfile.example gemfiles/modular/erb/r3/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r3_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: e3a15f621d434e085c58d4af70d2425c99f889470c88104acfa460867988b308 + input_fingerprint: 3b475202c25f1f85dc513d614beee51ff388cae3cf3eec9e0761f1669cdba532 template_sources: - gemfiles/modular/erb/r3/v5.0.gemfile.example gemfiles/modular/erb/r4/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r4_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 35943a2c2f4644d2637284af02e557a1ee6c2cdf3208f2d481c4fd85fa38c3a9 + input_fingerprint: 4a084db70b10e0bee0af7401b5af423a63cad84eedb5ea6978e0158b02fef9b3 template_sources: - gemfiles/modular/erb/r4/v5.0.gemfile.example gemfiles/modular/erb/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_erb_vHEAD_gemfile action: write dest_sha256: ad6f104a49e80e0cf625440e3dc816343fe7e2f037fc4971df75e7bb4305c683 - input_fingerprint: 3d096c9550e0b81878cbd860be569cdef152bf2f7221114e394b2df465da1c94 + input_fingerprint: 109c10cf57c703b230208a6d1162352b3fecfdc538492f348ba052a955485855 template_sources: - gemfiles/modular/erb/vHEAD.gemfile.example gemfiles/modular/json/truffleruby_22_3.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_22_3_gemfile action: write dest_sha256: 249c12eacbe90f9d0d2e81e7a62c4c7e9102e504ededcda4ecf660cb3bb68be4 - input_fingerprint: 2169c0a04ff30c76ab8ec5c939abd5d95be267afa25a6daec5da4b9db24457eb + input_fingerprint: 5a30d72a567f1e8e64b4e96f34b4314e2dd46d007996ec3d382f1d0692be84c5 template_sources: - gemfiles/modular/json/truffleruby_22_3.gemfile.example gemfiles/modular/json/truffleruby_23_0.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_0_gemfile action: write dest_sha256: 66aa010567f7afa1af8244a74c3c88ecaaf84dc87b6a25180691bb480d02ed28 - input_fingerprint: 62a0aeeea692d314f38714377ab6909fe29ee3fb06a95685970f9a8b8fa5803b + input_fingerprint: ed5424432aec0497eea1c2c08e21a36fc64b76ed3cf23e674df02286a4e77b43 template_sources: - gemfiles/modular/json/truffleruby_23_0.gemfile.example gemfiles/modular/json/truffleruby_23_1.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_1_gemfile action: write dest_sha256: '080fcbdaf2bec73cad40832a3d51eebb380af789917b96f493d1460b0dd6361d' - input_fingerprint: 7f060f4f40f4cc35ca786bc8fd32f8f304adf97693c9c11e02118474981ec705 + input_fingerprint: 8302249c86528a8c85565af61414534f08b4c7c7c10591c4eff0e2e62521a248 template_sources: - gemfiles/modular/json/truffleruby_23_1.gemfile.example gemfiles/modular/mutex_m/r2/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r2_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: fb03b8ec693723b22f29acb3f816947539df12a8dff0e8fae13c4670ebca531b + input_fingerprint: 206af86a4183068e1a8f18633694756887da36aa01a14fb3c46c4e6a28d1bce0 template_sources: - gemfiles/modular/mutex_m/r2/v0.3.gemfile.example gemfiles/modular/mutex_m/r3/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r3_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 0362f08bf84607444303b707b0b6ec924316ef7fc3688107b224d617c15b6748 + input_fingerprint: 48495eb89a16c56a4a2cf97a53e71be3e3e053972fd260afee1bd1d948bfbc1a template_sources: - gemfiles/modular/mutex_m/r3/v0.3.gemfile.example gemfiles/modular/mutex_m/r4/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r4_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 598ecfc05491183b35fcda81ed9a6fe6302058ed592b6e167f9ab3f300dde44f + input_fingerprint: d95d3878dca110acc7eb8083ccddcb8fdea447985ea85f75cd4d7f9a68233123 template_sources: - gemfiles/modular/mutex_m/r4/v0.3.gemfile.example gemfiles/modular/mutex_m/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_vHEAD_gemfile action: write dest_sha256: '08018641c97f894788fa91b462da504ab2237213d18d95404136c393274ae3cb' - input_fingerprint: 39238ac27c4b65e6209b36715c89290262431cb058560c214d70826116a9625e + input_fingerprint: 43633625fc836a1a9ddb7dc7312ce6d865687b4e292bfe199b814360fc4e4251 template_sources: - gemfiles/modular/mutex_m/vHEAD.gemfile.example gemfiles/modular/optional.gemfile: recipe: template_source_application_gemfiles_modular_optional_gemfile action: write dest_sha256: f770e6e9a9dd2bd0f1f132e882d88038b2e21127dce3afe270908c7338c28bfd - input_fingerprint: 7331e361d1d4f440344df31a3036fe92e2d43ebac596b235ec02375363da378f + input_fingerprint: e6294498442ad0f53675eed7a83e69288afbaa5e8c92d26dca1dca92c2b985fb template_sources: - gemfiles/modular/optional.gemfile.example gemfiles/modular/rspec.gemfile: recipe: template_source_application_gemfiles_modular_rspec_gemfile action: write dest_sha256: d043f5c9344f6435edb4607c5adaf42c78e7fb6b8b6726007de2bbedefb376c3 - input_fingerprint: 17b0b41b5c50254cf9e97b0a046851f111610850a2478b139daa4b521a347b57 + input_fingerprint: 6c51e2cc25bb8e726b90a8b495a1e5740b245825117c079969f35eb2100cc63f template_sources: - gemfiles/modular/rspec.gemfile.example gemfiles/modular/runtime_heads.gemfile: recipe: template_source_application_gemfiles_modular_runtime_heads_gemfile action: write dest_sha256: 6ac7158c4a3088190f2a9082f01439eb27eca2172ab3464b15c9cb045aa885e1 - input_fingerprint: 2ccfddcc675fc0cc06060c9b69156e24ba4e81e6ab90025da2a8846c68d43249 + input_fingerprint: 714b25f536db3642c3523968d26b1f5c27a66f188d3714c37fca338bbc2060d3 template_sources: - gemfiles/modular/runtime_heads.gemfile.example gemfiles/modular/stringio/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r2_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 28d10a5aadb493024645b2e9f5ba8b9115c07eac7f44246f0d46f7cfe72c3374 + input_fingerprint: 833ab5d57f1f07722ee7efc7fcb475ec1179eb6548e2bc377ecc9ed80640ae71 template_sources: - gemfiles/modular/stringio/r2/v3.0.gemfile.example gemfiles/modular/stringio/r3/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r3_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: bd8e445ce27f0f07787a30269ce508d0134992e72be77c3f95ec5de8bd2e9a8f + input_fingerprint: 7957ba628c51c3249a9498929a2b7082dec0947f250fb70192d6d181595961f7 template_sources: - gemfiles/modular/stringio/r3/v3.0.gemfile.example gemfiles/modular/stringio/r4/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r4_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: d1d0b8b8d3d29eabdbd587f49e1783b3212598c8dc2fb92006c5c4bb7bf08c13 + input_fingerprint: 148d86861f582ad01125f61163713fea831971de05ab9ad17ff78c326e2aaf4b template_sources: - gemfiles/modular/stringio/r4/v3.0.gemfile.example gemfiles/modular/stringio/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_stringio_vHEAD_gemfile action: write dest_sha256: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - input_fingerprint: 37c0b409572ca7c988befb8503a94304e1c029aa63fb3d3decc95687011d3138 + input_fingerprint: ddbd35e720f4442010e86296b0d7c8eaa631ef152ea7dd566564b4f42aa1cc08 template_sources: - gemfiles/modular/stringio/vHEAD.gemfile.example gemfiles/modular/style.gemfile: recipe: template_source_application_gemfiles_modular_style_gemfile action: write - dest_sha256: 2a3d46dcb8a9394f595f273f5eb0403d0a552837754ab109afc9ba79a7159083 - input_fingerprint: 86c5f41750cc44b51eee8b72e720329f0361be6e9781a795d495ef29ec0bd6af + dest_sha256: 9a24acff0054573c30f5d84d0418cd465ba3794d075bb5a36801410ac40e0787 + input_fingerprint: 3c990acada9e5519739ee154150b06edfb2a661b3d8fb50aafdd052c92f51414 template_sources: - gemfiles/modular/style.gemfile.example gemfiles/modular/style_local.gemfile: recipe: template_source_application_gemfiles_modular_style_local_gemfile action: write dest_sha256: 55eb9c149cdb2f29c9f31abe2d55a4f334e00fb859681dd17c42149a3f28ca36 - input_fingerprint: 56a8634875f6a4b8d7de39080af27be33999d60793cce8af86e3c5a507fcf7c3 + input_fingerprint: 8e4e6643b3f08b25e19a01b179aa8a90cf2527c1fdf089a5afb26813acadf0ac template_sources: - gemfiles/modular/style_local.gemfile.example gemfiles/modular/templating.gemfile: recipe: template_source_application_gemfiles_modular_templating_gemfile action: write - dest_sha256: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - input_fingerprint: 59fcc3b27450ce6705f9269a00fe2798242a3fef3751c68abcee3cbc644e73da + dest_sha256: 432ba59798d31b899268257c432443a017c5a9bd2c0c7f9f2216617e14150cd3 + input_fingerprint: 847dcf2da46c154c73fb5d096e64844ffd3bac94924f1d3dd65145b452e65662 template_sources: - gemfiles/modular/templating.gemfile.example gemfiles/modular/templating_local.gemfile: recipe: template_source_application_gemfiles_modular_templating_local_gemfile action: write - dest_sha256: 55877ae74385219f22620b6e4ed1d93c4b46e951666e86b486bd96fc122d9f03 - input_fingerprint: d4d69ae3fc4ff0f118392cefc876adfb832fc39017d31f050dbc8f9be75958c4 + dest_sha256: 46554990fc40e72c2a4f05fac8e1dcdac25dc723eb14c544e283540f1acbf249 + input_fingerprint: e6d82495a09263d6482ff6819634e36dd2e0c35ad635cc7eced746871e735642 template_sources: - gemfiles/modular/templating_local.gemfile.example gemfiles/modular/webrick/r4/v1.9.gemfile: recipe: template_source_application_gemfiles_modular_webrick_r4_v1_9_gemfile action: write dest_sha256: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea - input_fingerprint: 1197a45b3e77ffe7bf35d16ea212a4d706c628f764b66ad0112a9008135bf456 + input_fingerprint: 66f9d3e2967d97032cf6ad75da9cd9fc197dd54f784affd8f353f46793b43a0d template_sources: - gemfiles/modular/webrick/r4/v1.9.gemfile.example gemfiles/modular/webrick/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_webrick_vHEAD_gemfile action: write dest_sha256: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b - input_fingerprint: 4e9bd84505f6357e234c468aa8bc6c927938b7a473875937ad59333a0e206697 + input_fingerprint: 1b7cde304be45d7e827c791eff7562a0ccc28c0f88da8ff24675164642240b19 template_sources: - gemfiles/modular/webrick/vHEAD.gemfile.example gemfiles/modular/x_std_libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_gemfile action: write dest_sha256: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a - input_fingerprint: d4d8f88d22c41e7ce1a178d5bf197890e3fcc0a5effa1db4a49b71b015b09bbf + input_fingerprint: 4610f7a852c8d6858a457c1dd26762bd517c7a9b02c3650a8ed099dfa4a991a2 template_sources: - gemfiles/modular/x_std_libs.gemfile.example gemfiles/modular/x_std_libs/r2/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r2_libs_gemfile action: write dest_sha256: e80ec8ad06cb1b31ac982bc25cf7696987fca131aa1001eaefd0bf5cd379c273 - input_fingerprint: 6271bf4326bf857c7ea06bb8332249d8cdf901c9d20c74fad8a581a16fd37557 + input_fingerprint: d0a7ed98563b7be0b7dfcd35020cb93371e98920bb889d8ae8d09a5e37eb52cf template_sources: - gemfiles/modular/x_std_libs/r2/libs.gemfile.example gemfiles/modular/x_std_libs/r3.1/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_1_libs_gemfile action: write dest_sha256: 9f8565c40b09bea1bc4c2e2ad87fe11400c3c51a2b235655bfcd8e491ed88ca8 - input_fingerprint: 64c3bce477f5c0ba3c851d133b3026d410aa61d0579dc24a34c8c2fb57cce6d9 + input_fingerprint: e314b1d361eba9d2bcaccddb55e168e8782f0dc0e59f8c2d90faa8935f98d54e template_sources: - gemfiles/modular/x_std_libs/r3.1/libs.gemfile.example gemfiles/modular/x_std_libs/r3/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_libs_gemfile action: write dest_sha256: 546f8849f4267bb19aa10ff0de40be30957197f229e6887847181ea9127b2650 - input_fingerprint: 5f96424b8fa18937eb13820bd6864675ef811a5eb69c7660abf8d5ffdf9017b9 + input_fingerprint: e3724b16bb0732dc607570706db3079dc990b693fbd42259487274ba18d7aecf template_sources: - gemfiles/modular/x_std_libs/r3/libs.gemfile.example gemfiles/modular/x_std_libs/r4/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r4_libs_gemfile action: write dest_sha256: 8c2582eaa218d216b98c86c933465295c8b4e43f3251ea388b9eaf6e471f8da6 - input_fingerprint: b17c59c2038cef6ccc12f1d47898cd974c9afdb9a74aed4c03ec960b16c93dde + input_fingerprint: bddfb1ad38a9d774397bed51ce2cfd39faa64845f6bb9d21ff2f98f13c706acd template_sources: - gemfiles/modular/x_std_libs/r4/libs.gemfile.example gemfiles/modular/x_std_libs/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_vHEAD_gemfile action: write dest_sha256: d3133ec4c0638363a7fb025d19be7e95a615fd61c35ddb8d17f2280ee74a7486 - input_fingerprint: 2089d801a8db89042fdb1ec53367e8aca80b87dbca63d45a0bf2faa4266d18cb + input_fingerprint: d0eddf5650986228ba5953fbd7944ba014bff7b6c87ff09133acf58b61ec2386 template_sources: - gemfiles/modular/x_std_libs/vHEAD.gemfile.example lib/ast/crispr/version.rb: recipe: template_source_application_lib_ast_crispr_version_rb action: write - dest_sha256: 9416c0d56e9e872f700b7d0d9870dc9b663e1b7ed598d8d468073faa14132e92 - input_fingerprint: 6f8117be2e24417d73d57edf65864aa542e6963be3ca008d9b86759f91f573b1 + dest_sha256: eac347db1f675190644e2a75426ac71cf9c4dcc3e3e7b29ac0a0731e65b703eb + input_fingerprint: 5b7628ac53826879521fbe4909ea11321b78a868ed302cca00feca26a2264b09 template_sources: - lib/gem/version.rb.example mise.toml: recipe: template_source_application_mise_toml action: write dest_sha256: 491df76688079679de0a0b7cef55cad315b5b5907f92e825cb9a4655e9c671bd - input_fingerprint: 80e680cda01a80119746e99bdd2c1c67d67983030230c975ab0b8c7f86427aa0 + input_fingerprint: 91fb8d24448ba1cb59e99f87cc4c694b7fb8f3cd9aae2e416f02a60ae0ad1f09 template_sources: - mise.toml.no-osc.example sig/ast/crispr.rbs: recipe: template_source_application_sig_ast_crispr_rbs action: write dest_sha256: 5c2025a4bc0f20b439a1ad3eabd2df9b23be17a31c37f61007666324d40a2e51 - input_fingerprint: 765934f8f213d5f5fb47755459fdab1674c5a68270f3a5a506c53f1b3dd2f294 + input_fingerprint: 01a62771bf0ac865b5bf0ec90f7e975a0ba930613544b7f0d11d4e718363f657 template_sources: - sig/gem.rbs.example spec/spec_helper.rb: recipe: template_source_application_spec_spec_helper_rb action: write dest_sha256: d4130763a095d854defdd613d5360414e44c12497631cd6333d6f4a93a26dabc - input_fingerprint: c8be97983ac48e6e03c0e3552fd621721bf9854ae2e004cdce0304929d18ed84 + input_fingerprint: 18b227f1bcf379ba2ea14c77123ac6a4b754fa68679da94822fd3068968b8c0a template_sources: - spec/spec_helper.rb.example diff --git a/gems/ast-crispr/Gemfile b/gems/ast-crispr/Gemfile index 44db5bda9..25e852efc 100644 --- a/gems/ast-crispr/Gemfile +++ b/gems/ast-crispr/Gemfile @@ -19,7 +19,7 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } # Include dependencies from ast-crispr.gemspec gemspec -gem 'kettle-family', '~> 1.2', '>= 1.2.97' +gem 'kettle-family', '~> 1.2', '>= 1.2.100' # Local workspace dependency wiring for *_local.gemfile overrides gem 'nomono', '~> 1.1', '>= 1.1.5', require: false # ruby >= 3.2.0 diff --git a/gems/ast-crispr/Gemfile.lock b/gems/ast-crispr/Gemfile.lock index 62b9692fd..0457d6b81 100644 --- a/gems/ast-crispr/Gemfile.lock +++ b/gems/ast-crispr/Gemfile.lock @@ -10,123 +10,123 @@ GIT PATH remote: . specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) + ast-crispr (7.1.9) + ast-merge (= 7.1.9) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) + ast-crispr-markdown-markly (7.1.9) + ast-crispr (= 7.1.9) + markdown-merge (= 7.1.9) + markly-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism specs: - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) + ast-crispr-ruby-prism (7.1.9) + ast-crispr (= 7.1.9) + prism-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ast-merge-git (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: - ast-merge (7.1.8) + ast-merge (7.1.9) benchmark token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) + ast-template (7.1.9) + ast-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + bash-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + binary-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) + citrus-toml-merge (7.1.9) + ast-merge (= 7.1.9) + toml-merge (= 7.1.9) toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge specs: - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) commonmarker (~> 2.2) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) + dotenv-merge (7.1.9) + ast-merge (= 7.1.9) + plain-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + go-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + html-merge (7.1.9) + ast-crispr (= 7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + json-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: - kettle-jem (7.1.25) + kettle-jem (7.1.26) addressable (>= 2.8, < 3) ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) @@ -160,122 +160,122 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge specs: - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown (~> 2.5) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + markdown-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) + markly-merge (7.1.9) + markdown-merge (= 7.1.9) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge specs: - parslet-toml-merge (7.1.8) + parslet-toml-merge (7.1.9) toml (~> 0.3) - toml-merge (= 7.1.8) + toml-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + plain-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) + prism-merge (7.1.9) + ast-merge (= 7.1.9) prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + psych-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) + yaml-merge (= 7.1.9) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) + rbs-merge (7.1.9) + ast-merge (= 7.1.9) rbs (>= 3.10) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + rust-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) + smorg-rb (7.1.9) + ast-merge (= 7.1.9) + ast-merge-git (= 7.1.9) + bash-merge (= 7.1.9) diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) + dotenv-merge (= 7.1.9) + go-merge (= 7.1.9) + html-merge (= 7.1.9) + json-merge (= 7.1.9) kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) + markdown-merge (= 7.1.9) + plain-merge (= 7.1.9) + prism-merge (= 7.1.9) + psych-merge (= 7.1.9) + rbs-merge (= 7.1.9) + rust-merge (= 7.1.9) + toml-merge (= 7.1.9) + typescript-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + toml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: - tree_haver (7.1.8) + tree_haver (7.1.9) citrus (~> 3.0) parslet (~> 2.0) tree_sitter_language_pack (>= 1.16.2, < 2.0) @@ -284,25 +284,25 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + typescript-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + yaml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) + zip-merge (7.1.9) + binary-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) GEM @@ -336,6 +336,8 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) + commonmarker (2.10.0) + rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -465,11 +467,15 @@ GEM lint_roller (1.1.0) logger (1.7.0) markly (0.19.0) + mini_portile2 (2.8.9) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) reline (~> 0.6) mutex_m (0.3.0) + nokogiri (1.19.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-musl) @@ -503,6 +509,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) + rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -696,6 +705,9 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_sitter_language_pack (1.16.2) + rb_sys (>= 0.9.130, < 0.10) + sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -784,9 +796,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.31) + kettle-dev (~> 3.0, >= 3.0.34) kettle-drift (~> 1.0, >= 1.0.13) - kettle-family (~> 1.2, >= 1.2.97) + kettle-family (~> 1.2, >= 1.2.100) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) @@ -807,12 +819,12 @@ DEPENDENCIES reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) - rubocop-lts (~> 24.2, >= 24.2.1) - rubocop-lts-rspec (~> 1.0, >= 1.0.5) + rubocop-lts (~> 24.2, >= 24.2.3) + rubocop-lts-rspec (~> 1.0, >= 1.0.6) rubocop-minitest (~> 0.40, >= 0.40.0) rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! - rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) ruby-merge! ruby-progressbar (~> 1.13) rust-merge! @@ -843,33 +855,34 @@ CHECKSUMS appraisal2 (3.2.3) sha256=3a6cfaf8a444e02707b9a34154af1c4902fbe99d9d2168d7e81dd83ec77e6db7 appraisal2-rubocop (1.0.2) sha256=1dae97c1be087cf9c098a3a72fd41f873435e9b8b39687e633b36c9ccb22bff4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.8) - ast-crispr-markdown-markly (7.1.8) - ast-crispr-ruby-prism (7.1.8) - ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) + ast-crispr (7.1.9) + ast-crispr-markdown-markly (7.1.9) + ast-crispr-ruby-prism (7.1.9) + ast-merge (7.1.9) + ast-merge-git (7.1.9) + ast-template (7.1.9) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.8) + bash-merge (7.1.9) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) - bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae + binary-merge (7.1.9) + bundler (4.1.0.beta1) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.8) + citrus-toml-merge (7.1.9) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 + commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e commonmarker (2.10.0-x86_64-darwin) sha256=01e0830ed0319825ecdc16411c90acd3f661d1568dfc178731b3f64d0ce2363d commonmarker (2.10.0-x86_64-linux) sha256=945c510c0bfca9022245928e2248468fe3ddad58c939be0c37b20082cc392880 commonmarker (2.10.0-x86_64-linux-musl) sha256=288cd4fb9f17eed2ffa73551ef241dcf594e0f484b2aee2a0999540333c0618e - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) completely (0.8.0) sha256=e493cd5d84805f47917a41f277ecbfe5f35363bed670be5a957d3acaed8c6c5e concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 @@ -878,7 +891,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docopt_ng (0.7.1) sha256=a024148ee4fa3ab1a8a04411aa4370f39cf2b446e63562097d418b7974a15667 - dotenv-merge (7.1.8) + dotenv-merge (7.1.9) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -891,35 +904,37 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) + go-merge (7.1.9) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) + html-merge (7.1.9) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a - json-merge (7.1.8) - kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + json-merge (7.1.9) + kettle-changelog (1.0.7) + kettle-dev (3.0.34) + kettle-drift (1.0.13) kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 - kettle-jem (7.1.25) + kettle-jem (7.1.26) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 - kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd + kettle-soup-cover (3.0.10) kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 - markdown-merge (7.1.8) + markdown-merge (7.1.9) markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca - markly-merge (7.1.8) + markly-merge (7.1.9) + mini_portile2 (2.8.9) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 + nokogiri (1.19.4) nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af nokogiri (1.19.4-arm64-darwin) sha256=a46db9853286e6597b36ebc6953817d15acf3a299583eb3f89fdc6f91dd63527 @@ -933,20 +948,22 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) - plain-merge (7.1.8) + parslet-toml-merge (7.1.9) + plain-merge (7.1.9) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.8) + prism-merge (7.1.9) psych (5.5.0) sha256=4b245bbbd0f3238df8ccee766ebc1a6b062b10e4ee1d3284eb588739ba156a0a - psych-merge (7.1.8) + psych-merge (7.1.9) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 - rbs-merge (7.1.8) + rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -982,11 +999,11 @@ CHECKSUMS rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.8) + ruby-merge (7.1.9) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) + rust-merge (7.1.9) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +1011,7 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) + smorg-rb (7.1.9) sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,10 +1027,11 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.8) + toml (0.3.0) + toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb - tree_haver (7.1.8) + tree_haver (7.1.9) + tree_sitter_language_pack (1.16.2) tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 @@ -1023,12 +1041,12 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) + typescript-merge (7.1.9) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 yaml-converter (0.2.5) sha256=a5214fe1a6c2df88bd34a35bcded1b1dcd30135548130df2e03b54ca8c0f2423 - yaml-merge (7.1.8) + yaml-merge (7.1.9) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.8) sha256=73d935d43e3479d65ce8aff25c7d3100e8bb83528a2adaa0ed824e5046ac99e7 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -1037,8 +1055,8 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) + zip-merge (7.1.9) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH - 4.0.20 + 4.1.0.beta1 diff --git a/gems/ast-crispr/Rakefile b/gems/ast-crispr/Rakefile index e72c38647..d6af5447c 100644 --- a/gems/ast-crispr/Rakefile +++ b/gems/ast-crispr/Rakefile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -# ast-crispr Rakefile v7.1.18 - 2026-09-07 +# ast-crispr Rakefile v7.1.26 - 2026-09-09 # Ruby 2.3 (Safe Navigation) or higher required # # See LICENSE.md for license information. diff --git a/gems/ast-crispr/ast-crispr.gemspec b/gems/ast-crispr/ast-crispr.gemspec index 993dd1b53..f4a4480c8 100644 --- a/gems/ast-crispr/ast-crispr.gemspec +++ b/gems/ast-crispr/ast-crispr.gemspec @@ -120,7 +120,7 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.31') # ruby >= 4.0.0 + spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.34') # ruby >= 4.0.0 # Security spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 diff --git a/gems/ast-crispr/bin/rubocop-gradual b/gems/ast-crispr/bin/rubocop-gradual new file mode 100755 index 000000000..7c7ff0635 --- /dev/null +++ b/gems/ast-crispr/bin/rubocop-gradual @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'rubocop-gradual' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'rubygems' +require 'bundler/setup' + +load Gem.bin_path('rubocop-gradual', 'rubocop-gradual') diff --git a/gems/ast-crispr/gemfiles/modular/coverage_local.gemfile b/gems/ast-crispr/gemfiles/modular/coverage_local.gemfile index 37917caac..d6c890e46 100644 --- a/gems/ast-crispr/gemfiles/modular/coverage_local.gemfile +++ b/gems/ast-crispr/gemfiles/modular/coverage_local.gemfile @@ -29,11 +29,31 @@ Kernel.send(:gem, 'nomono', *nomono_activation_requirements) require 'nomono/bundler' local_gems = %w[kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -local_gems_to_eval = local_gems - %w[] - declared_gems # export KETTLE_DEV_DEV=/path/to/my platform :mri do + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + local_gems_to_eval = local_gems - %w[] - declared_gems + eval_nomono_gems( gems: local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/ast-crispr/gemfiles/modular/style.gemfile b/gems/ast-crispr/gemfiles/modular/style.gemfile index 59c5dc1a3..41ec99454 100644 --- a/gems/ast-crispr/gemfiles/modular/style.gemfile +++ b/gems/ast-crispr/gemfiles/modular/style.gemfile @@ -24,9 +24,9 @@ platform :mri do if ENV.fetch('RUBOCOP_LTS_DEV', 'false').casecmp('false').zero? declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) - gem 'rubocop-lts', '~> 24.2', '>= 24.2.1' unless declared_gems.include?('rubocop-lts') - gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.5' unless declared_gems.include?('rubocop-lts-rspec') - gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.6' unless declared_gems.include?('rubocop-ruby3_2') + gem 'rubocop-lts', '~> 24.2', '>= 24.2.3' unless declared_gems.include?('rubocop-lts') + gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.6' unless declared_gems.include?('rubocop-lts-rspec') + gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.8' unless declared_gems.include?('rubocop-ruby3_2') else eval_gemfile('style_local.gemfile') end diff --git a/gems/ast-crispr/gemfiles/modular/templating.gemfile b/gems/ast-crispr/gemfiles/modular/templating.gemfile index 6af159bd7..ce51a08ed 100644 --- a/gems/ast-crispr/gemfiles/modular/templating.gemfile +++ b/gems/ast-crispr/gemfiles/modular/templating.gemfile @@ -18,7 +18,7 @@ end if structuredmerge_remote # Merge recipes for released installs. - gem 'kettle-jem', '>= 7.0' + gem 'kettle-jem', '~> 7.1', '>= 7.1.26' end if kettle_remote diff --git a/gems/ast-crispr/gemfiles/modular/templating_local.gemfile b/gems/ast-crispr/gemfiles/modular/templating_local.gemfile index ec2f3ac1a..12b2f5e34 100644 --- a/gems/ast-crispr/gemfiles/modular/templating_local.gemfile +++ b/gems/ast-crispr/gemfiles/modular/templating_local.gemfile @@ -65,9 +65,7 @@ structuredmerge_local_gems = %w[ kettle_dev_local_gems = %w[ kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift ] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[] -kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - (declared_gems - %w[kettle-dev]) if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( @@ -81,6 +79,28 @@ if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 end if ENV.fetch('KETTLE_DEV_DEV', 'false').casecmp('false') != 0 + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - declared_gems + eval_nomono_gems( gems: kettle_dev_local_gems_to_eval, prefix: 'KETTLE_DEV', From e341ad259086413432da08003d93ebae258df3b5 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 23:50:44 -0400 Subject: [PATCH 078/137] =?UTF-8?q?=F0=9F=8E=A8=20Template=20ruby-merge=20?= =?UTF-8?q?by=20kettle-family?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ruby-merge/.rubocop_gradual.lock | 4 +- .../.structuredmerge/kettle-jem.lock | 145 ++++----- gems/ruby-merge/Gemfile | 2 +- gems/ruby-merge/Gemfile.lock | 304 ++++++++++-------- gems/ruby-merge/Rakefile | 2 +- gems/ruby-merge/bin/rubocop-gradual | 16 + .../gemfiles/modular/coverage_local.gemfile | 22 +- .../ruby-merge/gemfiles/modular/style.gemfile | 6 +- .../gemfiles/modular/templating.gemfile | 2 +- .../gemfiles/modular/templating_local.gemfile | 22 +- gems/ruby-merge/ruby-merge.gemspec | 2 +- 11 files changed, 299 insertions(+), 228 deletions(-) create mode 100755 gems/ruby-merge/bin/rubocop-gradual diff --git a/gems/ruby-merge/.rubocop_gradual.lock b/gems/ruby-merge/.rubocop_gradual.lock index 14c43bb83..f97612186 100644 --- a/gems/ruby-merge/.rubocop_gradual.lock +++ b/gems/ruby-merge/.rubocop_gradual.lock @@ -1,5 +1,5 @@ { - "Rakefile:2813041181": [ + "Rakefile:2208340862": [ [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], [81, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], [165, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], @@ -8,7 +8,7 @@ "lib/ruby/merge.rb:612213589": [ [151, 5, 73, "Lint/ShadowedException: Do not shadow rescued Exceptions.", 2046499071] ], - "ruby-merge.gemspec:3041951577": [ + "ruby-merge.gemspec:4053413660": [ [137, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4147388508], [148, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], [149, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] diff --git a/gems/ruby-merge/.structuredmerge/kettle-jem.lock b/gems/ruby-merge/.structuredmerge/kettle-jem.lock index 79af7893d..4e98f1516 100644 --- a/gems/ruby-merge/.structuredmerge/kettle-jem.lock +++ b/gems/ruby-merge/.structuredmerge/kettle-jem.lock @@ -1,11 +1,12 @@ --- version: 1 template_state: - version: 7.1.18 - applied_at: '2026-09-07' + version: 7.1.26 + applied_at: '2026-09-10' changelog_replay: last_entry_key: kettle-jem-template-20260802-001 last_entry_date: '2026-08-02' + maintenance_changelog: {} checksums: ".aiignore.example": 48a5dfdd93afd1a15fdce39cc28ca9920263f00018b0968ab031fa744521e5ce ".config/mise/env.sh": aeea5a2ab489ba6e5467ae8de6e386ec8c8fe4ff31a044e69d0cd6a092dd6654 @@ -75,7 +76,7 @@ template_state: ".rubocop_rspec.yml.example": 288ad75e7eb14d87d80fafe6f7272217be5c57547536ee56c780a7d10ac7ec74 ".simplecov.example": 222f2e6ce8cf089c70a21f0f5e5423d4bd59a96fdb2ce7754b0fb3d6f430c229 ".structuredmerge/git-drivers.toml.example": 9d241a44c9edffcdbd3da018fa188a238089c3d1635040924df594a6929a4f97 - ".structuredmerge/kettle-jem.yml.example": 26949dc4ee0722415e72452cbc186bee6ef7b154eae33166d36f3fdb1ca6e46d + ".structuredmerge/kettle-jem.yml.example": ff65a738da1af7d60714026a81d3323a46c864e96ae3570b806afdf6e7149ff9 ".yard-lint.yml.example": 90def46867c9436b4e177c47d91fc8165f4602e335715aecc39f5587ae20b55b ".yardignore.example": 821f453c609df7d46145d675424b39dfbe6dfdca8edac5f367b85fff48502455 ".yardopts.example": 6fd6f2701713096a8a9ea095c213bbc68eeef37797c4754d97837e3229a3a5f6 @@ -88,7 +89,7 @@ template_state: CHANGELOG.transfer.md: 21331d8a9e58b4ff6e088b88eb408bcccb0f2f64e78f8f4d42ac3f11a24baad8 CITATION.cff.example: e404ea0a7919d78a83d53d80e211d17b9663576aa606583b709795dc023fd75c CODE_OF_CONDUCT.md.example: f1ad532f1860f73ef774c6b27a26d41f4bc1cb8813034f5957487766ebb0986b - CONTRIBUTING.md.example: 22570cfb3dde72be79b4b522b6d5ab13f95d778e40444483a096871fe0891b19 + CONTRIBUTING.md.example: 8d23cce2d061e0c20d619c3f66591df5f32821cd84c32d171df0b8ebe1217a55 FUNDING.md.example: 392d047904b1557b29f4b43d37ec403b7480edd5b6ab51180be979b57a91e6ba FUNDING.md.no-osc.example: 3ef0258dd3e3b7f7e17e8bc2d20dcbcb3e74aa5a5a6f51297075696645e34c77 Gemfile.example: 99500023987e81775a9b5ef14e92cb3992f2ac408e5f42454f2728eee9b49fb2 @@ -99,19 +100,19 @@ template_state: PolyForm-Small-Business-1.0.0.md.example: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 README.md.example: 21f491e3d73bfc1b74056a6dcba61f72c93dee3cfe5272ac164a20978454de21 REEK: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - RUBOCOP.md.example: c09e5533ccc59b70a2efa05c99f66e521137c1053d3c12eb43509cebd5b68b0e + RUBOCOP.md.example: d99871a0e4c1d323c92e7febf328f062bb4722069b2abfd0a83bf7daa8dcbf8c Rakefile.example: 569803e726b07ea26267fec6891367a3096a0dff3c266269a7081d36afe496af SECURITY.md.example: ee9411aa85f36d88363fdaea7a1baea4362b6ec112cf2688e711b05de1d3144c bin/setup.example: 0ac35089c95a91d8973fe7a318bf9fd98b9f8e00db92c5d9ca6cd858abb8d41b certs/pboling.pem.example: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - gem.gemspec.example: 83e834e8958a88e4817a57199f48f5ebb245548ce251c5c47372208693f03b17 + gem.gemspec.example: 12dcadc0b297ccd4e18b9d1e538b98ac8330ef9fb2a059ed6754ad59272b77fa gemfiles/modular/benchmark/r4/v0.5.gemfile.example: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 gemfiles/modular/benchmark/vHEAD.gemfile.example: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 gemfiles/modular/cgi/r4/v0.5.gemfile.example: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 gemfiles/modular/cgi/vHEAD.gemfile.example: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 gemfiles/modular/changelog.gemfile.example: 892598e0e7792eb205247ae28128cef6dfc647d2fb33968969152230d6f69288 gemfiles/modular/coverage.gemfile.example: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - gemfiles/modular/coverage_local.gemfile.example: 928d5f260d7b119c038baa56da9fb78dd524dee613aea33ab72894bbce5c506e + gemfiles/modular/coverage_local.gemfile.example: 92ea0d7a9d693553dc614afa2c43990f5c3778c2b00ef6c528e122c31bd506a1 gemfiles/modular/debug.gemfile.example: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 gemfiles/modular/documentation.gemfile.example: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c gemfiles/modular/documentation_local.gemfile.example: 84a20f5d4b0feb94c2cf2f7a8dce8f682f1483498e41484c2b447a5661fd1870 @@ -145,10 +146,10 @@ template_state: gemfiles/modular/stringio/r3/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/r4/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/vHEAD.gemfile.example: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - gemfiles/modular/style.gemfile.example: 3ad0585b4f2db8918580ca41ea8723f7a166d7a83cfd7f9613511094997106fd + gemfiles/modular/style.gemfile.example: 02fe3e8fd00e49b90c3ab30e19b51014ee50490f3eadcfd1d4a39f4c2c997dda gemfiles/modular/style_local.gemfile.example: c86beb711e766126a5be68be4be18255831625ac3650d5069383c4a83a9511f3 - gemfiles/modular/templating.gemfile.example: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - gemfiles/modular/templating_local.gemfile.example: 930057d3b909a72e39a39125c4e883a7ff71f5691e64426c0541f8c8fc75b83f + gemfiles/modular/templating.gemfile.example: 2b33c094677b53ad9dd2eafeb3a3be452f612380c61001a2e75b3c078b8ff72a + gemfiles/modular/templating_local.gemfile.example: ac7259516e69ffafb8b9342a897ddf6042adc46335743f474c342509cefd8f2e gemfiles/modular/webrick/r4/v1.9.gemfile.example: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea gemfiles/modular/webrick/vHEAD.gemfile.example: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b gemfiles/modular/x_std_libs.gemfile.example: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a @@ -175,7 +176,7 @@ template_state: shim/Gemfile.example: 0fb0d9d06fcfb1fd6ca6f0eeb5867253ca1ed221e03d28027719225f868b0637 shim/README.md.example: 3a2f7211b7f92a1dfae5e523b8e34b051a3d8af942144b05286eca0b3c8f6fbe shim/Rakefile.example: 572c94da7052083b39b62a6600785419e314a109efd7a3d8c3a96eb77ad34fd1 - shim/gem.gemspec.example: efae033238e4fd1355cfc134f5c9123f175d1ad1dc4a1a2e663899788c9e0870 + shim/gem.gemspec.example: 14a7015b3328005d1c3b5fda6886bd6da383707745f6eaaa781d6f9689600131 shim/lib/compat_require.rb.example: 94ee85e353a3ca08c8a35c9063d4ff789214ea594c7f803f6cf09d7142f48379 shim/lib/entrypoint.rb.example: dd57613520daca01d6f6bcaa9b83b00ff74505240dc04b84ceb686df3c0539d7 shim/lib/version.rb.example: 15e219ac3a928b5580035f891e415551213175020f1131f6e7ca0ccd55a1b2d6 @@ -189,370 +190,370 @@ files: recipe: template_source_application_simplecov action: write dest_sha256: c0a08deddae56548b6c0fe97fe2b85942f6f5f5e446b6fe0422b7cdf4be27169 - input_fingerprint: 52110a067111a34c1ae42d23ec893b42f0e5751e0408ccf1c56b333591cf4238 + input_fingerprint: 30863f05986044b420b5142b81ea77f5b5b54e800384d21263f4ba5a7b646d1f template_sources: - ".simplecov.example" AGPL-3.0-only.md: recipe: template_source_application_AGPL_3_0_only_md action: write dest_sha256: d8a6cc31abc16b6748c7a21f21611f5a1ec33f67d22ca23d7da1c19b95496bee - input_fingerprint: eb0ea097584660064c0e4c910e9385cfe661899f6ebd1f8c6e1cb8a27114b14d + input_fingerprint: 612dc69760c27b5fb20a73a80c116d5f30897c4ef7aab8f5687c538f11c9cbf9 template_sources: - AGPL-3.0-only.md.example Gemfile: recipe: template_source_application_Gemfile action: write - dest_sha256: 0a4c747c898601b5f0f363273478cd602116b1e497bc9dbfdffde6591d28e364 - input_fingerprint: 3dd089af30a61d48d0b7464d1e5da496f78fe7f75be513bf1805cb112433ca03 + dest_sha256: 55f025dcde51a1f24635241dc2a1674ec9daf0c0eccca9e96f227fa741d0f389 + input_fingerprint: f60d81694905f9583e3c748db69d575dcece08b2238cf854f9417a79008b6b17 template_sources: - Gemfile.example LICENSE.md: recipe: template_source_application_LICENSE_md action: write dest_sha256: f6188bfd474a636d2a526420ebb411250faa447d94c9b9ccee097128ce4101b5 - input_fingerprint: 88172a69c7c5fc9b8fe381a879ede6f29ce157b3f66a3206392320e03f27ea2a + input_fingerprint: 2add9d193f13bf831c35ffb5821c54af73b0fe12a75f68027ae9fe32cc70aa09 template_sources: - LICENSE.md.example PolyForm-Small-Business-1.0.0.md: recipe: template_source_application_PolyForm_Small_Business_1_0_0_md action: write dest_sha256: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 - input_fingerprint: 4c95a9ba6e572d03b1ab35cef6c5111511352250cd39df7be37acb8f4ac3ba83 + input_fingerprint: d647739ab5a2659887c344f476bb4fb4a26e97903eb89dee3310c92a1d244a09 template_sources: - PolyForm-Small-Business-1.0.0.md.example README.md: recipe: template_source_application_README_md action: write dest_sha256: f2728a1141d6c432b1c21e69600138113e9f4d2aa813b1c6e1dfac0310ec9ae4 - input_fingerprint: fc871fb6b26fdd088f2678275525bb4307f66d9cc39a450d054886e7308a63fd + input_fingerprint: 25049f5d8227f8bf31ebaeb3466e6b7938ef30ded6cf88823f9a09fce6daa140 template_sources: - README.md.example Rakefile: recipe: template_source_application_Rakefile action: write - dest_sha256: 89074508bc8634269fb7ae7c2f3a2d276dd81ccdfef14c398e787ca3c9ca6ce5 - input_fingerprint: fe4331b4086374a9903a8243a93c5f90ce870c9b91956f49ad6dd9d1866cdc6a + dest_sha256: ca861273c106a7b3463f442c90ac161127ed7cf15f029e602b8a0e76e38e29f9 + input_fingerprint: ff2d40564cae944bf2d1489c9cd6dc7a7051db4106108edb761a3e05db276168 template_sources: - Rakefile.example certs/pboling.pem: recipe: template_source_application_certs_pboling_pem action: write dest_sha256: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - input_fingerprint: 601445a293b41e1f4ce032d2d8f1302f5ca886c97939ceea5654199b477ba293 + input_fingerprint: b70da6b1dbc6c2c1ad23c568893d1d282a48b6f8d1edb0262dbf959d911e89c5 template_sources: - certs/pboling.pem.example gemfiles/modular/benchmark/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_r4_v0_5_gemfile action: write dest_sha256: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 - input_fingerprint: 7f46db3a98cfe71b13c850549b2aa72d94258f697b65cf29afa49f1b558c92ff + input_fingerprint: 0fbd96230beb66229cfe84ae12cba3c9608b655f5940874e61b343626b66d2e0 template_sources: - gemfiles/modular/benchmark/r4/v0.5.gemfile.example gemfiles/modular/benchmark/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_vHEAD_gemfile action: write dest_sha256: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 - input_fingerprint: e5be2b0777c024f5373e81e675a982e74b0730d629a31966f4a46b41afcaaa56 + input_fingerprint: f69e4c419db4b24b3597d4105c9a10714ff11abb8e81c140322da7f399728448 template_sources: - gemfiles/modular/benchmark/vHEAD.gemfile.example gemfiles/modular/cgi/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_cgi_r4_v0_5_gemfile action: write dest_sha256: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 - input_fingerprint: b5564deeee637ad8781c97e2940bdcabcd97ecd088a94632603e60aaed655acc + input_fingerprint: f3d09d3c491f58fcef7f88bd99aa6fd35308df0ebe851ca9e8ddeb9332d2d7ed template_sources: - gemfiles/modular/cgi/r4/v0.5.gemfile.example gemfiles/modular/cgi/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_cgi_vHEAD_gemfile action: write dest_sha256: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 - input_fingerprint: 876ad32e110414a0661f893bec9d0ee3daa48ba7c51abf13cb3947541d7a3a6f + input_fingerprint: 52e583762400bea1d957b8071e6f6b0521eacfae0290da0ab695b0f948530035 template_sources: - gemfiles/modular/cgi/vHEAD.gemfile.example gemfiles/modular/changelog.gemfile: recipe: template_source_application_gemfiles_modular_changelog_gemfile action: write dest_sha256: da669526144fbff33aef207db9541b6fd6c254437f94dec2fab70fc55a7757cd - input_fingerprint: 686060d5a5859e014c89909ac7659de30785d7fad4d821b7f3e4d6705ba0b30c + input_fingerprint: 4986cf754d5faa9c574a38c24c7accbea315389e1aea04b0ad9dbc87ea96b077 template_sources: - gemfiles/modular/changelog.gemfile.example gemfiles/modular/coverage.gemfile: recipe: template_source_application_gemfiles_modular_coverage_gemfile action: write dest_sha256: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - input_fingerprint: 5bd4ac7e7e3d41a47c38e522cfd2c13de5586ff610e407a0145c56049ace20ca + input_fingerprint: 804d1275f4992ac1caf6b34ac7ec8b7cb2d8f59917d41b16bfe738647f789537 template_sources: - gemfiles/modular/coverage.gemfile.example gemfiles/modular/coverage_local.gemfile: recipe: template_source_application_gemfiles_modular_coverage_local_gemfile action: write - dest_sha256: 2b493414df06261ba8acb6f0eb18bf3fdd701d7cb5f967a9d15a3f42a4741827 - input_fingerprint: aac8608f0e8561aaa0b9f72ebe6c3c529ee9b6be59aabfeaf2304406ac355489 + dest_sha256: 92c9a599c8f6867ec532880f73568f2736ac05d8973ec524b42fd5dbe6aeda3e + input_fingerprint: aa7b6c0c707938f8dbaf479b8d90685f54385889aa39f04ef45473d31886aa33 template_sources: - gemfiles/modular/coverage_local.gemfile.example gemfiles/modular/debug.gemfile: recipe: template_source_application_gemfiles_modular_debug_gemfile action: write dest_sha256: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 - input_fingerprint: 0cc697796907acacccaa8672bafb2c0b62fdc88beea52e55b9955de5fc5fc5cd + input_fingerprint: 0ab948268b499b271d44ecef095588b3cb88d42a14c098912dd044ab16fe652f template_sources: - gemfiles/modular/debug.gemfile.example gemfiles/modular/documentation.gemfile: recipe: template_source_application_gemfiles_modular_documentation_gemfile action: write dest_sha256: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c - input_fingerprint: c85de56179a5dc108db1577feaab3bbb3b7881f2df31be768f6385a85f770ba1 + input_fingerprint: e3e7b817b63dc5a71c1ad69a6b04f2fae0537432729e6b541ca61e6e685e204c template_sources: - gemfiles/modular/documentation.gemfile.example gemfiles/modular/documentation_local.gemfile: recipe: template_source_application_gemfiles_modular_documentation_local_gemfile action: write dest_sha256: 2058173855b9a4acc6d5efa20520e49734243eef6cf0b5e9063e0e5866a08e9c - input_fingerprint: c51a47fda9403608ccf1a5f54bf74870693a8957c8c4b6dd8d9579c6825373e0 + input_fingerprint: 21a330519dcac74fa46fd31e7725ce3b5b9acc212ed24a78f12a9ccddaceb60f template_sources: - gemfiles/modular/documentation_local.gemfile.example gemfiles/modular/erb/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r2_v3_0_gemfile action: write dest_sha256: 3793e7dc9ef23a7ccd893d48cbba092fd27594c63e65cca011cc658218425670 - input_fingerprint: b8a6d94c6385b0c82a0754c8d528b2d51dc4286a76ba75530ac8812ff9296f81 + input_fingerprint: a05cce377b3e18a14a5cf0394e389bbd79104f30fe13899f4acbe218dc765ef8 template_sources: - gemfiles/modular/erb/r2/v3.0.gemfile.example gemfiles/modular/erb/r3/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r3_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: ffde9e505b938ca5bae2c1cf841b1db94c4802a7ef4133eecce39d5bd4cb4dce + input_fingerprint: 99fa088bb3d1a998a14436cda67e7f5b511b0ee9bebfa16c61a3e02aa68e829e template_sources: - gemfiles/modular/erb/r3/v5.0.gemfile.example gemfiles/modular/erb/r4/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r4_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 8b8cede1075d0341d6bdea065260de04b57a8fd170d2e8c6cd7f45708c1b27d0 + input_fingerprint: 55fa3f2b9658f1b7131ad6f92d197f9998177f0b4682c1bdd6a2077a5ec7c0b7 template_sources: - gemfiles/modular/erb/r4/v5.0.gemfile.example gemfiles/modular/erb/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_erb_vHEAD_gemfile action: write dest_sha256: ad6f104a49e80e0cf625440e3dc816343fe7e2f037fc4971df75e7bb4305c683 - input_fingerprint: a0dfb4f86fce556ea4f88aacb4525963a9ab2737bd4b09932b4d176c4472648f + input_fingerprint: cbeca13bfd7fa75ba61b1f7aff101cce9d6a2948e5370a6c4b697a1de272054e template_sources: - gemfiles/modular/erb/vHEAD.gemfile.example gemfiles/modular/json/truffleruby_22_3.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_22_3_gemfile action: write dest_sha256: 249c12eacbe90f9d0d2e81e7a62c4c7e9102e504ededcda4ecf660cb3bb68be4 - input_fingerprint: f1d73223a6752a05a9fdaf11cb93096311e3bdd1172b3cbba00f1ecb06825f2d + input_fingerprint: a06607fffaf21cbcfbde7bb8ca2805fa81b6843d9e26a1905f37e3858c7c8a08 template_sources: - gemfiles/modular/json/truffleruby_22_3.gemfile.example gemfiles/modular/json/truffleruby_23_0.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_0_gemfile action: write dest_sha256: 66aa010567f7afa1af8244a74c3c88ecaaf84dc87b6a25180691bb480d02ed28 - input_fingerprint: 6ca95913fba0d8b9acf96a4f3bad113379d734cb4b2436c7290d489723f45e2c + input_fingerprint: 25816be2a2902ce99006b9bf0598cbffaa0c72451af78d9ead1938965d6c12ec template_sources: - gemfiles/modular/json/truffleruby_23_0.gemfile.example gemfiles/modular/json/truffleruby_23_1.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_1_gemfile action: write dest_sha256: '080fcbdaf2bec73cad40832a3d51eebb380af789917b96f493d1460b0dd6361d' - input_fingerprint: 27904095d773daf586f2beab2110da994e53c60e227926ac472c19adcb3ba6ca + input_fingerprint: dba602daf140e725103db3e861d2763858b3ea09b375d7b3ecd073e67aa236f4 template_sources: - gemfiles/modular/json/truffleruby_23_1.gemfile.example gemfiles/modular/mutex_m/r2/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r2_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 8ff5da0d2064abce4bbee2807f4f7212a6d799c07bea6fe21ce5a95a7566c640 + input_fingerprint: 951620916ce4813685c250b26c4c12aee444222e75e5b12356fba94c2c9c2768 template_sources: - gemfiles/modular/mutex_m/r2/v0.3.gemfile.example gemfiles/modular/mutex_m/r3/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r3_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 86e7bf6c6b0ae987c5d0ce430b2d3c880533f4d58e0ecc64614e96b2afcdedd4 + input_fingerprint: '09d7881743b672b62910106799f7e49d028919be8c25d730d1bd1522b0bb5c8a' template_sources: - gemfiles/modular/mutex_m/r3/v0.3.gemfile.example gemfiles/modular/mutex_m/r4/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r4_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 51a4fe88d3970a79b13d90901f77a055d69c6f6fcdad7e825f06ad3e4e0b8baa + input_fingerprint: 990b8f32504c34c9accf22d9883b6ab27c174c54b0baafd67db71151d075ed2d template_sources: - gemfiles/modular/mutex_m/r4/v0.3.gemfile.example gemfiles/modular/mutex_m/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_vHEAD_gemfile action: write dest_sha256: '08018641c97f894788fa91b462da504ab2237213d18d95404136c393274ae3cb' - input_fingerprint: 36b80e222eea048de19f02d3d27de6251f12381cdb37ef9f80237c0999b5fb4a + input_fingerprint: 335d1e4f700aab040d2ff0cc2d557a3b26ee608cc85466ca039899a6660b8e38 template_sources: - gemfiles/modular/mutex_m/vHEAD.gemfile.example gemfiles/modular/optional.gemfile: recipe: template_source_application_gemfiles_modular_optional_gemfile action: write dest_sha256: f770e6e9a9dd2bd0f1f132e882d88038b2e21127dce3afe270908c7338c28bfd - input_fingerprint: cf4ee60adfefaf60e51f3dee1fe17b0f07a39a2cb1e50e41171b75016366fa12 + input_fingerprint: 46152ca4ca1ab8dae4144efdfa8bf95391f0228878a4d3687f3df81632540dfd template_sources: - gemfiles/modular/optional.gemfile.example gemfiles/modular/rspec.gemfile: recipe: template_source_application_gemfiles_modular_rspec_gemfile action: write dest_sha256: d043f5c9344f6435edb4607c5adaf42c78e7fb6b8b6726007de2bbedefb376c3 - input_fingerprint: 6d2188014c47586fdea045643015d86748a98b031d20bee2a6078b926127d6fb + input_fingerprint: 3a1cb57501f070b73b4b4c3465a38292a70f8b0ebee3dcb69acc0b7fc7716997 template_sources: - gemfiles/modular/rspec.gemfile.example gemfiles/modular/runtime_heads.gemfile: recipe: template_source_application_gemfiles_modular_runtime_heads_gemfile action: write dest_sha256: 6ac7158c4a3088190f2a9082f01439eb27eca2172ab3464b15c9cb045aa885e1 - input_fingerprint: bc6998193f663ba6caf79fdd49f0d71b8ca89af15cb2fcc9d0b2f9298ea01b34 + input_fingerprint: 5981c855ea0e7964619ea000f14d7f71c9f36c7fa6020c77d71e9fe02e0e98dd template_sources: - gemfiles/modular/runtime_heads.gemfile.example gemfiles/modular/stringio/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r2_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 218c65189f113bf98cc48a1ffbaddbafdbfce30e202d5cb5b6455bb1610c3b82 + input_fingerprint: b560297a395ba89c9d1310ffb0a6bdee6ce04e31147f7616545331aa0c875966 template_sources: - gemfiles/modular/stringio/r2/v3.0.gemfile.example gemfiles/modular/stringio/r3/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r3_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 15a7cceefa409c6caeff7b8e5e66df0d98cd609f318ad2005e3d779cc642f9e5 + input_fingerprint: ef0002fd49445fc450bba3a619287589691f182cb71285f95c0e323c13e9f675 template_sources: - gemfiles/modular/stringio/r3/v3.0.gemfile.example gemfiles/modular/stringio/r4/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r4_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 7487ccab90aea495cc2b45423bc793c1a10ce561604b8bf26fe4f816346bc532 + input_fingerprint: ba0ac54ebce411d1daebf682ef2793af6104170977bfb84d1184125958237d62 template_sources: - gemfiles/modular/stringio/r4/v3.0.gemfile.example gemfiles/modular/stringio/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_stringio_vHEAD_gemfile action: write dest_sha256: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - input_fingerprint: d3f8c1727a9cf09b47338ac4d043c02b470ab946e1bdc9b34a1864561ae3cac0 + input_fingerprint: 021a29fceca40e21f5158fbb872db57d73e78833841f6838c767a4137fa23308 template_sources: - gemfiles/modular/stringio/vHEAD.gemfile.example gemfiles/modular/style.gemfile: recipe: template_source_application_gemfiles_modular_style_gemfile action: write - dest_sha256: 2a3d46dcb8a9394f595f273f5eb0403d0a552837754ab109afc9ba79a7159083 - input_fingerprint: f2b6ff366d145bc108c74679420e5e2951fa7a0b84a6554d40a37b3b05a3c445 + dest_sha256: 9a24acff0054573c30f5d84d0418cd465ba3794d075bb5a36801410ac40e0787 + input_fingerprint: 794e8430eee4cb9df0f490fce152f17bd00915a1fcaca80fa9e4e997f2058b0d template_sources: - gemfiles/modular/style.gemfile.example gemfiles/modular/style_local.gemfile: recipe: template_source_application_gemfiles_modular_style_local_gemfile action: write dest_sha256: 55eb9c149cdb2f29c9f31abe2d55a4f334e00fb859681dd17c42149a3f28ca36 - input_fingerprint: ad66d917030aace1e0559553a665ff9c1438e8a63351bfac4e495e88734daf47 + input_fingerprint: 612da6085fd91997cca1deba0a3a4aba52d073a0865e126edd3f858263a33e0e template_sources: - gemfiles/modular/style_local.gemfile.example gemfiles/modular/templating.gemfile: recipe: template_source_application_gemfiles_modular_templating_gemfile action: write - dest_sha256: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - input_fingerprint: 2cb9463e932f748bb81b3518d1dbcf30acdccdab8a77a87cce52c145017bb39e + dest_sha256: 432ba59798d31b899268257c432443a017c5a9bd2c0c7f9f2216617e14150cd3 + input_fingerprint: 8c7714a3c9512d942abf45ad7bd27cd6047eb7c53e96d83346483daebc366e80 template_sources: - gemfiles/modular/templating.gemfile.example gemfiles/modular/templating_local.gemfile: recipe: template_source_application_gemfiles_modular_templating_local_gemfile action: write - dest_sha256: f8ba997fbda6eafd22f5b08af4667e1c53d184f33df6962fc698ab7802a8b783 - input_fingerprint: 390d70959f04f5264224e0509594fe378788c1f7e5af6f1095a236bfda6c1cec + dest_sha256: 62a1a763553fe783f27f3fe4ab858f033a4fa9c2677767e31aeeb3954fa42964 + input_fingerprint: 8ad79763b7eb35a997eba690d799e799ca20e6a180113a028cb678b965a4a4ca template_sources: - gemfiles/modular/templating_local.gemfile.example gemfiles/modular/webrick/r4/v1.9.gemfile: recipe: template_source_application_gemfiles_modular_webrick_r4_v1_9_gemfile action: write dest_sha256: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea - input_fingerprint: 80d2556ae407d380d947eeeb822a5b1b83f42e2655fd2b0c703ca83bab06a6d4 + input_fingerprint: 030cb27a47e49c220cfdfe95a4388fae56d3f778d2e60b974cd2a84b5516bc07 template_sources: - gemfiles/modular/webrick/r4/v1.9.gemfile.example gemfiles/modular/webrick/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_webrick_vHEAD_gemfile action: write dest_sha256: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b - input_fingerprint: 0e92cc8232bfd030ae831e3559329a756ae911eac33bfadd8421fc1828137a4b + input_fingerprint: 92607f9fbd499b51a5df1a6db307075decbfcbe688c82df936fce3f2e4bcd94d template_sources: - gemfiles/modular/webrick/vHEAD.gemfile.example gemfiles/modular/x_std_libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_gemfile action: write dest_sha256: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a - input_fingerprint: '08c8221a9eb7ae208c5e9e1d684c89212ddc5a016153e7e8b8a9efd3be98402d' + input_fingerprint: 391a23a2a303dfb4a2abbf07e7a4c1156a7d93535b861a473e1babbb829401b7 template_sources: - gemfiles/modular/x_std_libs.gemfile.example gemfiles/modular/x_std_libs/r2/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r2_libs_gemfile action: write dest_sha256: e80ec8ad06cb1b31ac982bc25cf7696987fca131aa1001eaefd0bf5cd379c273 - input_fingerprint: b9b036282138e14f99426d0ee571081b9f7f49e010e0f3c9bc651624191d3708 + input_fingerprint: 58424540891510db6fd5b36fb6bd82d0cbb099dc9d3b2b11d117f3b72fe93ba1 template_sources: - gemfiles/modular/x_std_libs/r2/libs.gemfile.example gemfiles/modular/x_std_libs/r3.1/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_1_libs_gemfile action: write dest_sha256: 9f8565c40b09bea1bc4c2e2ad87fe11400c3c51a2b235655bfcd8e491ed88ca8 - input_fingerprint: fe7f8cf1f1f91de0d16f4b8b5015f0a07798f25b8f55967dd11795115ef5fdfe + input_fingerprint: 0a2ac1577e33a1ee9c75da357ec862eafcaabd3af04972bed800f028f17773a6 template_sources: - gemfiles/modular/x_std_libs/r3.1/libs.gemfile.example gemfiles/modular/x_std_libs/r3/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_libs_gemfile action: write dest_sha256: 546f8849f4267bb19aa10ff0de40be30957197f229e6887847181ea9127b2650 - input_fingerprint: 7525b1d2d2a38686c00b44fd7af665dbf5ce9aaefac4e4fccbd6ee53c48ec362 + input_fingerprint: 73cba4379251654e216a0642e18cac218260abe58ed3d952134439cf96600094 template_sources: - gemfiles/modular/x_std_libs/r3/libs.gemfile.example gemfiles/modular/x_std_libs/r4/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r4_libs_gemfile action: write dest_sha256: 8c2582eaa218d216b98c86c933465295c8b4e43f3251ea388b9eaf6e471f8da6 - input_fingerprint: 0aebb0bcfcfeb5d5f55ef456f0f02dd4977234f2d74f7326da84714b3ba99139 + input_fingerprint: cdf3bf2dbde332a8fc617d02711b3db7330dc92bde44cf814f76be1874a66f77 template_sources: - gemfiles/modular/x_std_libs/r4/libs.gemfile.example gemfiles/modular/x_std_libs/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_vHEAD_gemfile action: write dest_sha256: d3133ec4c0638363a7fb025d19be7e95a615fd61c35ddb8d17f2280ee74a7486 - input_fingerprint: e6c42ae9bbc8679881a3001874da25fa55869e8ec6feb5a2d54e0264252ba408 + input_fingerprint: a36c1ef78164ae5676497597f9318291d47ec6d81d1e5c55d4937e239821cc9a template_sources: - gemfiles/modular/x_std_libs/vHEAD.gemfile.example lib/ruby/merge/version.rb: recipe: template_source_application_lib_ruby_merge_version_rb action: write - dest_sha256: cdaf5da7fd8b4ffb1292cc4f21dbfa502046d3af31d379f047b4e3e7cb0fbb72 - input_fingerprint: afc3a7eda1ccd5e439486df5c3ca97a5e8c0c101dda5ae9c7ca668e3844ec055 + dest_sha256: f3ed38f678a7bb9ae17d0f1bbfa87501c977b1a7297f35c261952be6665b8015 + input_fingerprint: 7f66c3511f32fe274cc2ed34b654170e2353c4a7680826f491890c7b8ba37ab1 template_sources: - lib/gem/version.rb.example mise.toml: recipe: template_source_application_mise_toml action: write dest_sha256: 7d267154ca4f081b0ac7da804c0180c2b091aec5f1c877417c1c320f4f369c88 - input_fingerprint: d8768cb75225c5e576517e1ad8f95bb9881927b7747a2bf5a1376e4351eaa561 + input_fingerprint: 9a5a95c2bed61c7080e4c02b7fcdc1c7ab7bb96a6c77befdceb6981e5bf0beca template_sources: - mise.toml.no-osc.example ruby-merge.gemspec: recipe: template_source_application_ruby_merge_gemspec action: write - dest_sha256: 97501a8529949defd8e58ab0463c0628b30b34cd76c0afb61d22b7920ed9b639 - input_fingerprint: b3f7888d1602c006c30b7bd594c40d300a943485d08dccb1686d72b80104391b + dest_sha256: a968bbcde3bc5d87ea25c9e9b9ae69b0c75d01e4285b597717faaf442050584b + input_fingerprint: b033619f9fe230a4d58e5f162f24040225a53c98f41550fb818e7d41b03ef62c template_sources: - gem.gemspec.example sig/ruby/merge.rbs: recipe: template_source_application_sig_ruby_merge_rbs action: write dest_sha256: c70398d6467886de9a68ad3044d524de20643d85a428707d39af3a45a973d90e - input_fingerprint: aa1aa33aa2810b347d10c4a7f4b8be8df173c61e3dd1c9b060348b87f1a5ee71 + input_fingerprint: c80f44b6918a21b406991e62b06548a43082de82944c6364e3cc713a1019e22b template_sources: - sig/gem.rbs.example spec/spec_helper.rb: recipe: template_source_application_spec_spec_helper_rb action: write dest_sha256: 2d9a2449491d2406fadddff591d9cf4f037a4e6737631fc09e1cc231eb0e9e5a - input_fingerprint: 5b90501b0c846b639dcba884baf63f8f0e05bc8d76df7ab2548514445d6409be + input_fingerprint: 15a3126d7c02b6fe27a5fd8ff3920c3667cecfe980cb0edea53b838008e20861 template_sources: - spec/spec_helper.rb.example diff --git a/gems/ruby-merge/Gemfile b/gems/ruby-merge/Gemfile index fc0719517..d1057ae1a 100644 --- a/gems/ruby-merge/Gemfile +++ b/gems/ruby-merge/Gemfile @@ -19,7 +19,7 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } # Include dependencies from ruby-merge.gemspec gemspec -gem 'kettle-family', '~> 1.2', '>= 1.2.97' +gem 'kettle-family', '~> 1.2', '>= 1.2.100' # Local workspace dependency wiring for *_local.gemfile overrides gem 'nomono', '~> 1.1', '>= 1.1.5', require: false # ruby >= 3.2.0 diff --git a/gems/ruby-merge/Gemfile.lock b/gems/ruby-merge/Gemfile.lock index 843490442..d5c28718b 100644 --- a/gems/ruby-merge/Gemfile.lock +++ b/gems/ruby-merge/Gemfile.lock @@ -10,131 +10,131 @@ GIT PATH remote: . specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) + ast-crispr-markdown-markly (7.1.9) + ast-crispr (= 7.1.9) + markdown-merge (= 7.1.9) + markly-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism specs: - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) + ast-crispr-ruby-prism (7.1.9) + ast-crispr (= 7.1.9) + prism-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) + ast-crispr (7.1.9) + ast-merge (= 7.1.9) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ast-merge-git (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: - ast-merge (7.1.8) + ast-merge (7.1.9) benchmark token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) + ast-template (7.1.9) + ast-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + bash-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + binary-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) + citrus-toml-merge (7.1.9) + ast-merge (= 7.1.9) + toml-merge (= 7.1.9) toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge specs: - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) commonmarker (~> 2.2) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) + dotenv-merge (7.1.9) + ast-merge (= 7.1.9) + plain-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + go-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + html-merge (7.1.9) + ast-crispr (= 7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + json-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: - kettle-jem (7.1.25) + kettle-jem (7.1.26) addressable (>= 2.8, < 3) ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) @@ -168,114 +168,114 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge specs: - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown (~> 2.5) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + markdown-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) + markly-merge (7.1.9) + markdown-merge (= 7.1.9) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge specs: - parslet-toml-merge (7.1.8) + parslet-toml-merge (7.1.9) toml (~> 0.3) - toml-merge (= 7.1.8) + toml-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + plain-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) + prism-merge (7.1.9) + ast-merge (= 7.1.9) prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + psych-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) + yaml-merge (= 7.1.9) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) + rbs-merge (7.1.9) + ast-merge (= 7.1.9) rbs (>= 3.10) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + rust-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) + smorg-rb (7.1.9) + ast-merge (= 7.1.9) + ast-merge-git (= 7.1.9) + bash-merge (= 7.1.9) diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) + dotenv-merge (= 7.1.9) + go-merge (= 7.1.9) + html-merge (= 7.1.9) + json-merge (= 7.1.9) kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) + markdown-merge (= 7.1.9) + plain-merge (= 7.1.9) + prism-merge (= 7.1.9) + psych-merge (= 7.1.9) + rbs-merge (= 7.1.9) + rust-merge (= 7.1.9) + toml-merge (= 7.1.9) + typescript-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + toml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: - tree_haver (7.1.8) + tree_haver (7.1.9) citrus (~> 3.0) parslet (~> 2.0) tree_sitter_language_pack (>= 1.16.2, < 2.0) @@ -284,25 +284,25 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + typescript-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + yaml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) + zip-merge (7.1.9) + binary-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) GEM @@ -336,6 +336,8 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) + commonmarker (2.10.0) + rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -465,11 +467,15 @@ GEM lint_roller (1.1.0) logger (1.7.0) markly (0.19.0) + mini_portile2 (2.8.9) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) reline (~> 0.6) mutex_m (0.3.0) + nokogiri (1.19.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-musl) @@ -503,6 +509,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) + rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -696,6 +705,9 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_sitter_language_pack (1.16.2) + rb_sys (>= 0.9.130, < 0.10) + sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -784,9 +796,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.31) + kettle-dev (~> 3.0, >= 3.0.34) kettle-drift (~> 1.0, >= 1.0.13) - kettle-family (~> 1.2, >= 1.2.97) + kettle-family (~> 1.2, >= 1.2.100) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) @@ -807,12 +819,12 @@ DEPENDENCIES reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) - rubocop-lts (~> 24.2, >= 24.2.1) - rubocop-lts-rspec (~> 1.0, >= 1.0.5) + rubocop-lts (~> 24.2, >= 24.2.3) + rubocop-lts-rspec (~> 1.0, >= 1.0.6) rubocop-minitest (~> 0.40, >= 0.40.0) rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! - rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) ruby-merge! ruby-progressbar (~> 1.13) rust-merge! @@ -843,33 +855,34 @@ CHECKSUMS appraisal2 (3.2.3) sha256=3a6cfaf8a444e02707b9a34154af1c4902fbe99d9d2168d7e81dd83ec77e6db7 appraisal2-rubocop (1.0.2) sha256=1dae97c1be087cf9c098a3a72fd41f873435e9b8b39687e633b36c9ccb22bff4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.8) - ast-crispr-markdown-markly (7.1.8) - ast-crispr-ruby-prism (7.1.8) - ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) + ast-crispr (7.1.9) + ast-crispr-markdown-markly (7.1.9) + ast-crispr-ruby-prism (7.1.9) + ast-merge (7.1.9) + ast-merge-git (7.1.9) + ast-template (7.1.9) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.8) + bash-merge (7.1.9) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) - bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae + binary-merge (7.1.9) + bundler (4.1.0.beta1) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.8) + citrus-toml-merge (7.1.9) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 + commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e commonmarker (2.10.0-x86_64-darwin) sha256=01e0830ed0319825ecdc16411c90acd3f661d1568dfc178731b3f64d0ce2363d commonmarker (2.10.0-x86_64-linux) sha256=945c510c0bfca9022245928e2248468fe3ddad58c939be0c37b20082cc392880 commonmarker (2.10.0-x86_64-linux-musl) sha256=288cd4fb9f17eed2ffa73551ef241dcf594e0f484b2aee2a0999540333c0618e - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) completely (0.8.0) sha256=e493cd5d84805f47917a41f277ecbfe5f35363bed670be5a957d3acaed8c6c5e concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 @@ -878,7 +891,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docopt_ng (0.7.1) sha256=a024148ee4fa3ab1a8a04411aa4370f39cf2b446e63562097d418b7974a15667 - dotenv-merge (7.1.8) + dotenv-merge (7.1.9) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -891,35 +904,37 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) + go-merge (7.1.9) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) + html-merge (7.1.9) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a - json-merge (7.1.8) - kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + json-merge (7.1.9) + kettle-changelog (1.0.7) + kettle-dev (3.0.34) + kettle-drift (1.0.13) kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 - kettle-jem (7.1.25) + kettle-jem (7.1.26) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 - kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd + kettle-soup-cover (3.0.10) kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 - markdown-merge (7.1.8) + markdown-merge (7.1.9) markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca - markly-merge (7.1.8) + markly-merge (7.1.9) + mini_portile2 (2.8.9) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 + nokogiri (1.19.4) nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af nokogiri (1.19.4-arm64-darwin) sha256=a46db9853286e6597b36ebc6953817d15acf3a299583eb3f89fdc6f91dd63527 @@ -933,20 +948,22 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) - plain-merge (7.1.8) + parslet-toml-merge (7.1.9) + plain-merge (7.1.9) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.8) + prism-merge (7.1.9) psych (5.5.0) sha256=4b245bbbd0f3238df8ccee766ebc1a6b062b10e4ee1d3284eb588739ba156a0a - psych-merge (7.1.8) + psych-merge (7.1.9) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 - rbs-merge (7.1.8) + rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -982,11 +999,11 @@ CHECKSUMS rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.8) + ruby-merge (7.1.9) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) + rust-merge (7.1.9) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +1011,7 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) + smorg-rb (7.1.9) sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,10 +1027,11 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.8) + toml (0.3.0) + toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb - tree_haver (7.1.8) + tree_haver (7.1.9) + tree_sitter_language_pack (1.16.2) tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 @@ -1023,12 +1041,12 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) + typescript-merge (7.1.9) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 yaml-converter (0.2.5) sha256=a5214fe1a6c2df88bd34a35bcded1b1dcd30135548130df2e03b54ca8c0f2423 - yaml-merge (7.1.8) + yaml-merge (7.1.9) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.8) sha256=73d935d43e3479d65ce8aff25c7d3100e8bb83528a2adaa0ed824e5046ac99e7 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -1037,8 +1055,8 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) + zip-merge (7.1.9) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH - 4.0.20 + 4.1.0.beta1 diff --git a/gems/ruby-merge/Rakefile b/gems/ruby-merge/Rakefile index 4f9f659c1..88929d763 100644 --- a/gems/ruby-merge/Rakefile +++ b/gems/ruby-merge/Rakefile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -# ruby-merge Rakefile v7.1.18 - 2026-09-07 +# ruby-merge Rakefile v7.1.26 - 2026-09-09 # Ruby 2.3 (Safe Navigation) or higher required # # See LICENSE.md for license information. diff --git a/gems/ruby-merge/bin/rubocop-gradual b/gems/ruby-merge/bin/rubocop-gradual new file mode 100755 index 000000000..7c7ff0635 --- /dev/null +++ b/gems/ruby-merge/bin/rubocop-gradual @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'rubocop-gradual' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'rubygems' +require 'bundler/setup' + +load Gem.bin_path('rubocop-gradual', 'rubocop-gradual') diff --git a/gems/ruby-merge/gemfiles/modular/coverage_local.gemfile b/gems/ruby-merge/gemfiles/modular/coverage_local.gemfile index a665705b8..0fffbadaf 100644 --- a/gems/ruby-merge/gemfiles/modular/coverage_local.gemfile +++ b/gems/ruby-merge/gemfiles/modular/coverage_local.gemfile @@ -30,11 +30,29 @@ require "nomono/bundler" local_gems = %w[kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -local_gems_to_eval = local_gems - %w[] - declared_gems # export KETTLE_DEV_DEV=/path/to/my platform :mri do + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find { |dependency| dependency.name == "kettle-dev" } + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: "KETTLE_DEV", + path_env: "KETTLE_DEV_DEV", + vendored_gems_env: "VENDORED_GEMS", + vendor_gem_dir_env: "VENDOR_GEM_DIR", + debug_env: "KETTLE_DEV_DEBUG", + root: ["src", "my", "kettle-dev"] + ).fetch("kettle-dev", nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + local_gems_to_eval = local_gems - %w[] - declared_gems + eval_nomono_gems( gems: local_gems_to_eval, prefix: "KETTLE_DEV", diff --git a/gems/ruby-merge/gemfiles/modular/style.gemfile b/gems/ruby-merge/gemfiles/modular/style.gemfile index 8d48377ae..f0af1ac43 100644 --- a/gems/ruby-merge/gemfiles/modular/style.gemfile +++ b/gems/ruby-merge/gemfiles/modular/style.gemfile @@ -24,9 +24,9 @@ platform :mri do if ENV.fetch("RUBOCOP_LTS_DEV", "false").casecmp("false").zero? declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) - gem "rubocop-lts", "~> 24.2", ">= 24.2.1" unless declared_gems.include?("rubocop-lts") - gem "rubocop-lts-rspec", "~> 1.0", ">= 1.0.5" unless declared_gems.include?("rubocop-lts-rspec") - gem "rubocop-ruby3_2", "~> 3.0", ">= 3.0.6" unless declared_gems.include?("rubocop-ruby3_2") + gem "rubocop-lts", "~> 24.2", ">= 24.2.3" unless declared_gems.include?("rubocop-lts") + gem "rubocop-lts-rspec", "~> 1.0", ">= 1.0.6" unless declared_gems.include?("rubocop-lts-rspec") + gem "rubocop-ruby3_2", "~> 3.0", ">= 3.0.8" unless declared_gems.include?("rubocop-ruby3_2") else eval_gemfile("style_local.gemfile") end diff --git a/gems/ruby-merge/gemfiles/modular/templating.gemfile b/gems/ruby-merge/gemfiles/modular/templating.gemfile index 2df8682f8..c52b3d28f 100644 --- a/gems/ruby-merge/gemfiles/modular/templating.gemfile +++ b/gems/ruby-merge/gemfiles/modular/templating.gemfile @@ -18,7 +18,7 @@ end if structuredmerge_remote # Merge recipes for released installs. - gem "kettle-jem", ">= 7.0" + gem "kettle-jem", "~> 7.1", ">= 7.1.26" end if kettle_remote diff --git a/gems/ruby-merge/gemfiles/modular/templating_local.gemfile b/gems/ruby-merge/gemfiles/modular/templating_local.gemfile index 9ab9ef054..5956943c3 100644 --- a/gems/ruby-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/ruby-merge/gemfiles/modular/templating_local.gemfile @@ -66,9 +66,7 @@ structuredmerge_local_gems = %w[ kettle_dev_local_gems = %w[ kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift ] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[] -kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - (declared_gems - %w[kettle-dev]) if ENV.fetch("STRUCTUREDMERGE_DEV", "false").casecmp("false") != 0 eval_nomono_gems( @@ -82,6 +80,26 @@ if ENV.fetch("STRUCTUREDMERGE_DEV", "false").casecmp("false") != 0 end if ENV.fetch("KETTLE_DEV_DEV", "false").casecmp("false") != 0 + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find { |dependency| dependency.name == "kettle-dev" } + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: "KETTLE_DEV", + path_env: "KETTLE_DEV_DEV", + vendored_gems_env: "VENDORED_GEMS", + vendor_gem_dir_env: "VENDOR_GEM_DIR", + debug_env: "KETTLE_DEV_DEBUG", + root: ["src", "my", "kettle-dev"] + ).fetch("kettle-dev", nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - declared_gems + eval_nomono_gems( gems: kettle_dev_local_gems_to_eval, prefix: "KETTLE_DEV", diff --git a/gems/ruby-merge/ruby-merge.gemspec b/gems/ruby-merge/ruby-merge.gemspec index e8de50496..0fb91035a 100644 --- a/gems/ruby-merge/ruby-merge.gemspec +++ b/gems/ruby-merge/ruby-merge.gemspec @@ -120,7 +120,7 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.31') # ruby >= 4.0.0 + spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.34') # ruby >= 4.0.0 # Security spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 From 0e63e9a9611ebee47b88898370a6f5753a2435bf Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 23:50:44 -0400 Subject: [PATCH 079/137] =?UTF-8?q?=F0=9F=8E=A8=20Template=20markdown-merg?= =?UTF-8?q?e=20by=20kettle-family?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/markdown-merge/.kettle-drift.lock | 76 ++++- gems/markdown-merge/.rubocop_gradual.lock | 7 +- .../.structuredmerge/kettle-jem.lock | 145 ++++----- gems/markdown-merge/Gemfile | 2 +- gems/markdown-merge/Gemfile.lock | 304 ++++++++++-------- gems/markdown-merge/Rakefile | 2 +- gems/markdown-merge/bin/rubocop-gradual | 16 + .../gemfiles/modular/coverage_local.gemfile | 24 +- .../gemfiles/modular/style.gemfile | 6 +- .../gemfiles/modular/templating.gemfile | 2 +- .../gemfiles/modular/templating_local.gemfile | 24 +- gems/markdown-merge/markdown-merge.gemspec | 2 +- 12 files changed, 380 insertions(+), 230 deletions(-) create mode 100755 gems/markdown-merge/bin/rubocop-gradual diff --git a/gems/markdown-merge/.kettle-drift.lock b/gems/markdown-merge/.kettle-drift.lock index 98b009e1e..1b23f4793 100644 --- a/gems/markdown-merge/.kettle-drift.lock +++ b/gems/markdown-merge/.kettle-drift.lock @@ -1,10 +1,82 @@ { + "debug_env: 'KETTLE_DEV_DEBUG',\nroot: %w[src my kettle-dev]": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 46, + 63 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 93, + 110 + ] + } + ], + "path_env: 'KETTLE_DEV_DEV',\nvendored_gems_env: 'VENDORED_GEMS',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 43, + 60 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 90, + 107 + ] + } + ], + "prefix: 'KETTLE_DEV',\npath_env: 'KETTLE_DEV_DEV',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 42, + 59 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 89, + 106 + ] + } + ], + "vendor_gem_dir_env: 'VENDOR_GEM_DIR',\ndebug_env: 'KETTLE_DEV_DEBUG',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 45, + 62 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 92, + 109 + ] + } + ], "vendored_gems_env: 'VENDORED_GEMS',\nvendor_gem_dir_env: 'VENDOR_GEM_DIR',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 44, + 61 + ] + }, { "file": "gemfiles/modular/templating_local.gemfile", "lines": [ - 77, - 88 + 75, + 91, + 108 ] } ] diff --git a/gems/markdown-merge/.rubocop_gradual.lock b/gems/markdown-merge/.rubocop_gradual.lock index 39117e948..b714291bc 100644 --- a/gems/markdown-merge/.rubocop_gradual.lock +++ b/gems/markdown-merge/.rubocop_gradual.lock @@ -2,7 +2,7 @@ ".simplecov:3364541157": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] ], - "Rakefile:1632243933": [ + "Rakefile:987861054": [ [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], [81, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], [165, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], @@ -22,6 +22,9 @@ [1, 1, 0, "Naming/FileName: The name of this source file (`vHEAD.gemfile`) should use snake_case.", 5381], [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], + "gemfiles/modular/coverage_local.gemfile:2813372128": [ + [34, 1, 1586, "Metrics/BlockLength: Block has too many lines. [37/25]", 820328175] + ], "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], @@ -624,7 +627,7 @@ [78, 43, 286, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 3809385913], [127, 7, 592, "Metrics/MethodLength: Method has too many lines. [12/10]", 3827282628] ], - "markdown-merge.gemspec:2159233986": [ + "markdown-merge.gemspec:489723911": [ [137, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4147388508], [148, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], [149, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] diff --git a/gems/markdown-merge/.structuredmerge/kettle-jem.lock b/gems/markdown-merge/.structuredmerge/kettle-jem.lock index 866768a6a..eba7059b9 100644 --- a/gems/markdown-merge/.structuredmerge/kettle-jem.lock +++ b/gems/markdown-merge/.structuredmerge/kettle-jem.lock @@ -1,11 +1,12 @@ --- version: 1 template_state: - version: 7.1.18 - applied_at: '2026-09-07' + version: 7.1.26 + applied_at: '2026-09-10' changelog_replay: last_entry_key: kettle-jem-template-20260802-001 last_entry_date: '2026-08-02' + maintenance_changelog: {} checksums: ".aiignore.example": 48a5dfdd93afd1a15fdce39cc28ca9920263f00018b0968ab031fa744521e5ce ".config/mise/env.sh": aeea5a2ab489ba6e5467ae8de6e386ec8c8fe4ff31a044e69d0cd6a092dd6654 @@ -75,7 +76,7 @@ template_state: ".rubocop_rspec.yml.example": 288ad75e7eb14d87d80fafe6f7272217be5c57547536ee56c780a7d10ac7ec74 ".simplecov.example": 222f2e6ce8cf089c70a21f0f5e5423d4bd59a96fdb2ce7754b0fb3d6f430c229 ".structuredmerge/git-drivers.toml.example": 9d241a44c9edffcdbd3da018fa188a238089c3d1635040924df594a6929a4f97 - ".structuredmerge/kettle-jem.yml.example": 26949dc4ee0722415e72452cbc186bee6ef7b154eae33166d36f3fdb1ca6e46d + ".structuredmerge/kettle-jem.yml.example": ff65a738da1af7d60714026a81d3323a46c864e96ae3570b806afdf6e7149ff9 ".yard-lint.yml.example": 90def46867c9436b4e177c47d91fc8165f4602e335715aecc39f5587ae20b55b ".yardignore.example": 821f453c609df7d46145d675424b39dfbe6dfdca8edac5f367b85fff48502455 ".yardopts.example": 6fd6f2701713096a8a9ea095c213bbc68eeef37797c4754d97837e3229a3a5f6 @@ -88,7 +89,7 @@ template_state: CHANGELOG.transfer.md: 21331d8a9e58b4ff6e088b88eb408bcccb0f2f64e78f8f4d42ac3f11a24baad8 CITATION.cff.example: e404ea0a7919d78a83d53d80e211d17b9663576aa606583b709795dc023fd75c CODE_OF_CONDUCT.md.example: f1ad532f1860f73ef774c6b27a26d41f4bc1cb8813034f5957487766ebb0986b - CONTRIBUTING.md.example: 22570cfb3dde72be79b4b522b6d5ab13f95d778e40444483a096871fe0891b19 + CONTRIBUTING.md.example: 8d23cce2d061e0c20d619c3f66591df5f32821cd84c32d171df0b8ebe1217a55 FUNDING.md.example: 392d047904b1557b29f4b43d37ec403b7480edd5b6ab51180be979b57a91e6ba FUNDING.md.no-osc.example: 3ef0258dd3e3b7f7e17e8bc2d20dcbcb3e74aa5a5a6f51297075696645e34c77 Gemfile.example: 99500023987e81775a9b5ef14e92cb3992f2ac408e5f42454f2728eee9b49fb2 @@ -99,19 +100,19 @@ template_state: PolyForm-Small-Business-1.0.0.md.example: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 README.md.example: 21f491e3d73bfc1b74056a6dcba61f72c93dee3cfe5272ac164a20978454de21 REEK: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - RUBOCOP.md.example: c09e5533ccc59b70a2efa05c99f66e521137c1053d3c12eb43509cebd5b68b0e + RUBOCOP.md.example: d99871a0e4c1d323c92e7febf328f062bb4722069b2abfd0a83bf7daa8dcbf8c Rakefile.example: 569803e726b07ea26267fec6891367a3096a0dff3c266269a7081d36afe496af SECURITY.md.example: ee9411aa85f36d88363fdaea7a1baea4362b6ec112cf2688e711b05de1d3144c bin/setup.example: 0ac35089c95a91d8973fe7a318bf9fd98b9f8e00db92c5d9ca6cd858abb8d41b certs/pboling.pem.example: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - gem.gemspec.example: 83e834e8958a88e4817a57199f48f5ebb245548ce251c5c47372208693f03b17 + gem.gemspec.example: 12dcadc0b297ccd4e18b9d1e538b98ac8330ef9fb2a059ed6754ad59272b77fa gemfiles/modular/benchmark/r4/v0.5.gemfile.example: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 gemfiles/modular/benchmark/vHEAD.gemfile.example: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 gemfiles/modular/cgi/r4/v0.5.gemfile.example: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 gemfiles/modular/cgi/vHEAD.gemfile.example: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 gemfiles/modular/changelog.gemfile.example: 892598e0e7792eb205247ae28128cef6dfc647d2fb33968969152230d6f69288 gemfiles/modular/coverage.gemfile.example: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - gemfiles/modular/coverage_local.gemfile.example: 928d5f260d7b119c038baa56da9fb78dd524dee613aea33ab72894bbce5c506e + gemfiles/modular/coverage_local.gemfile.example: 92ea0d7a9d693553dc614afa2c43990f5c3778c2b00ef6c528e122c31bd506a1 gemfiles/modular/debug.gemfile.example: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 gemfiles/modular/documentation.gemfile.example: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c gemfiles/modular/documentation_local.gemfile.example: 84a20f5d4b0feb94c2cf2f7a8dce8f682f1483498e41484c2b447a5661fd1870 @@ -145,10 +146,10 @@ template_state: gemfiles/modular/stringio/r3/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/r4/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/vHEAD.gemfile.example: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - gemfiles/modular/style.gemfile.example: 3ad0585b4f2db8918580ca41ea8723f7a166d7a83cfd7f9613511094997106fd + gemfiles/modular/style.gemfile.example: 02fe3e8fd00e49b90c3ab30e19b51014ee50490f3eadcfd1d4a39f4c2c997dda gemfiles/modular/style_local.gemfile.example: c86beb711e766126a5be68be4be18255831625ac3650d5069383c4a83a9511f3 - gemfiles/modular/templating.gemfile.example: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - gemfiles/modular/templating_local.gemfile.example: 930057d3b909a72e39a39125c4e883a7ff71f5691e64426c0541f8c8fc75b83f + gemfiles/modular/templating.gemfile.example: 2b33c094677b53ad9dd2eafeb3a3be452f612380c61001a2e75b3c078b8ff72a + gemfiles/modular/templating_local.gemfile.example: ac7259516e69ffafb8b9342a897ddf6042adc46335743f474c342509cefd8f2e gemfiles/modular/webrick/r4/v1.9.gemfile.example: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea gemfiles/modular/webrick/vHEAD.gemfile.example: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b gemfiles/modular/x_std_libs.gemfile.example: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a @@ -175,7 +176,7 @@ template_state: shim/Gemfile.example: 0fb0d9d06fcfb1fd6ca6f0eeb5867253ca1ed221e03d28027719225f868b0637 shim/README.md.example: 3a2f7211b7f92a1dfae5e523b8e34b051a3d8af942144b05286eca0b3c8f6fbe shim/Rakefile.example: 572c94da7052083b39b62a6600785419e314a109efd7a3d8c3a96eb77ad34fd1 - shim/gem.gemspec.example: efae033238e4fd1355cfc134f5c9123f175d1ad1dc4a1a2e663899788c9e0870 + shim/gem.gemspec.example: 14a7015b3328005d1c3b5fda6886bd6da383707745f6eaaa781d6f9689600131 shim/lib/compat_require.rb.example: 94ee85e353a3ca08c8a35c9063d4ff789214ea594c7f803f6cf09d7142f48379 shim/lib/entrypoint.rb.example: dd57613520daca01d6f6bcaa9b83b00ff74505240dc04b84ceb686df3c0539d7 shim/lib/version.rb.example: 15e219ac3a928b5580035f891e415551213175020f1131f6e7ca0ccd55a1b2d6 @@ -189,370 +190,370 @@ files: recipe: template_source_application_simplecov action: write dest_sha256: b39d3bfbbc2cb0ae2aabebdd0251976444d0d0b718251107d7fe0d55ee091cb5 - input_fingerprint: 101ed81a3baeac9ed7642f6d0b790e1f214ef901be186c393e27c5e108204440 + input_fingerprint: 3b6e1bb0f38f7206a9d22197212f20cfca7df7e6d1902c3c08fd3e2a43fb3ab2 template_sources: - ".simplecov.example" AGPL-3.0-only.md: recipe: template_source_application_AGPL_3_0_only_md action: write dest_sha256: d8a6cc31abc16b6748c7a21f21611f5a1ec33f67d22ca23d7da1c19b95496bee - input_fingerprint: d3c733910f203ab7291204c7ba0ce519e61761a20917657428fe6088a31a1400 + input_fingerprint: 606364d856b290484157c2b6610552c051660c865517e3fdb348ad4e083821d7 template_sources: - AGPL-3.0-only.md.example Gemfile: recipe: template_source_application_Gemfile action: write - dest_sha256: 58890d82ee16fd21a0e8e3c5aba2d057e63a0ca35f3a4337384931fe9b71e931 - input_fingerprint: 9e347d1cd52935d924f7a813121696c08edc8cfe5f6961ee809828dd2be52510 + dest_sha256: 4e4ebdc9b3e023110c0f24b27cf4ae8d0214634fba61869c46be1c614bc54403 + input_fingerprint: 3214d379b6c59deb8e062df6fcc971f8bf8bd34fee3e6405958e5f9ad89b4374 template_sources: - Gemfile.example LICENSE.md: recipe: template_source_application_LICENSE_md action: write dest_sha256: f6188bfd474a636d2a526420ebb411250faa447d94c9b9ccee097128ce4101b5 - input_fingerprint: d04c2710e4c43074cdeec6fba781360efa6b32b521a2670a158d6712ec52a880 + input_fingerprint: 5ee730437267970ca79b75cee4f15d52711857f131dde7e260a40a573b5d2ebf template_sources: - LICENSE.md.example PolyForm-Small-Business-1.0.0.md: recipe: template_source_application_PolyForm_Small_Business_1_0_0_md action: write dest_sha256: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 - input_fingerprint: 871a5c6eabbc588309f61c71c962e009352de9b50a2f6038d2b458d7953273a4 + input_fingerprint: a06fee10e3116a3da277fbca93c95b597f3c93daad522a307de3dfc0a13205f6 template_sources: - PolyForm-Small-Business-1.0.0.md.example README.md: recipe: template_source_application_README_md action: write dest_sha256: 490f9f2dcb5b8ba13de6937e9c1490f8af97885150c894a2a1e9f7b46b5fa0c0 - input_fingerprint: fe9982f43964333d34e533f8b72c7d1c118db049404b50862c080a041d12e455 + input_fingerprint: '067629b3b6fb0d54243f7a8aee6207f5011c23631241c7463e4bb1a59a290035' template_sources: - README.md.example Rakefile: recipe: template_source_application_Rakefile action: write - dest_sha256: 6ed7af51e6183059a8242b3e02dfede43f233cf23ea2e281849b7b33f65dccbd - input_fingerprint: f6f6bf867a43c066ed56260fb0cd96ad5678fbf49c05b29087a32dc2419a3867 + dest_sha256: d15e93cad80ab1fdc08f029bb50e26d9dfdeefbf7ae55858fb854659722bbcb8 + input_fingerprint: d6f5d7a1c526eb4d729623f3332afc962ca60f41cd44c86e499d0ab078ec8f19 template_sources: - Rakefile.example certs/pboling.pem: recipe: template_source_application_certs_pboling_pem action: write dest_sha256: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - input_fingerprint: 3584124df9f01d10ee50a1c83113ae5ca0ca236e419e2d6a68c8b06933314eb2 + input_fingerprint: 1b0a2142671fee98823a1d6c0d81e241728b0b15d3b1930c0dda3fe9b1a18f22 template_sources: - certs/pboling.pem.example gemfiles/modular/benchmark/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_r4_v0_5_gemfile action: write dest_sha256: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 - input_fingerprint: 2fac39379d53ae48b0af27d309fcfd45c74c35339a3af2293fa2bef195036ed8 + input_fingerprint: c05e257558ef096d834938bafb5582cfde1addc829f6a5ee1dd490def87fde97 template_sources: - gemfiles/modular/benchmark/r4/v0.5.gemfile.example gemfiles/modular/benchmark/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_vHEAD_gemfile action: write dest_sha256: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 - input_fingerprint: 4bfb32b778e5c4842a06d0cfd89c0a0089fc720ca8ede320f7f6b8f239b52e9a + input_fingerprint: 43947c404da6b64ee58fe97d8797ef7cd1a02d55721faa1f8da759e066520e6d template_sources: - gemfiles/modular/benchmark/vHEAD.gemfile.example gemfiles/modular/cgi/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_cgi_r4_v0_5_gemfile action: write dest_sha256: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 - input_fingerprint: 071c338317e1a1b97338b98d3743eb217454fda69ec0521df278cb99653a2783 + input_fingerprint: d6a5df50460f5691c0d9d1d4c88f96a30bc1454c730e76165e59d3ec0aeae00c template_sources: - gemfiles/modular/cgi/r4/v0.5.gemfile.example gemfiles/modular/cgi/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_cgi_vHEAD_gemfile action: write dest_sha256: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 - input_fingerprint: d988b0f176a8786557c9998fb69c23c2c7ed72c03df98f147704916e10bc7841 + input_fingerprint: 9a09944649f29184272e0e97a3407669b4311dd20c1d6a2f1ea38899e197d08a template_sources: - gemfiles/modular/cgi/vHEAD.gemfile.example gemfiles/modular/changelog.gemfile: recipe: template_source_application_gemfiles_modular_changelog_gemfile action: write dest_sha256: da669526144fbff33aef207db9541b6fd6c254437f94dec2fab70fc55a7757cd - input_fingerprint: a97312397bb57a938ec3bcfe6291394674d3e0fe853a2bc10403894a6fb3f615 + input_fingerprint: 05f8d1a2dd4bdc1c15240e747f4a9ea77fcb3bb5064676cec09fb1c7233ba333 template_sources: - gemfiles/modular/changelog.gemfile.example gemfiles/modular/coverage.gemfile: recipe: template_source_application_gemfiles_modular_coverage_gemfile action: write dest_sha256: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - input_fingerprint: 0e55aa855a2a6085933476039c8f5e7a3b21a9eb220d7ee329db3d300c9f6de4 + input_fingerprint: de4147c43b7f138e577b878cfa3c140218b4cf7d474f829554c4391a8cc0ffab template_sources: - gemfiles/modular/coverage.gemfile.example gemfiles/modular/coverage_local.gemfile: recipe: template_source_application_gemfiles_modular_coverage_local_gemfile action: write - dest_sha256: 2b493414df06261ba8acb6f0eb18bf3fdd701d7cb5f967a9d15a3f42a4741827 - input_fingerprint: 8bc47b3890eb74c9ac36ddddeed78be954a987687279b1667e270340abb6eca8 + dest_sha256: 92c9a599c8f6867ec532880f73568f2736ac05d8973ec524b42fd5dbe6aeda3e + input_fingerprint: 1fe0b701eca0134ad1eae2d60cfef12cc4cb6173120be39b00721c86d8645581 template_sources: - gemfiles/modular/coverage_local.gemfile.example gemfiles/modular/debug.gemfile: recipe: template_source_application_gemfiles_modular_debug_gemfile action: write dest_sha256: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 - input_fingerprint: 25ca63d9ad9737df2858a018049d2777cac9a522229e6f5c88228edbb1e4d3ba + input_fingerprint: 7393a565e6f021680c96c65942de5f61e75458aed21634c16c5d9c4d00ba2cb9 template_sources: - gemfiles/modular/debug.gemfile.example gemfiles/modular/documentation.gemfile: recipe: template_source_application_gemfiles_modular_documentation_gemfile action: write dest_sha256: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c - input_fingerprint: 71ca1d2919d1eb24b03be99ff798d412dca2ea3554c1f46f9fa81511c5267bda + input_fingerprint: d8aa80f15aee5cc48144ac8e1bab1a0c9ca78e529692c999fe59d9bfdb6aa535 template_sources: - gemfiles/modular/documentation.gemfile.example gemfiles/modular/documentation_local.gemfile: recipe: template_source_application_gemfiles_modular_documentation_local_gemfile action: write dest_sha256: 2058173855b9a4acc6d5efa20520e49734243eef6cf0b5e9063e0e5866a08e9c - input_fingerprint: 81d9ff533c58269a3e3e324a6d20ddde1b07d8fc347a25cf87fc6da37fdde6ad + input_fingerprint: 349787cf7770d94e7ba2e41201bd43b1565a85f24a69a7cffbb806bd3e26ae23 template_sources: - gemfiles/modular/documentation_local.gemfile.example gemfiles/modular/erb/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r2_v3_0_gemfile action: write dest_sha256: 3793e7dc9ef23a7ccd893d48cbba092fd27594c63e65cca011cc658218425670 - input_fingerprint: 40677253f708612eeb7add866b7bc3a662be353b4d95831d610dfe7a844d9b1d + input_fingerprint: 0bc4cf2e5f3a955ddf23c0991dd400a2cc2c7640c46ea08d559a039275d48709 template_sources: - gemfiles/modular/erb/r2/v3.0.gemfile.example gemfiles/modular/erb/r3/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r3_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 2f616861d7fd923bcb37ce692540514b6fb5a567abb648bb63cb755eb905ebb3 + input_fingerprint: 6e71e46dcee96881d2836e251ae171a93089fb65359958fe125c72fff90a0a00 template_sources: - gemfiles/modular/erb/r3/v5.0.gemfile.example gemfiles/modular/erb/r4/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r4_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: fa9b6b5d2e49df3f4b9f2013dc0c3c4a272bac80f3c3754de2469fc3ca3c29d2 + input_fingerprint: 24ae35d30eeabf96a2e39e9b68ff04df2c46e05978f833e833c13a45c423fae5 template_sources: - gemfiles/modular/erb/r4/v5.0.gemfile.example gemfiles/modular/erb/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_erb_vHEAD_gemfile action: write dest_sha256: ad6f104a49e80e0cf625440e3dc816343fe7e2f037fc4971df75e7bb4305c683 - input_fingerprint: cf6c359978fbc6dafb087652bc8520588952b4b225c825324d0c9767a9638719 + input_fingerprint: 78943bc17e821098c4e7633a60f3744f8abc1ec540df2ef056363f653fb0dfd2 template_sources: - gemfiles/modular/erb/vHEAD.gemfile.example gemfiles/modular/json/truffleruby_22_3.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_22_3_gemfile action: write dest_sha256: 249c12eacbe90f9d0d2e81e7a62c4c7e9102e504ededcda4ecf660cb3bb68be4 - input_fingerprint: 79b114777f40d15df9559ecb236088a82206a6d50fbfeb8026c714d84473992d + input_fingerprint: 614559f4708a569a79ac61bd3c142a09965aaa0827ea0f221a5b00b655b8959b template_sources: - gemfiles/modular/json/truffleruby_22_3.gemfile.example gemfiles/modular/json/truffleruby_23_0.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_0_gemfile action: write dest_sha256: 66aa010567f7afa1af8244a74c3c88ecaaf84dc87b6a25180691bb480d02ed28 - input_fingerprint: 0a41e02a6c4b6f56ffa495492e4ae8f1783f5f1c9df439b23cc7e443dae8e3c6 + input_fingerprint: 9d6a05b46aee74579ad28854ba0a92bee5addc063703ae030b740fcb621b1192 template_sources: - gemfiles/modular/json/truffleruby_23_0.gemfile.example gemfiles/modular/json/truffleruby_23_1.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_1_gemfile action: write dest_sha256: '080fcbdaf2bec73cad40832a3d51eebb380af789917b96f493d1460b0dd6361d' - input_fingerprint: f1a02f407ccee705f90ad56f39c193633639833bfcb7c6efb697154a3e642834 + input_fingerprint: 568636084f9707f648b0b7301e60b7939a8305eee79a506d603beb79f065ae6c template_sources: - gemfiles/modular/json/truffleruby_23_1.gemfile.example gemfiles/modular/mutex_m/r2/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r2_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: d65e9d1bfaa5b9490fec8b875a30a0342dc462d56751ceeae395fb5e7d2f6ad0 + input_fingerprint: 9972b2684df5747b298844cbcf4fa1fa911a809fbeb5625c9dd0b6ea078c2fde template_sources: - gemfiles/modular/mutex_m/r2/v0.3.gemfile.example gemfiles/modular/mutex_m/r3/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r3_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 7c8b77b729eae10ae5853d593d5c0db946d463c72e3f5ca44d6e3c80571b26ac + input_fingerprint: 34d8898bf2e4d9c30da8a1061cd16753a9e41ddffb558d25f232f79b6db155a2 template_sources: - gemfiles/modular/mutex_m/r3/v0.3.gemfile.example gemfiles/modular/mutex_m/r4/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r4_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 0b9985b5739cd604e50a237b4099271f164d5aeb48b50aef7124bc42ba928806 + input_fingerprint: 90d0d79e628a82d230f5287f142cd3e81de006c9072455066e531523f63d13d0 template_sources: - gemfiles/modular/mutex_m/r4/v0.3.gemfile.example gemfiles/modular/mutex_m/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_vHEAD_gemfile action: write dest_sha256: '08018641c97f894788fa91b462da504ab2237213d18d95404136c393274ae3cb' - input_fingerprint: eb4ca711d47cac9818f3005a5c6a716c7993ea9ffda7e56bc1b939e6c5333fef + input_fingerprint: b8d2d359ba18ca757c297f82f04891413e16ac59abf3752ba9132bafaf00be86 template_sources: - gemfiles/modular/mutex_m/vHEAD.gemfile.example gemfiles/modular/optional.gemfile: recipe: template_source_application_gemfiles_modular_optional_gemfile action: write dest_sha256: f770e6e9a9dd2bd0f1f132e882d88038b2e21127dce3afe270908c7338c28bfd - input_fingerprint: 8636f04796b4cfcbf7ca6ecf8adcd60bdf18b1e504cb1837df84ef5aea72fc55 + input_fingerprint: 26659ee4e2f903617188ca2bacccf9406f263c8204cb60cd08f1ea966d38288c template_sources: - gemfiles/modular/optional.gemfile.example gemfiles/modular/rspec.gemfile: recipe: template_source_application_gemfiles_modular_rspec_gemfile action: write dest_sha256: d043f5c9344f6435edb4607c5adaf42c78e7fb6b8b6726007de2bbedefb376c3 - input_fingerprint: 6101166f6f0088a374953d073499fc023f5ebe782def9cff68258cd2c9fdc4be + input_fingerprint: 6efc240ed730000d9e4f46f25f9131827d4475846cebea6e6fe0d475220e7559 template_sources: - gemfiles/modular/rspec.gemfile.example gemfiles/modular/runtime_heads.gemfile: recipe: template_source_application_gemfiles_modular_runtime_heads_gemfile action: write dest_sha256: 6ac7158c4a3088190f2a9082f01439eb27eca2172ab3464b15c9cb045aa885e1 - input_fingerprint: 4c9d0dfd88ca1f29ce6e6547312601e363d9f0d77e2c2c474a47b31dff1e6d23 + input_fingerprint: 878d9eb2f03b2dc897b3eb75e532d79923570e1db7fc801195170db5aeea3d22 template_sources: - gemfiles/modular/runtime_heads.gemfile.example gemfiles/modular/stringio/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r2_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 4ef4b89eb70a4beffe92f7c61a79513a322a79eef8365e4936ff15e77a8e9f68 + input_fingerprint: 3d5ead8920c59845064e37e1aad4843f21d0f41d92fa8f0cda507490793752f9 template_sources: - gemfiles/modular/stringio/r2/v3.0.gemfile.example gemfiles/modular/stringio/r3/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r3_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 6da91fbe9c9501c9a9095fa8a32769808bbdc0c34418f17172535f1e6b05793e + input_fingerprint: a770f606d0cc6cc080451a2267967042426b3dbcc9aa9f560738e73832f7f3a2 template_sources: - gemfiles/modular/stringio/r3/v3.0.gemfile.example gemfiles/modular/stringio/r4/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r4_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 37683f1403453b76a8ede0d8102e15084dfad2669d9aabcc48fd7a2614585ec5 + input_fingerprint: b8793b415886d4c3bb8bbb020b712ef2764d3a9e264d6dce71d404b54b5bbea7 template_sources: - gemfiles/modular/stringio/r4/v3.0.gemfile.example gemfiles/modular/stringio/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_stringio_vHEAD_gemfile action: write dest_sha256: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - input_fingerprint: 8d9a4d6a84bdd7501f59fb3cd0ad152dbe3e82deaac6e2274a4ce5279b148272 + input_fingerprint: 3bb001d94b031bab0b974538c7eb43758a7cd9aca3b8480d17a9eab15cfadc55 template_sources: - gemfiles/modular/stringio/vHEAD.gemfile.example gemfiles/modular/style.gemfile: recipe: template_source_application_gemfiles_modular_style_gemfile action: write - dest_sha256: 2a3d46dcb8a9394f595f273f5eb0403d0a552837754ab109afc9ba79a7159083 - input_fingerprint: dd9190235ec59dcad84a83d1444cfd6766608aa5757d4db22a602334d8ce7f08 + dest_sha256: 9a24acff0054573c30f5d84d0418cd465ba3794d075bb5a36801410ac40e0787 + input_fingerprint: 8987de61cfd4d5855022e0f6e42f958ba1544cbdccd7295c41658fefd3e2bc58 template_sources: - gemfiles/modular/style.gemfile.example gemfiles/modular/style_local.gemfile: recipe: template_source_application_gemfiles_modular_style_local_gemfile action: write dest_sha256: 55eb9c149cdb2f29c9f31abe2d55a4f334e00fb859681dd17c42149a3f28ca36 - input_fingerprint: 7a0c31537d1e9cf5fc531c7de0eedd6707cf09ebddcc2d6ed90cd8b33528987e + input_fingerprint: f0ac10b602edd98b42e61e4a7a2dcb4b0513e0996583b3c6b1be26eb13931618 template_sources: - gemfiles/modular/style_local.gemfile.example gemfiles/modular/templating.gemfile: recipe: template_source_application_gemfiles_modular_templating_gemfile action: write - dest_sha256: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - input_fingerprint: 91e14e164092b3bc2070b9ddbd8b9918bdbbaa7c581210a83db37825b43c05ba + dest_sha256: 432ba59798d31b899268257c432443a017c5a9bd2c0c7f9f2216617e14150cd3 + input_fingerprint: 3c57ff493a78f620f9850cd5f5750400645fb19aa5cd47a3473ec5f942d3c3f7 template_sources: - gemfiles/modular/templating.gemfile.example gemfiles/modular/templating_local.gemfile: recipe: template_source_application_gemfiles_modular_templating_local_gemfile action: write - dest_sha256: f9351b9090c568710c503956267696fe7a020a63d34e88e214aec554dd924005 - input_fingerprint: 440ece45452d23b1938965ddd629e63a803f481fdbabd71dfe883dba0e387f40 + dest_sha256: 35f85002a07d9759f9cdc193ac93007341b755989918a7457df8cb2dfadfb363 + input_fingerprint: fd4a818916a8152eee06f28b6eb47c59cc192f02d44525d695181520a413521e template_sources: - gemfiles/modular/templating_local.gemfile.example gemfiles/modular/webrick/r4/v1.9.gemfile: recipe: template_source_application_gemfiles_modular_webrick_r4_v1_9_gemfile action: write dest_sha256: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea - input_fingerprint: 847272106752169707bfa96e4c0758ff753bcd3f9321b3e8e7990ad13e5ba6b3 + input_fingerprint: 1c69feb1a1d0c90b6bf9ea386f8e92633b5b4c940c206fe8f8aa292f7f585514 template_sources: - gemfiles/modular/webrick/r4/v1.9.gemfile.example gemfiles/modular/webrick/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_webrick_vHEAD_gemfile action: write dest_sha256: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b - input_fingerprint: b0525bab6f2d1fe189e6217efc3fe2d23e95f40cacd521f0c8ec7715f9a2028f + input_fingerprint: 6775c53bc44d302f8c1d5c74a5a6377a9c3268de8f438abd2db3abb307e5ac0e template_sources: - gemfiles/modular/webrick/vHEAD.gemfile.example gemfiles/modular/x_std_libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_gemfile action: write dest_sha256: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a - input_fingerprint: e8172e1cdaac231c05440bc4d98151b39d3161ba39ed2403d62315364803eac4 + input_fingerprint: c375b73885c4142518ee22ec5b5218a84a4ae0c839442471499743943d4dd545 template_sources: - gemfiles/modular/x_std_libs.gemfile.example gemfiles/modular/x_std_libs/r2/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r2_libs_gemfile action: write dest_sha256: e80ec8ad06cb1b31ac982bc25cf7696987fca131aa1001eaefd0bf5cd379c273 - input_fingerprint: '09b0dbd779ac05eec3fa9e97defd2d4b94a7d883f01e666a5d08b431164161bc' + input_fingerprint: d884e19456b6fefa49bf37ec079fb608a84cb372070ada781fb823d3a2138163 template_sources: - gemfiles/modular/x_std_libs/r2/libs.gemfile.example gemfiles/modular/x_std_libs/r3.1/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_1_libs_gemfile action: write dest_sha256: 9f8565c40b09bea1bc4c2e2ad87fe11400c3c51a2b235655bfcd8e491ed88ca8 - input_fingerprint: 76274c4bdecfef995411360436bbc6236849feecc36ba65e969551e910fcaa1c + input_fingerprint: 6a4f3c0820d9b2bcda0e3db1749fb341cc8e25830c8b91f3b4223cb067992130 template_sources: - gemfiles/modular/x_std_libs/r3.1/libs.gemfile.example gemfiles/modular/x_std_libs/r3/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_libs_gemfile action: write dest_sha256: 546f8849f4267bb19aa10ff0de40be30957197f229e6887847181ea9127b2650 - input_fingerprint: 576353b6aa25473869aff8abe158f79d37201d5b9b36c75831803afc93c9c971 + input_fingerprint: 6653b4a863171f7fe64c8519d461a968ac88586abcf53271b6413cb429e18483 template_sources: - gemfiles/modular/x_std_libs/r3/libs.gemfile.example gemfiles/modular/x_std_libs/r4/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r4_libs_gemfile action: write dest_sha256: 8c2582eaa218d216b98c86c933465295c8b4e43f3251ea388b9eaf6e471f8da6 - input_fingerprint: 8ff201c760c48b37112f1d61091fe454a0d5e93f6eed5e855605ac462a9d9a9f + input_fingerprint: c20881753efb57ff2e9783e60669e6d389196fc029fae336df01b3f0a9951270 template_sources: - gemfiles/modular/x_std_libs/r4/libs.gemfile.example gemfiles/modular/x_std_libs/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_vHEAD_gemfile action: write dest_sha256: d3133ec4c0638363a7fb025d19be7e95a615fd61c35ddb8d17f2280ee74a7486 - input_fingerprint: 310cc37a689913839d7858eb389ecd33286ed609ff74df13811ef4f71a049d91 + input_fingerprint: 7501da097d4bcc93f01d14e61130d9cb32f03c5e07dc3b58a9c84cca0ca3108d template_sources: - gemfiles/modular/x_std_libs/vHEAD.gemfile.example lib/markdown/merge/version.rb: recipe: template_source_application_lib_markdown_merge_version_rb action: write - dest_sha256: 4949108a5f445ce1e4924c308b0ac448a31fe0c079e24d0fed121393a7b99de8 - input_fingerprint: eafa82c0deee2df23776a566fc3e027bc844c2e714258e827c8ee96258793ce0 + dest_sha256: b6a9a5b9df1e716d25e16bc38c29ca47d03a23b8f8d3879e43944022f7e2b2ad + input_fingerprint: eb90d5b35e91a47e38449e4eaad3e2f6bf27092a8a4ddcf594a38df03ae8665f template_sources: - lib/gem/version.rb.example markdown-merge.gemspec: recipe: template_source_application_markdown_merge_gemspec action: write - dest_sha256: 520e7d41ba56ded16038399f7014559badd7a57e50e4a10600bd72699eb219a2 - input_fingerprint: 67771b36b964e21a79523e299740473275400193be500b0a086f3a253b4a503c + dest_sha256: d51a7ab3e0e7a1e7c9ebe0380dfa7ec1ce577d175b3610f385efcf6df5688e52 + input_fingerprint: c34a922c03c66f9231d9cb2d66e2fde8719e732da5fb20a9ae722ce34c87fd6f template_sources: - gem.gemspec.example mise.toml: recipe: template_source_application_mise_toml action: write dest_sha256: 7d267154ca4f081b0ac7da804c0180c2b091aec5f1c877417c1c320f4f369c88 - input_fingerprint: 908939e168de34ded46d69a533c36fba964120b502b818965db87e875ecb560c + input_fingerprint: 6768986c9a2e2dd89861bf1f4b8e95284502008703ba0599901e713ed6248a7d template_sources: - mise.toml.no-osc.example sig/markdown/merge.rbs: recipe: template_source_application_sig_markdown_merge_rbs action: write dest_sha256: 26669fd592a86dc97c412cf2d88f99a932de8e77b1133295384a3ec3be937ae6 - input_fingerprint: 22be53609a6fd805617afe7596a95abd89f46cf7256925ad4964253082e195f2 + input_fingerprint: 0d2b78bfa3ebf130e5045263e50578cc8f67d1864d4384e3a418e034b29ba2b3 template_sources: - sig/gem.rbs.example spec/spec_helper.rb: recipe: template_source_application_spec_spec_helper_rb action: write dest_sha256: ac220fd87a96bf49f9d3e8c587aec48a57c87fe8cab20a95eeab3661ae13c51a - input_fingerprint: 8fd67b69e8a07529c8217f47da76a25e20d15e48101746a304247c8a32196a9c + input_fingerprint: d1da7915d8500943081cb96121310455f4fb28faf1d2909716c863a0a3ff3ca4 template_sources: - spec/spec_helper.rb.example diff --git a/gems/markdown-merge/Gemfile b/gems/markdown-merge/Gemfile index 9bab84551..9c270b67f 100644 --- a/gems/markdown-merge/Gemfile +++ b/gems/markdown-merge/Gemfile @@ -19,7 +19,7 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } # Include dependencies from markdown-merge.gemspec gemspec -gem 'kettle-family', '~> 1.2', '>= 1.2.97' +gem 'kettle-family', '~> 1.2', '>= 1.2.100' # Local workspace dependency wiring for *_local.gemfile overrides gem 'nomono', '~> 1.1', '>= 1.1.5', require: false # ruby >= 3.2.0 diff --git a/gems/markdown-merge/Gemfile.lock b/gems/markdown-merge/Gemfile.lock index 326bd57aa..84ebbbacc 100644 --- a/gems/markdown-merge/Gemfile.lock +++ b/gems/markdown-merge/Gemfile.lock @@ -10,131 +10,131 @@ GIT PATH remote: . specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + markdown-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) + ast-crispr-markdown-markly (7.1.9) + ast-crispr (= 7.1.9) + markdown-merge (= 7.1.9) + markly-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism specs: - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) + ast-crispr-ruby-prism (7.1.9) + ast-crispr (= 7.1.9) + prism-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) + ast-crispr (7.1.9) + ast-merge (= 7.1.9) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ast-merge-git (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: - ast-merge (7.1.8) + ast-merge (7.1.9) benchmark token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) + ast-template (7.1.9) + ast-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + bash-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + binary-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) + citrus-toml-merge (7.1.9) + ast-merge (= 7.1.9) + toml-merge (= 7.1.9) toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge specs: - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) commonmarker (~> 2.2) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) + dotenv-merge (7.1.9) + ast-merge (= 7.1.9) + plain-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + go-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + html-merge (7.1.9) + ast-crispr (= 7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + json-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: - kettle-jem (7.1.25) + kettle-jem (7.1.26) addressable (>= 2.8, < 3) ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) @@ -168,114 +168,114 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge specs: - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown (~> 2.5) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) + markly-merge (7.1.9) + markdown-merge (= 7.1.9) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge specs: - parslet-toml-merge (7.1.8) + parslet-toml-merge (7.1.9) toml (~> 0.3) - toml-merge (= 7.1.8) + toml-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + plain-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) + prism-merge (7.1.9) + ast-merge (= 7.1.9) prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + psych-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) + yaml-merge (= 7.1.9) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) + rbs-merge (7.1.9) + ast-merge (= 7.1.9) rbs (>= 3.10) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + rust-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) + smorg-rb (7.1.9) + ast-merge (= 7.1.9) + ast-merge-git (= 7.1.9) + bash-merge (= 7.1.9) diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) + dotenv-merge (= 7.1.9) + go-merge (= 7.1.9) + html-merge (= 7.1.9) + json-merge (= 7.1.9) kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) + markdown-merge (= 7.1.9) + plain-merge (= 7.1.9) + prism-merge (= 7.1.9) + psych-merge (= 7.1.9) + rbs-merge (= 7.1.9) + rust-merge (= 7.1.9) + toml-merge (= 7.1.9) + typescript-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + toml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: - tree_haver (7.1.8) + tree_haver (7.1.9) citrus (~> 3.0) parslet (~> 2.0) tree_sitter_language_pack (>= 1.16.2, < 2.0) @@ -284,25 +284,25 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + typescript-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + yaml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) + zip-merge (7.1.9) + binary-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) GEM @@ -336,6 +336,8 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) + commonmarker (2.10.0) + rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -465,11 +467,15 @@ GEM lint_roller (1.1.0) logger (1.7.0) markly (0.19.0) + mini_portile2 (2.8.9) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) reline (~> 0.6) mutex_m (0.3.0) + nokogiri (1.19.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-musl) @@ -503,6 +509,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) + rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -696,6 +705,9 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_sitter_language_pack (1.16.2) + rb_sys (>= 0.9.130, < 0.10) + sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -784,9 +796,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.31) + kettle-dev (~> 3.0, >= 3.0.34) kettle-drift (~> 1.0, >= 1.0.13) - kettle-family (~> 1.2, >= 1.2.97) + kettle-family (~> 1.2, >= 1.2.100) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) @@ -807,12 +819,12 @@ DEPENDENCIES reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) - rubocop-lts (~> 24.2, >= 24.2.1) - rubocop-lts-rspec (~> 1.0, >= 1.0.5) + rubocop-lts (~> 24.2, >= 24.2.3) + rubocop-lts-rspec (~> 1.0, >= 1.0.6) rubocop-minitest (~> 0.40, >= 0.40.0) rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! - rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) ruby-merge! ruby-progressbar (~> 1.13) rust-merge! @@ -843,33 +855,34 @@ CHECKSUMS appraisal2 (3.2.3) sha256=3a6cfaf8a444e02707b9a34154af1c4902fbe99d9d2168d7e81dd83ec77e6db7 appraisal2-rubocop (1.0.2) sha256=1dae97c1be087cf9c098a3a72fd41f873435e9b8b39687e633b36c9ccb22bff4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.8) - ast-crispr-markdown-markly (7.1.8) - ast-crispr-ruby-prism (7.1.8) - ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) + ast-crispr (7.1.9) + ast-crispr-markdown-markly (7.1.9) + ast-crispr-ruby-prism (7.1.9) + ast-merge (7.1.9) + ast-merge-git (7.1.9) + ast-template (7.1.9) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.8) + bash-merge (7.1.9) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) - bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae + binary-merge (7.1.9) + bundler (4.1.0.beta1) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.8) + citrus-toml-merge (7.1.9) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 + commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e commonmarker (2.10.0-x86_64-darwin) sha256=01e0830ed0319825ecdc16411c90acd3f661d1568dfc178731b3f64d0ce2363d commonmarker (2.10.0-x86_64-linux) sha256=945c510c0bfca9022245928e2248468fe3ddad58c939be0c37b20082cc392880 commonmarker (2.10.0-x86_64-linux-musl) sha256=288cd4fb9f17eed2ffa73551ef241dcf594e0f484b2aee2a0999540333c0618e - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) completely (0.8.0) sha256=e493cd5d84805f47917a41f277ecbfe5f35363bed670be5a957d3acaed8c6c5e concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 @@ -878,7 +891,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docopt_ng (0.7.1) sha256=a024148ee4fa3ab1a8a04411aa4370f39cf2b446e63562097d418b7974a15667 - dotenv-merge (7.1.8) + dotenv-merge (7.1.9) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -891,35 +904,37 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) + go-merge (7.1.9) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) + html-merge (7.1.9) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a - json-merge (7.1.8) - kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + json-merge (7.1.9) + kettle-changelog (1.0.7) + kettle-dev (3.0.34) + kettle-drift (1.0.13) kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 - kettle-jem (7.1.25) + kettle-jem (7.1.26) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 - kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd + kettle-soup-cover (3.0.10) kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 - markdown-merge (7.1.8) + markdown-merge (7.1.9) markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca - markly-merge (7.1.8) + markly-merge (7.1.9) + mini_portile2 (2.8.9) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 + nokogiri (1.19.4) nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af nokogiri (1.19.4-arm64-darwin) sha256=a46db9853286e6597b36ebc6953817d15acf3a299583eb3f89fdc6f91dd63527 @@ -933,20 +948,22 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) - plain-merge (7.1.8) + parslet-toml-merge (7.1.9) + plain-merge (7.1.9) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.8) + prism-merge (7.1.9) psych (5.5.0) sha256=4b245bbbd0f3238df8ccee766ebc1a6b062b10e4ee1d3284eb588739ba156a0a - psych-merge (7.1.8) + psych-merge (7.1.9) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 - rbs-merge (7.1.8) + rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -982,11 +999,11 @@ CHECKSUMS rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.8) + ruby-merge (7.1.9) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) + rust-merge (7.1.9) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +1011,7 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) + smorg-rb (7.1.9) sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,10 +1027,11 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.8) + toml (0.3.0) + toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb - tree_haver (7.1.8) + tree_haver (7.1.9) + tree_sitter_language_pack (1.16.2) tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 @@ -1023,12 +1041,12 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) + typescript-merge (7.1.9) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 yaml-converter (0.2.5) sha256=a5214fe1a6c2df88bd34a35bcded1b1dcd30135548130df2e03b54ca8c0f2423 - yaml-merge (7.1.8) + yaml-merge (7.1.9) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.8) sha256=73d935d43e3479d65ce8aff25c7d3100e8bb83528a2adaa0ed824e5046ac99e7 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -1037,8 +1055,8 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) + zip-merge (7.1.9) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH - 4.0.20 + 4.1.0.beta1 diff --git a/gems/markdown-merge/Rakefile b/gems/markdown-merge/Rakefile index 021ebaf20..8ea941c06 100644 --- a/gems/markdown-merge/Rakefile +++ b/gems/markdown-merge/Rakefile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -# markdown-merge Rakefile v7.1.18 - 2026-09-07 +# markdown-merge Rakefile v7.1.26 - 2026-09-09 # Ruby 2.3 (Safe Navigation) or higher required # # See LICENSE.md for license information. diff --git a/gems/markdown-merge/bin/rubocop-gradual b/gems/markdown-merge/bin/rubocop-gradual new file mode 100755 index 000000000..7c7ff0635 --- /dev/null +++ b/gems/markdown-merge/bin/rubocop-gradual @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'rubocop-gradual' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'rubygems' +require 'bundler/setup' + +load Gem.bin_path('rubocop-gradual', 'rubocop-gradual') diff --git a/gems/markdown-merge/gemfiles/modular/coverage_local.gemfile b/gems/markdown-merge/gemfiles/modular/coverage_local.gemfile index 37917caac..d6c890e46 100644 --- a/gems/markdown-merge/gemfiles/modular/coverage_local.gemfile +++ b/gems/markdown-merge/gemfiles/modular/coverage_local.gemfile @@ -29,11 +29,31 @@ Kernel.send(:gem, 'nomono', *nomono_activation_requirements) require 'nomono/bundler' local_gems = %w[kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -local_gems_to_eval = local_gems - %w[] - declared_gems # export KETTLE_DEV_DEV=/path/to/my platform :mri do + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + local_gems_to_eval = local_gems - %w[] - declared_gems + eval_nomono_gems( gems: local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/markdown-merge/gemfiles/modular/style.gemfile b/gems/markdown-merge/gemfiles/modular/style.gemfile index 59c5dc1a3..41ec99454 100644 --- a/gems/markdown-merge/gemfiles/modular/style.gemfile +++ b/gems/markdown-merge/gemfiles/modular/style.gemfile @@ -24,9 +24,9 @@ platform :mri do if ENV.fetch('RUBOCOP_LTS_DEV', 'false').casecmp('false').zero? declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) - gem 'rubocop-lts', '~> 24.2', '>= 24.2.1' unless declared_gems.include?('rubocop-lts') - gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.5' unless declared_gems.include?('rubocop-lts-rspec') - gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.6' unless declared_gems.include?('rubocop-ruby3_2') + gem 'rubocop-lts', '~> 24.2', '>= 24.2.3' unless declared_gems.include?('rubocop-lts') + gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.6' unless declared_gems.include?('rubocop-lts-rspec') + gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.8' unless declared_gems.include?('rubocop-ruby3_2') else eval_gemfile('style_local.gemfile') end diff --git a/gems/markdown-merge/gemfiles/modular/templating.gemfile b/gems/markdown-merge/gemfiles/modular/templating.gemfile index 6af159bd7..ce51a08ed 100644 --- a/gems/markdown-merge/gemfiles/modular/templating.gemfile +++ b/gems/markdown-merge/gemfiles/modular/templating.gemfile @@ -18,7 +18,7 @@ end if structuredmerge_remote # Merge recipes for released installs. - gem 'kettle-jem', '>= 7.0' + gem 'kettle-jem', '~> 7.1', '>= 7.1.26' end if kettle_remote diff --git a/gems/markdown-merge/gemfiles/modular/templating_local.gemfile b/gems/markdown-merge/gemfiles/modular/templating_local.gemfile index 8b4cae98b..2a9520264 100644 --- a/gems/markdown-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/markdown-merge/gemfiles/modular/templating_local.gemfile @@ -65,9 +65,7 @@ structuredmerge_local_gems = %w[ kettle_dev_local_gems = %w[ kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift ] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[] -kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - (declared_gems - %w[kettle-dev]) if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( @@ -81,6 +79,28 @@ if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 end if ENV.fetch('KETTLE_DEV_DEV', 'false').casecmp('false') != 0 + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - declared_gems + eval_nomono_gems( gems: kettle_dev_local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/markdown-merge/markdown-merge.gemspec b/gems/markdown-merge/markdown-merge.gemspec index 136727b90..a76a5844d 100644 --- a/gems/markdown-merge/markdown-merge.gemspec +++ b/gems/markdown-merge/markdown-merge.gemspec @@ -120,7 +120,7 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.31') # ruby >= 4.0.0 + spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.34') # ruby >= 4.0.0 # Security spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 From 38a1579f1d940c6b8e5f9888386fa78ac0470408 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 23:50:45 -0400 Subject: [PATCH 080/137] =?UTF-8?q?=F0=9F=8E=A8=20Template=20ast-merge-git?= =?UTF-8?q?=20by=20kettle-family?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge-git/.kettle-drift.lock | 76 ++++- gems/ast-merge-git/.rubocop_gradual.lock | 7 +- .../.structuredmerge/kettle-jem.lock | 145 ++++----- gems/ast-merge-git/Gemfile | 2 +- gems/ast-merge-git/Gemfile.lock | 302 ++++++++++-------- gems/ast-merge-git/Rakefile | 2 +- gems/ast-merge-git/ast-merge-git.gemspec | 2 +- gems/ast-merge-git/bin/rubocop-gradual | 16 + .../gemfiles/modular/coverage_local.gemfile | 24 +- .../gemfiles/modular/style.gemfile | 6 +- .../gemfiles/modular/templating.gemfile | 2 +- .../gemfiles/modular/templating_local.gemfile | 24 +- 12 files changed, 379 insertions(+), 229 deletions(-) create mode 100755 gems/ast-merge-git/bin/rubocop-gradual diff --git a/gems/ast-merge-git/.kettle-drift.lock b/gems/ast-merge-git/.kettle-drift.lock index 98b009e1e..1b23f4793 100644 --- a/gems/ast-merge-git/.kettle-drift.lock +++ b/gems/ast-merge-git/.kettle-drift.lock @@ -1,10 +1,82 @@ { + "debug_env: 'KETTLE_DEV_DEBUG',\nroot: %w[src my kettle-dev]": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 46, + 63 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 93, + 110 + ] + } + ], + "path_env: 'KETTLE_DEV_DEV',\nvendored_gems_env: 'VENDORED_GEMS',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 43, + 60 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 90, + 107 + ] + } + ], + "prefix: 'KETTLE_DEV',\npath_env: 'KETTLE_DEV_DEV',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 42, + 59 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 89, + 106 + ] + } + ], + "vendor_gem_dir_env: 'VENDOR_GEM_DIR',\ndebug_env: 'KETTLE_DEV_DEBUG',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 45, + 62 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 92, + 109 + ] + } + ], "vendored_gems_env: 'VENDORED_GEMS',\nvendor_gem_dir_env: 'VENDOR_GEM_DIR',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 44, + 61 + ] + }, { "file": "gemfiles/modular/templating_local.gemfile", "lines": [ - 77, - 88 + 75, + 91, + 108 ] } ] diff --git a/gems/ast-merge-git/.rubocop_gradual.lock b/gems/ast-merge-git/.rubocop_gradual.lock index a61bcd74b..5c490b9ae 100644 --- a/gems/ast-merge-git/.rubocop_gradual.lock +++ b/gems/ast-merge-git/.rubocop_gradual.lock @@ -2,13 +2,13 @@ ".simplecov:74630949": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] ], - "Rakefile:3358920797": [ + "Rakefile:531892062": [ [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], [81, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], [165, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], [168, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] ], - "ast-merge-git.gemspec:2613863778": [ + "ast-merge-git.gemspec:2332307111": [ [137, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4147388508], [148, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], [149, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] @@ -27,6 +27,9 @@ [1, 1, 0, "Naming/FileName: The name of this source file (`vHEAD.gemfile`) should use snake_case.", 5381], [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], + "gemfiles/modular/coverage_local.gemfile:2813372128": [ + [34, 1, 1586, "Metrics/BlockLength: Block has too many lines. [37/25]", 820328175] + ], "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], diff --git a/gems/ast-merge-git/.structuredmerge/kettle-jem.lock b/gems/ast-merge-git/.structuredmerge/kettle-jem.lock index 7b8f66ef3..572915b0f 100644 --- a/gems/ast-merge-git/.structuredmerge/kettle-jem.lock +++ b/gems/ast-merge-git/.structuredmerge/kettle-jem.lock @@ -1,11 +1,12 @@ --- version: 1 template_state: - version: 7.1.18 - applied_at: '2026-09-07' + version: 7.1.26 + applied_at: '2026-09-10' changelog_replay: last_entry_key: kettle-jem-template-20260802-001 last_entry_date: '2026-08-02' + maintenance_changelog: {} checksums: ".aiignore.example": 48a5dfdd93afd1a15fdce39cc28ca9920263f00018b0968ab031fa744521e5ce ".config/mise/env.sh": aeea5a2ab489ba6e5467ae8de6e386ec8c8fe4ff31a044e69d0cd6a092dd6654 @@ -75,7 +76,7 @@ template_state: ".rubocop_rspec.yml.example": 288ad75e7eb14d87d80fafe6f7272217be5c57547536ee56c780a7d10ac7ec74 ".simplecov.example": 222f2e6ce8cf089c70a21f0f5e5423d4bd59a96fdb2ce7754b0fb3d6f430c229 ".structuredmerge/git-drivers.toml.example": 9d241a44c9edffcdbd3da018fa188a238089c3d1635040924df594a6929a4f97 - ".structuredmerge/kettle-jem.yml.example": 26949dc4ee0722415e72452cbc186bee6ef7b154eae33166d36f3fdb1ca6e46d + ".structuredmerge/kettle-jem.yml.example": ff65a738da1af7d60714026a81d3323a46c864e96ae3570b806afdf6e7149ff9 ".yard-lint.yml.example": 90def46867c9436b4e177c47d91fc8165f4602e335715aecc39f5587ae20b55b ".yardignore.example": 821f453c609df7d46145d675424b39dfbe6dfdca8edac5f367b85fff48502455 ".yardopts.example": 6fd6f2701713096a8a9ea095c213bbc68eeef37797c4754d97837e3229a3a5f6 @@ -88,7 +89,7 @@ template_state: CHANGELOG.transfer.md: 21331d8a9e58b4ff6e088b88eb408bcccb0f2f64e78f8f4d42ac3f11a24baad8 CITATION.cff.example: e404ea0a7919d78a83d53d80e211d17b9663576aa606583b709795dc023fd75c CODE_OF_CONDUCT.md.example: f1ad532f1860f73ef774c6b27a26d41f4bc1cb8813034f5957487766ebb0986b - CONTRIBUTING.md.example: 22570cfb3dde72be79b4b522b6d5ab13f95d778e40444483a096871fe0891b19 + CONTRIBUTING.md.example: 8d23cce2d061e0c20d619c3f66591df5f32821cd84c32d171df0b8ebe1217a55 FUNDING.md.example: 392d047904b1557b29f4b43d37ec403b7480edd5b6ab51180be979b57a91e6ba FUNDING.md.no-osc.example: 3ef0258dd3e3b7f7e17e8bc2d20dcbcb3e74aa5a5a6f51297075696645e34c77 Gemfile.example: 99500023987e81775a9b5ef14e92cb3992f2ac408e5f42454f2728eee9b49fb2 @@ -99,19 +100,19 @@ template_state: PolyForm-Small-Business-1.0.0.md.example: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 README.md.example: 21f491e3d73bfc1b74056a6dcba61f72c93dee3cfe5272ac164a20978454de21 REEK: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - RUBOCOP.md.example: c09e5533ccc59b70a2efa05c99f66e521137c1053d3c12eb43509cebd5b68b0e + RUBOCOP.md.example: d99871a0e4c1d323c92e7febf328f062bb4722069b2abfd0a83bf7daa8dcbf8c Rakefile.example: 569803e726b07ea26267fec6891367a3096a0dff3c266269a7081d36afe496af SECURITY.md.example: ee9411aa85f36d88363fdaea7a1baea4362b6ec112cf2688e711b05de1d3144c bin/setup.example: 0ac35089c95a91d8973fe7a318bf9fd98b9f8e00db92c5d9ca6cd858abb8d41b certs/pboling.pem.example: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - gem.gemspec.example: 83e834e8958a88e4817a57199f48f5ebb245548ce251c5c47372208693f03b17 + gem.gemspec.example: 12dcadc0b297ccd4e18b9d1e538b98ac8330ef9fb2a059ed6754ad59272b77fa gemfiles/modular/benchmark/r4/v0.5.gemfile.example: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 gemfiles/modular/benchmark/vHEAD.gemfile.example: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 gemfiles/modular/cgi/r4/v0.5.gemfile.example: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 gemfiles/modular/cgi/vHEAD.gemfile.example: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 gemfiles/modular/changelog.gemfile.example: 892598e0e7792eb205247ae28128cef6dfc647d2fb33968969152230d6f69288 gemfiles/modular/coverage.gemfile.example: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - gemfiles/modular/coverage_local.gemfile.example: 928d5f260d7b119c038baa56da9fb78dd524dee613aea33ab72894bbce5c506e + gemfiles/modular/coverage_local.gemfile.example: 92ea0d7a9d693553dc614afa2c43990f5c3778c2b00ef6c528e122c31bd506a1 gemfiles/modular/debug.gemfile.example: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 gemfiles/modular/documentation.gemfile.example: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c gemfiles/modular/documentation_local.gemfile.example: 84a20f5d4b0feb94c2cf2f7a8dce8f682f1483498e41484c2b447a5661fd1870 @@ -145,10 +146,10 @@ template_state: gemfiles/modular/stringio/r3/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/r4/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/vHEAD.gemfile.example: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - gemfiles/modular/style.gemfile.example: 3ad0585b4f2db8918580ca41ea8723f7a166d7a83cfd7f9613511094997106fd + gemfiles/modular/style.gemfile.example: 02fe3e8fd00e49b90c3ab30e19b51014ee50490f3eadcfd1d4a39f4c2c997dda gemfiles/modular/style_local.gemfile.example: c86beb711e766126a5be68be4be18255831625ac3650d5069383c4a83a9511f3 - gemfiles/modular/templating.gemfile.example: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - gemfiles/modular/templating_local.gemfile.example: 930057d3b909a72e39a39125c4e883a7ff71f5691e64426c0541f8c8fc75b83f + gemfiles/modular/templating.gemfile.example: 2b33c094677b53ad9dd2eafeb3a3be452f612380c61001a2e75b3c078b8ff72a + gemfiles/modular/templating_local.gemfile.example: ac7259516e69ffafb8b9342a897ddf6042adc46335743f474c342509cefd8f2e gemfiles/modular/webrick/r4/v1.9.gemfile.example: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea gemfiles/modular/webrick/vHEAD.gemfile.example: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b gemfiles/modular/x_std_libs.gemfile.example: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a @@ -175,7 +176,7 @@ template_state: shim/Gemfile.example: 0fb0d9d06fcfb1fd6ca6f0eeb5867253ca1ed221e03d28027719225f868b0637 shim/README.md.example: 3a2f7211b7f92a1dfae5e523b8e34b051a3d8af942144b05286eca0b3c8f6fbe shim/Rakefile.example: 572c94da7052083b39b62a6600785419e314a109efd7a3d8c3a96eb77ad34fd1 - shim/gem.gemspec.example: efae033238e4fd1355cfc134f5c9123f175d1ad1dc4a1a2e663899788c9e0870 + shim/gem.gemspec.example: 14a7015b3328005d1c3b5fda6886bd6da383707745f6eaaa781d6f9689600131 shim/lib/compat_require.rb.example: 94ee85e353a3ca08c8a35c9063d4ff789214ea594c7f803f6cf09d7142f48379 shim/lib/entrypoint.rb.example: dd57613520daca01d6f6bcaa9b83b00ff74505240dc04b84ceb686df3c0539d7 shim/lib/version.rb.example: 15e219ac3a928b5580035f891e415551213175020f1131f6e7ca0ccd55a1b2d6 @@ -189,370 +190,370 @@ files: recipe: template_source_application_simplecov action: write dest_sha256: 6ca7cdefba9fcc0678dd4ed217f9adf326b0c2b1526cdddeaafe863aa61399c4 - input_fingerprint: 0f211850f4fcc6a458039b1e388b6e72e805c24993cdb813e5b189b037f43781 + input_fingerprint: ff1792246465285dedf094c47bbbb4d168cca8f6771feac3741bce3cf3918818 template_sources: - ".simplecov.example" AGPL-3.0-only.md: recipe: template_source_application_AGPL_3_0_only_md action: write dest_sha256: d8a6cc31abc16b6748c7a21f21611f5a1ec33f67d22ca23d7da1c19b95496bee - input_fingerprint: 4efb19787f1678d4c57bb58f8eaeac8a04ada547326b87aad05af411c3671b6f + input_fingerprint: 21d45718184299b3cef0675976c2b73080dc21c9abd57c8f390d6a94c1dfc7c9 template_sources: - AGPL-3.0-only.md.example Gemfile: recipe: template_source_application_Gemfile action: write - dest_sha256: dca68a169209c9d277bfd17571794b916fb1776f1cf685d9f483aeb46053798a - input_fingerprint: f119fb21ba80354af47bbe9da7fbc7c4f1a7d8afd08a2f26ed277909de618c6a + dest_sha256: 2cfb58cb7f04bff174ab2051e0084afe09e7598b26b351ced362edae2f083f43 + input_fingerprint: 94c70b6e99568445010f56fd534ebecc737c5fe5d45d90de00ff62b6e43c793e template_sources: - Gemfile.example LICENSE.md: recipe: template_source_application_LICENSE_md action: write dest_sha256: f6188bfd474a636d2a526420ebb411250faa447d94c9b9ccee097128ce4101b5 - input_fingerprint: 314a3deeb0127636c1ab7cd44438ab34c8c5fa49baecedfcbd3c3aefd9706b38 + input_fingerprint: aad8dd63f08022feef81d1ce2824fd372167e2abfb989c2ced41b613d9f5eb30 template_sources: - LICENSE.md.example PolyForm-Small-Business-1.0.0.md: recipe: template_source_application_PolyForm_Small_Business_1_0_0_md action: write dest_sha256: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 - input_fingerprint: 4706aac34812ac0c634e5d6ccdf48b93c9e73f9796431e3bde874f4ffab379c3 + input_fingerprint: 512a3c1f8c0d8c8b30f40f1268695850657388e32ee851dbac57c78962c8bd6b template_sources: - PolyForm-Small-Business-1.0.0.md.example README.md: recipe: template_source_application_README_md action: write dest_sha256: 3d0caf17cb98a61b06c2c5645f826ced30bdea968b54776348de0b5a2ceaa157 - input_fingerprint: de591da5b2afc97fb1f95b88e673b608ebf356d38810b71825bea4f9467d6e38 + input_fingerprint: 2151dee8add0f0f829ecaeea6da3c0f4ea4206f8c68d927fab9b9196665d28a9 template_sources: - README.md.example Rakefile: recipe: template_source_application_Rakefile action: write - dest_sha256: e91fe9f84ecb273c4b8a19c7309f1063495d4119aac480e597d2b1067ec8a8fb - input_fingerprint: 371e2bb4ace9bdd29af28ee6e6767a482698fdd925480eee418bfca02036176a + dest_sha256: 89281336338c40708c8da8066c23f9225e68228e43f0e6e3b4e821dbc503b52d + input_fingerprint: ed24ffa72b9b2da263f44e584ac8c1f515c4e4b14b3df778f108e4f5d78eba76 template_sources: - Rakefile.example ast-merge-git.gemspec: recipe: template_source_application_ast_merge_git_gemspec action: write - dest_sha256: a31852e639da8783ed107cd846d071e753dbb7879e8352339b27730c4f9f7665 - input_fingerprint: 0e18705ca202690da0f8bda47b4762132325c1f7c3c4425ce2f4bcbdb64ab803 + dest_sha256: c321013cfe24c0b0b5aaa16d75c1c6f6a3a6bb68b6df47f2d19d801f784cc103 + input_fingerprint: 7a5b2a57caa5e1a83f5b6312fbb1297838be7373aaf29d13ce28235edbd81a2a template_sources: - gem.gemspec.example certs/pboling.pem: recipe: template_source_application_certs_pboling_pem action: write dest_sha256: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - input_fingerprint: 01c0cfd5b917f51ad0890dad3ebb1837d8f66eaf70daeff5d6064c0dbd153b4d + input_fingerprint: 764de435df081b7ed8595579393ee6c34b2b714049e572028e392fb0764159f1 template_sources: - certs/pboling.pem.example gemfiles/modular/benchmark/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_r4_v0_5_gemfile action: write dest_sha256: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 - input_fingerprint: 929461bdf1dfbe9b6a51a4fbb5466ec3df7afe069aa166228cc14263141d6eb1 + input_fingerprint: d5a64cc05cd87a31b82f45110cb99a92399ce2d263964e06c6560859a0f8dc93 template_sources: - gemfiles/modular/benchmark/r4/v0.5.gemfile.example gemfiles/modular/benchmark/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_vHEAD_gemfile action: write dest_sha256: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 - input_fingerprint: '03880b9251b24edad948c0bc81270e253adab6245c3850990d93fc210e84e5ee' + input_fingerprint: 4f152aea3e80f91ae333139e80da04a5f5cb84f3640acad025468ca995f96809 template_sources: - gemfiles/modular/benchmark/vHEAD.gemfile.example gemfiles/modular/cgi/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_cgi_r4_v0_5_gemfile action: write dest_sha256: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 - input_fingerprint: 0dacb922832b7ec8c17011cfe3b95485638c3b4c0f406c55f0278efd14c31e53 + input_fingerprint: e92ae9a42e35c0f99a613cdd1fc84af013d6a4dde0208680742ddc818c040506 template_sources: - gemfiles/modular/cgi/r4/v0.5.gemfile.example gemfiles/modular/cgi/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_cgi_vHEAD_gemfile action: write dest_sha256: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 - input_fingerprint: d53641e82693459fd6bd4a27c040a29cd682318b7a31b039c676503770c75d5e + input_fingerprint: 0a2867fc9140e74a275404e313d127b4f01b95ce21a56105fcdbb0c27eaacaa0 template_sources: - gemfiles/modular/cgi/vHEAD.gemfile.example gemfiles/modular/changelog.gemfile: recipe: template_source_application_gemfiles_modular_changelog_gemfile action: write dest_sha256: da669526144fbff33aef207db9541b6fd6c254437f94dec2fab70fc55a7757cd - input_fingerprint: 1f2d4d7f03b1b11028f3a3542b536382973f56232feda95ebe2e6f66e956968e + input_fingerprint: de3fbe6d1dc0e4359166fd79524fd30860c3cf902d3cf41c5ff7d7072190be5b template_sources: - gemfiles/modular/changelog.gemfile.example gemfiles/modular/coverage.gemfile: recipe: template_source_application_gemfiles_modular_coverage_gemfile action: write dest_sha256: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - input_fingerprint: fb5768814ccb58ea8814ec1a09a6c5264bce29dd367b4673756aa78c4ce17428 + input_fingerprint: b650c09bf0516ca41a95b329a9aab81f59bb7bec3a19a28aff291e14da6b945c template_sources: - gemfiles/modular/coverage.gemfile.example gemfiles/modular/coverage_local.gemfile: recipe: template_source_application_gemfiles_modular_coverage_local_gemfile action: write - dest_sha256: 2b493414df06261ba8acb6f0eb18bf3fdd701d7cb5f967a9d15a3f42a4741827 - input_fingerprint: 61a67674b855be34a14e33c2b050bfd87ac2e9714ff9dc4960a0042eed972d7a + dest_sha256: 92c9a599c8f6867ec532880f73568f2736ac05d8973ec524b42fd5dbe6aeda3e + input_fingerprint: a928b0b147ea1368e0ef9509befbd91acc69d34f0b993972a2dc088f37e7a985 template_sources: - gemfiles/modular/coverage_local.gemfile.example gemfiles/modular/debug.gemfile: recipe: template_source_application_gemfiles_modular_debug_gemfile action: write dest_sha256: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 - input_fingerprint: a99cd21d95f50db018b9884c6ed7cf881c7ed67a2f2a146cb199d2fc8c890988 + input_fingerprint: d7954c8112fb85fa56828eaed91011a41b238e41567fc8a8ccbdcf8d868104fd template_sources: - gemfiles/modular/debug.gemfile.example gemfiles/modular/documentation.gemfile: recipe: template_source_application_gemfiles_modular_documentation_gemfile action: write dest_sha256: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c - input_fingerprint: 6d1b20bcb497d08eb3b32f0ce1294442750066af7626f8cd32cc1c2d8048d2f6 + input_fingerprint: 3ecbcdd2cd02c52e1ac688c2333cc13090b1c25f9d33ebc4000c83bde3a3f6c3 template_sources: - gemfiles/modular/documentation.gemfile.example gemfiles/modular/documentation_local.gemfile: recipe: template_source_application_gemfiles_modular_documentation_local_gemfile action: write dest_sha256: 2058173855b9a4acc6d5efa20520e49734243eef6cf0b5e9063e0e5866a08e9c - input_fingerprint: 1cb497add747ed669170fa3548a0a235c072d57855c10220a58510039ecd9abe + input_fingerprint: 19a4478202022d1d3df32b61d0d5143a09973d60fcfc8edf6af49b1bf12b46af template_sources: - gemfiles/modular/documentation_local.gemfile.example gemfiles/modular/erb/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r2_v3_0_gemfile action: write dest_sha256: 3793e7dc9ef23a7ccd893d48cbba092fd27594c63e65cca011cc658218425670 - input_fingerprint: a9c114b1c9d9a44ff0bd59fac01df56bb6648807fdbe66caa7a1ad423f6f10f4 + input_fingerprint: bd9cb59958efb0ba20a7492f9e66c2884155191b0988a9f16ab77fb00f416ca2 template_sources: - gemfiles/modular/erb/r2/v3.0.gemfile.example gemfiles/modular/erb/r3/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r3_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 798a9c6785e4f0851f7fd99e3261705992aaa89f1eabdfae10eeff0dae9d43bc + input_fingerprint: 744f67bfd18fec97a74319276b77b7d1652a6403fbc6c9801007d2154296dcfc template_sources: - gemfiles/modular/erb/r3/v5.0.gemfile.example gemfiles/modular/erb/r4/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r4_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: bd98826624553515e2d84c83bed8adb188ae7e7d61a13751ebb70a24ecaea96b + input_fingerprint: 67853a79edbe94056ae1cdbb265955a27996dae13e385dc225b036727e4f5c0a template_sources: - gemfiles/modular/erb/r4/v5.0.gemfile.example gemfiles/modular/erb/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_erb_vHEAD_gemfile action: write dest_sha256: ad6f104a49e80e0cf625440e3dc816343fe7e2f037fc4971df75e7bb4305c683 - input_fingerprint: f5d81f4485cdd9ab7c23ab7d9ad66991ac9a74063098d9469ed349298c41e15f + input_fingerprint: 79b77701148d71dcf568a987006e49f1d2e2ad89511e8dd0f5a5b3cf60a3a140 template_sources: - gemfiles/modular/erb/vHEAD.gemfile.example gemfiles/modular/json/truffleruby_22_3.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_22_3_gemfile action: write dest_sha256: 249c12eacbe90f9d0d2e81e7a62c4c7e9102e504ededcda4ecf660cb3bb68be4 - input_fingerprint: 2bd010487e144699c3ee8d7d32a2f02ee0251cff40d745659257422485cacfa5 + input_fingerprint: 2ed17d9201133dc8f9fe43e937d7820dffabcf3512ac7872069a3bc189a3c673 template_sources: - gemfiles/modular/json/truffleruby_22_3.gemfile.example gemfiles/modular/json/truffleruby_23_0.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_0_gemfile action: write dest_sha256: 66aa010567f7afa1af8244a74c3c88ecaaf84dc87b6a25180691bb480d02ed28 - input_fingerprint: b418ec4aea1a02caa1f02f1d0a50bfe73ab437e9ccdbb665dd8064898e7beba3 + input_fingerprint: 0bb649823cf2c714e2fe5493387a838f6de7acfcf2cef2ab008d9b76bb6ec2e6 template_sources: - gemfiles/modular/json/truffleruby_23_0.gemfile.example gemfiles/modular/json/truffleruby_23_1.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_1_gemfile action: write dest_sha256: '080fcbdaf2bec73cad40832a3d51eebb380af789917b96f493d1460b0dd6361d' - input_fingerprint: 5e077d7561f119c06a7760ac0f1fd152de71c69bf5c353a18d8496b2bde4bb80 + input_fingerprint: 22156e49e1855c2218d79f82216235a0074ace7a97fd13e689eaefc541568f46 template_sources: - gemfiles/modular/json/truffleruby_23_1.gemfile.example gemfiles/modular/mutex_m/r2/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r2_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 237be78bdceacfe98608e0770c7806c2794cf83577f392da67454219ef527826 + input_fingerprint: 22d595a4c4c26a72708086fd14b83457474e88666213da14930e7dff152fba4c template_sources: - gemfiles/modular/mutex_m/r2/v0.3.gemfile.example gemfiles/modular/mutex_m/r3/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r3_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: f4173f664653d0d0c1afdf1b07bd421336be0984d648b33e25f110fea4678c22 + input_fingerprint: dfb68e88b13c8a63eb59115edd4169407a3ebf157e0e5d01c1c998a93a549522 template_sources: - gemfiles/modular/mutex_m/r3/v0.3.gemfile.example gemfiles/modular/mutex_m/r4/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r4_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 832879acbc94533df7c3ee378e0bff703c1de9840f41b898b3bbe9643e478237 + input_fingerprint: 1aa16a44e87fada58d44315d976c3259aa68cd450489a24a8a0c6e35ef150b0a template_sources: - gemfiles/modular/mutex_m/r4/v0.3.gemfile.example gemfiles/modular/mutex_m/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_vHEAD_gemfile action: write dest_sha256: '08018641c97f894788fa91b462da504ab2237213d18d95404136c393274ae3cb' - input_fingerprint: fede9687643a45747ca90d3ac95c8cd335319d86766aa5135fc15a99df9611e4 + input_fingerprint: 8afc6f430fea2651a3857def56559115866f11f551d87079af6bb3f53ce5138a template_sources: - gemfiles/modular/mutex_m/vHEAD.gemfile.example gemfiles/modular/optional.gemfile: recipe: template_source_application_gemfiles_modular_optional_gemfile action: write dest_sha256: f770e6e9a9dd2bd0f1f132e882d88038b2e21127dce3afe270908c7338c28bfd - input_fingerprint: 0c31fa0b355600a1f3e6ad29e8b8377c7d63f77c5cf0eae8040fec3a9b89ee34 + input_fingerprint: c0c30cc881b0408e40db11ccf00324f1a92abc28d13fb41db1a12837841e07ec template_sources: - gemfiles/modular/optional.gemfile.example gemfiles/modular/rspec.gemfile: recipe: template_source_application_gemfiles_modular_rspec_gemfile action: write dest_sha256: d043f5c9344f6435edb4607c5adaf42c78e7fb6b8b6726007de2bbedefb376c3 - input_fingerprint: aed3e7ddebe6e8cb3a197d83e9c824342171e70379b56c291981d34c373b308b + input_fingerprint: b91d499a74f45defa33da392ecba85dd9d152f16aac448a586ad8dc27a7b69fb template_sources: - gemfiles/modular/rspec.gemfile.example gemfiles/modular/runtime_heads.gemfile: recipe: template_source_application_gemfiles_modular_runtime_heads_gemfile action: write dest_sha256: 6ac7158c4a3088190f2a9082f01439eb27eca2172ab3464b15c9cb045aa885e1 - input_fingerprint: 957ffb1df924313bbc17e77a8ebadee0cbce751f3af139e09878371b1528c8a7 + input_fingerprint: 3c6783351cd117ba851c5841d3468fd6c40c01fe3221443b7903b8a9bb64e7a2 template_sources: - gemfiles/modular/runtime_heads.gemfile.example gemfiles/modular/stringio/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r2_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: cde31ba11cceeec8376a0ff0ac0b28a9c5e0e2a9fa5a6f20e7a1d9e3a81cb9ce + input_fingerprint: 611a6f14c2b83a37f8892cce48c6e1ee54bbc1467e518e5648cfb3aae613bc3f template_sources: - gemfiles/modular/stringio/r2/v3.0.gemfile.example gemfiles/modular/stringio/r3/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r3_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 063f0e87eb4f219a95c20ea447142957c4e9ce8011be250fc113914cac4d4c24 + input_fingerprint: b3a2134cd029602f936f628020670ada95187665825f89ed58f72be540fdf8c9 template_sources: - gemfiles/modular/stringio/r3/v3.0.gemfile.example gemfiles/modular/stringio/r4/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r4_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 990b56d600c7832c696ac9c51b27ef9259181c23725723cf1b6027edfbe84c18 + input_fingerprint: 943ce46484ce8b6827f9135ee8b89f9cb734866b83f2e2e48fe96332b9288856 template_sources: - gemfiles/modular/stringio/r4/v3.0.gemfile.example gemfiles/modular/stringio/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_stringio_vHEAD_gemfile action: write dest_sha256: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - input_fingerprint: 1432b70ac8d67cd0e0e02914847530b4c5e7abf2a1bf95164368db09bcd3786e + input_fingerprint: 893b5d4be0b1b5c98a9325b4b17d0d362023e972d4f4df0f80cbdc325ec22f7e template_sources: - gemfiles/modular/stringio/vHEAD.gemfile.example gemfiles/modular/style.gemfile: recipe: template_source_application_gemfiles_modular_style_gemfile action: write - dest_sha256: 2a3d46dcb8a9394f595f273f5eb0403d0a552837754ab109afc9ba79a7159083 - input_fingerprint: bb250782a0c46a2428eb0bcd463c69120aa01ef0cb3e503a257cb0d8c3e20ef5 + dest_sha256: 9a24acff0054573c30f5d84d0418cd465ba3794d075bb5a36801410ac40e0787 + input_fingerprint: 37d18a44bbb895d17bf1cadb1af78ea8ec8428362ba71e11e56e42af8d4006b0 template_sources: - gemfiles/modular/style.gemfile.example gemfiles/modular/style_local.gemfile: recipe: template_source_application_gemfiles_modular_style_local_gemfile action: write dest_sha256: 55eb9c149cdb2f29c9f31abe2d55a4f334e00fb859681dd17c42149a3f28ca36 - input_fingerprint: bf743d96d525a862461bcf3acbbf347e7ba1003417a0889f384c19b7a6a9c91d + input_fingerprint: 0b5c229b8ede425ddd7456b5fe660e92f07ffdc5a44eb50e6ef1d992afd80bb0 template_sources: - gemfiles/modular/style_local.gemfile.example gemfiles/modular/templating.gemfile: recipe: template_source_application_gemfiles_modular_templating_gemfile action: write - dest_sha256: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - input_fingerprint: 8ede8d14e0d2d7cb2bdfa826b6098cbed23faf7bd954f2bf23dae5f3b744253a + dest_sha256: 432ba59798d31b899268257c432443a017c5a9bd2c0c7f9f2216617e14150cd3 + input_fingerprint: c1e1bd18141253445bc6d497978ba7784d97f94d21c816a22cbd765267d517dd template_sources: - gemfiles/modular/templating.gemfile.example gemfiles/modular/templating_local.gemfile: recipe: template_source_application_gemfiles_modular_templating_local_gemfile action: write - dest_sha256: ef52ada498d2a1c10578a0aad0d01ddc2942268f993cecd8ac2c89a832ae3d69 - input_fingerprint: 93e3f5e4aa3ce1e8bcbecd20444dff1ca90c3b7f76555fd2b780fe8d0ff422fa + dest_sha256: 16a34d139c6ebf0d9e91070dacc5ce7bf4c2cf82a02896263b1795c8e6ea0773 + input_fingerprint: 949383fc9ac0a5b8ed5330ef1927b652ca2f0e4a3b529d006f8fa86809470448 template_sources: - gemfiles/modular/templating_local.gemfile.example gemfiles/modular/webrick/r4/v1.9.gemfile: recipe: template_source_application_gemfiles_modular_webrick_r4_v1_9_gemfile action: write dest_sha256: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea - input_fingerprint: 843ae36d09eb5891e82feae63c52f08fe11439d1b31d5efa116d5a76125bca9b + input_fingerprint: dd1e9b140491c341060f0989e00201c01520633b0dd6494652412f5d369671b7 template_sources: - gemfiles/modular/webrick/r4/v1.9.gemfile.example gemfiles/modular/webrick/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_webrick_vHEAD_gemfile action: write dest_sha256: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b - input_fingerprint: 68517738501b5c7dcebdcbd680261f62433bd74aef7385a1ac9a76cab5d8a549 + input_fingerprint: 33b9ec19eb8c64f01c4704e68815a6b92938a4c341cb1e595818790aad4c2f51 template_sources: - gemfiles/modular/webrick/vHEAD.gemfile.example gemfiles/modular/x_std_libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_gemfile action: write dest_sha256: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a - input_fingerprint: 6d142ad0c27af24c650b5c48b2187d4a7cfa965d6a2933a72501a8b7f7df3f9d + input_fingerprint: ab8617ee631084ba5c41db436d313b0d46f401b991609d0cbd9fb103055f7a00 template_sources: - gemfiles/modular/x_std_libs.gemfile.example gemfiles/modular/x_std_libs/r2/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r2_libs_gemfile action: write dest_sha256: e80ec8ad06cb1b31ac982bc25cf7696987fca131aa1001eaefd0bf5cd379c273 - input_fingerprint: 42976aba181e43a35d7a8f7998a5f8404c413a63c7d0bad21719e052c1cd52b5 + input_fingerprint: 3bed98bf27fe574e351f6ec6e11bfd8ff4846703fd5abef6cb854e924b5c5a8b template_sources: - gemfiles/modular/x_std_libs/r2/libs.gemfile.example gemfiles/modular/x_std_libs/r3.1/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_1_libs_gemfile action: write dest_sha256: 9f8565c40b09bea1bc4c2e2ad87fe11400c3c51a2b235655bfcd8e491ed88ca8 - input_fingerprint: 39d25da74d51b92858b621124e20e0706ee62dfd4db36da472ea36fc824630e8 + input_fingerprint: f554031192c653175e9cbd85904061eb607f2059beaa7ef3c3e813c82202bc68 template_sources: - gemfiles/modular/x_std_libs/r3.1/libs.gemfile.example gemfiles/modular/x_std_libs/r3/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_libs_gemfile action: write dest_sha256: 546f8849f4267bb19aa10ff0de40be30957197f229e6887847181ea9127b2650 - input_fingerprint: d63aea2349622d61c97a27b0e23c5c1efb45f57545019bccfbf2e79d843cc115 + input_fingerprint: 7fb30e88e1a44462b62d136a84d2a295237ecea74eb0f8da30c88002241aa130 template_sources: - gemfiles/modular/x_std_libs/r3/libs.gemfile.example gemfiles/modular/x_std_libs/r4/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r4_libs_gemfile action: write dest_sha256: 8c2582eaa218d216b98c86c933465295c8b4e43f3251ea388b9eaf6e471f8da6 - input_fingerprint: 0a56eb87310cde24c7fa686ea7da5a0a30be261c8b041a8b3149ecfbbc1a047d + input_fingerprint: e978582b664f5e8301a86fa26689afcea7fd135d5f01a083c24dcde3063ac47e template_sources: - gemfiles/modular/x_std_libs/r4/libs.gemfile.example gemfiles/modular/x_std_libs/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_vHEAD_gemfile action: write dest_sha256: d3133ec4c0638363a7fb025d19be7e95a615fd61c35ddb8d17f2280ee74a7486 - input_fingerprint: f4f0fd44a00cae15e5ee1be330cefa683b043649f275655185311bfbe655d746 + input_fingerprint: 14af153f55dcc6b82c45b3feab3487f5e52f9c9ce971aea925344b363a02e9c8 template_sources: - gemfiles/modular/x_std_libs/vHEAD.gemfile.example lib/ast/merge/git/version.rb: recipe: template_source_application_lib_ast_merge_git_version_rb action: write - dest_sha256: 1e77c0884047e319932c347565719ab12aac7a40afd01956d167dcc0b239e5d0 - input_fingerprint: c1c28f710361e8a1253aae585a3bafd5b27b300b4ec787f46632aba90e59ab89 + dest_sha256: 28316e7b1285fd0d21ec4f6d1867d11d9c7df93f027f80535f890e67e1ef2c6c + input_fingerprint: 06a59ad26cc6c8a7d1e14ae85932a13a787d3c9fdd2de05878e41b56da70a185 template_sources: - lib/gem/version.rb.example mise.toml: recipe: template_source_application_mise_toml action: write dest_sha256: 7d267154ca4f081b0ac7da804c0180c2b091aec5f1c877417c1c320f4f369c88 - input_fingerprint: 789a396c389b3711c35357d9b71ddddcc86ee820b10f9f32318068fb97f5b66a + input_fingerprint: 68ae92fd0ff329f2ce6d89fa8c24803482506b2d1643ab0a1c4bb9a5ebbd02fc template_sources: - mise.toml.no-osc.example sig/ast/merge/git.rbs: recipe: template_source_application_sig_ast_merge_git_rbs action: write dest_sha256: da2fa5e17930670d54bd73928f5ee746bd1b03159ca308cc89e35953ccba9169 - input_fingerprint: b95dda3fcc2810e59b3c2a3cfce7790ec1f6169c00a867cee64d18ff75452040 + input_fingerprint: da883647ed1a6c4249d1d2a43d9ec4f18c162e33fd5041221321029efb0bfcee template_sources: - sig/gem.rbs.example spec/spec_helper.rb: recipe: template_source_application_spec_spec_helper_rb action: write dest_sha256: a54e158dda53222ca60e3b0ebb623b58b36ae6c3fa4e333cd47049394d8b6ed0 - input_fingerprint: b4d315d7652a9fa6ca31deda8b675c99b8cbf5156702b3bd25269d7089792687 + input_fingerprint: 532064e09573d6dfbd7132a9313e6b189e0a007f84d0f52d71b0b93d9958d1b4 template_sources: - spec/spec_helper.rb.example diff --git a/gems/ast-merge-git/Gemfile b/gems/ast-merge-git/Gemfile index 5f0a33e90..b5b9b14f9 100644 --- a/gems/ast-merge-git/Gemfile +++ b/gems/ast-merge-git/Gemfile @@ -19,7 +19,7 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } # Include dependencies from ast-merge-git.gemspec gemspec -gem 'kettle-family', '~> 1.2', '>= 1.2.97' +gem 'kettle-family', '~> 1.2', '>= 1.2.100' # Local workspace dependency wiring for *_local.gemfile overrides gem 'nomono', '~> 1.1', '>= 1.1.5', require: false # ruby >= 3.2.0 diff --git a/gems/ast-merge-git/Gemfile.lock b/gems/ast-merge-git/Gemfile.lock index 75cd49e52..3faf33c93 100644 --- a/gems/ast-merge-git/Gemfile.lock +++ b/gems/ast-merge-git/Gemfile.lock @@ -10,123 +10,123 @@ GIT PATH remote: . specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ast-merge-git (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) + ast-crispr-markdown-markly (7.1.9) + ast-crispr (= 7.1.9) + markdown-merge (= 7.1.9) + markly-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism specs: - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) + ast-crispr-ruby-prism (7.1.9) + ast-crispr (= 7.1.9) + prism-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) + ast-crispr (7.1.9) + ast-merge (= 7.1.9) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: - ast-merge (7.1.8) + ast-merge (7.1.9) benchmark token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) + ast-template (7.1.9) + ast-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + bash-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + binary-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) + citrus-toml-merge (7.1.9) + ast-merge (= 7.1.9) + toml-merge (= 7.1.9) toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge specs: - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) commonmarker (~> 2.2) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) + dotenv-merge (7.1.9) + ast-merge (= 7.1.9) + plain-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + go-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + html-merge (7.1.9) + ast-crispr (= 7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + json-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: - kettle-jem (7.1.25) + kettle-jem (7.1.26) addressable (>= 2.8, < 3) ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) @@ -160,122 +160,122 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge specs: - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown (~> 2.5) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + markdown-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) + markly-merge (7.1.9) + markdown-merge (= 7.1.9) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge specs: - parslet-toml-merge (7.1.8) + parslet-toml-merge (7.1.9) toml (~> 0.3) - toml-merge (= 7.1.8) + toml-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + plain-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) + prism-merge (7.1.9) + ast-merge (= 7.1.9) prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + psych-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) + yaml-merge (= 7.1.9) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) + rbs-merge (7.1.9) + ast-merge (= 7.1.9) rbs (>= 3.10) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + rust-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) + smorg-rb (7.1.9) + ast-merge (= 7.1.9) + ast-merge-git (= 7.1.9) + bash-merge (= 7.1.9) diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) + dotenv-merge (= 7.1.9) + go-merge (= 7.1.9) + html-merge (= 7.1.9) + json-merge (= 7.1.9) kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) + markdown-merge (= 7.1.9) + plain-merge (= 7.1.9) + prism-merge (= 7.1.9) + psych-merge (= 7.1.9) + rbs-merge (= 7.1.9) + rust-merge (= 7.1.9) + toml-merge (= 7.1.9) + typescript-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + toml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: - tree_haver (7.1.8) + tree_haver (7.1.9) citrus (~> 3.0) parslet (~> 2.0) tree_sitter_language_pack (>= 1.16.2, < 2.0) @@ -284,25 +284,25 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + typescript-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + yaml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) + zip-merge (7.1.9) + binary-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) GEM @@ -336,6 +336,8 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) + commonmarker (2.10.0) + rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -465,11 +467,15 @@ GEM lint_roller (1.1.0) logger (1.7.0) markly (0.19.0) + mini_portile2 (2.8.9) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) reline (~> 0.6) mutex_m (0.3.0) + nokogiri (1.19.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-musl) @@ -503,6 +509,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) + rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -696,6 +705,9 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_sitter_language_pack (1.16.2) + rb_sys (>= 0.9.130, < 0.10) + sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -784,9 +796,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.31) + kettle-dev (~> 3.0, >= 3.0.34) kettle-drift (~> 1.0, >= 1.0.13) - kettle-family (~> 1.2, >= 1.2.97) + kettle-family (~> 1.2, >= 1.2.100) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) @@ -807,12 +819,12 @@ DEPENDENCIES reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) - rubocop-lts (~> 24.2, >= 24.2.1) - rubocop-lts-rspec (~> 1.0, >= 1.0.5) + rubocop-lts (~> 24.2, >= 24.2.3) + rubocop-lts-rspec (~> 1.0, >= 1.0.6) rubocop-minitest (~> 0.40, >= 0.40.0) rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! - rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) ruby-merge! ruby-progressbar (~> 1.13) rust-merge! @@ -843,33 +855,34 @@ CHECKSUMS appraisal2 (3.2.3) sha256=3a6cfaf8a444e02707b9a34154af1c4902fbe99d9d2168d7e81dd83ec77e6db7 appraisal2-rubocop (1.0.2) sha256=1dae97c1be087cf9c098a3a72fd41f873435e9b8b39687e633b36c9ccb22bff4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.8) - ast-crispr-markdown-markly (7.1.8) - ast-crispr-ruby-prism (7.1.8) - ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) + ast-crispr (7.1.9) + ast-crispr-markdown-markly (7.1.9) + ast-crispr-ruby-prism (7.1.9) + ast-merge (7.1.9) + ast-merge-git (7.1.9) + ast-template (7.1.9) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.8) + bash-merge (7.1.9) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) - bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae + binary-merge (7.1.9) + bundler (4.1.0.beta1) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.8) + citrus-toml-merge (7.1.9) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 + commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e commonmarker (2.10.0-x86_64-darwin) sha256=01e0830ed0319825ecdc16411c90acd3f661d1568dfc178731b3f64d0ce2363d commonmarker (2.10.0-x86_64-linux) sha256=945c510c0bfca9022245928e2248468fe3ddad58c939be0c37b20082cc392880 commonmarker (2.10.0-x86_64-linux-musl) sha256=288cd4fb9f17eed2ffa73551ef241dcf594e0f484b2aee2a0999540333c0618e - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) completely (0.8.0) sha256=e493cd5d84805f47917a41f277ecbfe5f35363bed670be5a957d3acaed8c6c5e concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 @@ -878,7 +891,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docopt_ng (0.7.1) sha256=a024148ee4fa3ab1a8a04411aa4370f39cf2b446e63562097d418b7974a15667 - dotenv-merge (7.1.8) + dotenv-merge (7.1.9) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -891,35 +904,37 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) + go-merge (7.1.9) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) + html-merge (7.1.9) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a - json-merge (7.1.8) - kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + json-merge (7.1.9) + kettle-changelog (1.0.7) + kettle-dev (3.0.34) + kettle-drift (1.0.13) kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 - kettle-jem (7.1.25) + kettle-jem (7.1.26) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 - kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd + kettle-soup-cover (3.0.10) kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 - markdown-merge (7.1.8) + markdown-merge (7.1.9) markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca - markly-merge (7.1.8) + markly-merge (7.1.9) + mini_portile2 (2.8.9) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 + nokogiri (1.19.4) nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af nokogiri (1.19.4-arm64-darwin) sha256=a46db9853286e6597b36ebc6953817d15acf3a299583eb3f89fdc6f91dd63527 @@ -933,20 +948,22 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) - plain-merge (7.1.8) + parslet-toml-merge (7.1.9) + plain-merge (7.1.9) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.8) + prism-merge (7.1.9) psych (5.5.0) sha256=4b245bbbd0f3238df8ccee766ebc1a6b062b10e4ee1d3284eb588739ba156a0a - psych-merge (7.1.8) + psych-merge (7.1.9) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 - rbs-merge (7.1.8) + rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -982,11 +999,11 @@ CHECKSUMS rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.8) + ruby-merge (7.1.9) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) + rust-merge (7.1.9) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +1011,7 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) + smorg-rb (7.1.9) sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1011,9 +1028,10 @@ CHECKSUMS timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.8) + toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb - tree_haver (7.1.8) + tree_haver (7.1.9) + tree_sitter_language_pack (1.16.2) tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 @@ -1023,12 +1041,12 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) + typescript-merge (7.1.9) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 yaml-converter (0.2.5) sha256=a5214fe1a6c2df88bd34a35bcded1b1dcd30135548130df2e03b54ca8c0f2423 - yaml-merge (7.1.8) + yaml-merge (7.1.9) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.8) sha256=73d935d43e3479d65ce8aff25c7d3100e8bb83528a2adaa0ed824e5046ac99e7 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -1037,8 +1055,8 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) + zip-merge (7.1.9) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH - 4.0.20 + 4.1.0.beta1 diff --git a/gems/ast-merge-git/Rakefile b/gems/ast-merge-git/Rakefile index f07a32332..8b77f0960 100644 --- a/gems/ast-merge-git/Rakefile +++ b/gems/ast-merge-git/Rakefile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -# ast-merge-git Rakefile v7.1.18 - 2026-09-07 +# ast-merge-git Rakefile v7.1.26 - 2026-09-09 # Ruby 2.3 (Safe Navigation) or higher required # # See LICENSE.md for license information. diff --git a/gems/ast-merge-git/ast-merge-git.gemspec b/gems/ast-merge-git/ast-merge-git.gemspec index fbeb42cd9..e5a65e863 100644 --- a/gems/ast-merge-git/ast-merge-git.gemspec +++ b/gems/ast-merge-git/ast-merge-git.gemspec @@ -120,7 +120,7 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.31') # ruby >= 4.0.0 + spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.34') # ruby >= 4.0.0 # Security spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 diff --git a/gems/ast-merge-git/bin/rubocop-gradual b/gems/ast-merge-git/bin/rubocop-gradual new file mode 100755 index 000000000..7c7ff0635 --- /dev/null +++ b/gems/ast-merge-git/bin/rubocop-gradual @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'rubocop-gradual' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'rubygems' +require 'bundler/setup' + +load Gem.bin_path('rubocop-gradual', 'rubocop-gradual') diff --git a/gems/ast-merge-git/gemfiles/modular/coverage_local.gemfile b/gems/ast-merge-git/gemfiles/modular/coverage_local.gemfile index 37917caac..d6c890e46 100644 --- a/gems/ast-merge-git/gemfiles/modular/coverage_local.gemfile +++ b/gems/ast-merge-git/gemfiles/modular/coverage_local.gemfile @@ -29,11 +29,31 @@ Kernel.send(:gem, 'nomono', *nomono_activation_requirements) require 'nomono/bundler' local_gems = %w[kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -local_gems_to_eval = local_gems - %w[] - declared_gems # export KETTLE_DEV_DEV=/path/to/my platform :mri do + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + local_gems_to_eval = local_gems - %w[] - declared_gems + eval_nomono_gems( gems: local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/ast-merge-git/gemfiles/modular/style.gemfile b/gems/ast-merge-git/gemfiles/modular/style.gemfile index 59c5dc1a3..41ec99454 100644 --- a/gems/ast-merge-git/gemfiles/modular/style.gemfile +++ b/gems/ast-merge-git/gemfiles/modular/style.gemfile @@ -24,9 +24,9 @@ platform :mri do if ENV.fetch('RUBOCOP_LTS_DEV', 'false').casecmp('false').zero? declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) - gem 'rubocop-lts', '~> 24.2', '>= 24.2.1' unless declared_gems.include?('rubocop-lts') - gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.5' unless declared_gems.include?('rubocop-lts-rspec') - gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.6' unless declared_gems.include?('rubocop-ruby3_2') + gem 'rubocop-lts', '~> 24.2', '>= 24.2.3' unless declared_gems.include?('rubocop-lts') + gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.6' unless declared_gems.include?('rubocop-lts-rspec') + gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.8' unless declared_gems.include?('rubocop-ruby3_2') else eval_gemfile('style_local.gemfile') end diff --git a/gems/ast-merge-git/gemfiles/modular/templating.gemfile b/gems/ast-merge-git/gemfiles/modular/templating.gemfile index 6af159bd7..ce51a08ed 100644 --- a/gems/ast-merge-git/gemfiles/modular/templating.gemfile +++ b/gems/ast-merge-git/gemfiles/modular/templating.gemfile @@ -18,7 +18,7 @@ end if structuredmerge_remote # Merge recipes for released installs. - gem 'kettle-jem', '>= 7.0' + gem 'kettle-jem', '~> 7.1', '>= 7.1.26' end if kettle_remote diff --git a/gems/ast-merge-git/gemfiles/modular/templating_local.gemfile b/gems/ast-merge-git/gemfiles/modular/templating_local.gemfile index 51d71211a..08c0bf6d3 100644 --- a/gems/ast-merge-git/gemfiles/modular/templating_local.gemfile +++ b/gems/ast-merge-git/gemfiles/modular/templating_local.gemfile @@ -65,9 +65,7 @@ structuredmerge_local_gems = %w[ kettle_dev_local_gems = %w[ kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift ] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[] -kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - (declared_gems - %w[kettle-dev]) if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( @@ -81,6 +79,28 @@ if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 end if ENV.fetch('KETTLE_DEV_DEV', 'false').casecmp('false') != 0 + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - declared_gems + eval_nomono_gems( gems: kettle_dev_local_gems_to_eval, prefix: 'KETTLE_DEV', From 0098bc4d0c2beecbeafd2bb52cf5c27876e169cd Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 23:50:45 -0400 Subject: [PATCH 081/137] =?UTF-8?q?=F0=9F=8E=A8=20Template=20plain-merge?= =?UTF-8?q?=20by=20kettle-family?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/plain-merge/.kettle-drift.lock | 76 ++++- gems/plain-merge/.rubocop_gradual.lock | 7 +- .../.structuredmerge/kettle-jem.lock | 145 ++++----- gems/plain-merge/Gemfile | 2 +- gems/plain-merge/Gemfile.lock | 304 ++++++++++-------- gems/plain-merge/Rakefile | 2 +- gems/plain-merge/bin/rubocop-gradual | 16 + .../gemfiles/modular/coverage_local.gemfile | 24 +- .../gemfiles/modular/style.gemfile | 6 +- .../gemfiles/modular/templating.gemfile | 2 +- .../gemfiles/modular/templating_local.gemfile | 24 +- gems/plain-merge/plain-merge.gemspec | 2 +- 12 files changed, 380 insertions(+), 230 deletions(-) create mode 100755 gems/plain-merge/bin/rubocop-gradual diff --git a/gems/plain-merge/.kettle-drift.lock b/gems/plain-merge/.kettle-drift.lock index 98b009e1e..1b23f4793 100644 --- a/gems/plain-merge/.kettle-drift.lock +++ b/gems/plain-merge/.kettle-drift.lock @@ -1,10 +1,82 @@ { + "debug_env: 'KETTLE_DEV_DEBUG',\nroot: %w[src my kettle-dev]": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 46, + 63 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 93, + 110 + ] + } + ], + "path_env: 'KETTLE_DEV_DEV',\nvendored_gems_env: 'VENDORED_GEMS',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 43, + 60 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 90, + 107 + ] + } + ], + "prefix: 'KETTLE_DEV',\npath_env: 'KETTLE_DEV_DEV',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 42, + 59 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 89, + 106 + ] + } + ], + "vendor_gem_dir_env: 'VENDOR_GEM_DIR',\ndebug_env: 'KETTLE_DEV_DEBUG',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 45, + 62 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 92, + 109 + ] + } + ], "vendored_gems_env: 'VENDORED_GEMS',\nvendor_gem_dir_env: 'VENDOR_GEM_DIR',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 44, + 61 + ] + }, { "file": "gemfiles/modular/templating_local.gemfile", "lines": [ - 77, - 88 + 75, + 91, + 108 ] } ] diff --git a/gems/plain-merge/.rubocop_gradual.lock b/gems/plain-merge/.rubocop_gradual.lock index bc4f6615a..1b9183559 100644 --- a/gems/plain-merge/.rubocop_gradual.lock +++ b/gems/plain-merge/.rubocop_gradual.lock @@ -2,7 +2,7 @@ ".simplecov:1228210085": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] ], - "Rakefile:795824029": [ + "Rakefile:2681147166": [ [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], [81, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], [165, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], @@ -22,6 +22,9 @@ [1, 1, 0, "Naming/FileName: The name of this source file (`vHEAD.gemfile`) should use snake_case.", 5381], [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], + "gemfiles/modular/coverage_local.gemfile:2813372128": [ + [34, 1, 1586, "Metrics/BlockLength: Block has too many lines. [37/25]", 820328175] + ], "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], @@ -108,7 +111,7 @@ [214, 5, 700, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<8, 31, 8> 33/17]", 1827550752], [214, 5, 700, "Metrics/MethodLength: Method has too many lines. [18/10]", 1827550752] ], - "plain-merge.gemspec:3025227980": [ + "plain-merge.gemspec:2476306697": [ [137, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4147388508], [148, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], [149, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] diff --git a/gems/plain-merge/.structuredmerge/kettle-jem.lock b/gems/plain-merge/.structuredmerge/kettle-jem.lock index 20176b8bc..565e3157d 100644 --- a/gems/plain-merge/.structuredmerge/kettle-jem.lock +++ b/gems/plain-merge/.structuredmerge/kettle-jem.lock @@ -1,11 +1,12 @@ --- version: 1 template_state: - version: 7.1.18 - applied_at: '2026-09-07' + version: 7.1.26 + applied_at: '2026-09-10' changelog_replay: last_entry_key: kettle-jem-template-20260802-001 last_entry_date: '2026-08-02' + maintenance_changelog: {} checksums: ".aiignore.example": 48a5dfdd93afd1a15fdce39cc28ca9920263f00018b0968ab031fa744521e5ce ".config/mise/env.sh": aeea5a2ab489ba6e5467ae8de6e386ec8c8fe4ff31a044e69d0cd6a092dd6654 @@ -75,7 +76,7 @@ template_state: ".rubocop_rspec.yml.example": 288ad75e7eb14d87d80fafe6f7272217be5c57547536ee56c780a7d10ac7ec74 ".simplecov.example": 222f2e6ce8cf089c70a21f0f5e5423d4bd59a96fdb2ce7754b0fb3d6f430c229 ".structuredmerge/git-drivers.toml.example": 9d241a44c9edffcdbd3da018fa188a238089c3d1635040924df594a6929a4f97 - ".structuredmerge/kettle-jem.yml.example": 26949dc4ee0722415e72452cbc186bee6ef7b154eae33166d36f3fdb1ca6e46d + ".structuredmerge/kettle-jem.yml.example": ff65a738da1af7d60714026a81d3323a46c864e96ae3570b806afdf6e7149ff9 ".yard-lint.yml.example": 90def46867c9436b4e177c47d91fc8165f4602e335715aecc39f5587ae20b55b ".yardignore.example": 821f453c609df7d46145d675424b39dfbe6dfdca8edac5f367b85fff48502455 ".yardopts.example": 6fd6f2701713096a8a9ea095c213bbc68eeef37797c4754d97837e3229a3a5f6 @@ -88,7 +89,7 @@ template_state: CHANGELOG.transfer.md: 21331d8a9e58b4ff6e088b88eb408bcccb0f2f64e78f8f4d42ac3f11a24baad8 CITATION.cff.example: e404ea0a7919d78a83d53d80e211d17b9663576aa606583b709795dc023fd75c CODE_OF_CONDUCT.md.example: f1ad532f1860f73ef774c6b27a26d41f4bc1cb8813034f5957487766ebb0986b - CONTRIBUTING.md.example: 22570cfb3dde72be79b4b522b6d5ab13f95d778e40444483a096871fe0891b19 + CONTRIBUTING.md.example: 8d23cce2d061e0c20d619c3f66591df5f32821cd84c32d171df0b8ebe1217a55 FUNDING.md.example: 392d047904b1557b29f4b43d37ec403b7480edd5b6ab51180be979b57a91e6ba FUNDING.md.no-osc.example: 3ef0258dd3e3b7f7e17e8bc2d20dcbcb3e74aa5a5a6f51297075696645e34c77 Gemfile.example: 99500023987e81775a9b5ef14e92cb3992f2ac408e5f42454f2728eee9b49fb2 @@ -99,19 +100,19 @@ template_state: PolyForm-Small-Business-1.0.0.md.example: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 README.md.example: 21f491e3d73bfc1b74056a6dcba61f72c93dee3cfe5272ac164a20978454de21 REEK: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - RUBOCOP.md.example: c09e5533ccc59b70a2efa05c99f66e521137c1053d3c12eb43509cebd5b68b0e + RUBOCOP.md.example: d99871a0e4c1d323c92e7febf328f062bb4722069b2abfd0a83bf7daa8dcbf8c Rakefile.example: 569803e726b07ea26267fec6891367a3096a0dff3c266269a7081d36afe496af SECURITY.md.example: ee9411aa85f36d88363fdaea7a1baea4362b6ec112cf2688e711b05de1d3144c bin/setup.example: 0ac35089c95a91d8973fe7a318bf9fd98b9f8e00db92c5d9ca6cd858abb8d41b certs/pboling.pem.example: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - gem.gemspec.example: 83e834e8958a88e4817a57199f48f5ebb245548ce251c5c47372208693f03b17 + gem.gemspec.example: 12dcadc0b297ccd4e18b9d1e538b98ac8330ef9fb2a059ed6754ad59272b77fa gemfiles/modular/benchmark/r4/v0.5.gemfile.example: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 gemfiles/modular/benchmark/vHEAD.gemfile.example: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 gemfiles/modular/cgi/r4/v0.5.gemfile.example: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 gemfiles/modular/cgi/vHEAD.gemfile.example: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 gemfiles/modular/changelog.gemfile.example: 892598e0e7792eb205247ae28128cef6dfc647d2fb33968969152230d6f69288 gemfiles/modular/coverage.gemfile.example: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - gemfiles/modular/coverage_local.gemfile.example: 928d5f260d7b119c038baa56da9fb78dd524dee613aea33ab72894bbce5c506e + gemfiles/modular/coverage_local.gemfile.example: 92ea0d7a9d693553dc614afa2c43990f5c3778c2b00ef6c528e122c31bd506a1 gemfiles/modular/debug.gemfile.example: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 gemfiles/modular/documentation.gemfile.example: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c gemfiles/modular/documentation_local.gemfile.example: 84a20f5d4b0feb94c2cf2f7a8dce8f682f1483498e41484c2b447a5661fd1870 @@ -145,10 +146,10 @@ template_state: gemfiles/modular/stringio/r3/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/r4/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/vHEAD.gemfile.example: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - gemfiles/modular/style.gemfile.example: 3ad0585b4f2db8918580ca41ea8723f7a166d7a83cfd7f9613511094997106fd + gemfiles/modular/style.gemfile.example: 02fe3e8fd00e49b90c3ab30e19b51014ee50490f3eadcfd1d4a39f4c2c997dda gemfiles/modular/style_local.gemfile.example: c86beb711e766126a5be68be4be18255831625ac3650d5069383c4a83a9511f3 - gemfiles/modular/templating.gemfile.example: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - gemfiles/modular/templating_local.gemfile.example: 930057d3b909a72e39a39125c4e883a7ff71f5691e64426c0541f8c8fc75b83f + gemfiles/modular/templating.gemfile.example: 2b33c094677b53ad9dd2eafeb3a3be452f612380c61001a2e75b3c078b8ff72a + gemfiles/modular/templating_local.gemfile.example: ac7259516e69ffafb8b9342a897ddf6042adc46335743f474c342509cefd8f2e gemfiles/modular/webrick/r4/v1.9.gemfile.example: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea gemfiles/modular/webrick/vHEAD.gemfile.example: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b gemfiles/modular/x_std_libs.gemfile.example: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a @@ -175,7 +176,7 @@ template_state: shim/Gemfile.example: 0fb0d9d06fcfb1fd6ca6f0eeb5867253ca1ed221e03d28027719225f868b0637 shim/README.md.example: 3a2f7211b7f92a1dfae5e523b8e34b051a3d8af942144b05286eca0b3c8f6fbe shim/Rakefile.example: 572c94da7052083b39b62a6600785419e314a109efd7a3d8c3a96eb77ad34fd1 - shim/gem.gemspec.example: efae033238e4fd1355cfc134f5c9123f175d1ad1dc4a1a2e663899788c9e0870 + shim/gem.gemspec.example: 14a7015b3328005d1c3b5fda6886bd6da383707745f6eaaa781d6f9689600131 shim/lib/compat_require.rb.example: 94ee85e353a3ca08c8a35c9063d4ff789214ea594c7f803f6cf09d7142f48379 shim/lib/entrypoint.rb.example: dd57613520daca01d6f6bcaa9b83b00ff74505240dc04b84ceb686df3c0539d7 shim/lib/version.rb.example: 15e219ac3a928b5580035f891e415551213175020f1131f6e7ca0ccd55a1b2d6 @@ -189,370 +190,370 @@ files: recipe: template_source_application_simplecov action: write dest_sha256: e5a029c511ac411ffc1a2644c7c2eb7ba275d0c594fff48e18cf6cc5d81b70b8 - input_fingerprint: 9d29a176d4f36d4beda66ab53d42deafaec8587b82ebf7d706f715d9e0c61878 + input_fingerprint: 2a0bc17ae271a91c99b70d527cc145e64fcf7710959f82952ba7854fcc9c10d5 template_sources: - ".simplecov.example" AGPL-3.0-only.md: recipe: template_source_application_AGPL_3_0_only_md action: write dest_sha256: d8a6cc31abc16b6748c7a21f21611f5a1ec33f67d22ca23d7da1c19b95496bee - input_fingerprint: c922e00d2aabfe5504ae3494b4e5a15a0fa169d30cab58b8900305e935342c2a + input_fingerprint: dd898b99ab513ce357d62e04b30d9ce4a47a19ab57fd05127de94ff887b3e596 template_sources: - AGPL-3.0-only.md.example Gemfile: recipe: template_source_application_Gemfile action: write - dest_sha256: 9228d1e2a7f92510553b1a6b3d69d7f0af158e1b37184ec042711922cb245912 - input_fingerprint: dea34f26cb111cc24deea219c77d190d6d63dcd73d50811b4f70fb7c17ee7434 + dest_sha256: 4757e9ab13cbdd251e3652d6f34fa1bed9c7fb542b952b59a9847d1ffb4c0cee + input_fingerprint: e5d27d75322a86a0924adbd530097c7038ae67708d4cda835a1192cb39aabf1b template_sources: - Gemfile.example LICENSE.md: recipe: template_source_application_LICENSE_md action: write dest_sha256: f6188bfd474a636d2a526420ebb411250faa447d94c9b9ccee097128ce4101b5 - input_fingerprint: c2cc35a630a742af2f9dfdd061b1de178d1c42358e1650da907fe715b1553910 + input_fingerprint: 9de86eb2f27c8808496bacca31508550a50a6b3cd38a9f367e1a15c41fed3fee template_sources: - LICENSE.md.example PolyForm-Small-Business-1.0.0.md: recipe: template_source_application_PolyForm_Small_Business_1_0_0_md action: write dest_sha256: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 - input_fingerprint: 535cb6c83445b36967b4cd085c6e45afaed8a1654edd8d2ce767b9ece48e5123 + input_fingerprint: e24dfb65a3eb48c38df3fb57b91765f96817f225c6206762275aeb0ed1ea0007 template_sources: - PolyForm-Small-Business-1.0.0.md.example README.md: recipe: template_source_application_README_md action: write dest_sha256: 216b7ddb18793d4770420eb82c84ff7c38e8e0da92e2f265119b87b1e8a582cb - input_fingerprint: 0ddbc78539f25f2b059e34b57c78831cf2f137632a371e7cb1e1f14b4ef30c40 + input_fingerprint: 8ecd7f01ef2fde1d857b67e5ecfa13323e33b53261d944e5a27f8090166dd9c1 template_sources: - README.md.example Rakefile: recipe: template_source_application_Rakefile action: write - dest_sha256: 514779134fdc99f2f751bbf28c909c9e3cc86de2ae98cfcd6202aab9a4241ed6 - input_fingerprint: 4cbe9188d5c640928d67cc22cebf59dd7dc2549e1337a6e2a360ccd9f6530d44 + dest_sha256: a0f7283af3a7f6dcd9d4bf62a79639d5c56b27a7bf524f46057e26f821a41f6e + input_fingerprint: 890326daf6e29a67a7f2b8d315e71c80c270900c71e0bd065378cb5dfd165699 template_sources: - Rakefile.example certs/pboling.pem: recipe: template_source_application_certs_pboling_pem action: write dest_sha256: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - input_fingerprint: 7bc9521fc55744569f78025a5b619f6e44da43dd2b2c512038213c5e73a0b812 + input_fingerprint: 8bdd82c05dfcfd9d384795c5be884eeb746df33c742387d4ed4742ee0bf841cf template_sources: - certs/pboling.pem.example gemfiles/modular/benchmark/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_r4_v0_5_gemfile action: write dest_sha256: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 - input_fingerprint: abbb9164d03c8051b90a8a6e8291c8b872eb9f17850f756d2ec75913751eefa0 + input_fingerprint: ab90439ab4454bb2a1600b10caa1b77335977c776ee59879fe9efbee13c75755 template_sources: - gemfiles/modular/benchmark/r4/v0.5.gemfile.example gemfiles/modular/benchmark/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_vHEAD_gemfile action: write dest_sha256: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 - input_fingerprint: d02a4c9ab6216d4e4d70a2d0e4e3806bb222a2faea8fbef6fb4ecdada594fbf2 + input_fingerprint: 55b325d6521a1259cd256759e05d64a3a23d3a3ce04f99a392878a85c05053bb template_sources: - gemfiles/modular/benchmark/vHEAD.gemfile.example gemfiles/modular/cgi/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_cgi_r4_v0_5_gemfile action: write dest_sha256: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 - input_fingerprint: 40e308cfdd34b5118a678c800a57084e4760eb8435379acd2edb8f165c146921 + input_fingerprint: d48d91680146db5c49e70d8b61afe74ad945fad20e3590ad85c87d6f8b1d0878 template_sources: - gemfiles/modular/cgi/r4/v0.5.gemfile.example gemfiles/modular/cgi/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_cgi_vHEAD_gemfile action: write dest_sha256: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 - input_fingerprint: d075321e2309b6280deb3b4b0fe883328a0cfa894bc47aef3a908f49bb10db9b + input_fingerprint: fd80f9a343700f8dcc15f350a4a59f3f4706ac111f3054c2766b83a205dc5ac9 template_sources: - gemfiles/modular/cgi/vHEAD.gemfile.example gemfiles/modular/changelog.gemfile: recipe: template_source_application_gemfiles_modular_changelog_gemfile action: write dest_sha256: da669526144fbff33aef207db9541b6fd6c254437f94dec2fab70fc55a7757cd - input_fingerprint: d22857e898a7a4b7842185d8c84e90e7758bad0001557dc440870b0cb94d1c5a + input_fingerprint: f6c521971d3cdb36ff58d5a3777d92904029cacc914ca70178e0ad87c8d9d98c template_sources: - gemfiles/modular/changelog.gemfile.example gemfiles/modular/coverage.gemfile: recipe: template_source_application_gemfiles_modular_coverage_gemfile action: write dest_sha256: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - input_fingerprint: 7c266c046e5dd5f18847967443837c0e2c7bb8ca0568d6ad8e8743351f87afb4 + input_fingerprint: d36625b7dbaad04c1938ac8943a4cfa8542a3166529dc5435c3dc20f53bce864 template_sources: - gemfiles/modular/coverage.gemfile.example gemfiles/modular/coverage_local.gemfile: recipe: template_source_application_gemfiles_modular_coverage_local_gemfile action: write - dest_sha256: 2b493414df06261ba8acb6f0eb18bf3fdd701d7cb5f967a9d15a3f42a4741827 - input_fingerprint: 276ada6b0ef5577d1958f6d23d138f61e4befa56f33c92bb2892978e0c38c239 + dest_sha256: 92c9a599c8f6867ec532880f73568f2736ac05d8973ec524b42fd5dbe6aeda3e + input_fingerprint: e70f150df3918c46101b03c11a9858e4b524c6167aa4564e8a664885d525acc2 template_sources: - gemfiles/modular/coverage_local.gemfile.example gemfiles/modular/debug.gemfile: recipe: template_source_application_gemfiles_modular_debug_gemfile action: write dest_sha256: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 - input_fingerprint: aff9ab7066f144ace1bc2eaf1f94bb682e41042d8c0971c59f352f9a719e215f + input_fingerprint: 540e0669b028f4516e09f49479623add3fef9f4bd48c43674f4c09dd9d55a3c7 template_sources: - gemfiles/modular/debug.gemfile.example gemfiles/modular/documentation.gemfile: recipe: template_source_application_gemfiles_modular_documentation_gemfile action: write dest_sha256: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c - input_fingerprint: 6463d3225b3fe226c9ec7d0d11c49375d43451e16fc01b8124a86a337c91fe09 + input_fingerprint: 8232545bd51e364a4b2f02f934b1d68ec11dc9910368ea6439dc315fdf55b531 template_sources: - gemfiles/modular/documentation.gemfile.example gemfiles/modular/documentation_local.gemfile: recipe: template_source_application_gemfiles_modular_documentation_local_gemfile action: write dest_sha256: 2058173855b9a4acc6d5efa20520e49734243eef6cf0b5e9063e0e5866a08e9c - input_fingerprint: 1603930d48ae595af37121aa09f4bc1f4b4e4104cdfcdeede3e87b8d188fb20e + input_fingerprint: caf95caa5f6862af2b1caf507faefd596353a5c4ab152e1fcdf3271b142eeeb1 template_sources: - gemfiles/modular/documentation_local.gemfile.example gemfiles/modular/erb/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r2_v3_0_gemfile action: write dest_sha256: 3793e7dc9ef23a7ccd893d48cbba092fd27594c63e65cca011cc658218425670 - input_fingerprint: b3854473aec24c167a035429e2e3b6d4071add557d774b3c33ba70dae2967e70 + input_fingerprint: 0df543ed5cadf2b7956cb503defa0a006ceca3f31ba3ec80f5965d27ca5efcc5 template_sources: - gemfiles/modular/erb/r2/v3.0.gemfile.example gemfiles/modular/erb/r3/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r3_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 0d53e8dd7321002cb5f4e6953678738f9781a7a8bb40542f0f6ef65541b60b92 + input_fingerprint: bc5ca085a9992a428b3c87ce1738200368c7f90ba6fea90410e6ee3de980d5f3 template_sources: - gemfiles/modular/erb/r3/v5.0.gemfile.example gemfiles/modular/erb/r4/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r4_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 5a01c74e911431914b4831c31cdb66c103f5ecd78834fc3f9e656d3dcf276c9a + input_fingerprint: fc53710c04255831b472169f5e9bcbf58bcd4332a63fe57153c88309a1ecd99a template_sources: - gemfiles/modular/erb/r4/v5.0.gemfile.example gemfiles/modular/erb/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_erb_vHEAD_gemfile action: write dest_sha256: ad6f104a49e80e0cf625440e3dc816343fe7e2f037fc4971df75e7bb4305c683 - input_fingerprint: 487f672504c81ae3b0ec9843b915d4498a23a9de0584bf7832efbdf924a53e12 + input_fingerprint: bd16a3fc1ed764fab4f3af1ff97629e08250e586fc9a6519b172f58d6def5848 template_sources: - gemfiles/modular/erb/vHEAD.gemfile.example gemfiles/modular/json/truffleruby_22_3.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_22_3_gemfile action: write dest_sha256: 249c12eacbe90f9d0d2e81e7a62c4c7e9102e504ededcda4ecf660cb3bb68be4 - input_fingerprint: 021066b876fd4a05039396c881e3f34a8a3999c85ce0a978a4b9b459b355fa90 + input_fingerprint: 53f466e0c2ed0345eff88f9009dec465e6f21f3e4d32d0bde89ef3858574efdd template_sources: - gemfiles/modular/json/truffleruby_22_3.gemfile.example gemfiles/modular/json/truffleruby_23_0.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_0_gemfile action: write dest_sha256: 66aa010567f7afa1af8244a74c3c88ecaaf84dc87b6a25180691bb480d02ed28 - input_fingerprint: 5a8a65a740ada834266e3bae3ee12b8cab6d3d47a63df60114db7f544b23156c + input_fingerprint: 5e177e7976f36183611a74639be8cafbf04fc52a02650d1b615d93c72d127354 template_sources: - gemfiles/modular/json/truffleruby_23_0.gemfile.example gemfiles/modular/json/truffleruby_23_1.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_1_gemfile action: write dest_sha256: '080fcbdaf2bec73cad40832a3d51eebb380af789917b96f493d1460b0dd6361d' - input_fingerprint: 81be2d7363a28d235b1753d7b331c59e127af1cb1087482b2122cb3d0f45b5a4 + input_fingerprint: e0f0fc065e37018924ffa3da51032dcbb8dfebe1a6edd4c4634ea361c0d56c98 template_sources: - gemfiles/modular/json/truffleruby_23_1.gemfile.example gemfiles/modular/mutex_m/r2/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r2_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 7d40b6b07b0159a83789ef2d8cd499fb3bc953557098d0d2b5189d4591f4dcff + input_fingerprint: 8bae67db0b4e8193069137d41e1338147bde0984aaaca131a9101c3b46791c25 template_sources: - gemfiles/modular/mutex_m/r2/v0.3.gemfile.example gemfiles/modular/mutex_m/r3/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r3_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 04d60081d27af3da3170a14088a6ce9e95a05fdaf26bd0e6218923e51c0a5a18 + input_fingerprint: 0b65121f6b17af8a5ac947a6d2012b23da00db90f9603f3ac0213e7814324772 template_sources: - gemfiles/modular/mutex_m/r3/v0.3.gemfile.example gemfiles/modular/mutex_m/r4/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r4_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: c5ae88e2c427cdd6ccb5e9d913e6fd7198e2bd0436b6d7ed61229d171d36a769 + input_fingerprint: ef335201880d490c99ded7f35be851f3d86f69dba5505de591b407d875b36a0b template_sources: - gemfiles/modular/mutex_m/r4/v0.3.gemfile.example gemfiles/modular/mutex_m/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_vHEAD_gemfile action: write dest_sha256: '08018641c97f894788fa91b462da504ab2237213d18d95404136c393274ae3cb' - input_fingerprint: 7a0ebaf882600223ee5d838ea4a9f30caf553568afe2e08c78163980dc6e3e03 + input_fingerprint: 4a75e58c868be6df8dadc12fab585c9a21126063c87741ff324782fbf98cc4ff template_sources: - gemfiles/modular/mutex_m/vHEAD.gemfile.example gemfiles/modular/optional.gemfile: recipe: template_source_application_gemfiles_modular_optional_gemfile action: write dest_sha256: f770e6e9a9dd2bd0f1f132e882d88038b2e21127dce3afe270908c7338c28bfd - input_fingerprint: ef4eafd492979d838b46c9628b6691151af27dabce29fec9f853eb86f6d499cb + input_fingerprint: 870809d851785fab684a6c9d6ad1d1dfdb5c5d8d48d39afc0ed7f36f555c173c template_sources: - gemfiles/modular/optional.gemfile.example gemfiles/modular/rspec.gemfile: recipe: template_source_application_gemfiles_modular_rspec_gemfile action: write dest_sha256: d043f5c9344f6435edb4607c5adaf42c78e7fb6b8b6726007de2bbedefb376c3 - input_fingerprint: 63ab0acfea7ae26a3cb36f4e955b75bf8b6532aea55ed1c698cda1e8ec016d2e + input_fingerprint: baf45b5656f70ab1176687a0a18013721807704cbaabc06f1c915b657467762c template_sources: - gemfiles/modular/rspec.gemfile.example gemfiles/modular/runtime_heads.gemfile: recipe: template_source_application_gemfiles_modular_runtime_heads_gemfile action: write dest_sha256: 6ac7158c4a3088190f2a9082f01439eb27eca2172ab3464b15c9cb045aa885e1 - input_fingerprint: 57ac1ed962e15d7049e5badcdcb416f4eba3f08ba5a1d3cfa59bc0084a360ce6 + input_fingerprint: 9a38682bbf0630bca235e5e1aed75dc9258c4497ae444786d044f2f97bab10da template_sources: - gemfiles/modular/runtime_heads.gemfile.example gemfiles/modular/stringio/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r2_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 9b11e0791a1a47912dc6e718e4e05c5d8b0fbca0b0977755cb6c7cbf4b6158a9 + input_fingerprint: 59782b73ef373541ca386cdebd5b8973ffc013175df1b5bdcbae2584073ca17d template_sources: - gemfiles/modular/stringio/r2/v3.0.gemfile.example gemfiles/modular/stringio/r3/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r3_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 144dfe0ec60130f9206af2794b3ba96bac4855dce02c9351462cf90b2e2391d7 + input_fingerprint: 40e1c74898afee30b791d5520a09caaaddfb22ac9322c4a1e78954c3149c7510 template_sources: - gemfiles/modular/stringio/r3/v3.0.gemfile.example gemfiles/modular/stringio/r4/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r4_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: bbc08952f48730e4af808f63fcd5aeeeea06de774fed207cfa79a14e3b30a36d + input_fingerprint: 2073f2fc8e029e5de4e7467f8575d01d6a8c8f74b7525665a9b701f21b975f79 template_sources: - gemfiles/modular/stringio/r4/v3.0.gemfile.example gemfiles/modular/stringio/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_stringio_vHEAD_gemfile action: write dest_sha256: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - input_fingerprint: 70132f5196690829cf237ace57119078f1153273f2bb4f75673e2b8f01451bee + input_fingerprint: 604c5858bbd479d4a09682ca4550830d549bb782c05e80e428111d8df18441b6 template_sources: - gemfiles/modular/stringio/vHEAD.gemfile.example gemfiles/modular/style.gemfile: recipe: template_source_application_gemfiles_modular_style_gemfile action: write - dest_sha256: 2a3d46dcb8a9394f595f273f5eb0403d0a552837754ab109afc9ba79a7159083 - input_fingerprint: 3a3ebd3bd52154bc6fff848896b89c978fd1fefedf7f4a666ccd9b106c8bda6f + dest_sha256: 9a24acff0054573c30f5d84d0418cd465ba3794d075bb5a36801410ac40e0787 + input_fingerprint: 811d236a5f35737ef00dacb97bb73a9830fdf5763b12a5db66d212aad81d3e8a template_sources: - gemfiles/modular/style.gemfile.example gemfiles/modular/style_local.gemfile: recipe: template_source_application_gemfiles_modular_style_local_gemfile action: write dest_sha256: 55eb9c149cdb2f29c9f31abe2d55a4f334e00fb859681dd17c42149a3f28ca36 - input_fingerprint: a2edbf78ce67a50431561168be435d75dc1bdd053df0b7b8c111984133d2b872 + input_fingerprint: 17655df27989869c16e5694b0fb76964017d4d3e220d1ce4c1fb2038591b4881 template_sources: - gemfiles/modular/style_local.gemfile.example gemfiles/modular/templating.gemfile: recipe: template_source_application_gemfiles_modular_templating_gemfile action: write - dest_sha256: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - input_fingerprint: 8bb8e54df5321279cd2d21ea878313eefa347b2f6fcb5364a7012d0ef3469f23 + dest_sha256: 432ba59798d31b899268257c432443a017c5a9bd2c0c7f9f2216617e14150cd3 + input_fingerprint: 7789d36f985d76179c989770ab5b26b06118d5c4b0c46073316d140163c85623 template_sources: - gemfiles/modular/templating.gemfile.example gemfiles/modular/templating_local.gemfile: recipe: template_source_application_gemfiles_modular_templating_local_gemfile action: write - dest_sha256: 49c46a74b0781c124918f5c7526b9bb661be9bbc7ca82137e06a3104471d59af - input_fingerprint: 88a51f5ac7f978c76c5a3f926abc97b67bbe637ac2ec7bb650d958d60377c077 + dest_sha256: 7518b80ea76a3b605fcfe4dffd483fe194335afeb81cecc803980af1bfcbfadd + input_fingerprint: cf092bad43a55f76b1d714107ca92603a1dee734f27751ad9cd2c762703dea22 template_sources: - gemfiles/modular/templating_local.gemfile.example gemfiles/modular/webrick/r4/v1.9.gemfile: recipe: template_source_application_gemfiles_modular_webrick_r4_v1_9_gemfile action: write dest_sha256: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea - input_fingerprint: 922487416aa3b39abbc061b2483fa38963e21672f0b14f917f4c2d3bf3d83b90 + input_fingerprint: ebeb631936a95b72ebe450c036998210911fac0ebee09f2f6604fff13c0b8f16 template_sources: - gemfiles/modular/webrick/r4/v1.9.gemfile.example gemfiles/modular/webrick/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_webrick_vHEAD_gemfile action: write dest_sha256: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b - input_fingerprint: e4ef87426a9f99b443d164b0037d880432fa5656216a55a2821d8fb052a5f8e6 + input_fingerprint: 30a5846557bcc0d3acc4b32ed09e038672aaefe06dda8bff693c9bddc84fce02 template_sources: - gemfiles/modular/webrick/vHEAD.gemfile.example gemfiles/modular/x_std_libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_gemfile action: write dest_sha256: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a - input_fingerprint: c35aacec2ba48fe1e7c097babd7e3bfd778d6c676078f3cd473325022d8efec9 + input_fingerprint: 964620dd058480c40a695f1ffb9efa3bfcaf439ced59d209670fba6ea68444f6 template_sources: - gemfiles/modular/x_std_libs.gemfile.example gemfiles/modular/x_std_libs/r2/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r2_libs_gemfile action: write dest_sha256: e80ec8ad06cb1b31ac982bc25cf7696987fca131aa1001eaefd0bf5cd379c273 - input_fingerprint: acebdd200d256fa896aed7a6355ec11d1796b16732db4099fc7ff3e02db618a5 + input_fingerprint: d7ff39156e754ad731ff8f2cdd0c0c02366955324c2001ca5f8508b08792cf96 template_sources: - gemfiles/modular/x_std_libs/r2/libs.gemfile.example gemfiles/modular/x_std_libs/r3.1/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_1_libs_gemfile action: write dest_sha256: 9f8565c40b09bea1bc4c2e2ad87fe11400c3c51a2b235655bfcd8e491ed88ca8 - input_fingerprint: 58292b9d6e8cd42d1d98974dc3e466ac71a63400c9e2f1561261b4644db2fef5 + input_fingerprint: dba949d164ee92143d399f3510f7ecbc4a1bf7e29b9b7200c9caf0ca8869e9c0 template_sources: - gemfiles/modular/x_std_libs/r3.1/libs.gemfile.example gemfiles/modular/x_std_libs/r3/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_libs_gemfile action: write dest_sha256: 546f8849f4267bb19aa10ff0de40be30957197f229e6887847181ea9127b2650 - input_fingerprint: fa583c7fc1e4d4c2f0e4381afdca99e15889b9509ae5a0cf5d8058941ebb2f84 + input_fingerprint: d63656afc934f0a70735c80b14f38a4dc5b9bf574c23d695bbc92f6220cc3db8 template_sources: - gemfiles/modular/x_std_libs/r3/libs.gemfile.example gemfiles/modular/x_std_libs/r4/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r4_libs_gemfile action: write dest_sha256: 8c2582eaa218d216b98c86c933465295c8b4e43f3251ea388b9eaf6e471f8da6 - input_fingerprint: a5c995b7c11a6f8e35f6bbc49b1ff4ee3a462d728207bc3ab57d934ab781cf80 + input_fingerprint: a1d0f17dad7107f34b301bb1fce5aaa1f550eed4a7276fa21427f83531706991 template_sources: - gemfiles/modular/x_std_libs/r4/libs.gemfile.example gemfiles/modular/x_std_libs/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_vHEAD_gemfile action: write dest_sha256: d3133ec4c0638363a7fb025d19be7e95a615fd61c35ddb8d17f2280ee74a7486 - input_fingerprint: 6cf69efdb4124e2a117693317848c8f9cadcc50271d840ab2eb64686a9620f39 + input_fingerprint: 3776869dd14a5a164d69603bdecb50e104bec2aafdcc3dc57884fa3369e95e5a template_sources: - gemfiles/modular/x_std_libs/vHEAD.gemfile.example lib/plain/merge/version.rb: recipe: template_source_application_lib_plain_merge_version_rb action: write - dest_sha256: 4e0d26f65ab0cf00dc420fef060ab95e8ac113e8cf3d5d936d10cbb72c75f7cb - input_fingerprint: 2bdf503817ed182eb09f695e08d1f9c39fb71a76e36a78cfd03c97e48d16d10b + dest_sha256: bc6ed08fc5986764ea68be2f2bc2b4859f2b2ef1acfafc83d500ae5183ecf8a8 + input_fingerprint: 8b10b77849cb2f23f1810ae11737a31208353a2032fc4aa2013f5d7898987bb5 template_sources: - lib/gem/version.rb.example mise.toml: recipe: template_source_application_mise_toml action: write dest_sha256: 7d267154ca4f081b0ac7da804c0180c2b091aec5f1c877417c1c320f4f369c88 - input_fingerprint: 7700d6df93a75e28a37bdc7bd926a23ff81b3ac4ff9dd7bda6ca7505f0cea850 + input_fingerprint: a4d53f71a63e4a87f3fec98051f68c899a73ec8bb3a3cef4e3162bb511cdc97a template_sources: - mise.toml.no-osc.example plain-merge.gemspec: recipe: template_source_application_plain_merge_gemspec action: write - dest_sha256: bd2d5808e6f25a34ad37c1e3233adaff969b2f8b725d6eb02f5076eda0c73c44 - input_fingerprint: fd7cdbcd478663f3f52dc8cd55df3ff68e7816489640fd55678fc7b2202028e3 + dest_sha256: 93689ef50670ad396c38917f136217783dd3cb26b0b3070d0f3f9604ed2424d9 + input_fingerprint: 50297c97c51a1580f1cc26a1f373d886575d00f3699a3c01b3726329afacb93e template_sources: - gem.gemspec.example sig/plain/merge.rbs: recipe: template_source_application_sig_plain_merge_rbs action: write dest_sha256: f2ad1c197b704d04dc0d4e7a35250198fd8c7c09629341d72fa50ca4448aa4a1 - input_fingerprint: a09ea70acc2152728e8225cd27194998e5b6235437c40442d49f2f677c238d7f + input_fingerprint: af6583a906bd0738a462e11cb054b85ddf56b079d0efe3d5cb34d5bb603dd9b9 template_sources: - sig/gem.rbs.example spec/spec_helper.rb: recipe: template_source_application_spec_spec_helper_rb action: write dest_sha256: 391120e7591e00c11f1545ff513b91b5f60a9d115418e2a869ce67f54d826e33 - input_fingerprint: fce49d6c868e627e4881d6251308dfd5845ed64627a2bed258c4d12f1e5a5b74 + input_fingerprint: 9ca543e60b00df1c0375fd7674ef8afcea654fb0cd6c2fa2d4a02d8bfb5c4bd0 template_sources: - spec/spec_helper.rb.example diff --git a/gems/plain-merge/Gemfile b/gems/plain-merge/Gemfile index 1aca70d51..9a34db53c 100644 --- a/gems/plain-merge/Gemfile +++ b/gems/plain-merge/Gemfile @@ -19,7 +19,7 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } # Include dependencies from plain-merge.gemspec gemspec -gem 'kettle-family', '~> 1.2', '>= 1.2.97' +gem 'kettle-family', '~> 1.2', '>= 1.2.100' # Local workspace dependency wiring for *_local.gemfile overrides gem 'nomono', '~> 1.1', '>= 1.1.5', require: false # ruby >= 3.2.0 diff --git a/gems/plain-merge/Gemfile.lock b/gems/plain-merge/Gemfile.lock index 068212df2..a73b6cb19 100644 --- a/gems/plain-merge/Gemfile.lock +++ b/gems/plain-merge/Gemfile.lock @@ -10,131 +10,131 @@ GIT PATH remote: . specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + plain-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) + ast-crispr-markdown-markly (7.1.9) + ast-crispr (= 7.1.9) + markdown-merge (= 7.1.9) + markly-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism specs: - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) + ast-crispr-ruby-prism (7.1.9) + ast-crispr (= 7.1.9) + prism-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) + ast-crispr (7.1.9) + ast-merge (= 7.1.9) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ast-merge-git (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: - ast-merge (7.1.8) + ast-merge (7.1.9) benchmark token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) + ast-template (7.1.9) + ast-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + bash-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + binary-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) + citrus-toml-merge (7.1.9) + ast-merge (= 7.1.9) + toml-merge (= 7.1.9) toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge specs: - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) commonmarker (~> 2.2) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) + dotenv-merge (7.1.9) + ast-merge (= 7.1.9) + plain-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + go-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + html-merge (7.1.9) + ast-crispr (= 7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + json-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: - kettle-jem (7.1.25) + kettle-jem (7.1.26) addressable (>= 2.8, < 3) ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) @@ -168,114 +168,114 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge specs: - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown (~> 2.5) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + markdown-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) + markly-merge (7.1.9) + markdown-merge (= 7.1.9) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge specs: - parslet-toml-merge (7.1.8) + parslet-toml-merge (7.1.9) toml (~> 0.3) - toml-merge (= 7.1.8) + toml-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) + prism-merge (7.1.9) + ast-merge (= 7.1.9) prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + psych-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) + yaml-merge (= 7.1.9) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) + rbs-merge (7.1.9) + ast-merge (= 7.1.9) rbs (>= 3.10) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + rust-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) + smorg-rb (7.1.9) + ast-merge (= 7.1.9) + ast-merge-git (= 7.1.9) + bash-merge (= 7.1.9) diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) + dotenv-merge (= 7.1.9) + go-merge (= 7.1.9) + html-merge (= 7.1.9) + json-merge (= 7.1.9) kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) + markdown-merge (= 7.1.9) + plain-merge (= 7.1.9) + prism-merge (= 7.1.9) + psych-merge (= 7.1.9) + rbs-merge (= 7.1.9) + rust-merge (= 7.1.9) + toml-merge (= 7.1.9) + typescript-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + toml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: - tree_haver (7.1.8) + tree_haver (7.1.9) citrus (~> 3.0) parslet (~> 2.0) tree_sitter_language_pack (>= 1.16.2, < 2.0) @@ -284,25 +284,25 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + typescript-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + yaml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) + zip-merge (7.1.9) + binary-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) GEM @@ -336,6 +336,8 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) + commonmarker (2.10.0) + rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -465,11 +467,15 @@ GEM lint_roller (1.1.0) logger (1.7.0) markly (0.19.0) + mini_portile2 (2.8.9) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) reline (~> 0.6) mutex_m (0.3.0) + nokogiri (1.19.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-musl) @@ -503,6 +509,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) + rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -696,6 +705,9 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_sitter_language_pack (1.16.2) + rb_sys (>= 0.9.130, < 0.10) + sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -784,9 +796,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.31) + kettle-dev (~> 3.0, >= 3.0.34) kettle-drift (~> 1.0, >= 1.0.13) - kettle-family (~> 1.2, >= 1.2.97) + kettle-family (~> 1.2, >= 1.2.100) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) @@ -807,12 +819,12 @@ DEPENDENCIES reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) - rubocop-lts (~> 24.2, >= 24.2.1) - rubocop-lts-rspec (~> 1.0, >= 1.0.5) + rubocop-lts (~> 24.2, >= 24.2.3) + rubocop-lts-rspec (~> 1.0, >= 1.0.6) rubocop-minitest (~> 0.40, >= 0.40.0) rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! - rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) ruby-merge! ruby-progressbar (~> 1.13) rust-merge! @@ -843,33 +855,34 @@ CHECKSUMS appraisal2 (3.2.3) sha256=3a6cfaf8a444e02707b9a34154af1c4902fbe99d9d2168d7e81dd83ec77e6db7 appraisal2-rubocop (1.0.2) sha256=1dae97c1be087cf9c098a3a72fd41f873435e9b8b39687e633b36c9ccb22bff4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.8) - ast-crispr-markdown-markly (7.1.8) - ast-crispr-ruby-prism (7.1.8) - ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) + ast-crispr (7.1.9) + ast-crispr-markdown-markly (7.1.9) + ast-crispr-ruby-prism (7.1.9) + ast-merge (7.1.9) + ast-merge-git (7.1.9) + ast-template (7.1.9) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.8) + bash-merge (7.1.9) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) - bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae + binary-merge (7.1.9) + bundler (4.1.0.beta1) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.8) + citrus-toml-merge (7.1.9) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 + commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e commonmarker (2.10.0-x86_64-darwin) sha256=01e0830ed0319825ecdc16411c90acd3f661d1568dfc178731b3f64d0ce2363d commonmarker (2.10.0-x86_64-linux) sha256=945c510c0bfca9022245928e2248468fe3ddad58c939be0c37b20082cc392880 commonmarker (2.10.0-x86_64-linux-musl) sha256=288cd4fb9f17eed2ffa73551ef241dcf594e0f484b2aee2a0999540333c0618e - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) completely (0.8.0) sha256=e493cd5d84805f47917a41f277ecbfe5f35363bed670be5a957d3acaed8c6c5e concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 @@ -878,7 +891,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docopt_ng (0.7.1) sha256=a024148ee4fa3ab1a8a04411aa4370f39cf2b446e63562097d418b7974a15667 - dotenv-merge (7.1.8) + dotenv-merge (7.1.9) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -891,35 +904,37 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) + go-merge (7.1.9) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) + html-merge (7.1.9) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a - json-merge (7.1.8) - kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + json-merge (7.1.9) + kettle-changelog (1.0.7) + kettle-dev (3.0.34) + kettle-drift (1.0.13) kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 - kettle-jem (7.1.25) + kettle-jem (7.1.26) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 - kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd + kettle-soup-cover (3.0.10) kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 - markdown-merge (7.1.8) + markdown-merge (7.1.9) markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca - markly-merge (7.1.8) + markly-merge (7.1.9) + mini_portile2 (2.8.9) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 + nokogiri (1.19.4) nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af nokogiri (1.19.4-arm64-darwin) sha256=a46db9853286e6597b36ebc6953817d15acf3a299583eb3f89fdc6f91dd63527 @@ -933,20 +948,22 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) - plain-merge (7.1.8) + parslet-toml-merge (7.1.9) + plain-merge (7.1.9) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.8) + prism-merge (7.1.9) psych (5.5.0) sha256=4b245bbbd0f3238df8ccee766ebc1a6b062b10e4ee1d3284eb588739ba156a0a - psych-merge (7.1.8) + psych-merge (7.1.9) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 - rbs-merge (7.1.8) + rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -982,11 +999,11 @@ CHECKSUMS rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.8) + ruby-merge (7.1.9) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) + rust-merge (7.1.9) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +1011,7 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) + smorg-rb (7.1.9) sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,10 +1027,11 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.8) + toml (0.3.0) + toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb - tree_haver (7.1.8) + tree_haver (7.1.9) + tree_sitter_language_pack (1.16.2) tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 @@ -1023,12 +1041,12 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) + typescript-merge (7.1.9) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 yaml-converter (0.2.5) sha256=a5214fe1a6c2df88bd34a35bcded1b1dcd30135548130df2e03b54ca8c0f2423 - yaml-merge (7.1.8) + yaml-merge (7.1.9) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.8) sha256=73d935d43e3479d65ce8aff25c7d3100e8bb83528a2adaa0ed824e5046ac99e7 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -1037,8 +1055,8 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) + zip-merge (7.1.9) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH - 4.0.20 + 4.1.0.beta1 diff --git a/gems/plain-merge/Rakefile b/gems/plain-merge/Rakefile index 8d7f03370..60b0d84f0 100644 --- a/gems/plain-merge/Rakefile +++ b/gems/plain-merge/Rakefile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -# plain-merge Rakefile v7.1.18 - 2026-09-07 +# plain-merge Rakefile v7.1.26 - 2026-09-09 # Ruby 2.3 (Safe Navigation) or higher required # # See LICENSE.md for license information. diff --git a/gems/plain-merge/bin/rubocop-gradual b/gems/plain-merge/bin/rubocop-gradual new file mode 100755 index 000000000..7c7ff0635 --- /dev/null +++ b/gems/plain-merge/bin/rubocop-gradual @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'rubocop-gradual' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'rubygems' +require 'bundler/setup' + +load Gem.bin_path('rubocop-gradual', 'rubocop-gradual') diff --git a/gems/plain-merge/gemfiles/modular/coverage_local.gemfile b/gems/plain-merge/gemfiles/modular/coverage_local.gemfile index 37917caac..d6c890e46 100644 --- a/gems/plain-merge/gemfiles/modular/coverage_local.gemfile +++ b/gems/plain-merge/gemfiles/modular/coverage_local.gemfile @@ -29,11 +29,31 @@ Kernel.send(:gem, 'nomono', *nomono_activation_requirements) require 'nomono/bundler' local_gems = %w[kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -local_gems_to_eval = local_gems - %w[] - declared_gems # export KETTLE_DEV_DEV=/path/to/my platform :mri do + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + local_gems_to_eval = local_gems - %w[] - declared_gems + eval_nomono_gems( gems: local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/plain-merge/gemfiles/modular/style.gemfile b/gems/plain-merge/gemfiles/modular/style.gemfile index 59c5dc1a3..41ec99454 100644 --- a/gems/plain-merge/gemfiles/modular/style.gemfile +++ b/gems/plain-merge/gemfiles/modular/style.gemfile @@ -24,9 +24,9 @@ platform :mri do if ENV.fetch('RUBOCOP_LTS_DEV', 'false').casecmp('false').zero? declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) - gem 'rubocop-lts', '~> 24.2', '>= 24.2.1' unless declared_gems.include?('rubocop-lts') - gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.5' unless declared_gems.include?('rubocop-lts-rspec') - gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.6' unless declared_gems.include?('rubocop-ruby3_2') + gem 'rubocop-lts', '~> 24.2', '>= 24.2.3' unless declared_gems.include?('rubocop-lts') + gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.6' unless declared_gems.include?('rubocop-lts-rspec') + gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.8' unless declared_gems.include?('rubocop-ruby3_2') else eval_gemfile('style_local.gemfile') end diff --git a/gems/plain-merge/gemfiles/modular/templating.gemfile b/gems/plain-merge/gemfiles/modular/templating.gemfile index 6af159bd7..ce51a08ed 100644 --- a/gems/plain-merge/gemfiles/modular/templating.gemfile +++ b/gems/plain-merge/gemfiles/modular/templating.gemfile @@ -18,7 +18,7 @@ end if structuredmerge_remote # Merge recipes for released installs. - gem 'kettle-jem', '>= 7.0' + gem 'kettle-jem', '~> 7.1', '>= 7.1.26' end if kettle_remote diff --git a/gems/plain-merge/gemfiles/modular/templating_local.gemfile b/gems/plain-merge/gemfiles/modular/templating_local.gemfile index 32ac1a7a4..c723e1244 100644 --- a/gems/plain-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/plain-merge/gemfiles/modular/templating_local.gemfile @@ -65,9 +65,7 @@ structuredmerge_local_gems = %w[ kettle_dev_local_gems = %w[ kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift ] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[] -kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - (declared_gems - %w[kettle-dev]) if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( @@ -81,6 +79,28 @@ if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 end if ENV.fetch('KETTLE_DEV_DEV', 'false').casecmp('false') != 0 + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - declared_gems + eval_nomono_gems( gems: kettle_dev_local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/plain-merge/plain-merge.gemspec b/gems/plain-merge/plain-merge.gemspec index 44a106577..c5c28a581 100644 --- a/gems/plain-merge/plain-merge.gemspec +++ b/gems/plain-merge/plain-merge.gemspec @@ -120,7 +120,7 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.31') # ruby >= 4.0.0 + spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.34') # ruby >= 4.0.0 # Security spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 From 05832ac8229deb2dbd3004045f7f3a58abfee0a7 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 23:50:45 -0400 Subject: [PATCH 082/137] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bash-merge=20?= =?UTF-8?q?by=20kettle-family?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/bash-merge/.kettle-drift.lock | 76 ++++- gems/bash-merge/.rubocop_gradual.lock | 7 +- .../.structuredmerge/kettle-jem.lock | 145 ++++----- gems/bash-merge/Gemfile | 2 +- gems/bash-merge/Gemfile.lock | 304 ++++++++++-------- gems/bash-merge/Rakefile | 2 +- gems/bash-merge/bash-merge.gemspec | 2 +- gems/bash-merge/bin/rubocop-gradual | 16 + .../gemfiles/modular/coverage_local.gemfile | 24 +- .../bash-merge/gemfiles/modular/style.gemfile | 6 +- .../gemfiles/modular/templating.gemfile | 2 +- .../gemfiles/modular/templating_local.gemfile | 24 +- 12 files changed, 380 insertions(+), 230 deletions(-) create mode 100755 gems/bash-merge/bin/rubocop-gradual diff --git a/gems/bash-merge/.kettle-drift.lock b/gems/bash-merge/.kettle-drift.lock index 98b009e1e..1b23f4793 100644 --- a/gems/bash-merge/.kettle-drift.lock +++ b/gems/bash-merge/.kettle-drift.lock @@ -1,10 +1,82 @@ { + "debug_env: 'KETTLE_DEV_DEBUG',\nroot: %w[src my kettle-dev]": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 46, + 63 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 93, + 110 + ] + } + ], + "path_env: 'KETTLE_DEV_DEV',\nvendored_gems_env: 'VENDORED_GEMS',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 43, + 60 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 90, + 107 + ] + } + ], + "prefix: 'KETTLE_DEV',\npath_env: 'KETTLE_DEV_DEV',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 42, + 59 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 89, + 106 + ] + } + ], + "vendor_gem_dir_env: 'VENDOR_GEM_DIR',\ndebug_env: 'KETTLE_DEV_DEBUG',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 45, + 62 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 92, + 109 + ] + } + ], "vendored_gems_env: 'VENDORED_GEMS',\nvendor_gem_dir_env: 'VENDOR_GEM_DIR',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 44, + 61 + ] + }, { "file": "gemfiles/modular/templating_local.gemfile", "lines": [ - 77, - 88 + 75, + 91, + 108 ] } ] diff --git a/gems/bash-merge/.rubocop_gradual.lock b/gems/bash-merge/.rubocop_gradual.lock index 93a9cbf5a..46407b1e2 100644 --- a/gems/bash-merge/.rubocop_gradual.lock +++ b/gems/bash-merge/.rubocop_gradual.lock @@ -2,13 +2,13 @@ ".simplecov:3811430533": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] ], - "Rakefile:3018019741": [ + "Rakefile:3736672062": [ [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], [81, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], [165, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], [168, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] ], - "bash-merge.gemspec:4013438215": [ + "bash-merge.gemspec:1387980994": [ [130, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4147388508], [141, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], [142, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] @@ -27,6 +27,9 @@ [1, 1, 0, "Naming/FileName: The name of this source file (`vHEAD.gemfile`) should use snake_case.", 5381], [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], + "gemfiles/modular/coverage_local.gemfile:2813372128": [ + [34, 1, 1586, "Metrics/BlockLength: Block has too many lines. [37/25]", 820328175] + ], "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], diff --git a/gems/bash-merge/.structuredmerge/kettle-jem.lock b/gems/bash-merge/.structuredmerge/kettle-jem.lock index 8872f116b..8e41d13a8 100644 --- a/gems/bash-merge/.structuredmerge/kettle-jem.lock +++ b/gems/bash-merge/.structuredmerge/kettle-jem.lock @@ -1,11 +1,12 @@ --- version: 1 template_state: - version: 7.1.18 - applied_at: '2026-09-07' + version: 7.1.26 + applied_at: '2026-09-10' changelog_replay: last_entry_key: kettle-jem-template-20260802-001 last_entry_date: '2026-08-02' + maintenance_changelog: {} checksums: ".aiignore.example": 48a5dfdd93afd1a15fdce39cc28ca9920263f00018b0968ab031fa744521e5ce ".config/mise/env.sh": aeea5a2ab489ba6e5467ae8de6e386ec8c8fe4ff31a044e69d0cd6a092dd6654 @@ -75,7 +76,7 @@ template_state: ".rubocop_rspec.yml.example": 288ad75e7eb14d87d80fafe6f7272217be5c57547536ee56c780a7d10ac7ec74 ".simplecov.example": 222f2e6ce8cf089c70a21f0f5e5423d4bd59a96fdb2ce7754b0fb3d6f430c229 ".structuredmerge/git-drivers.toml.example": 9d241a44c9edffcdbd3da018fa188a238089c3d1635040924df594a6929a4f97 - ".structuredmerge/kettle-jem.yml.example": 26949dc4ee0722415e72452cbc186bee6ef7b154eae33166d36f3fdb1ca6e46d + ".structuredmerge/kettle-jem.yml.example": ff65a738da1af7d60714026a81d3323a46c864e96ae3570b806afdf6e7149ff9 ".yard-lint.yml.example": 90def46867c9436b4e177c47d91fc8165f4602e335715aecc39f5587ae20b55b ".yardignore.example": 821f453c609df7d46145d675424b39dfbe6dfdca8edac5f367b85fff48502455 ".yardopts.example": 6fd6f2701713096a8a9ea095c213bbc68eeef37797c4754d97837e3229a3a5f6 @@ -88,7 +89,7 @@ template_state: CHANGELOG.transfer.md: 21331d8a9e58b4ff6e088b88eb408bcccb0f2f64e78f8f4d42ac3f11a24baad8 CITATION.cff.example: e404ea0a7919d78a83d53d80e211d17b9663576aa606583b709795dc023fd75c CODE_OF_CONDUCT.md.example: f1ad532f1860f73ef774c6b27a26d41f4bc1cb8813034f5957487766ebb0986b - CONTRIBUTING.md.example: 22570cfb3dde72be79b4b522b6d5ab13f95d778e40444483a096871fe0891b19 + CONTRIBUTING.md.example: 8d23cce2d061e0c20d619c3f66591df5f32821cd84c32d171df0b8ebe1217a55 FUNDING.md.example: 392d047904b1557b29f4b43d37ec403b7480edd5b6ab51180be979b57a91e6ba FUNDING.md.no-osc.example: 3ef0258dd3e3b7f7e17e8bc2d20dcbcb3e74aa5a5a6f51297075696645e34c77 Gemfile.example: 99500023987e81775a9b5ef14e92cb3992f2ac408e5f42454f2728eee9b49fb2 @@ -99,19 +100,19 @@ template_state: PolyForm-Small-Business-1.0.0.md.example: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 README.md.example: 21f491e3d73bfc1b74056a6dcba61f72c93dee3cfe5272ac164a20978454de21 REEK: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - RUBOCOP.md.example: c09e5533ccc59b70a2efa05c99f66e521137c1053d3c12eb43509cebd5b68b0e + RUBOCOP.md.example: d99871a0e4c1d323c92e7febf328f062bb4722069b2abfd0a83bf7daa8dcbf8c Rakefile.example: 569803e726b07ea26267fec6891367a3096a0dff3c266269a7081d36afe496af SECURITY.md.example: ee9411aa85f36d88363fdaea7a1baea4362b6ec112cf2688e711b05de1d3144c bin/setup.example: 0ac35089c95a91d8973fe7a318bf9fd98b9f8e00db92c5d9ca6cd858abb8d41b certs/pboling.pem.example: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - gem.gemspec.example: 83e834e8958a88e4817a57199f48f5ebb245548ce251c5c47372208693f03b17 + gem.gemspec.example: 12dcadc0b297ccd4e18b9d1e538b98ac8330ef9fb2a059ed6754ad59272b77fa gemfiles/modular/benchmark/r4/v0.5.gemfile.example: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 gemfiles/modular/benchmark/vHEAD.gemfile.example: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 gemfiles/modular/cgi/r4/v0.5.gemfile.example: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 gemfiles/modular/cgi/vHEAD.gemfile.example: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 gemfiles/modular/changelog.gemfile.example: 892598e0e7792eb205247ae28128cef6dfc647d2fb33968969152230d6f69288 gemfiles/modular/coverage.gemfile.example: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - gemfiles/modular/coverage_local.gemfile.example: 928d5f260d7b119c038baa56da9fb78dd524dee613aea33ab72894bbce5c506e + gemfiles/modular/coverage_local.gemfile.example: 92ea0d7a9d693553dc614afa2c43990f5c3778c2b00ef6c528e122c31bd506a1 gemfiles/modular/debug.gemfile.example: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 gemfiles/modular/documentation.gemfile.example: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c gemfiles/modular/documentation_local.gemfile.example: 84a20f5d4b0feb94c2cf2f7a8dce8f682f1483498e41484c2b447a5661fd1870 @@ -145,10 +146,10 @@ template_state: gemfiles/modular/stringio/r3/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/r4/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/vHEAD.gemfile.example: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - gemfiles/modular/style.gemfile.example: 3ad0585b4f2db8918580ca41ea8723f7a166d7a83cfd7f9613511094997106fd + gemfiles/modular/style.gemfile.example: 02fe3e8fd00e49b90c3ab30e19b51014ee50490f3eadcfd1d4a39f4c2c997dda gemfiles/modular/style_local.gemfile.example: c86beb711e766126a5be68be4be18255831625ac3650d5069383c4a83a9511f3 - gemfiles/modular/templating.gemfile.example: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - gemfiles/modular/templating_local.gemfile.example: 930057d3b909a72e39a39125c4e883a7ff71f5691e64426c0541f8c8fc75b83f + gemfiles/modular/templating.gemfile.example: 2b33c094677b53ad9dd2eafeb3a3be452f612380c61001a2e75b3c078b8ff72a + gemfiles/modular/templating_local.gemfile.example: ac7259516e69ffafb8b9342a897ddf6042adc46335743f474c342509cefd8f2e gemfiles/modular/webrick/r4/v1.9.gemfile.example: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea gemfiles/modular/webrick/vHEAD.gemfile.example: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b gemfiles/modular/x_std_libs.gemfile.example: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a @@ -175,7 +176,7 @@ template_state: shim/Gemfile.example: 0fb0d9d06fcfb1fd6ca6f0eeb5867253ca1ed221e03d28027719225f868b0637 shim/README.md.example: 3a2f7211b7f92a1dfae5e523b8e34b051a3d8af942144b05286eca0b3c8f6fbe shim/Rakefile.example: 572c94da7052083b39b62a6600785419e314a109efd7a3d8c3a96eb77ad34fd1 - shim/gem.gemspec.example: efae033238e4fd1355cfc134f5c9123f175d1ad1dc4a1a2e663899788c9e0870 + shim/gem.gemspec.example: 14a7015b3328005d1c3b5fda6886bd6da383707745f6eaaa781d6f9689600131 shim/lib/compat_require.rb.example: 94ee85e353a3ca08c8a35c9063d4ff789214ea594c7f803f6cf09d7142f48379 shim/lib/entrypoint.rb.example: dd57613520daca01d6f6bcaa9b83b00ff74505240dc04b84ceb686df3c0539d7 shim/lib/version.rb.example: 15e219ac3a928b5580035f891e415551213175020f1131f6e7ca0ccd55a1b2d6 @@ -189,370 +190,370 @@ files: recipe: template_source_application_simplecov action: write dest_sha256: dad49e6b87745bb0086489b692d76323838718231846f4bee376e821347d4e15 - input_fingerprint: 280eeedbdca1c4d8c075bffdeead3ca00b6d34c9e0eeecbebcf9f38cda014519 + input_fingerprint: 7d805b93bf599290773feb16f986cc13d1a9638b583c9742404f367f4569c61f template_sources: - ".simplecov.example" AGPL-3.0-only.md: recipe: template_source_application_AGPL_3_0_only_md action: write dest_sha256: d8a6cc31abc16b6748c7a21f21611f5a1ec33f67d22ca23d7da1c19b95496bee - input_fingerprint: 58bcbdb3d5d3f80791e48db61127604b2fc34d6c7f70fa9ec92e13c91b23d8da + input_fingerprint: 2eaf580a6ca0b9a560cc0b2b132f8ec2ec9684ad16ce6811cc998fa2b0588086 template_sources: - AGPL-3.0-only.md.example Gemfile: recipe: template_source_application_Gemfile action: write - dest_sha256: 67ecd4377d91ed685aea3dd5492356515f4a92400bc6016f9aa392e674ce96ec - input_fingerprint: d8dbdbe69c78c13e2a47866a26864f51bfb54c64b7784d0b7047423db2df7c54 + dest_sha256: e87f892b360e43610c3a6a92fe52d8fb83ccbef3dd324394677b0c443c555e67 + input_fingerprint: 59db1b0ea81e658fb10ed4927ed1a3b6a98efecbb1fc5d3472f0e1d4ff9079a9 template_sources: - Gemfile.example LICENSE.md: recipe: template_source_application_LICENSE_md action: write dest_sha256: f6188bfd474a636d2a526420ebb411250faa447d94c9b9ccee097128ce4101b5 - input_fingerprint: f2ef4d6c6cf6bbe2317b2ed11dc4cb76c01c5a6984a4f172d6930b8c027a2230 + input_fingerprint: 1f560b8d4e733b461124108747799c7e531048817311db1ed1a1938c7839f788 template_sources: - LICENSE.md.example PolyForm-Small-Business-1.0.0.md: recipe: template_source_application_PolyForm_Small_Business_1_0_0_md action: write dest_sha256: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 - input_fingerprint: 267fec3827c248593ebec32f1763d78a445cd2929ece7e578837ea9c43bd0896 + input_fingerprint: b525a168239c669ade83f84915962751c5629af4817805e6c64c4be59231d8dc template_sources: - PolyForm-Small-Business-1.0.0.md.example README.md: recipe: template_source_application_README_md action: write dest_sha256: 9a7930305b7318b977f2f03d5a0f9c9729be3c7b74d9c81d4d4273a895d46c76 - input_fingerprint: 188d232942d23a207ebccab874d95236d4e5f59a3c622fa8e8d27fb2e9c61ce8 + input_fingerprint: 65784cdb3f7c2b48750428d31e6622f84932a82433e21429ef3d91ec5453f197 template_sources: - README.md.example Rakefile: recipe: template_source_application_Rakefile action: write - dest_sha256: 8f297961d6549c17eecf22a7aac0dd4bd65de9078b541231e13d8f531d155d98 - input_fingerprint: 2896047b90dd4611a6b9d541c4755d9261a66b82b8d4c1c8a727a69c3287a496 + dest_sha256: ce960c5d8eb66dd8cdf1d798ffdeae0d97387bd1e8d4ae8b161db3bd44cbccb8 + input_fingerprint: d26f0dff7f07a2f58cbff461aac40eaa143ef196aac90a20113557720820d396 template_sources: - Rakefile.example bash-merge.gemspec: recipe: template_source_application_bash_merge_gemspec action: write - dest_sha256: 19cc1cd368f71ccfb807544043abec568afeeee5bfc27d95b3a4f2f3bbab274d - input_fingerprint: 1fd8cf61a9e62b2d4ff456856eb0c99e90189a3a08dfa3062b5269f79cd49cbe + dest_sha256: 07f717ba4103aa0cead0ac22e2057aa19bde6046e9077a1d3ed83521fa8cbccf + input_fingerprint: 070fc009aa0a572c1b5fc7d88fa4eeb096586e76392693901774247499860f94 template_sources: - gem.gemspec.example certs/pboling.pem: recipe: template_source_application_certs_pboling_pem action: write dest_sha256: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - input_fingerprint: bfc8fa09b536e925c42ecb53dcdcf36f8f2106a387dc4a57d225f895ab7bcde6 + input_fingerprint: 26335eed703b774bb6b2ccf4bd4449d255602f7ed277dd50fb507c0c64fd3315 template_sources: - certs/pboling.pem.example gemfiles/modular/benchmark/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_r4_v0_5_gemfile action: write dest_sha256: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 - input_fingerprint: d0437244b6c117147eed2465c536fa8f1af594b786ff60fa3931d6b93ec2a1d4 + input_fingerprint: 55c769f713d8b7e4b11fecb483786082c2eb3135a781e0384e0499cb23d6195a template_sources: - gemfiles/modular/benchmark/r4/v0.5.gemfile.example gemfiles/modular/benchmark/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_vHEAD_gemfile action: write dest_sha256: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 - input_fingerprint: da3440f3022ef6fd586856ee04a2908e25516aab01aa4a958ba7dc96189483b5 + input_fingerprint: 58a78a9887a684395f316e486551ae934cb5412d3ea9a24bd7378da652228d6b template_sources: - gemfiles/modular/benchmark/vHEAD.gemfile.example gemfiles/modular/cgi/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_cgi_r4_v0_5_gemfile action: write dest_sha256: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 - input_fingerprint: c9bb20b3b7185c8f28b246d8c794a3e21b42732478beb24adaddc5f99d17de49 + input_fingerprint: f049755269aff355d367f9147dacae3127e4867588b0af4b31d8e7cd66ca4089 template_sources: - gemfiles/modular/cgi/r4/v0.5.gemfile.example gemfiles/modular/cgi/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_cgi_vHEAD_gemfile action: write dest_sha256: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 - input_fingerprint: 6e8834e2be863775d8f051e2053360e12500c78606010112e1ce73f11e813a68 + input_fingerprint: df1336ef2c9240e8c7e424435f668b491bebb81c77352b262336a4b3cf193592 template_sources: - gemfiles/modular/cgi/vHEAD.gemfile.example gemfiles/modular/changelog.gemfile: recipe: template_source_application_gemfiles_modular_changelog_gemfile action: write dest_sha256: da669526144fbff33aef207db9541b6fd6c254437f94dec2fab70fc55a7757cd - input_fingerprint: af5b98a2110aab452c8006f505b03952c4b434ee5a7c429bbb16c3f43f52e563 + input_fingerprint: 2fae61a58a2b443d0fddbe7ce8d5494ba22df5cccecfa1ed640267ef79c2c764 template_sources: - gemfiles/modular/changelog.gemfile.example gemfiles/modular/coverage.gemfile: recipe: template_source_application_gemfiles_modular_coverage_gemfile action: write dest_sha256: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - input_fingerprint: 93513d473644624fc65a282fcef9b5d3a5fc341f3fcecd8e67af4be250f6f8d6 + input_fingerprint: b3cc3ee3c220739d40e4756c31d050b553cd7f2c3a20a7eadc7f8dc6323a6c0d template_sources: - gemfiles/modular/coverage.gemfile.example gemfiles/modular/coverage_local.gemfile: recipe: template_source_application_gemfiles_modular_coverage_local_gemfile action: write - dest_sha256: 2b493414df06261ba8acb6f0eb18bf3fdd701d7cb5f967a9d15a3f42a4741827 - input_fingerprint: 98d347f09ff28fbf5528828b5866b87720d8e47570baadc9a25e440961aae475 + dest_sha256: 92c9a599c8f6867ec532880f73568f2736ac05d8973ec524b42fd5dbe6aeda3e + input_fingerprint: d5534ff2b78a117d04027a2cd43d239655b7902097bddedf0af6a07291895d39 template_sources: - gemfiles/modular/coverage_local.gemfile.example gemfiles/modular/debug.gemfile: recipe: template_source_application_gemfiles_modular_debug_gemfile action: write dest_sha256: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 - input_fingerprint: '074499ec56664963c33ecc5fed7646c5ff8eacf1e617803227ae9bfbb562be06' + input_fingerprint: c8cc093d0bb0af584fb23bd499a0d6023792318b16b3ecb0193452c023adf842 template_sources: - gemfiles/modular/debug.gemfile.example gemfiles/modular/documentation.gemfile: recipe: template_source_application_gemfiles_modular_documentation_gemfile action: write dest_sha256: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c - input_fingerprint: fc7fadcf08bbae0b1192c6f2ca11344ea214cf731db035fb8b5b199efd032e32 + input_fingerprint: f02fca617a452fa9d1b2c2f827c8ad7471c5e380460af8cf20421c41996933d2 template_sources: - gemfiles/modular/documentation.gemfile.example gemfiles/modular/documentation_local.gemfile: recipe: template_source_application_gemfiles_modular_documentation_local_gemfile action: write dest_sha256: 2058173855b9a4acc6d5efa20520e49734243eef6cf0b5e9063e0e5866a08e9c - input_fingerprint: c5fa2d4608ef46fce6fb4aca7cc08896316ddfa5ea3cffcb9900e02b1f467071 + input_fingerprint: d0a870a23c583ce606230624e619fb2597dc31e5bbd91835c0e989faf280d146 template_sources: - gemfiles/modular/documentation_local.gemfile.example gemfiles/modular/erb/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r2_v3_0_gemfile action: write dest_sha256: 3793e7dc9ef23a7ccd893d48cbba092fd27594c63e65cca011cc658218425670 - input_fingerprint: bd2a6848d2ecdf19f5203fe687484858e4e46e0ec42fe19e47589d2413a6e97e + input_fingerprint: 0e639e305ef44fd595ad898e12a0151871907291b7efcf0a2f76a48b2fe406e4 template_sources: - gemfiles/modular/erb/r2/v3.0.gemfile.example gemfiles/modular/erb/r3/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r3_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: fda1814795486200f9fd6d1f7abaa888e776388b1c51106dae691abc3f700e4d + input_fingerprint: 219601aed783044f22726564091badced134e6688740bb2c9df84450c2683945 template_sources: - gemfiles/modular/erb/r3/v5.0.gemfile.example gemfiles/modular/erb/r4/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r4_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: d085b0b16a53cd09de6cdeda157e852eb9eda51e342ec7069a25faddc57c72ad + input_fingerprint: 681a9f04357f8d85b53a9a62ca46b4a375804392583a7b9ce2daab5487049233 template_sources: - gemfiles/modular/erb/r4/v5.0.gemfile.example gemfiles/modular/erb/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_erb_vHEAD_gemfile action: write dest_sha256: ad6f104a49e80e0cf625440e3dc816343fe7e2f037fc4971df75e7bb4305c683 - input_fingerprint: e33783e96771f37cfd4769e2b943ad2b3c5fd3adb1834dc2319c6b6718906a1c + input_fingerprint: 2632b77d7a4619fcb0c7850de546cbdb0fa23ac74fb3d217d15be90158d3ccbf template_sources: - gemfiles/modular/erb/vHEAD.gemfile.example gemfiles/modular/json/truffleruby_22_3.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_22_3_gemfile action: write dest_sha256: 249c12eacbe90f9d0d2e81e7a62c4c7e9102e504ededcda4ecf660cb3bb68be4 - input_fingerprint: db30756a5b62df5d588eeb685a1a06f16a2ecd08aed08ef871638a16274517bc + input_fingerprint: 0dd9ad56b823e2f8fb2dc9d27fed5c0af235284abcaae76aba766fe94639f031 template_sources: - gemfiles/modular/json/truffleruby_22_3.gemfile.example gemfiles/modular/json/truffleruby_23_0.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_0_gemfile action: write dest_sha256: 66aa010567f7afa1af8244a74c3c88ecaaf84dc87b6a25180691bb480d02ed28 - input_fingerprint: 8d0711a0ddaed03b178da857976b7195079029c1201eada641348973bb4809fd + input_fingerprint: fc79e394d6e494b7d622ea6a80535a55fbd6f367a30619234123234db9b9ff4b template_sources: - gemfiles/modular/json/truffleruby_23_0.gemfile.example gemfiles/modular/json/truffleruby_23_1.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_1_gemfile action: write dest_sha256: '080fcbdaf2bec73cad40832a3d51eebb380af789917b96f493d1460b0dd6361d' - input_fingerprint: 8ac75d3dec37c4c41e2190c3605fe35c2e5c0ad97a0dad433b067ea33f4f31ce + input_fingerprint: 7c865044eb40ee678faaa55b3323307ad65ba08440b3e5c5305f5182fbe5a45d template_sources: - gemfiles/modular/json/truffleruby_23_1.gemfile.example gemfiles/modular/mutex_m/r2/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r2_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: d39e6ec47990d2ec291ed6d988667963ddcef4732fb784e2f4dd994dd39aa377 + input_fingerprint: bcbf7bb1ed4e298ce1872cddef7533fbad1a66d9c3a74495cbd4856424226349 template_sources: - gemfiles/modular/mutex_m/r2/v0.3.gemfile.example gemfiles/modular/mutex_m/r3/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r3_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 9f4991f93429929d847d07b1cb657b156006f6f59301fb5301704b7de23437f4 + input_fingerprint: 803b9e01b2fa2a3a1899908383e700ea75390975ee2e7dc1eefd7201c6a54a4a template_sources: - gemfiles/modular/mutex_m/r3/v0.3.gemfile.example gemfiles/modular/mutex_m/r4/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r4_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: edad9eff4135d4546c2a38922036f9f763dda36c36d4b759d5501f68d2e75ae5 + input_fingerprint: 8844a8d206bf015e8e20c0b5d297e25ccb03f385b4cd52a1b69188d4660c933c template_sources: - gemfiles/modular/mutex_m/r4/v0.3.gemfile.example gemfiles/modular/mutex_m/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_vHEAD_gemfile action: write dest_sha256: '08018641c97f894788fa91b462da504ab2237213d18d95404136c393274ae3cb' - input_fingerprint: fea93b180fe6fa26364d4bfe6d55257556ff8a10932d014bfdf8078157d434a7 + input_fingerprint: 532f53f9365c5ccc00e4d3031006d87eb69092cf14bc4feaf4cf1116f71bce40 template_sources: - gemfiles/modular/mutex_m/vHEAD.gemfile.example gemfiles/modular/optional.gemfile: recipe: template_source_application_gemfiles_modular_optional_gemfile action: write dest_sha256: f770e6e9a9dd2bd0f1f132e882d88038b2e21127dce3afe270908c7338c28bfd - input_fingerprint: 1cb8970c39d7d7d07ff04c502617cb3ed8a16f0bef8e13823db72d56eb950ec5 + input_fingerprint: a03300983e43d62f226dd9dd22d9adb15d7328e35da132a5189c4cd3514bdcce template_sources: - gemfiles/modular/optional.gemfile.example gemfiles/modular/rspec.gemfile: recipe: template_source_application_gemfiles_modular_rspec_gemfile action: write dest_sha256: d043f5c9344f6435edb4607c5adaf42c78e7fb6b8b6726007de2bbedefb376c3 - input_fingerprint: 99f4ef3bea2b8071cd1c7219899dee4e2c7cdd16aefa1665b40b85559ea1456e + input_fingerprint: 24b8325fe884acadf9d742425e3262976ace85db9cf81522963d2f1a7ca5fea1 template_sources: - gemfiles/modular/rspec.gemfile.example gemfiles/modular/runtime_heads.gemfile: recipe: template_source_application_gemfiles_modular_runtime_heads_gemfile action: write dest_sha256: 6ac7158c4a3088190f2a9082f01439eb27eca2172ab3464b15c9cb045aa885e1 - input_fingerprint: dd63ee8b963ae8a25bee95b07a4a51ee4831a66f5f644cf518892b25302b51c9 + input_fingerprint: 9cb0fd0e569be042896f4f85b4810d6ec626ac415846d73d81d1c4f584263239 template_sources: - gemfiles/modular/runtime_heads.gemfile.example gemfiles/modular/stringio/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r2_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 180f01446c1d429e1d60d7f938e638addedff955a224b292e0d4e542a0c0fb30 + input_fingerprint: 0257e7f9205e84b15781d370d60a61a676d58b8e1bba037844120a55521920d0 template_sources: - gemfiles/modular/stringio/r2/v3.0.gemfile.example gemfiles/modular/stringio/r3/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r3_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 8af4cb085d2337e0af4d214aec6071013b275f5831a316a664f153d658202f9f + input_fingerprint: a559441485149d66bf985c8a13a6083559bc2920133ef1527c9ddc177f4325e8 template_sources: - gemfiles/modular/stringio/r3/v3.0.gemfile.example gemfiles/modular/stringio/r4/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r4_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 59e4c8316d00f548928cb4b9a512601e439c84cf74059d0c8b45efa64e21141a + input_fingerprint: b580e5fb184c2218e148b2a3bd2c0d711786816be75439dcb557db0b218cbd86 template_sources: - gemfiles/modular/stringio/r4/v3.0.gemfile.example gemfiles/modular/stringio/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_stringio_vHEAD_gemfile action: write dest_sha256: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - input_fingerprint: 250132b7a09de62aff817a157dfd04857ae0f64d57e27aebbc5f35848dc01909 + input_fingerprint: e6729e709f1908b56173b9a3ffa4cbebcdfa7695264ff7b4d77d9ed0dadb083a template_sources: - gemfiles/modular/stringio/vHEAD.gemfile.example gemfiles/modular/style.gemfile: recipe: template_source_application_gemfiles_modular_style_gemfile action: write - dest_sha256: 2a3d46dcb8a9394f595f273f5eb0403d0a552837754ab109afc9ba79a7159083 - input_fingerprint: b689fbb8d97381e657c65f14b77319e8bf7c02dfba3e95f6961ae90e2add9300 + dest_sha256: 9a24acff0054573c30f5d84d0418cd465ba3794d075bb5a36801410ac40e0787 + input_fingerprint: 7135daa777e016b4963bceccaacbc078e008a296561bb139fc341692499e43ed template_sources: - gemfiles/modular/style.gemfile.example gemfiles/modular/style_local.gemfile: recipe: template_source_application_gemfiles_modular_style_local_gemfile action: write dest_sha256: 55eb9c149cdb2f29c9f31abe2d55a4f334e00fb859681dd17c42149a3f28ca36 - input_fingerprint: ce84131f0174bc4133bdb8032cd68f3d0c6c76701c6e5643690bc956b05f5ebc + input_fingerprint: bdc6e6c7fee8163506d2fad365a97fa0be562c3dfe0d0a0b539a4b1a3c49aa82 template_sources: - gemfiles/modular/style_local.gemfile.example gemfiles/modular/templating.gemfile: recipe: template_source_application_gemfiles_modular_templating_gemfile action: write - dest_sha256: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - input_fingerprint: 177713544a5a2381e056be9a763154881f767315b6e656011920db2863f04cb2 + dest_sha256: 432ba59798d31b899268257c432443a017c5a9bd2c0c7f9f2216617e14150cd3 + input_fingerprint: 12814a94fdf7432cccc5949d4cb336a6326b5245d15e757219c9426362e700c8 template_sources: - gemfiles/modular/templating.gemfile.example gemfiles/modular/templating_local.gemfile: recipe: template_source_application_gemfiles_modular_templating_local_gemfile action: write - dest_sha256: bf58c3d972ef8d89bb38263e98f37f392ca7c9010aa44c6e2ed654443ff25201 - input_fingerprint: 95a29ac126a590a1b2093cee368aed284211896fd4175a3b19888fa99637dbb1 + dest_sha256: 52f25a96713ad24cb6ecf38ef4604fc136909eae3ed187c71743d8aa0ceabe1a + input_fingerprint: 1ef9ecd95c96051bbb740ec1819c28375f55701dcd570801b050b90273fb3911 template_sources: - gemfiles/modular/templating_local.gemfile.example gemfiles/modular/webrick/r4/v1.9.gemfile: recipe: template_source_application_gemfiles_modular_webrick_r4_v1_9_gemfile action: write dest_sha256: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea - input_fingerprint: c6447963c496a6a50770c8f27b1be7591af22b9e4fc06b866f0d5b512de93eda + input_fingerprint: 3994ae868755958e8115c0a9f7d34a067e0c0110f92eed66b636ba441ce5fdb9 template_sources: - gemfiles/modular/webrick/r4/v1.9.gemfile.example gemfiles/modular/webrick/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_webrick_vHEAD_gemfile action: write dest_sha256: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b - input_fingerprint: a1cf2fc654c5b9aec2e838675d82dcd1b4e86bdd3b11518927e163ad54c9fe12 + input_fingerprint: f6743d9b88fa5c460083c5f515c01afcd63dea85f36dd1e4002e34937e502f63 template_sources: - gemfiles/modular/webrick/vHEAD.gemfile.example gemfiles/modular/x_std_libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_gemfile action: write dest_sha256: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a - input_fingerprint: a6fe0623216c32c9487f393055c15c1d162f39e7aabd17032ad1ca9b9c619f0b + input_fingerprint: 94434ce8410bb431c67003936cfd97289ab4183301705ea770023635ac62e995 template_sources: - gemfiles/modular/x_std_libs.gemfile.example gemfiles/modular/x_std_libs/r2/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r2_libs_gemfile action: write dest_sha256: e80ec8ad06cb1b31ac982bc25cf7696987fca131aa1001eaefd0bf5cd379c273 - input_fingerprint: c259991b17245e23f5c72c008ffb489283f832a97a6b685183a601456da144a9 + input_fingerprint: 4325b67334c77b6dde4a60093d810315427aa6b6cab5bb57f17e27a45249c747 template_sources: - gemfiles/modular/x_std_libs/r2/libs.gemfile.example gemfiles/modular/x_std_libs/r3.1/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_1_libs_gemfile action: write dest_sha256: 9f8565c40b09bea1bc4c2e2ad87fe11400c3c51a2b235655bfcd8e491ed88ca8 - input_fingerprint: ead33ca05619a50fc6a87177aca6372299db83c7847426ce08c6dd85024f32a1 + input_fingerprint: 03b66a7ce561f0852ab70b93b63c88578943e07a8853146dff4b2a2108d71032 template_sources: - gemfiles/modular/x_std_libs/r3.1/libs.gemfile.example gemfiles/modular/x_std_libs/r3/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_libs_gemfile action: write dest_sha256: 546f8849f4267bb19aa10ff0de40be30957197f229e6887847181ea9127b2650 - input_fingerprint: a10a0b3a5e94aff452fb2f991ca66375b58263b551c8af8baba26d68a0ed088d + input_fingerprint: b28abeb7b07b40f783bf811b3a3b0e6a1b4b8360b426e001642ea1e37817cdf7 template_sources: - gemfiles/modular/x_std_libs/r3/libs.gemfile.example gemfiles/modular/x_std_libs/r4/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r4_libs_gemfile action: write dest_sha256: 8c2582eaa218d216b98c86c933465295c8b4e43f3251ea388b9eaf6e471f8da6 - input_fingerprint: ae88feaf5239b333b450820d0516f9839d0dd702954376607d77f83a96bda376 + input_fingerprint: 1b997c06fa42db4a533e7ed1c8c827f58fc92e3e6faee8f61987e758c71688b2 template_sources: - gemfiles/modular/x_std_libs/r4/libs.gemfile.example gemfiles/modular/x_std_libs/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_vHEAD_gemfile action: write dest_sha256: d3133ec4c0638363a7fb025d19be7e95a615fd61c35ddb8d17f2280ee74a7486 - input_fingerprint: 837e33efa4b9f76390145d482b418bfbecf44bb5e935a3a70d80dbab83a7a66e + input_fingerprint: bb140e46482571f957ee95d66595df80a578caf45f56ae2a66598271945379cd template_sources: - gemfiles/modular/x_std_libs/vHEAD.gemfile.example lib/bash/merge/version.rb: recipe: template_source_application_lib_bash_merge_version_rb action: write - dest_sha256: 00dcd2b813b353c8aadeda033ba8874527ba14363d4eed298e381db7b7c82298 - input_fingerprint: 9221a290508faa1d3c9882b62eaafcd8fa1a21490de513954b3668289f16f2ab + dest_sha256: b85fa785a71cc0775f6317829232fd1f3b303e6e0f43193fae3be9b120a699c0 + input_fingerprint: cfefc88be9292278b0e5bc5aba50cd44bb05931d8317badc7935ef6e065483de template_sources: - lib/gem/version.rb.example mise.toml: recipe: template_source_application_mise_toml action: write dest_sha256: 7d267154ca4f081b0ac7da804c0180c2b091aec5f1c877417c1c320f4f369c88 - input_fingerprint: 38f6606ba0a9486afea5d776ea86f52f39af661a5a361ba66c0aa13bb2317a57 + input_fingerprint: 4ea84a2eb1aa81062d6324bd6f8ff8ec2cbd3da132757f5169364e1d763e0f4b template_sources: - mise.toml.no-osc.example sig/bash/merge.rbs: recipe: template_source_application_sig_bash_merge_rbs action: write dest_sha256: e7b30072091a4702d2412e561adc9029554d72f2cef5786cdf03bad9e28661c3 - input_fingerprint: 1dc9fdb3c5aa6a5e18b4cf8670ae15280858abc33d9723bfb9cb203917842e98 + input_fingerprint: b8444ec23a22929a70cbab13f111815a8636b817fc0856ad1a7a30e1237ec4ef template_sources: - sig/gem.rbs.example spec/spec_helper.rb: recipe: template_source_application_spec_spec_helper_rb action: write dest_sha256: 48b8af64ec60658c6a28f89e0b3359fcc22ea683afc7ba72d0b8a3646948715a - input_fingerprint: 40f3b3ae35c5feba8508fad316dd5c475e9b6c531c6f0077e10c7f03c0f6d44a + input_fingerprint: bd7315e3d47bb3cb30621dc597171851df81144adeac80c8e5ae487f03c849e0 template_sources: - spec/spec_helper.rb.example diff --git a/gems/bash-merge/Gemfile b/gems/bash-merge/Gemfile index a0d9f2389..8ada50ea1 100644 --- a/gems/bash-merge/Gemfile +++ b/gems/bash-merge/Gemfile @@ -19,7 +19,7 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } # Include dependencies from bash-merge.gemspec gemspec -gem 'kettle-family', '~> 1.2', '>= 1.2.97' +gem 'kettle-family', '~> 1.2', '>= 1.2.100' # Local workspace dependency wiring for *_local.gemfile overrides gem 'nomono', '~> 1.1', '>= 1.1.5', require: false # ruby >= 3.2.0 diff --git a/gems/bash-merge/Gemfile.lock b/gems/bash-merge/Gemfile.lock index a85bbf3eb..dac23237e 100644 --- a/gems/bash-merge/Gemfile.lock +++ b/gems/bash-merge/Gemfile.lock @@ -10,123 +10,123 @@ GIT PATH remote: . specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + bash-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) + ast-crispr-markdown-markly (7.1.9) + ast-crispr (= 7.1.9) + markdown-merge (= 7.1.9) + markly-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism specs: - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) + ast-crispr-ruby-prism (7.1.9) + ast-crispr (= 7.1.9) + prism-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) + ast-crispr (7.1.9) + ast-merge (= 7.1.9) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ast-merge-git (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: - ast-merge (7.1.8) + ast-merge (7.1.9) benchmark token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) + ast-template (7.1.9) + ast-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + binary-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) + citrus-toml-merge (7.1.9) + ast-merge (= 7.1.9) + toml-merge (= 7.1.9) toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge specs: - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) commonmarker (~> 2.2) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) + dotenv-merge (7.1.9) + ast-merge (= 7.1.9) + plain-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + go-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + html-merge (7.1.9) + ast-crispr (= 7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + json-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: - kettle-jem (7.1.25) + kettle-jem (7.1.26) addressable (>= 2.8, < 3) ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) @@ -160,122 +160,122 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge specs: - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown (~> 2.5) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + markdown-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) + markly-merge (7.1.9) + markdown-merge (= 7.1.9) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge specs: - parslet-toml-merge (7.1.8) + parslet-toml-merge (7.1.9) toml (~> 0.3) - toml-merge (= 7.1.8) + toml-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + plain-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) + prism-merge (7.1.9) + ast-merge (= 7.1.9) prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + psych-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) + yaml-merge (= 7.1.9) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) + rbs-merge (7.1.9) + ast-merge (= 7.1.9) rbs (>= 3.10) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + rust-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) + smorg-rb (7.1.9) + ast-merge (= 7.1.9) + ast-merge-git (= 7.1.9) + bash-merge (= 7.1.9) diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) + dotenv-merge (= 7.1.9) + go-merge (= 7.1.9) + html-merge (= 7.1.9) + json-merge (= 7.1.9) kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) + markdown-merge (= 7.1.9) + plain-merge (= 7.1.9) + prism-merge (= 7.1.9) + psych-merge (= 7.1.9) + rbs-merge (= 7.1.9) + rust-merge (= 7.1.9) + toml-merge (= 7.1.9) + typescript-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + toml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: - tree_haver (7.1.8) + tree_haver (7.1.9) citrus (~> 3.0) parslet (~> 2.0) tree_sitter_language_pack (>= 1.16.2, < 2.0) @@ -284,25 +284,25 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + typescript-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + yaml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) + zip-merge (7.1.9) + binary-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) GEM @@ -336,6 +336,8 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) + commonmarker (2.10.0) + rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -465,11 +467,15 @@ GEM lint_roller (1.1.0) logger (1.7.0) markly (0.19.0) + mini_portile2 (2.8.9) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) reline (~> 0.6) mutex_m (0.3.0) + nokogiri (1.19.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-musl) @@ -503,6 +509,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) + rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -696,6 +705,9 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_sitter_language_pack (1.16.2) + rb_sys (>= 0.9.130, < 0.10) + sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -784,9 +796,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.31) + kettle-dev (~> 3.0, >= 3.0.34) kettle-drift (~> 1.0, >= 1.0.13) - kettle-family (~> 1.2, >= 1.2.97) + kettle-family (~> 1.2, >= 1.2.100) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) @@ -807,12 +819,12 @@ DEPENDENCIES reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) - rubocop-lts (~> 24.2, >= 24.2.1) - rubocop-lts-rspec (~> 1.0, >= 1.0.5) + rubocop-lts (~> 24.2, >= 24.2.3) + rubocop-lts-rspec (~> 1.0, >= 1.0.6) rubocop-minitest (~> 0.40, >= 0.40.0) rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! - rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) ruby-merge! ruby-progressbar (~> 1.13) rust-merge! @@ -843,33 +855,34 @@ CHECKSUMS appraisal2 (3.2.3) sha256=3a6cfaf8a444e02707b9a34154af1c4902fbe99d9d2168d7e81dd83ec77e6db7 appraisal2-rubocop (1.0.2) sha256=1dae97c1be087cf9c098a3a72fd41f873435e9b8b39687e633b36c9ccb22bff4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.8) - ast-crispr-markdown-markly (7.1.8) - ast-crispr-ruby-prism (7.1.8) - ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) + ast-crispr (7.1.9) + ast-crispr-markdown-markly (7.1.9) + ast-crispr-ruby-prism (7.1.9) + ast-merge (7.1.9) + ast-merge-git (7.1.9) + ast-template (7.1.9) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.8) + bash-merge (7.1.9) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) - bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae + binary-merge (7.1.9) + bundler (4.1.0.beta1) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.8) + citrus-toml-merge (7.1.9) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 + commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e commonmarker (2.10.0-x86_64-darwin) sha256=01e0830ed0319825ecdc16411c90acd3f661d1568dfc178731b3f64d0ce2363d commonmarker (2.10.0-x86_64-linux) sha256=945c510c0bfca9022245928e2248468fe3ddad58c939be0c37b20082cc392880 commonmarker (2.10.0-x86_64-linux-musl) sha256=288cd4fb9f17eed2ffa73551ef241dcf594e0f484b2aee2a0999540333c0618e - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) completely (0.8.0) sha256=e493cd5d84805f47917a41f277ecbfe5f35363bed670be5a957d3acaed8c6c5e concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 @@ -878,7 +891,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docopt_ng (0.7.1) sha256=a024148ee4fa3ab1a8a04411aa4370f39cf2b446e63562097d418b7974a15667 - dotenv-merge (7.1.8) + dotenv-merge (7.1.9) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -891,35 +904,37 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) + go-merge (7.1.9) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) + html-merge (7.1.9) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a - json-merge (7.1.8) - kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + json-merge (7.1.9) + kettle-changelog (1.0.7) + kettle-dev (3.0.34) + kettle-drift (1.0.13) kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 - kettle-jem (7.1.25) + kettle-jem (7.1.26) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 - kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd + kettle-soup-cover (3.0.10) kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 - markdown-merge (7.1.8) + markdown-merge (7.1.9) markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca - markly-merge (7.1.8) + markly-merge (7.1.9) + mini_portile2 (2.8.9) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 + nokogiri (1.19.4) nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af nokogiri (1.19.4-arm64-darwin) sha256=a46db9853286e6597b36ebc6953817d15acf3a299583eb3f89fdc6f91dd63527 @@ -933,20 +948,22 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) - plain-merge (7.1.8) + parslet-toml-merge (7.1.9) + plain-merge (7.1.9) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.8) + prism-merge (7.1.9) psych (5.5.0) sha256=4b245bbbd0f3238df8ccee766ebc1a6b062b10e4ee1d3284eb588739ba156a0a - psych-merge (7.1.8) + psych-merge (7.1.9) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 - rbs-merge (7.1.8) + rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -982,11 +999,11 @@ CHECKSUMS rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.8) + ruby-merge (7.1.9) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) + rust-merge (7.1.9) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +1011,7 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) + smorg-rb (7.1.9) sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,10 +1027,11 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.8) + toml (0.3.0) + toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb - tree_haver (7.1.8) + tree_haver (7.1.9) + tree_sitter_language_pack (1.16.2) tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 @@ -1023,12 +1041,12 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) + typescript-merge (7.1.9) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 yaml-converter (0.2.5) sha256=a5214fe1a6c2df88bd34a35bcded1b1dcd30135548130df2e03b54ca8c0f2423 - yaml-merge (7.1.8) + yaml-merge (7.1.9) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.8) sha256=73d935d43e3479d65ce8aff25c7d3100e8bb83528a2adaa0ed824e5046ac99e7 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -1037,8 +1055,8 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) + zip-merge (7.1.9) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH - 4.0.20 + 4.1.0.beta1 diff --git a/gems/bash-merge/Rakefile b/gems/bash-merge/Rakefile index 4c3c1c7d8..aa6d844a2 100644 --- a/gems/bash-merge/Rakefile +++ b/gems/bash-merge/Rakefile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -# bash-merge Rakefile v7.1.18 - 2026-09-07 +# bash-merge Rakefile v7.1.26 - 2026-09-09 # Ruby 2.3 (Safe Navigation) or higher required # # See LICENSE.md for license information. diff --git a/gems/bash-merge/bash-merge.gemspec b/gems/bash-merge/bash-merge.gemspec index 0dab5c2a0..4b528a09b 100644 --- a/gems/bash-merge/bash-merge.gemspec +++ b/gems/bash-merge/bash-merge.gemspec @@ -113,7 +113,7 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.31') # ruby >= 4.0.0 + spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.34') # ruby >= 4.0.0 # Security spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 diff --git a/gems/bash-merge/bin/rubocop-gradual b/gems/bash-merge/bin/rubocop-gradual new file mode 100755 index 000000000..7c7ff0635 --- /dev/null +++ b/gems/bash-merge/bin/rubocop-gradual @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'rubocop-gradual' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'rubygems' +require 'bundler/setup' + +load Gem.bin_path('rubocop-gradual', 'rubocop-gradual') diff --git a/gems/bash-merge/gemfiles/modular/coverage_local.gemfile b/gems/bash-merge/gemfiles/modular/coverage_local.gemfile index 37917caac..d6c890e46 100644 --- a/gems/bash-merge/gemfiles/modular/coverage_local.gemfile +++ b/gems/bash-merge/gemfiles/modular/coverage_local.gemfile @@ -29,11 +29,31 @@ Kernel.send(:gem, 'nomono', *nomono_activation_requirements) require 'nomono/bundler' local_gems = %w[kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -local_gems_to_eval = local_gems - %w[] - declared_gems # export KETTLE_DEV_DEV=/path/to/my platform :mri do + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + local_gems_to_eval = local_gems - %w[] - declared_gems + eval_nomono_gems( gems: local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/bash-merge/gemfiles/modular/style.gemfile b/gems/bash-merge/gemfiles/modular/style.gemfile index 59c5dc1a3..41ec99454 100644 --- a/gems/bash-merge/gemfiles/modular/style.gemfile +++ b/gems/bash-merge/gemfiles/modular/style.gemfile @@ -24,9 +24,9 @@ platform :mri do if ENV.fetch('RUBOCOP_LTS_DEV', 'false').casecmp('false').zero? declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) - gem 'rubocop-lts', '~> 24.2', '>= 24.2.1' unless declared_gems.include?('rubocop-lts') - gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.5' unless declared_gems.include?('rubocop-lts-rspec') - gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.6' unless declared_gems.include?('rubocop-ruby3_2') + gem 'rubocop-lts', '~> 24.2', '>= 24.2.3' unless declared_gems.include?('rubocop-lts') + gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.6' unless declared_gems.include?('rubocop-lts-rspec') + gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.8' unless declared_gems.include?('rubocop-ruby3_2') else eval_gemfile('style_local.gemfile') end diff --git a/gems/bash-merge/gemfiles/modular/templating.gemfile b/gems/bash-merge/gemfiles/modular/templating.gemfile index 6af159bd7..ce51a08ed 100644 --- a/gems/bash-merge/gemfiles/modular/templating.gemfile +++ b/gems/bash-merge/gemfiles/modular/templating.gemfile @@ -18,7 +18,7 @@ end if structuredmerge_remote # Merge recipes for released installs. - gem 'kettle-jem', '>= 7.0' + gem 'kettle-jem', '~> 7.1', '>= 7.1.26' end if kettle_remote diff --git a/gems/bash-merge/gemfiles/modular/templating_local.gemfile b/gems/bash-merge/gemfiles/modular/templating_local.gemfile index 89644906e..f9d162182 100644 --- a/gems/bash-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/bash-merge/gemfiles/modular/templating_local.gemfile @@ -65,9 +65,7 @@ structuredmerge_local_gems = %w[ kettle_dev_local_gems = %w[ kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift ] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[] -kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - (declared_gems - %w[kettle-dev]) if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( @@ -81,6 +79,28 @@ if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 end if ENV.fetch('KETTLE_DEV_DEV', 'false').casecmp('false') != 0 + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - declared_gems + eval_nomono_gems( gems: kettle_dev_local_gems_to_eval, prefix: 'KETTLE_DEV', From f8a2da470048c973c29185e248f895ead081ca62 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 23:50:46 -0400 Subject: [PATCH 083/137] =?UTF-8?q?=F0=9F=8E=A8=20Template=20rbs-merge=20b?= =?UTF-8?q?y=20kettle-family?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/rbs-merge/.kettle-drift.lock | 76 ++++- gems/rbs-merge/.rubocop_gradual.lock | 7 +- .../.structuredmerge/kettle-jem.lock | 145 ++++----- gems/rbs-merge/Gemfile | 2 +- gems/rbs-merge/Gemfile.lock | 304 ++++++++++-------- gems/rbs-merge/Rakefile | 2 +- gems/rbs-merge/bin/rubocop-gradual | 16 + .../gemfiles/modular/coverage_local.gemfile | 24 +- gems/rbs-merge/gemfiles/modular/style.gemfile | 6 +- .../gemfiles/modular/templating.gemfile | 2 +- .../gemfiles/modular/templating_local.gemfile | 24 +- gems/rbs-merge/rbs-merge.gemspec | 2 +- 12 files changed, 380 insertions(+), 230 deletions(-) create mode 100755 gems/rbs-merge/bin/rubocop-gradual diff --git a/gems/rbs-merge/.kettle-drift.lock b/gems/rbs-merge/.kettle-drift.lock index 98b009e1e..1b23f4793 100644 --- a/gems/rbs-merge/.kettle-drift.lock +++ b/gems/rbs-merge/.kettle-drift.lock @@ -1,10 +1,82 @@ { + "debug_env: 'KETTLE_DEV_DEBUG',\nroot: %w[src my kettle-dev]": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 46, + 63 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 93, + 110 + ] + } + ], + "path_env: 'KETTLE_DEV_DEV',\nvendored_gems_env: 'VENDORED_GEMS',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 43, + 60 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 90, + 107 + ] + } + ], + "prefix: 'KETTLE_DEV',\npath_env: 'KETTLE_DEV_DEV',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 42, + 59 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 89, + 106 + ] + } + ], + "vendor_gem_dir_env: 'VENDOR_GEM_DIR',\ndebug_env: 'KETTLE_DEV_DEBUG',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 45, + 62 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 92, + 109 + ] + } + ], "vendored_gems_env: 'VENDORED_GEMS',\nvendor_gem_dir_env: 'VENDOR_GEM_DIR',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 44, + 61 + ] + }, { "file": "gemfiles/modular/templating_local.gemfile", "lines": [ - 77, - 88 + 75, + 91, + 108 ] } ] diff --git a/gems/rbs-merge/.rubocop_gradual.lock b/gems/rbs-merge/.rubocop_gradual.lock index ecb355caa..892ddfc36 100644 --- a/gems/rbs-merge/.rubocop_gradual.lock +++ b/gems/rbs-merge/.rubocop_gradual.lock @@ -2,7 +2,7 @@ ".simplecov:2845233061": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] ], - "Rakefile:498126301": [ + "Rakefile:3174278558": [ [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], [81, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], [165, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], @@ -22,6 +22,9 @@ [1, 1, 0, "Naming/FileName: The name of this source file (`vHEAD.gemfile`) should use snake_case.", 5381], [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], + "gemfiles/modular/coverage_local.gemfile:2813372128": [ + [34, 1, 1586, "Metrics/BlockLength: Block has too many lines. [37/25]", 820328175] + ], "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], @@ -269,7 +272,7 @@ [892, 7, 1788, "Metrics/PerceivedComplexity: Perceived complexity for `collapse_cross_source_preamble_prefixes` is too high. [9/8]", 3130187278], [932, 7, 533, "Metrics/MethodLength: Method has too many lines. [15/10]", 4188914818] ], - "rbs-merge.gemspec:2899637442": [ + "rbs-merge.gemspec:1230127367": [ [138, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4147388508], [149, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], [150, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] diff --git a/gems/rbs-merge/.structuredmerge/kettle-jem.lock b/gems/rbs-merge/.structuredmerge/kettle-jem.lock index cffff45b6..4de0f6355 100644 --- a/gems/rbs-merge/.structuredmerge/kettle-jem.lock +++ b/gems/rbs-merge/.structuredmerge/kettle-jem.lock @@ -1,11 +1,12 @@ --- version: 1 template_state: - version: 7.1.18 - applied_at: '2026-09-07' + version: 7.1.26 + applied_at: '2026-09-10' changelog_replay: last_entry_key: kettle-jem-template-20260802-001 last_entry_date: '2026-08-02' + maintenance_changelog: {} checksums: ".aiignore.example": 48a5dfdd93afd1a15fdce39cc28ca9920263f00018b0968ab031fa744521e5ce ".config/mise/env.sh": aeea5a2ab489ba6e5467ae8de6e386ec8c8fe4ff31a044e69d0cd6a092dd6654 @@ -75,7 +76,7 @@ template_state: ".rubocop_rspec.yml.example": 288ad75e7eb14d87d80fafe6f7272217be5c57547536ee56c780a7d10ac7ec74 ".simplecov.example": 222f2e6ce8cf089c70a21f0f5e5423d4bd59a96fdb2ce7754b0fb3d6f430c229 ".structuredmerge/git-drivers.toml.example": 9d241a44c9edffcdbd3da018fa188a238089c3d1635040924df594a6929a4f97 - ".structuredmerge/kettle-jem.yml.example": 26949dc4ee0722415e72452cbc186bee6ef7b154eae33166d36f3fdb1ca6e46d + ".structuredmerge/kettle-jem.yml.example": ff65a738da1af7d60714026a81d3323a46c864e96ae3570b806afdf6e7149ff9 ".yard-lint.yml.example": 90def46867c9436b4e177c47d91fc8165f4602e335715aecc39f5587ae20b55b ".yardignore.example": 821f453c609df7d46145d675424b39dfbe6dfdca8edac5f367b85fff48502455 ".yardopts.example": 6fd6f2701713096a8a9ea095c213bbc68eeef37797c4754d97837e3229a3a5f6 @@ -88,7 +89,7 @@ template_state: CHANGELOG.transfer.md: 21331d8a9e58b4ff6e088b88eb408bcccb0f2f64e78f8f4d42ac3f11a24baad8 CITATION.cff.example: e404ea0a7919d78a83d53d80e211d17b9663576aa606583b709795dc023fd75c CODE_OF_CONDUCT.md.example: f1ad532f1860f73ef774c6b27a26d41f4bc1cb8813034f5957487766ebb0986b - CONTRIBUTING.md.example: 22570cfb3dde72be79b4b522b6d5ab13f95d778e40444483a096871fe0891b19 + CONTRIBUTING.md.example: 8d23cce2d061e0c20d619c3f66591df5f32821cd84c32d171df0b8ebe1217a55 FUNDING.md.example: 392d047904b1557b29f4b43d37ec403b7480edd5b6ab51180be979b57a91e6ba FUNDING.md.no-osc.example: 3ef0258dd3e3b7f7e17e8bc2d20dcbcb3e74aa5a5a6f51297075696645e34c77 Gemfile.example: 99500023987e81775a9b5ef14e92cb3992f2ac408e5f42454f2728eee9b49fb2 @@ -99,19 +100,19 @@ template_state: PolyForm-Small-Business-1.0.0.md.example: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 README.md.example: 21f491e3d73bfc1b74056a6dcba61f72c93dee3cfe5272ac164a20978454de21 REEK: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - RUBOCOP.md.example: c09e5533ccc59b70a2efa05c99f66e521137c1053d3c12eb43509cebd5b68b0e + RUBOCOP.md.example: d99871a0e4c1d323c92e7febf328f062bb4722069b2abfd0a83bf7daa8dcbf8c Rakefile.example: 569803e726b07ea26267fec6891367a3096a0dff3c266269a7081d36afe496af SECURITY.md.example: ee9411aa85f36d88363fdaea7a1baea4362b6ec112cf2688e711b05de1d3144c bin/setup.example: 0ac35089c95a91d8973fe7a318bf9fd98b9f8e00db92c5d9ca6cd858abb8d41b certs/pboling.pem.example: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - gem.gemspec.example: 83e834e8958a88e4817a57199f48f5ebb245548ce251c5c47372208693f03b17 + gem.gemspec.example: 12dcadc0b297ccd4e18b9d1e538b98ac8330ef9fb2a059ed6754ad59272b77fa gemfiles/modular/benchmark/r4/v0.5.gemfile.example: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 gemfiles/modular/benchmark/vHEAD.gemfile.example: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 gemfiles/modular/cgi/r4/v0.5.gemfile.example: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 gemfiles/modular/cgi/vHEAD.gemfile.example: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 gemfiles/modular/changelog.gemfile.example: 892598e0e7792eb205247ae28128cef6dfc647d2fb33968969152230d6f69288 gemfiles/modular/coverage.gemfile.example: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - gemfiles/modular/coverage_local.gemfile.example: 928d5f260d7b119c038baa56da9fb78dd524dee613aea33ab72894bbce5c506e + gemfiles/modular/coverage_local.gemfile.example: 92ea0d7a9d693553dc614afa2c43990f5c3778c2b00ef6c528e122c31bd506a1 gemfiles/modular/debug.gemfile.example: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 gemfiles/modular/documentation.gemfile.example: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c gemfiles/modular/documentation_local.gemfile.example: 84a20f5d4b0feb94c2cf2f7a8dce8f682f1483498e41484c2b447a5661fd1870 @@ -145,10 +146,10 @@ template_state: gemfiles/modular/stringio/r3/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/r4/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/vHEAD.gemfile.example: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - gemfiles/modular/style.gemfile.example: 3ad0585b4f2db8918580ca41ea8723f7a166d7a83cfd7f9613511094997106fd + gemfiles/modular/style.gemfile.example: 02fe3e8fd00e49b90c3ab30e19b51014ee50490f3eadcfd1d4a39f4c2c997dda gemfiles/modular/style_local.gemfile.example: c86beb711e766126a5be68be4be18255831625ac3650d5069383c4a83a9511f3 - gemfiles/modular/templating.gemfile.example: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - gemfiles/modular/templating_local.gemfile.example: 930057d3b909a72e39a39125c4e883a7ff71f5691e64426c0541f8c8fc75b83f + gemfiles/modular/templating.gemfile.example: 2b33c094677b53ad9dd2eafeb3a3be452f612380c61001a2e75b3c078b8ff72a + gemfiles/modular/templating_local.gemfile.example: ac7259516e69ffafb8b9342a897ddf6042adc46335743f474c342509cefd8f2e gemfiles/modular/webrick/r4/v1.9.gemfile.example: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea gemfiles/modular/webrick/vHEAD.gemfile.example: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b gemfiles/modular/x_std_libs.gemfile.example: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a @@ -175,7 +176,7 @@ template_state: shim/Gemfile.example: 0fb0d9d06fcfb1fd6ca6f0eeb5867253ca1ed221e03d28027719225f868b0637 shim/README.md.example: 3a2f7211b7f92a1dfae5e523b8e34b051a3d8af942144b05286eca0b3c8f6fbe shim/Rakefile.example: 572c94da7052083b39b62a6600785419e314a109efd7a3d8c3a96eb77ad34fd1 - shim/gem.gemspec.example: efae033238e4fd1355cfc134f5c9123f175d1ad1dc4a1a2e663899788c9e0870 + shim/gem.gemspec.example: 14a7015b3328005d1c3b5fda6886bd6da383707745f6eaaa781d6f9689600131 shim/lib/compat_require.rb.example: 94ee85e353a3ca08c8a35c9063d4ff789214ea594c7f803f6cf09d7142f48379 shim/lib/entrypoint.rb.example: dd57613520daca01d6f6bcaa9b83b00ff74505240dc04b84ceb686df3c0539d7 shim/lib/version.rb.example: 15e219ac3a928b5580035f891e415551213175020f1131f6e7ca0ccd55a1b2d6 @@ -189,370 +190,370 @@ files: recipe: template_source_application_simplecov action: write dest_sha256: a6fd6fa0015c989536e86471f797a8125f181f8d959249533e849d14830a0c02 - input_fingerprint: 2e028f13380804b06dcc9122901f03a0958397a62e02d827db45c31d87b6282a + input_fingerprint: 7155631e117e6c76c7996c2957ae011b302905b8e8e2ed1d2a8baf0a4b075bd9 template_sources: - ".simplecov.example" AGPL-3.0-only.md: recipe: template_source_application_AGPL_3_0_only_md action: write dest_sha256: d8a6cc31abc16b6748c7a21f21611f5a1ec33f67d22ca23d7da1c19b95496bee - input_fingerprint: '0501596171b3824ff756f475f9d9d7dce355d8dda36008f6b7397c216b4fd8d4' + input_fingerprint: d7ad90267055fed2f1d2969c3a4c1c78ec769dce475701eae889d00adcef48db template_sources: - AGPL-3.0-only.md.example Gemfile: recipe: template_source_application_Gemfile action: write - dest_sha256: bed82ca88279829e12fea1bf871de3352cd0b9d88c9027228528336f4ef1cd67 - input_fingerprint: 9ad4a3b5382cb9714836d4ea2eb9e38cc98b6d22ee00f3bf3c3146e4c73674bd + dest_sha256: a7710b3ed272f24858314788b1cd091846421b28b84307324456bb87e2f60c6a + input_fingerprint: f930e6901650804fc8c27f28efe3b2c0cd821d100c76e3c7c8e00bb431d24f85 template_sources: - Gemfile.example LICENSE.md: recipe: template_source_application_LICENSE_md action: write dest_sha256: f6188bfd474a636d2a526420ebb411250faa447d94c9b9ccee097128ce4101b5 - input_fingerprint: 8dc7366443d3358fb3f6844ba7463cb15db79d071ea99d7e0c45fd782d774fc3 + input_fingerprint: dd36271e7452895dc6c5faa889164a66ccd26e6d031d8778c78654a1e85112a8 template_sources: - LICENSE.md.example PolyForm-Small-Business-1.0.0.md: recipe: template_source_application_PolyForm_Small_Business_1_0_0_md action: write dest_sha256: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 - input_fingerprint: fcd5f73e38199dd445f87e952b6788174c722a65ed5f3a982b7ca06595c65815 + input_fingerprint: 2b76fbe0bae8980c7d3449da38a18cb30801eb12bebd7178757d2b083a7ab6f9 template_sources: - PolyForm-Small-Business-1.0.0.md.example README.md: recipe: template_source_application_README_md action: write dest_sha256: 050ca7507731c301616f27ddbb7aa59eeb71a5ba88e2a4c95167b3675bb1f380 - input_fingerprint: 37546ee7aea6ba31c3c158940acda25c43c74b2d7ae3d86bc7a23970ee152d0c + input_fingerprint: 93ee80ba4daf69832b8e23d3d330a0b72200a317b71da0bbaac9defeac010e52 template_sources: - README.md.example Rakefile: recipe: template_source_application_Rakefile action: write - dest_sha256: 34397370024e414fb60f27fc9d402001bb30eda7f18bd11234a9b315887c914a - input_fingerprint: 7e7df73e9c61d3393cf8f91de378f39002fea142a3b1cbc4d66506124ddb4b3c + dest_sha256: b5cb04f30cce723954165386dbf1796363a25437c2812668f25ae96c165aa4fc + input_fingerprint: 477791a71800ff358d777dc3374a72febabc7858b0395eef56f54fcedec9bf32 template_sources: - Rakefile.example certs/pboling.pem: recipe: template_source_application_certs_pboling_pem action: write dest_sha256: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - input_fingerprint: 120be6e0db22a73ed3c81d141884ea10bf1a9fd88e5be59b56163d2ef977b4c6 + input_fingerprint: 89a5d3e66076a2bf4c73f7f6033dca749c8f23395b1a05855efaf4e68728a447 template_sources: - certs/pboling.pem.example gemfiles/modular/benchmark/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_r4_v0_5_gemfile action: write dest_sha256: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 - input_fingerprint: 8659d6a8cb3c15577707e266518be88395b97eaa5ced26daea4da6381a4ecc5b + input_fingerprint: 975a9d39f20c7d024a13b4c535be639b7f6f46b3587a2fcf9c1649a059f68b92 template_sources: - gemfiles/modular/benchmark/r4/v0.5.gemfile.example gemfiles/modular/benchmark/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_vHEAD_gemfile action: write dest_sha256: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 - input_fingerprint: cd29e605f4137a2d5c4b5c16d880c41dfb7a4f0a1b3406ee174e2baf2668836d + input_fingerprint: 0e8a876f5f9d56c33d0798f15148eccd5691f274205194a4534ca0d333db38ec template_sources: - gemfiles/modular/benchmark/vHEAD.gemfile.example gemfiles/modular/cgi/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_cgi_r4_v0_5_gemfile action: write dest_sha256: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 - input_fingerprint: c77463665e6fa911d40831f04ef1b0f95242833f8e21bdaf365d55d83b11111d + input_fingerprint: e1403e3a72cf235cc1550734ba4addff4a52a0da6600274a04511e87c31df6ba template_sources: - gemfiles/modular/cgi/r4/v0.5.gemfile.example gemfiles/modular/cgi/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_cgi_vHEAD_gemfile action: write dest_sha256: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 - input_fingerprint: 3f3f475cac18f2d65109233e968e2fc148565baccb0c5a38c43436f46ce9fc8f + input_fingerprint: 4d4d2cea0f1020c6b0fa539df3de670748e33e8e61d4f55a55fa9c45d8f886d7 template_sources: - gemfiles/modular/cgi/vHEAD.gemfile.example gemfiles/modular/changelog.gemfile: recipe: template_source_application_gemfiles_modular_changelog_gemfile action: write dest_sha256: da669526144fbff33aef207db9541b6fd6c254437f94dec2fab70fc55a7757cd - input_fingerprint: 0c285a4756c73e0b676249e4164efaed5a31c86e5fd715bc1859f043b24079d4 + input_fingerprint: 28006988a52941a08d5ea6b32da4a01e3bbb3979273bb9eae987671455e2cd8a template_sources: - gemfiles/modular/changelog.gemfile.example gemfiles/modular/coverage.gemfile: recipe: template_source_application_gemfiles_modular_coverage_gemfile action: write dest_sha256: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - input_fingerprint: 1f0887fd453197a3788b94e84d6d116d9b09d0e6359756db423edba60c27b33d + input_fingerprint: 51781f69acdfcf71aeceb2da8718e6a6f42351f663b255017b5af6e4c0d88b0b template_sources: - gemfiles/modular/coverage.gemfile.example gemfiles/modular/coverage_local.gemfile: recipe: template_source_application_gemfiles_modular_coverage_local_gemfile action: write - dest_sha256: 2b493414df06261ba8acb6f0eb18bf3fdd701d7cb5f967a9d15a3f42a4741827 - input_fingerprint: ebcb8ce10c4f78d7050835955e8f3064457f6ee9b039c25bbc149b8e14f0ae6f + dest_sha256: 92c9a599c8f6867ec532880f73568f2736ac05d8973ec524b42fd5dbe6aeda3e + input_fingerprint: e6dac19a5fdadce8f3b6be473a0719bc1e26c4455a9f7c2a06e5956c0b89e58e template_sources: - gemfiles/modular/coverage_local.gemfile.example gemfiles/modular/debug.gemfile: recipe: template_source_application_gemfiles_modular_debug_gemfile action: write dest_sha256: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 - input_fingerprint: 9349e4141f4ebf80fb1c844850f573453fa05fd6db510e912c47e5453e8d5753 + input_fingerprint: 84fa719eb495b596348c1df7fc9b4e2799320904784fc062c1dcad5d2a72a78e template_sources: - gemfiles/modular/debug.gemfile.example gemfiles/modular/documentation.gemfile: recipe: template_source_application_gemfiles_modular_documentation_gemfile action: write dest_sha256: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c - input_fingerprint: cde9f9cc417fbec7fd4d2e85261e0f69a517579c9dc076a398a272943eaf65f6 + input_fingerprint: 2bb8950e999976a962fbdfc06fb573177a329167e204a11e12a4765c0333cc63 template_sources: - gemfiles/modular/documentation.gemfile.example gemfiles/modular/documentation_local.gemfile: recipe: template_source_application_gemfiles_modular_documentation_local_gemfile action: write dest_sha256: 2058173855b9a4acc6d5efa20520e49734243eef6cf0b5e9063e0e5866a08e9c - input_fingerprint: 7e70602ad8c4c5f3b345825e0c096eadcbbaef383ae9e649c19c9fcc09759342 + input_fingerprint: 2e8fe4e64b96cf1245f791eaee810d5c0a3fc8ed9a753924b1463a86dedfd767 template_sources: - gemfiles/modular/documentation_local.gemfile.example gemfiles/modular/erb/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r2_v3_0_gemfile action: write dest_sha256: 3793e7dc9ef23a7ccd893d48cbba092fd27594c63e65cca011cc658218425670 - input_fingerprint: 5d9dfe8c90a4900ce9fcac42ac3e7855a028185ec91d9c4e4f9c736bb00960a6 + input_fingerprint: e01ac0c00772bd398e669e42727b9aabc9129f8344f447d6bd8ddaa8338574c5 template_sources: - gemfiles/modular/erb/r2/v3.0.gemfile.example gemfiles/modular/erb/r3/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r3_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 750fc0c094592aa5b08bb44ce7b77f6772e97bb4f510230c108eb63b5094975f + input_fingerprint: 24f7a4d371c0112317dd1c90422926931525ac389ff48555221074ae1e64e5b6 template_sources: - gemfiles/modular/erb/r3/v5.0.gemfile.example gemfiles/modular/erb/r4/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r4_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 6c2503b329441ca025318088808806585a6bc0fe5966c8247f19793ec04a6664 + input_fingerprint: d12781b22116b0b5c8ba0be33c79f10c85929d0bf4b491bea3f73bc55b4a9b7b template_sources: - gemfiles/modular/erb/r4/v5.0.gemfile.example gemfiles/modular/erb/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_erb_vHEAD_gemfile action: write dest_sha256: ad6f104a49e80e0cf625440e3dc816343fe7e2f037fc4971df75e7bb4305c683 - input_fingerprint: 0c2d8b5f09f3c8030375828d2cc3fce24d0bea9072fd5c67ebc3224049c2e0b7 + input_fingerprint: 4ac4a378f8845985ae920da34b330c91168c31ce9fa844ade70faa1b80dc6e65 template_sources: - gemfiles/modular/erb/vHEAD.gemfile.example gemfiles/modular/json/truffleruby_22_3.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_22_3_gemfile action: write dest_sha256: 249c12eacbe90f9d0d2e81e7a62c4c7e9102e504ededcda4ecf660cb3bb68be4 - input_fingerprint: a876eeaab2d85b3c2cc633907d7128fdb0ec7873c02f5fd2e36e20fc1448d0e4 + input_fingerprint: 05f5dd6c4c0d9b3fb2441be0be60e980caf2546ba3d956beec1671bdd295ad41 template_sources: - gemfiles/modular/json/truffleruby_22_3.gemfile.example gemfiles/modular/json/truffleruby_23_0.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_0_gemfile action: write dest_sha256: 66aa010567f7afa1af8244a74c3c88ecaaf84dc87b6a25180691bb480d02ed28 - input_fingerprint: ab36083a027c8e32f491b17e362bbac63aff195c2fd5925c7a0ae8e086083e78 + input_fingerprint: 9b1b9446d84f31e90334abaade25eb356143a7c7296344e399cbc3df7db81c0b template_sources: - gemfiles/modular/json/truffleruby_23_0.gemfile.example gemfiles/modular/json/truffleruby_23_1.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_1_gemfile action: write dest_sha256: '080fcbdaf2bec73cad40832a3d51eebb380af789917b96f493d1460b0dd6361d' - input_fingerprint: fef68168ec34e37ec9278001ae1507cac73f75dc3e873a148a7b65355e42a6f4 + input_fingerprint: da91621ce1f9c6eea22c939c54e059a3f7b85168b5213e1c8e065f3cf71298df template_sources: - gemfiles/modular/json/truffleruby_23_1.gemfile.example gemfiles/modular/mutex_m/r2/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r2_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: '039a3906a9780bcae30df62cfe37c4042139dbefcfdcfc7d4eb76f01236bad5f' + input_fingerprint: 46d6fe67a1e6eca649fcd746e0b585b102de115993e3caa66a48f0e2774e6df0 template_sources: - gemfiles/modular/mutex_m/r2/v0.3.gemfile.example gemfiles/modular/mutex_m/r3/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r3_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 594c4f9ebc9457340048d02af57afe0045fbb4ef12d6bfe50047e292e6f8d9b5 + input_fingerprint: 90b45e13e60cd6e0bc015c98450ef09a99b262e16733540d736cc1aa49bb3679 template_sources: - gemfiles/modular/mutex_m/r3/v0.3.gemfile.example gemfiles/modular/mutex_m/r4/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r4_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 70549316ce07d6f2d9a7a735ddfcdc36bdfa9b2d05ea5fedd0d689c41d7c11e5 + input_fingerprint: 585d7fc13bf9d4cdc31f5c576b48232b2a94716a953a1bbbb9bff93241a0409d template_sources: - gemfiles/modular/mutex_m/r4/v0.3.gemfile.example gemfiles/modular/mutex_m/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_vHEAD_gemfile action: write dest_sha256: '08018641c97f894788fa91b462da504ab2237213d18d95404136c393274ae3cb' - input_fingerprint: f0bb3fe2c4476b8c7c478e26cd09d78b82b5f916b00b04f4d8ef44df5ccbe6e1 + input_fingerprint: 53acc4042e1f51b250fdb1de8a78c258f589d019d7a6317f4ff5cb0d2ad407f2 template_sources: - gemfiles/modular/mutex_m/vHEAD.gemfile.example gemfiles/modular/optional.gemfile: recipe: template_source_application_gemfiles_modular_optional_gemfile action: write dest_sha256: cbb0bd82b56e48e0be4e9059182792d2da3c221bc2d3636da7e640dd0ef0d428 - input_fingerprint: f3666e16181928376945c67ad3d0c2cf5f9b76a638ce2f55eaa3ba54d2aeff8b + input_fingerprint: 408481363e9dae9429b7036eb7a412b314ffca95fcff13d68bb1936adcf1178a template_sources: - gemfiles/modular/optional.gemfile.example gemfiles/modular/rspec.gemfile: recipe: template_source_application_gemfiles_modular_rspec_gemfile action: write dest_sha256: d043f5c9344f6435edb4607c5adaf42c78e7fb6b8b6726007de2bbedefb376c3 - input_fingerprint: c7a901e5d76d7889434b394f4600efa32e382c8c57c17e4066048111e6014e72 + input_fingerprint: 2593f6f2418ee9d2aeb25f81691e3e127ebcb37e057215a4d52b99130b6e8755 template_sources: - gemfiles/modular/rspec.gemfile.example gemfiles/modular/runtime_heads.gemfile: recipe: template_source_application_gemfiles_modular_runtime_heads_gemfile action: write dest_sha256: 6ac7158c4a3088190f2a9082f01439eb27eca2172ab3464b15c9cb045aa885e1 - input_fingerprint: f602a72f12ec803920053f24a018fc69836bd38c5fb2f95e4a7bce2078089720 + input_fingerprint: 18d5cdaefe0b59b0e183ad15a938c4e6582af0f79d521fdea865cf27b288abd8 template_sources: - gemfiles/modular/runtime_heads.gemfile.example gemfiles/modular/stringio/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r2_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 1a25edb97f7bea7b737275d25c7480c124d1ba53a283b5c4c6c910ed75f6fb37 + input_fingerprint: 674375ee8c9efb0ba094328f0a6c9f2c95de8ca745f4b2834b7bda03f32527ff template_sources: - gemfiles/modular/stringio/r2/v3.0.gemfile.example gemfiles/modular/stringio/r3/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r3_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: cfe85e226b64aa040bbdbf9f274af37f880cd784a1d15a8e0dc0249419630a93 + input_fingerprint: 39a41c89700625121dae46f51dd5e9189c91f58548d853d5b6fd808a45d3f5a9 template_sources: - gemfiles/modular/stringio/r3/v3.0.gemfile.example gemfiles/modular/stringio/r4/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r4_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 8a1c855c2e0fc874f104d80c540e444c75522be4a9a077dbde27b3e4b4574b8e + input_fingerprint: e00137d8b5833a97f67d0efb73968272cd446dadbe0f00854ea6aaf4f74a0d74 template_sources: - gemfiles/modular/stringio/r4/v3.0.gemfile.example gemfiles/modular/stringio/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_stringio_vHEAD_gemfile action: write dest_sha256: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - input_fingerprint: 126991bd66750a24ca3475b30fd2dc2571ae74eff64a91f3202b3fab016b9721 + input_fingerprint: 1f2a7f95e5f370059203ee7c80228eaa4e93604540d6b653936c27e169ea41d2 template_sources: - gemfiles/modular/stringio/vHEAD.gemfile.example gemfiles/modular/style.gemfile: recipe: template_source_application_gemfiles_modular_style_gemfile action: write - dest_sha256: 2a3d46dcb8a9394f595f273f5eb0403d0a552837754ab109afc9ba79a7159083 - input_fingerprint: 3fdd07562c661892f60cd47a2fd8258db95700847c68c691be441fc3a034c3fa + dest_sha256: 9a24acff0054573c30f5d84d0418cd465ba3794d075bb5a36801410ac40e0787 + input_fingerprint: b4275adad273f064485ee8e972802569808fb5b9bc8e479b3fb49d6d84faa15b template_sources: - gemfiles/modular/style.gemfile.example gemfiles/modular/style_local.gemfile: recipe: template_source_application_gemfiles_modular_style_local_gemfile action: write dest_sha256: 55eb9c149cdb2f29c9f31abe2d55a4f334e00fb859681dd17c42149a3f28ca36 - input_fingerprint: 9a57a5ba1051b5808d944d51aabd66acb0d98d34d57d6ffbbbe791789d7e3502 + input_fingerprint: f0f29c99e13ee3456765c706be7810ed349616b9c928135c12323e04570be201 template_sources: - gemfiles/modular/style_local.gemfile.example gemfiles/modular/templating.gemfile: recipe: template_source_application_gemfiles_modular_templating_gemfile action: write - dest_sha256: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - input_fingerprint: c2e4591808f0a2ba08f79be9ef51bd8e4f137aba44f6d70997f5e54ae5955856 + dest_sha256: 432ba59798d31b899268257c432443a017c5a9bd2c0c7f9f2216617e14150cd3 + input_fingerprint: b69f4d2cb18146f0b1992745fcfd87f02e443c48e00c4d96c2cd0a3b132d1881 template_sources: - gemfiles/modular/templating.gemfile.example gemfiles/modular/templating_local.gemfile: recipe: template_source_application_gemfiles_modular_templating_local_gemfile action: write - dest_sha256: db07de23b833eb6fa48d5eedd91b23a16b1e3dff827bc52bed69deb6dcf8133a - input_fingerprint: ab8c27450bc7bc9682b10400ccf70fde30ff05d077f6d12668abee40c721cb99 + dest_sha256: 77a385d4064e6595ab61701bdf4f6d1574b83fa59f5910c38543b2221c926b3a + input_fingerprint: b86b18b7024478c1bd98957c64bfc4b286e48547d7a27d5086e8680b7c4e0251 template_sources: - gemfiles/modular/templating_local.gemfile.example gemfiles/modular/webrick/r4/v1.9.gemfile: recipe: template_source_application_gemfiles_modular_webrick_r4_v1_9_gemfile action: write dest_sha256: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea - input_fingerprint: bd6352db229863ef3e65c5d0a59b144cc4881ca1577040d92f75a202667b8b5f + input_fingerprint: 42114295367f6b90ca26870ead413f94c9ff32194b07a9a101e10d55b53c06c3 template_sources: - gemfiles/modular/webrick/r4/v1.9.gemfile.example gemfiles/modular/webrick/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_webrick_vHEAD_gemfile action: write dest_sha256: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b - input_fingerprint: 9f356dd2f94e51bf42ce11922fa69964559ee88ded1d5521ce4ec61a28c15851 + input_fingerprint: 8ad8d0e0f8bccda090bbbfc49836b09d48cec54a4f36079f85fd3a23c828590b template_sources: - gemfiles/modular/webrick/vHEAD.gemfile.example gemfiles/modular/x_std_libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_gemfile action: write dest_sha256: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a - input_fingerprint: c70ca172fe2deb185157e5d8ce9d9cf7fe22b13a56f68cf60fbf13bdcadb7f82 + input_fingerprint: 81166a970d0356ab21e02b5b36fdc24d992ac610853c40a29d715cc33bee436b template_sources: - gemfiles/modular/x_std_libs.gemfile.example gemfiles/modular/x_std_libs/r2/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r2_libs_gemfile action: write dest_sha256: e80ec8ad06cb1b31ac982bc25cf7696987fca131aa1001eaefd0bf5cd379c273 - input_fingerprint: 69eb85817866bc1ed4eb5c2eaecf1b5ee57aabcc1589ce5ea3ef2fa249d8b994 + input_fingerprint: c266147adcac9343a2af465362ad7147563c8fd6cfde18d16db31f2f9ad4976a template_sources: - gemfiles/modular/x_std_libs/r2/libs.gemfile.example gemfiles/modular/x_std_libs/r3.1/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_1_libs_gemfile action: write dest_sha256: 9f8565c40b09bea1bc4c2e2ad87fe11400c3c51a2b235655bfcd8e491ed88ca8 - input_fingerprint: 3bcfe2d3d78f0da30aef41f71d34c19f282cda03f035d12ab57d28c3e739e116 + input_fingerprint: 7a9c10a0df45088af06e5a7a297de89e3b82635f6fc8ffb9d7b2f2f19029c7b5 template_sources: - gemfiles/modular/x_std_libs/r3.1/libs.gemfile.example gemfiles/modular/x_std_libs/r3/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_libs_gemfile action: write dest_sha256: 546f8849f4267bb19aa10ff0de40be30957197f229e6887847181ea9127b2650 - input_fingerprint: d058f67ded50369c4c6ee3f93eb186fd100a533a8ac7eaf365a092c95d91d8e6 + input_fingerprint: bef66f8bd89b2071b797ce90040186f942d6fe15122ca203f822fa903f853518 template_sources: - gemfiles/modular/x_std_libs/r3/libs.gemfile.example gemfiles/modular/x_std_libs/r4/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r4_libs_gemfile action: write dest_sha256: 8c2582eaa218d216b98c86c933465295c8b4e43f3251ea388b9eaf6e471f8da6 - input_fingerprint: 4511cb931070d7d9cedd3b155436890adbc4eee98e87d5619c2d012a85056258 + input_fingerprint: 4a8c735cdf65b19c84f555d7dd58735e2c4f6d2aac240b382c9d35b72c6136f9 template_sources: - gemfiles/modular/x_std_libs/r4/libs.gemfile.example gemfiles/modular/x_std_libs/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_vHEAD_gemfile action: write dest_sha256: d3133ec4c0638363a7fb025d19be7e95a615fd61c35ddb8d17f2280ee74a7486 - input_fingerprint: bf4a64c210d3c4e5da4a157b1210be6648482847282d73258205f78e4b49957d + input_fingerprint: c493a211861d99ba06526375cf21f65f0ea2703b5983254f1fd867b225d24a97 template_sources: - gemfiles/modular/x_std_libs/vHEAD.gemfile.example lib/rbs/merge/version.rb: recipe: template_source_application_lib_rbs_merge_version_rb action: write - dest_sha256: bbd63d721b1bdf24bfe787d95e48ec8e4d97abbfde88c1c310a730f018a6bef5 - input_fingerprint: feb72af301de62095e412121056b6b6c0e0e0e9683914372168ef0550485c2b0 + dest_sha256: 3205c863dd2bed4298acc44797db24a0d30276a57ace4608dd33fc29b82aca4a + input_fingerprint: 69138446094e5d42d1f4702176c42810fd5e70da0580dc8c024eb5267c0e5d79 template_sources: - lib/gem/version.rb.example mise.toml: recipe: template_source_application_mise_toml action: write dest_sha256: 7d267154ca4f081b0ac7da804c0180c2b091aec5f1c877417c1c320f4f369c88 - input_fingerprint: 42b78977837314c283e1233d30a4bb77d8f783ccdcd690435d6bc99052ad228e + input_fingerprint: 20fb8cdd72d7a517b1d25a0217a476e7014a501030198032266108bf8c8fce9b template_sources: - mise.toml.no-osc.example rbs-merge.gemspec: recipe: template_source_application_rbs_merge_gemspec action: write - dest_sha256: 5c9dccdf250c774da19846b918f1e55ae75a08cac505b77ebb2149de59dc24d1 - input_fingerprint: b292ab25f0c629f3c0a9c25e52cf8ff8ef0c51f1fe23ae1d5289b8a4c41692a5 + dest_sha256: 71c3c488640ec3dab23c5332b040ba9b946fea35c3a2f51204963c2d484f590f + input_fingerprint: 2e519c66247d6a61ebab80028f72a375c93550344312d0887b2963bde2449180 template_sources: - gem.gemspec.example sig/rbs/merge.rbs: recipe: template_source_application_sig_rbs_merge_rbs action: write dest_sha256: 7e57eeb4d100a99948eca2084404dd7ae3cc352e8f6e936130a3e4a1dfb21a73 - input_fingerprint: 06716105fcc18589c904a6e8a7c8894687261b1d71bce8d3ad8deda1ae93028d + input_fingerprint: 697168c68356c11d24f26195e25cebdf9b9e7121c54e7cf593dffe6d615cad11 template_sources: - sig/gem.rbs.example spec/spec_helper.rb: recipe: template_source_application_spec_spec_helper_rb action: write dest_sha256: 2ff203370f5805b5f53e7b343f9fe4ecce624d875489a8b01e465924e3d2e6b7 - input_fingerprint: c646cbb4a1ebe41de3a63082dd9a707cfdc9bf77498988b800b40b05b59e42cd + input_fingerprint: 888bd3cc6708c0ef6b9cc221930990069ece553ed424527acf80ac0b671d88a9 template_sources: - spec/spec_helper.rb.example diff --git a/gems/rbs-merge/Gemfile b/gems/rbs-merge/Gemfile index 31c298acf..3d72fa5bf 100644 --- a/gems/rbs-merge/Gemfile +++ b/gems/rbs-merge/Gemfile @@ -19,7 +19,7 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } # Include dependencies from rbs-merge.gemspec gemspec -gem 'kettle-family', '~> 1.2', '>= 1.2.97' +gem 'kettle-family', '~> 1.2', '>= 1.2.100' # Local workspace dependency wiring for *_local.gemfile overrides gem 'nomono', '~> 1.1', '>= 1.1.5', require: false # ruby >= 3.2.0 diff --git a/gems/rbs-merge/Gemfile.lock b/gems/rbs-merge/Gemfile.lock index 78890f000..a6511ca1f 100644 --- a/gems/rbs-merge/Gemfile.lock +++ b/gems/rbs-merge/Gemfile.lock @@ -10,132 +10,132 @@ GIT PATH remote: . specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) + rbs-merge (7.1.9) + ast-merge (= 7.1.9) rbs (>= 3.10) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) + ast-crispr-markdown-markly (7.1.9) + ast-crispr (= 7.1.9) + markdown-merge (= 7.1.9) + markly-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism specs: - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) + ast-crispr-ruby-prism (7.1.9) + ast-crispr (= 7.1.9) + prism-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) + ast-crispr (7.1.9) + ast-merge (= 7.1.9) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ast-merge-git (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: - ast-merge (7.1.8) + ast-merge (7.1.9) benchmark token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) + ast-template (7.1.9) + ast-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + bash-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + binary-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) + citrus-toml-merge (7.1.9) + ast-merge (= 7.1.9) + toml-merge (= 7.1.9) toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge specs: - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) commonmarker (~> 2.2) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) + dotenv-merge (7.1.9) + ast-merge (= 7.1.9) + plain-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + go-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + html-merge (7.1.9) + ast-crispr (= 7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + json-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: - kettle-jem (7.1.25) + kettle-jem (7.1.26) addressable (>= 2.8, < 3) ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) @@ -169,113 +169,113 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge specs: - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown (~> 2.5) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + markdown-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) + markly-merge (7.1.9) + markdown-merge (= 7.1.9) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge specs: - parslet-toml-merge (7.1.8) + parslet-toml-merge (7.1.9) toml (~> 0.3) - toml-merge (= 7.1.8) + toml-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + plain-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) + prism-merge (7.1.9) + ast-merge (= 7.1.9) prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + psych-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) + yaml-merge (= 7.1.9) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + rust-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) + smorg-rb (7.1.9) + ast-merge (= 7.1.9) + ast-merge-git (= 7.1.9) + bash-merge (= 7.1.9) diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) + dotenv-merge (= 7.1.9) + go-merge (= 7.1.9) + html-merge (= 7.1.9) + json-merge (= 7.1.9) kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) + markdown-merge (= 7.1.9) + plain-merge (= 7.1.9) + prism-merge (= 7.1.9) + psych-merge (= 7.1.9) + rbs-merge (= 7.1.9) + rust-merge (= 7.1.9) + toml-merge (= 7.1.9) + typescript-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + toml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: - tree_haver (7.1.8) + tree_haver (7.1.9) citrus (~> 3.0) parslet (~> 2.0) tree_sitter_language_pack (>= 1.16.2, < 2.0) @@ -284,25 +284,25 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + typescript-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + yaml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) + zip-merge (7.1.9) + binary-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) GEM @@ -336,6 +336,8 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) + commonmarker (2.10.0) + rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -465,11 +467,15 @@ GEM lint_roller (1.1.0) logger (1.7.0) markly (0.19.0) + mini_portile2 (2.8.9) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) reline (~> 0.6) mutex_m (0.3.0) + nokogiri (1.19.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-musl) @@ -503,6 +509,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) + rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -696,6 +705,9 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_sitter_language_pack (1.16.2) + rb_sys (>= 0.9.130, < 0.10) + sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -784,9 +796,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.31) + kettle-dev (~> 3.0, >= 3.0.34) kettle-drift (~> 1.0, >= 1.0.13) - kettle-family (~> 1.2, >= 1.2.97) + kettle-family (~> 1.2, >= 1.2.100) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) @@ -806,12 +818,12 @@ DEPENDENCIES reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) - rubocop-lts (~> 24.2, >= 24.2.1) - rubocop-lts-rspec (~> 1.0, >= 1.0.5) + rubocop-lts (~> 24.2, >= 24.2.3) + rubocop-lts-rspec (~> 1.0, >= 1.0.6) rubocop-minitest (~> 0.40, >= 0.40.0) rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! - rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) ruby-merge! ruby-progressbar (~> 1.13) rust-merge! @@ -842,33 +854,34 @@ CHECKSUMS appraisal2 (3.2.3) sha256=3a6cfaf8a444e02707b9a34154af1c4902fbe99d9d2168d7e81dd83ec77e6db7 appraisal2-rubocop (1.0.2) sha256=1dae97c1be087cf9c098a3a72fd41f873435e9b8b39687e633b36c9ccb22bff4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.8) - ast-crispr-markdown-markly (7.1.8) - ast-crispr-ruby-prism (7.1.8) - ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) + ast-crispr (7.1.9) + ast-crispr-markdown-markly (7.1.9) + ast-crispr-ruby-prism (7.1.9) + ast-merge (7.1.9) + ast-merge-git (7.1.9) + ast-template (7.1.9) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.8) + bash-merge (7.1.9) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) - bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae + binary-merge (7.1.9) + bundler (4.1.0.beta1) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.8) + citrus-toml-merge (7.1.9) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 + commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e commonmarker (2.10.0-x86_64-darwin) sha256=01e0830ed0319825ecdc16411c90acd3f661d1568dfc178731b3f64d0ce2363d commonmarker (2.10.0-x86_64-linux) sha256=945c510c0bfca9022245928e2248468fe3ddad58c939be0c37b20082cc392880 commonmarker (2.10.0-x86_64-linux-musl) sha256=288cd4fb9f17eed2ffa73551ef241dcf594e0f484b2aee2a0999540333c0618e - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) completely (0.8.0) sha256=e493cd5d84805f47917a41f277ecbfe5f35363bed670be5a957d3acaed8c6c5e concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 @@ -877,7 +890,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docopt_ng (0.7.1) sha256=a024148ee4fa3ab1a8a04411aa4370f39cf2b446e63562097d418b7974a15667 - dotenv-merge (7.1.8) + dotenv-merge (7.1.9) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -890,35 +903,37 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) + go-merge (7.1.9) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) + html-merge (7.1.9) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a - json-merge (7.1.8) - kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + json-merge (7.1.9) + kettle-changelog (1.0.7) + kettle-dev (3.0.34) + kettle-drift (1.0.13) kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 - kettle-jem (7.1.25) + kettle-jem (7.1.26) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 - kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd + kettle-soup-cover (3.0.10) kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 - markdown-merge (7.1.8) + markdown-merge (7.1.9) markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca - markly-merge (7.1.8) + markly-merge (7.1.9) + mini_portile2 (2.8.9) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 + nokogiri (1.19.4) nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af nokogiri (1.19.4-arm64-darwin) sha256=a46db9853286e6597b36ebc6953817d15acf3a299583eb3f89fdc6f91dd63527 @@ -932,20 +947,22 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) - plain-merge (7.1.8) + parslet-toml-merge (7.1.9) + plain-merge (7.1.9) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.8) + prism-merge (7.1.9) psych (5.5.0) sha256=4b245bbbd0f3238df8ccee766ebc1a6b062b10e4ee1d3284eb588739ba156a0a - psych-merge (7.1.8) + psych-merge (7.1.9) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 - rbs-merge (7.1.8) + rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -981,11 +998,11 @@ CHECKSUMS rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.8) + ruby-merge (7.1.9) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) + rust-merge (7.1.9) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -993,7 +1010,7 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) + smorg-rb (7.1.9) sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1009,10 +1026,11 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.8) + toml (0.3.0) + toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb - tree_haver (7.1.8) + tree_haver (7.1.9) + tree_sitter_language_pack (1.16.2) tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 @@ -1022,12 +1040,12 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) + typescript-merge (7.1.9) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 yaml-converter (0.2.5) sha256=a5214fe1a6c2df88bd34a35bcded1b1dcd30135548130df2e03b54ca8c0f2423 - yaml-merge (7.1.8) + yaml-merge (7.1.9) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.8) sha256=73d935d43e3479d65ce8aff25c7d3100e8bb83528a2adaa0ed824e5046ac99e7 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -1036,8 +1054,8 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) + zip-merge (7.1.9) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH - 4.0.20 + 4.1.0.beta1 diff --git a/gems/rbs-merge/Rakefile b/gems/rbs-merge/Rakefile index 54d3b4ad9..e3857f8fe 100644 --- a/gems/rbs-merge/Rakefile +++ b/gems/rbs-merge/Rakefile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -# rbs-merge Rakefile v7.1.18 - 2026-09-07 +# rbs-merge Rakefile v7.1.26 - 2026-09-09 # Ruby 2.3 (Safe Navigation) or higher required # # See LICENSE.md for license information. diff --git a/gems/rbs-merge/bin/rubocop-gradual b/gems/rbs-merge/bin/rubocop-gradual new file mode 100755 index 000000000..7c7ff0635 --- /dev/null +++ b/gems/rbs-merge/bin/rubocop-gradual @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'rubocop-gradual' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'rubygems' +require 'bundler/setup' + +load Gem.bin_path('rubocop-gradual', 'rubocop-gradual') diff --git a/gems/rbs-merge/gemfiles/modular/coverage_local.gemfile b/gems/rbs-merge/gemfiles/modular/coverage_local.gemfile index 37917caac..d6c890e46 100644 --- a/gems/rbs-merge/gemfiles/modular/coverage_local.gemfile +++ b/gems/rbs-merge/gemfiles/modular/coverage_local.gemfile @@ -29,11 +29,31 @@ Kernel.send(:gem, 'nomono', *nomono_activation_requirements) require 'nomono/bundler' local_gems = %w[kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -local_gems_to_eval = local_gems - %w[] - declared_gems # export KETTLE_DEV_DEV=/path/to/my platform :mri do + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + local_gems_to_eval = local_gems - %w[] - declared_gems + eval_nomono_gems( gems: local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/rbs-merge/gemfiles/modular/style.gemfile b/gems/rbs-merge/gemfiles/modular/style.gemfile index 59c5dc1a3..41ec99454 100644 --- a/gems/rbs-merge/gemfiles/modular/style.gemfile +++ b/gems/rbs-merge/gemfiles/modular/style.gemfile @@ -24,9 +24,9 @@ platform :mri do if ENV.fetch('RUBOCOP_LTS_DEV', 'false').casecmp('false').zero? declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) - gem 'rubocop-lts', '~> 24.2', '>= 24.2.1' unless declared_gems.include?('rubocop-lts') - gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.5' unless declared_gems.include?('rubocop-lts-rspec') - gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.6' unless declared_gems.include?('rubocop-ruby3_2') + gem 'rubocop-lts', '~> 24.2', '>= 24.2.3' unless declared_gems.include?('rubocop-lts') + gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.6' unless declared_gems.include?('rubocop-lts-rspec') + gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.8' unless declared_gems.include?('rubocop-ruby3_2') else eval_gemfile('style_local.gemfile') end diff --git a/gems/rbs-merge/gemfiles/modular/templating.gemfile b/gems/rbs-merge/gemfiles/modular/templating.gemfile index 6af159bd7..ce51a08ed 100644 --- a/gems/rbs-merge/gemfiles/modular/templating.gemfile +++ b/gems/rbs-merge/gemfiles/modular/templating.gemfile @@ -18,7 +18,7 @@ end if structuredmerge_remote # Merge recipes for released installs. - gem 'kettle-jem', '>= 7.0' + gem 'kettle-jem', '~> 7.1', '>= 7.1.26' end if kettle_remote diff --git a/gems/rbs-merge/gemfiles/modular/templating_local.gemfile b/gems/rbs-merge/gemfiles/modular/templating_local.gemfile index 92fb8e26a..14372fc5d 100644 --- a/gems/rbs-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/rbs-merge/gemfiles/modular/templating_local.gemfile @@ -65,9 +65,7 @@ structuredmerge_local_gems = %w[ kettle_dev_local_gems = %w[ kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift ] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[] -kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - (declared_gems - %w[kettle-dev]) if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( @@ -81,6 +79,28 @@ if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 end if ENV.fetch('KETTLE_DEV_DEV', 'false').casecmp('false') != 0 + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - declared_gems + eval_nomono_gems( gems: kettle_dev_local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/rbs-merge/rbs-merge.gemspec b/gems/rbs-merge/rbs-merge.gemspec index 5757bf9a1..ec4f0bccf 100644 --- a/gems/rbs-merge/rbs-merge.gemspec +++ b/gems/rbs-merge/rbs-merge.gemspec @@ -121,7 +121,7 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.31') # ruby >= 4.0.0 + spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.34') # ruby >= 4.0.0 # Security spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 From e41977da4609c491637f238415e07c619b5203b2 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 23:50:46 -0400 Subject: [PATCH 084/137] =?UTF-8?q?=F0=9F=8E=A8=20Template=20json-merge=20?= =?UTF-8?q?by=20kettle-family?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/json-merge/.kettle-drift.lock | 76 ++++- gems/json-merge/.rubocop_gradual.lock | 7 +- .../.structuredmerge/kettle-jem.lock | 145 ++++----- gems/json-merge/Gemfile | 2 +- gems/json-merge/Gemfile.lock | 304 ++++++++++-------- gems/json-merge/Rakefile | 2 +- gems/json-merge/bin/rubocop-gradual | 16 + .../gemfiles/modular/coverage_local.gemfile | 24 +- .../json-merge/gemfiles/modular/style.gemfile | 6 +- .../gemfiles/modular/templating.gemfile | 2 +- .../gemfiles/modular/templating_local.gemfile | 24 +- gems/json-merge/json-merge.gemspec | 2 +- 12 files changed, 380 insertions(+), 230 deletions(-) create mode 100755 gems/json-merge/bin/rubocop-gradual diff --git a/gems/json-merge/.kettle-drift.lock b/gems/json-merge/.kettle-drift.lock index 98b009e1e..1b23f4793 100644 --- a/gems/json-merge/.kettle-drift.lock +++ b/gems/json-merge/.kettle-drift.lock @@ -1,10 +1,82 @@ { + "debug_env: 'KETTLE_DEV_DEBUG',\nroot: %w[src my kettle-dev]": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 46, + 63 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 93, + 110 + ] + } + ], + "path_env: 'KETTLE_DEV_DEV',\nvendored_gems_env: 'VENDORED_GEMS',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 43, + 60 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 90, + 107 + ] + } + ], + "prefix: 'KETTLE_DEV',\npath_env: 'KETTLE_DEV_DEV',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 42, + 59 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 89, + 106 + ] + } + ], + "vendor_gem_dir_env: 'VENDOR_GEM_DIR',\ndebug_env: 'KETTLE_DEV_DEBUG',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 45, + 62 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 92, + 109 + ] + } + ], "vendored_gems_env: 'VENDORED_GEMS',\nvendor_gem_dir_env: 'VENDOR_GEM_DIR',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 44, + 61 + ] + }, { "file": "gemfiles/modular/templating_local.gemfile", "lines": [ - 77, - 88 + 75, + 91, + 108 ] } ] diff --git a/gems/json-merge/.rubocop_gradual.lock b/gems/json-merge/.rubocop_gradual.lock index be77c30af..18a22af88 100644 --- a/gems/json-merge/.rubocop_gradual.lock +++ b/gems/json-merge/.rubocop_gradual.lock @@ -2,7 +2,7 @@ ".simplecov:3227426949": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] ], - "Rakefile:2283987869": [ + "Rakefile:876452158": [ [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], [81, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], [165, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], @@ -22,6 +22,9 @@ [1, 1, 0, "Naming/FileName: The name of this source file (`vHEAD.gemfile`) should use snake_case.", 5381], [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], + "gemfiles/modular/coverage_local.gemfile:2813372128": [ + [34, 1, 1586, "Metrics/BlockLength: Block has too many lines. [37/25]", 820328175] + ], "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], @@ -87,7 +90,7 @@ [1, 1, 0, "Naming/FileName: The name of this source file (`vHEAD.gemfile`) should use snake_case.", 5381], [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] ], - "json-merge.gemspec:656856673": [ + "json-merge.gemspec:346553636": [ [16, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1168797721], [137, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4147388508], [148, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], diff --git a/gems/json-merge/.structuredmerge/kettle-jem.lock b/gems/json-merge/.structuredmerge/kettle-jem.lock index 40fad51ca..e7ee742b8 100644 --- a/gems/json-merge/.structuredmerge/kettle-jem.lock +++ b/gems/json-merge/.structuredmerge/kettle-jem.lock @@ -1,11 +1,12 @@ --- version: 1 template_state: - version: 7.1.18 - applied_at: '2026-09-07' + version: 7.1.26 + applied_at: '2026-09-10' changelog_replay: last_entry_key: kettle-jem-template-20260802-001 last_entry_date: '2026-08-02' + maintenance_changelog: {} checksums: ".aiignore.example": 48a5dfdd93afd1a15fdce39cc28ca9920263f00018b0968ab031fa744521e5ce ".config/mise/env.sh": aeea5a2ab489ba6e5467ae8de6e386ec8c8fe4ff31a044e69d0cd6a092dd6654 @@ -75,7 +76,7 @@ template_state: ".rubocop_rspec.yml.example": 288ad75e7eb14d87d80fafe6f7272217be5c57547536ee56c780a7d10ac7ec74 ".simplecov.example": 222f2e6ce8cf089c70a21f0f5e5423d4bd59a96fdb2ce7754b0fb3d6f430c229 ".structuredmerge/git-drivers.toml.example": 9d241a44c9edffcdbd3da018fa188a238089c3d1635040924df594a6929a4f97 - ".structuredmerge/kettle-jem.yml.example": 26949dc4ee0722415e72452cbc186bee6ef7b154eae33166d36f3fdb1ca6e46d + ".structuredmerge/kettle-jem.yml.example": ff65a738da1af7d60714026a81d3323a46c864e96ae3570b806afdf6e7149ff9 ".yard-lint.yml.example": 90def46867c9436b4e177c47d91fc8165f4602e335715aecc39f5587ae20b55b ".yardignore.example": 821f453c609df7d46145d675424b39dfbe6dfdca8edac5f367b85fff48502455 ".yardopts.example": 6fd6f2701713096a8a9ea095c213bbc68eeef37797c4754d97837e3229a3a5f6 @@ -88,7 +89,7 @@ template_state: CHANGELOG.transfer.md: 21331d8a9e58b4ff6e088b88eb408bcccb0f2f64e78f8f4d42ac3f11a24baad8 CITATION.cff.example: e404ea0a7919d78a83d53d80e211d17b9663576aa606583b709795dc023fd75c CODE_OF_CONDUCT.md.example: f1ad532f1860f73ef774c6b27a26d41f4bc1cb8813034f5957487766ebb0986b - CONTRIBUTING.md.example: 22570cfb3dde72be79b4b522b6d5ab13f95d778e40444483a096871fe0891b19 + CONTRIBUTING.md.example: 8d23cce2d061e0c20d619c3f66591df5f32821cd84c32d171df0b8ebe1217a55 FUNDING.md.example: 392d047904b1557b29f4b43d37ec403b7480edd5b6ab51180be979b57a91e6ba FUNDING.md.no-osc.example: 3ef0258dd3e3b7f7e17e8bc2d20dcbcb3e74aa5a5a6f51297075696645e34c77 Gemfile.example: 99500023987e81775a9b5ef14e92cb3992f2ac408e5f42454f2728eee9b49fb2 @@ -99,19 +100,19 @@ template_state: PolyForm-Small-Business-1.0.0.md.example: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 README.md.example: 21f491e3d73bfc1b74056a6dcba61f72c93dee3cfe5272ac164a20978454de21 REEK: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - RUBOCOP.md.example: c09e5533ccc59b70a2efa05c99f66e521137c1053d3c12eb43509cebd5b68b0e + RUBOCOP.md.example: d99871a0e4c1d323c92e7febf328f062bb4722069b2abfd0a83bf7daa8dcbf8c Rakefile.example: 569803e726b07ea26267fec6891367a3096a0dff3c266269a7081d36afe496af SECURITY.md.example: ee9411aa85f36d88363fdaea7a1baea4362b6ec112cf2688e711b05de1d3144c bin/setup.example: 0ac35089c95a91d8973fe7a318bf9fd98b9f8e00db92c5d9ca6cd858abb8d41b certs/pboling.pem.example: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - gem.gemspec.example: 83e834e8958a88e4817a57199f48f5ebb245548ce251c5c47372208693f03b17 + gem.gemspec.example: 12dcadc0b297ccd4e18b9d1e538b98ac8330ef9fb2a059ed6754ad59272b77fa gemfiles/modular/benchmark/r4/v0.5.gemfile.example: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 gemfiles/modular/benchmark/vHEAD.gemfile.example: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 gemfiles/modular/cgi/r4/v0.5.gemfile.example: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 gemfiles/modular/cgi/vHEAD.gemfile.example: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 gemfiles/modular/changelog.gemfile.example: 892598e0e7792eb205247ae28128cef6dfc647d2fb33968969152230d6f69288 gemfiles/modular/coverage.gemfile.example: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - gemfiles/modular/coverage_local.gemfile.example: 928d5f260d7b119c038baa56da9fb78dd524dee613aea33ab72894bbce5c506e + gemfiles/modular/coverage_local.gemfile.example: 92ea0d7a9d693553dc614afa2c43990f5c3778c2b00ef6c528e122c31bd506a1 gemfiles/modular/debug.gemfile.example: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 gemfiles/modular/documentation.gemfile.example: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c gemfiles/modular/documentation_local.gemfile.example: 84a20f5d4b0feb94c2cf2f7a8dce8f682f1483498e41484c2b447a5661fd1870 @@ -145,10 +146,10 @@ template_state: gemfiles/modular/stringio/r3/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/r4/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/vHEAD.gemfile.example: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - gemfiles/modular/style.gemfile.example: 3ad0585b4f2db8918580ca41ea8723f7a166d7a83cfd7f9613511094997106fd + gemfiles/modular/style.gemfile.example: 02fe3e8fd00e49b90c3ab30e19b51014ee50490f3eadcfd1d4a39f4c2c997dda gemfiles/modular/style_local.gemfile.example: c86beb711e766126a5be68be4be18255831625ac3650d5069383c4a83a9511f3 - gemfiles/modular/templating.gemfile.example: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - gemfiles/modular/templating_local.gemfile.example: 930057d3b909a72e39a39125c4e883a7ff71f5691e64426c0541f8c8fc75b83f + gemfiles/modular/templating.gemfile.example: 2b33c094677b53ad9dd2eafeb3a3be452f612380c61001a2e75b3c078b8ff72a + gemfiles/modular/templating_local.gemfile.example: ac7259516e69ffafb8b9342a897ddf6042adc46335743f474c342509cefd8f2e gemfiles/modular/webrick/r4/v1.9.gemfile.example: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea gemfiles/modular/webrick/vHEAD.gemfile.example: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b gemfiles/modular/x_std_libs.gemfile.example: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a @@ -175,7 +176,7 @@ template_state: shim/Gemfile.example: 0fb0d9d06fcfb1fd6ca6f0eeb5867253ca1ed221e03d28027719225f868b0637 shim/README.md.example: 3a2f7211b7f92a1dfae5e523b8e34b051a3d8af942144b05286eca0b3c8f6fbe shim/Rakefile.example: 572c94da7052083b39b62a6600785419e314a109efd7a3d8c3a96eb77ad34fd1 - shim/gem.gemspec.example: efae033238e4fd1355cfc134f5c9123f175d1ad1dc4a1a2e663899788c9e0870 + shim/gem.gemspec.example: 14a7015b3328005d1c3b5fda6886bd6da383707745f6eaaa781d6f9689600131 shim/lib/compat_require.rb.example: 94ee85e353a3ca08c8a35c9063d4ff789214ea594c7f803f6cf09d7142f48379 shim/lib/entrypoint.rb.example: dd57613520daca01d6f6bcaa9b83b00ff74505240dc04b84ceb686df3c0539d7 shim/lib/version.rb.example: 15e219ac3a928b5580035f891e415551213175020f1131f6e7ca0ccd55a1b2d6 @@ -189,370 +190,370 @@ files: recipe: template_source_application_simplecov action: write dest_sha256: e94e37b9369dac3759bec723ab0ed7f214bd4a5c304fe6265a2b12febd7b29c0 - input_fingerprint: 689d040a408b3014e47669056134748b59553620f72f06a384ab529f06b39b12 + input_fingerprint: af4a7f5171057486d9d40de306ab1f5f2a4e70e94b5f9dd0acc0672bc95dde17 template_sources: - ".simplecov.example" AGPL-3.0-only.md: recipe: template_source_application_AGPL_3_0_only_md action: write dest_sha256: d8a6cc31abc16b6748c7a21f21611f5a1ec33f67d22ca23d7da1c19b95496bee - input_fingerprint: 25388adc919dc805d1aac0e4ea174cb38e4105ba984ed296f54f6165d024dc36 + input_fingerprint: 0d07e8a62b22b9cae4d368290069e6a63d1f51b69a2a3af56a3ba76261b53789 template_sources: - AGPL-3.0-only.md.example Gemfile: recipe: template_source_application_Gemfile action: write - dest_sha256: 6c68aa0b16bf53b9cb4c441fd17aac358ed52182e721be11853d52e4714dd51b - input_fingerprint: 2ee454b033acba07ecb97f6410672b16aba92185813bc8f1f4309eedb76f02c0 + dest_sha256: 5f97528bdb267a0c7cb8719e309b758106599d525a7a386c2dfdcab81dce3372 + input_fingerprint: 9471b9d5fb8a85210f020f8c06284dc6d7d26d8c8ce51abb0d2f3d732d6084f4 template_sources: - Gemfile.example LICENSE.md: recipe: template_source_application_LICENSE_md action: write dest_sha256: f6188bfd474a636d2a526420ebb411250faa447d94c9b9ccee097128ce4101b5 - input_fingerprint: ae82aab3f6cbde6955411d1759ed4d474e61df362e28647cb5b1192a8a058c6d + input_fingerprint: 25eb386f846c883bbbfaff893fdbeae76298b844de0b806a1ea2b526643133fa template_sources: - LICENSE.md.example PolyForm-Small-Business-1.0.0.md: recipe: template_source_application_PolyForm_Small_Business_1_0_0_md action: write dest_sha256: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 - input_fingerprint: d39bc00fd67ff95723b57e8edfd9454e941f66e1eee500ed7ec399445989d481 + input_fingerprint: 42e4639d8ea4565f82b35b3de4246f8659f5fdc78fc4cf03939928381d385441 template_sources: - PolyForm-Small-Business-1.0.0.md.example README.md: recipe: template_source_application_README_md action: write dest_sha256: 811a0447239a1ee8eef87887e8e8dfbc1570c1d100beea9b3c5fb75937fe59fe - input_fingerprint: a4b2fbbbe846d911c41ebfe5b6a54713c055c6c3c610a443d6f84c7f64cdfe3b + input_fingerprint: c638ef086e7abecb0ceca0768b31506f7fcb9a963ca3aa201567af00887861b1 template_sources: - README.md.example Rakefile: recipe: template_source_application_Rakefile action: write - dest_sha256: 3c0851045da2fa376cbfb5b259d830678fbb4ad54d7151d73d1d06b1fce2112f - input_fingerprint: 2ea945c0cc7125754e6511d979622cb25bbe72b920ed280ef5b6ee99b247f396 + dest_sha256: 10aeeee69eb3f18407b041d4102c4b159f0b933b5d1c84d626ead2c85c4a460f + input_fingerprint: b00a4627b8c9169b400ab342c541ef575793e69dc116a7d0f457bd3eff37975d template_sources: - Rakefile.example certs/pboling.pem: recipe: template_source_application_certs_pboling_pem action: write dest_sha256: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - input_fingerprint: 9b068675bfe0576ddf8e283b1e5fe10ed320c62710aae1288665512ba83da78b + input_fingerprint: 6d56405ad954b185e27b099e587437a708acac9953b48409bf48aa31eeafeea8 template_sources: - certs/pboling.pem.example gemfiles/modular/benchmark/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_r4_v0_5_gemfile action: write dest_sha256: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 - input_fingerprint: 2815a970ffa3df34a15b2ca39c77c906730774ba5cade65d7cf6745ab3f878a7 + input_fingerprint: b060fc90ef58404462a58889b7c5d3680876a6787dcf05a0fb3f7757280fd8c8 template_sources: - gemfiles/modular/benchmark/r4/v0.5.gemfile.example gemfiles/modular/benchmark/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_vHEAD_gemfile action: write dest_sha256: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 - input_fingerprint: df487137a63ac232fd68ca96eac890deace34ca4bbdd88b295b363e289f3ff64 + input_fingerprint: 0c63f5453ed9cb3bc59d29e880c922799741718b1b1ce610e5ccbe5a0a5ce00b template_sources: - gemfiles/modular/benchmark/vHEAD.gemfile.example gemfiles/modular/cgi/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_cgi_r4_v0_5_gemfile action: write dest_sha256: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 - input_fingerprint: 1915d0411635103d202ef764595ab595f5ebaa2b7940d50259f0d438b39c0a97 + input_fingerprint: 036de38a754bade2d353713c8c9ae652e1c2cfae74b0afd3c27ad9711fd6055d template_sources: - gemfiles/modular/cgi/r4/v0.5.gemfile.example gemfiles/modular/cgi/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_cgi_vHEAD_gemfile action: write dest_sha256: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 - input_fingerprint: d5bfa1bae8a91814b4a7fabd0b6c2fa33f882668c5b9f1c3f44504620663610d + input_fingerprint: a415330bc320cc3c8436dccdd0c3b1f30cb2b537938f48397760c742ea300edb template_sources: - gemfiles/modular/cgi/vHEAD.gemfile.example gemfiles/modular/changelog.gemfile: recipe: template_source_application_gemfiles_modular_changelog_gemfile action: write dest_sha256: da669526144fbff33aef207db9541b6fd6c254437f94dec2fab70fc55a7757cd - input_fingerprint: 652598b6c9e2d39f18ca4b02351c62860bb7dab7685dc04d7fbe58377563b836 + input_fingerprint: c0a67bb574b2a950bcc84f080733eb3437d3d90206a4fd9b1e87f316b4fd8891 template_sources: - gemfiles/modular/changelog.gemfile.example gemfiles/modular/coverage.gemfile: recipe: template_source_application_gemfiles_modular_coverage_gemfile action: write dest_sha256: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - input_fingerprint: fc479d80500cba8c381fa49aed7c5a7a3f1d4bdf9b73b3b19035adca8038ed23 + input_fingerprint: 3e95532d37b00433f4570ab512e8b606ddbea288490e8ac1ff262b17cdadabc9 template_sources: - gemfiles/modular/coverage.gemfile.example gemfiles/modular/coverage_local.gemfile: recipe: template_source_application_gemfiles_modular_coverage_local_gemfile action: write - dest_sha256: 2b493414df06261ba8acb6f0eb18bf3fdd701d7cb5f967a9d15a3f42a4741827 - input_fingerprint: 2b7534e2c67ee8202c446bd6669b9e2b67593a2a6c8dcba9a08ff92cf8f9ffd3 + dest_sha256: 92c9a599c8f6867ec532880f73568f2736ac05d8973ec524b42fd5dbe6aeda3e + input_fingerprint: 7c92d97b2c47898a942aefb0c1ce0e9a0fa1b181f3ec77c0c96e59f253c33277 template_sources: - gemfiles/modular/coverage_local.gemfile.example gemfiles/modular/debug.gemfile: recipe: template_source_application_gemfiles_modular_debug_gemfile action: write dest_sha256: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 - input_fingerprint: 35cea600aae1031ba932feda0e2e103ad37913085eb27085003cec30b21477a9 + input_fingerprint: 2989cbea14dd0c176887f91099463e01b82e43bd7d824bf7a260d26246845d32 template_sources: - gemfiles/modular/debug.gemfile.example gemfiles/modular/documentation.gemfile: recipe: template_source_application_gemfiles_modular_documentation_gemfile action: write dest_sha256: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c - input_fingerprint: 6e9d6b6bba7863bddb08ab01a420ae2078f7ff0ef15abbcff51e015ff0da8f11 + input_fingerprint: 1e6f9bdda3891644257e2766786d1ac3149e9d2116ad679d2080ee9a48b02d9a template_sources: - gemfiles/modular/documentation.gemfile.example gemfiles/modular/documentation_local.gemfile: recipe: template_source_application_gemfiles_modular_documentation_local_gemfile action: write dest_sha256: 2058173855b9a4acc6d5efa20520e49734243eef6cf0b5e9063e0e5866a08e9c - input_fingerprint: ce334a81d30333f147905210e998ab8b9979be6d5ffd32f508f6181e802d1b0c + input_fingerprint: 327d483787e8a723d8412ac5a5c3907e380f4d3a3b4035453744b7226c6b4554 template_sources: - gemfiles/modular/documentation_local.gemfile.example gemfiles/modular/erb/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r2_v3_0_gemfile action: write dest_sha256: 3793e7dc9ef23a7ccd893d48cbba092fd27594c63e65cca011cc658218425670 - input_fingerprint: 74dcf7550b79e533323797095011b325ea4b2260994834fdb4c205316ab9e98b + input_fingerprint: e4a0e45d5bffe7491120e829927894b34e244439f3addfe6b2d95667231a00ca template_sources: - gemfiles/modular/erb/r2/v3.0.gemfile.example gemfiles/modular/erb/r3/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r3_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: b7d3317d91a52d39279086677dfe27f06f68d91f555c8952480eb0b7e15f6857 + input_fingerprint: 18b6ad75ba3525cd252e61ce5687c49a83dfd9aa352dafcfd0c5dbc0755a44a4 template_sources: - gemfiles/modular/erb/r3/v5.0.gemfile.example gemfiles/modular/erb/r4/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r4_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 8e9e157495ae63510a3f422d92a2fde1d3c5389dc2b84f5ee9e5e36f6dd39d01 + input_fingerprint: 5e28d48f5255a98561fc46f467d1c9a560c64230153d9b12b6853a307ee94b40 template_sources: - gemfiles/modular/erb/r4/v5.0.gemfile.example gemfiles/modular/erb/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_erb_vHEAD_gemfile action: write dest_sha256: ad6f104a49e80e0cf625440e3dc816343fe7e2f037fc4971df75e7bb4305c683 - input_fingerprint: bac55d280bc84f7768870a5ec5c08e210a28c5665b4b4523a98a814cb6cc8a30 + input_fingerprint: 6f9d313f71005bbf49f31fe512ff4010f77f65002e8c076f4df5043ece5b0969 template_sources: - gemfiles/modular/erb/vHEAD.gemfile.example gemfiles/modular/json/truffleruby_22_3.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_22_3_gemfile action: write dest_sha256: 249c12eacbe90f9d0d2e81e7a62c4c7e9102e504ededcda4ecf660cb3bb68be4 - input_fingerprint: e204214909070af55fec5611c1e7a958a47ba5e6885126bc098fb4483bf6036a + input_fingerprint: a331f28c419f39b19251a719006f0e994e3f6888c8811dc38597819311932054 template_sources: - gemfiles/modular/json/truffleruby_22_3.gemfile.example gemfiles/modular/json/truffleruby_23_0.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_0_gemfile action: write dest_sha256: 66aa010567f7afa1af8244a74c3c88ecaaf84dc87b6a25180691bb480d02ed28 - input_fingerprint: e865a87a1633622633eab5e5c7456118203eb7d0465bc959044720473131d2d9 + input_fingerprint: 3bdd28e1a75a9c19a0d6813751bf1d60c87eba9f8a7f59bc94bf0cbe4972c1c3 template_sources: - gemfiles/modular/json/truffleruby_23_0.gemfile.example gemfiles/modular/json/truffleruby_23_1.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_1_gemfile action: write dest_sha256: '080fcbdaf2bec73cad40832a3d51eebb380af789917b96f493d1460b0dd6361d' - input_fingerprint: 03b4bf3c9ba54d0e66fe4f96fb706be1b761788dfc8eabcacf0d8cd1260e8411 + input_fingerprint: 0d7c2c1ccb0ebb62106e308b87deaf6c95402cc5ed3250b2012a5c56fa570846 template_sources: - gemfiles/modular/json/truffleruby_23_1.gemfile.example gemfiles/modular/mutex_m/r2/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r2_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 4a51a482f2ee5e4c4e3ce83bc65a791c61ae7bede9ec6367d23fbf830deb010a + input_fingerprint: 010dc4d45fb4ccf9bd350c77a0714eb2948b411170514f8aa1c81fb40b19f871 template_sources: - gemfiles/modular/mutex_m/r2/v0.3.gemfile.example gemfiles/modular/mutex_m/r3/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r3_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 25575b9d3f3390e4666c6a5c374343bb8927274401e5b297570c96d4e396dca7 + input_fingerprint: 0e627967e2d1d542b9d577cda2d92be233854960faa61936f9fe31e35dc8ea5d template_sources: - gemfiles/modular/mutex_m/r3/v0.3.gemfile.example gemfiles/modular/mutex_m/r4/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r4_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 18c0b72fa702bb8c1487b6a8c650d7856c3abc7db85fc57b41962d7ae49de62a + input_fingerprint: e4b2e275c6c6fee17864947615252432ab133d71cd34d2bd0fee4ba8a4d70c4a template_sources: - gemfiles/modular/mutex_m/r4/v0.3.gemfile.example gemfiles/modular/mutex_m/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_vHEAD_gemfile action: write dest_sha256: '08018641c97f894788fa91b462da504ab2237213d18d95404136c393274ae3cb' - input_fingerprint: 18b55de0af44e21502216695202694a9d0fc86e60c0fba3a9aefc25722924221 + input_fingerprint: 7a515f04d6e9fdf379df9faa925afc14fcb9820b1d95438a5da6491b81ee7e16 template_sources: - gemfiles/modular/mutex_m/vHEAD.gemfile.example gemfiles/modular/optional.gemfile: recipe: template_source_application_gemfiles_modular_optional_gemfile action: write dest_sha256: f770e6e9a9dd2bd0f1f132e882d88038b2e21127dce3afe270908c7338c28bfd - input_fingerprint: f7513b5d0b129df8148d9482e8cacb40556a1acf294422f7f475bd238ddcdec4 + input_fingerprint: 475fd777705ee5f83ec66e38978a844c10ad9a02aca902446834ab4057d4c219 template_sources: - gemfiles/modular/optional.gemfile.example gemfiles/modular/rspec.gemfile: recipe: template_source_application_gemfiles_modular_rspec_gemfile action: write dest_sha256: d043f5c9344f6435edb4607c5adaf42c78e7fb6b8b6726007de2bbedefb376c3 - input_fingerprint: d73ff63b95fef3e6399b949d4be6c50a4e25f46661138578cdca5b27e2fea02b + input_fingerprint: cc05be6868d26e4f93becb535d22a15c8f8ead79acb95eee4783a70008602255 template_sources: - gemfiles/modular/rspec.gemfile.example gemfiles/modular/runtime_heads.gemfile: recipe: template_source_application_gemfiles_modular_runtime_heads_gemfile action: write dest_sha256: 6ac7158c4a3088190f2a9082f01439eb27eca2172ab3464b15c9cb045aa885e1 - input_fingerprint: 2ced28dcf4fc9859d774beca8553e6c8f42f541ec616fc84bca91684ac30a7d5 + input_fingerprint: e732785665f5e73972fd428cf7d618624f67bcf862dfad3bb72e376e958c31cc template_sources: - gemfiles/modular/runtime_heads.gemfile.example gemfiles/modular/stringio/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r2_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 88846db66dbc8d9ef82c61e1042bc2c0649d87cd5c1b405a81b6c83ab22c7b78 + input_fingerprint: 558f289962ccbc820b0f5ede541e391ed2baa18186f3041aae899383ad5bf68e template_sources: - gemfiles/modular/stringio/r2/v3.0.gemfile.example gemfiles/modular/stringio/r3/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r3_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 0dbe0dd9ed34920210bc57daa8cfd5105fb342437961b22d2bc7124d43aebb27 + input_fingerprint: 7de4a762a06bf8c35bdfa8605bca5570e962b216164193042cebeebdd0dc5f74 template_sources: - gemfiles/modular/stringio/r3/v3.0.gemfile.example gemfiles/modular/stringio/r4/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r4_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 927707ea6c1f007b25ad57ced89e27b049fe3cff49bb55fd832f6ff9e1762ac0 + input_fingerprint: 0b313a9b8ccc6f3ac9cea830c833637e43f43c5037260c207add90604aab0507 template_sources: - gemfiles/modular/stringio/r4/v3.0.gemfile.example gemfiles/modular/stringio/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_stringio_vHEAD_gemfile action: write dest_sha256: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - input_fingerprint: bc501fe13dc66db29f44b9447807ccfdfd452bd9b7b4a249b548c1e1eac5afaf + input_fingerprint: 4fe0cd7383c754d1ab56e6a3bd7ca4f8d11cd172c3132473e3e56bb786f56d06 template_sources: - gemfiles/modular/stringio/vHEAD.gemfile.example gemfiles/modular/style.gemfile: recipe: template_source_application_gemfiles_modular_style_gemfile action: write - dest_sha256: 2a3d46dcb8a9394f595f273f5eb0403d0a552837754ab109afc9ba79a7159083 - input_fingerprint: 17af42f99e17f0021a5e8b8abd2030d19ee18b1ccdce615abfd98557f843425e + dest_sha256: 9a24acff0054573c30f5d84d0418cd465ba3794d075bb5a36801410ac40e0787 + input_fingerprint: 96013cfa8c3516afcc149b568d86e62f12afefb0f09f5f19d8eb1767d7903567 template_sources: - gemfiles/modular/style.gemfile.example gemfiles/modular/style_local.gemfile: recipe: template_source_application_gemfiles_modular_style_local_gemfile action: write dest_sha256: 55eb9c149cdb2f29c9f31abe2d55a4f334e00fb859681dd17c42149a3f28ca36 - input_fingerprint: cbc773aa13286ea87516ac21d0847800914b8ecceaffb21f45a1350fc34f16ec + input_fingerprint: c2d5426f347cf48b1d257769804ec48e88787db3c176506f4b4cd4cf20fbdfeb template_sources: - gemfiles/modular/style_local.gemfile.example gemfiles/modular/templating.gemfile: recipe: template_source_application_gemfiles_modular_templating_gemfile action: write - dest_sha256: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - input_fingerprint: fd22e7c2d106cdadaa1d1de88f3d703084b5fb8b2dbae0cd60aad2e1307fe90f + dest_sha256: 432ba59798d31b899268257c432443a017c5a9bd2c0c7f9f2216617e14150cd3 + input_fingerprint: 0d5e48b06afc833ff4ceed1fcc68608136415cf296dbdc78df4a047f42f4e531 template_sources: - gemfiles/modular/templating.gemfile.example gemfiles/modular/templating_local.gemfile: recipe: template_source_application_gemfiles_modular_templating_local_gemfile action: write - dest_sha256: 4036aa9f9018dfbe9d27feb08b282d0594828216139b0e4e8569ff52cb459c7c - input_fingerprint: e1efc60b1e1c27aa477f91c4a36d6316a3a4b3bfd07cbfa4932abfb793a4b521 + dest_sha256: 59639ff7b579d18e2955a24d2f1f5fb64e75b1d3a723c13416381df87214a3cd + input_fingerprint: 9689117337afc03802f11e7b3f0aafa1f5c238a4d0f07a7e523cd4a80caaa719 template_sources: - gemfiles/modular/templating_local.gemfile.example gemfiles/modular/webrick/r4/v1.9.gemfile: recipe: template_source_application_gemfiles_modular_webrick_r4_v1_9_gemfile action: write dest_sha256: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea - input_fingerprint: 0e9f075d5b1472bcce9ab72c93d45973f61ee34e729e46b4420deed522e21f1c + input_fingerprint: a6c9ad2daf657a1de732aca185643a502553d9017cdad5ce4a54b2ae4f8259c3 template_sources: - gemfiles/modular/webrick/r4/v1.9.gemfile.example gemfiles/modular/webrick/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_webrick_vHEAD_gemfile action: write dest_sha256: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b - input_fingerprint: bd462f2f5d8bdccb52255066fd7bd69edd33b0fd577f89731f88f59b9a90c80b + input_fingerprint: 37f25de82711325d899d9d2410263d8c23337080240ac66febeae7f12823d665 template_sources: - gemfiles/modular/webrick/vHEAD.gemfile.example gemfiles/modular/x_std_libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_gemfile action: write dest_sha256: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a - input_fingerprint: 622d1ba802b0427465c9750bc0558246b39bc1169531fc67588e0ac253afa7af + input_fingerprint: 6bb4e6ea52e3f2b23f2b44e424feb01afe113b68961bd2aefb6090e838701e33 template_sources: - gemfiles/modular/x_std_libs.gemfile.example gemfiles/modular/x_std_libs/r2/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r2_libs_gemfile action: write dest_sha256: e80ec8ad06cb1b31ac982bc25cf7696987fca131aa1001eaefd0bf5cd379c273 - input_fingerprint: 22710083eccee51d0c15bbb9cc8dc189fe97ba53d98e0d6059c3c82eee655da1 + input_fingerprint: 6e17b2f7dafe7dd818127038f07717437d6f976f7bdcb146a56d10185998dc4f template_sources: - gemfiles/modular/x_std_libs/r2/libs.gemfile.example gemfiles/modular/x_std_libs/r3.1/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_1_libs_gemfile action: write dest_sha256: 9f8565c40b09bea1bc4c2e2ad87fe11400c3c51a2b235655bfcd8e491ed88ca8 - input_fingerprint: bb70c180c9f9bafc6e3afbb883dfafa5cd1d8dcff30c2c5d2e2a06396b6ef583 + input_fingerprint: 7c89e5024cca4adbdc94d833f9cb2a5c37fdfca6131d7be64eea6724c8f7305d template_sources: - gemfiles/modular/x_std_libs/r3.1/libs.gemfile.example gemfiles/modular/x_std_libs/r3/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_libs_gemfile action: write dest_sha256: 546f8849f4267bb19aa10ff0de40be30957197f229e6887847181ea9127b2650 - input_fingerprint: 182c72670b350ce93806f44bf085426876c051f6087acf4704585f7404079ef9 + input_fingerprint: 5d8e8796ba573c341d4cfcf6f38ddb5dbf96d6de7eb15b3fe8ee7e9695518647 template_sources: - gemfiles/modular/x_std_libs/r3/libs.gemfile.example gemfiles/modular/x_std_libs/r4/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r4_libs_gemfile action: write dest_sha256: 8c2582eaa218d216b98c86c933465295c8b4e43f3251ea388b9eaf6e471f8da6 - input_fingerprint: 1f3e59770cef5a8325e87b5b69392d59c99aff3a07d016c99868ee63dbb6a8e8 + input_fingerprint: 7da3bf566ebc91cfb592490b9fa1bc74de592b9226c73f7e7a185bec3505c2a3 template_sources: - gemfiles/modular/x_std_libs/r4/libs.gemfile.example gemfiles/modular/x_std_libs/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_vHEAD_gemfile action: write dest_sha256: d3133ec4c0638363a7fb025d19be7e95a615fd61c35ddb8d17f2280ee74a7486 - input_fingerprint: 5ae24dee4b3203e476a7168ab52c4ec7a8d7bbc4a6186ea193214b3eba50c9e5 + input_fingerprint: 3ae691f9ec3ac2b040601ecf2b433c863fb70c1d48c71cfbeca03f85c4339fca template_sources: - gemfiles/modular/x_std_libs/vHEAD.gemfile.example json-merge.gemspec: recipe: template_source_application_json_merge_gemspec action: write - dest_sha256: 2be9d4382da434edb8212bc478500373f28e844a6ad1cbb4c58ba5d3ef7ae81b - input_fingerprint: 920a5fc5d1b46d4be27642ca699d41fa92e197552b84180ab98e02400a371515 + dest_sha256: 85b12f54c1c456abcc3147dc529114b85609f9834e30e826f68838859db97f10 + input_fingerprint: 64c71f2f19772d08bdf4495feca57702c96fb95cb610f00d60357544ace27207 template_sources: - gem.gemspec.example lib/json/merge/version.rb: recipe: template_source_application_lib_json_merge_version_rb action: write - dest_sha256: c69d11bc9a2dd2c07666fa1a7c3aa3db805b81de54fcf05f70f573a2cc370262 - input_fingerprint: b7eaf7e3d57d68b1e91b34dfe6e799b6632f7d9b1c80fe41dd6453d7b222df6e + dest_sha256: 412df2c221982dbdd30f3675615c95eb4f08528250137cfdc319046e237469e8 + input_fingerprint: e6d48daffb522fb847454e78abc2058bb2aee0b1fee8afd36975c74a64530f22 template_sources: - lib/gem/version.rb.example mise.toml: recipe: template_source_application_mise_toml action: write dest_sha256: 7d267154ca4f081b0ac7da804c0180c2b091aec5f1c877417c1c320f4f369c88 - input_fingerprint: 5bffbe3550cdfef35da28f805dd042ca95194507fb70a7c7a00a706e215646a1 + input_fingerprint: 2339b354c916efdc4dd41bc6a5e6311bc2543ab156c5f775cc18244025b12bff template_sources: - mise.toml.no-osc.example sig/json/merge.rbs: recipe: template_source_application_sig_json_merge_rbs action: write dest_sha256: a049257eec0f5c0f35a775915c90bee52681e49c18968562bc7257c640713e11 - input_fingerprint: 10d986742068f38092d703c133a98eb4b3f449180cf5a0fd78df823716b03c01 + input_fingerprint: c060c6f25fbbd330fe0a8a65c070a9952661962d15eaa169059786b4468b0423 template_sources: - sig/gem.rbs.example spec/spec_helper.rb: recipe: template_source_application_spec_spec_helper_rb action: write dest_sha256: 665ce5957e1540e212fdf5905e11d08833ff9156d1d33f7137ef073ca3d009d4 - input_fingerprint: b164898b01776cba6ec9992d901e7db6106e91fd4d02b2067e91d8d0cc7ed25d + input_fingerprint: fd3ac0aa07e91aadac9a05536ac86aab5030b05d395fe82d5df53eee6174700e template_sources: - spec/spec_helper.rb.example diff --git a/gems/json-merge/Gemfile b/gems/json-merge/Gemfile index c225ab002..39d77a02a 100644 --- a/gems/json-merge/Gemfile +++ b/gems/json-merge/Gemfile @@ -19,7 +19,7 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } # Include dependencies from json-merge.gemspec gemspec -gem 'kettle-family', '~> 1.2', '>= 1.2.97' +gem 'kettle-family', '~> 1.2', '>= 1.2.100' # Local workspace dependency wiring for *_local.gemfile overrides gem 'nomono', '~> 1.1', '>= 1.1.5', require: false # ruby >= 3.2.0 diff --git a/gems/json-merge/Gemfile.lock b/gems/json-merge/Gemfile.lock index 979b24b02..eb0300f7b 100644 --- a/gems/json-merge/Gemfile.lock +++ b/gems/json-merge/Gemfile.lock @@ -10,123 +10,123 @@ GIT PATH remote: . specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + json-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) + ast-crispr-markdown-markly (7.1.9) + ast-crispr (= 7.1.9) + markdown-merge (= 7.1.9) + markly-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism specs: - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) + ast-crispr-ruby-prism (7.1.9) + ast-crispr (= 7.1.9) + prism-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) + ast-crispr (7.1.9) + ast-merge (= 7.1.9) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ast-merge-git (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: - ast-merge (7.1.8) + ast-merge (7.1.9) benchmark token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) + ast-template (7.1.9) + ast-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + bash-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + binary-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) + citrus-toml-merge (7.1.9) + ast-merge (= 7.1.9) + toml-merge (= 7.1.9) toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge specs: - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) commonmarker (~> 2.2) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) + dotenv-merge (7.1.9) + ast-merge (= 7.1.9) + plain-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + go-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + html-merge (7.1.9) + ast-crispr (= 7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: - kettle-jem (7.1.25) + kettle-jem (7.1.26) addressable (>= 2.8, < 3) ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) @@ -160,122 +160,122 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge specs: - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown (~> 2.5) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + markdown-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) + markly-merge (7.1.9) + markdown-merge (= 7.1.9) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge specs: - parslet-toml-merge (7.1.8) + parslet-toml-merge (7.1.9) toml (~> 0.3) - toml-merge (= 7.1.8) + toml-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + plain-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) + prism-merge (7.1.9) + ast-merge (= 7.1.9) prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + psych-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) + yaml-merge (= 7.1.9) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) + rbs-merge (7.1.9) + ast-merge (= 7.1.9) rbs (>= 3.10) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + rust-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) + smorg-rb (7.1.9) + ast-merge (= 7.1.9) + ast-merge-git (= 7.1.9) + bash-merge (= 7.1.9) diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) + dotenv-merge (= 7.1.9) + go-merge (= 7.1.9) + html-merge (= 7.1.9) + json-merge (= 7.1.9) kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) + markdown-merge (= 7.1.9) + plain-merge (= 7.1.9) + prism-merge (= 7.1.9) + psych-merge (= 7.1.9) + rbs-merge (= 7.1.9) + rust-merge (= 7.1.9) + toml-merge (= 7.1.9) + typescript-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + toml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: - tree_haver (7.1.8) + tree_haver (7.1.9) citrus (~> 3.0) parslet (~> 2.0) tree_sitter_language_pack (>= 1.16.2, < 2.0) @@ -284,25 +284,25 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + typescript-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + yaml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) + zip-merge (7.1.9) + binary-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) GEM @@ -336,6 +336,8 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) + commonmarker (2.10.0) + rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -465,11 +467,15 @@ GEM lint_roller (1.1.0) logger (1.7.0) markly (0.19.0) + mini_portile2 (2.8.9) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) reline (~> 0.6) mutex_m (0.3.0) + nokogiri (1.19.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-musl) @@ -503,6 +509,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) + rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -696,6 +705,9 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_sitter_language_pack (1.16.2) + rb_sys (>= 0.9.130, < 0.10) + sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -784,9 +796,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.31) + kettle-dev (~> 3.0, >= 3.0.34) kettle-drift (~> 1.0, >= 1.0.13) - kettle-family (~> 1.2, >= 1.2.97) + kettle-family (~> 1.2, >= 1.2.100) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) @@ -807,12 +819,12 @@ DEPENDENCIES reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) - rubocop-lts (~> 24.2, >= 24.2.1) - rubocop-lts-rspec (~> 1.0, >= 1.0.5) + rubocop-lts (~> 24.2, >= 24.2.3) + rubocop-lts-rspec (~> 1.0, >= 1.0.6) rubocop-minitest (~> 0.40, >= 0.40.0) rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! - rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) ruby-merge! ruby-progressbar (~> 1.13) rust-merge! @@ -843,33 +855,34 @@ CHECKSUMS appraisal2 (3.2.3) sha256=3a6cfaf8a444e02707b9a34154af1c4902fbe99d9d2168d7e81dd83ec77e6db7 appraisal2-rubocop (1.0.2) sha256=1dae97c1be087cf9c098a3a72fd41f873435e9b8b39687e633b36c9ccb22bff4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.8) - ast-crispr-markdown-markly (7.1.8) - ast-crispr-ruby-prism (7.1.8) - ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) + ast-crispr (7.1.9) + ast-crispr-markdown-markly (7.1.9) + ast-crispr-ruby-prism (7.1.9) + ast-merge (7.1.9) + ast-merge-git (7.1.9) + ast-template (7.1.9) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.8) + bash-merge (7.1.9) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) - bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae + binary-merge (7.1.9) + bundler (4.1.0.beta1) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.8) + citrus-toml-merge (7.1.9) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 + commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e commonmarker (2.10.0-x86_64-darwin) sha256=01e0830ed0319825ecdc16411c90acd3f661d1568dfc178731b3f64d0ce2363d commonmarker (2.10.0-x86_64-linux) sha256=945c510c0bfca9022245928e2248468fe3ddad58c939be0c37b20082cc392880 commonmarker (2.10.0-x86_64-linux-musl) sha256=288cd4fb9f17eed2ffa73551ef241dcf594e0f484b2aee2a0999540333c0618e - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) completely (0.8.0) sha256=e493cd5d84805f47917a41f277ecbfe5f35363bed670be5a957d3acaed8c6c5e concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 @@ -878,7 +891,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docopt_ng (0.7.1) sha256=a024148ee4fa3ab1a8a04411aa4370f39cf2b446e63562097d418b7974a15667 - dotenv-merge (7.1.8) + dotenv-merge (7.1.9) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -891,35 +904,37 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) + go-merge (7.1.9) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) + html-merge (7.1.9) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a - json-merge (7.1.8) - kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + json-merge (7.1.9) + kettle-changelog (1.0.7) + kettle-dev (3.0.34) + kettle-drift (1.0.13) kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 - kettle-jem (7.1.25) + kettle-jem (7.1.26) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 - kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd + kettle-soup-cover (3.0.10) kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 - markdown-merge (7.1.8) + markdown-merge (7.1.9) markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca - markly-merge (7.1.8) + markly-merge (7.1.9) + mini_portile2 (2.8.9) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 + nokogiri (1.19.4) nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af nokogiri (1.19.4-arm64-darwin) sha256=a46db9853286e6597b36ebc6953817d15acf3a299583eb3f89fdc6f91dd63527 @@ -933,20 +948,22 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) - plain-merge (7.1.8) + parslet-toml-merge (7.1.9) + plain-merge (7.1.9) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.8) + prism-merge (7.1.9) psych (5.5.0) sha256=4b245bbbd0f3238df8ccee766ebc1a6b062b10e4ee1d3284eb588739ba156a0a - psych-merge (7.1.8) + psych-merge (7.1.9) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 - rbs-merge (7.1.8) + rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -982,11 +999,11 @@ CHECKSUMS rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.8) + ruby-merge (7.1.9) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) + rust-merge (7.1.9) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +1011,7 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) + smorg-rb (7.1.9) sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,10 +1027,11 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.8) + toml (0.3.0) + toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb - tree_haver (7.1.8) + tree_haver (7.1.9) + tree_sitter_language_pack (1.16.2) tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 @@ -1023,12 +1041,12 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) + typescript-merge (7.1.9) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 yaml-converter (0.2.5) sha256=a5214fe1a6c2df88bd34a35bcded1b1dcd30135548130df2e03b54ca8c0f2423 - yaml-merge (7.1.8) + yaml-merge (7.1.9) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.8) sha256=73d935d43e3479d65ce8aff25c7d3100e8bb83528a2adaa0ed824e5046ac99e7 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -1037,8 +1055,8 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) + zip-merge (7.1.9) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH - 4.0.20 + 4.1.0.beta1 diff --git a/gems/json-merge/Rakefile b/gems/json-merge/Rakefile index 8eac76bce..28ac4c4dd 100644 --- a/gems/json-merge/Rakefile +++ b/gems/json-merge/Rakefile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -# json-merge Rakefile v7.1.18 - 2026-09-07 +# json-merge Rakefile v7.1.26 - 2026-09-09 # Ruby 2.3 (Safe Navigation) or higher required # # See LICENSE.md for license information. diff --git a/gems/json-merge/bin/rubocop-gradual b/gems/json-merge/bin/rubocop-gradual new file mode 100755 index 000000000..7c7ff0635 --- /dev/null +++ b/gems/json-merge/bin/rubocop-gradual @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'rubocop-gradual' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'rubygems' +require 'bundler/setup' + +load Gem.bin_path('rubocop-gradual', 'rubocop-gradual') diff --git a/gems/json-merge/gemfiles/modular/coverage_local.gemfile b/gems/json-merge/gemfiles/modular/coverage_local.gemfile index 37917caac..d6c890e46 100644 --- a/gems/json-merge/gemfiles/modular/coverage_local.gemfile +++ b/gems/json-merge/gemfiles/modular/coverage_local.gemfile @@ -29,11 +29,31 @@ Kernel.send(:gem, 'nomono', *nomono_activation_requirements) require 'nomono/bundler' local_gems = %w[kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -local_gems_to_eval = local_gems - %w[] - declared_gems # export KETTLE_DEV_DEV=/path/to/my platform :mri do + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + local_gems_to_eval = local_gems - %w[] - declared_gems + eval_nomono_gems( gems: local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/json-merge/gemfiles/modular/style.gemfile b/gems/json-merge/gemfiles/modular/style.gemfile index 59c5dc1a3..41ec99454 100644 --- a/gems/json-merge/gemfiles/modular/style.gemfile +++ b/gems/json-merge/gemfiles/modular/style.gemfile @@ -24,9 +24,9 @@ platform :mri do if ENV.fetch('RUBOCOP_LTS_DEV', 'false').casecmp('false').zero? declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) - gem 'rubocop-lts', '~> 24.2', '>= 24.2.1' unless declared_gems.include?('rubocop-lts') - gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.5' unless declared_gems.include?('rubocop-lts-rspec') - gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.6' unless declared_gems.include?('rubocop-ruby3_2') + gem 'rubocop-lts', '~> 24.2', '>= 24.2.3' unless declared_gems.include?('rubocop-lts') + gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.6' unless declared_gems.include?('rubocop-lts-rspec') + gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.8' unless declared_gems.include?('rubocop-ruby3_2') else eval_gemfile('style_local.gemfile') end diff --git a/gems/json-merge/gemfiles/modular/templating.gemfile b/gems/json-merge/gemfiles/modular/templating.gemfile index 6af159bd7..ce51a08ed 100644 --- a/gems/json-merge/gemfiles/modular/templating.gemfile +++ b/gems/json-merge/gemfiles/modular/templating.gemfile @@ -18,7 +18,7 @@ end if structuredmerge_remote # Merge recipes for released installs. - gem 'kettle-jem', '>= 7.0' + gem 'kettle-jem', '~> 7.1', '>= 7.1.26' end if kettle_remote diff --git a/gems/json-merge/gemfiles/modular/templating_local.gemfile b/gems/json-merge/gemfiles/modular/templating_local.gemfile index 2d9d2f42a..a18024b80 100644 --- a/gems/json-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/json-merge/gemfiles/modular/templating_local.gemfile @@ -65,9 +65,7 @@ structuredmerge_local_gems = %w[ kettle_dev_local_gems = %w[ kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift ] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[] -kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - (declared_gems - %w[kettle-dev]) if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( @@ -81,6 +79,28 @@ if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 end if ENV.fetch('KETTLE_DEV_DEV', 'false').casecmp('false') != 0 + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - declared_gems + eval_nomono_gems( gems: kettle_dev_local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/json-merge/json-merge.gemspec b/gems/json-merge/json-merge.gemspec index afa6e40f3..3608a950a 100644 --- a/gems/json-merge/json-merge.gemspec +++ b/gems/json-merge/json-merge.gemspec @@ -120,7 +120,7 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.31') # ruby >= 4.0.0 + spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.34') # ruby >= 4.0.0 # Security spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 From b8f49ba5006e35750af7f634f6dd591859296513 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 23:50:46 -0400 Subject: [PATCH 085/137] =?UTF-8?q?=F0=9F=8E=A8=20Template=20yaml-merge=20?= =?UTF-8?q?by=20kettle-family?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/yaml-merge/.kettle-drift.lock | 76 ++++- gems/yaml-merge/.rubocop_gradual.lock | 7 +- .../.structuredmerge/kettle-jem.lock | 145 ++++----- gems/yaml-merge/Gemfile | 2 +- gems/yaml-merge/Gemfile.lock | 302 ++++++++++-------- gems/yaml-merge/Rakefile | 2 +- gems/yaml-merge/bin/rubocop-gradual | 16 + .../gemfiles/modular/coverage_local.gemfile | 24 +- .../yaml-merge/gemfiles/modular/style.gemfile | 6 +- .../gemfiles/modular/templating.gemfile | 2 +- .../gemfiles/modular/templating_local.gemfile | 24 +- gems/yaml-merge/yaml-merge.gemspec | 2 +- 12 files changed, 379 insertions(+), 229 deletions(-) create mode 100755 gems/yaml-merge/bin/rubocop-gradual diff --git a/gems/yaml-merge/.kettle-drift.lock b/gems/yaml-merge/.kettle-drift.lock index 98b009e1e..1b23f4793 100644 --- a/gems/yaml-merge/.kettle-drift.lock +++ b/gems/yaml-merge/.kettle-drift.lock @@ -1,10 +1,82 @@ { + "debug_env: 'KETTLE_DEV_DEBUG',\nroot: %w[src my kettle-dev]": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 46, + 63 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 93, + 110 + ] + } + ], + "path_env: 'KETTLE_DEV_DEV',\nvendored_gems_env: 'VENDORED_GEMS',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 43, + 60 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 90, + 107 + ] + } + ], + "prefix: 'KETTLE_DEV',\npath_env: 'KETTLE_DEV_DEV',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 42, + 59 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 89, + 106 + ] + } + ], + "vendor_gem_dir_env: 'VENDOR_GEM_DIR',\ndebug_env: 'KETTLE_DEV_DEBUG',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 45, + 62 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 92, + 109 + ] + } + ], "vendored_gems_env: 'VENDORED_GEMS',\nvendor_gem_dir_env: 'VENDOR_GEM_DIR',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 44, + 61 + ] + }, { "file": "gemfiles/modular/templating_local.gemfile", "lines": [ - 77, - 88 + 75, + 91, + 108 ] } ] diff --git a/gems/yaml-merge/.rubocop_gradual.lock b/gems/yaml-merge/.rubocop_gradual.lock index 9b8821b64..8fe5ef66b 100644 --- a/gems/yaml-merge/.rubocop_gradual.lock +++ b/gems/yaml-merge/.rubocop_gradual.lock @@ -2,7 +2,7 @@ ".simplecov:479300517": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] ], - "Rakefile:269930845": [ + "Rakefile:459786814": [ [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], [81, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], [165, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], @@ -22,6 +22,9 @@ [1, 1, 0, "Naming/FileName: The name of this source file (`vHEAD.gemfile`) should use snake_case.", 5381], [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], + "gemfiles/modular/coverage_local.gemfile:2813372128": [ + [34, 1, 1586, "Metrics/BlockLength: Block has too many lines. [37/25]", 820328175] + ], "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], @@ -146,7 +149,7 @@ "spec/retained_blank_gap_spec.rb:3080228732": [ [5, 1, 914, "Metrics/BlockLength: Block has too many lines. [33/25]", 2851550009] ], - "yaml-merge.gemspec:892976881": [ + "yaml-merge.gemspec:582673844": [ [137, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4147388508], [148, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], [149, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] diff --git a/gems/yaml-merge/.structuredmerge/kettle-jem.lock b/gems/yaml-merge/.structuredmerge/kettle-jem.lock index 06dc1a0ae..14651891e 100644 --- a/gems/yaml-merge/.structuredmerge/kettle-jem.lock +++ b/gems/yaml-merge/.structuredmerge/kettle-jem.lock @@ -1,11 +1,12 @@ --- version: 1 template_state: - version: 7.1.18 - applied_at: '2026-09-07' + version: 7.1.26 + applied_at: '2026-09-10' changelog_replay: last_entry_key: kettle-jem-template-20260802-001 last_entry_date: '2026-08-02' + maintenance_changelog: {} checksums: ".aiignore.example": 48a5dfdd93afd1a15fdce39cc28ca9920263f00018b0968ab031fa744521e5ce ".config/mise/env.sh": aeea5a2ab489ba6e5467ae8de6e386ec8c8fe4ff31a044e69d0cd6a092dd6654 @@ -75,7 +76,7 @@ template_state: ".rubocop_rspec.yml.example": 288ad75e7eb14d87d80fafe6f7272217be5c57547536ee56c780a7d10ac7ec74 ".simplecov.example": 222f2e6ce8cf089c70a21f0f5e5423d4bd59a96fdb2ce7754b0fb3d6f430c229 ".structuredmerge/git-drivers.toml.example": 9d241a44c9edffcdbd3da018fa188a238089c3d1635040924df594a6929a4f97 - ".structuredmerge/kettle-jem.yml.example": 26949dc4ee0722415e72452cbc186bee6ef7b154eae33166d36f3fdb1ca6e46d + ".structuredmerge/kettle-jem.yml.example": ff65a738da1af7d60714026a81d3323a46c864e96ae3570b806afdf6e7149ff9 ".yard-lint.yml.example": 90def46867c9436b4e177c47d91fc8165f4602e335715aecc39f5587ae20b55b ".yardignore.example": 821f453c609df7d46145d675424b39dfbe6dfdca8edac5f367b85fff48502455 ".yardopts.example": 6fd6f2701713096a8a9ea095c213bbc68eeef37797c4754d97837e3229a3a5f6 @@ -88,7 +89,7 @@ template_state: CHANGELOG.transfer.md: 21331d8a9e58b4ff6e088b88eb408bcccb0f2f64e78f8f4d42ac3f11a24baad8 CITATION.cff.example: e404ea0a7919d78a83d53d80e211d17b9663576aa606583b709795dc023fd75c CODE_OF_CONDUCT.md.example: f1ad532f1860f73ef774c6b27a26d41f4bc1cb8813034f5957487766ebb0986b - CONTRIBUTING.md.example: 22570cfb3dde72be79b4b522b6d5ab13f95d778e40444483a096871fe0891b19 + CONTRIBUTING.md.example: 8d23cce2d061e0c20d619c3f66591df5f32821cd84c32d171df0b8ebe1217a55 FUNDING.md.example: 392d047904b1557b29f4b43d37ec403b7480edd5b6ab51180be979b57a91e6ba FUNDING.md.no-osc.example: 3ef0258dd3e3b7f7e17e8bc2d20dcbcb3e74aa5a5a6f51297075696645e34c77 Gemfile.example: 99500023987e81775a9b5ef14e92cb3992f2ac408e5f42454f2728eee9b49fb2 @@ -99,19 +100,19 @@ template_state: PolyForm-Small-Business-1.0.0.md.example: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 README.md.example: 21f491e3d73bfc1b74056a6dcba61f72c93dee3cfe5272ac164a20978454de21 REEK: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - RUBOCOP.md.example: c09e5533ccc59b70a2efa05c99f66e521137c1053d3c12eb43509cebd5b68b0e + RUBOCOP.md.example: d99871a0e4c1d323c92e7febf328f062bb4722069b2abfd0a83bf7daa8dcbf8c Rakefile.example: 569803e726b07ea26267fec6891367a3096a0dff3c266269a7081d36afe496af SECURITY.md.example: ee9411aa85f36d88363fdaea7a1baea4362b6ec112cf2688e711b05de1d3144c bin/setup.example: 0ac35089c95a91d8973fe7a318bf9fd98b9f8e00db92c5d9ca6cd858abb8d41b certs/pboling.pem.example: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - gem.gemspec.example: 83e834e8958a88e4817a57199f48f5ebb245548ce251c5c47372208693f03b17 + gem.gemspec.example: 12dcadc0b297ccd4e18b9d1e538b98ac8330ef9fb2a059ed6754ad59272b77fa gemfiles/modular/benchmark/r4/v0.5.gemfile.example: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 gemfiles/modular/benchmark/vHEAD.gemfile.example: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 gemfiles/modular/cgi/r4/v0.5.gemfile.example: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 gemfiles/modular/cgi/vHEAD.gemfile.example: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 gemfiles/modular/changelog.gemfile.example: 892598e0e7792eb205247ae28128cef6dfc647d2fb33968969152230d6f69288 gemfiles/modular/coverage.gemfile.example: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - gemfiles/modular/coverage_local.gemfile.example: 928d5f260d7b119c038baa56da9fb78dd524dee613aea33ab72894bbce5c506e + gemfiles/modular/coverage_local.gemfile.example: 92ea0d7a9d693553dc614afa2c43990f5c3778c2b00ef6c528e122c31bd506a1 gemfiles/modular/debug.gemfile.example: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 gemfiles/modular/documentation.gemfile.example: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c gemfiles/modular/documentation_local.gemfile.example: 84a20f5d4b0feb94c2cf2f7a8dce8f682f1483498e41484c2b447a5661fd1870 @@ -145,10 +146,10 @@ template_state: gemfiles/modular/stringio/r3/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/r4/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/vHEAD.gemfile.example: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - gemfiles/modular/style.gemfile.example: 3ad0585b4f2db8918580ca41ea8723f7a166d7a83cfd7f9613511094997106fd + gemfiles/modular/style.gemfile.example: 02fe3e8fd00e49b90c3ab30e19b51014ee50490f3eadcfd1d4a39f4c2c997dda gemfiles/modular/style_local.gemfile.example: c86beb711e766126a5be68be4be18255831625ac3650d5069383c4a83a9511f3 - gemfiles/modular/templating.gemfile.example: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - gemfiles/modular/templating_local.gemfile.example: 930057d3b909a72e39a39125c4e883a7ff71f5691e64426c0541f8c8fc75b83f + gemfiles/modular/templating.gemfile.example: 2b33c094677b53ad9dd2eafeb3a3be452f612380c61001a2e75b3c078b8ff72a + gemfiles/modular/templating_local.gemfile.example: ac7259516e69ffafb8b9342a897ddf6042adc46335743f474c342509cefd8f2e gemfiles/modular/webrick/r4/v1.9.gemfile.example: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea gemfiles/modular/webrick/vHEAD.gemfile.example: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b gemfiles/modular/x_std_libs.gemfile.example: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a @@ -175,7 +176,7 @@ template_state: shim/Gemfile.example: 0fb0d9d06fcfb1fd6ca6f0eeb5867253ca1ed221e03d28027719225f868b0637 shim/README.md.example: 3a2f7211b7f92a1dfae5e523b8e34b051a3d8af942144b05286eca0b3c8f6fbe shim/Rakefile.example: 572c94da7052083b39b62a6600785419e314a109efd7a3d8c3a96eb77ad34fd1 - shim/gem.gemspec.example: efae033238e4fd1355cfc134f5c9123f175d1ad1dc4a1a2e663899788c9e0870 + shim/gem.gemspec.example: 14a7015b3328005d1c3b5fda6886bd6da383707745f6eaaa781d6f9689600131 shim/lib/compat_require.rb.example: 94ee85e353a3ca08c8a35c9063d4ff789214ea594c7f803f6cf09d7142f48379 shim/lib/entrypoint.rb.example: dd57613520daca01d6f6bcaa9b83b00ff74505240dc04b84ceb686df3c0539d7 shim/lib/version.rb.example: 15e219ac3a928b5580035f891e415551213175020f1131f6e7ca0ccd55a1b2d6 @@ -189,370 +190,370 @@ files: recipe: template_source_application_simplecov action: write dest_sha256: c96f625ce55141cce926c7820981f5865d2d1c1377c6c893947feb7894d149ad - input_fingerprint: 1f9f68a009859bef8934e8fa82c147aba9ac1a4f233d91067cb55fd34d9682f4 + input_fingerprint: ed9cd0006277841d7ad2361f8565b0b0f3bb1615673842b0071dc84c4df2214e template_sources: - ".simplecov.example" AGPL-3.0-only.md: recipe: template_source_application_AGPL_3_0_only_md action: write dest_sha256: d8a6cc31abc16b6748c7a21f21611f5a1ec33f67d22ca23d7da1c19b95496bee - input_fingerprint: 1bad8a764f6ececad0c48b35bf768e1500c60186060384c876c959a14c00e66c + input_fingerprint: 3d1926185208e180ab474b0a4d53b8264319de323fb6177b609c5192814d7d27 template_sources: - AGPL-3.0-only.md.example Gemfile: recipe: template_source_application_Gemfile action: write - dest_sha256: a01f8a2c8c934396b3b741fb6744bbe3a4db7bbf78141af1b23c3b24311f3279 - input_fingerprint: 12426803f972a84a2ac5a5adf4930a668cfd92b159e75c9ab0a37b4c0df9a01c + dest_sha256: 480a3baa535756c88a67601a0278f0e5059ecef8b467c0138e3fb000bb951763 + input_fingerprint: f419b7b0b64d2da48bd80ade46d8b21201e8dead431ef2aa37a26451c1dc574e template_sources: - Gemfile.example LICENSE.md: recipe: template_source_application_LICENSE_md action: write dest_sha256: f6188bfd474a636d2a526420ebb411250faa447d94c9b9ccee097128ce4101b5 - input_fingerprint: cdfb5dd6fabda3e372b1f4b532b8304688c28ece98933596d5ab9b9dbe9c569e + input_fingerprint: 5622637ced315abcc2f942c9b8836459b97423f3a358a997268691bbe616867f template_sources: - LICENSE.md.example PolyForm-Small-Business-1.0.0.md: recipe: template_source_application_PolyForm_Small_Business_1_0_0_md action: write dest_sha256: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 - input_fingerprint: a740acd8561d62b94ecd2a74628b606bda648480ce25f0c2faa5d8783492b77d + input_fingerprint: 145ce11ca6e8ec112fa4eb733738a364def7db9affef2e1e50dbfd929b6bf65b template_sources: - PolyForm-Small-Business-1.0.0.md.example README.md: recipe: template_source_application_README_md action: write dest_sha256: 2339ad957c856f648e26ccf3da4ae39d4cb2186802c0e5b8a4273bf268378af1 - input_fingerprint: b4ce524463f40857a23ee901c76bc360068db4e45f1a55eb89404cc8b9bca2c8 + input_fingerprint: 8e52e8cf6ca07cf86a0688bdacdac56854d1534129530234440116bddbba81a4 template_sources: - README.md.example Rakefile: recipe: template_source_application_Rakefile action: write - dest_sha256: 142bd1894968cd010b2fd67cc0f00690d9293d460e31e0305febfd286c66ac8b - input_fingerprint: c2046b782206502f0bba1aafe510bf61e9b80ba5f4a46c7ecbec8cef6508998c + dest_sha256: 5e0faa7bd5426a030b8e8bbba50b7decb832f9fc3aec4975b7c83b7af423e241 + input_fingerprint: d503ba628f1a6796a548b4ccb26489cabb90ee4a773b3a166d0a0cf17e9903b5 template_sources: - Rakefile.example certs/pboling.pem: recipe: template_source_application_certs_pboling_pem action: write dest_sha256: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - input_fingerprint: 2f00b27b7415b411107887f771898df0fc7516fd89244b9c2463f13f5ae45852 + input_fingerprint: 2274b441ce3509729530f1b21bca409b0117f3864b6ede367d18ce3b5d9dce7d template_sources: - certs/pboling.pem.example gemfiles/modular/benchmark/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_r4_v0_5_gemfile action: write dest_sha256: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 - input_fingerprint: e0323f5dbb6ae7775ca65f25ee8c812ea7d6f43bc26b3980ff5e19dd1b41f6b1 + input_fingerprint: e1ce26002a279a597a9c66ae8a47429d165744ad8e84daad3acd142d159e7d7a template_sources: - gemfiles/modular/benchmark/r4/v0.5.gemfile.example gemfiles/modular/benchmark/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_vHEAD_gemfile action: write dest_sha256: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 - input_fingerprint: c104b1ae6691acbf9232caeb82abe8aad31f55846d1c59b15695807ee282fc03 + input_fingerprint: e5c7c66ca196d82864e787cbafaf62f71f9b93501352077ab17134633f517865 template_sources: - gemfiles/modular/benchmark/vHEAD.gemfile.example gemfiles/modular/cgi/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_cgi_r4_v0_5_gemfile action: write dest_sha256: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 - input_fingerprint: 176340520bd9e675a9954e45bcc8f28a296993ecee64e24aea13c0fd0ab244af + input_fingerprint: 33211a31ee17ec9e54e6a86dc6f8ec6518a58ad4a54b4df6c7243275b980de60 template_sources: - gemfiles/modular/cgi/r4/v0.5.gemfile.example gemfiles/modular/cgi/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_cgi_vHEAD_gemfile action: write dest_sha256: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 - input_fingerprint: 817ef96677941182d9e6a90affbfbb5ee6d52e428151f7b4dd60846f4d0e88c3 + input_fingerprint: 74ab3ae276602ce349f89b3ebde880532f945b387194166cc18757dcc1b6a776 template_sources: - gemfiles/modular/cgi/vHEAD.gemfile.example gemfiles/modular/changelog.gemfile: recipe: template_source_application_gemfiles_modular_changelog_gemfile action: write dest_sha256: da669526144fbff33aef207db9541b6fd6c254437f94dec2fab70fc55a7757cd - input_fingerprint: fc851e7cd71ac3a32ba530ef8b1b20f213200806c02bf34acad4cd57588eadd9 + input_fingerprint: 19cf372a064626b44cfb66771e7e6cccb3327d966f33dc927bfdf58e81bc6f5e template_sources: - gemfiles/modular/changelog.gemfile.example gemfiles/modular/coverage.gemfile: recipe: template_source_application_gemfiles_modular_coverage_gemfile action: write dest_sha256: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - input_fingerprint: b2e8d83653ec3b6f086f84d5dad119760cd0a1032fa19442d79681c7a3b856d0 + input_fingerprint: e4b3a3bc20cd29911c03c343dc5c4d69e6c7e2fb8b344b5251b42e451c07347c template_sources: - gemfiles/modular/coverage.gemfile.example gemfiles/modular/coverage_local.gemfile: recipe: template_source_application_gemfiles_modular_coverage_local_gemfile action: write - dest_sha256: 2b493414df06261ba8acb6f0eb18bf3fdd701d7cb5f967a9d15a3f42a4741827 - input_fingerprint: 9b11fa8c45185f5c84c284eb8291b1a387f499b71033e0bd8f47855f62922046 + dest_sha256: 92c9a599c8f6867ec532880f73568f2736ac05d8973ec524b42fd5dbe6aeda3e + input_fingerprint: db5112f9adc81c21818aec13513a081a25a73f033fa2cd3299a33c18fa307732 template_sources: - gemfiles/modular/coverage_local.gemfile.example gemfiles/modular/debug.gemfile: recipe: template_source_application_gemfiles_modular_debug_gemfile action: write dest_sha256: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 - input_fingerprint: 140aa9df2ef841034aaa7987926a6422e2da8ce4bf3bde7c28a2b779e7d85904 + input_fingerprint: '09b338cc5be750124d107e38194a97d94522b6be93b29b96358467ec9ec76e02' template_sources: - gemfiles/modular/debug.gemfile.example gemfiles/modular/documentation.gemfile: recipe: template_source_application_gemfiles_modular_documentation_gemfile action: write dest_sha256: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c - input_fingerprint: 81b45cc4b4639ed960c67d98d6fac8a73b53b55c3ee16c389d7334970964f398 + input_fingerprint: 9d750ecf4e5764c982631d46f5ce4e6dd63b77211dfec0d1f8dd092fde5d90ee template_sources: - gemfiles/modular/documentation.gemfile.example gemfiles/modular/documentation_local.gemfile: recipe: template_source_application_gemfiles_modular_documentation_local_gemfile action: write dest_sha256: 2058173855b9a4acc6d5efa20520e49734243eef6cf0b5e9063e0e5866a08e9c - input_fingerprint: 4c86c240d68afa202346c91bf7169810557261ac0aafa9203a8fcfb504914505 + input_fingerprint: 8a998bc7a68f98e4640384e04a43b847a25f7f027c19988bf949a45069857f7c template_sources: - gemfiles/modular/documentation_local.gemfile.example gemfiles/modular/erb/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r2_v3_0_gemfile action: write dest_sha256: 3793e7dc9ef23a7ccd893d48cbba092fd27594c63e65cca011cc658218425670 - input_fingerprint: 7dde7d96ad17e5741f78c799af270e4f7ea6614cc70b2f69ca56e56ab6517021 + input_fingerprint: 656ea9989c6a61cb82750be61251ed9ae8fd2f87327d81628b23c812a2f300bb template_sources: - gemfiles/modular/erb/r2/v3.0.gemfile.example gemfiles/modular/erb/r3/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r3_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 5c5c7f7de28ec180935f015a24bd825cf403de0b6307d2eb23eb9cf5efc2509a + input_fingerprint: 1f6704b7a437c2e87278ade0694e9d0734819aab9e7b1ffe1ac6e9adba834a53 template_sources: - gemfiles/modular/erb/r3/v5.0.gemfile.example gemfiles/modular/erb/r4/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r4_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 6777d78c4b5186f29a96499a669e893296a159ff0bf9064b324bcefba71dba84 + input_fingerprint: 7cb944f4232c7f87fe82acf2bd48cda31071a3f3694bbedf31291dd2e0a413d5 template_sources: - gemfiles/modular/erb/r4/v5.0.gemfile.example gemfiles/modular/erb/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_erb_vHEAD_gemfile action: write dest_sha256: ad6f104a49e80e0cf625440e3dc816343fe7e2f037fc4971df75e7bb4305c683 - input_fingerprint: f7efef49ea67b6d1e154feac833c53f24301111933386eb078b55d01796219d9 + input_fingerprint: 20873720b612f6babe3c8f702618f5ea37c2d458e25389cb16f56797108cda3d template_sources: - gemfiles/modular/erb/vHEAD.gemfile.example gemfiles/modular/json/truffleruby_22_3.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_22_3_gemfile action: write dest_sha256: 249c12eacbe90f9d0d2e81e7a62c4c7e9102e504ededcda4ecf660cb3bb68be4 - input_fingerprint: 504d3c8f97e5f778573e1e78ae6d7046a733cedef7c529257f49e167aa17ef79 + input_fingerprint: 8503588686176cdfa187095ca45257d0b6f32d617843b5e12fd15f96dd73d853 template_sources: - gemfiles/modular/json/truffleruby_22_3.gemfile.example gemfiles/modular/json/truffleruby_23_0.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_0_gemfile action: write dest_sha256: 66aa010567f7afa1af8244a74c3c88ecaaf84dc87b6a25180691bb480d02ed28 - input_fingerprint: 7925a2da326ee31bd89d3e7abd1562a26b4f618c446fe4a7818b50eb2f052475 + input_fingerprint: fce63a1f1cb95a5047e3dfa97885b1d46e9bfd72577db3926a925782677ef683 template_sources: - gemfiles/modular/json/truffleruby_23_0.gemfile.example gemfiles/modular/json/truffleruby_23_1.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_1_gemfile action: write dest_sha256: '080fcbdaf2bec73cad40832a3d51eebb380af789917b96f493d1460b0dd6361d' - input_fingerprint: 1d9038068bf9fb0a804d3df573459f481dcbb14cb777fb5533193f80735c3dbe + input_fingerprint: 29f6c79c67e20f4c77dfb35fdf530df71e775fabd29ea58dc7b92725b9060152 template_sources: - gemfiles/modular/json/truffleruby_23_1.gemfile.example gemfiles/modular/mutex_m/r2/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r2_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 9918af005a3b91ba292f9c1f5863d65c8eb4eb44ee9493848aeb6e76a8d5e4ea + input_fingerprint: '079158dcf5c3104a4eda61bf1032dd78cdd4a5ed258f0572a22d6875eb35504f' template_sources: - gemfiles/modular/mutex_m/r2/v0.3.gemfile.example gemfiles/modular/mutex_m/r3/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r3_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: c360483f591952ca2a8d6acb2b1895e0d19bf847350ab24c359ff145afcf22ef + input_fingerprint: 8a2207aadc78e64ab8d0cb4be4e16c0e3e131dbe943b8cd2e46f564f72cf8988 template_sources: - gemfiles/modular/mutex_m/r3/v0.3.gemfile.example gemfiles/modular/mutex_m/r4/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r4_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 258fe679bbf4aad36354f3f4cdc668c95701f4f074aa76e83687ea9f9c7ee838 + input_fingerprint: 4f3352d9ca8b578368b615543a6be60ba562ec3a3ead5bb953ebf1fab9151ddf template_sources: - gemfiles/modular/mutex_m/r4/v0.3.gemfile.example gemfiles/modular/mutex_m/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_vHEAD_gemfile action: write dest_sha256: '08018641c97f894788fa91b462da504ab2237213d18d95404136c393274ae3cb' - input_fingerprint: 9a12b39408e15bf9e1b6a37d6c595d77e48a311e9f18085fa57accd9aa085091 + input_fingerprint: 5c65a0049341ee84fbd3119c63522006cd6d03c48ee36aaabc66d03c29d168e9 template_sources: - gemfiles/modular/mutex_m/vHEAD.gemfile.example gemfiles/modular/optional.gemfile: recipe: template_source_application_gemfiles_modular_optional_gemfile action: write dest_sha256: f770e6e9a9dd2bd0f1f132e882d88038b2e21127dce3afe270908c7338c28bfd - input_fingerprint: 9480e0f75d178fc07f48a299cb1bba8f42de71ae039767da5674fd009020e4d3 + input_fingerprint: 74e96372acc7b885f5713178b5bbbff5cb3c8d43d405e0aab4076a25163854d2 template_sources: - gemfiles/modular/optional.gemfile.example gemfiles/modular/rspec.gemfile: recipe: template_source_application_gemfiles_modular_rspec_gemfile action: write dest_sha256: d043f5c9344f6435edb4607c5adaf42c78e7fb6b8b6726007de2bbedefb376c3 - input_fingerprint: 9ea9590bfd4d424fed742b8f26c51d697af83f3143a78358ee94e8f3ef7c38de + input_fingerprint: f4b94ee68ae3a92d7764f8c4e0d050d09badcb84ae9b455451ac37fc7b4598f9 template_sources: - gemfiles/modular/rspec.gemfile.example gemfiles/modular/runtime_heads.gemfile: recipe: template_source_application_gemfiles_modular_runtime_heads_gemfile action: write dest_sha256: 6ac7158c4a3088190f2a9082f01439eb27eca2172ab3464b15c9cb045aa885e1 - input_fingerprint: 39c4f839d2637d07ff7fadcf73e7a15a9d6157b79c252307c4c1e3becb5f1da7 + input_fingerprint: 556550724d9d0d23be8ecd739475ad41111a1d959712a440056a1728d6cb60d5 template_sources: - gemfiles/modular/runtime_heads.gemfile.example gemfiles/modular/stringio/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r2_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 6fb4a76c2adc107662ad858231684dcd4b4a6e6a9a563def17b309f98d39e418 + input_fingerprint: a93c9c68d88bb64e96b424cfa4762a979a6b29a04610198a6c65b7d989adc67e template_sources: - gemfiles/modular/stringio/r2/v3.0.gemfile.example gemfiles/modular/stringio/r3/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r3_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 57b48df395645f7aace637b33767fac44c4e1e100e7ce32779b36d37fd2b33ad + input_fingerprint: cf1ab52942807314d12aed59ed04bc9d71a440b56a35f2cff1b105e721c54dd7 template_sources: - gemfiles/modular/stringio/r3/v3.0.gemfile.example gemfiles/modular/stringio/r4/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r4_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: f90b05ccf806e92dded64faf240bdf8d83fe913eb20bf5c66482011500bf0054 + input_fingerprint: 42df537c7eaa274b1f8e1aeff799ca4bb8bad09a1737606245b37580d17f8b7c template_sources: - gemfiles/modular/stringio/r4/v3.0.gemfile.example gemfiles/modular/stringio/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_stringio_vHEAD_gemfile action: write dest_sha256: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - input_fingerprint: d5d52fe4e4486efbf2b4cacdd048bcdb434cc9ad4101d0ca85aa5416aa03482e + input_fingerprint: 63cfe5529c772dcd1290a96c9c1b9c456c5f01244322f7dc78484a2e24c311d3 template_sources: - gemfiles/modular/stringio/vHEAD.gemfile.example gemfiles/modular/style.gemfile: recipe: template_source_application_gemfiles_modular_style_gemfile action: write - dest_sha256: 2a3d46dcb8a9394f595f273f5eb0403d0a552837754ab109afc9ba79a7159083 - input_fingerprint: 9a3c938a797e5e178df78c9d614f7b54a7aa38ec70601239f731bbf3ca9fb26c + dest_sha256: 9a24acff0054573c30f5d84d0418cd465ba3794d075bb5a36801410ac40e0787 + input_fingerprint: 3cf1319cc52d304f2ce3239e5a9a5a04fc20462bf6b508b3860e72b7b7995012 template_sources: - gemfiles/modular/style.gemfile.example gemfiles/modular/style_local.gemfile: recipe: template_source_application_gemfiles_modular_style_local_gemfile action: write dest_sha256: 55eb9c149cdb2f29c9f31abe2d55a4f334e00fb859681dd17c42149a3f28ca36 - input_fingerprint: b3388419097720f63f94d496dee656434cbd3e189ee70c419ab03635303ca57c + input_fingerprint: 82a1cb6db7c10a2e451d408ea766511be40df870f46c629761a0c2a41d38d7d1 template_sources: - gemfiles/modular/style_local.gemfile.example gemfiles/modular/templating.gemfile: recipe: template_source_application_gemfiles_modular_templating_gemfile action: write - dest_sha256: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - input_fingerprint: '0916443c6b688b22b1914016c8897abd6981d5ec6d726ec3c40e5531a779d401' + dest_sha256: 432ba59798d31b899268257c432443a017c5a9bd2c0c7f9f2216617e14150cd3 + input_fingerprint: 33ab6767433e0e31e20702ff7e6ca35528bfddce548a0d31a131910b2ae0a692 template_sources: - gemfiles/modular/templating.gemfile.example gemfiles/modular/templating_local.gemfile: recipe: template_source_application_gemfiles_modular_templating_local_gemfile action: write - dest_sha256: c7426cd868d2facab5f76688132178b0876416fe6b3990472e8d2e391b7918bf - input_fingerprint: 5b4ded93d125ec63066ab28c0387ba911f0d38f02ad72d1475d0197e8f73bc30 + dest_sha256: 5f079df517d409e689af0f92533028d8f9de1cf091273a04465b67978ca51569 + input_fingerprint: bb5c66caf40a7156384d0059a685e433e28a89e451b6998ab3998c839c8bf3a1 template_sources: - gemfiles/modular/templating_local.gemfile.example gemfiles/modular/webrick/r4/v1.9.gemfile: recipe: template_source_application_gemfiles_modular_webrick_r4_v1_9_gemfile action: write dest_sha256: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea - input_fingerprint: 98204dfd9b39de0c7515fbe73a87c97bc08a53b2fd7503c8761e2671c5c146db + input_fingerprint: 57777ae4d9b2d493fad2b3c839f2da9cdc277de08c4a5f513636eaa631b0b70a template_sources: - gemfiles/modular/webrick/r4/v1.9.gemfile.example gemfiles/modular/webrick/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_webrick_vHEAD_gemfile action: write dest_sha256: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b - input_fingerprint: 19928802336bf8500956cb5b609d8d70897fcfe3e5124c39840577949eecc9df + input_fingerprint: 1662fc92ce1a7c8c309f87f1caf8649d3367937259bbe483e0b5f3e004af46de template_sources: - gemfiles/modular/webrick/vHEAD.gemfile.example gemfiles/modular/x_std_libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_gemfile action: write dest_sha256: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a - input_fingerprint: 8730d1369726810ed6f967f3c6837817b0db831342f409f395f21b56e47fd68a + input_fingerprint: ab4dede38579c22ea803adea372b780d794ee80db9948ac89b77eec8f2b62af4 template_sources: - gemfiles/modular/x_std_libs.gemfile.example gemfiles/modular/x_std_libs/r2/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r2_libs_gemfile action: write dest_sha256: e80ec8ad06cb1b31ac982bc25cf7696987fca131aa1001eaefd0bf5cd379c273 - input_fingerprint: 647668002b60f6b7ad572e6b18e34e72348cd0e2834e4b8a3b63f28a109eac84 + input_fingerprint: 80e6f298b4c8900aa7ba470689fcabedc697a8a09cc8da2f04e66d343bd83d96 template_sources: - gemfiles/modular/x_std_libs/r2/libs.gemfile.example gemfiles/modular/x_std_libs/r3.1/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_1_libs_gemfile action: write dest_sha256: 9f8565c40b09bea1bc4c2e2ad87fe11400c3c51a2b235655bfcd8e491ed88ca8 - input_fingerprint: 16a2a980265104371dd1d0c2bd32d281ce9e355b39bf2a72170f9a6493e761a9 + input_fingerprint: 3f4ad8ea403a6caa6a7afe1e15572bebfab64077ee7b79b7dc43678a9b158d2e template_sources: - gemfiles/modular/x_std_libs/r3.1/libs.gemfile.example gemfiles/modular/x_std_libs/r3/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_libs_gemfile action: write dest_sha256: 546f8849f4267bb19aa10ff0de40be30957197f229e6887847181ea9127b2650 - input_fingerprint: 58088fe5ce89c26790ef61d2825cb1ba80a19c6b3fb1f74074ef9ae387091269 + input_fingerprint: 956f08b91fcdc300ed8d3c5d9bbac9a70b4abef9c586d1289e25233417fe7149 template_sources: - gemfiles/modular/x_std_libs/r3/libs.gemfile.example gemfiles/modular/x_std_libs/r4/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r4_libs_gemfile action: write dest_sha256: 8c2582eaa218d216b98c86c933465295c8b4e43f3251ea388b9eaf6e471f8da6 - input_fingerprint: 0a4dfd9171607e82023a8f0bfdd99120b6dd3caac6974d5e39889d0708d24717 + input_fingerprint: 13db6986f8bf514e0708f54d20377d254ed2d69b27b1729256348ee98515f4f6 template_sources: - gemfiles/modular/x_std_libs/r4/libs.gemfile.example gemfiles/modular/x_std_libs/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_vHEAD_gemfile action: write dest_sha256: d3133ec4c0638363a7fb025d19be7e95a615fd61c35ddb8d17f2280ee74a7486 - input_fingerprint: 69491b9207b55a285f5ab56a5840b877812a6ca4d2dece640bdaafc0fc6012d6 + input_fingerprint: 28565170d81ad214372f28e4a0efe256b105c889b1899b8fa8f77340642c30d7 template_sources: - gemfiles/modular/x_std_libs/vHEAD.gemfile.example lib/yaml/merge/version.rb: recipe: template_source_application_lib_yaml_merge_version_rb action: write - dest_sha256: 4dc8252ada2dc4116defc96b05482f8d2a926f42db1c9ab729628b49407b2f8e - input_fingerprint: 7f2a88b16af140e528de67b5c8853e5c4446eeaba1834a9347a0997e6fdcc6c8 + dest_sha256: 82816a5c25c40ebfc11750f44851478eb2eed434a07fc96a955274286b78c912 + input_fingerprint: cd81814b93cb3c65e049631cab198554cdfbaa2b32c4b976f8da26127870c438 template_sources: - lib/gem/version.rb.example mise.toml: recipe: template_source_application_mise_toml action: write dest_sha256: 7d267154ca4f081b0ac7da804c0180c2b091aec5f1c877417c1c320f4f369c88 - input_fingerprint: 3a7e6e5920b8dc8f1c09447113eab7ec231bbf89b55acb3b2c29647a46c4d9ea + input_fingerprint: 335dba69f27abc67abb09aa2f97f1f7507f8d69c57e1cd12c62001be46bca73e template_sources: - mise.toml.no-osc.example sig/yaml/merge.rbs: recipe: template_source_application_sig_yaml_merge_rbs action: write dest_sha256: d8a7e093161bbd0e14713e441cf582a4d8266b4744f141be57a2475f6039c69b - input_fingerprint: e85145060b90f98e86ed0b604612ec27feb9d990923736d60f68ea5605a51bd1 + input_fingerprint: 74e2d16f664355c84ccc78778076b4a054f6264dbfbb7e70db5d572743550ce8 template_sources: - sig/gem.rbs.example spec/spec_helper.rb: recipe: template_source_application_spec_spec_helper_rb action: write dest_sha256: 7b8d2d151820783c11d2c6a7485f02f4a1b51943fbb3ebf85b3aa4ced18ce1f8 - input_fingerprint: 8c3ad5a4a5657f6bf39720036cc5620f2bc55b65cb7c64ad8f498c6ebdd5ec44 + input_fingerprint: 3641413e977718cd617dfe0795a37ba3f11120ad9f571faaf5064d5242e9a565 template_sources: - spec/spec_helper.rb.example yaml-merge.gemspec: recipe: template_source_application_yaml_merge_gemspec action: write - dest_sha256: 383c421a631b3d7fa9f2ceb42b851c5e38553280b6911e00fe8170a18d932504 - input_fingerprint: 3e1303c4f661ccf31a6a0a0a299dfca1315fc2e9a4bdee60ea9c346d28469093 + dest_sha256: 07b6cea771b4d3ac602843ee0114375f5ef7f0d90577a9c536a5601880262d05 + input_fingerprint: 7da8b839417968621124ef82354c3f689c6cf5aeea6bed0147396a53801f5f57 template_sources: - gem.gemspec.example diff --git a/gems/yaml-merge/Gemfile b/gems/yaml-merge/Gemfile index 302063565..50ebf2ab0 100644 --- a/gems/yaml-merge/Gemfile +++ b/gems/yaml-merge/Gemfile @@ -19,7 +19,7 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } # Include dependencies from yaml-merge.gemspec gemspec -gem 'kettle-family', '~> 1.2', '>= 1.2.97' +gem 'kettle-family', '~> 1.2', '>= 1.2.100' # Local workspace dependency wiring for *_local.gemfile overrides gem 'nomono', '~> 1.1', '>= 1.1.5', require: false # ruby >= 3.2.0 diff --git a/gems/yaml-merge/Gemfile.lock b/gems/yaml-merge/Gemfile.lock index 455104b91..a951db287 100644 --- a/gems/yaml-merge/Gemfile.lock +++ b/gems/yaml-merge/Gemfile.lock @@ -10,131 +10,131 @@ GIT PATH remote: . specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + yaml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) + ast-crispr-markdown-markly (7.1.9) + ast-crispr (= 7.1.9) + markdown-merge (= 7.1.9) + markly-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism specs: - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) + ast-crispr-ruby-prism (7.1.9) + ast-crispr (= 7.1.9) + prism-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) + ast-crispr (7.1.9) + ast-merge (= 7.1.9) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ast-merge-git (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: - ast-merge (7.1.8) + ast-merge (7.1.9) benchmark token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) + ast-template (7.1.9) + ast-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + bash-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + binary-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) + citrus-toml-merge (7.1.9) + ast-merge (= 7.1.9) + toml-merge (= 7.1.9) toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge specs: - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) commonmarker (~> 2.2) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) + dotenv-merge (7.1.9) + ast-merge (= 7.1.9) + plain-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + go-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + html-merge (7.1.9) + ast-crispr (= 7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + json-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: - kettle-jem (7.1.25) + kettle-jem (7.1.26) addressable (>= 2.8, < 3) ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) @@ -168,122 +168,122 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge specs: - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown (~> 2.5) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + markdown-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) + markly-merge (7.1.9) + markdown-merge (= 7.1.9) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge specs: - parslet-toml-merge (7.1.8) + parslet-toml-merge (7.1.9) toml (~> 0.3) - toml-merge (= 7.1.8) + toml-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + plain-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) + prism-merge (7.1.9) + ast-merge (= 7.1.9) prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + psych-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) + yaml-merge (= 7.1.9) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) + rbs-merge (7.1.9) + ast-merge (= 7.1.9) rbs (>= 3.10) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + rust-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) + smorg-rb (7.1.9) + ast-merge (= 7.1.9) + ast-merge-git (= 7.1.9) + bash-merge (= 7.1.9) diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) + dotenv-merge (= 7.1.9) + go-merge (= 7.1.9) + html-merge (= 7.1.9) + json-merge (= 7.1.9) kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) + markdown-merge (= 7.1.9) + plain-merge (= 7.1.9) + prism-merge (= 7.1.9) + psych-merge (= 7.1.9) + rbs-merge (= 7.1.9) + rust-merge (= 7.1.9) + toml-merge (= 7.1.9) + typescript-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + toml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: - tree_haver (7.1.8) + tree_haver (7.1.9) citrus (~> 3.0) parslet (~> 2.0) tree_sitter_language_pack (>= 1.16.2, < 2.0) @@ -292,17 +292,17 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + typescript-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) + zip-merge (7.1.9) + binary-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) GEM @@ -336,6 +336,8 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) + commonmarker (2.10.0) + rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -465,11 +467,15 @@ GEM lint_roller (1.1.0) logger (1.7.0) markly (0.19.0) + mini_portile2 (2.8.9) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) reline (~> 0.6) mutex_m (0.3.0) + nokogiri (1.19.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-musl) @@ -503,6 +509,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) + rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -696,6 +705,9 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_sitter_language_pack (1.16.2) + rb_sys (>= 0.9.130, < 0.10) + sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -784,9 +796,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.31) + kettle-dev (~> 3.0, >= 3.0.34) kettle-drift (~> 1.0, >= 1.0.13) - kettle-family (~> 1.2, >= 1.2.97) + kettle-family (~> 1.2, >= 1.2.100) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) @@ -807,12 +819,12 @@ DEPENDENCIES reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) - rubocop-lts (~> 24.2, >= 24.2.1) - rubocop-lts-rspec (~> 1.0, >= 1.0.5) + rubocop-lts (~> 24.2, >= 24.2.3) + rubocop-lts-rspec (~> 1.0, >= 1.0.6) rubocop-minitest (~> 0.40, >= 0.40.0) rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! - rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) ruby-merge! ruby-progressbar (~> 1.13) rust-merge! @@ -843,33 +855,34 @@ CHECKSUMS appraisal2 (3.2.3) sha256=3a6cfaf8a444e02707b9a34154af1c4902fbe99d9d2168d7e81dd83ec77e6db7 appraisal2-rubocop (1.0.2) sha256=1dae97c1be087cf9c098a3a72fd41f873435e9b8b39687e633b36c9ccb22bff4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.8) - ast-crispr-markdown-markly (7.1.8) - ast-crispr-ruby-prism (7.1.8) - ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) + ast-crispr (7.1.9) + ast-crispr-markdown-markly (7.1.9) + ast-crispr-ruby-prism (7.1.9) + ast-merge (7.1.9) + ast-merge-git (7.1.9) + ast-template (7.1.9) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.8) + bash-merge (7.1.9) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) - bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae + binary-merge (7.1.9) + bundler (4.1.0.beta1) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.8) + citrus-toml-merge (7.1.9) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 + commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e commonmarker (2.10.0-x86_64-darwin) sha256=01e0830ed0319825ecdc16411c90acd3f661d1568dfc178731b3f64d0ce2363d commonmarker (2.10.0-x86_64-linux) sha256=945c510c0bfca9022245928e2248468fe3ddad58c939be0c37b20082cc392880 commonmarker (2.10.0-x86_64-linux-musl) sha256=288cd4fb9f17eed2ffa73551ef241dcf594e0f484b2aee2a0999540333c0618e - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) completely (0.8.0) sha256=e493cd5d84805f47917a41f277ecbfe5f35363bed670be5a957d3acaed8c6c5e concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 @@ -878,7 +891,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docopt_ng (0.7.1) sha256=a024148ee4fa3ab1a8a04411aa4370f39cf2b446e63562097d418b7974a15667 - dotenv-merge (7.1.8) + dotenv-merge (7.1.9) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -891,35 +904,37 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) + go-merge (7.1.9) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) + html-merge (7.1.9) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a - json-merge (7.1.8) - kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + json-merge (7.1.9) + kettle-changelog (1.0.7) + kettle-dev (3.0.34) + kettle-drift (1.0.13) kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 - kettle-jem (7.1.25) + kettle-jem (7.1.26) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 - kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd + kettle-soup-cover (3.0.10) kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 - markdown-merge (7.1.8) + markdown-merge (7.1.9) markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca - markly-merge (7.1.8) + markly-merge (7.1.9) + mini_portile2 (2.8.9) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 + nokogiri (1.19.4) nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af nokogiri (1.19.4-arm64-darwin) sha256=a46db9853286e6597b36ebc6953817d15acf3a299583eb3f89fdc6f91dd63527 @@ -933,20 +948,22 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) - plain-merge (7.1.8) + parslet-toml-merge (7.1.9) + plain-merge (7.1.9) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.8) + prism-merge (7.1.9) psych (5.5.0) sha256=4b245bbbd0f3238df8ccee766ebc1a6b062b10e4ee1d3284eb588739ba156a0a - psych-merge (7.1.8) + psych-merge (7.1.9) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 - rbs-merge (7.1.8) + rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -982,11 +999,11 @@ CHECKSUMS rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.8) + ruby-merge (7.1.9) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) + rust-merge (7.1.9) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +1011,7 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) + smorg-rb (7.1.9) sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1011,9 +1028,10 @@ CHECKSUMS timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.8) + toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb - tree_haver (7.1.8) + tree_haver (7.1.9) + tree_sitter_language_pack (1.16.2) tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 @@ -1023,12 +1041,12 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) + typescript-merge (7.1.9) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 yaml-converter (0.2.5) sha256=a5214fe1a6c2df88bd34a35bcded1b1dcd30135548130df2e03b54ca8c0f2423 - yaml-merge (7.1.8) + yaml-merge (7.1.9) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.8) sha256=73d935d43e3479d65ce8aff25c7d3100e8bb83528a2adaa0ed824e5046ac99e7 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -1037,8 +1055,8 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) + zip-merge (7.1.9) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH - 4.0.20 + 4.1.0.beta1 diff --git a/gems/yaml-merge/Rakefile b/gems/yaml-merge/Rakefile index d3f424178..d8f334103 100644 --- a/gems/yaml-merge/Rakefile +++ b/gems/yaml-merge/Rakefile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -# yaml-merge Rakefile v7.1.18 - 2026-09-07 +# yaml-merge Rakefile v7.1.26 - 2026-09-09 # Ruby 2.3 (Safe Navigation) or higher required # # See LICENSE.md for license information. diff --git a/gems/yaml-merge/bin/rubocop-gradual b/gems/yaml-merge/bin/rubocop-gradual new file mode 100755 index 000000000..7c7ff0635 --- /dev/null +++ b/gems/yaml-merge/bin/rubocop-gradual @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'rubocop-gradual' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'rubygems' +require 'bundler/setup' + +load Gem.bin_path('rubocop-gradual', 'rubocop-gradual') diff --git a/gems/yaml-merge/gemfiles/modular/coverage_local.gemfile b/gems/yaml-merge/gemfiles/modular/coverage_local.gemfile index 37917caac..d6c890e46 100644 --- a/gems/yaml-merge/gemfiles/modular/coverage_local.gemfile +++ b/gems/yaml-merge/gemfiles/modular/coverage_local.gemfile @@ -29,11 +29,31 @@ Kernel.send(:gem, 'nomono', *nomono_activation_requirements) require 'nomono/bundler' local_gems = %w[kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -local_gems_to_eval = local_gems - %w[] - declared_gems # export KETTLE_DEV_DEV=/path/to/my platform :mri do + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + local_gems_to_eval = local_gems - %w[] - declared_gems + eval_nomono_gems( gems: local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/yaml-merge/gemfiles/modular/style.gemfile b/gems/yaml-merge/gemfiles/modular/style.gemfile index 59c5dc1a3..41ec99454 100644 --- a/gems/yaml-merge/gemfiles/modular/style.gemfile +++ b/gems/yaml-merge/gemfiles/modular/style.gemfile @@ -24,9 +24,9 @@ platform :mri do if ENV.fetch('RUBOCOP_LTS_DEV', 'false').casecmp('false').zero? declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) - gem 'rubocop-lts', '~> 24.2', '>= 24.2.1' unless declared_gems.include?('rubocop-lts') - gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.5' unless declared_gems.include?('rubocop-lts-rspec') - gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.6' unless declared_gems.include?('rubocop-ruby3_2') + gem 'rubocop-lts', '~> 24.2', '>= 24.2.3' unless declared_gems.include?('rubocop-lts') + gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.6' unless declared_gems.include?('rubocop-lts-rspec') + gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.8' unless declared_gems.include?('rubocop-ruby3_2') else eval_gemfile('style_local.gemfile') end diff --git a/gems/yaml-merge/gemfiles/modular/templating.gemfile b/gems/yaml-merge/gemfiles/modular/templating.gemfile index 6af159bd7..ce51a08ed 100644 --- a/gems/yaml-merge/gemfiles/modular/templating.gemfile +++ b/gems/yaml-merge/gemfiles/modular/templating.gemfile @@ -18,7 +18,7 @@ end if structuredmerge_remote # Merge recipes for released installs. - gem 'kettle-jem', '>= 7.0' + gem 'kettle-jem', '~> 7.1', '>= 7.1.26' end if kettle_remote diff --git a/gems/yaml-merge/gemfiles/modular/templating_local.gemfile b/gems/yaml-merge/gemfiles/modular/templating_local.gemfile index db36e9df3..82339e402 100644 --- a/gems/yaml-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/yaml-merge/gemfiles/modular/templating_local.gemfile @@ -65,9 +65,7 @@ structuredmerge_local_gems = %w[ kettle_dev_local_gems = %w[ kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift ] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[] -kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - (declared_gems - %w[kettle-dev]) if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( @@ -81,6 +79,28 @@ if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 end if ENV.fetch('KETTLE_DEV_DEV', 'false').casecmp('false') != 0 + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - declared_gems + eval_nomono_gems( gems: kettle_dev_local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/yaml-merge/yaml-merge.gemspec b/gems/yaml-merge/yaml-merge.gemspec index 4021248c3..860438464 100644 --- a/gems/yaml-merge/yaml-merge.gemspec +++ b/gems/yaml-merge/yaml-merge.gemspec @@ -120,7 +120,7 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.31') # ruby >= 4.0.0 + spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.34') # ruby >= 4.0.0 # Security spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 From 079d146b273607d796600f74b2babf51bcfaee7f Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 23:50:47 -0400 Subject: [PATCH 086/137] =?UTF-8?q?=F0=9F=8E=A8=20Template=20toml-merge=20?= =?UTF-8?q?by=20kettle-family?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/toml-merge/.kettle-drift.lock | 76 ++++- gems/toml-merge/.rubocop_gradual.lock | 9 +- .../.structuredmerge/kettle-jem.lock | 145 ++++----- gems/toml-merge/Gemfile | 2 +- gems/toml-merge/Gemfile.lock | 304 ++++++++++-------- gems/toml-merge/Rakefile | 2 +- gems/toml-merge/bin/rubocop-gradual | 16 + .../gemfiles/modular/coverage_local.gemfile | 24 +- .../toml-merge/gemfiles/modular/style.gemfile | 6 +- .../gemfiles/modular/templating.gemfile | 2 +- .../gemfiles/modular/templating_local.gemfile | 24 +- gems/toml-merge/toml-merge.gemspec | 2 +- 12 files changed, 381 insertions(+), 231 deletions(-) create mode 100755 gems/toml-merge/bin/rubocop-gradual diff --git a/gems/toml-merge/.kettle-drift.lock b/gems/toml-merge/.kettle-drift.lock index 98b009e1e..1b23f4793 100644 --- a/gems/toml-merge/.kettle-drift.lock +++ b/gems/toml-merge/.kettle-drift.lock @@ -1,10 +1,82 @@ { + "debug_env: 'KETTLE_DEV_DEBUG',\nroot: %w[src my kettle-dev]": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 46, + 63 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 93, + 110 + ] + } + ], + "path_env: 'KETTLE_DEV_DEV',\nvendored_gems_env: 'VENDORED_GEMS',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 43, + 60 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 90, + 107 + ] + } + ], + "prefix: 'KETTLE_DEV',\npath_env: 'KETTLE_DEV_DEV',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 42, + 59 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 89, + 106 + ] + } + ], + "vendor_gem_dir_env: 'VENDOR_GEM_DIR',\ndebug_env: 'KETTLE_DEV_DEBUG',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 45, + 62 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 92, + 109 + ] + } + ], "vendored_gems_env: 'VENDORED_GEMS',\nvendor_gem_dir_env: 'VENDOR_GEM_DIR',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 44, + 61 + ] + }, { "file": "gemfiles/modular/templating_local.gemfile", "lines": [ - 77, - 88 + 75, + 91, + 108 ] } ] diff --git a/gems/toml-merge/.rubocop_gradual.lock b/gems/toml-merge/.rubocop_gradual.lock index 942d6ade4..e1d49d698 100644 --- a/gems/toml-merge/.rubocop_gradual.lock +++ b/gems/toml-merge/.rubocop_gradual.lock @@ -2,7 +2,7 @@ ".simplecov:2333130821": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] ], - "Rakefile:2562572317": [ + "Rakefile:425105726": [ [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], [81, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], [165, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], @@ -22,6 +22,9 @@ [1, 1, 0, "Naming/FileName: The name of this source file (`vHEAD.gemfile`) should use snake_case.", 5381], [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], + "gemfiles/modular/coverage_local.gemfile:2813372128": [ + [34, 1, 1586, "Metrics/BlockLength: Block has too many lines. [37/25]", 820328175] + ], "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], @@ -255,7 +258,7 @@ [217, 7, 659, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `levenshtein_distance` is too high. [8/7]", 2658150371], [217, 7, 659, "Metrics/MethodLength: Method has too many lines. [18/10]", 2658150371] ], - "spec/fixtures_integration_spec.rb:3385407889": [ + "spec/fixtures_integration_spec.rb:857444757": [ [3, 1, 12696, "Metrics/BlockLength: Block has too many lines. [277/25]", 2102318823], [34, 3, 2178, "Metrics/BlockLength: Block has too many lines. [28/25]", 2701083302], [233, 3, 1146, "Metrics/BlockLength: Block has too many lines. [27/25]", 3231986094] @@ -263,7 +266,7 @@ "spec/toml/merge/retained_blank_gap_compliance_spec.rb:1717387616": [ [8, 1, 1046, "Metrics/BlockLength: Block has too many lines. [31/25]", 305562394] ], - "toml-merge.gemspec:3905559845": [ + "toml-merge.gemspec:454131680": [ [137, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4147388508], [148, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], [149, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] diff --git a/gems/toml-merge/.structuredmerge/kettle-jem.lock b/gems/toml-merge/.structuredmerge/kettle-jem.lock index 839aafb76..0dc2e9aa7 100644 --- a/gems/toml-merge/.structuredmerge/kettle-jem.lock +++ b/gems/toml-merge/.structuredmerge/kettle-jem.lock @@ -1,11 +1,12 @@ --- version: 1 template_state: - version: 7.1.18 - applied_at: '2026-09-07' + version: 7.1.26 + applied_at: '2026-09-10' changelog_replay: last_entry_key: kettle-jem-template-20260802-001 last_entry_date: '2026-08-02' + maintenance_changelog: {} checksums: ".aiignore.example": 48a5dfdd93afd1a15fdce39cc28ca9920263f00018b0968ab031fa744521e5ce ".config/mise/env.sh": aeea5a2ab489ba6e5467ae8de6e386ec8c8fe4ff31a044e69d0cd6a092dd6654 @@ -75,7 +76,7 @@ template_state: ".rubocop_rspec.yml.example": 288ad75e7eb14d87d80fafe6f7272217be5c57547536ee56c780a7d10ac7ec74 ".simplecov.example": 222f2e6ce8cf089c70a21f0f5e5423d4bd59a96fdb2ce7754b0fb3d6f430c229 ".structuredmerge/git-drivers.toml.example": 9d241a44c9edffcdbd3da018fa188a238089c3d1635040924df594a6929a4f97 - ".structuredmerge/kettle-jem.yml.example": 26949dc4ee0722415e72452cbc186bee6ef7b154eae33166d36f3fdb1ca6e46d + ".structuredmerge/kettle-jem.yml.example": ff65a738da1af7d60714026a81d3323a46c864e96ae3570b806afdf6e7149ff9 ".yard-lint.yml.example": 90def46867c9436b4e177c47d91fc8165f4602e335715aecc39f5587ae20b55b ".yardignore.example": 821f453c609df7d46145d675424b39dfbe6dfdca8edac5f367b85fff48502455 ".yardopts.example": 6fd6f2701713096a8a9ea095c213bbc68eeef37797c4754d97837e3229a3a5f6 @@ -88,7 +89,7 @@ template_state: CHANGELOG.transfer.md: 21331d8a9e58b4ff6e088b88eb408bcccb0f2f64e78f8f4d42ac3f11a24baad8 CITATION.cff.example: e404ea0a7919d78a83d53d80e211d17b9663576aa606583b709795dc023fd75c CODE_OF_CONDUCT.md.example: f1ad532f1860f73ef774c6b27a26d41f4bc1cb8813034f5957487766ebb0986b - CONTRIBUTING.md.example: 22570cfb3dde72be79b4b522b6d5ab13f95d778e40444483a096871fe0891b19 + CONTRIBUTING.md.example: 8d23cce2d061e0c20d619c3f66591df5f32821cd84c32d171df0b8ebe1217a55 FUNDING.md.example: 392d047904b1557b29f4b43d37ec403b7480edd5b6ab51180be979b57a91e6ba FUNDING.md.no-osc.example: 3ef0258dd3e3b7f7e17e8bc2d20dcbcb3e74aa5a5a6f51297075696645e34c77 Gemfile.example: 99500023987e81775a9b5ef14e92cb3992f2ac408e5f42454f2728eee9b49fb2 @@ -99,19 +100,19 @@ template_state: PolyForm-Small-Business-1.0.0.md.example: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 README.md.example: 21f491e3d73bfc1b74056a6dcba61f72c93dee3cfe5272ac164a20978454de21 REEK: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - RUBOCOP.md.example: c09e5533ccc59b70a2efa05c99f66e521137c1053d3c12eb43509cebd5b68b0e + RUBOCOP.md.example: d99871a0e4c1d323c92e7febf328f062bb4722069b2abfd0a83bf7daa8dcbf8c Rakefile.example: 569803e726b07ea26267fec6891367a3096a0dff3c266269a7081d36afe496af SECURITY.md.example: ee9411aa85f36d88363fdaea7a1baea4362b6ec112cf2688e711b05de1d3144c bin/setup.example: 0ac35089c95a91d8973fe7a318bf9fd98b9f8e00db92c5d9ca6cd858abb8d41b certs/pboling.pem.example: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - gem.gemspec.example: 83e834e8958a88e4817a57199f48f5ebb245548ce251c5c47372208693f03b17 + gem.gemspec.example: 12dcadc0b297ccd4e18b9d1e538b98ac8330ef9fb2a059ed6754ad59272b77fa gemfiles/modular/benchmark/r4/v0.5.gemfile.example: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 gemfiles/modular/benchmark/vHEAD.gemfile.example: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 gemfiles/modular/cgi/r4/v0.5.gemfile.example: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 gemfiles/modular/cgi/vHEAD.gemfile.example: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 gemfiles/modular/changelog.gemfile.example: 892598e0e7792eb205247ae28128cef6dfc647d2fb33968969152230d6f69288 gemfiles/modular/coverage.gemfile.example: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - gemfiles/modular/coverage_local.gemfile.example: 928d5f260d7b119c038baa56da9fb78dd524dee613aea33ab72894bbce5c506e + gemfiles/modular/coverage_local.gemfile.example: 92ea0d7a9d693553dc614afa2c43990f5c3778c2b00ef6c528e122c31bd506a1 gemfiles/modular/debug.gemfile.example: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 gemfiles/modular/documentation.gemfile.example: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c gemfiles/modular/documentation_local.gemfile.example: 84a20f5d4b0feb94c2cf2f7a8dce8f682f1483498e41484c2b447a5661fd1870 @@ -145,10 +146,10 @@ template_state: gemfiles/modular/stringio/r3/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/r4/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/vHEAD.gemfile.example: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - gemfiles/modular/style.gemfile.example: 3ad0585b4f2db8918580ca41ea8723f7a166d7a83cfd7f9613511094997106fd + gemfiles/modular/style.gemfile.example: 02fe3e8fd00e49b90c3ab30e19b51014ee50490f3eadcfd1d4a39f4c2c997dda gemfiles/modular/style_local.gemfile.example: c86beb711e766126a5be68be4be18255831625ac3650d5069383c4a83a9511f3 - gemfiles/modular/templating.gemfile.example: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - gemfiles/modular/templating_local.gemfile.example: 930057d3b909a72e39a39125c4e883a7ff71f5691e64426c0541f8c8fc75b83f + gemfiles/modular/templating.gemfile.example: 2b33c094677b53ad9dd2eafeb3a3be452f612380c61001a2e75b3c078b8ff72a + gemfiles/modular/templating_local.gemfile.example: ac7259516e69ffafb8b9342a897ddf6042adc46335743f474c342509cefd8f2e gemfiles/modular/webrick/r4/v1.9.gemfile.example: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea gemfiles/modular/webrick/vHEAD.gemfile.example: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b gemfiles/modular/x_std_libs.gemfile.example: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a @@ -175,7 +176,7 @@ template_state: shim/Gemfile.example: 0fb0d9d06fcfb1fd6ca6f0eeb5867253ca1ed221e03d28027719225f868b0637 shim/README.md.example: 3a2f7211b7f92a1dfae5e523b8e34b051a3d8af942144b05286eca0b3c8f6fbe shim/Rakefile.example: 572c94da7052083b39b62a6600785419e314a109efd7a3d8c3a96eb77ad34fd1 - shim/gem.gemspec.example: efae033238e4fd1355cfc134f5c9123f175d1ad1dc4a1a2e663899788c9e0870 + shim/gem.gemspec.example: 14a7015b3328005d1c3b5fda6886bd6da383707745f6eaaa781d6f9689600131 shim/lib/compat_require.rb.example: 94ee85e353a3ca08c8a35c9063d4ff789214ea594c7f803f6cf09d7142f48379 shim/lib/entrypoint.rb.example: dd57613520daca01d6f6bcaa9b83b00ff74505240dc04b84ceb686df3c0539d7 shim/lib/version.rb.example: 15e219ac3a928b5580035f891e415551213175020f1131f6e7ca0ccd55a1b2d6 @@ -189,370 +190,370 @@ files: recipe: template_source_application_simplecov action: write dest_sha256: d12ca8a1fac05cb7f01b2d897cf3c694a356504c593d633fe26b72eb45306bb8 - input_fingerprint: c486942ec680c5de296d8028269946a0a11be0784a16fdd4d90398d2670743f0 + input_fingerprint: 2a758dea6f2d8e5d8c801b6231df71fabaa28f1b73e544a1a23f835ed709b330 template_sources: - ".simplecov.example" AGPL-3.0-only.md: recipe: template_source_application_AGPL_3_0_only_md action: write dest_sha256: d8a6cc31abc16b6748c7a21f21611f5a1ec33f67d22ca23d7da1c19b95496bee - input_fingerprint: 178b9b0d7c18b577748f2a68616e3ae3d10c713b4ba5327cfdbc7fed6cdf0494 + input_fingerprint: 4a0d2040864a1c6493bbf16170d484ecb40dbd1e9e90869affa48e04953ec13f template_sources: - AGPL-3.0-only.md.example Gemfile: recipe: template_source_application_Gemfile action: write - dest_sha256: 8d63da2d28c3f1d4c3820d35c21cb97ef18ae99d8a39f4e766de8086b14adba3 - input_fingerprint: 578cdd8236de17ee4241d9b453bcb12ffc5255290fd0ea47db0eb35d3e23e3d7 + dest_sha256: d80fb7244df2a5888f52b76ccbc837f9da5404268b4d57617cd4380e8997240d + input_fingerprint: 2d50dd5048b021353c6e8ac573904d59098931ae0a0a3e18933e106a6991e7bb template_sources: - Gemfile.example LICENSE.md: recipe: template_source_application_LICENSE_md action: write dest_sha256: f6188bfd474a636d2a526420ebb411250faa447d94c9b9ccee097128ce4101b5 - input_fingerprint: c1d4d879f5785151cddfbbd718a2a3861cf0b9b978ce85cb4ee80be40e850e2b + input_fingerprint: 26fd93731c7ed69d5df89f1cbfbe2db89301d906c40632edea3dac85ee36061e template_sources: - LICENSE.md.example PolyForm-Small-Business-1.0.0.md: recipe: template_source_application_PolyForm_Small_Business_1_0_0_md action: write dest_sha256: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 - input_fingerprint: fa1eab6132c30685893930745fe93a76cdb9d10b132788e65fd7d677f747b253 + input_fingerprint: 5909980bd02ed4e8abff8d7c99e4d0664e7204591ccfbcc8e06a89e313197486 template_sources: - PolyForm-Small-Business-1.0.0.md.example README.md: recipe: template_source_application_README_md action: write dest_sha256: 23f0fd07731180887a20f26927b6ff3f1321ce618843fb35f2301ad4f960a0dc - input_fingerprint: 003413b2d646a5861c56c9934b1fe9ed285dce2df02c783ac4205c7410d5aaa1 + input_fingerprint: e0e3db122de2a8660b58342a6d7451c6cb4e9656394e57a2f0ba835049b8522b template_sources: - README.md.example Rakefile: recipe: template_source_application_Rakefile action: write - dest_sha256: d5b4eb2ea069d32d7a8adc864b2b73a39e652043f5c26fe194ac7f6bf69a4bb9 - input_fingerprint: be5e8219cc985f3e35e27d5a914f579969a40bf248482b2000d2c022d79d9a7d + dest_sha256: 1e01d08403f8272152cb1ee76011a0b700269277ddc505f3b0eb19ef21686b80 + input_fingerprint: c901ca77f799619cd11d269ae363777f3de894c0fe6dd0f4c218aa0bc98e1e2a template_sources: - Rakefile.example certs/pboling.pem: recipe: template_source_application_certs_pboling_pem action: write dest_sha256: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - input_fingerprint: ba29112e9c2de495297403dffa57551d890a52e75d90304f90241a26c8ec8e83 + input_fingerprint: 22a06afe8d0ad7c2648ead8ba857eb338edc5413a5a00f9e30fc6957b268ee5e template_sources: - certs/pboling.pem.example gemfiles/modular/benchmark/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_r4_v0_5_gemfile action: write dest_sha256: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 - input_fingerprint: e0ea9c899c46a1b59eab45d339ed49fdb467c35a58500f6204b1ac3802623b19 + input_fingerprint: b8488f91b932475b4d47df856f8fb1f5af0ddc6e7a89338728b0cd93c9140c26 template_sources: - gemfiles/modular/benchmark/r4/v0.5.gemfile.example gemfiles/modular/benchmark/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_vHEAD_gemfile action: write dest_sha256: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 - input_fingerprint: f820f7641d3319b673f03f7e1b229be07b97b7bfdaa14a80e0152e78c3edf8ed + input_fingerprint: 420d84ff5acd607891cdebfb8d9fb788e1ab743c7515863594620614a34d8ffa template_sources: - gemfiles/modular/benchmark/vHEAD.gemfile.example gemfiles/modular/cgi/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_cgi_r4_v0_5_gemfile action: write dest_sha256: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 - input_fingerprint: f644260a295328a1e131a306a9e162c44a88970115bf9c60cc151fdccfc0fe1d + input_fingerprint: 27ba45f1f69f2c13fbdad3215734c83c9f858417ef8462fe780ec55c6496d455 template_sources: - gemfiles/modular/cgi/r4/v0.5.gemfile.example gemfiles/modular/cgi/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_cgi_vHEAD_gemfile action: write dest_sha256: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 - input_fingerprint: 41e386a2e1b1899edd3d35a5d266f6e5e8881e8f14eb72b3d930083ba5a4088e + input_fingerprint: bb9ee8616d9853d99bf1a00f4c28f39e4622d3959247c30cc9d00fc40977ce61 template_sources: - gemfiles/modular/cgi/vHEAD.gemfile.example gemfiles/modular/changelog.gemfile: recipe: template_source_application_gemfiles_modular_changelog_gemfile action: write dest_sha256: da669526144fbff33aef207db9541b6fd6c254437f94dec2fab70fc55a7757cd - input_fingerprint: 256de93b648392c54f8a50cfed56dd7f26987121b3e9d1dd90d00b3a91428c13 + input_fingerprint: 939bdca6f3dafe3ef2138af0f873af0717eb31601fc3d6a6bf16f9c3e4d10484 template_sources: - gemfiles/modular/changelog.gemfile.example gemfiles/modular/coverage.gemfile: recipe: template_source_application_gemfiles_modular_coverage_gemfile action: write dest_sha256: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - input_fingerprint: 542fe75461fb871b85969e038f0b4928ed675b352baed24cc860294529003644 + input_fingerprint: b645acb7a43f2441cc272f2785306039e100b09d9f70d6119950fd88614d7a29 template_sources: - gemfiles/modular/coverage.gemfile.example gemfiles/modular/coverage_local.gemfile: recipe: template_source_application_gemfiles_modular_coverage_local_gemfile action: write - dest_sha256: 2b493414df06261ba8acb6f0eb18bf3fdd701d7cb5f967a9d15a3f42a4741827 - input_fingerprint: 480fdff62ad415751c002afd2982a3e30870ebbe54a4926b106592bf03ed1f31 + dest_sha256: 92c9a599c8f6867ec532880f73568f2736ac05d8973ec524b42fd5dbe6aeda3e + input_fingerprint: 7692c6cb8151a3f3512692ec471cd138ed00aa7a5c8f2e6080d8954e3e17a4ee template_sources: - gemfiles/modular/coverage_local.gemfile.example gemfiles/modular/debug.gemfile: recipe: template_source_application_gemfiles_modular_debug_gemfile action: write dest_sha256: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 - input_fingerprint: 3f931c7c358469ed5d959743f9bf64b111dce75c3dfcf52b8ed692e0eb9abbbd + input_fingerprint: 4ce37f31e3ea572b8358f851669ac3abd7c87f647d98a90f5f7fa50ca9f45152 template_sources: - gemfiles/modular/debug.gemfile.example gemfiles/modular/documentation.gemfile: recipe: template_source_application_gemfiles_modular_documentation_gemfile action: write dest_sha256: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c - input_fingerprint: d6ad5238471cd61d0217bd952ebaec94816e570133310d7531d8ee01fbe27cdf + input_fingerprint: 551309022b9ddb41f2e9c72c868c46198b1dc5f3cf76bbf10927eae7fc14806f template_sources: - gemfiles/modular/documentation.gemfile.example gemfiles/modular/documentation_local.gemfile: recipe: template_source_application_gemfiles_modular_documentation_local_gemfile action: write dest_sha256: 2058173855b9a4acc6d5efa20520e49734243eef6cf0b5e9063e0e5866a08e9c - input_fingerprint: c07e1827bd371f25edb5e5d26a6efebcee36c1dd3fd8b856c31b3def6282b470 + input_fingerprint: 3e7a75b91a5a99d417c6dda3d0339ed0782e4403c03d38cc7bbe81a2a4c77c9b template_sources: - gemfiles/modular/documentation_local.gemfile.example gemfiles/modular/erb/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r2_v3_0_gemfile action: write dest_sha256: 3793e7dc9ef23a7ccd893d48cbba092fd27594c63e65cca011cc658218425670 - input_fingerprint: 5e97ab1e024296dc116bdfb71f749be89f270563af6adfee125c4996dd304dd2 + input_fingerprint: 11ffa0374629bafb0a8c04c4f0afdee6326ed8ba60a1a3217ded58dbda68690c template_sources: - gemfiles/modular/erb/r2/v3.0.gemfile.example gemfiles/modular/erb/r3/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r3_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: e9a9d1ef66037ca68de4f10e8ae53e75a041c22c37768e4c8e658c6bc85b5468 + input_fingerprint: 6da2d51cd29ca3a3de689d3a8f642508601e9d7a4d00b50ac328de68f2f58140 template_sources: - gemfiles/modular/erb/r3/v5.0.gemfile.example gemfiles/modular/erb/r4/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r4_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 42701c8e7cacae8911e9e257a687bd4eeb5d1de08a4c2f58123fb032fc5c5154 + input_fingerprint: 34feb9fda02f99190cc801f780fe7d672511456e076664d24381a21484d94072 template_sources: - gemfiles/modular/erb/r4/v5.0.gemfile.example gemfiles/modular/erb/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_erb_vHEAD_gemfile action: write dest_sha256: ad6f104a49e80e0cf625440e3dc816343fe7e2f037fc4971df75e7bb4305c683 - input_fingerprint: 859c15a8385bc4b3ee6d7d3bf73fb78208e2fe71c9e8861ad94473d7cbbc500f + input_fingerprint: 6bffa6cf928a2db376d0104e6d1dd6965758a7557f77696d6dc3a96e46b6f92a template_sources: - gemfiles/modular/erb/vHEAD.gemfile.example gemfiles/modular/json/truffleruby_22_3.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_22_3_gemfile action: write dest_sha256: 249c12eacbe90f9d0d2e81e7a62c4c7e9102e504ededcda4ecf660cb3bb68be4 - input_fingerprint: 8373ebddfc434978f81ae5eb34681716f8c1631a80db6bb4feb1e2fc2cc9807d + input_fingerprint: cab0d844925b1576fe257313e6d383a48794e2230efa739f2fb5d38bb0b4058b template_sources: - gemfiles/modular/json/truffleruby_22_3.gemfile.example gemfiles/modular/json/truffleruby_23_0.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_0_gemfile action: write dest_sha256: 66aa010567f7afa1af8244a74c3c88ecaaf84dc87b6a25180691bb480d02ed28 - input_fingerprint: 0c8759ff460660d718d71158b0b33db8ab0912fc97b8ff14ac1d2799561bc8d7 + input_fingerprint: 3f3f45a1dd2a87e3b845c191ec436d61c43bc1b49ea8b4147ec6e1f6f81bc09a template_sources: - gemfiles/modular/json/truffleruby_23_0.gemfile.example gemfiles/modular/json/truffleruby_23_1.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_1_gemfile action: write dest_sha256: '080fcbdaf2bec73cad40832a3d51eebb380af789917b96f493d1460b0dd6361d' - input_fingerprint: b6d3e87b10c93a6425f44ac99aeb49ea948e83f05cd000dfa2aa5294aa60a046 + input_fingerprint: 6c105f718573fdba4fba14605229aaec6a2b6b533b930bfe9b0ba4c028bfb7cc template_sources: - gemfiles/modular/json/truffleruby_23_1.gemfile.example gemfiles/modular/mutex_m/r2/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r2_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: aaccc740c56b8f1ee4ba2c83f9654bce810a8615c13b2d7032b1344ab7d4cc6b + input_fingerprint: bfad80e7453bbcff3fc7437dd2c8d849650efd0feb6183ab2ccda9b03fc64164 template_sources: - gemfiles/modular/mutex_m/r2/v0.3.gemfile.example gemfiles/modular/mutex_m/r3/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r3_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: a421f958d286d80c0d3d4cd1e2d49efff59aba3c511d5864c43c304f29db37ad + input_fingerprint: 9a890aa493092e5df58e42c421ef5207aaa276ad4534817c533489d8ef7f6325 template_sources: - gemfiles/modular/mutex_m/r3/v0.3.gemfile.example gemfiles/modular/mutex_m/r4/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r4_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: bd02034578a084f842a9855637a419125a279186124b2f24bf3e222bc0767358 + input_fingerprint: f40a9f2482fb707a19be6409d05c6a8e8533bda8370401882298456df2557829 template_sources: - gemfiles/modular/mutex_m/r4/v0.3.gemfile.example gemfiles/modular/mutex_m/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_vHEAD_gemfile action: write dest_sha256: '08018641c97f894788fa91b462da504ab2237213d18d95404136c393274ae3cb' - input_fingerprint: 512ac211b909fbb0d0b2cf6ff7db3c2de505efe656df1373a867a4fcef54e3f1 + input_fingerprint: ef8fb47f231abf175088abd48cc86bdcd793a9d97ab1f21ddb9e431ee4c13387 template_sources: - gemfiles/modular/mutex_m/vHEAD.gemfile.example gemfiles/modular/optional.gemfile: recipe: template_source_application_gemfiles_modular_optional_gemfile action: write dest_sha256: f770e6e9a9dd2bd0f1f132e882d88038b2e21127dce3afe270908c7338c28bfd - input_fingerprint: 5a4470d560575f0d717917a5780de0847be11b8951e0a2b268b5554497cda0e0 + input_fingerprint: 5ca1648f7e9ba262142f757006e49f947769de2577454fefe18e30415970ba36 template_sources: - gemfiles/modular/optional.gemfile.example gemfiles/modular/rspec.gemfile: recipe: template_source_application_gemfiles_modular_rspec_gemfile action: write dest_sha256: d043f5c9344f6435edb4607c5adaf42c78e7fb6b8b6726007de2bbedefb376c3 - input_fingerprint: cc8c1ffec69fcdbd60c8a816df16016b8b71aba6486b961f1303bf313f08587a + input_fingerprint: 20fc7e5b4b5ed20705d1ea09beee6376df7e577d7470000afe551c0aea4f40b4 template_sources: - gemfiles/modular/rspec.gemfile.example gemfiles/modular/runtime_heads.gemfile: recipe: template_source_application_gemfiles_modular_runtime_heads_gemfile action: write dest_sha256: 6ac7158c4a3088190f2a9082f01439eb27eca2172ab3464b15c9cb045aa885e1 - input_fingerprint: 47ae4b939c398a244c4a473e049b0cb82d0786989773a5148b1f063c956fc958 + input_fingerprint: 96db6b07466f390cf714884f05f8494551c55ef8726b2d8487b2e85d61b30b75 template_sources: - gemfiles/modular/runtime_heads.gemfile.example gemfiles/modular/stringio/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r2_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 3861d504bd9b672272b398aebb1a680d09191c2c703ba940d09e5a1b9cbc77c2 + input_fingerprint: d004489900461116554c22c020d21784b54be149f98075836fc9412bf30c6eaf template_sources: - gemfiles/modular/stringio/r2/v3.0.gemfile.example gemfiles/modular/stringio/r3/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r3_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 598500506d80033b48298af19281d14e3a0ae117937aa67cc1f4e8515ff54496 + input_fingerprint: efa165971ce0992f325ed4c15684e44aee0124bb24e63bdcbb6b597bf25d3476 template_sources: - gemfiles/modular/stringio/r3/v3.0.gemfile.example gemfiles/modular/stringio/r4/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r4_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: ce453be7c7d851673678ff1a2c0b2aed6562c5f66992a8af5d42fd7f7d8d75c7 + input_fingerprint: 5e50fdfd7a5dfdc62cc830f8ff819bdc546184721a706a087085d65692c79ce8 template_sources: - gemfiles/modular/stringio/r4/v3.0.gemfile.example gemfiles/modular/stringio/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_stringio_vHEAD_gemfile action: write dest_sha256: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - input_fingerprint: 9e05a434b501e98a994d01544b400e49f2a9aa6c1755b66ec75ee736426f91ce + input_fingerprint: 323351ff8b10bbd56fd2ac05e12dae6f304de3f56121a799eda165e0284c2c8a template_sources: - gemfiles/modular/stringio/vHEAD.gemfile.example gemfiles/modular/style.gemfile: recipe: template_source_application_gemfiles_modular_style_gemfile action: write - dest_sha256: 2a3d46dcb8a9394f595f273f5eb0403d0a552837754ab109afc9ba79a7159083 - input_fingerprint: b0cbf047fee9e58d2f7b7aec050398215fec53b434035abdfb0345f2e28c2176 + dest_sha256: 9a24acff0054573c30f5d84d0418cd465ba3794d075bb5a36801410ac40e0787 + input_fingerprint: 558f7db9ff0084f8d9b476d7f420acd9a40b78a299308781cf20159e7869d4f9 template_sources: - gemfiles/modular/style.gemfile.example gemfiles/modular/style_local.gemfile: recipe: template_source_application_gemfiles_modular_style_local_gemfile action: write dest_sha256: 55eb9c149cdb2f29c9f31abe2d55a4f334e00fb859681dd17c42149a3f28ca36 - input_fingerprint: a45368faca938f739e4629862a0b2bdea253f64a62883e2da935a1fe42b99248 + input_fingerprint: 37a094346d9631a45662a50cc6e6d2ed861e9e5a39fa64931fd06785e1d7659d template_sources: - gemfiles/modular/style_local.gemfile.example gemfiles/modular/templating.gemfile: recipe: template_source_application_gemfiles_modular_templating_gemfile action: write - dest_sha256: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - input_fingerprint: 1641c0eba3979c1643e9f43a24258a13050d363886524bbd796df658ba9d0fc7 + dest_sha256: 432ba59798d31b899268257c432443a017c5a9bd2c0c7f9f2216617e14150cd3 + input_fingerprint: 04cd457cb64d6c8bdba41647226104d39282df99f7a18e235b179f76a1382613 template_sources: - gemfiles/modular/templating.gemfile.example gemfiles/modular/templating_local.gemfile: recipe: template_source_application_gemfiles_modular_templating_local_gemfile action: write - dest_sha256: 295066e727d96fb3fd96d898f0f1ce86acf153ed154ca78a1d43fc0110488d0b - input_fingerprint: 4793e43c13ac3c4f7ff3a147f5e32ade636801e54d6bcf7ef7c2d715bb92f4da + dest_sha256: adcecde18ca16a9097df2340b565b020ed28d1b3d11404574b337d64af5bf61e + input_fingerprint: 49f090b60282395818006a2a815a1c727161f9624893f54ad08360f285feed04 template_sources: - gemfiles/modular/templating_local.gemfile.example gemfiles/modular/webrick/r4/v1.9.gemfile: recipe: template_source_application_gemfiles_modular_webrick_r4_v1_9_gemfile action: write dest_sha256: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea - input_fingerprint: 3aff7109b99df50c92d519b861ef346c54db05262cb4abf3579048a4cb7a0d10 + input_fingerprint: 7fa086d09cfe75bf68cda0c294bb7abb14aacd54d91542c2cec426bdb827236c template_sources: - gemfiles/modular/webrick/r4/v1.9.gemfile.example gemfiles/modular/webrick/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_webrick_vHEAD_gemfile action: write dest_sha256: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b - input_fingerprint: dabe9f57de4662c178e2895f8d624842466c631e9b5997a2377b890267dcaa6a + input_fingerprint: 8052f52b4da77649b2772259395ac0d12b6e463dbb3ed8a2b57cc2c576f05209 template_sources: - gemfiles/modular/webrick/vHEAD.gemfile.example gemfiles/modular/x_std_libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_gemfile action: write dest_sha256: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a - input_fingerprint: a620cb40270977e14532a8479d6197c00cfbde588d5f45920ae38823aeadb098 + input_fingerprint: b6d36f2fc1394e098e3967ddd48dce9ff22c531e3ddff1f99bea23286c3aa5bd template_sources: - gemfiles/modular/x_std_libs.gemfile.example gemfiles/modular/x_std_libs/r2/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r2_libs_gemfile action: write dest_sha256: e80ec8ad06cb1b31ac982bc25cf7696987fca131aa1001eaefd0bf5cd379c273 - input_fingerprint: d63e145943d398477fd281979196609cc53127d978d0a4aabdce05e27030152d + input_fingerprint: c55096f694459787b7b49c9650022e041d0281c4007f9f8eed5f30142eff7b38 template_sources: - gemfiles/modular/x_std_libs/r2/libs.gemfile.example gemfiles/modular/x_std_libs/r3.1/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_1_libs_gemfile action: write dest_sha256: 9f8565c40b09bea1bc4c2e2ad87fe11400c3c51a2b235655bfcd8e491ed88ca8 - input_fingerprint: 8301a117f572e14a1b12fb737aebb6bb804ce906d62618446a615d6a6b382e48 + input_fingerprint: c1e5672970c0556015b79317bc8f456ef933cec7448a2748156ccc6584c52735 template_sources: - gemfiles/modular/x_std_libs/r3.1/libs.gemfile.example gemfiles/modular/x_std_libs/r3/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_libs_gemfile action: write dest_sha256: 546f8849f4267bb19aa10ff0de40be30957197f229e6887847181ea9127b2650 - input_fingerprint: a08f34b4e8c16cdafd5c1da239f214ebbe0788a016274c2d0ec2bb7a438d2a9d + input_fingerprint: 2292321ee752e7fbcd1b5ff09586838385cc7741b4ca7e68e1dadcb94207bee6 template_sources: - gemfiles/modular/x_std_libs/r3/libs.gemfile.example gemfiles/modular/x_std_libs/r4/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r4_libs_gemfile action: write dest_sha256: 8c2582eaa218d216b98c86c933465295c8b4e43f3251ea388b9eaf6e471f8da6 - input_fingerprint: efc3cf14d853eeebbe1484c525a4b65707565488a1799988983e530b7e050a14 + input_fingerprint: a78ee735f591f58b1ec8b676146f1284f324c26e09310b5c0753e55e17811671 template_sources: - gemfiles/modular/x_std_libs/r4/libs.gemfile.example gemfiles/modular/x_std_libs/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_vHEAD_gemfile action: write dest_sha256: d3133ec4c0638363a7fb025d19be7e95a615fd61c35ddb8d17f2280ee74a7486 - input_fingerprint: 9d3d8f3d2f65e6a10630980d961616ffecf83cf08bf0aa24fb8dba955ea3a755 + input_fingerprint: 758d125bfc64a9c95b2a8e99e3d517605bf35e8be76af7d09f685534aa203a00 template_sources: - gemfiles/modular/x_std_libs/vHEAD.gemfile.example lib/toml/merge/version.rb: recipe: template_source_application_lib_toml_merge_version_rb action: write - dest_sha256: b6f6ad5d4771b0bffba479fe97b96e94f3992a790b5390ddfc8973dfa79180be - input_fingerprint: d2a0a7b558d4fe6c14604f69166d87739cae7b118431b0cc1303638b87766a86 + dest_sha256: 848215224ee4bf72c6e3d26b8709191a248fc70058be1d9278356277b80cdeb7 + input_fingerprint: 57ee626c955065f0496fc074433a1f9a1e348b57b1151a904e79b174aa21a3d4 template_sources: - lib/gem/version.rb.example mise.toml: recipe: template_source_application_mise_toml action: write dest_sha256: 7d267154ca4f081b0ac7da804c0180c2b091aec5f1c877417c1c320f4f369c88 - input_fingerprint: c1877422aff2ec64446eb768a85a2ac3d93796b2dbf9f70a473c89a1adf1ebc7 + input_fingerprint: c313604a7648368cc2f995164ffe8e47aca9fc39d294983b66cc95b9b0e80bb1 template_sources: - mise.toml.no-osc.example sig/toml/merge.rbs: recipe: template_source_application_sig_toml_merge_rbs action: write dest_sha256: 80cc57ca6782f5da836a7dd8270fa216658fe4f34afe9e515a2cf616c7473ca0 - input_fingerprint: 926447295ba224c51b357a7e1bad5d2b7b22f2a8f28d52d1cd30489a187a139a + input_fingerprint: 73214271610b800a4c1fe57e3e4a820102d9bcaa239a7e08edca5665c6cfe60b template_sources: - sig/gem.rbs.example spec/spec_helper.rb: recipe: template_source_application_spec_spec_helper_rb action: write dest_sha256: 64fdcc92d651bd35884970816382297f3b703a01577a555921a557069c984d37 - input_fingerprint: f2286841af004492e9c3ad26ab2caaead08d0edbb50364f54db52b276ebc3d6b + input_fingerprint: 512e7b41dea7744bd39b34efaa26cb4d211431276f429807d445e5b9edf3916d template_sources: - spec/spec_helper.rb.example toml-merge.gemspec: recipe: template_source_application_toml_merge_gemspec action: write - dest_sha256: a22e2df02f143f35bad91fdf2c59f0c9ea54941b184adb5d7565fd3cf2a07eb4 - input_fingerprint: dda0d400ee91e4025f6a91a411fc46660613f4946488f83f9996486d252c8b00 + dest_sha256: cdd78324441cd0d00aabafc822f85bc82b04c00be276e426f937b7b9c0fecdb9 + input_fingerprint: 35ca3736d38a7c6249f4413629343c6b73754eec2308ccd89e9a45deda0b7d67 template_sources: - gem.gemspec.example diff --git a/gems/toml-merge/Gemfile b/gems/toml-merge/Gemfile index e809a01b7..8981e84ac 100644 --- a/gems/toml-merge/Gemfile +++ b/gems/toml-merge/Gemfile @@ -19,7 +19,7 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } # Include dependencies from toml-merge.gemspec gemspec -gem 'kettle-family', '~> 1.2', '>= 1.2.97' +gem 'kettle-family', '~> 1.2', '>= 1.2.100' # Local workspace dependency wiring for *_local.gemfile overrides gem 'nomono', '~> 1.1', '>= 1.1.5', require: false # ruby >= 3.2.0 diff --git a/gems/toml-merge/Gemfile.lock b/gems/toml-merge/Gemfile.lock index 8c842cd58..c625139d7 100644 --- a/gems/toml-merge/Gemfile.lock +++ b/gems/toml-merge/Gemfile.lock @@ -10,131 +10,131 @@ GIT PATH remote: . specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + toml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) + ast-crispr-markdown-markly (7.1.9) + ast-crispr (= 7.1.9) + markdown-merge (= 7.1.9) + markly-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism specs: - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) + ast-crispr-ruby-prism (7.1.9) + ast-crispr (= 7.1.9) + prism-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) + ast-crispr (7.1.9) + ast-merge (= 7.1.9) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ast-merge-git (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: - ast-merge (7.1.8) + ast-merge (7.1.9) benchmark token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) + ast-template (7.1.9) + ast-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + bash-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + binary-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) + citrus-toml-merge (7.1.9) + ast-merge (= 7.1.9) + toml-merge (= 7.1.9) toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge specs: - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) commonmarker (~> 2.2) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) + dotenv-merge (7.1.9) + ast-merge (= 7.1.9) + plain-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + go-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + html-merge (7.1.9) + ast-crispr (= 7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + json-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: - kettle-jem (7.1.25) + kettle-jem (7.1.26) addressable (>= 2.8, < 3) ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) @@ -168,114 +168,114 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge specs: - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown (~> 2.5) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + markdown-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) + markly-merge (7.1.9) + markdown-merge (= 7.1.9) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge specs: - parslet-toml-merge (7.1.8) + parslet-toml-merge (7.1.9) toml (~> 0.3) - toml-merge (= 7.1.8) + toml-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + plain-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) + prism-merge (7.1.9) + ast-merge (= 7.1.9) prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + psych-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) + yaml-merge (= 7.1.9) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) + rbs-merge (7.1.9) + ast-merge (= 7.1.9) rbs (>= 3.10) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + rust-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) + smorg-rb (7.1.9) + ast-merge (= 7.1.9) + ast-merge-git (= 7.1.9) + bash-merge (= 7.1.9) diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) + dotenv-merge (= 7.1.9) + go-merge (= 7.1.9) + html-merge (= 7.1.9) + json-merge (= 7.1.9) kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) + markdown-merge (= 7.1.9) + plain-merge (= 7.1.9) + prism-merge (= 7.1.9) + psych-merge (= 7.1.9) + rbs-merge (= 7.1.9) + rust-merge (= 7.1.9) + toml-merge (= 7.1.9) + typescript-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: - tree_haver (7.1.8) + tree_haver (7.1.9) citrus (~> 3.0) parslet (~> 2.0) tree_sitter_language_pack (>= 1.16.2, < 2.0) @@ -284,25 +284,25 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + typescript-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + yaml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) + zip-merge (7.1.9) + binary-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) GEM @@ -336,6 +336,8 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) + commonmarker (2.10.0) + rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -465,11 +467,15 @@ GEM lint_roller (1.1.0) logger (1.7.0) markly (0.19.0) + mini_portile2 (2.8.9) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) reline (~> 0.6) mutex_m (0.3.0) + nokogiri (1.19.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-musl) @@ -503,6 +509,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) + rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -696,6 +705,9 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_sitter_language_pack (1.16.2) + rb_sys (>= 0.9.130, < 0.10) + sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -784,9 +796,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.31) + kettle-dev (~> 3.0, >= 3.0.34) kettle-drift (~> 1.0, >= 1.0.13) - kettle-family (~> 1.2, >= 1.2.97) + kettle-family (~> 1.2, >= 1.2.100) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) @@ -807,12 +819,12 @@ DEPENDENCIES reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) - rubocop-lts (~> 24.2, >= 24.2.1) - rubocop-lts-rspec (~> 1.0, >= 1.0.5) + rubocop-lts (~> 24.2, >= 24.2.3) + rubocop-lts-rspec (~> 1.0, >= 1.0.6) rubocop-minitest (~> 0.40, >= 0.40.0) rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! - rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) ruby-merge! ruby-progressbar (~> 1.13) rust-merge! @@ -843,33 +855,34 @@ CHECKSUMS appraisal2 (3.2.3) sha256=3a6cfaf8a444e02707b9a34154af1c4902fbe99d9d2168d7e81dd83ec77e6db7 appraisal2-rubocop (1.0.2) sha256=1dae97c1be087cf9c098a3a72fd41f873435e9b8b39687e633b36c9ccb22bff4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.8) - ast-crispr-markdown-markly (7.1.8) - ast-crispr-ruby-prism (7.1.8) - ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) + ast-crispr (7.1.9) + ast-crispr-markdown-markly (7.1.9) + ast-crispr-ruby-prism (7.1.9) + ast-merge (7.1.9) + ast-merge-git (7.1.9) + ast-template (7.1.9) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.8) + bash-merge (7.1.9) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) - bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae + binary-merge (7.1.9) + bundler (4.1.0.beta1) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.8) + citrus-toml-merge (7.1.9) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 + commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e commonmarker (2.10.0-x86_64-darwin) sha256=01e0830ed0319825ecdc16411c90acd3f661d1568dfc178731b3f64d0ce2363d commonmarker (2.10.0-x86_64-linux) sha256=945c510c0bfca9022245928e2248468fe3ddad58c939be0c37b20082cc392880 commonmarker (2.10.0-x86_64-linux-musl) sha256=288cd4fb9f17eed2ffa73551ef241dcf594e0f484b2aee2a0999540333c0618e - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) completely (0.8.0) sha256=e493cd5d84805f47917a41f277ecbfe5f35363bed670be5a957d3acaed8c6c5e concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 @@ -878,7 +891,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docopt_ng (0.7.1) sha256=a024148ee4fa3ab1a8a04411aa4370f39cf2b446e63562097d418b7974a15667 - dotenv-merge (7.1.8) + dotenv-merge (7.1.9) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -891,35 +904,37 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) + go-merge (7.1.9) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) + html-merge (7.1.9) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a - json-merge (7.1.8) - kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + json-merge (7.1.9) + kettle-changelog (1.0.7) + kettle-dev (3.0.34) + kettle-drift (1.0.13) kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 - kettle-jem (7.1.25) + kettle-jem (7.1.26) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 - kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd + kettle-soup-cover (3.0.10) kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 - markdown-merge (7.1.8) + markdown-merge (7.1.9) markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca - markly-merge (7.1.8) + markly-merge (7.1.9) + mini_portile2 (2.8.9) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 + nokogiri (1.19.4) nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af nokogiri (1.19.4-arm64-darwin) sha256=a46db9853286e6597b36ebc6953817d15acf3a299583eb3f89fdc6f91dd63527 @@ -933,20 +948,22 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) - plain-merge (7.1.8) + parslet-toml-merge (7.1.9) + plain-merge (7.1.9) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.8) + prism-merge (7.1.9) psych (5.5.0) sha256=4b245bbbd0f3238df8ccee766ebc1a6b062b10e4ee1d3284eb588739ba156a0a - psych-merge (7.1.8) + psych-merge (7.1.9) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 - rbs-merge (7.1.8) + rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -982,11 +999,11 @@ CHECKSUMS rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.8) + ruby-merge (7.1.9) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) + rust-merge (7.1.9) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +1011,7 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) + smorg-rb (7.1.9) sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,10 +1027,11 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.8) + toml (0.3.0) + toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb - tree_haver (7.1.8) + tree_haver (7.1.9) + tree_sitter_language_pack (1.16.2) tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 @@ -1023,12 +1041,12 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) + typescript-merge (7.1.9) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 yaml-converter (0.2.5) sha256=a5214fe1a6c2df88bd34a35bcded1b1dcd30135548130df2e03b54ca8c0f2423 - yaml-merge (7.1.8) + yaml-merge (7.1.9) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.8) sha256=73d935d43e3479d65ce8aff25c7d3100e8bb83528a2adaa0ed824e5046ac99e7 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -1037,8 +1055,8 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) + zip-merge (7.1.9) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH - 4.0.20 + 4.1.0.beta1 diff --git a/gems/toml-merge/Rakefile b/gems/toml-merge/Rakefile index 749079861..5248ac613 100644 --- a/gems/toml-merge/Rakefile +++ b/gems/toml-merge/Rakefile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -# toml-merge Rakefile v7.1.18 - 2026-09-07 +# toml-merge Rakefile v7.1.26 - 2026-09-09 # Ruby 2.3 (Safe Navigation) or higher required # # See LICENSE.md for license information. diff --git a/gems/toml-merge/bin/rubocop-gradual b/gems/toml-merge/bin/rubocop-gradual new file mode 100755 index 000000000..7c7ff0635 --- /dev/null +++ b/gems/toml-merge/bin/rubocop-gradual @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'rubocop-gradual' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'rubygems' +require 'bundler/setup' + +load Gem.bin_path('rubocop-gradual', 'rubocop-gradual') diff --git a/gems/toml-merge/gemfiles/modular/coverage_local.gemfile b/gems/toml-merge/gemfiles/modular/coverage_local.gemfile index 37917caac..d6c890e46 100644 --- a/gems/toml-merge/gemfiles/modular/coverage_local.gemfile +++ b/gems/toml-merge/gemfiles/modular/coverage_local.gemfile @@ -29,11 +29,31 @@ Kernel.send(:gem, 'nomono', *nomono_activation_requirements) require 'nomono/bundler' local_gems = %w[kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -local_gems_to_eval = local_gems - %w[] - declared_gems # export KETTLE_DEV_DEV=/path/to/my platform :mri do + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + local_gems_to_eval = local_gems - %w[] - declared_gems + eval_nomono_gems( gems: local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/toml-merge/gemfiles/modular/style.gemfile b/gems/toml-merge/gemfiles/modular/style.gemfile index 59c5dc1a3..41ec99454 100644 --- a/gems/toml-merge/gemfiles/modular/style.gemfile +++ b/gems/toml-merge/gemfiles/modular/style.gemfile @@ -24,9 +24,9 @@ platform :mri do if ENV.fetch('RUBOCOP_LTS_DEV', 'false').casecmp('false').zero? declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) - gem 'rubocop-lts', '~> 24.2', '>= 24.2.1' unless declared_gems.include?('rubocop-lts') - gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.5' unless declared_gems.include?('rubocop-lts-rspec') - gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.6' unless declared_gems.include?('rubocop-ruby3_2') + gem 'rubocop-lts', '~> 24.2', '>= 24.2.3' unless declared_gems.include?('rubocop-lts') + gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.6' unless declared_gems.include?('rubocop-lts-rspec') + gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.8' unless declared_gems.include?('rubocop-ruby3_2') else eval_gemfile('style_local.gemfile') end diff --git a/gems/toml-merge/gemfiles/modular/templating.gemfile b/gems/toml-merge/gemfiles/modular/templating.gemfile index 6af159bd7..ce51a08ed 100644 --- a/gems/toml-merge/gemfiles/modular/templating.gemfile +++ b/gems/toml-merge/gemfiles/modular/templating.gemfile @@ -18,7 +18,7 @@ end if structuredmerge_remote # Merge recipes for released installs. - gem 'kettle-jem', '>= 7.0' + gem 'kettle-jem', '~> 7.1', '>= 7.1.26' end if kettle_remote diff --git a/gems/toml-merge/gemfiles/modular/templating_local.gemfile b/gems/toml-merge/gemfiles/modular/templating_local.gemfile index f4db66d27..9f114319a 100644 --- a/gems/toml-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/toml-merge/gemfiles/modular/templating_local.gemfile @@ -65,9 +65,7 @@ structuredmerge_local_gems = %w[ kettle_dev_local_gems = %w[ kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift ] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[] -kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - (declared_gems - %w[kettle-dev]) if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( @@ -81,6 +79,28 @@ if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 end if ENV.fetch('KETTLE_DEV_DEV', 'false').casecmp('false') != 0 + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - declared_gems + eval_nomono_gems( gems: kettle_dev_local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/toml-merge/toml-merge.gemspec b/gems/toml-merge/toml-merge.gemspec index 61693ea40..240cb8fd9 100644 --- a/gems/toml-merge/toml-merge.gemspec +++ b/gems/toml-merge/toml-merge.gemspec @@ -120,7 +120,7 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.31') # ruby >= 4.0.0 + spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.34') # ruby >= 4.0.0 # Security spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 From 78f8e92db59fa310fd8298841cd1fe7c8c558132 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 23:50:47 -0400 Subject: [PATCH 087/137] =?UTF-8?q?=F0=9F=8E=A8=20Template=20go-merge=20by?= =?UTF-8?q?=20kettle-family?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/go-merge/.kettle-drift.lock | 76 ++++- gems/go-merge/.rubocop_gradual.lock | 7 +- .../go-merge/.structuredmerge/kettle-jem.lock | 145 ++++----- gems/go-merge/Gemfile | 2 +- gems/go-merge/Gemfile.lock | 304 ++++++++++-------- gems/go-merge/Rakefile | 2 +- gems/go-merge/bin/rubocop-gradual | 16 + .../gemfiles/modular/coverage_local.gemfile | 24 +- gems/go-merge/gemfiles/modular/style.gemfile | 6 +- .../gemfiles/modular/templating.gemfile | 2 +- .../gemfiles/modular/templating_local.gemfile | 24 +- gems/go-merge/go-merge.gemspec | 2 +- 12 files changed, 380 insertions(+), 230 deletions(-) create mode 100755 gems/go-merge/bin/rubocop-gradual diff --git a/gems/go-merge/.kettle-drift.lock b/gems/go-merge/.kettle-drift.lock index 98b009e1e..1b23f4793 100644 --- a/gems/go-merge/.kettle-drift.lock +++ b/gems/go-merge/.kettle-drift.lock @@ -1,10 +1,82 @@ { + "debug_env: 'KETTLE_DEV_DEBUG',\nroot: %w[src my kettle-dev]": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 46, + 63 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 93, + 110 + ] + } + ], + "path_env: 'KETTLE_DEV_DEV',\nvendored_gems_env: 'VENDORED_GEMS',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 43, + 60 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 90, + 107 + ] + } + ], + "prefix: 'KETTLE_DEV',\npath_env: 'KETTLE_DEV_DEV',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 42, + 59 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 89, + 106 + ] + } + ], + "vendor_gem_dir_env: 'VENDOR_GEM_DIR',\ndebug_env: 'KETTLE_DEV_DEBUG',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 45, + 62 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 92, + 109 + ] + } + ], "vendored_gems_env: 'VENDORED_GEMS',\nvendor_gem_dir_env: 'VENDOR_GEM_DIR',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 44, + 61 + ] + }, { "file": "gemfiles/modular/templating_local.gemfile", "lines": [ - 77, - 88 + 75, + 91, + 108 ] } ] diff --git a/gems/go-merge/.rubocop_gradual.lock b/gems/go-merge/.rubocop_gradual.lock index 7d5f7de31..a712ec837 100644 --- a/gems/go-merge/.rubocop_gradual.lock +++ b/gems/go-merge/.rubocop_gradual.lock @@ -2,7 +2,7 @@ ".simplecov:2259278597": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] ], - "Rakefile:3311639325": [ + "Rakefile:2704217278": [ [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], [81, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], [165, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], @@ -22,6 +22,9 @@ [1, 1, 0, "Naming/FileName: The name of this source file (`vHEAD.gemfile`) should use snake_case.", 5381], [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], + "gemfiles/modular/coverage_local.gemfile:2813372128": [ + [34, 1, 1586, "Metrics/BlockLength: Block has too many lines. [37/25]", 820328175] + ], "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], @@ -87,7 +90,7 @@ [1, 1, 0, "Naming/FileName: The name of this source file (`vHEAD.gemfile`) should use snake_case.", 5381], [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] ], - "go-merge.gemspec:1913077474": [ + "go-merge.gemspec:1631520807": [ [137, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4147388508], [148, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], [149, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] diff --git a/gems/go-merge/.structuredmerge/kettle-jem.lock b/gems/go-merge/.structuredmerge/kettle-jem.lock index 00d1e9e32..509186257 100644 --- a/gems/go-merge/.structuredmerge/kettle-jem.lock +++ b/gems/go-merge/.structuredmerge/kettle-jem.lock @@ -1,11 +1,12 @@ --- version: 1 template_state: - version: 7.1.18 - applied_at: '2026-09-07' + version: 7.1.26 + applied_at: '2026-09-10' changelog_replay: last_entry_key: kettle-jem-template-20260802-001 last_entry_date: '2026-08-02' + maintenance_changelog: {} checksums: ".aiignore.example": 48a5dfdd93afd1a15fdce39cc28ca9920263f00018b0968ab031fa744521e5ce ".config/mise/env.sh": aeea5a2ab489ba6e5467ae8de6e386ec8c8fe4ff31a044e69d0cd6a092dd6654 @@ -75,7 +76,7 @@ template_state: ".rubocop_rspec.yml.example": 288ad75e7eb14d87d80fafe6f7272217be5c57547536ee56c780a7d10ac7ec74 ".simplecov.example": 222f2e6ce8cf089c70a21f0f5e5423d4bd59a96fdb2ce7754b0fb3d6f430c229 ".structuredmerge/git-drivers.toml.example": 9d241a44c9edffcdbd3da018fa188a238089c3d1635040924df594a6929a4f97 - ".structuredmerge/kettle-jem.yml.example": 26949dc4ee0722415e72452cbc186bee6ef7b154eae33166d36f3fdb1ca6e46d + ".structuredmerge/kettle-jem.yml.example": ff65a738da1af7d60714026a81d3323a46c864e96ae3570b806afdf6e7149ff9 ".yard-lint.yml.example": 90def46867c9436b4e177c47d91fc8165f4602e335715aecc39f5587ae20b55b ".yardignore.example": 821f453c609df7d46145d675424b39dfbe6dfdca8edac5f367b85fff48502455 ".yardopts.example": 6fd6f2701713096a8a9ea095c213bbc68eeef37797c4754d97837e3229a3a5f6 @@ -88,7 +89,7 @@ template_state: CHANGELOG.transfer.md: 21331d8a9e58b4ff6e088b88eb408bcccb0f2f64e78f8f4d42ac3f11a24baad8 CITATION.cff.example: e404ea0a7919d78a83d53d80e211d17b9663576aa606583b709795dc023fd75c CODE_OF_CONDUCT.md.example: f1ad532f1860f73ef774c6b27a26d41f4bc1cb8813034f5957487766ebb0986b - CONTRIBUTING.md.example: 22570cfb3dde72be79b4b522b6d5ab13f95d778e40444483a096871fe0891b19 + CONTRIBUTING.md.example: 8d23cce2d061e0c20d619c3f66591df5f32821cd84c32d171df0b8ebe1217a55 FUNDING.md.example: 392d047904b1557b29f4b43d37ec403b7480edd5b6ab51180be979b57a91e6ba FUNDING.md.no-osc.example: 3ef0258dd3e3b7f7e17e8bc2d20dcbcb3e74aa5a5a6f51297075696645e34c77 Gemfile.example: 99500023987e81775a9b5ef14e92cb3992f2ac408e5f42454f2728eee9b49fb2 @@ -99,19 +100,19 @@ template_state: PolyForm-Small-Business-1.0.0.md.example: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 README.md.example: 21f491e3d73bfc1b74056a6dcba61f72c93dee3cfe5272ac164a20978454de21 REEK: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - RUBOCOP.md.example: c09e5533ccc59b70a2efa05c99f66e521137c1053d3c12eb43509cebd5b68b0e + RUBOCOP.md.example: d99871a0e4c1d323c92e7febf328f062bb4722069b2abfd0a83bf7daa8dcbf8c Rakefile.example: 569803e726b07ea26267fec6891367a3096a0dff3c266269a7081d36afe496af SECURITY.md.example: ee9411aa85f36d88363fdaea7a1baea4362b6ec112cf2688e711b05de1d3144c bin/setup.example: 0ac35089c95a91d8973fe7a318bf9fd98b9f8e00db92c5d9ca6cd858abb8d41b certs/pboling.pem.example: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - gem.gemspec.example: 83e834e8958a88e4817a57199f48f5ebb245548ce251c5c47372208693f03b17 + gem.gemspec.example: 12dcadc0b297ccd4e18b9d1e538b98ac8330ef9fb2a059ed6754ad59272b77fa gemfiles/modular/benchmark/r4/v0.5.gemfile.example: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 gemfiles/modular/benchmark/vHEAD.gemfile.example: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 gemfiles/modular/cgi/r4/v0.5.gemfile.example: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 gemfiles/modular/cgi/vHEAD.gemfile.example: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 gemfiles/modular/changelog.gemfile.example: 892598e0e7792eb205247ae28128cef6dfc647d2fb33968969152230d6f69288 gemfiles/modular/coverage.gemfile.example: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - gemfiles/modular/coverage_local.gemfile.example: 928d5f260d7b119c038baa56da9fb78dd524dee613aea33ab72894bbce5c506e + gemfiles/modular/coverage_local.gemfile.example: 92ea0d7a9d693553dc614afa2c43990f5c3778c2b00ef6c528e122c31bd506a1 gemfiles/modular/debug.gemfile.example: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 gemfiles/modular/documentation.gemfile.example: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c gemfiles/modular/documentation_local.gemfile.example: 84a20f5d4b0feb94c2cf2f7a8dce8f682f1483498e41484c2b447a5661fd1870 @@ -145,10 +146,10 @@ template_state: gemfiles/modular/stringio/r3/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/r4/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/vHEAD.gemfile.example: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - gemfiles/modular/style.gemfile.example: 3ad0585b4f2db8918580ca41ea8723f7a166d7a83cfd7f9613511094997106fd + gemfiles/modular/style.gemfile.example: 02fe3e8fd00e49b90c3ab30e19b51014ee50490f3eadcfd1d4a39f4c2c997dda gemfiles/modular/style_local.gemfile.example: c86beb711e766126a5be68be4be18255831625ac3650d5069383c4a83a9511f3 - gemfiles/modular/templating.gemfile.example: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - gemfiles/modular/templating_local.gemfile.example: 930057d3b909a72e39a39125c4e883a7ff71f5691e64426c0541f8c8fc75b83f + gemfiles/modular/templating.gemfile.example: 2b33c094677b53ad9dd2eafeb3a3be452f612380c61001a2e75b3c078b8ff72a + gemfiles/modular/templating_local.gemfile.example: ac7259516e69ffafb8b9342a897ddf6042adc46335743f474c342509cefd8f2e gemfiles/modular/webrick/r4/v1.9.gemfile.example: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea gemfiles/modular/webrick/vHEAD.gemfile.example: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b gemfiles/modular/x_std_libs.gemfile.example: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a @@ -175,7 +176,7 @@ template_state: shim/Gemfile.example: 0fb0d9d06fcfb1fd6ca6f0eeb5867253ca1ed221e03d28027719225f868b0637 shim/README.md.example: 3a2f7211b7f92a1dfae5e523b8e34b051a3d8af942144b05286eca0b3c8f6fbe shim/Rakefile.example: 572c94da7052083b39b62a6600785419e314a109efd7a3d8c3a96eb77ad34fd1 - shim/gem.gemspec.example: efae033238e4fd1355cfc134f5c9123f175d1ad1dc4a1a2e663899788c9e0870 + shim/gem.gemspec.example: 14a7015b3328005d1c3b5fda6886bd6da383707745f6eaaa781d6f9689600131 shim/lib/compat_require.rb.example: 94ee85e353a3ca08c8a35c9063d4ff789214ea594c7f803f6cf09d7142f48379 shim/lib/entrypoint.rb.example: dd57613520daca01d6f6bcaa9b83b00ff74505240dc04b84ceb686df3c0539d7 shim/lib/version.rb.example: 15e219ac3a928b5580035f891e415551213175020f1131f6e7ca0ccd55a1b2d6 @@ -189,370 +190,370 @@ files: recipe: template_source_application_simplecov action: write dest_sha256: 482a70507755116272fea544367cf1a9ea63fe9afe5897e36da68fb1171bebc4 - input_fingerprint: 8a55af737567fbb14ab3ca341cd96acbb005dc6fb5e8a0b0652bc7109b93c6b6 + input_fingerprint: 7bcdbc422f15e986fee0ac6561ee1a60f32f024702665ae0e9ded6dd05654933 template_sources: - ".simplecov.example" AGPL-3.0-only.md: recipe: template_source_application_AGPL_3_0_only_md action: write dest_sha256: d8a6cc31abc16b6748c7a21f21611f5a1ec33f67d22ca23d7da1c19b95496bee - input_fingerprint: 3cd04ad2781903f832cea2d7c13f0de00a27f3d126f919c7db03af29cbc4b5ec + input_fingerprint: 4b1d7bbb83fc82ee3389882d19414fa0ccaa02d55e4ea5d79767c2db93fb0579 template_sources: - AGPL-3.0-only.md.example Gemfile: recipe: template_source_application_Gemfile action: write - dest_sha256: 3bc9b7e402c3e5b97d43dec58fcc5a84d0bd060157277058a3a6c9e180f65563 - input_fingerprint: ce4a6dcbea361a769ad39ac1e0c7e22215f580ad0cbef966f2caff9619ae279c + dest_sha256: c7043641b39ee5d934bae654eba549f8b4af5f156583336d77b38ab8fc6cecda + input_fingerprint: 23a60842d3dbee656251f14284bae6da8638949fef0540083fe8ec7fba404e7c template_sources: - Gemfile.example LICENSE.md: recipe: template_source_application_LICENSE_md action: write dest_sha256: f6188bfd474a636d2a526420ebb411250faa447d94c9b9ccee097128ce4101b5 - input_fingerprint: fc8f930672c3af5d132ed4e7ff8b5c2552e876c6f1d635065d60ea7bb46de6d0 + input_fingerprint: cce8a749f770efa0e4aa7846b2927d82c1d3fda95617011ebf847e8deb70896c template_sources: - LICENSE.md.example PolyForm-Small-Business-1.0.0.md: recipe: template_source_application_PolyForm_Small_Business_1_0_0_md action: write dest_sha256: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 - input_fingerprint: 202f1e15dcfaec852f6d004d93a0a67e27f98a3dfa385e6c8b25172f26c3a1e5 + input_fingerprint: 169d87d9b8fbde22fbe0f1c0317f7fe2fa2e5a0144c20beaf6bd50b76661b41a template_sources: - PolyForm-Small-Business-1.0.0.md.example README.md: recipe: template_source_application_README_md action: write dest_sha256: a719e295c2755dd4907eb4b01e03b62855b1538b0602a27a36321ff3017bae14 - input_fingerprint: 6d1ad219c4d4b2239abef78c9d08a9b4d312a5d2e79181bf4b211a0a59415866 + input_fingerprint: 4b0f0603117ee168b71eebc3c2404931fc902e52f486e0513f5f523458ee4b6d template_sources: - README.md.example Rakefile: recipe: template_source_application_Rakefile action: write - dest_sha256: 4cc436b05261473fc583ccfb81545e2cf37d057f59d2fd6508d19cfdd30d682c - input_fingerprint: 97f7763af8d2a81fc7507fce37065a06aaeeca0a216fdf78bec37061763be759 + dest_sha256: d1894ff27d7e6af0064b6936a128030ff902fc546d910f07f622375df4906f3d + input_fingerprint: 8ce9903eec04f41167238ac11ed0497faf3334e0d7b36282701d2757a30b532c template_sources: - Rakefile.example certs/pboling.pem: recipe: template_source_application_certs_pboling_pem action: write dest_sha256: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - input_fingerprint: e8df473b8b2e1089896f4418e9e0241fc066dc58bfae925fdd1549f5470ce0ea + input_fingerprint: bcd92ce7f5cd8ccf07f7858226d60161b36a278ae973ffc420a0e437ab5c2e9c template_sources: - certs/pboling.pem.example gemfiles/modular/benchmark/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_r4_v0_5_gemfile action: write dest_sha256: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 - input_fingerprint: 7383e63d38512b6d1fbde85a549a3101b1848b3f5798cd90918adc26434aa4cd + input_fingerprint: 6a1bfaf21fc12050acab98595b47b7844b49b3d76163b3444c8db392f2788c75 template_sources: - gemfiles/modular/benchmark/r4/v0.5.gemfile.example gemfiles/modular/benchmark/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_vHEAD_gemfile action: write dest_sha256: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 - input_fingerprint: b6216d8b49f640fe4f2d901ff382ccd6d49bf3dae74513a65b0d6a435968db4b + input_fingerprint: 0260b5bbc6350c82478b55aee2982836fc7bfaad44387791a6c3104e4d6a18f4 template_sources: - gemfiles/modular/benchmark/vHEAD.gemfile.example gemfiles/modular/cgi/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_cgi_r4_v0_5_gemfile action: write dest_sha256: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 - input_fingerprint: ef714ac91c1867b8dab1a1ae30e92fa6c71711e7bb12f84d32a92504d1971b8c + input_fingerprint: d35dc390b62fa1ae3f394a30a2a4f208d6550fa0949cdc1ce29650f248446107 template_sources: - gemfiles/modular/cgi/r4/v0.5.gemfile.example gemfiles/modular/cgi/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_cgi_vHEAD_gemfile action: write dest_sha256: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 - input_fingerprint: 28ae704c85e41b003429f4130f3a4e677829b10193afc84ac9150a3627ef40ef + input_fingerprint: '09be0fff62064669790da5b364cc6cbbd24f484330738c31bd2813a29de52368' template_sources: - gemfiles/modular/cgi/vHEAD.gemfile.example gemfiles/modular/changelog.gemfile: recipe: template_source_application_gemfiles_modular_changelog_gemfile action: write dest_sha256: da669526144fbff33aef207db9541b6fd6c254437f94dec2fab70fc55a7757cd - input_fingerprint: 377dc57202e799d646bf7847aae7080b203dcf23f2de7b5c0345e2f3d18478d5 + input_fingerprint: e99c119cfec821c283578a7b865bf0b79cb0a9b7fe65922ca1a32024a508c913 template_sources: - gemfiles/modular/changelog.gemfile.example gemfiles/modular/coverage.gemfile: recipe: template_source_application_gemfiles_modular_coverage_gemfile action: write dest_sha256: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - input_fingerprint: 30972d1fb21ed1279ab52f49a6acacb770ee40780949b8a388f38690a4618101 + input_fingerprint: 4a7351d328b42b1906745d6e0284f81c025d9d0a8ee99dfb59e7ff004e72752e template_sources: - gemfiles/modular/coverage.gemfile.example gemfiles/modular/coverage_local.gemfile: recipe: template_source_application_gemfiles_modular_coverage_local_gemfile action: write - dest_sha256: 2b493414df06261ba8acb6f0eb18bf3fdd701d7cb5f967a9d15a3f42a4741827 - input_fingerprint: b9dccc8afc2f9b9cc40444618b14f3d71049b7327f4f0fdb1aa8acfa1f749a70 + dest_sha256: 92c9a599c8f6867ec532880f73568f2736ac05d8973ec524b42fd5dbe6aeda3e + input_fingerprint: 1d3a4913130ef81c185b1e1f6c9e42fbf1c52e838384de15b87b9e3f81ebea59 template_sources: - gemfiles/modular/coverage_local.gemfile.example gemfiles/modular/debug.gemfile: recipe: template_source_application_gemfiles_modular_debug_gemfile action: write dest_sha256: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 - input_fingerprint: '0385ce1ad56edfe2c38563be8caf261406d57548fb3b8c0a23308764544b1d0a' + input_fingerprint: 9db7d4928b2829d72522044df3a566ec2952a73d387fb4b52f63ba86718ce68f template_sources: - gemfiles/modular/debug.gemfile.example gemfiles/modular/documentation.gemfile: recipe: template_source_application_gemfiles_modular_documentation_gemfile action: write dest_sha256: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c - input_fingerprint: e6c2e22b3deb34808be7f4a7db852887602a662a83220db901e29c675f1ee7fd + input_fingerprint: 54b50ce0d33f49a5b0ab51d916eb67b54a7f8d1fd292182c6d6056d6db528a65 template_sources: - gemfiles/modular/documentation.gemfile.example gemfiles/modular/documentation_local.gemfile: recipe: template_source_application_gemfiles_modular_documentation_local_gemfile action: write dest_sha256: 2058173855b9a4acc6d5efa20520e49734243eef6cf0b5e9063e0e5866a08e9c - input_fingerprint: ab5dca756fe87dc2e50b3b6ed8bdfc6f2d897deae75994df7203fc7a092e46cc + input_fingerprint: 517317382a8ea62e2d0ccf7763483d9f94eb6cbf84d4a3be3c95bcfea0c73033 template_sources: - gemfiles/modular/documentation_local.gemfile.example gemfiles/modular/erb/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r2_v3_0_gemfile action: write dest_sha256: 3793e7dc9ef23a7ccd893d48cbba092fd27594c63e65cca011cc658218425670 - input_fingerprint: 7ddd053d789466ba568dc8cd1071950cc6489f6650fde3ca346c683442901a9e + input_fingerprint: 504a16459f926a6492bb16527a24a41530fd5a16381a316667f9bc269a8514e2 template_sources: - gemfiles/modular/erb/r2/v3.0.gemfile.example gemfiles/modular/erb/r3/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r3_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: b5374502011d01eb009e781cfc14b784173e66f5e9503444e8a46f49df1685b6 + input_fingerprint: 45c64b26705885eca7a57a1458dd1cd99d21173bfde152d55bef3a7e7ffb880f template_sources: - gemfiles/modular/erb/r3/v5.0.gemfile.example gemfiles/modular/erb/r4/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r4_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 5161d95e99d94b491352f5aab63304610d6d37ba2860760751170064dddf87bb + input_fingerprint: fb160a6946df21b6ee31adc61482b50ac418276ba6afc69f11aee057aeb3a359 template_sources: - gemfiles/modular/erb/r4/v5.0.gemfile.example gemfiles/modular/erb/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_erb_vHEAD_gemfile action: write dest_sha256: ad6f104a49e80e0cf625440e3dc816343fe7e2f037fc4971df75e7bb4305c683 - input_fingerprint: 073723a53342a13e4b3483a0f249ae37c5ce55234f7cd287de1d3d295c691fb4 + input_fingerprint: b6244f86268da94ac227053bf058d53ec58a73d770ab2924b6939a5087d71626 template_sources: - gemfiles/modular/erb/vHEAD.gemfile.example gemfiles/modular/json/truffleruby_22_3.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_22_3_gemfile action: write dest_sha256: 249c12eacbe90f9d0d2e81e7a62c4c7e9102e504ededcda4ecf660cb3bb68be4 - input_fingerprint: 5e984bea70f37cd8eb532511d3bbafd88a17cc26e42693d034def317b17295bd + input_fingerprint: 623dd5de0c2a8913a4542c621dc281050d9344866e6c6702f3ad0390e1437d93 template_sources: - gemfiles/modular/json/truffleruby_22_3.gemfile.example gemfiles/modular/json/truffleruby_23_0.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_0_gemfile action: write dest_sha256: 66aa010567f7afa1af8244a74c3c88ecaaf84dc87b6a25180691bb480d02ed28 - input_fingerprint: dc41c8495619d655eb33ecf02e54ad2b788eaa8fb9598acbceeb73fc8bad89d4 + input_fingerprint: ef0f3bcff53beda2dd1b370050ccc92f0c837afc16b27ae60602c4eddccc5421 template_sources: - gemfiles/modular/json/truffleruby_23_0.gemfile.example gemfiles/modular/json/truffleruby_23_1.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_1_gemfile action: write dest_sha256: '080fcbdaf2bec73cad40832a3d51eebb380af789917b96f493d1460b0dd6361d' - input_fingerprint: 505a3218f4bbea4ccf062c815fba419c0d7af603fd1d08c08aafc942f938a8f6 + input_fingerprint: 4a078e7685248fffce26b4ae78d944cc022e7a2a75b42335a9896d4522481da2 template_sources: - gemfiles/modular/json/truffleruby_23_1.gemfile.example gemfiles/modular/mutex_m/r2/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r2_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 4fec6e46a49d93257af631557b131fef161d7015793e3151e5e25a2e75b93a59 + input_fingerprint: 9efab0c57cad296b5020c0b957be89ae122be583e60659776cfaa53e211322a1 template_sources: - gemfiles/modular/mutex_m/r2/v0.3.gemfile.example gemfiles/modular/mutex_m/r3/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r3_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: c97bc127f87ce851f534e3fb7622bfa4da4fb7e0cc5c66eb44242cb1cb79861b + input_fingerprint: c8144f58239b18f27aa3dfa881a10b452cdd10721f9cc3b07a6bfb1573816328 template_sources: - gemfiles/modular/mutex_m/r3/v0.3.gemfile.example gemfiles/modular/mutex_m/r4/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r4_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 8515e85c6da065fbf2ed378f43f159d07e4fc5630ce9e5eb362ccf6e4a23d8ce + input_fingerprint: 8cf0c43645081017646163b8930a2f2c69172ddfe0f0a1c43d39e0035da4c225 template_sources: - gemfiles/modular/mutex_m/r4/v0.3.gemfile.example gemfiles/modular/mutex_m/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_vHEAD_gemfile action: write dest_sha256: '08018641c97f894788fa91b462da504ab2237213d18d95404136c393274ae3cb' - input_fingerprint: f6495b58622207b2c44be3dc2f11fac0ecd83bf912323d4653f2e4c167725f77 + input_fingerprint: 505ff184ce9392d4e84de64b5217cd776108cc4ba8219a8ee85be51888945ebc template_sources: - gemfiles/modular/mutex_m/vHEAD.gemfile.example gemfiles/modular/optional.gemfile: recipe: template_source_application_gemfiles_modular_optional_gemfile action: write dest_sha256: f770e6e9a9dd2bd0f1f132e882d88038b2e21127dce3afe270908c7338c28bfd - input_fingerprint: fbba989e16de642c44619372c97354d69b6c686ed08ec66efb8ecb33d623d18d + input_fingerprint: 663e198f7140fed003061b1ef7eadd0b39fb544bd914fb9cd975f4bf0b05e2f3 template_sources: - gemfiles/modular/optional.gemfile.example gemfiles/modular/rspec.gemfile: recipe: template_source_application_gemfiles_modular_rspec_gemfile action: write dest_sha256: d043f5c9344f6435edb4607c5adaf42c78e7fb6b8b6726007de2bbedefb376c3 - input_fingerprint: bc894f026ef0e37ef0a84e855e45dba7fd358dd683884d5f7f9dc5933e8c4bd6 + input_fingerprint: 81350c1493a0860320910eef9da6ec46ed3cc9a62e4d1a6eb021dbbe4ce381fe template_sources: - gemfiles/modular/rspec.gemfile.example gemfiles/modular/runtime_heads.gemfile: recipe: template_source_application_gemfiles_modular_runtime_heads_gemfile action: write dest_sha256: 6ac7158c4a3088190f2a9082f01439eb27eca2172ab3464b15c9cb045aa885e1 - input_fingerprint: 1dec1cbb29e235a944436c52a565e0855972c73e93e463a74842b3ccc8e1234f + input_fingerprint: '08711341606222dc06a18aa7f3d54581c4e66b9c86a5a1b71b2a2c48ee85824c' template_sources: - gemfiles/modular/runtime_heads.gemfile.example gemfiles/modular/stringio/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r2_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 0d11e963b6c18bdb1d558a537cc3da1dd727f8b663cc73c499f9b9730da8b975 + input_fingerprint: c36eeb8f9cee7d541943a0904623c2e2a9b0be9400387765929ce220cf93a2a4 template_sources: - gemfiles/modular/stringio/r2/v3.0.gemfile.example gemfiles/modular/stringio/r3/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r3_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 6724136915002046944543ad512a57cc5e216172123d8d7e6b244f32928398d0 + input_fingerprint: 80bc8bc168bf6f9829ae062e54d5cfb14c37e735341738368a5180d12cfeb7fc template_sources: - gemfiles/modular/stringio/r3/v3.0.gemfile.example gemfiles/modular/stringio/r4/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r4_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: f985edd63e082697ad2d39fad02b50fc4ff859715e4134ba720026c5ec59d63a + input_fingerprint: e9f49a3f473de7d132038bac27e3d9ccaf4ad48a1158e9fd02dc94025bc6470f template_sources: - gemfiles/modular/stringio/r4/v3.0.gemfile.example gemfiles/modular/stringio/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_stringio_vHEAD_gemfile action: write dest_sha256: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - input_fingerprint: d59c0b73cf04afc5c64326b593b85a65e7c97f406efa692dc7a5d043abf6ae93 + input_fingerprint: 90708f4313b2a7e2aa946c4526fc72a5f67edc4e799dc94947459d21e6780157 template_sources: - gemfiles/modular/stringio/vHEAD.gemfile.example gemfiles/modular/style.gemfile: recipe: template_source_application_gemfiles_modular_style_gemfile action: write - dest_sha256: 2a3d46dcb8a9394f595f273f5eb0403d0a552837754ab109afc9ba79a7159083 - input_fingerprint: a6d743935c5742529f3196ee3b079f47fdf8d213e45bc39f322cc206afe919e7 + dest_sha256: 9a24acff0054573c30f5d84d0418cd465ba3794d075bb5a36801410ac40e0787 + input_fingerprint: 0c6d40ac11af58fb06d01ca894f52b54d4a1e9815316b15e751b573b8490267e template_sources: - gemfiles/modular/style.gemfile.example gemfiles/modular/style_local.gemfile: recipe: template_source_application_gemfiles_modular_style_local_gemfile action: write dest_sha256: 55eb9c149cdb2f29c9f31abe2d55a4f334e00fb859681dd17c42149a3f28ca36 - input_fingerprint: 6e48878ef043bb15dbe0bb9e1a026adc387cf348d17bd856a2db2952350b4fba + input_fingerprint: 512d3af112ea33d94ddb05038b831514fa6b98420edd2b1c2de2ed561e1c5e51 template_sources: - gemfiles/modular/style_local.gemfile.example gemfiles/modular/templating.gemfile: recipe: template_source_application_gemfiles_modular_templating_gemfile action: write - dest_sha256: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - input_fingerprint: 035b20e6c0f0e7bed5c87d8ebb2684bbdb9948ad772f237459d00f0b1cb04995 + dest_sha256: 432ba59798d31b899268257c432443a017c5a9bd2c0c7f9f2216617e14150cd3 + input_fingerprint: 2873e909858b71130146e0547f8f976c4b7bd3c56e5bd321df884296c1594032 template_sources: - gemfiles/modular/templating.gemfile.example gemfiles/modular/templating_local.gemfile: recipe: template_source_application_gemfiles_modular_templating_local_gemfile action: write - dest_sha256: c7e5120101f875354d66e95e5e3bd75b55e7a76343ae29eaaafff5d2b3bc7be9 - input_fingerprint: 5c5e1b320f374d46794d5d270434e3a917aecdb6d5fec7e0b6b69dba486e76d6 + dest_sha256: fde449b74fa870cc44be97399637a225350fce22af6bd13890c2fe7343971fdd + input_fingerprint: 723f026492c2962edc66bbb952348bd25a553146e89d2fc2d6097f1a39412672 template_sources: - gemfiles/modular/templating_local.gemfile.example gemfiles/modular/webrick/r4/v1.9.gemfile: recipe: template_source_application_gemfiles_modular_webrick_r4_v1_9_gemfile action: write dest_sha256: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea - input_fingerprint: f409913ef02d30d758f571b84ec68a9564607f5a2ee1baa368a8bf6f9419f008 + input_fingerprint: 9fc6277da35794781a70b82c37795adc472a76ef344ef5b981e0e09c50079158 template_sources: - gemfiles/modular/webrick/r4/v1.9.gemfile.example gemfiles/modular/webrick/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_webrick_vHEAD_gemfile action: write dest_sha256: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b - input_fingerprint: 4b6d8a13b10ea999b648cee6522d6f0b70b0ccaf49ffa0f429b5caf75aed7c84 + input_fingerprint: 5fc743e6ab75e197e0865e8b40a93969916d41ba4797dd956af7b1f14eef820a template_sources: - gemfiles/modular/webrick/vHEAD.gemfile.example gemfiles/modular/x_std_libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_gemfile action: write dest_sha256: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a - input_fingerprint: 707c869ff5c256029934a235df51840a3d6febdd55e8d5e7341c6e3433ef2d2e + input_fingerprint: 1a0f5d5994086b253d8e92490a9c287794d9f20cc99e184222361a335a2b067d template_sources: - gemfiles/modular/x_std_libs.gemfile.example gemfiles/modular/x_std_libs/r2/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r2_libs_gemfile action: write dest_sha256: e80ec8ad06cb1b31ac982bc25cf7696987fca131aa1001eaefd0bf5cd379c273 - input_fingerprint: 223b09a4306dde89bc7c5d6c772ffd3ab15de6b1d702dddda9208bd2a3546382 + input_fingerprint: 8ed396a190097cd86f7746d2cf7ffc39e73e2fcd05b76793f309e1cbfd98815b template_sources: - gemfiles/modular/x_std_libs/r2/libs.gemfile.example gemfiles/modular/x_std_libs/r3.1/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_1_libs_gemfile action: write dest_sha256: 9f8565c40b09bea1bc4c2e2ad87fe11400c3c51a2b235655bfcd8e491ed88ca8 - input_fingerprint: c2aa7b979c14a171ab7ba0aabfe46fad6f308bed471e5efa877fcae8ed111338 + input_fingerprint: a4534305b8f0e202ff09f789ea17daf9ed77365cc689f890ac9c914ab329fa7f template_sources: - gemfiles/modular/x_std_libs/r3.1/libs.gemfile.example gemfiles/modular/x_std_libs/r3/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_libs_gemfile action: write dest_sha256: 546f8849f4267bb19aa10ff0de40be30957197f229e6887847181ea9127b2650 - input_fingerprint: 2799070dfbcbcf26a9f4338289d4a20940c0b5c9bd92f5ade060a7d6ad38282c + input_fingerprint: 2698dbdd40306ae45a57b680617ae343519eff2b8d0b8adeee484a8b4006bcfc template_sources: - gemfiles/modular/x_std_libs/r3/libs.gemfile.example gemfiles/modular/x_std_libs/r4/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r4_libs_gemfile action: write dest_sha256: 8c2582eaa218d216b98c86c933465295c8b4e43f3251ea388b9eaf6e471f8da6 - input_fingerprint: 0f757a157c8c0ec5ea44a7668a402e2caf69a39a26f077f4e02af7a42be14922 + input_fingerprint: f73f29006ef44175a0a00b151dd1d5c663e9f137f73772ffa4d2a8bde5e68556 template_sources: - gemfiles/modular/x_std_libs/r4/libs.gemfile.example gemfiles/modular/x_std_libs/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_vHEAD_gemfile action: write dest_sha256: d3133ec4c0638363a7fb025d19be7e95a615fd61c35ddb8d17f2280ee74a7486 - input_fingerprint: 6a4f99c7e8c0955a0acddb60aa3821299b49a2f643daa7fea3a530bfbb0238b7 + input_fingerprint: 1ab74212d98159ad3ee5a30bed38103a6b9b2b507dd1c2d2115cdc2c2d7a751b template_sources: - gemfiles/modular/x_std_libs/vHEAD.gemfile.example go-merge.gemspec: recipe: template_source_application_go_merge_gemspec action: write - dest_sha256: baeda1e9f9dbdbcc0bae22f24ba68bbebaad8cb0cbc113dfac858a100fe83898 - input_fingerprint: fd0d7f0489aa3070fbfdcbd3a53d01fd962dfd1ffc43d860e1a028bb66889f60 + dest_sha256: 8b9e8d3585775c85ea4f662f417a1101363924f16296e1c79e2b7c07a9c3413e + input_fingerprint: d299ec503ac616c335191a4ff8fcf12af5aab8da2ff92bd294517ae12f00d5bb template_sources: - gem.gemspec.example lib/go/merge/version.rb: recipe: template_source_application_lib_go_merge_version_rb action: write - dest_sha256: ece264783d1cb8713601ba1760ce7afce56c8684a8824758dff2a5ebb55e0959 - input_fingerprint: b2031fdf864cfb5be14de20f39cb43a30aa7ec1a568eef45b5018ec5bb39771b + dest_sha256: 6328423c9adc2b4b449dfa5441c4901c24e8b229fba7c97caf9e6426cae957dc + input_fingerprint: 26c4377e755533ffcc5a958e6ea8f058aec2e4f521d32dcbffd2e1d1ee03155c template_sources: - lib/gem/version.rb.example mise.toml: recipe: template_source_application_mise_toml action: write dest_sha256: 7d267154ca4f081b0ac7da804c0180c2b091aec5f1c877417c1c320f4f369c88 - input_fingerprint: 6e74c8b795fcd1bc90bc3f67a2a6db0692c2c4196debc93b5c2f588c3f36a68c + input_fingerprint: 85294652e8e059570d5f82849a490c27b26247d537ea2642e4eb7a0e3b2b4c83 template_sources: - mise.toml.no-osc.example sig/go/merge.rbs: recipe: template_source_application_sig_go_merge_rbs action: write dest_sha256: bb23303a4ab2a1668fad93a3eb22bebbccfcf6ba45f3e02ba578d4ee536394e0 - input_fingerprint: 03b37c3ae90a2b511d748129d8e927aee6470cbd4f4605f54decaf2eab1c3789 + input_fingerprint: 8f659a30f7e0c1f1c08cde28cba405acb995f96c61a4b5b4ee9e299c61e73ba4 template_sources: - sig/gem.rbs.example spec/spec_helper.rb: recipe: template_source_application_spec_spec_helper_rb action: write dest_sha256: c0adf780dbb0ab2c9ebaa64513d8457d172b49827088e61d2ce016fcf810f7fb - input_fingerprint: 042a8a6afda92b175bbd3c8efb6339f868dc4ecc60a4e256296df9e499c73ab2 + input_fingerprint: 7fedfab6b2816d66247563008a45396bd67003451587af3f2352599e363e76c0 template_sources: - spec/spec_helper.rb.example diff --git a/gems/go-merge/Gemfile b/gems/go-merge/Gemfile index 9c9561982..2f2d2f476 100644 --- a/gems/go-merge/Gemfile +++ b/gems/go-merge/Gemfile @@ -19,7 +19,7 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } # Include dependencies from go-merge.gemspec gemspec -gem 'kettle-family', '~> 1.2', '>= 1.2.97' +gem 'kettle-family', '~> 1.2', '>= 1.2.100' # Local workspace dependency wiring for *_local.gemfile overrides gem 'nomono', '~> 1.1', '>= 1.1.5', require: false # ruby >= 3.2.0 diff --git a/gems/go-merge/Gemfile.lock b/gems/go-merge/Gemfile.lock index e6cd76781..3615ac478 100644 --- a/gems/go-merge/Gemfile.lock +++ b/gems/go-merge/Gemfile.lock @@ -10,123 +10,123 @@ GIT PATH remote: . specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + go-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) + ast-crispr-markdown-markly (7.1.9) + ast-crispr (= 7.1.9) + markdown-merge (= 7.1.9) + markly-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism specs: - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) + ast-crispr-ruby-prism (7.1.9) + ast-crispr (= 7.1.9) + prism-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) + ast-crispr (7.1.9) + ast-merge (= 7.1.9) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ast-merge-git (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: - ast-merge (7.1.8) + ast-merge (7.1.9) benchmark token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) + ast-template (7.1.9) + ast-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + bash-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + binary-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) + citrus-toml-merge (7.1.9) + ast-merge (= 7.1.9) + toml-merge (= 7.1.9) toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge specs: - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) commonmarker (~> 2.2) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) + dotenv-merge (7.1.9) + ast-merge (= 7.1.9) + plain-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + html-merge (7.1.9) + ast-crispr (= 7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + json-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: - kettle-jem (7.1.25) + kettle-jem (7.1.26) addressable (>= 2.8, < 3) ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) @@ -160,122 +160,122 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge specs: - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown (~> 2.5) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + markdown-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) + markly-merge (7.1.9) + markdown-merge (= 7.1.9) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge specs: - parslet-toml-merge (7.1.8) + parslet-toml-merge (7.1.9) toml (~> 0.3) - toml-merge (= 7.1.8) + toml-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + plain-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) + prism-merge (7.1.9) + ast-merge (= 7.1.9) prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + psych-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) + yaml-merge (= 7.1.9) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) + rbs-merge (7.1.9) + ast-merge (= 7.1.9) rbs (>= 3.10) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + rust-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) + smorg-rb (7.1.9) + ast-merge (= 7.1.9) + ast-merge-git (= 7.1.9) + bash-merge (= 7.1.9) diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) + dotenv-merge (= 7.1.9) + go-merge (= 7.1.9) + html-merge (= 7.1.9) + json-merge (= 7.1.9) kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) + markdown-merge (= 7.1.9) + plain-merge (= 7.1.9) + prism-merge (= 7.1.9) + psych-merge (= 7.1.9) + rbs-merge (= 7.1.9) + rust-merge (= 7.1.9) + toml-merge (= 7.1.9) + typescript-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + toml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: - tree_haver (7.1.8) + tree_haver (7.1.9) citrus (~> 3.0) parslet (~> 2.0) tree_sitter_language_pack (>= 1.16.2, < 2.0) @@ -284,25 +284,25 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + typescript-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + yaml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) + zip-merge (7.1.9) + binary-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) GEM @@ -336,6 +336,8 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) + commonmarker (2.10.0) + rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -465,11 +467,15 @@ GEM lint_roller (1.1.0) logger (1.7.0) markly (0.19.0) + mini_portile2 (2.8.9) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) reline (~> 0.6) mutex_m (0.3.0) + nokogiri (1.19.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-musl) @@ -503,6 +509,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) + rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -696,6 +705,9 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_sitter_language_pack (1.16.2) + rb_sys (>= 0.9.130, < 0.10) + sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -784,9 +796,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.31) + kettle-dev (~> 3.0, >= 3.0.34) kettle-drift (~> 1.0, >= 1.0.13) - kettle-family (~> 1.2, >= 1.2.97) + kettle-family (~> 1.2, >= 1.2.100) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) @@ -807,12 +819,12 @@ DEPENDENCIES reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) - rubocop-lts (~> 24.2, >= 24.2.1) - rubocop-lts-rspec (~> 1.0, >= 1.0.5) + rubocop-lts (~> 24.2, >= 24.2.3) + rubocop-lts-rspec (~> 1.0, >= 1.0.6) rubocop-minitest (~> 0.40, >= 0.40.0) rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! - rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) ruby-merge! ruby-progressbar (~> 1.13) rust-merge! @@ -843,33 +855,34 @@ CHECKSUMS appraisal2 (3.2.3) sha256=3a6cfaf8a444e02707b9a34154af1c4902fbe99d9d2168d7e81dd83ec77e6db7 appraisal2-rubocop (1.0.2) sha256=1dae97c1be087cf9c098a3a72fd41f873435e9b8b39687e633b36c9ccb22bff4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.8) - ast-crispr-markdown-markly (7.1.8) - ast-crispr-ruby-prism (7.1.8) - ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) + ast-crispr (7.1.9) + ast-crispr-markdown-markly (7.1.9) + ast-crispr-ruby-prism (7.1.9) + ast-merge (7.1.9) + ast-merge-git (7.1.9) + ast-template (7.1.9) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.8) + bash-merge (7.1.9) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) - bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae + binary-merge (7.1.9) + bundler (4.1.0.beta1) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.8) + citrus-toml-merge (7.1.9) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 + commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e commonmarker (2.10.0-x86_64-darwin) sha256=01e0830ed0319825ecdc16411c90acd3f661d1568dfc178731b3f64d0ce2363d commonmarker (2.10.0-x86_64-linux) sha256=945c510c0bfca9022245928e2248468fe3ddad58c939be0c37b20082cc392880 commonmarker (2.10.0-x86_64-linux-musl) sha256=288cd4fb9f17eed2ffa73551ef241dcf594e0f484b2aee2a0999540333c0618e - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) completely (0.8.0) sha256=e493cd5d84805f47917a41f277ecbfe5f35363bed670be5a957d3acaed8c6c5e concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 @@ -878,7 +891,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docopt_ng (0.7.1) sha256=a024148ee4fa3ab1a8a04411aa4370f39cf2b446e63562097d418b7974a15667 - dotenv-merge (7.1.8) + dotenv-merge (7.1.9) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -891,35 +904,37 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) + go-merge (7.1.9) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) + html-merge (7.1.9) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a - json-merge (7.1.8) - kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + json-merge (7.1.9) + kettle-changelog (1.0.7) + kettle-dev (3.0.34) + kettle-drift (1.0.13) kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 - kettle-jem (7.1.25) + kettle-jem (7.1.26) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 - kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd + kettle-soup-cover (3.0.10) kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 - markdown-merge (7.1.8) + markdown-merge (7.1.9) markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca - markly-merge (7.1.8) + markly-merge (7.1.9) + mini_portile2 (2.8.9) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 + nokogiri (1.19.4) nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af nokogiri (1.19.4-arm64-darwin) sha256=a46db9853286e6597b36ebc6953817d15acf3a299583eb3f89fdc6f91dd63527 @@ -933,20 +948,22 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) - plain-merge (7.1.8) + parslet-toml-merge (7.1.9) + plain-merge (7.1.9) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.8) + prism-merge (7.1.9) psych (5.5.0) sha256=4b245bbbd0f3238df8ccee766ebc1a6b062b10e4ee1d3284eb588739ba156a0a - psych-merge (7.1.8) + psych-merge (7.1.9) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 - rbs-merge (7.1.8) + rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -982,11 +999,11 @@ CHECKSUMS rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.8) + ruby-merge (7.1.9) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) + rust-merge (7.1.9) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +1011,7 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) + smorg-rb (7.1.9) sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,10 +1027,11 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.8) + toml (0.3.0) + toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb - tree_haver (7.1.8) + tree_haver (7.1.9) + tree_sitter_language_pack (1.16.2) tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 @@ -1023,12 +1041,12 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) + typescript-merge (7.1.9) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 yaml-converter (0.2.5) sha256=a5214fe1a6c2df88bd34a35bcded1b1dcd30135548130df2e03b54ca8c0f2423 - yaml-merge (7.1.8) + yaml-merge (7.1.9) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.8) sha256=73d935d43e3479d65ce8aff25c7d3100e8bb83528a2adaa0ed824e5046ac99e7 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -1037,8 +1055,8 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) + zip-merge (7.1.9) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH - 4.0.20 + 4.1.0.beta1 diff --git a/gems/go-merge/Rakefile b/gems/go-merge/Rakefile index dcf08c2fc..6d78793ad 100644 --- a/gems/go-merge/Rakefile +++ b/gems/go-merge/Rakefile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -# go-merge Rakefile v7.1.18 - 2026-09-07 +# go-merge Rakefile v7.1.26 - 2026-09-09 # Ruby 2.3 (Safe Navigation) or higher required # # See LICENSE.md for license information. diff --git a/gems/go-merge/bin/rubocop-gradual b/gems/go-merge/bin/rubocop-gradual new file mode 100755 index 000000000..7c7ff0635 --- /dev/null +++ b/gems/go-merge/bin/rubocop-gradual @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'rubocop-gradual' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'rubygems' +require 'bundler/setup' + +load Gem.bin_path('rubocop-gradual', 'rubocop-gradual') diff --git a/gems/go-merge/gemfiles/modular/coverage_local.gemfile b/gems/go-merge/gemfiles/modular/coverage_local.gemfile index 37917caac..d6c890e46 100644 --- a/gems/go-merge/gemfiles/modular/coverage_local.gemfile +++ b/gems/go-merge/gemfiles/modular/coverage_local.gemfile @@ -29,11 +29,31 @@ Kernel.send(:gem, 'nomono', *nomono_activation_requirements) require 'nomono/bundler' local_gems = %w[kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -local_gems_to_eval = local_gems - %w[] - declared_gems # export KETTLE_DEV_DEV=/path/to/my platform :mri do + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + local_gems_to_eval = local_gems - %w[] - declared_gems + eval_nomono_gems( gems: local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/go-merge/gemfiles/modular/style.gemfile b/gems/go-merge/gemfiles/modular/style.gemfile index 59c5dc1a3..41ec99454 100644 --- a/gems/go-merge/gemfiles/modular/style.gemfile +++ b/gems/go-merge/gemfiles/modular/style.gemfile @@ -24,9 +24,9 @@ platform :mri do if ENV.fetch('RUBOCOP_LTS_DEV', 'false').casecmp('false').zero? declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) - gem 'rubocop-lts', '~> 24.2', '>= 24.2.1' unless declared_gems.include?('rubocop-lts') - gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.5' unless declared_gems.include?('rubocop-lts-rspec') - gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.6' unless declared_gems.include?('rubocop-ruby3_2') + gem 'rubocop-lts', '~> 24.2', '>= 24.2.3' unless declared_gems.include?('rubocop-lts') + gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.6' unless declared_gems.include?('rubocop-lts-rspec') + gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.8' unless declared_gems.include?('rubocop-ruby3_2') else eval_gemfile('style_local.gemfile') end diff --git a/gems/go-merge/gemfiles/modular/templating.gemfile b/gems/go-merge/gemfiles/modular/templating.gemfile index 6af159bd7..ce51a08ed 100644 --- a/gems/go-merge/gemfiles/modular/templating.gemfile +++ b/gems/go-merge/gemfiles/modular/templating.gemfile @@ -18,7 +18,7 @@ end if structuredmerge_remote # Merge recipes for released installs. - gem 'kettle-jem', '>= 7.0' + gem 'kettle-jem', '~> 7.1', '>= 7.1.26' end if kettle_remote diff --git a/gems/go-merge/gemfiles/modular/templating_local.gemfile b/gems/go-merge/gemfiles/modular/templating_local.gemfile index c1966108e..7f26aab94 100644 --- a/gems/go-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/go-merge/gemfiles/modular/templating_local.gemfile @@ -65,9 +65,7 @@ structuredmerge_local_gems = %w[ kettle_dev_local_gems = %w[ kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift ] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[] -kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - (declared_gems - %w[kettle-dev]) if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( @@ -81,6 +79,28 @@ if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 end if ENV.fetch('KETTLE_DEV_DEV', 'false').casecmp('false') != 0 + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - declared_gems + eval_nomono_gems( gems: kettle_dev_local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/go-merge/go-merge.gemspec b/gems/go-merge/go-merge.gemspec index c9547de1b..cb849bc74 100644 --- a/gems/go-merge/go-merge.gemspec +++ b/gems/go-merge/go-merge.gemspec @@ -120,7 +120,7 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.31') # ruby >= 4.0.0 + spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.34') # ruby >= 4.0.0 # Security spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 From e749375e644801dd44339f29565b86dba86a41e6 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 23:50:47 -0400 Subject: [PATCH 088/137] =?UTF-8?q?=F0=9F=8E=A8=20Template=20rust-merge=20?= =?UTF-8?q?by=20kettle-family?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/rust-merge/.kettle-drift.lock | 76 ++++- gems/rust-merge/.rubocop_gradual.lock | 7 +- .../.structuredmerge/kettle-jem.lock | 145 ++++---- gems/rust-merge/Gemfile | 2 +- gems/rust-merge/Gemfile.lock | 320 +++++++++--------- gems/rust-merge/Rakefile | 2 +- gems/rust-merge/bin/rubocop-gradual | 16 + .../gemfiles/modular/coverage_local.gemfile | 24 +- .../rust-merge/gemfiles/modular/style.gemfile | 6 +- .../gemfiles/modular/templating.gemfile | 2 +- .../gemfiles/modular/templating_local.gemfile | 24 +- gems/rust-merge/rust-merge.gemspec | 2 +- 12 files changed, 388 insertions(+), 238 deletions(-) create mode 100755 gems/rust-merge/bin/rubocop-gradual diff --git a/gems/rust-merge/.kettle-drift.lock b/gems/rust-merge/.kettle-drift.lock index 98b009e1e..1b23f4793 100644 --- a/gems/rust-merge/.kettle-drift.lock +++ b/gems/rust-merge/.kettle-drift.lock @@ -1,10 +1,82 @@ { + "debug_env: 'KETTLE_DEV_DEBUG',\nroot: %w[src my kettle-dev]": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 46, + 63 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 93, + 110 + ] + } + ], + "path_env: 'KETTLE_DEV_DEV',\nvendored_gems_env: 'VENDORED_GEMS',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 43, + 60 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 90, + 107 + ] + } + ], + "prefix: 'KETTLE_DEV',\npath_env: 'KETTLE_DEV_DEV',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 42, + 59 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 89, + 106 + ] + } + ], + "vendor_gem_dir_env: 'VENDOR_GEM_DIR',\ndebug_env: 'KETTLE_DEV_DEBUG',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 45, + 62 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 92, + 109 + ] + } + ], "vendored_gems_env: 'VENDORED_GEMS',\nvendor_gem_dir_env: 'VENDOR_GEM_DIR',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 44, + 61 + ] + }, { "file": "gemfiles/modular/templating_local.gemfile", "lines": [ - 77, - 88 + 75, + 91, + 108 ] } ] diff --git a/gems/rust-merge/.rubocop_gradual.lock b/gems/rust-merge/.rubocop_gradual.lock index fd28d4654..3d9ef5043 100644 --- a/gems/rust-merge/.rubocop_gradual.lock +++ b/gems/rust-merge/.rubocop_gradual.lock @@ -2,7 +2,7 @@ ".simplecov:204083589": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] ], - "Rakefile:1257808285": [ + "Rakefile:1640440638": [ [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], [81, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], [165, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], @@ -22,6 +22,9 @@ [1, 1, 0, "Naming/FileName: The name of this source file (`vHEAD.gemfile`) should use snake_case.", 5381], [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], + "gemfiles/modular/coverage_local.gemfile:2813372128": [ + [34, 1, 1586, "Metrics/BlockLength: Block has too many lines. [37/25]", 820328175] + ], "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], @@ -103,7 +106,7 @@ [128, 5, 1470, "Metrics/MethodLength: Method has too many lines. [41/10]", 1652164001], [171, 5, 73, "Lint/ShadowedException: Do not shadow rescued Exceptions.", 2046499071] ], - "rust-merge.gemspec:4110558690": [ + "rust-merge.gemspec:3829002023": [ [137, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4147388508], [148, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], [149, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] diff --git a/gems/rust-merge/.structuredmerge/kettle-jem.lock b/gems/rust-merge/.structuredmerge/kettle-jem.lock index e0bd8fdaf..b737a39e2 100644 --- a/gems/rust-merge/.structuredmerge/kettle-jem.lock +++ b/gems/rust-merge/.structuredmerge/kettle-jem.lock @@ -1,11 +1,12 @@ --- version: 1 template_state: - version: 7.1.18 - applied_at: '2026-09-07' + version: 7.1.26 + applied_at: '2026-09-10' changelog_replay: last_entry_key: kettle-jem-template-20260802-001 last_entry_date: '2026-08-02' + maintenance_changelog: {} checksums: ".aiignore.example": 48a5dfdd93afd1a15fdce39cc28ca9920263f00018b0968ab031fa744521e5ce ".config/mise/env.sh": aeea5a2ab489ba6e5467ae8de6e386ec8c8fe4ff31a044e69d0cd6a092dd6654 @@ -75,7 +76,7 @@ template_state: ".rubocop_rspec.yml.example": 288ad75e7eb14d87d80fafe6f7272217be5c57547536ee56c780a7d10ac7ec74 ".simplecov.example": 222f2e6ce8cf089c70a21f0f5e5423d4bd59a96fdb2ce7754b0fb3d6f430c229 ".structuredmerge/git-drivers.toml.example": 9d241a44c9edffcdbd3da018fa188a238089c3d1635040924df594a6929a4f97 - ".structuredmerge/kettle-jem.yml.example": 26949dc4ee0722415e72452cbc186bee6ef7b154eae33166d36f3fdb1ca6e46d + ".structuredmerge/kettle-jem.yml.example": ff65a738da1af7d60714026a81d3323a46c864e96ae3570b806afdf6e7149ff9 ".yard-lint.yml.example": 90def46867c9436b4e177c47d91fc8165f4602e335715aecc39f5587ae20b55b ".yardignore.example": 821f453c609df7d46145d675424b39dfbe6dfdca8edac5f367b85fff48502455 ".yardopts.example": 6fd6f2701713096a8a9ea095c213bbc68eeef37797c4754d97837e3229a3a5f6 @@ -88,7 +89,7 @@ template_state: CHANGELOG.transfer.md: 21331d8a9e58b4ff6e088b88eb408bcccb0f2f64e78f8f4d42ac3f11a24baad8 CITATION.cff.example: e404ea0a7919d78a83d53d80e211d17b9663576aa606583b709795dc023fd75c CODE_OF_CONDUCT.md.example: f1ad532f1860f73ef774c6b27a26d41f4bc1cb8813034f5957487766ebb0986b - CONTRIBUTING.md.example: 22570cfb3dde72be79b4b522b6d5ab13f95d778e40444483a096871fe0891b19 + CONTRIBUTING.md.example: 8d23cce2d061e0c20d619c3f66591df5f32821cd84c32d171df0b8ebe1217a55 FUNDING.md.example: 392d047904b1557b29f4b43d37ec403b7480edd5b6ab51180be979b57a91e6ba FUNDING.md.no-osc.example: 3ef0258dd3e3b7f7e17e8bc2d20dcbcb3e74aa5a5a6f51297075696645e34c77 Gemfile.example: 99500023987e81775a9b5ef14e92cb3992f2ac408e5f42454f2728eee9b49fb2 @@ -99,19 +100,19 @@ template_state: PolyForm-Small-Business-1.0.0.md.example: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 README.md.example: 21f491e3d73bfc1b74056a6dcba61f72c93dee3cfe5272ac164a20978454de21 REEK: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - RUBOCOP.md.example: c09e5533ccc59b70a2efa05c99f66e521137c1053d3c12eb43509cebd5b68b0e + RUBOCOP.md.example: d99871a0e4c1d323c92e7febf328f062bb4722069b2abfd0a83bf7daa8dcbf8c Rakefile.example: 569803e726b07ea26267fec6891367a3096a0dff3c266269a7081d36afe496af SECURITY.md.example: ee9411aa85f36d88363fdaea7a1baea4362b6ec112cf2688e711b05de1d3144c bin/setup.example: 0ac35089c95a91d8973fe7a318bf9fd98b9f8e00db92c5d9ca6cd858abb8d41b certs/pboling.pem.example: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - gem.gemspec.example: 83e834e8958a88e4817a57199f48f5ebb245548ce251c5c47372208693f03b17 + gem.gemspec.example: 12dcadc0b297ccd4e18b9d1e538b98ac8330ef9fb2a059ed6754ad59272b77fa gemfiles/modular/benchmark/r4/v0.5.gemfile.example: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 gemfiles/modular/benchmark/vHEAD.gemfile.example: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 gemfiles/modular/cgi/r4/v0.5.gemfile.example: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 gemfiles/modular/cgi/vHEAD.gemfile.example: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 gemfiles/modular/changelog.gemfile.example: 892598e0e7792eb205247ae28128cef6dfc647d2fb33968969152230d6f69288 gemfiles/modular/coverage.gemfile.example: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - gemfiles/modular/coverage_local.gemfile.example: 928d5f260d7b119c038baa56da9fb78dd524dee613aea33ab72894bbce5c506e + gemfiles/modular/coverage_local.gemfile.example: 92ea0d7a9d693553dc614afa2c43990f5c3778c2b00ef6c528e122c31bd506a1 gemfiles/modular/debug.gemfile.example: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 gemfiles/modular/documentation.gemfile.example: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c gemfiles/modular/documentation_local.gemfile.example: 84a20f5d4b0feb94c2cf2f7a8dce8f682f1483498e41484c2b447a5661fd1870 @@ -145,10 +146,10 @@ template_state: gemfiles/modular/stringio/r3/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/r4/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/vHEAD.gemfile.example: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - gemfiles/modular/style.gemfile.example: 3ad0585b4f2db8918580ca41ea8723f7a166d7a83cfd7f9613511094997106fd + gemfiles/modular/style.gemfile.example: 02fe3e8fd00e49b90c3ab30e19b51014ee50490f3eadcfd1d4a39f4c2c997dda gemfiles/modular/style_local.gemfile.example: c86beb711e766126a5be68be4be18255831625ac3650d5069383c4a83a9511f3 - gemfiles/modular/templating.gemfile.example: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - gemfiles/modular/templating_local.gemfile.example: 930057d3b909a72e39a39125c4e883a7ff71f5691e64426c0541f8c8fc75b83f + gemfiles/modular/templating.gemfile.example: 2b33c094677b53ad9dd2eafeb3a3be452f612380c61001a2e75b3c078b8ff72a + gemfiles/modular/templating_local.gemfile.example: ac7259516e69ffafb8b9342a897ddf6042adc46335743f474c342509cefd8f2e gemfiles/modular/webrick/r4/v1.9.gemfile.example: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea gemfiles/modular/webrick/vHEAD.gemfile.example: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b gemfiles/modular/x_std_libs.gemfile.example: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a @@ -175,7 +176,7 @@ template_state: shim/Gemfile.example: 0fb0d9d06fcfb1fd6ca6f0eeb5867253ca1ed221e03d28027719225f868b0637 shim/README.md.example: 3a2f7211b7f92a1dfae5e523b8e34b051a3d8af942144b05286eca0b3c8f6fbe shim/Rakefile.example: 572c94da7052083b39b62a6600785419e314a109efd7a3d8c3a96eb77ad34fd1 - shim/gem.gemspec.example: efae033238e4fd1355cfc134f5c9123f175d1ad1dc4a1a2e663899788c9e0870 + shim/gem.gemspec.example: 14a7015b3328005d1c3b5fda6886bd6da383707745f6eaaa781d6f9689600131 shim/lib/compat_require.rb.example: 94ee85e353a3ca08c8a35c9063d4ff789214ea594c7f803f6cf09d7142f48379 shim/lib/entrypoint.rb.example: dd57613520daca01d6f6bcaa9b83b00ff74505240dc04b84ceb686df3c0539d7 shim/lib/version.rb.example: 15e219ac3a928b5580035f891e415551213175020f1131f6e7ca0ccd55a1b2d6 @@ -189,370 +190,370 @@ files: recipe: template_source_application_simplecov action: write dest_sha256: 7ad375cd3d3e7af12d04843e34eb6e0f28f93c4b8a2da124375c48d433eafc18 - input_fingerprint: b95d391d51c3653b567e8ad29995b05bc095551fdf50c6607e9e78b7e0c13e60 + input_fingerprint: 9b584cdf6a3f757813f1a6ece63d89ee078b55a33365b1e9b9ee66c7125a975e template_sources: - ".simplecov.example" AGPL-3.0-only.md: recipe: template_source_application_AGPL_3_0_only_md action: write dest_sha256: d8a6cc31abc16b6748c7a21f21611f5a1ec33f67d22ca23d7da1c19b95496bee - input_fingerprint: 4c2901acadff9ba6fcb7ca44fc9ef24d6446773e76609b1c5dc708bde289d302 + input_fingerprint: 05d379ae88de0acab64bc946399c81ead8c257df5418d350c9f8cd48f86a67bd template_sources: - AGPL-3.0-only.md.example Gemfile: recipe: template_source_application_Gemfile action: write - dest_sha256: 7400a543bb0048c78bf9c8cf83a054985643c6a7634ce839b29e3fea2695a5b0 - input_fingerprint: bbe50944180c42daf0806daaa783ed9292d7caead58c50707f49602228b2da7c + dest_sha256: a7bf7349a7b8106df03259e9fcbb3285234fea926607944b11c3dc6a4d4a988c + input_fingerprint: 9262c02ef16772ed9f17bb4a94ccfeeff8570398ec2ddba6a85dbd1d25bc3d48 template_sources: - Gemfile.example LICENSE.md: recipe: template_source_application_LICENSE_md action: write dest_sha256: f6188bfd474a636d2a526420ebb411250faa447d94c9b9ccee097128ce4101b5 - input_fingerprint: e33f811ec6405cd25f3fac6cdca7e9a4742af80803c01fa3c9e00b65b0314f32 + input_fingerprint: e8ff03c6f303d0becec5926b16c9ef1569466df8b68dddc2559fd40916cb02ae template_sources: - LICENSE.md.example PolyForm-Small-Business-1.0.0.md: recipe: template_source_application_PolyForm_Small_Business_1_0_0_md action: write dest_sha256: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 - input_fingerprint: 55cc00270b46f44fa419104c34747af8e15740240ec236aef6484decbdd39dc6 + input_fingerprint: 9c3ece0088b2996371474f890201e73d6a1fb71c7d0ec1edf041cabb35aadf64 template_sources: - PolyForm-Small-Business-1.0.0.md.example README.md: recipe: template_source_application_README_md action: write dest_sha256: 6ee44816d05b324da314be2282cbebc41571ae380ac57ce020e1b8173a63b1f4 - input_fingerprint: a47e22e9a9fba4ed336dc511ec5fa1d04c239f354913137dcdd021257d6d33cd + input_fingerprint: 304c8a27b6dc9a787577e1eec7038252e3ce92d2d6fb74cc9447e316371e47b9 template_sources: - README.md.example Rakefile: recipe: template_source_application_Rakefile action: write - dest_sha256: f6e86d6d0cfa242a8a2b8f304d74dff47a7777d04855d64e6252eb8bfcd07d48 - input_fingerprint: 336563e6d9970d7a6870b8ef37084fc54c55b590dc954f7a9f1740f7b6e60ae0 + dest_sha256: a21d2ba144b22eb2e2f8979c594054917dc2d41f39a2546374160fb1720c8e5c + input_fingerprint: 69e8a0c37c97d9b6d5179369ea0ede89fc33cff78104060e6761c48d072d1713 template_sources: - Rakefile.example certs/pboling.pem: recipe: template_source_application_certs_pboling_pem action: write dest_sha256: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - input_fingerprint: 97d82dd2afe11feb3cd6ce0332b2d0f670a7ad40232e8765d164702ddc4c982b + input_fingerprint: 700cfc7d90689130de0e9cd40fc0d73115a361f19a8bfab5c5c7d42a336a3507 template_sources: - certs/pboling.pem.example gemfiles/modular/benchmark/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_r4_v0_5_gemfile action: write dest_sha256: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 - input_fingerprint: 920320c686db27b331ae37114141cb0100c9dc3f2bfffcfaebf5985b3e15a31b + input_fingerprint: 60fcff132cc10068a1201db44fbe42c8ba39ecf7863906b9640a20d658b8b7a3 template_sources: - gemfiles/modular/benchmark/r4/v0.5.gemfile.example gemfiles/modular/benchmark/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_vHEAD_gemfile action: write dest_sha256: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 - input_fingerprint: f52e94ea7121b340ac6193883a9c1beab5a3f2427a7405ab486aa18b06a541fc + input_fingerprint: 0451a8e51725897b5b05dde0045b651c73290bbe27ba75fe49cef5afc038747c template_sources: - gemfiles/modular/benchmark/vHEAD.gemfile.example gemfiles/modular/cgi/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_cgi_r4_v0_5_gemfile action: write dest_sha256: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 - input_fingerprint: 9e89cc1558e3d51eb8e3adebd40913eece589c1520d107a92d1a9fff54e69c89 + input_fingerprint: 43746d5b85708e2d2fbe8ad290971e161e3742bf5c59158346564dc55fc9592b template_sources: - gemfiles/modular/cgi/r4/v0.5.gemfile.example gemfiles/modular/cgi/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_cgi_vHEAD_gemfile action: write dest_sha256: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 - input_fingerprint: 156f6a001a960139136ee3675ec64f57318b5d7c6610697ed0741223ffefd51f + input_fingerprint: f695c8384f0acddd7c5ffdc4c3e9ff5651ca7a54e6ae771f1262e8fb6470cfca template_sources: - gemfiles/modular/cgi/vHEAD.gemfile.example gemfiles/modular/changelog.gemfile: recipe: template_source_application_gemfiles_modular_changelog_gemfile action: write dest_sha256: da669526144fbff33aef207db9541b6fd6c254437f94dec2fab70fc55a7757cd - input_fingerprint: bc1bb2450b5dfc9fc9ea115f223758abfa6694a89c946e95fd314b99982f1f7b + input_fingerprint: d59b9a7bba1d0a47cec4491480c8712f4d774a42424b2769a45a3f1a0c847a82 template_sources: - gemfiles/modular/changelog.gemfile.example gemfiles/modular/coverage.gemfile: recipe: template_source_application_gemfiles_modular_coverage_gemfile action: write dest_sha256: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - input_fingerprint: 4f01d2034eaca0b497a7e644c4146a56dba46f10cc19673a5eaa9d86fca50e57 + input_fingerprint: ce04cdb0de10b344ce5b8b965933f826638c1f02790eb4831e63cd42b421b1d9 template_sources: - gemfiles/modular/coverage.gemfile.example gemfiles/modular/coverage_local.gemfile: recipe: template_source_application_gemfiles_modular_coverage_local_gemfile action: write - dest_sha256: 2b493414df06261ba8acb6f0eb18bf3fdd701d7cb5f967a9d15a3f42a4741827 - input_fingerprint: 75738bec4697ccf0e9dfe8e664b9c792864bf4c3760cbebc88ac9dd4d18cb10e + dest_sha256: 92c9a599c8f6867ec532880f73568f2736ac05d8973ec524b42fd5dbe6aeda3e + input_fingerprint: b29d941a4b955362aa9718db2712b82d7959264a0fc69ce06044b81fbbc0e9a5 template_sources: - gemfiles/modular/coverage_local.gemfile.example gemfiles/modular/debug.gemfile: recipe: template_source_application_gemfiles_modular_debug_gemfile action: write dest_sha256: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 - input_fingerprint: b3a875d168ad1a08020dfee7d6bd6f8dd536667dec9c0e2cc33da760ff0b4253 + input_fingerprint: d38bb781e65b93159b20b13be59909abccfbdb619327b1dc25f3cd335e8a044e template_sources: - gemfiles/modular/debug.gemfile.example gemfiles/modular/documentation.gemfile: recipe: template_source_application_gemfiles_modular_documentation_gemfile action: write dest_sha256: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c - input_fingerprint: 75ea36fdb30a3440a5ea1af8cd5f51ee69a3aaa74c9150e6043e1444ab8c4f78 + input_fingerprint: 4a89643d84710732ab3fc71f9265f28eb93e11484991155373c76b89d30c85c2 template_sources: - gemfiles/modular/documentation.gemfile.example gemfiles/modular/documentation_local.gemfile: recipe: template_source_application_gemfiles_modular_documentation_local_gemfile action: write dest_sha256: 2058173855b9a4acc6d5efa20520e49734243eef6cf0b5e9063e0e5866a08e9c - input_fingerprint: 934e5380e8e500b0504ebe03a001fa616d58e188a368d032a1a79620f4d59089 + input_fingerprint: 7e814e5108637749bb43381e3bfeaa4d3c1cce9fea5255acb86f93cf1837b0f9 template_sources: - gemfiles/modular/documentation_local.gemfile.example gemfiles/modular/erb/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r2_v3_0_gemfile action: write dest_sha256: 3793e7dc9ef23a7ccd893d48cbba092fd27594c63e65cca011cc658218425670 - input_fingerprint: fa0ed795b9ae7f6903ba4315d2c0b08e32325e5788415845424b272da9b195d7 + input_fingerprint: c60208b707a3323a1dcf796a759c1ebf8a586fb5add9e15334b8aa8e4fba53f1 template_sources: - gemfiles/modular/erb/r2/v3.0.gemfile.example gemfiles/modular/erb/r3/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r3_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: a7284dcc5b17318acdbc8e34318539c50228ecc879d0915ea8905c352a8b425c + input_fingerprint: ad061b42e2300fb4b2907832eab17a1705620cd945680a160f0a61a0e418b55d template_sources: - gemfiles/modular/erb/r3/v5.0.gemfile.example gemfiles/modular/erb/r4/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r4_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: d762f699b31de41ad88e7c454e97b4298225a4ac34942a7d07ac4f506ecfef5f + input_fingerprint: 5567415415f3a90befc2505532292cd2e2f905b4052111012a2f31849c6c8c0e template_sources: - gemfiles/modular/erb/r4/v5.0.gemfile.example gemfiles/modular/erb/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_erb_vHEAD_gemfile action: write dest_sha256: ad6f104a49e80e0cf625440e3dc816343fe7e2f037fc4971df75e7bb4305c683 - input_fingerprint: e1e6f9ec3ba20cc5e7d126b12b1715781769d512e1814c38eeb62699b722d26e + input_fingerprint: 36fed78b63dbdafab53b36785088b3dc516a7ad611065b20af4851fa05b286a7 template_sources: - gemfiles/modular/erb/vHEAD.gemfile.example gemfiles/modular/json/truffleruby_22_3.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_22_3_gemfile action: write dest_sha256: 249c12eacbe90f9d0d2e81e7a62c4c7e9102e504ededcda4ecf660cb3bb68be4 - input_fingerprint: a55837e45fe05d383a1534d5cd34c3ab122a9f7c3fb57acfef70be738c8565e4 + input_fingerprint: 6cf55885cba959d3707d10ac43d7688e888587531a977f12846115237b9a77ec template_sources: - gemfiles/modular/json/truffleruby_22_3.gemfile.example gemfiles/modular/json/truffleruby_23_0.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_0_gemfile action: write dest_sha256: 66aa010567f7afa1af8244a74c3c88ecaaf84dc87b6a25180691bb480d02ed28 - input_fingerprint: bd489f3df83609305b16d4383fa088f4d71539e3ebea93bb9479db45d251b338 + input_fingerprint: 4bf2f2b6aa124c2d1a2e22b782ef42e055427e9e8aa01c01eac814acf2ed34b1 template_sources: - gemfiles/modular/json/truffleruby_23_0.gemfile.example gemfiles/modular/json/truffleruby_23_1.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_1_gemfile action: write dest_sha256: '080fcbdaf2bec73cad40832a3d51eebb380af789917b96f493d1460b0dd6361d' - input_fingerprint: ce065812fe39309dcc6d1de43ac3242edc3c8d918688d978bee5d07530a673b3 + input_fingerprint: 5091bdfb4b701bf2210cebba5b51a7983dcb859b637fdd97660a3504cf8dd292 template_sources: - gemfiles/modular/json/truffleruby_23_1.gemfile.example gemfiles/modular/mutex_m/r2/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r2_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: fede1b1615dde99a7312471ad0c4fd209bb27e41ba17ff2fb7e954b8134522d5 + input_fingerprint: ed5a0a59a8b93d11c76bab98f4e0c35c8036290ce8f3aca24ddc02b79046817c template_sources: - gemfiles/modular/mutex_m/r2/v0.3.gemfile.example gemfiles/modular/mutex_m/r3/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r3_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: c1a10d7320a466b4a9ccbdfd23bbabc7c5fc3b62ed451b57bcef1d3f710c9f7f + input_fingerprint: 1968d7d6161db87897e5698ff3e69fb4f18350fbc42e49ed204e1b964fa98ae0 template_sources: - gemfiles/modular/mutex_m/r3/v0.3.gemfile.example gemfiles/modular/mutex_m/r4/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r4_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 2c6f9cf36d46f0c68f935421593b5e26d1084edd14a190d6834d7f85f51dd0f4 + input_fingerprint: 5dd8fd9b3b6c365dbdfd0819d93a2b3f63c44279ff8fcb02b9f7df95c47fb077 template_sources: - gemfiles/modular/mutex_m/r4/v0.3.gemfile.example gemfiles/modular/mutex_m/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_vHEAD_gemfile action: write dest_sha256: '08018641c97f894788fa91b462da504ab2237213d18d95404136c393274ae3cb' - input_fingerprint: a24fcbdc0f4aa50e19932244cdc10e0e7da8661328a3f9d17acaf2ed94d47171 + input_fingerprint: ecfaf4086d4257c556163fe0516702135ca69dffc171d28da0209ad075ea99e5 template_sources: - gemfiles/modular/mutex_m/vHEAD.gemfile.example gemfiles/modular/optional.gemfile: recipe: template_source_application_gemfiles_modular_optional_gemfile action: write dest_sha256: f770e6e9a9dd2bd0f1f132e882d88038b2e21127dce3afe270908c7338c28bfd - input_fingerprint: 5647eac9d89fbe8c6146e798250103f2aa7d50be640a3a8c8acadce709d420dc + input_fingerprint: b5d35f68307aad73ffe722511363c0468d3577df7cc3c140b39a6607d314e787 template_sources: - gemfiles/modular/optional.gemfile.example gemfiles/modular/rspec.gemfile: recipe: template_source_application_gemfiles_modular_rspec_gemfile action: write dest_sha256: d043f5c9344f6435edb4607c5adaf42c78e7fb6b8b6726007de2bbedefb376c3 - input_fingerprint: fbb69f4129afacb762b93cf6343cb47597e53badb26b8d1136640d74721b5a0b + input_fingerprint: 3d8c9c36f312918b7860758d308fdc32c5c51b09de36c00aa802cb1ab0c39321 template_sources: - gemfiles/modular/rspec.gemfile.example gemfiles/modular/runtime_heads.gemfile: recipe: template_source_application_gemfiles_modular_runtime_heads_gemfile action: write dest_sha256: 6ac7158c4a3088190f2a9082f01439eb27eca2172ab3464b15c9cb045aa885e1 - input_fingerprint: 36609970522ca09f030ab7f577ee36e0224df46aa35581fb2f404210091fc71b + input_fingerprint: 731850cf7b741ed81a3093cb6f8901b98297063c0bfcd55a6cd9d527005c1204 template_sources: - gemfiles/modular/runtime_heads.gemfile.example gemfiles/modular/stringio/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r2_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 30ed32d34a2ea3df98e7b272f9714ac68f4844b555b274ad02096b0592922d10 + input_fingerprint: 389a0738c072f59cfa7a9e35c2cac69c9385b1ba6b3a7a7205e14ae0db18313e template_sources: - gemfiles/modular/stringio/r2/v3.0.gemfile.example gemfiles/modular/stringio/r3/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r3_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 7a4443747684cd3e6b02bbc31f127ea1f43c98de5e7eaebc364aad7aac86107c + input_fingerprint: 7c53587660053ce04d6ce3e19d549986a3805215075068a146208a33e936168c template_sources: - gemfiles/modular/stringio/r3/v3.0.gemfile.example gemfiles/modular/stringio/r4/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r4_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 23ff1b93167d9c27dcf9d364f1b058a9b1298ac5bc0ee6d19cd1a8f22fdacbbb + input_fingerprint: ba857e797384435b0ae289b6a02c00caa1e65769701e3902824937b57c806cd5 template_sources: - gemfiles/modular/stringio/r4/v3.0.gemfile.example gemfiles/modular/stringio/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_stringio_vHEAD_gemfile action: write dest_sha256: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - input_fingerprint: 6c7e8df8e36b8b2129acfe40427e5048176e851da8d57fdc17e4618a49c11ed4 + input_fingerprint: c20d1c621fd94ca9d84c90beee893ccbaab83898578bb2d5a21810e6681baffa template_sources: - gemfiles/modular/stringio/vHEAD.gemfile.example gemfiles/modular/style.gemfile: recipe: template_source_application_gemfiles_modular_style_gemfile action: write - dest_sha256: 2a3d46dcb8a9394f595f273f5eb0403d0a552837754ab109afc9ba79a7159083 - input_fingerprint: c2d0a039880dabc00590a9a43ec5a18a9fddf033851377fa119660d7f4cd78e5 + dest_sha256: 9a24acff0054573c30f5d84d0418cd465ba3794d075bb5a36801410ac40e0787 + input_fingerprint: f35a436c0d0857da45f01fa7ef5fa23636da401f9dade5cbba08808f76107371 template_sources: - gemfiles/modular/style.gemfile.example gemfiles/modular/style_local.gemfile: recipe: template_source_application_gemfiles_modular_style_local_gemfile action: write dest_sha256: 55eb9c149cdb2f29c9f31abe2d55a4f334e00fb859681dd17c42149a3f28ca36 - input_fingerprint: 5dce357da2c39ec9775754e43d84962f3b8963c1a85b7d934ff3289e11ced7f6 + input_fingerprint: 5e1fa05ea73d0d6546e5fc0dd64b2defb680189de68be68e37c466acc139691a template_sources: - gemfiles/modular/style_local.gemfile.example gemfiles/modular/templating.gemfile: recipe: template_source_application_gemfiles_modular_templating_gemfile action: write - dest_sha256: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - input_fingerprint: a5f8bd8c5267226b5a12108ea1e1cc514d3e4775417fc2326d443466aa94790d + dest_sha256: 432ba59798d31b899268257c432443a017c5a9bd2c0c7f9f2216617e14150cd3 + input_fingerprint: aed4eba7c876839e4604405f6078c4eeed6ff16281f43449bc3fceded8c54654 template_sources: - gemfiles/modular/templating.gemfile.example gemfiles/modular/templating_local.gemfile: recipe: template_source_application_gemfiles_modular_templating_local_gemfile action: write - dest_sha256: 7d092e5da19f93f2cc92a7ef05889b4aa778c011baf9a6b4684f2e7c03369425 - input_fingerprint: bd8bbd58e5c75c4d297e65ce69f918e97afe759534736150d7af5ea1aebd02bc + dest_sha256: 3f8599d7de1b17e88ce873f36e9a75fbca2d5fb867ca31116c986c26bf9acd75 + input_fingerprint: eadc267bb2d3dc28a5f7195e68996c5a69e9d6812cf017ef08c145c8fe621ce4 template_sources: - gemfiles/modular/templating_local.gemfile.example gemfiles/modular/webrick/r4/v1.9.gemfile: recipe: template_source_application_gemfiles_modular_webrick_r4_v1_9_gemfile action: write dest_sha256: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea - input_fingerprint: d2f54ba8e9b0372200b0bb1133aae4b4d91dd6b65850a2d3944991ba0e2ca0ee + input_fingerprint: cc640f93e52f2857abd13496e9fa2c8f75459932725aa1d34dc122a1ba00c344 template_sources: - gemfiles/modular/webrick/r4/v1.9.gemfile.example gemfiles/modular/webrick/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_webrick_vHEAD_gemfile action: write dest_sha256: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b - input_fingerprint: 4d6ace747b9cfe09d8902702f91b1472063a2e1c7ad1aa2758c9f22cf17dc1eb + input_fingerprint: f27f937de10ca3b737a058144cccf08933b614fa17cf3dc2e1586093fac79517 template_sources: - gemfiles/modular/webrick/vHEAD.gemfile.example gemfiles/modular/x_std_libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_gemfile action: write dest_sha256: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a - input_fingerprint: 344862d4f3650f7b128d936302f042b80b2b9f3ece4e15e03401696139f26d36 + input_fingerprint: a8b33c83ce2861c223678dfa80946d090c49c90bf298ea6fd49160097a68945b template_sources: - gemfiles/modular/x_std_libs.gemfile.example gemfiles/modular/x_std_libs/r2/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r2_libs_gemfile action: write dest_sha256: e80ec8ad06cb1b31ac982bc25cf7696987fca131aa1001eaefd0bf5cd379c273 - input_fingerprint: fc4b02b159e8401289ed6301fed30012b5f19338a971d431d4a1a80ce4dca737 + input_fingerprint: 3caf96141703b91dee6b48bec4496b48e18051b9a915854431b0f6a861ec5841 template_sources: - gemfiles/modular/x_std_libs/r2/libs.gemfile.example gemfiles/modular/x_std_libs/r3.1/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_1_libs_gemfile action: write dest_sha256: 9f8565c40b09bea1bc4c2e2ad87fe11400c3c51a2b235655bfcd8e491ed88ca8 - input_fingerprint: a0dadba8adc1e72d61933b48a57716a836ca3677a00360ad4be8b41e34e2fb66 + input_fingerprint: 951f7401390da767e3838e579de608b26179ce80b16c26cec378e441a0a682b5 template_sources: - gemfiles/modular/x_std_libs/r3.1/libs.gemfile.example gemfiles/modular/x_std_libs/r3/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_libs_gemfile action: write dest_sha256: 546f8849f4267bb19aa10ff0de40be30957197f229e6887847181ea9127b2650 - input_fingerprint: b3af1053dc3800fb641e0748f0027838f33a2626ccbf5dadc6801b8590fd0252 + input_fingerprint: 20a878346f4791fbb2b682be33af913dbdce8084471c887d06c27cda33ad3e20 template_sources: - gemfiles/modular/x_std_libs/r3/libs.gemfile.example gemfiles/modular/x_std_libs/r4/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r4_libs_gemfile action: write dest_sha256: 8c2582eaa218d216b98c86c933465295c8b4e43f3251ea388b9eaf6e471f8da6 - input_fingerprint: 9e01ea60bd84f6eb30a5a1438af07a46028a497363490a3454497b6525459cd7 + input_fingerprint: 4c5eca6de5610b599cd9ed0251d2a07bd326737a4cba4033fee4e468a9aaaccb template_sources: - gemfiles/modular/x_std_libs/r4/libs.gemfile.example gemfiles/modular/x_std_libs/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_vHEAD_gemfile action: write dest_sha256: d3133ec4c0638363a7fb025d19be7e95a615fd61c35ddb8d17f2280ee74a7486 - input_fingerprint: 1943fedbd660b205b1f1616c143db5abf8bff1c54e8e43849a7e423787b5a14b + input_fingerprint: d2637ed21f424098f9669e74fca2ee8e11f02ee306dc2529e5b76129e0faddd8 template_sources: - gemfiles/modular/x_std_libs/vHEAD.gemfile.example lib/rust/merge/version.rb: recipe: template_source_application_lib_rust_merge_version_rb action: write - dest_sha256: 5f68d87c6d5ebe3f243e0e3602873d38db910901efa7d3aa939cab47f1b24f90 - input_fingerprint: 3386a64c380dc55f29defcec45663f91cfc8b07fb39218004195a8ac36a61385 + dest_sha256: c30de09c06c06acd3149df7c566c0797449030dbf0eb1a23105fa5113fbe1406 + input_fingerprint: 224e99c3d28435d19919dc7b81dec27ea8d649de339b492d1d9123aefbd891e4 template_sources: - lib/gem/version.rb.example mise.toml: recipe: template_source_application_mise_toml action: write dest_sha256: 7d267154ca4f081b0ac7da804c0180c2b091aec5f1c877417c1c320f4f369c88 - input_fingerprint: bd71456aa4ef7b5272b1e09549f005a91d4cd6cfb3793397850f72e8df69e5e9 + input_fingerprint: a6e1857364844e6ce4279d38a3a78f775e9563717432ea3278807cb00d3c2ada template_sources: - mise.toml.no-osc.example rust-merge.gemspec: recipe: template_source_application_rust_merge_gemspec action: write - dest_sha256: ebbceb6f49202750d74eaa7ed9854dc5095fadfb89b0b72218db6f23873745c4 - input_fingerprint: 92b9db479b4558ae129d76b762fcd6aad24d92a8383ab88172a57b2ce49dbb9d + dest_sha256: 1d84baa206098f1a463992653453538170c68b66ecdf87a9603639af5407895d + input_fingerprint: 0d1314ce13e5cb8469de16808dff9ef1bbbfdb72211cdc9a97d049f78cdd0f14 template_sources: - gem.gemspec.example sig/rust/merge.rbs: recipe: template_source_application_sig_rust_merge_rbs action: write dest_sha256: 737a3bf98096a1db3f6b34bdfd811dfd1498658906fa7a40d92f7c15c4d09b7a - input_fingerprint: 61cba8a302fc4e0772930746533063961fd13a802ae2b4ac81a30200c4be6a6a + input_fingerprint: a05d26a1edde378b7ec04587ff1afb16e3bfbbf77e785ca0cfc9a98a88dbb246 template_sources: - sig/gem.rbs.example spec/spec_helper.rb: recipe: template_source_application_spec_spec_helper_rb action: write dest_sha256: 70a35d00eedf99179fad873409446fad8e91c33df146bb5ecc2b736dc00b6cf5 - input_fingerprint: 6aa5fed58c6d7a0526298607b4d0c2608b9d8ef4824fa4ebb1162af5548c79d5 + input_fingerprint: 1221b4fd3adbba13b2d36e85e799b637385ed4b6fdbc07872219c3f3f8fb7664 template_sources: - spec/spec_helper.rb.example diff --git a/gems/rust-merge/Gemfile b/gems/rust-merge/Gemfile index 544f9d1d3..3c0d8de3c 100644 --- a/gems/rust-merge/Gemfile +++ b/gems/rust-merge/Gemfile @@ -19,7 +19,7 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } # Include dependencies from rust-merge.gemspec gemspec -gem 'kettle-family', '~> 1.2', '>= 1.2.97' +gem 'kettle-family', '~> 1.2', '>= 1.2.100' # Local workspace dependency wiring for *_local.gemfile overrides gem 'nomono', '~> 1.1', '>= 1.1.5', require: false # ruby >= 3.2.0 diff --git a/gems/rust-merge/Gemfile.lock b/gems/rust-merge/Gemfile.lock index ba4d3a70c..6e3e98200 100644 --- a/gems/rust-merge/Gemfile.lock +++ b/gems/rust-merge/Gemfile.lock @@ -10,131 +10,131 @@ GIT PATH remote: . specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + rust-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) + ast-crispr-markdown-markly (7.1.9) + ast-crispr (= 7.1.9) + markdown-merge (= 7.1.9) + markly-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism specs: - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) + ast-crispr-ruby-prism (7.1.9) + ast-crispr (= 7.1.9) + prism-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) + ast-crispr (7.1.9) + ast-merge (= 7.1.9) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ast-merge-git (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: - ast-merge (7.1.8) + ast-merge (7.1.9) benchmark token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) + ast-template (7.1.9) + ast-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + bash-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + binary-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) + citrus-toml-merge (7.1.9) + ast-merge (= 7.1.9) + toml-merge (= 7.1.9) toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge specs: - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) commonmarker (~> 2.2) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) + dotenv-merge (7.1.9) + ast-merge (= 7.1.9) + plain-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + go-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + html-merge (7.1.9) + ast-crispr (= 7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + json-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: - kettle-jem (7.1.25) + kettle-jem (7.1.26) addressable (>= 2.8, < 3) ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) @@ -168,114 +168,114 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge specs: - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown (~> 2.5) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + markdown-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) + markly-merge (7.1.9) + markdown-merge (= 7.1.9) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge specs: - parslet-toml-merge (7.1.8) + parslet-toml-merge (7.1.9) toml (~> 0.3) - toml-merge (= 7.1.8) + toml-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + plain-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) + prism-merge (7.1.9) + ast-merge (= 7.1.9) prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + psych-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) + yaml-merge (= 7.1.9) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) + rbs-merge (7.1.9) + ast-merge (= 7.1.9) rbs (>= 3.10) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) + smorg-rb (7.1.9) + ast-merge (= 7.1.9) + ast-merge-git (= 7.1.9) + bash-merge (= 7.1.9) diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) + dotenv-merge (= 7.1.9) + go-merge (= 7.1.9) + html-merge (= 7.1.9) + json-merge (= 7.1.9) kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) + markdown-merge (= 7.1.9) + plain-merge (= 7.1.9) + prism-merge (= 7.1.9) + psych-merge (= 7.1.9) + rbs-merge (= 7.1.9) + rust-merge (= 7.1.9) + toml-merge (= 7.1.9) + typescript-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + toml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: - tree_haver (7.1.8) + tree_haver (7.1.9) citrus (~> 3.0) parslet (~> 2.0) tree_sitter_language_pack (>= 1.16.2, < 2.0) @@ -284,25 +284,25 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + typescript-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + yaml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) + zip-merge (7.1.9) + binary-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) GEM @@ -336,6 +336,8 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) + commonmarker (2.10.0) + rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -465,11 +467,15 @@ GEM lint_roller (1.1.0) logger (1.7.0) markly (0.19.0) + mini_portile2 (2.8.9) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) reline (~> 0.6) mutex_m (0.3.0) + nokogiri (1.19.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-musl) @@ -503,6 +509,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) + rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -696,13 +705,16 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.16.2-aarch64-linux) + tree_sitter_language_pack (1.17.0) + rb_sys (>= 0.9.130, < 0.10) + sorbet-runtime (~> 0.5) + tree_sitter_language_pack (1.17.0-aarch64-linux) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-arm64-darwin) + tree_sitter_language_pack (1.17.0-arm64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-linux) + tree_sitter_language_pack (1.17.0-x86_64-linux) sorbet-runtime (~> 0.5) tsort (0.2.0) tty-cursor (0.7.1) @@ -784,9 +796,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.31) + kettle-dev (~> 3.0, >= 3.0.34) kettle-drift (~> 1.0, >= 1.0.13) - kettle-family (~> 1.2, >= 1.2.97) + kettle-family (~> 1.2, >= 1.2.100) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) @@ -807,12 +819,12 @@ DEPENDENCIES reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) - rubocop-lts (~> 24.2, >= 24.2.1) - rubocop-lts-rspec (~> 1.0, >= 1.0.5) + rubocop-lts (~> 24.2, >= 24.2.3) + rubocop-lts-rspec (~> 1.0, >= 1.0.6) rubocop-minitest (~> 0.40, >= 0.40.0) rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! - rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) ruby-merge! ruby-progressbar (~> 1.13) rust-merge! @@ -843,33 +855,34 @@ CHECKSUMS appraisal2 (3.2.3) sha256=3a6cfaf8a444e02707b9a34154af1c4902fbe99d9d2168d7e81dd83ec77e6db7 appraisal2-rubocop (1.0.2) sha256=1dae97c1be087cf9c098a3a72fd41f873435e9b8b39687e633b36c9ccb22bff4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.8) - ast-crispr-markdown-markly (7.1.8) - ast-crispr-ruby-prism (7.1.8) - ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) + ast-crispr (7.1.9) + ast-crispr-markdown-markly (7.1.9) + ast-crispr-ruby-prism (7.1.9) + ast-merge (7.1.9) + ast-merge-git (7.1.9) + ast-template (7.1.9) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.8) + bash-merge (7.1.9) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) - bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae + binary-merge (7.1.9) + bundler (4.1.0.beta1) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.8) + citrus-toml-merge (7.1.9) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 + commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e commonmarker (2.10.0-x86_64-darwin) sha256=01e0830ed0319825ecdc16411c90acd3f661d1568dfc178731b3f64d0ce2363d commonmarker (2.10.0-x86_64-linux) sha256=945c510c0bfca9022245928e2248468fe3ddad58c939be0c37b20082cc392880 commonmarker (2.10.0-x86_64-linux-musl) sha256=288cd4fb9f17eed2ffa73551ef241dcf594e0f484b2aee2a0999540333c0618e - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) completely (0.8.0) sha256=e493cd5d84805f47917a41f277ecbfe5f35363bed670be5a957d3acaed8c6c5e concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 @@ -878,7 +891,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docopt_ng (0.7.1) sha256=a024148ee4fa3ab1a8a04411aa4370f39cf2b446e63562097d418b7974a15667 - dotenv-merge (7.1.8) + dotenv-merge (7.1.9) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -891,35 +904,37 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) + go-merge (7.1.9) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) + html-merge (7.1.9) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a - json-merge (7.1.8) - kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + json-merge (7.1.9) + kettle-changelog (1.0.7) + kettle-dev (3.0.34) + kettle-drift (1.0.13) kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 - kettle-jem (7.1.25) + kettle-jem (7.1.26) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 - kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd + kettle-soup-cover (3.0.10) kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 - markdown-merge (7.1.8) + markdown-merge (7.1.9) markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca - markly-merge (7.1.8) + markly-merge (7.1.9) + mini_portile2 (2.8.9) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 + nokogiri (1.19.4) nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af nokogiri (1.19.4-arm64-darwin) sha256=a46db9853286e6597b36ebc6953817d15acf3a299583eb3f89fdc6f91dd63527 @@ -933,20 +948,22 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) - plain-merge (7.1.8) + parslet-toml-merge (7.1.9) + plain-merge (7.1.9) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.8) + prism-merge (7.1.9) psych (5.5.0) sha256=4b245bbbd0f3238df8ccee766ebc1a6b062b10e4ee1d3284eb588739ba156a0a - psych-merge (7.1.8) + psych-merge (7.1.9) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 - rbs-merge (7.1.8) + rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -982,11 +999,11 @@ CHECKSUMS rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.8) + ruby-merge (7.1.9) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) + rust-merge (7.1.9) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +1011,7 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) + smorg-rb (7.1.9) sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,25 +1027,26 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.8) + toml (0.3.0) + toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb - tree_haver (7.1.8) - tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 - tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 - tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 - tree_sitter_language_pack (1.16.2-x86_64-linux) sha256=d8151e6e44e35ace9de3611c76b730896beab17f427db06d8f76666332a5dc60 + tree_haver (7.1.9) + tree_sitter_language_pack (1.17.0) + tree_sitter_language_pack (1.17.0-aarch64-linux) + tree_sitter_language_pack (1.17.0-arm64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-linux) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f tty-cursor (0.7.1) sha256=79534185e6a777888d88628b14b6a1fdf5154a603f285f80b1753e1908e0bf48 tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) + typescript-merge (7.1.9) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 yaml-converter (0.2.5) sha256=a5214fe1a6c2df88bd34a35bcded1b1dcd30135548130df2e03b54ca8c0f2423 - yaml-merge (7.1.8) + yaml-merge (7.1.9) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.8) sha256=73d935d43e3479d65ce8aff25c7d3100e8bb83528a2adaa0ed824e5046ac99e7 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -1037,8 +1055,8 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) + zip-merge (7.1.9) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH - 4.0.20 + 4.1.0.beta1 diff --git a/gems/rust-merge/Rakefile b/gems/rust-merge/Rakefile index 6a7d63f43..eb9eba531 100644 --- a/gems/rust-merge/Rakefile +++ b/gems/rust-merge/Rakefile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -# rust-merge Rakefile v7.1.18 - 2026-09-07 +# rust-merge Rakefile v7.1.26 - 2026-09-09 # Ruby 2.3 (Safe Navigation) or higher required # # See LICENSE.md for license information. diff --git a/gems/rust-merge/bin/rubocop-gradual b/gems/rust-merge/bin/rubocop-gradual new file mode 100755 index 000000000..7c7ff0635 --- /dev/null +++ b/gems/rust-merge/bin/rubocop-gradual @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'rubocop-gradual' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'rubygems' +require 'bundler/setup' + +load Gem.bin_path('rubocop-gradual', 'rubocop-gradual') diff --git a/gems/rust-merge/gemfiles/modular/coverage_local.gemfile b/gems/rust-merge/gemfiles/modular/coverage_local.gemfile index 37917caac..d6c890e46 100644 --- a/gems/rust-merge/gemfiles/modular/coverage_local.gemfile +++ b/gems/rust-merge/gemfiles/modular/coverage_local.gemfile @@ -29,11 +29,31 @@ Kernel.send(:gem, 'nomono', *nomono_activation_requirements) require 'nomono/bundler' local_gems = %w[kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -local_gems_to_eval = local_gems - %w[] - declared_gems # export KETTLE_DEV_DEV=/path/to/my platform :mri do + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + local_gems_to_eval = local_gems - %w[] - declared_gems + eval_nomono_gems( gems: local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/rust-merge/gemfiles/modular/style.gemfile b/gems/rust-merge/gemfiles/modular/style.gemfile index 59c5dc1a3..41ec99454 100644 --- a/gems/rust-merge/gemfiles/modular/style.gemfile +++ b/gems/rust-merge/gemfiles/modular/style.gemfile @@ -24,9 +24,9 @@ platform :mri do if ENV.fetch('RUBOCOP_LTS_DEV', 'false').casecmp('false').zero? declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) - gem 'rubocop-lts', '~> 24.2', '>= 24.2.1' unless declared_gems.include?('rubocop-lts') - gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.5' unless declared_gems.include?('rubocop-lts-rspec') - gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.6' unless declared_gems.include?('rubocop-ruby3_2') + gem 'rubocop-lts', '~> 24.2', '>= 24.2.3' unless declared_gems.include?('rubocop-lts') + gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.6' unless declared_gems.include?('rubocop-lts-rspec') + gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.8' unless declared_gems.include?('rubocop-ruby3_2') else eval_gemfile('style_local.gemfile') end diff --git a/gems/rust-merge/gemfiles/modular/templating.gemfile b/gems/rust-merge/gemfiles/modular/templating.gemfile index 6af159bd7..ce51a08ed 100644 --- a/gems/rust-merge/gemfiles/modular/templating.gemfile +++ b/gems/rust-merge/gemfiles/modular/templating.gemfile @@ -18,7 +18,7 @@ end if structuredmerge_remote # Merge recipes for released installs. - gem 'kettle-jem', '>= 7.0' + gem 'kettle-jem', '~> 7.1', '>= 7.1.26' end if kettle_remote diff --git a/gems/rust-merge/gemfiles/modular/templating_local.gemfile b/gems/rust-merge/gemfiles/modular/templating_local.gemfile index ccf777803..85e778960 100644 --- a/gems/rust-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/rust-merge/gemfiles/modular/templating_local.gemfile @@ -65,9 +65,7 @@ structuredmerge_local_gems = %w[ kettle_dev_local_gems = %w[ kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift ] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[] -kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - (declared_gems - %w[kettle-dev]) if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( @@ -81,6 +79,28 @@ if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 end if ENV.fetch('KETTLE_DEV_DEV', 'false').casecmp('false') != 0 + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - declared_gems + eval_nomono_gems( gems: kettle_dev_local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/rust-merge/rust-merge.gemspec b/gems/rust-merge/rust-merge.gemspec index 85a5b0a69..9f683bd0f 100644 --- a/gems/rust-merge/rust-merge.gemspec +++ b/gems/rust-merge/rust-merge.gemspec @@ -120,7 +120,7 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.31') # ruby >= 4.0.0 + spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.34') # ruby >= 4.0.0 # Security spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 From 8b6f677fa8f288f1b23b72611ae4a87020bef964 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 23:50:47 -0400 Subject: [PATCH 089/137] =?UTF-8?q?=F0=9F=8E=A8=20Template=20typescript-me?= =?UTF-8?q?rge=20by=20kettle-family?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/typescript-merge/.kettle-drift.lock | 76 ++++- gems/typescript-merge/.rubocop_gradual.lock | 7 +- .../.structuredmerge/kettle-jem.lock | 145 ++++---- gems/typescript-merge/Gemfile | 2 +- gems/typescript-merge/Gemfile.lock | 320 +++++++++--------- gems/typescript-merge/Rakefile | 2 +- gems/typescript-merge/bin/rubocop-gradual | 16 + .../gemfiles/modular/coverage_local.gemfile | 24 +- .../gemfiles/modular/style.gemfile | 6 +- .../gemfiles/modular/templating.gemfile | 2 +- .../gemfiles/modular/templating_local.gemfile | 24 +- .../typescript-merge/typescript-merge.gemspec | 2 +- 12 files changed, 388 insertions(+), 238 deletions(-) create mode 100755 gems/typescript-merge/bin/rubocop-gradual diff --git a/gems/typescript-merge/.kettle-drift.lock b/gems/typescript-merge/.kettle-drift.lock index 98b009e1e..1b23f4793 100644 --- a/gems/typescript-merge/.kettle-drift.lock +++ b/gems/typescript-merge/.kettle-drift.lock @@ -1,10 +1,82 @@ { + "debug_env: 'KETTLE_DEV_DEBUG',\nroot: %w[src my kettle-dev]": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 46, + 63 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 93, + 110 + ] + } + ], + "path_env: 'KETTLE_DEV_DEV',\nvendored_gems_env: 'VENDORED_GEMS',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 43, + 60 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 90, + 107 + ] + } + ], + "prefix: 'KETTLE_DEV',\npath_env: 'KETTLE_DEV_DEV',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 42, + 59 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 89, + 106 + ] + } + ], + "vendor_gem_dir_env: 'VENDOR_GEM_DIR',\ndebug_env: 'KETTLE_DEV_DEBUG',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 45, + 62 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 92, + 109 + ] + } + ], "vendored_gems_env: 'VENDORED_GEMS',\nvendor_gem_dir_env: 'VENDOR_GEM_DIR',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 44, + 61 + ] + }, { "file": "gemfiles/modular/templating_local.gemfile", "lines": [ - 77, - 88 + 75, + 91, + 108 ] } ] diff --git a/gems/typescript-merge/.rubocop_gradual.lock b/gems/typescript-merge/.rubocop_gradual.lock index 09abe4338..721f9231d 100644 --- a/gems/typescript-merge/.rubocop_gradual.lock +++ b/gems/typescript-merge/.rubocop_gradual.lock @@ -2,7 +2,7 @@ ".simplecov:827434149": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] ], - "Rakefile:2096741469": [ + "Rakefile:4122014206": [ [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], [81, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], [165, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], @@ -22,6 +22,9 @@ [1, 1, 0, "Naming/FileName: The name of this source file (`vHEAD.gemfile`) should use snake_case.", 5381], [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], + "gemfiles/modular/coverage_local.gemfile:2813372128": [ + [34, 1, 1586, "Metrics/BlockLength: Block has too many lines. [37/25]", 820328175] + ], "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], @@ -108,7 +111,7 @@ [3, 1, 5654, "Metrics/BlockLength: Block has too many lines. [77/25]", 332568190], [8, 3, 4830, "Metrics/BlockLength: Block has too many lines. [62/25]", 3720035714] ], - "typescript-merge.gemspec:2743117154": [ + "typescript-merge.gemspec:2461560487": [ [137, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4147388508], [148, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], [149, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] diff --git a/gems/typescript-merge/.structuredmerge/kettle-jem.lock b/gems/typescript-merge/.structuredmerge/kettle-jem.lock index 64f91b5c9..1a0da0735 100644 --- a/gems/typescript-merge/.structuredmerge/kettle-jem.lock +++ b/gems/typescript-merge/.structuredmerge/kettle-jem.lock @@ -1,11 +1,12 @@ --- version: 1 template_state: - version: 7.1.18 - applied_at: '2026-09-07' + version: 7.1.26 + applied_at: '2026-09-10' changelog_replay: last_entry_key: kettle-jem-template-20260802-001 last_entry_date: '2026-08-02' + maintenance_changelog: {} checksums: ".aiignore.example": 48a5dfdd93afd1a15fdce39cc28ca9920263f00018b0968ab031fa744521e5ce ".config/mise/env.sh": aeea5a2ab489ba6e5467ae8de6e386ec8c8fe4ff31a044e69d0cd6a092dd6654 @@ -75,7 +76,7 @@ template_state: ".rubocop_rspec.yml.example": 288ad75e7eb14d87d80fafe6f7272217be5c57547536ee56c780a7d10ac7ec74 ".simplecov.example": 222f2e6ce8cf089c70a21f0f5e5423d4bd59a96fdb2ce7754b0fb3d6f430c229 ".structuredmerge/git-drivers.toml.example": 9d241a44c9edffcdbd3da018fa188a238089c3d1635040924df594a6929a4f97 - ".structuredmerge/kettle-jem.yml.example": 26949dc4ee0722415e72452cbc186bee6ef7b154eae33166d36f3fdb1ca6e46d + ".structuredmerge/kettle-jem.yml.example": ff65a738da1af7d60714026a81d3323a46c864e96ae3570b806afdf6e7149ff9 ".yard-lint.yml.example": 90def46867c9436b4e177c47d91fc8165f4602e335715aecc39f5587ae20b55b ".yardignore.example": 821f453c609df7d46145d675424b39dfbe6dfdca8edac5f367b85fff48502455 ".yardopts.example": 6fd6f2701713096a8a9ea095c213bbc68eeef37797c4754d97837e3229a3a5f6 @@ -88,7 +89,7 @@ template_state: CHANGELOG.transfer.md: 21331d8a9e58b4ff6e088b88eb408bcccb0f2f64e78f8f4d42ac3f11a24baad8 CITATION.cff.example: e404ea0a7919d78a83d53d80e211d17b9663576aa606583b709795dc023fd75c CODE_OF_CONDUCT.md.example: f1ad532f1860f73ef774c6b27a26d41f4bc1cb8813034f5957487766ebb0986b - CONTRIBUTING.md.example: 22570cfb3dde72be79b4b522b6d5ab13f95d778e40444483a096871fe0891b19 + CONTRIBUTING.md.example: 8d23cce2d061e0c20d619c3f66591df5f32821cd84c32d171df0b8ebe1217a55 FUNDING.md.example: 392d047904b1557b29f4b43d37ec403b7480edd5b6ab51180be979b57a91e6ba FUNDING.md.no-osc.example: 3ef0258dd3e3b7f7e17e8bc2d20dcbcb3e74aa5a5a6f51297075696645e34c77 Gemfile.example: 99500023987e81775a9b5ef14e92cb3992f2ac408e5f42454f2728eee9b49fb2 @@ -99,19 +100,19 @@ template_state: PolyForm-Small-Business-1.0.0.md.example: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 README.md.example: 21f491e3d73bfc1b74056a6dcba61f72c93dee3cfe5272ac164a20978454de21 REEK: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - RUBOCOP.md.example: c09e5533ccc59b70a2efa05c99f66e521137c1053d3c12eb43509cebd5b68b0e + RUBOCOP.md.example: d99871a0e4c1d323c92e7febf328f062bb4722069b2abfd0a83bf7daa8dcbf8c Rakefile.example: 569803e726b07ea26267fec6891367a3096a0dff3c266269a7081d36afe496af SECURITY.md.example: ee9411aa85f36d88363fdaea7a1baea4362b6ec112cf2688e711b05de1d3144c bin/setup.example: 0ac35089c95a91d8973fe7a318bf9fd98b9f8e00db92c5d9ca6cd858abb8d41b certs/pboling.pem.example: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - gem.gemspec.example: 83e834e8958a88e4817a57199f48f5ebb245548ce251c5c47372208693f03b17 + gem.gemspec.example: 12dcadc0b297ccd4e18b9d1e538b98ac8330ef9fb2a059ed6754ad59272b77fa gemfiles/modular/benchmark/r4/v0.5.gemfile.example: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 gemfiles/modular/benchmark/vHEAD.gemfile.example: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 gemfiles/modular/cgi/r4/v0.5.gemfile.example: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 gemfiles/modular/cgi/vHEAD.gemfile.example: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 gemfiles/modular/changelog.gemfile.example: 892598e0e7792eb205247ae28128cef6dfc647d2fb33968969152230d6f69288 gemfiles/modular/coverage.gemfile.example: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - gemfiles/modular/coverage_local.gemfile.example: 928d5f260d7b119c038baa56da9fb78dd524dee613aea33ab72894bbce5c506e + gemfiles/modular/coverage_local.gemfile.example: 92ea0d7a9d693553dc614afa2c43990f5c3778c2b00ef6c528e122c31bd506a1 gemfiles/modular/debug.gemfile.example: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 gemfiles/modular/documentation.gemfile.example: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c gemfiles/modular/documentation_local.gemfile.example: 84a20f5d4b0feb94c2cf2f7a8dce8f682f1483498e41484c2b447a5661fd1870 @@ -145,10 +146,10 @@ template_state: gemfiles/modular/stringio/r3/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/r4/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/vHEAD.gemfile.example: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - gemfiles/modular/style.gemfile.example: 3ad0585b4f2db8918580ca41ea8723f7a166d7a83cfd7f9613511094997106fd + gemfiles/modular/style.gemfile.example: 02fe3e8fd00e49b90c3ab30e19b51014ee50490f3eadcfd1d4a39f4c2c997dda gemfiles/modular/style_local.gemfile.example: c86beb711e766126a5be68be4be18255831625ac3650d5069383c4a83a9511f3 - gemfiles/modular/templating.gemfile.example: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - gemfiles/modular/templating_local.gemfile.example: 930057d3b909a72e39a39125c4e883a7ff71f5691e64426c0541f8c8fc75b83f + gemfiles/modular/templating.gemfile.example: 2b33c094677b53ad9dd2eafeb3a3be452f612380c61001a2e75b3c078b8ff72a + gemfiles/modular/templating_local.gemfile.example: ac7259516e69ffafb8b9342a897ddf6042adc46335743f474c342509cefd8f2e gemfiles/modular/webrick/r4/v1.9.gemfile.example: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea gemfiles/modular/webrick/vHEAD.gemfile.example: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b gemfiles/modular/x_std_libs.gemfile.example: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a @@ -175,7 +176,7 @@ template_state: shim/Gemfile.example: 0fb0d9d06fcfb1fd6ca6f0eeb5867253ca1ed221e03d28027719225f868b0637 shim/README.md.example: 3a2f7211b7f92a1dfae5e523b8e34b051a3d8af942144b05286eca0b3c8f6fbe shim/Rakefile.example: 572c94da7052083b39b62a6600785419e314a109efd7a3d8c3a96eb77ad34fd1 - shim/gem.gemspec.example: efae033238e4fd1355cfc134f5c9123f175d1ad1dc4a1a2e663899788c9e0870 + shim/gem.gemspec.example: 14a7015b3328005d1c3b5fda6886bd6da383707745f6eaaa781d6f9689600131 shim/lib/compat_require.rb.example: 94ee85e353a3ca08c8a35c9063d4ff789214ea594c7f803f6cf09d7142f48379 shim/lib/entrypoint.rb.example: dd57613520daca01d6f6bcaa9b83b00ff74505240dc04b84ceb686df3c0539d7 shim/lib/version.rb.example: 15e219ac3a928b5580035f891e415551213175020f1131f6e7ca0ccd55a1b2d6 @@ -189,370 +190,370 @@ files: recipe: template_source_application_simplecov action: write dest_sha256: 3e57a717abbd4384a3a039c4cdaa49550561d6eb52b3a4efb75df316c7cb2226 - input_fingerprint: a1fa11d591e7ca2af31b827092cd54fc71096d8f60a633aaaa657611fc5891c3 + input_fingerprint: 92c9f9ad5523f3db5458a0515f25d0f0d6b077752f651a277a569099dd8d1328 template_sources: - ".simplecov.example" AGPL-3.0-only.md: recipe: template_source_application_AGPL_3_0_only_md action: write dest_sha256: d8a6cc31abc16b6748c7a21f21611f5a1ec33f67d22ca23d7da1c19b95496bee - input_fingerprint: f795135e5fb32fd50e1fea7ced85e32cd0b43cee12eb4547b04f15af020160bd + input_fingerprint: 29693443add549634b32ff3c156438c9fa6e4a5c2790bbf17f0547c6124933af template_sources: - AGPL-3.0-only.md.example Gemfile: recipe: template_source_application_Gemfile action: write - dest_sha256: d1b2bf0d1c326e7325d557bfbe84c5a3e3e1e5971214c12dfed4c29f9d2d9020 - input_fingerprint: 6ffc62f3f1b315b8c3a03a0b42e05105adcd7db2db31eb2af30f1f7407b37777 + dest_sha256: 5f2634a5f1e9da61f49b60b244f2d004a880be82c42fbbab8c79d5c0225a9829 + input_fingerprint: 2cd10643788ea538c56d2f2c2bf2e6fbf902ebde2923ae85469b9c2b4b1e55e8 template_sources: - Gemfile.example LICENSE.md: recipe: template_source_application_LICENSE_md action: write dest_sha256: f6188bfd474a636d2a526420ebb411250faa447d94c9b9ccee097128ce4101b5 - input_fingerprint: e6eba25dfda39027d6e0434295b3681f131c95ae300d0f5aa2522f5af9789e3c + input_fingerprint: 315d28b83ca28a90fb56c4d39eb867de2e81111a939dd2db81e0841b75846c3c template_sources: - LICENSE.md.example PolyForm-Small-Business-1.0.0.md: recipe: template_source_application_PolyForm_Small_Business_1_0_0_md action: write dest_sha256: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 - input_fingerprint: a17abf97762ff7f8de8e131a2b7ec2e9d0c78d07baa4d0d24550d5e98a85ef8c + input_fingerprint: 11d769ef01d08728f3307b1145a8b3f854bf42aec68942b427795f9210307779 template_sources: - PolyForm-Small-Business-1.0.0.md.example README.md: recipe: template_source_application_README_md action: write dest_sha256: 813b7731f3b7053db85c9b6a639fc9bd4ed9fdbb2c198cb28bbb1e4bbf4dd78b - input_fingerprint: 6a5c2955171f9d844c55e44717f5d0ee1c4387e13f1e870b471be83a706214cf + input_fingerprint: 012b895c561abb79f64bd995b942b0169ac448e3e42b37b6b7463e4bb8794541 template_sources: - README.md.example Rakefile: recipe: template_source_application_Rakefile action: write - dest_sha256: 4db88c22988c1d2087d104580b0b1efb583d57429fe9a52a2497d2d560c67a3a - input_fingerprint: 1434f543e8f3fe4627f8e6a4ce40c212da81a663ab1701315baaa62f15a162a4 + dest_sha256: 2ab1d112042ca8f8a2ddfd903adabacd43b238ded6f4996230f6c68a1c0ea85f + input_fingerprint: e1c534c3c9656b9a539c7a60f7c2c507f33272859449663e568bf7634c155d03 template_sources: - Rakefile.example certs/pboling.pem: recipe: template_source_application_certs_pboling_pem action: write dest_sha256: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - input_fingerprint: 4a7be979ec203a5dd8c54c70c1da77b538b00f59abef4e6daacc6abd8abf50ae + input_fingerprint: c1c47d7d6927c68730935ceb1c241ca5f61cd0da0333ea36c442ee55e9ed7a63 template_sources: - certs/pboling.pem.example gemfiles/modular/benchmark/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_r4_v0_5_gemfile action: write dest_sha256: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 - input_fingerprint: 5b9e36dc22eaec5dd75e15ab19d74888166e52391a858d4245c669e6adf8eb62 + input_fingerprint: 2e4006860f574b2c4bfd52a24f24e2c9efbdb5d51fa1082440d32c336f8e1f6d template_sources: - gemfiles/modular/benchmark/r4/v0.5.gemfile.example gemfiles/modular/benchmark/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_vHEAD_gemfile action: write dest_sha256: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 - input_fingerprint: c641962d6f8b41a8c96db9917d2c968b0adc2e090fe33f8a4915d532aeefe828 + input_fingerprint: 13b5634d2c17d21709413f35ec0292ac194c0874610ec99afcca14c4ee8b5a09 template_sources: - gemfiles/modular/benchmark/vHEAD.gemfile.example gemfiles/modular/cgi/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_cgi_r4_v0_5_gemfile action: write dest_sha256: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 - input_fingerprint: f4c4f59dba36c80f408c70eade489a2a4843bfc5af0e5cc26fd2878d374fe8b8 + input_fingerprint: 38f149df802648ca6afed347b8acdc544e76db28ce0086be8f9002eaada5fe21 template_sources: - gemfiles/modular/cgi/r4/v0.5.gemfile.example gemfiles/modular/cgi/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_cgi_vHEAD_gemfile action: write dest_sha256: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 - input_fingerprint: 598e4efe032b2f99e69c82f447b19c00108e05dd6b59dd74e50bc0fd87b85487 + input_fingerprint: 670a9e3e277505247826d2e0f4bfa29f9b473f9a1ea64b9c71f2c47175d5eebe template_sources: - gemfiles/modular/cgi/vHEAD.gemfile.example gemfiles/modular/changelog.gemfile: recipe: template_source_application_gemfiles_modular_changelog_gemfile action: write dest_sha256: da669526144fbff33aef207db9541b6fd6c254437f94dec2fab70fc55a7757cd - input_fingerprint: c39f37d454f4a385bcec37a4a20025ec9dbc460b555d6a63cab9d5fdf0676cb2 + input_fingerprint: cc6e152c1e8e7b7ad7ae3db1972f04e2de01e95f5f2ebb5aee4d82dc2cc23c22 template_sources: - gemfiles/modular/changelog.gemfile.example gemfiles/modular/coverage.gemfile: recipe: template_source_application_gemfiles_modular_coverage_gemfile action: write dest_sha256: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - input_fingerprint: 7f6da22f2ce79453cdfdeefefa77745190d87e2704f12b0f9d0adb61a32691f2 + input_fingerprint: df328b3562d2ce08fad4f98b98bdf85e8b53db781ba02bd2c20533ba04828e37 template_sources: - gemfiles/modular/coverage.gemfile.example gemfiles/modular/coverage_local.gemfile: recipe: template_source_application_gemfiles_modular_coverage_local_gemfile action: write - dest_sha256: 2b493414df06261ba8acb6f0eb18bf3fdd701d7cb5f967a9d15a3f42a4741827 - input_fingerprint: 647380f9442a4ac72b21554d598c9317677dc672afbccb5a6a31aeca7d7c3ba8 + dest_sha256: 92c9a599c8f6867ec532880f73568f2736ac05d8973ec524b42fd5dbe6aeda3e + input_fingerprint: a814f07bbab8ad9c4bd654b981420e43e7f173d00090614f5ae386c8bdd2f5c9 template_sources: - gemfiles/modular/coverage_local.gemfile.example gemfiles/modular/debug.gemfile: recipe: template_source_application_gemfiles_modular_debug_gemfile action: write dest_sha256: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 - input_fingerprint: 6e9397ec385d00365a0053fae82a316ee69689f86ffcdb71156853e16208d191 + input_fingerprint: dc2171189609c774a760fa25b684fbaeb07e94d51bbcff5c6881f9cd70022486 template_sources: - gemfiles/modular/debug.gemfile.example gemfiles/modular/documentation.gemfile: recipe: template_source_application_gemfiles_modular_documentation_gemfile action: write dest_sha256: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c - input_fingerprint: db7e30df3e73cca137e204858e63766d71942c7e7fe3b06cd894dd148a0da925 + input_fingerprint: 3251a54e456ef42d5d49f04a8c693fd8307f55e3f9139b93bd46c794341d4ede template_sources: - gemfiles/modular/documentation.gemfile.example gemfiles/modular/documentation_local.gemfile: recipe: template_source_application_gemfiles_modular_documentation_local_gemfile action: write dest_sha256: 2058173855b9a4acc6d5efa20520e49734243eef6cf0b5e9063e0e5866a08e9c - input_fingerprint: 9320c8887cd507510e562575c9792d4935c1e6f8f82a8a4e5d3adc534b62dd0b + input_fingerprint: 1dac31b99a115d8eda306349e56cf0dd58a287edd62cc06c1f9bd6f516556367 template_sources: - gemfiles/modular/documentation_local.gemfile.example gemfiles/modular/erb/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r2_v3_0_gemfile action: write dest_sha256: 3793e7dc9ef23a7ccd893d48cbba092fd27594c63e65cca011cc658218425670 - input_fingerprint: 5b9cdbf1d1cd15a892c9292ac4145ab67b25f3da5ede75267941e47e93d941cd + input_fingerprint: dc975895bd12e54f82c068ecf50fd12bcd5bc951db8e2523b7b04f6272a604fe template_sources: - gemfiles/modular/erb/r2/v3.0.gemfile.example gemfiles/modular/erb/r3/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r3_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 86cb8fab47620a73ef9517de7efa7cd0dc473bb78613434bc56d88c5b31b12ed + input_fingerprint: 1e2bd0bf550737e6bf29ff9c734cd961e4ffa16d64da67d2b5b07a842aaa7b5b template_sources: - gemfiles/modular/erb/r3/v5.0.gemfile.example gemfiles/modular/erb/r4/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r4_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 50bf7737e07abf07ea133c07fee0e4b552a9f4c4e9db57ad9c23db7f8f6ece4a + input_fingerprint: 27145290ad65e1c552ff77a519891c2088e8c9aab7c1a7129b23747f8069cf61 template_sources: - gemfiles/modular/erb/r4/v5.0.gemfile.example gemfiles/modular/erb/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_erb_vHEAD_gemfile action: write dest_sha256: ad6f104a49e80e0cf625440e3dc816343fe7e2f037fc4971df75e7bb4305c683 - input_fingerprint: 5c9c67f6ac86ca27260395a3bd9136b1a1711034fc405cbd8f60a51fdb90ae27 + input_fingerprint: cf13905cd84c0042a09c7d3923a555e14249ac5faf6475a2744fee5fbde9de6e template_sources: - gemfiles/modular/erb/vHEAD.gemfile.example gemfiles/modular/json/truffleruby_22_3.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_22_3_gemfile action: write dest_sha256: 249c12eacbe90f9d0d2e81e7a62c4c7e9102e504ededcda4ecf660cb3bb68be4 - input_fingerprint: 341bc4b6d5c3c7615974c77b0fd73fbaccb12993d36bb12e4259f0bcda70e938 + input_fingerprint: 18f7eb7e807732826537e831744322d9d1e73557e98992b1b05c4145e539e9d8 template_sources: - gemfiles/modular/json/truffleruby_22_3.gemfile.example gemfiles/modular/json/truffleruby_23_0.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_0_gemfile action: write dest_sha256: 66aa010567f7afa1af8244a74c3c88ecaaf84dc87b6a25180691bb480d02ed28 - input_fingerprint: 20910651d9d9cef373c878adaaf9ea614391e3127a7033fda986caee38c0a729 + input_fingerprint: 17e0c4b3adcfe59eede55e54013beed65e0e036eec20a1f9bfa1cd671f811af0 template_sources: - gemfiles/modular/json/truffleruby_23_0.gemfile.example gemfiles/modular/json/truffleruby_23_1.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_1_gemfile action: write dest_sha256: '080fcbdaf2bec73cad40832a3d51eebb380af789917b96f493d1460b0dd6361d' - input_fingerprint: 20d9da1053d615bb65a8b763b248c68bf4e150041551ad476a54f499fe98d7e0 + input_fingerprint: 64f291428297fc83f80621089066cd774df431ca1615a17c483db4dd22104a38 template_sources: - gemfiles/modular/json/truffleruby_23_1.gemfile.example gemfiles/modular/mutex_m/r2/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r2_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 520eaebd6b3e67f51e3ba180c68193e3f0f023107f411c3343d2f4418c3ec290 + input_fingerprint: fa2f97f1327a656b03121146191b832086bf58302e9e474ec7e2b46554c69f2c template_sources: - gemfiles/modular/mutex_m/r2/v0.3.gemfile.example gemfiles/modular/mutex_m/r3/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r3_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: f389346680eabba285cc04bb7b1509b2c16681ea4fb28c6d254f99382dcc466e + input_fingerprint: 0ba62ad027d20647dd9e878f7403d69d83b362c5f1a11545b648b696c9079029 template_sources: - gemfiles/modular/mutex_m/r3/v0.3.gemfile.example gemfiles/modular/mutex_m/r4/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r4_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 8576ed7a258fb6b851781491184607038e17f603a4994422592d1dc5cb2a9d3f + input_fingerprint: bc712dd6d6cc9c9d52c5e178a853127f0ba780216def95c94caf7365bffb8813 template_sources: - gemfiles/modular/mutex_m/r4/v0.3.gemfile.example gemfiles/modular/mutex_m/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_vHEAD_gemfile action: write dest_sha256: '08018641c97f894788fa91b462da504ab2237213d18d95404136c393274ae3cb' - input_fingerprint: f50079805b16c396d84529920b94d4b498c26f5424a9bb3d80495f69aa923df7 + input_fingerprint: 42eada64eadd8a53a13a93205caae977aeb2b1d1b02383b393f6ba19074576c4 template_sources: - gemfiles/modular/mutex_m/vHEAD.gemfile.example gemfiles/modular/optional.gemfile: recipe: template_source_application_gemfiles_modular_optional_gemfile action: write dest_sha256: f770e6e9a9dd2bd0f1f132e882d88038b2e21127dce3afe270908c7338c28bfd - input_fingerprint: f34406073e63fec82e5eb0d65fd7ee713f89c12d4ef7b07246d21757b4756a46 + input_fingerprint: 1a461f2643cbb0327e4fbb820602b58e593f91999bf84c6d1f22e3b3a1da9537 template_sources: - gemfiles/modular/optional.gemfile.example gemfiles/modular/rspec.gemfile: recipe: template_source_application_gemfiles_modular_rspec_gemfile action: write dest_sha256: d043f5c9344f6435edb4607c5adaf42c78e7fb6b8b6726007de2bbedefb376c3 - input_fingerprint: 7869fa9e88d576424e99bf9599f6d87fbf40252f506f1fc95f9744dcbbf5a1c3 + input_fingerprint: 05e56bda7c6d2c6cd9b6be7c14e9e51eb0cd2ac8488cc3988915663fd75375c3 template_sources: - gemfiles/modular/rspec.gemfile.example gemfiles/modular/runtime_heads.gemfile: recipe: template_source_application_gemfiles_modular_runtime_heads_gemfile action: write dest_sha256: 6ac7158c4a3088190f2a9082f01439eb27eca2172ab3464b15c9cb045aa885e1 - input_fingerprint: e365dd828bd8ed02445597a722d0a7aadb921c6744045656ff18813b79d88cff + input_fingerprint: f60e3e0b2fc53a368df7f90c46dd2553964ce2185d75720243acf61b864be468 template_sources: - gemfiles/modular/runtime_heads.gemfile.example gemfiles/modular/stringio/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r2_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: dffb4b2a330f0f52ac02081ceb2ae53bc4b579697b2d3def1a642f4e382092da + input_fingerprint: 15054079f52a0a909e3549238db2518acb71566b5801b463bdf4d1bda0cd0cb8 template_sources: - gemfiles/modular/stringio/r2/v3.0.gemfile.example gemfiles/modular/stringio/r3/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r3_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 29cb7671a3089db0a14039de86e202665929b517f8594584fb66df77df2ea8b4 + input_fingerprint: 8c6ec2840e3c91aa391c5313b3bfcf5d494189fb7d2408232c0c5f90710e6599 template_sources: - gemfiles/modular/stringio/r3/v3.0.gemfile.example gemfiles/modular/stringio/r4/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r4_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 1315c9c1de60e4eb8ae57e0cff384426d9b95a6a679974b20439421d69117f0a + input_fingerprint: c5c73badd7e29fc3bae57723950c3848b863afddcee064f899498e9708e298da template_sources: - gemfiles/modular/stringio/r4/v3.0.gemfile.example gemfiles/modular/stringio/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_stringio_vHEAD_gemfile action: write dest_sha256: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - input_fingerprint: 643e35f80fbf21a58e796ea5f7e84795244ca4f1e847afa93c4650c0ddf96e7e + input_fingerprint: 5b47d23b679abb43f836aa18bf8a47dc7abb56042f1cafe6c1fcc4947ccc38db template_sources: - gemfiles/modular/stringio/vHEAD.gemfile.example gemfiles/modular/style.gemfile: recipe: template_source_application_gemfiles_modular_style_gemfile action: write - dest_sha256: 2a3d46dcb8a9394f595f273f5eb0403d0a552837754ab109afc9ba79a7159083 - input_fingerprint: 576c76b9cdc36812aa237a4ff3ac6dac00b22c5f009319d343d4ea2689b97577 + dest_sha256: 9a24acff0054573c30f5d84d0418cd465ba3794d075bb5a36801410ac40e0787 + input_fingerprint: 8206787441737fe19bd7ad6e97dde5bb278d72817c1a301e95c4a8b90a0a50b0 template_sources: - gemfiles/modular/style.gemfile.example gemfiles/modular/style_local.gemfile: recipe: template_source_application_gemfiles_modular_style_local_gemfile action: write dest_sha256: 55eb9c149cdb2f29c9f31abe2d55a4f334e00fb859681dd17c42149a3f28ca36 - input_fingerprint: 783b365bce1e67e29025fa988ba9372cbf3d072e6d476435a1ea3160991a9541 + input_fingerprint: 74552d052c857c1a2319f99673928e1b78a01ce12607558d0ed10259092971b6 template_sources: - gemfiles/modular/style_local.gemfile.example gemfiles/modular/templating.gemfile: recipe: template_source_application_gemfiles_modular_templating_gemfile action: write - dest_sha256: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - input_fingerprint: 25c517de2d7b28725ea27624f96f2b0e2fd3b87e88d68b333ed1a227365f39cf + dest_sha256: 432ba59798d31b899268257c432443a017c5a9bd2c0c7f9f2216617e14150cd3 + input_fingerprint: 6e77f6f5aaf6867fd16f2f86e708bec1ca63a4d8551c23735a0c876e9e6a62fe template_sources: - gemfiles/modular/templating.gemfile.example gemfiles/modular/templating_local.gemfile: recipe: template_source_application_gemfiles_modular_templating_local_gemfile action: write - dest_sha256: ec2517e6395044a311b60941cb67b226f185427096bba1de9b3b5f4b3349b26f - input_fingerprint: b8ce6559ac389071d5c1f15ed4adf0ccbea3a590b54293c6fb16227fb1bb6ba0 + dest_sha256: a0743fc72092531a827599174530d33f3600ac3dee3fc9ebdbbf9aa04e8a8f38 + input_fingerprint: 1acf6f6325589b586e07bcbbac5408be156b96819945af57d8efaf1369fb637c template_sources: - gemfiles/modular/templating_local.gemfile.example gemfiles/modular/webrick/r4/v1.9.gemfile: recipe: template_source_application_gemfiles_modular_webrick_r4_v1_9_gemfile action: write dest_sha256: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea - input_fingerprint: abe85b8642123bd5ab606058d7b19763ef5e6028dbddf4be0ba14a98e2e34ecb + input_fingerprint: 1abadd188056583eed0b503ef57b6188b997e38d2e4a7ab0a3852a16fef0df8a template_sources: - gemfiles/modular/webrick/r4/v1.9.gemfile.example gemfiles/modular/webrick/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_webrick_vHEAD_gemfile action: write dest_sha256: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b - input_fingerprint: 6c800d720def3dec385b726c0d6d68f331ac73ce03c4d88d41165a9c322cb605 + input_fingerprint: 90a2e4e27887abe1c63f918035fb96b6acbe638dbe3f9fb5b80744e13c626f53 template_sources: - gemfiles/modular/webrick/vHEAD.gemfile.example gemfiles/modular/x_std_libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_gemfile action: write dest_sha256: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a - input_fingerprint: c6f7700477681601724c62214284d6319def63efc22190352e4bfdbe9deee391 + input_fingerprint: 824f08c2a52c67417b4df9bc7ecfdad7a52375718cbcbc4da485fa83fe8770a8 template_sources: - gemfiles/modular/x_std_libs.gemfile.example gemfiles/modular/x_std_libs/r2/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r2_libs_gemfile action: write dest_sha256: e80ec8ad06cb1b31ac982bc25cf7696987fca131aa1001eaefd0bf5cd379c273 - input_fingerprint: 4c7c3650db009d80145e615498f3a821800df2b9caba508ad1fd50904e61a094 + input_fingerprint: d2cedbab5560420a9349b2a3a971d182c46a548889629d8bb9d18537404ecd90 template_sources: - gemfiles/modular/x_std_libs/r2/libs.gemfile.example gemfiles/modular/x_std_libs/r3.1/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_1_libs_gemfile action: write dest_sha256: 9f8565c40b09bea1bc4c2e2ad87fe11400c3c51a2b235655bfcd8e491ed88ca8 - input_fingerprint: 302011dce9ac64ced950b84323e174414ce2b43aae9ff8ce2d070b4f950ccd12 + input_fingerprint: 8b7e63bf371237e042fdc59a7c110833c671bf19575622278030646d276c00b3 template_sources: - gemfiles/modular/x_std_libs/r3.1/libs.gemfile.example gemfiles/modular/x_std_libs/r3/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_libs_gemfile action: write dest_sha256: 546f8849f4267bb19aa10ff0de40be30957197f229e6887847181ea9127b2650 - input_fingerprint: 6d9c736cc0a4c2657b9ddd4dd9f75f631a0e04b8210a96a4e96f351105db8db9 + input_fingerprint: 5a4521abea32621322ab6973924d1e30378e1fe1de8fee8545861d6dc4bc1ef2 template_sources: - gemfiles/modular/x_std_libs/r3/libs.gemfile.example gemfiles/modular/x_std_libs/r4/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r4_libs_gemfile action: write dest_sha256: 8c2582eaa218d216b98c86c933465295c8b4e43f3251ea388b9eaf6e471f8da6 - input_fingerprint: b94c9081b478bf5d85cea57cea54623c616e2dc08a293f3a5a439962c49bcd49 + input_fingerprint: 49d9eed5c8fb645fa9aa93fe764b0cc07d2fe4051874e297ac88ed2669240926 template_sources: - gemfiles/modular/x_std_libs/r4/libs.gemfile.example gemfiles/modular/x_std_libs/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_vHEAD_gemfile action: write dest_sha256: d3133ec4c0638363a7fb025d19be7e95a615fd61c35ddb8d17f2280ee74a7486 - input_fingerprint: 17587e3867475a10d8a68cc2e912ac1076b9d97f3cf6f1e8a74f873bf2a8cc74 + input_fingerprint: 8f667d7fdcefe025f9846d09949dd6d64a4262164e3d17aef8b49059010cd845 template_sources: - gemfiles/modular/x_std_libs/vHEAD.gemfile.example lib/typescript/merge/version.rb: recipe: template_source_application_lib_typescript_merge_version_rb action: write - dest_sha256: 36d048b864f0a4f6c3f96524e56352625ea58aa31aa50228eb15168674412c99 - input_fingerprint: 8242a4b2ac23d49a91f91f08133ce5dd577c17bc61a6ccca1f90f83c4140d950 + dest_sha256: 4285d2b91247dcd2f14c3707df3dae914aca5a3d1735e66835e10f4f4c96022e + input_fingerprint: c8c6672bc5a1672e05f75fc5f97c9a57e1903a602d0787075eaf342a3a12145f template_sources: - lib/gem/version.rb.example mise.toml: recipe: template_source_application_mise_toml action: write dest_sha256: 7d267154ca4f081b0ac7da804c0180c2b091aec5f1c877417c1c320f4f369c88 - input_fingerprint: ae9b072f6fb079e59fffa7a925927caf9059cdd626f69b0d5a2188802f596aab + input_fingerprint: 5440af4556fba191c1540da79a478720d8d0b443fb8f896c3e48d9ff29462090 template_sources: - mise.toml.no-osc.example sig/typescript/merge.rbs: recipe: template_source_application_sig_typescript_merge_rbs action: write dest_sha256: 3ce5f0a9d5152ce834bc525322639a90235a733b43cb12fa0120d2d0f86870eb - input_fingerprint: b61100913c4f1b191c8df82e1f37991aa36aeb16904401162d6edf4a0f383246 + input_fingerprint: 8656032d4a399141fcf37aca4440c8deec191453418f3dcac53587ccf9120205 template_sources: - sig/gem.rbs.example spec/spec_helper.rb: recipe: template_source_application_spec_spec_helper_rb action: write dest_sha256: c7a6a1b8cfa0c37279be84579cf5dd7ba1587d4479759bf153d334d756117691 - input_fingerprint: 2f40cab8b9ce2e43ccda4a7a5149705cea292dde21af72a1b51cd6ce7cb4fda1 + input_fingerprint: 8925cd01a1227acd4847222bd1a92c96c9e4efe3440cfc2dd06d38696a601fa0 template_sources: - spec/spec_helper.rb.example typescript-merge.gemspec: recipe: template_source_application_typescript_merge_gemspec action: write - dest_sha256: 7baed1e013026ae28c3c2bd2949c9944e5c246121ceba70d8f64a471c549f1af - input_fingerprint: 9051382360dba05e0be2ae575ccc11d9350e81f9f2951c6460267e221064008b + dest_sha256: d93cc469f59eb0b412f517f3abbc3575c0fa876332496acb5db0f87ba1e0127d + input_fingerprint: b2da7c8efd7ac486e08dc211c00afc63325260cd6e60106767968d161f70e6b8 template_sources: - gem.gemspec.example diff --git a/gems/typescript-merge/Gemfile b/gems/typescript-merge/Gemfile index 93f04cc8b..5bd033aea 100644 --- a/gems/typescript-merge/Gemfile +++ b/gems/typescript-merge/Gemfile @@ -19,7 +19,7 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } # Include dependencies from typescript-merge.gemspec gemspec -gem 'kettle-family', '~> 1.2', '>= 1.2.97' +gem 'kettle-family', '~> 1.2', '>= 1.2.100' # Local workspace dependency wiring for *_local.gemfile overrides gem 'nomono', '~> 1.1', '>= 1.1.5', require: false # ruby >= 3.2.0 diff --git a/gems/typescript-merge/Gemfile.lock b/gems/typescript-merge/Gemfile.lock index 66a3dc307..b2a029bde 100644 --- a/gems/typescript-merge/Gemfile.lock +++ b/gems/typescript-merge/Gemfile.lock @@ -10,131 +10,131 @@ GIT PATH remote: . specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + typescript-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) + ast-crispr-markdown-markly (7.1.9) + ast-crispr (= 7.1.9) + markdown-merge (= 7.1.9) + markly-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism specs: - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) + ast-crispr-ruby-prism (7.1.9) + ast-crispr (= 7.1.9) + prism-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) + ast-crispr (7.1.9) + ast-merge (= 7.1.9) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ast-merge-git (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: - ast-merge (7.1.8) + ast-merge (7.1.9) benchmark token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) + ast-template (7.1.9) + ast-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + bash-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + binary-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) + citrus-toml-merge (7.1.9) + ast-merge (= 7.1.9) + toml-merge (= 7.1.9) toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge specs: - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) commonmarker (~> 2.2) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) + dotenv-merge (7.1.9) + ast-merge (= 7.1.9) + plain-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + go-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + html-merge (7.1.9) + ast-crispr (= 7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + json-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: - kettle-jem (7.1.25) + kettle-jem (7.1.26) addressable (>= 2.8, < 3) ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) @@ -168,122 +168,122 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge specs: - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown (~> 2.5) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + markdown-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) + markly-merge (7.1.9) + markdown-merge (= 7.1.9) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge specs: - parslet-toml-merge (7.1.8) + parslet-toml-merge (7.1.9) toml (~> 0.3) - toml-merge (= 7.1.8) + toml-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + plain-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) + prism-merge (7.1.9) + ast-merge (= 7.1.9) prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + psych-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) + yaml-merge (= 7.1.9) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) + rbs-merge (7.1.9) + ast-merge (= 7.1.9) rbs (>= 3.10) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + rust-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) + smorg-rb (7.1.9) + ast-merge (= 7.1.9) + ast-merge-git (= 7.1.9) + bash-merge (= 7.1.9) diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) + dotenv-merge (= 7.1.9) + go-merge (= 7.1.9) + html-merge (= 7.1.9) + json-merge (= 7.1.9) kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) + markdown-merge (= 7.1.9) + plain-merge (= 7.1.9) + prism-merge (= 7.1.9) + psych-merge (= 7.1.9) + rbs-merge (= 7.1.9) + rust-merge (= 7.1.9) + toml-merge (= 7.1.9) + typescript-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + toml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: - tree_haver (7.1.8) + tree_haver (7.1.9) citrus (~> 3.0) parslet (~> 2.0) tree_sitter_language_pack (>= 1.16.2, < 2.0) @@ -292,17 +292,17 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + yaml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) + zip-merge (7.1.9) + binary-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) GEM @@ -336,6 +336,8 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) + commonmarker (2.10.0) + rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -465,11 +467,15 @@ GEM lint_roller (1.1.0) logger (1.7.0) markly (0.19.0) + mini_portile2 (2.8.9) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) reline (~> 0.6) mutex_m (0.3.0) + nokogiri (1.19.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-musl) @@ -503,6 +509,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) + rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -696,13 +705,16 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.16.2-aarch64-linux) + tree_sitter_language_pack (1.17.0) + rb_sys (>= 0.9.130, < 0.10) + sorbet-runtime (~> 0.5) + tree_sitter_language_pack (1.17.0-aarch64-linux) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-arm64-darwin) + tree_sitter_language_pack (1.17.0-arm64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-linux) + tree_sitter_language_pack (1.17.0-x86_64-linux) sorbet-runtime (~> 0.5) tsort (0.2.0) tty-cursor (0.7.1) @@ -784,9 +796,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.31) + kettle-dev (~> 3.0, >= 3.0.34) kettle-drift (~> 1.0, >= 1.0.13) - kettle-family (~> 1.2, >= 1.2.97) + kettle-family (~> 1.2, >= 1.2.100) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) @@ -807,12 +819,12 @@ DEPENDENCIES reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) - rubocop-lts (~> 24.2, >= 24.2.1) - rubocop-lts-rspec (~> 1.0, >= 1.0.5) + rubocop-lts (~> 24.2, >= 24.2.3) + rubocop-lts-rspec (~> 1.0, >= 1.0.6) rubocop-minitest (~> 0.40, >= 0.40.0) rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! - rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) ruby-merge! ruby-progressbar (~> 1.13) rust-merge! @@ -843,33 +855,34 @@ CHECKSUMS appraisal2 (3.2.3) sha256=3a6cfaf8a444e02707b9a34154af1c4902fbe99d9d2168d7e81dd83ec77e6db7 appraisal2-rubocop (1.0.2) sha256=1dae97c1be087cf9c098a3a72fd41f873435e9b8b39687e633b36c9ccb22bff4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.8) - ast-crispr-markdown-markly (7.1.8) - ast-crispr-ruby-prism (7.1.8) - ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) + ast-crispr (7.1.9) + ast-crispr-markdown-markly (7.1.9) + ast-crispr-ruby-prism (7.1.9) + ast-merge (7.1.9) + ast-merge-git (7.1.9) + ast-template (7.1.9) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.8) + bash-merge (7.1.9) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) - bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae + binary-merge (7.1.9) + bundler (4.1.0.beta1) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.8) + citrus-toml-merge (7.1.9) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 + commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e commonmarker (2.10.0-x86_64-darwin) sha256=01e0830ed0319825ecdc16411c90acd3f661d1568dfc178731b3f64d0ce2363d commonmarker (2.10.0-x86_64-linux) sha256=945c510c0bfca9022245928e2248468fe3ddad58c939be0c37b20082cc392880 commonmarker (2.10.0-x86_64-linux-musl) sha256=288cd4fb9f17eed2ffa73551ef241dcf594e0f484b2aee2a0999540333c0618e - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) completely (0.8.0) sha256=e493cd5d84805f47917a41f277ecbfe5f35363bed670be5a957d3acaed8c6c5e concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 @@ -878,7 +891,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docopt_ng (0.7.1) sha256=a024148ee4fa3ab1a8a04411aa4370f39cf2b446e63562097d418b7974a15667 - dotenv-merge (7.1.8) + dotenv-merge (7.1.9) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -891,35 +904,37 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) + go-merge (7.1.9) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) + html-merge (7.1.9) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a - json-merge (7.1.8) - kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + json-merge (7.1.9) + kettle-changelog (1.0.7) + kettle-dev (3.0.34) + kettle-drift (1.0.13) kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 - kettle-jem (7.1.25) + kettle-jem (7.1.26) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 - kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd + kettle-soup-cover (3.0.10) kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 - markdown-merge (7.1.8) + markdown-merge (7.1.9) markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca - markly-merge (7.1.8) + markly-merge (7.1.9) + mini_portile2 (2.8.9) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 + nokogiri (1.19.4) nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af nokogiri (1.19.4-arm64-darwin) sha256=a46db9853286e6597b36ebc6953817d15acf3a299583eb3f89fdc6f91dd63527 @@ -933,20 +948,22 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) - plain-merge (7.1.8) + parslet-toml-merge (7.1.9) + plain-merge (7.1.9) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.8) + prism-merge (7.1.9) psych (5.5.0) sha256=4b245bbbd0f3238df8ccee766ebc1a6b062b10e4ee1d3284eb588739ba156a0a - psych-merge (7.1.8) + psych-merge (7.1.9) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 - rbs-merge (7.1.8) + rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -982,11 +999,11 @@ CHECKSUMS rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.8) + ruby-merge (7.1.9) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) + rust-merge (7.1.9) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +1011,7 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) + smorg-rb (7.1.9) sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,25 +1027,26 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.8) + toml (0.3.0) + toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb - tree_haver (7.1.8) - tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 - tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 - tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 - tree_sitter_language_pack (1.16.2-x86_64-linux) sha256=d8151e6e44e35ace9de3611c76b730896beab17f427db06d8f76666332a5dc60 + tree_haver (7.1.9) + tree_sitter_language_pack (1.17.0) + tree_sitter_language_pack (1.17.0-aarch64-linux) + tree_sitter_language_pack (1.17.0-arm64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-linux) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f tty-cursor (0.7.1) sha256=79534185e6a777888d88628b14b6a1fdf5154a603f285f80b1753e1908e0bf48 tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) + typescript-merge (7.1.9) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 yaml-converter (0.2.5) sha256=a5214fe1a6c2df88bd34a35bcded1b1dcd30135548130df2e03b54ca8c0f2423 - yaml-merge (7.1.8) + yaml-merge (7.1.9) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.8) sha256=73d935d43e3479d65ce8aff25c7d3100e8bb83528a2adaa0ed824e5046ac99e7 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -1037,8 +1055,8 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) + zip-merge (7.1.9) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH - 4.0.20 + 4.1.0.beta1 diff --git a/gems/typescript-merge/Rakefile b/gems/typescript-merge/Rakefile index f7a1b859d..e462e85ab 100644 --- a/gems/typescript-merge/Rakefile +++ b/gems/typescript-merge/Rakefile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -# typescript-merge Rakefile v7.1.18 - 2026-09-07 +# typescript-merge Rakefile v7.1.26 - 2026-09-09 # Ruby 2.3 (Safe Navigation) or higher required # # See LICENSE.md for license information. diff --git a/gems/typescript-merge/bin/rubocop-gradual b/gems/typescript-merge/bin/rubocop-gradual new file mode 100755 index 000000000..7c7ff0635 --- /dev/null +++ b/gems/typescript-merge/bin/rubocop-gradual @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'rubocop-gradual' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'rubygems' +require 'bundler/setup' + +load Gem.bin_path('rubocop-gradual', 'rubocop-gradual') diff --git a/gems/typescript-merge/gemfiles/modular/coverage_local.gemfile b/gems/typescript-merge/gemfiles/modular/coverage_local.gemfile index 37917caac..d6c890e46 100644 --- a/gems/typescript-merge/gemfiles/modular/coverage_local.gemfile +++ b/gems/typescript-merge/gemfiles/modular/coverage_local.gemfile @@ -29,11 +29,31 @@ Kernel.send(:gem, 'nomono', *nomono_activation_requirements) require 'nomono/bundler' local_gems = %w[kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -local_gems_to_eval = local_gems - %w[] - declared_gems # export KETTLE_DEV_DEV=/path/to/my platform :mri do + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + local_gems_to_eval = local_gems - %w[] - declared_gems + eval_nomono_gems( gems: local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/typescript-merge/gemfiles/modular/style.gemfile b/gems/typescript-merge/gemfiles/modular/style.gemfile index 59c5dc1a3..41ec99454 100644 --- a/gems/typescript-merge/gemfiles/modular/style.gemfile +++ b/gems/typescript-merge/gemfiles/modular/style.gemfile @@ -24,9 +24,9 @@ platform :mri do if ENV.fetch('RUBOCOP_LTS_DEV', 'false').casecmp('false').zero? declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) - gem 'rubocop-lts', '~> 24.2', '>= 24.2.1' unless declared_gems.include?('rubocop-lts') - gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.5' unless declared_gems.include?('rubocop-lts-rspec') - gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.6' unless declared_gems.include?('rubocop-ruby3_2') + gem 'rubocop-lts', '~> 24.2', '>= 24.2.3' unless declared_gems.include?('rubocop-lts') + gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.6' unless declared_gems.include?('rubocop-lts-rspec') + gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.8' unless declared_gems.include?('rubocop-ruby3_2') else eval_gemfile('style_local.gemfile') end diff --git a/gems/typescript-merge/gemfiles/modular/templating.gemfile b/gems/typescript-merge/gemfiles/modular/templating.gemfile index 6af159bd7..ce51a08ed 100644 --- a/gems/typescript-merge/gemfiles/modular/templating.gemfile +++ b/gems/typescript-merge/gemfiles/modular/templating.gemfile @@ -18,7 +18,7 @@ end if structuredmerge_remote # Merge recipes for released installs. - gem 'kettle-jem', '>= 7.0' + gem 'kettle-jem', '~> 7.1', '>= 7.1.26' end if kettle_remote diff --git a/gems/typescript-merge/gemfiles/modular/templating_local.gemfile b/gems/typescript-merge/gemfiles/modular/templating_local.gemfile index f7df54b15..a86c3ed45 100644 --- a/gems/typescript-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/typescript-merge/gemfiles/modular/templating_local.gemfile @@ -65,9 +65,7 @@ structuredmerge_local_gems = %w[ kettle_dev_local_gems = %w[ kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift ] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[] -kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - (declared_gems - %w[kettle-dev]) if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( @@ -81,6 +79,28 @@ if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 end if ENV.fetch('KETTLE_DEV_DEV', 'false').casecmp('false') != 0 + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - declared_gems + eval_nomono_gems( gems: kettle_dev_local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/typescript-merge/typescript-merge.gemspec b/gems/typescript-merge/typescript-merge.gemspec index 37cbc0ca4..6e7d26687 100644 --- a/gems/typescript-merge/typescript-merge.gemspec +++ b/gems/typescript-merge/typescript-merge.gemspec @@ -120,7 +120,7 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.31') # ruby >= 4.0.0 + spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.34') # ruby >= 4.0.0 # Security spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 From e8cbb52cac8944f4c9192230cfba64899330c440 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 23:50:48 -0400 Subject: [PATCH 090/137] =?UTF-8?q?=F0=9F=8E=A8=20Template=20ast-template?= =?UTF-8?q?=20by=20kettle-family?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-template/.kettle-drift.lock | 76 ++++- gems/ast-template/.rubocop_gradual.lock | 7 +- .../.structuredmerge/kettle-jem.lock | 145 ++++---- gems/ast-template/Gemfile | 2 +- gems/ast-template/Gemfile.lock | 320 +++++++++--------- gems/ast-template/Rakefile | 2 +- gems/ast-template/ast-template.gemspec | 2 +- gems/ast-template/bin/rubocop-gradual | 16 + .../gemfiles/modular/coverage_local.gemfile | 24 +- .../gemfiles/modular/style.gemfile | 6 +- .../gemfiles/modular/templating.gemfile | 2 +- .../gemfiles/modular/templating_local.gemfile | 24 +- 12 files changed, 388 insertions(+), 238 deletions(-) create mode 100755 gems/ast-template/bin/rubocop-gradual diff --git a/gems/ast-template/.kettle-drift.lock b/gems/ast-template/.kettle-drift.lock index 98b009e1e..1b23f4793 100644 --- a/gems/ast-template/.kettle-drift.lock +++ b/gems/ast-template/.kettle-drift.lock @@ -1,10 +1,82 @@ { + "debug_env: 'KETTLE_DEV_DEBUG',\nroot: %w[src my kettle-dev]": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 46, + 63 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 93, + 110 + ] + } + ], + "path_env: 'KETTLE_DEV_DEV',\nvendored_gems_env: 'VENDORED_GEMS',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 43, + 60 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 90, + 107 + ] + } + ], + "prefix: 'KETTLE_DEV',\npath_env: 'KETTLE_DEV_DEV',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 42, + 59 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 89, + 106 + ] + } + ], + "vendor_gem_dir_env: 'VENDOR_GEM_DIR',\ndebug_env: 'KETTLE_DEV_DEBUG',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 45, + 62 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 92, + 109 + ] + } + ], "vendored_gems_env: 'VENDORED_GEMS',\nvendor_gem_dir_env: 'VENDOR_GEM_DIR',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 44, + 61 + ] + }, { "file": "gemfiles/modular/templating_local.gemfile", "lines": [ - 77, - 88 + 75, + 91, + 108 ] } ] diff --git a/gems/ast-template/.rubocop_gradual.lock b/gems/ast-template/.rubocop_gradual.lock index e89ad372f..6e67a0039 100644 --- a/gems/ast-template/.rubocop_gradual.lock +++ b/gems/ast-template/.rubocop_gradual.lock @@ -2,13 +2,13 @@ ".simplecov:470547781": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] ], - "Rakefile:3093499805": [ + "Rakefile:2455893566": [ [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], [81, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], [165, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], [168, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] ], - "ast-template.gemspec:3307662021": [ + "ast-template.gemspec:3786680960": [ [136, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4147388508], [147, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], [148, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] @@ -27,6 +27,9 @@ [1, 1, 0, "Naming/FileName: The name of this source file (`vHEAD.gemfile`) should use snake_case.", 5381], [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], + "gemfiles/modular/coverage_local.gemfile:2813372128": [ + [34, 1, 1586, "Metrics/BlockLength: Block has too many lines. [37/25]", 820328175] + ], "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], diff --git a/gems/ast-template/.structuredmerge/kettle-jem.lock b/gems/ast-template/.structuredmerge/kettle-jem.lock index b66247987..657599415 100644 --- a/gems/ast-template/.structuredmerge/kettle-jem.lock +++ b/gems/ast-template/.structuredmerge/kettle-jem.lock @@ -1,11 +1,12 @@ --- version: 1 template_state: - version: 7.1.18 - applied_at: '2026-09-07' + version: 7.1.26 + applied_at: '2026-09-10' changelog_replay: last_entry_key: kettle-jem-template-20260802-001 last_entry_date: '2026-08-02' + maintenance_changelog: {} checksums: ".aiignore.example": 48a5dfdd93afd1a15fdce39cc28ca9920263f00018b0968ab031fa744521e5ce ".config/mise/env.sh": aeea5a2ab489ba6e5467ae8de6e386ec8c8fe4ff31a044e69d0cd6a092dd6654 @@ -75,7 +76,7 @@ template_state: ".rubocop_rspec.yml.example": 288ad75e7eb14d87d80fafe6f7272217be5c57547536ee56c780a7d10ac7ec74 ".simplecov.example": 222f2e6ce8cf089c70a21f0f5e5423d4bd59a96fdb2ce7754b0fb3d6f430c229 ".structuredmerge/git-drivers.toml.example": 9d241a44c9edffcdbd3da018fa188a238089c3d1635040924df594a6929a4f97 - ".structuredmerge/kettle-jem.yml.example": 26949dc4ee0722415e72452cbc186bee6ef7b154eae33166d36f3fdb1ca6e46d + ".structuredmerge/kettle-jem.yml.example": ff65a738da1af7d60714026a81d3323a46c864e96ae3570b806afdf6e7149ff9 ".yard-lint.yml.example": 90def46867c9436b4e177c47d91fc8165f4602e335715aecc39f5587ae20b55b ".yardignore.example": 821f453c609df7d46145d675424b39dfbe6dfdca8edac5f367b85fff48502455 ".yardopts.example": 6fd6f2701713096a8a9ea095c213bbc68eeef37797c4754d97837e3229a3a5f6 @@ -88,7 +89,7 @@ template_state: CHANGELOG.transfer.md: 21331d8a9e58b4ff6e088b88eb408bcccb0f2f64e78f8f4d42ac3f11a24baad8 CITATION.cff.example: e404ea0a7919d78a83d53d80e211d17b9663576aa606583b709795dc023fd75c CODE_OF_CONDUCT.md.example: f1ad532f1860f73ef774c6b27a26d41f4bc1cb8813034f5957487766ebb0986b - CONTRIBUTING.md.example: 22570cfb3dde72be79b4b522b6d5ab13f95d778e40444483a096871fe0891b19 + CONTRIBUTING.md.example: 8d23cce2d061e0c20d619c3f66591df5f32821cd84c32d171df0b8ebe1217a55 FUNDING.md.example: 392d047904b1557b29f4b43d37ec403b7480edd5b6ab51180be979b57a91e6ba FUNDING.md.no-osc.example: 3ef0258dd3e3b7f7e17e8bc2d20dcbcb3e74aa5a5a6f51297075696645e34c77 Gemfile.example: 99500023987e81775a9b5ef14e92cb3992f2ac408e5f42454f2728eee9b49fb2 @@ -99,19 +100,19 @@ template_state: PolyForm-Small-Business-1.0.0.md.example: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 README.md.example: 21f491e3d73bfc1b74056a6dcba61f72c93dee3cfe5272ac164a20978454de21 REEK: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - RUBOCOP.md.example: c09e5533ccc59b70a2efa05c99f66e521137c1053d3c12eb43509cebd5b68b0e + RUBOCOP.md.example: d99871a0e4c1d323c92e7febf328f062bb4722069b2abfd0a83bf7daa8dcbf8c Rakefile.example: 569803e726b07ea26267fec6891367a3096a0dff3c266269a7081d36afe496af SECURITY.md.example: ee9411aa85f36d88363fdaea7a1baea4362b6ec112cf2688e711b05de1d3144c bin/setup.example: 0ac35089c95a91d8973fe7a318bf9fd98b9f8e00db92c5d9ca6cd858abb8d41b certs/pboling.pem.example: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - gem.gemspec.example: 83e834e8958a88e4817a57199f48f5ebb245548ce251c5c47372208693f03b17 + gem.gemspec.example: 12dcadc0b297ccd4e18b9d1e538b98ac8330ef9fb2a059ed6754ad59272b77fa gemfiles/modular/benchmark/r4/v0.5.gemfile.example: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 gemfiles/modular/benchmark/vHEAD.gemfile.example: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 gemfiles/modular/cgi/r4/v0.5.gemfile.example: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 gemfiles/modular/cgi/vHEAD.gemfile.example: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 gemfiles/modular/changelog.gemfile.example: 892598e0e7792eb205247ae28128cef6dfc647d2fb33968969152230d6f69288 gemfiles/modular/coverage.gemfile.example: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - gemfiles/modular/coverage_local.gemfile.example: 928d5f260d7b119c038baa56da9fb78dd524dee613aea33ab72894bbce5c506e + gemfiles/modular/coverage_local.gemfile.example: 92ea0d7a9d693553dc614afa2c43990f5c3778c2b00ef6c528e122c31bd506a1 gemfiles/modular/debug.gemfile.example: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 gemfiles/modular/documentation.gemfile.example: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c gemfiles/modular/documentation_local.gemfile.example: 84a20f5d4b0feb94c2cf2f7a8dce8f682f1483498e41484c2b447a5661fd1870 @@ -145,10 +146,10 @@ template_state: gemfiles/modular/stringio/r3/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/r4/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/vHEAD.gemfile.example: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - gemfiles/modular/style.gemfile.example: 3ad0585b4f2db8918580ca41ea8723f7a166d7a83cfd7f9613511094997106fd + gemfiles/modular/style.gemfile.example: 02fe3e8fd00e49b90c3ab30e19b51014ee50490f3eadcfd1d4a39f4c2c997dda gemfiles/modular/style_local.gemfile.example: c86beb711e766126a5be68be4be18255831625ac3650d5069383c4a83a9511f3 - gemfiles/modular/templating.gemfile.example: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - gemfiles/modular/templating_local.gemfile.example: 930057d3b909a72e39a39125c4e883a7ff71f5691e64426c0541f8c8fc75b83f + gemfiles/modular/templating.gemfile.example: 2b33c094677b53ad9dd2eafeb3a3be452f612380c61001a2e75b3c078b8ff72a + gemfiles/modular/templating_local.gemfile.example: ac7259516e69ffafb8b9342a897ddf6042adc46335743f474c342509cefd8f2e gemfiles/modular/webrick/r4/v1.9.gemfile.example: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea gemfiles/modular/webrick/vHEAD.gemfile.example: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b gemfiles/modular/x_std_libs.gemfile.example: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a @@ -175,7 +176,7 @@ template_state: shim/Gemfile.example: 0fb0d9d06fcfb1fd6ca6f0eeb5867253ca1ed221e03d28027719225f868b0637 shim/README.md.example: 3a2f7211b7f92a1dfae5e523b8e34b051a3d8af942144b05286eca0b3c8f6fbe shim/Rakefile.example: 572c94da7052083b39b62a6600785419e314a109efd7a3d8c3a96eb77ad34fd1 - shim/gem.gemspec.example: efae033238e4fd1355cfc134f5c9123f175d1ad1dc4a1a2e663899788c9e0870 + shim/gem.gemspec.example: 14a7015b3328005d1c3b5fda6886bd6da383707745f6eaaa781d6f9689600131 shim/lib/compat_require.rb.example: 94ee85e353a3ca08c8a35c9063d4ff789214ea594c7f803f6cf09d7142f48379 shim/lib/entrypoint.rb.example: dd57613520daca01d6f6bcaa9b83b00ff74505240dc04b84ceb686df3c0539d7 shim/lib/version.rb.example: 15e219ac3a928b5580035f891e415551213175020f1131f6e7ca0ccd55a1b2d6 @@ -189,370 +190,370 @@ files: recipe: template_source_application_simplecov action: write dest_sha256: '091b5582b9fe3405b6d2cbd89209f325268c556f70aecde8baad7686c89bb991' - input_fingerprint: a83fc098f53f5710d6d877b77bb40b2fec61a5d4eea0f3592d02426747cbbbd1 + input_fingerprint: ac2f39d9ff1a8970a52731c534d43d6222a95223a4dab223a48cce13778476ab template_sources: - ".simplecov.example" AGPL-3.0-only.md: recipe: template_source_application_AGPL_3_0_only_md action: write dest_sha256: d8a6cc31abc16b6748c7a21f21611f5a1ec33f67d22ca23d7da1c19b95496bee - input_fingerprint: 5d12e65c882c13fa3bd21dada3a70051a82e2c842819855b52109d0049d08112 + input_fingerprint: 9b0212eb37e0ef22e5988f744406d58b7b69e2ffbf954095abffcad3ceebdb56 template_sources: - AGPL-3.0-only.md.example Gemfile: recipe: template_source_application_Gemfile action: write - dest_sha256: 2a838f2bad5f15dce5715aa10e864e89110de740ad1f2815f2ffa1327124acc6 - input_fingerprint: 73af5ecf6dca68c940c3e461b273abe6e43fc39857fc4374cce908b2d50ece40 + dest_sha256: 2967333552b35de8c3c781b6284027fa4ee14fc074c5ddc6c29c44b9f19cfc18 + input_fingerprint: fb93124665eaf1a07afd80f4c2960a85f4bfe3dd23d661dc8b098458008ebba6 template_sources: - Gemfile.example LICENSE.md: recipe: template_source_application_LICENSE_md action: write dest_sha256: f6188bfd474a636d2a526420ebb411250faa447d94c9b9ccee097128ce4101b5 - input_fingerprint: f60e90193d61b3a7d95b55af77645e6bc590efae5a81c195420c593334fe7da2 + input_fingerprint: da7fbbfc8026b02eeb8223e26d957ff03c7292ab467c5a59d0329047184b54f4 template_sources: - LICENSE.md.example PolyForm-Small-Business-1.0.0.md: recipe: template_source_application_PolyForm_Small_Business_1_0_0_md action: write dest_sha256: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 - input_fingerprint: 9e38cfb059e69c7b1f9c3735334c2430a7284912168a3a8657d9136cacabbb31 + input_fingerprint: f7dae632e18f7fa3d112e3cfc710932e8d6c90feb4b98967a679c42df5c54409 template_sources: - PolyForm-Small-Business-1.0.0.md.example README.md: recipe: template_source_application_README_md action: write dest_sha256: 6ba53126230a8315c94a2b3238209a07841f510f98633de22243a55fdc813bd6 - input_fingerprint: 549758c332e7afca2621e62cfb3434a8862d807057f3859bd1fae124ea06d6c4 + input_fingerprint: 5f972cbace3e87e5af051b36fc1e813167b847b2ffd72f304045f82dc0784903 template_sources: - README.md.example Rakefile: recipe: template_source_application_Rakefile action: write - dest_sha256: e5652bdf4eea48517a26274a773ea7c46479de576b37acc642803fc9bb4ab232 - input_fingerprint: 7fa5ff28f1bd9b79efd95c290198b4544f4a5f23315eafa5768bce77fb6175ce + dest_sha256: 7e8a0b2772d9cdee2a26b7537a874f682a5ea9db730f57ee0f0a6d0688590bb2 + input_fingerprint: 6647e6cacc8f7e520c8316a629fe596f24d8f2882bb15e14298b02c7ebb1f788 template_sources: - Rakefile.example ast-template.gemspec: recipe: template_source_application_ast_template_gemspec action: write - dest_sha256: dac71de756a06d0f98584abed87075591dd7fd95f5cbb86219e91aca8f05ebd6 - input_fingerprint: dcb87dc7a5456b9e6ee2e690d2fb054f7376233af87a64572aab6c4f941a1ee0 + dest_sha256: 163ca3321ba18227bafb4a7f192510d00f4a325fe4eabba2511f87784490ab63 + input_fingerprint: b973a949d7632fc68c5b3dabb641527b82fcfca5b1c1810a9a0e420aeaf47008 template_sources: - gem.gemspec.example certs/pboling.pem: recipe: template_source_application_certs_pboling_pem action: write dest_sha256: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - input_fingerprint: 3d8a535074d2da6c695f8fd7fe734d67529168eaee19c6c833387da1df27967f + input_fingerprint: 7ede71f5e1efeebe6a196dcb062360be686d8a4d315e9a4840a64f8faf9715f8 template_sources: - certs/pboling.pem.example gemfiles/modular/benchmark/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_r4_v0_5_gemfile action: write dest_sha256: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 - input_fingerprint: f9349a43e255b727e4585b85105b5bbf5a3d217cdbf259499b9f3e4bc76e7e62 + input_fingerprint: 75479585274923509a22dc12eaa75d95a73704788c70ab760f608c92c9ce23bc template_sources: - gemfiles/modular/benchmark/r4/v0.5.gemfile.example gemfiles/modular/benchmark/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_vHEAD_gemfile action: write dest_sha256: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 - input_fingerprint: 774d5f802b925ba7f10522f4a165d017fdbeb851f4317a60b602188474947b07 + input_fingerprint: 933cb300fc2a01221200c2cf5b7e648888993bc60672b50150658fe64ce644b9 template_sources: - gemfiles/modular/benchmark/vHEAD.gemfile.example gemfiles/modular/cgi/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_cgi_r4_v0_5_gemfile action: write dest_sha256: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 - input_fingerprint: 3abf133dd67f4895f146d2480835be5afeaffabef29b6032aa106a5f9a55a100 + input_fingerprint: abcad36f2297dcef122675f8488a3d9f6d4dada2f834a3b9192df426c28075b3 template_sources: - gemfiles/modular/cgi/r4/v0.5.gemfile.example gemfiles/modular/cgi/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_cgi_vHEAD_gemfile action: write dest_sha256: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 - input_fingerprint: c09c5eea2a1c50320b651e12dece8adc80694d5ccb5eb15f6117c01eb0db04d9 + input_fingerprint: 501eda220107e927c8ff3f30f056914c8804315ead6800339073fcdd9571ff58 template_sources: - gemfiles/modular/cgi/vHEAD.gemfile.example gemfiles/modular/changelog.gemfile: recipe: template_source_application_gemfiles_modular_changelog_gemfile action: write dest_sha256: da669526144fbff33aef207db9541b6fd6c254437f94dec2fab70fc55a7757cd - input_fingerprint: aeaff07cac087a3d050208874216c9a03f2da64e140f83fafdfab3f3170a6064 + input_fingerprint: a0515b0f997ef714f153e0b09acd9f241f8234f5c1f574905dacf5ce06b92831 template_sources: - gemfiles/modular/changelog.gemfile.example gemfiles/modular/coverage.gemfile: recipe: template_source_application_gemfiles_modular_coverage_gemfile action: write dest_sha256: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - input_fingerprint: 7c08fa29dc03d900419d5cc5a17580fb2c98cae37489ec4ce74a3511e2c740be + input_fingerprint: f47fc84aa0a124ca52b07a67ca31811369fc56de56b9f006c07a6c19a6691e7a template_sources: - gemfiles/modular/coverage.gemfile.example gemfiles/modular/coverage_local.gemfile: recipe: template_source_application_gemfiles_modular_coverage_local_gemfile action: write - dest_sha256: 2b493414df06261ba8acb6f0eb18bf3fdd701d7cb5f967a9d15a3f42a4741827 - input_fingerprint: 826f647e0d0230dc1405601717709241e96d1308453a3cc12e01a9ccdad3c497 + dest_sha256: 92c9a599c8f6867ec532880f73568f2736ac05d8973ec524b42fd5dbe6aeda3e + input_fingerprint: aaad55794f2b146146bf6dd3beaf8324f2892f9c19cb56fe78de3609aade3fdb template_sources: - gemfiles/modular/coverage_local.gemfile.example gemfiles/modular/debug.gemfile: recipe: template_source_application_gemfiles_modular_debug_gemfile action: write dest_sha256: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 - input_fingerprint: 8a6c1ff387b62cea44f3d064a50107d243791724fe3423b7bab2cb415a6609f0 + input_fingerprint: eb3f6e3c14afca5a9266af491cf04d1472f2e7bd893c3c504da38c5d0db23068 template_sources: - gemfiles/modular/debug.gemfile.example gemfiles/modular/documentation.gemfile: recipe: template_source_application_gemfiles_modular_documentation_gemfile action: write dest_sha256: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c - input_fingerprint: 3a83ea76dc0a9fa9ddbb130f62b9f006e52d8eab21c4232a5f376018c27c153c + input_fingerprint: 9d7afec260fd1fda0f929359dd35c78324c6399d6690a26f0f46e026c820b3d6 template_sources: - gemfiles/modular/documentation.gemfile.example gemfiles/modular/documentation_local.gemfile: recipe: template_source_application_gemfiles_modular_documentation_local_gemfile action: write dest_sha256: 2058173855b9a4acc6d5efa20520e49734243eef6cf0b5e9063e0e5866a08e9c - input_fingerprint: e32566360bdb4e78194886eb5f0ffdb7cab9547748669a29ad4726aa4d838a85 + input_fingerprint: 54dbb1ce052e53908a619b14316e259590b5d86d18e2f01b262a0e50640f5b88 template_sources: - gemfiles/modular/documentation_local.gemfile.example gemfiles/modular/erb/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r2_v3_0_gemfile action: write dest_sha256: 3793e7dc9ef23a7ccd893d48cbba092fd27594c63e65cca011cc658218425670 - input_fingerprint: 44069bc995fb0fc71dd4a1be30102182bad8ad476cd041476087fdfd1deb02f4 + input_fingerprint: 89e1fb88bf37e6f59f2ff5bd691d18b489954fbe8982b7cbf19e82c3c17439b9 template_sources: - gemfiles/modular/erb/r2/v3.0.gemfile.example gemfiles/modular/erb/r3/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r3_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 888a01cf2f8dc6c7df615d2d15c2c73ff451e440622daca63c972460222d4264 + input_fingerprint: c426d18b0c32819a0e2ce57c2e3d4bc6e5ecf8af77bf7e1e3b359e2a1bdc39bf template_sources: - gemfiles/modular/erb/r3/v5.0.gemfile.example gemfiles/modular/erb/r4/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r4_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 56bcaaf4b80bf36b6c373e26fa2e5c048efd8d9359ad9b9d15f94c08cd7837f7 + input_fingerprint: bb6b30c8a481f715e140f675302ca357ef909a0ea497b4be37d24d71bc498ad5 template_sources: - gemfiles/modular/erb/r4/v5.0.gemfile.example gemfiles/modular/erb/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_erb_vHEAD_gemfile action: write dest_sha256: ad6f104a49e80e0cf625440e3dc816343fe7e2f037fc4971df75e7bb4305c683 - input_fingerprint: c86e6b275195c2606a71322dab29e3f2edd726c50c5026403242752fa118d038 + input_fingerprint: aa0a1de5df1091dd6c1a4728faa5b9c5ca6bc3570af56d8bcf68e153a206d306 template_sources: - gemfiles/modular/erb/vHEAD.gemfile.example gemfiles/modular/json/truffleruby_22_3.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_22_3_gemfile action: write dest_sha256: 249c12eacbe90f9d0d2e81e7a62c4c7e9102e504ededcda4ecf660cb3bb68be4 - input_fingerprint: 9a4367602f2e537bf5ac3f33ed3ebc88dda30fe9c7fa2c48fc959001322b915c + input_fingerprint: 726ba229eef363c4e41fb46a1c5bdc9fa807fc296058bd118ae88fbcbb809bd8 template_sources: - gemfiles/modular/json/truffleruby_22_3.gemfile.example gemfiles/modular/json/truffleruby_23_0.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_0_gemfile action: write dest_sha256: 66aa010567f7afa1af8244a74c3c88ecaaf84dc87b6a25180691bb480d02ed28 - input_fingerprint: cec4a9a250c9e8771c0f73ab60807a9508905005e96ce52a39b9bfcac59d4a0b + input_fingerprint: 15b2841fcbad35b986124b98149035b2bfad9a90cda9a120aabf265b05c884d6 template_sources: - gemfiles/modular/json/truffleruby_23_0.gemfile.example gemfiles/modular/json/truffleruby_23_1.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_1_gemfile action: write dest_sha256: '080fcbdaf2bec73cad40832a3d51eebb380af789917b96f493d1460b0dd6361d' - input_fingerprint: c04f3433ada419d92b0c0ed507c42f9706aadb8a221c02193221d4e6c7e6185d + input_fingerprint: f9353669e7685b1dbdddcec56455ba78b5b6c79ec7f9e06caba376db1a8897d7 template_sources: - gemfiles/modular/json/truffleruby_23_1.gemfile.example gemfiles/modular/mutex_m/r2/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r2_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 536eb16c24915ac5d6badd916a45ca73960119b41ae0260f75e70eace9cd53a1 + input_fingerprint: 7d28b55128d2afb019d8c4b0595886e63a13bbfba4c19306dc6d844f10343454 template_sources: - gemfiles/modular/mutex_m/r2/v0.3.gemfile.example gemfiles/modular/mutex_m/r3/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r3_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: ac740c15d68db7f7a3a9593db82bbf1f041e2f39ac3deebc53a988a51f6a3b1d + input_fingerprint: eb148a26c54a305f6834235b59c2fd848e529556e0318bb953aef772379b649e template_sources: - gemfiles/modular/mutex_m/r3/v0.3.gemfile.example gemfiles/modular/mutex_m/r4/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r4_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: a56d70bdbc67d24b8427fda29db35dbdd300dcad8edd272a49c9b46728769adc + input_fingerprint: f19e7497c198b464b71f1b35e46b49f17e2fdacaf90c3ad993515953374d137c template_sources: - gemfiles/modular/mutex_m/r4/v0.3.gemfile.example gemfiles/modular/mutex_m/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_vHEAD_gemfile action: write dest_sha256: '08018641c97f894788fa91b462da504ab2237213d18d95404136c393274ae3cb' - input_fingerprint: 7f2751c785dadd66866319d96dbd2f0ece8bb00e944512f886810ea8d28a0ba0 + input_fingerprint: 1dc79dc15c73d1e397ae7b45db8087a1275ffcdf3b5df61a3c96d38325c99e4b template_sources: - gemfiles/modular/mutex_m/vHEAD.gemfile.example gemfiles/modular/optional.gemfile: recipe: template_source_application_gemfiles_modular_optional_gemfile action: write dest_sha256: f770e6e9a9dd2bd0f1f132e882d88038b2e21127dce3afe270908c7338c28bfd - input_fingerprint: fee427d16f87d0ff6ec82cf1ddfdf652a87f727a0adf580601ab408ac412b467 + input_fingerprint: 62172abd0fc735eb8c3c5bd6fa9c3a2d5edeb83991e7ca28cebfe8f7ff2d8824 template_sources: - gemfiles/modular/optional.gemfile.example gemfiles/modular/rspec.gemfile: recipe: template_source_application_gemfiles_modular_rspec_gemfile action: write dest_sha256: d043f5c9344f6435edb4607c5adaf42c78e7fb6b8b6726007de2bbedefb376c3 - input_fingerprint: 4307d05f38f5e102d64498e65d684f6276ee7c1b58a74a22b8e56aa0ef442a29 + input_fingerprint: 978bb18fa2ca357dd7cb49cb2c07341eb6e1d803e331a3b7a331e5f7d57b4a6d template_sources: - gemfiles/modular/rspec.gemfile.example gemfiles/modular/runtime_heads.gemfile: recipe: template_source_application_gemfiles_modular_runtime_heads_gemfile action: write dest_sha256: 6ac7158c4a3088190f2a9082f01439eb27eca2172ab3464b15c9cb045aa885e1 - input_fingerprint: c884990cf0266058735b90eafbc8c283ecd13a0bba00df3f1311e3bc3811a8b4 + input_fingerprint: 95192a9aa0fba6ca6888e592eb171d3529aa945be9cf8ef11fe9383c264df5cc template_sources: - gemfiles/modular/runtime_heads.gemfile.example gemfiles/modular/stringio/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r2_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: a55d0f97bd46ffa1eafad15d5d124616d8772d5355696ef905122c09bf600496 + input_fingerprint: a4691b11b1b8f4b1717caecb87c155a6e6c638fe2932022289eac54104b77bdc template_sources: - gemfiles/modular/stringio/r2/v3.0.gemfile.example gemfiles/modular/stringio/r3/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r3_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: f61dba0bed900d336380353b0b8eb3c69ef18fa44b817295200382d4b1c2c6ec + input_fingerprint: 207919a5cfe498abb40dcc3ccbaac0142a1b4e470d10aede5be6619710494688 template_sources: - gemfiles/modular/stringio/r3/v3.0.gemfile.example gemfiles/modular/stringio/r4/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r4_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 56fb21e69698266e80c3257e1bb4f6a1975b525a3a3ad65ccdd9897b0fc18441 + input_fingerprint: 1b4322c4e64b7e64a1cc7ed91a7b3f3a858118dcb763aab044f1cb1853a2a9b9 template_sources: - gemfiles/modular/stringio/r4/v3.0.gemfile.example gemfiles/modular/stringio/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_stringio_vHEAD_gemfile action: write dest_sha256: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - input_fingerprint: f1312fc120821a992fab4dbae28461d4085db8a8dd5dde893d1f00df6d72f57c + input_fingerprint: f42703c3aaa023435b240334cd3ba7c9321624ed193061c6d3d6e52616ed0ae5 template_sources: - gemfiles/modular/stringio/vHEAD.gemfile.example gemfiles/modular/style.gemfile: recipe: template_source_application_gemfiles_modular_style_gemfile action: write - dest_sha256: 2a3d46dcb8a9394f595f273f5eb0403d0a552837754ab109afc9ba79a7159083 - input_fingerprint: 4fa2d0ee1f8aa565b80024579adaa424f18cb5d3241ddc08bcff4e8354354d6f + dest_sha256: 9a24acff0054573c30f5d84d0418cd465ba3794d075bb5a36801410ac40e0787 + input_fingerprint: 1ec17cda7d245087b6307b510af03e1da2341d8a887213da2a489ba57d6bc75e template_sources: - gemfiles/modular/style.gemfile.example gemfiles/modular/style_local.gemfile: recipe: template_source_application_gemfiles_modular_style_local_gemfile action: write dest_sha256: 55eb9c149cdb2f29c9f31abe2d55a4f334e00fb859681dd17c42149a3f28ca36 - input_fingerprint: 6a79ebea988f99a7c4eeadd1b3f14b6f417ffac1ade2e4a7bb46084a989fd0e1 + input_fingerprint: f1667e4d98939a5da7ab5bce6c33515d6f703f54efdc6b8237440a788cdcf7fb template_sources: - gemfiles/modular/style_local.gemfile.example gemfiles/modular/templating.gemfile: recipe: template_source_application_gemfiles_modular_templating_gemfile action: write - dest_sha256: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - input_fingerprint: 584a1b3b8502503ce1730ae119342c1ede248e241ebe4198442ea7990be6070c + dest_sha256: 432ba59798d31b899268257c432443a017c5a9bd2c0c7f9f2216617e14150cd3 + input_fingerprint: 484c6cbd6a7a6266756558e34f0a6c1ab454ca201faafaeb118dce673e9ad396 template_sources: - gemfiles/modular/templating.gemfile.example gemfiles/modular/templating_local.gemfile: recipe: template_source_application_gemfiles_modular_templating_local_gemfile action: write - dest_sha256: d16c401ffd0194949313df893c2251c68746bc934c106545345bc7076d24b168 - input_fingerprint: e5ef78d23046bdb8b2b1b6d21b7813f4b3223ff6eca50605c6bf802fbe3ce672 + dest_sha256: 984ae5f97640e2edd06c0114fcbdde171f884aa391c7cfa53d64d4eb15d79689 + input_fingerprint: a2f8d02b0f2b5fdb792c0123ff016eaf6d51968999f5e8da5e955ce39f78de52 template_sources: - gemfiles/modular/templating_local.gemfile.example gemfiles/modular/webrick/r4/v1.9.gemfile: recipe: template_source_application_gemfiles_modular_webrick_r4_v1_9_gemfile action: write dest_sha256: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea - input_fingerprint: 2018e133741ebde80d32f6425c7abc7469547d5a25696b5e175083215394a09d + input_fingerprint: 41464d5517c518ad963f2b62cfbcf319ace33a5e22b3652e5cb4fb1b571ac926 template_sources: - gemfiles/modular/webrick/r4/v1.9.gemfile.example gemfiles/modular/webrick/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_webrick_vHEAD_gemfile action: write dest_sha256: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b - input_fingerprint: 234303e9a83c1fe769ff5d45a728ba4b2efe2738454b33e2ff7b9036bff63039 + input_fingerprint: 608d66044898575dcc524463b89388c55d4ed6469932787fb381e7f7868e47dd template_sources: - gemfiles/modular/webrick/vHEAD.gemfile.example gemfiles/modular/x_std_libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_gemfile action: write dest_sha256: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a - input_fingerprint: 04bd43b6d27cf4589364e3187c42390c5e1f055fa26c1269d4623bfa81a772f6 + input_fingerprint: cf38425d934d915adf5fcefc750e83c18280c330fe4da1d097c70819f89d565f template_sources: - gemfiles/modular/x_std_libs.gemfile.example gemfiles/modular/x_std_libs/r2/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r2_libs_gemfile action: write dest_sha256: e80ec8ad06cb1b31ac982bc25cf7696987fca131aa1001eaefd0bf5cd379c273 - input_fingerprint: 2ed74baca4aaf4e345207df34c449c12a84a20839a5caddc25e453d74ab704ab + input_fingerprint: 1b85a5952ecefe1bfaedcda82f70a9b8132852fe3ca775d07ffbc792d6e5590a template_sources: - gemfiles/modular/x_std_libs/r2/libs.gemfile.example gemfiles/modular/x_std_libs/r3.1/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_1_libs_gemfile action: write dest_sha256: 9f8565c40b09bea1bc4c2e2ad87fe11400c3c51a2b235655bfcd8e491ed88ca8 - input_fingerprint: 7405326255dfe1308a6516a6ae60cfb30c263ed65ece8e13e26db318f20a2c4d + input_fingerprint: '03784f013d7ca09c47ca6d48ed87c1dcf91dd4d5f5de50b09b7c7de046d74bde' template_sources: - gemfiles/modular/x_std_libs/r3.1/libs.gemfile.example gemfiles/modular/x_std_libs/r3/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_libs_gemfile action: write dest_sha256: 546f8849f4267bb19aa10ff0de40be30957197f229e6887847181ea9127b2650 - input_fingerprint: d343990551a715048edec048af141e5149f23a873b1b7d18ac72a486a964f99d + input_fingerprint: dac724d5623a71e1c56d9f071d640edaf68346f7cdbfddfa2731ff0ecde3eed2 template_sources: - gemfiles/modular/x_std_libs/r3/libs.gemfile.example gemfiles/modular/x_std_libs/r4/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r4_libs_gemfile action: write dest_sha256: 8c2582eaa218d216b98c86c933465295c8b4e43f3251ea388b9eaf6e471f8da6 - input_fingerprint: 0bd8816cc1098863a9d50508c39b4a049f487853694ae19a3278a6801e91fe99 + input_fingerprint: bd0119d7956422b8aaf9497ff0e12eb5b1d98b184741c8750fbe7dce135a08df template_sources: - gemfiles/modular/x_std_libs/r4/libs.gemfile.example gemfiles/modular/x_std_libs/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_vHEAD_gemfile action: write dest_sha256: d3133ec4c0638363a7fb025d19be7e95a615fd61c35ddb8d17f2280ee74a7486 - input_fingerprint: e57bc55bd617bf564901f7066c850bb615f8b9eef70489ccfdc5dbfb656b5e6f + input_fingerprint: c4358faf68d26b15c27e0b6311ec5cbf07d9ede31b1250140aeac6a4178daf11 template_sources: - gemfiles/modular/x_std_libs/vHEAD.gemfile.example lib/ast/template/version.rb: recipe: template_source_application_lib_ast_template_version_rb action: write - dest_sha256: bb8a82fd149e86d8f4c8bd63d8d9e0ab2141f76054d811d12efe0579aa13fb7d - input_fingerprint: d613fac25d27638f866d21bc88df533ada01a4c21b6d901b22c72eb3c6169cba + dest_sha256: 1770148aafe1a6b0e4f023b79b581dfdfcd8c5c91bd091e4ee6bed835cb17cd0 + input_fingerprint: ae1efb59376a08ba584d6db6d0337b1eb8106896404a1b773543f9b0e5feb2fe template_sources: - lib/gem/version.rb.example mise.toml: recipe: template_source_application_mise_toml action: write dest_sha256: 454389d5a3d3362ed90d1ff72a51e50cc45e26b1380e52394ae5402d2ce984d7 - input_fingerprint: b76f185583270ce1fad920c7b5e18e76be688bf8154cac626835018adf65d636 + input_fingerprint: ed230e83a28bd4ddbedb0f8e347cd9b84ca2ce7ae4878681e147695988e11e91 template_sources: - mise.toml.no-osc.example sig/ast/template.rbs: recipe: template_source_application_sig_ast_template_rbs action: write dest_sha256: a813080f4a30efb84ed4d249d641f953866d639f9aa9388f36a8451a1d838861 - input_fingerprint: 85956f20b7cfbda3b48bffff735102b7e76b2aa52addc313a8ee55135ea70c40 + input_fingerprint: 83aa1c86b44b3ac94925bf7e14353b64c8355e17afc5b7839084f68775eac37d template_sources: - sig/gem.rbs.example spec/spec_helper.rb: recipe: template_source_application_spec_spec_helper_rb action: write dest_sha256: bae5fc2b817f62f5fb951cc42fc8cf25144910892ebd19ca7b8ccb1755a4436d - input_fingerprint: 9eaeed0aa27f05c31228f27493c9bff101731d1eb4449d3f17983c13108dc759 + input_fingerprint: 8de83d943ae689075e98c0a5895ad421db0f5ccdc3ddf35dfc45e896f29e8976 template_sources: - spec/spec_helper.rb.example diff --git a/gems/ast-template/Gemfile b/gems/ast-template/Gemfile index ca94d91a7..75b12698c 100644 --- a/gems/ast-template/Gemfile +++ b/gems/ast-template/Gemfile @@ -19,7 +19,7 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } # Include dependencies from ast-template.gemspec gemspec -gem 'kettle-family', '~> 1.2', '>= 1.2.97' +gem 'kettle-family', '~> 1.2', '>= 1.2.100' # Local workspace dependency wiring for *_local.gemfile overrides gem 'nomono', '~> 1.1', '>= 1.1.5', require: false # ruby >= 3.2.0 diff --git a/gems/ast-template/Gemfile.lock b/gems/ast-template/Gemfile.lock index 27f35119e..209f7afb3 100644 --- a/gems/ast-template/Gemfile.lock +++ b/gems/ast-template/Gemfile.lock @@ -10,123 +10,123 @@ GIT PATH remote: . specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) + ast-template (7.1.9) + ast-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) + ast-crispr-markdown-markly (7.1.9) + ast-crispr (= 7.1.9) + markdown-merge (= 7.1.9) + markly-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism specs: - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) + ast-crispr-ruby-prism (7.1.9) + ast-crispr (= 7.1.9) + prism-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) + ast-crispr (7.1.9) + ast-merge (= 7.1.9) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ast-merge-git (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: - ast-merge (7.1.8) + ast-merge (7.1.9) benchmark token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + bash-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + binary-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) + citrus-toml-merge (7.1.9) + ast-merge (= 7.1.9) + toml-merge (= 7.1.9) toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge specs: - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) commonmarker (~> 2.2) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) + dotenv-merge (7.1.9) + ast-merge (= 7.1.9) + plain-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + go-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + html-merge (7.1.9) + ast-crispr (= 7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + json-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: - kettle-jem (7.1.25) + kettle-jem (7.1.26) addressable (>= 2.8, < 3) ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) @@ -160,122 +160,122 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge specs: - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown (~> 2.5) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + markdown-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) + markly-merge (7.1.9) + markdown-merge (= 7.1.9) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge specs: - parslet-toml-merge (7.1.8) + parslet-toml-merge (7.1.9) toml (~> 0.3) - toml-merge (= 7.1.8) + toml-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + plain-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) + prism-merge (7.1.9) + ast-merge (= 7.1.9) prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + psych-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) + yaml-merge (= 7.1.9) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) + rbs-merge (7.1.9) + ast-merge (= 7.1.9) rbs (>= 3.10) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + rust-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) + smorg-rb (7.1.9) + ast-merge (= 7.1.9) + ast-merge-git (= 7.1.9) + bash-merge (= 7.1.9) diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) + dotenv-merge (= 7.1.9) + go-merge (= 7.1.9) + html-merge (= 7.1.9) + json-merge (= 7.1.9) kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) + markdown-merge (= 7.1.9) + plain-merge (= 7.1.9) + prism-merge (= 7.1.9) + psych-merge (= 7.1.9) + rbs-merge (= 7.1.9) + rust-merge (= 7.1.9) + toml-merge (= 7.1.9) + typescript-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + toml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: - tree_haver (7.1.8) + tree_haver (7.1.9) citrus (~> 3.0) parslet (~> 2.0) tree_sitter_language_pack (>= 1.16.2, < 2.0) @@ -284,25 +284,25 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + typescript-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + yaml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) + zip-merge (7.1.9) + binary-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) GEM @@ -336,6 +336,8 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) + commonmarker (2.10.0) + rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -465,11 +467,15 @@ GEM lint_roller (1.1.0) logger (1.7.0) markly (0.19.0) + mini_portile2 (2.8.9) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) reline (~> 0.6) mutex_m (0.3.0) + nokogiri (1.19.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-musl) @@ -503,6 +509,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) + rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -696,13 +705,16 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.16.2-aarch64-linux) + tree_sitter_language_pack (1.17.0) + rb_sys (>= 0.9.130, < 0.10) + sorbet-runtime (~> 0.5) + tree_sitter_language_pack (1.17.0-aarch64-linux) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-arm64-darwin) + tree_sitter_language_pack (1.17.0-arm64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-linux) + tree_sitter_language_pack (1.17.0-x86_64-linux) sorbet-runtime (~> 0.5) tsort (0.2.0) tty-cursor (0.7.1) @@ -784,9 +796,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.31) + kettle-dev (~> 3.0, >= 3.0.34) kettle-drift (~> 1.0, >= 1.0.13) - kettle-family (~> 1.2, >= 1.2.97) + kettle-family (~> 1.2, >= 1.2.100) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) @@ -807,12 +819,12 @@ DEPENDENCIES reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) - rubocop-lts (~> 24.2, >= 24.2.1) - rubocop-lts-rspec (~> 1.0, >= 1.0.5) + rubocop-lts (~> 24.2, >= 24.2.3) + rubocop-lts-rspec (~> 1.0, >= 1.0.6) rubocop-minitest (~> 0.40, >= 0.40.0) rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! - rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) ruby-merge! ruby-progressbar (~> 1.13) rust-merge! @@ -843,33 +855,34 @@ CHECKSUMS appraisal2 (3.2.3) sha256=3a6cfaf8a444e02707b9a34154af1c4902fbe99d9d2168d7e81dd83ec77e6db7 appraisal2-rubocop (1.0.2) sha256=1dae97c1be087cf9c098a3a72fd41f873435e9b8b39687e633b36c9ccb22bff4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.8) - ast-crispr-markdown-markly (7.1.8) - ast-crispr-ruby-prism (7.1.8) - ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) + ast-crispr (7.1.9) + ast-crispr-markdown-markly (7.1.9) + ast-crispr-ruby-prism (7.1.9) + ast-merge (7.1.9) + ast-merge-git (7.1.9) + ast-template (7.1.9) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.8) + bash-merge (7.1.9) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) - bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae + binary-merge (7.1.9) + bundler (4.1.0.beta1) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.8) + citrus-toml-merge (7.1.9) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 + commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e commonmarker (2.10.0-x86_64-darwin) sha256=01e0830ed0319825ecdc16411c90acd3f661d1568dfc178731b3f64d0ce2363d commonmarker (2.10.0-x86_64-linux) sha256=945c510c0bfca9022245928e2248468fe3ddad58c939be0c37b20082cc392880 commonmarker (2.10.0-x86_64-linux-musl) sha256=288cd4fb9f17eed2ffa73551ef241dcf594e0f484b2aee2a0999540333c0618e - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) completely (0.8.0) sha256=e493cd5d84805f47917a41f277ecbfe5f35363bed670be5a957d3acaed8c6c5e concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 @@ -878,7 +891,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docopt_ng (0.7.1) sha256=a024148ee4fa3ab1a8a04411aa4370f39cf2b446e63562097d418b7974a15667 - dotenv-merge (7.1.8) + dotenv-merge (7.1.9) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -891,35 +904,37 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) + go-merge (7.1.9) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) + html-merge (7.1.9) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a - json-merge (7.1.8) - kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + json-merge (7.1.9) + kettle-changelog (1.0.7) + kettle-dev (3.0.34) + kettle-drift (1.0.13) kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 - kettle-jem (7.1.25) + kettle-jem (7.1.26) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 - kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd + kettle-soup-cover (3.0.10) kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 - markdown-merge (7.1.8) + markdown-merge (7.1.9) markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca - markly-merge (7.1.8) + markly-merge (7.1.9) + mini_portile2 (2.8.9) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 + nokogiri (1.19.4) nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af nokogiri (1.19.4-arm64-darwin) sha256=a46db9853286e6597b36ebc6953817d15acf3a299583eb3f89fdc6f91dd63527 @@ -933,20 +948,22 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) - plain-merge (7.1.8) + parslet-toml-merge (7.1.9) + plain-merge (7.1.9) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.8) + prism-merge (7.1.9) psych (5.5.0) sha256=4b245bbbd0f3238df8ccee766ebc1a6b062b10e4ee1d3284eb588739ba156a0a - psych-merge (7.1.8) + psych-merge (7.1.9) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 - rbs-merge (7.1.8) + rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -982,11 +999,11 @@ CHECKSUMS rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.8) + ruby-merge (7.1.9) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) + rust-merge (7.1.9) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +1011,7 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) + smorg-rb (7.1.9) sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,25 +1027,26 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.8) + toml (0.3.0) + toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb - tree_haver (7.1.8) - tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 - tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 - tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 - tree_sitter_language_pack (1.16.2-x86_64-linux) sha256=d8151e6e44e35ace9de3611c76b730896beab17f427db06d8f76666332a5dc60 + tree_haver (7.1.9) + tree_sitter_language_pack (1.17.0) + tree_sitter_language_pack (1.17.0-aarch64-linux) + tree_sitter_language_pack (1.17.0-arm64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-linux) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f tty-cursor (0.7.1) sha256=79534185e6a777888d88628b14b6a1fdf5154a603f285f80b1753e1908e0bf48 tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) + typescript-merge (7.1.9) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 yaml-converter (0.2.5) sha256=a5214fe1a6c2df88bd34a35bcded1b1dcd30135548130df2e03b54ca8c0f2423 - yaml-merge (7.1.8) + yaml-merge (7.1.9) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.8) sha256=73d935d43e3479d65ce8aff25c7d3100e8bb83528a2adaa0ed824e5046ac99e7 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -1037,8 +1055,8 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) + zip-merge (7.1.9) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH - 4.0.20 + 4.1.0.beta1 diff --git a/gems/ast-template/Rakefile b/gems/ast-template/Rakefile index e6a892253..d0905ca43 100644 --- a/gems/ast-template/Rakefile +++ b/gems/ast-template/Rakefile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -# ast-template Rakefile v7.1.18 - 2026-09-07 +# ast-template Rakefile v7.1.26 - 2026-09-09 # Ruby 2.3 (Safe Navigation) or higher required # # See LICENSE.md for license information. diff --git a/gems/ast-template/ast-template.gemspec b/gems/ast-template/ast-template.gemspec index d37b9d02d..953f02d5a 100644 --- a/gems/ast-template/ast-template.gemspec +++ b/gems/ast-template/ast-template.gemspec @@ -119,7 +119,7 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.31') # ruby >= 4.0.0 + spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.34') # ruby >= 4.0.0 # Security spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 diff --git a/gems/ast-template/bin/rubocop-gradual b/gems/ast-template/bin/rubocop-gradual new file mode 100755 index 000000000..7c7ff0635 --- /dev/null +++ b/gems/ast-template/bin/rubocop-gradual @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'rubocop-gradual' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'rubygems' +require 'bundler/setup' + +load Gem.bin_path('rubocop-gradual', 'rubocop-gradual') diff --git a/gems/ast-template/gemfiles/modular/coverage_local.gemfile b/gems/ast-template/gemfiles/modular/coverage_local.gemfile index 37917caac..d6c890e46 100644 --- a/gems/ast-template/gemfiles/modular/coverage_local.gemfile +++ b/gems/ast-template/gemfiles/modular/coverage_local.gemfile @@ -29,11 +29,31 @@ Kernel.send(:gem, 'nomono', *nomono_activation_requirements) require 'nomono/bundler' local_gems = %w[kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -local_gems_to_eval = local_gems - %w[] - declared_gems # export KETTLE_DEV_DEV=/path/to/my platform :mri do + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + local_gems_to_eval = local_gems - %w[] - declared_gems + eval_nomono_gems( gems: local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/ast-template/gemfiles/modular/style.gemfile b/gems/ast-template/gemfiles/modular/style.gemfile index 59c5dc1a3..41ec99454 100644 --- a/gems/ast-template/gemfiles/modular/style.gemfile +++ b/gems/ast-template/gemfiles/modular/style.gemfile @@ -24,9 +24,9 @@ platform :mri do if ENV.fetch('RUBOCOP_LTS_DEV', 'false').casecmp('false').zero? declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) - gem 'rubocop-lts', '~> 24.2', '>= 24.2.1' unless declared_gems.include?('rubocop-lts') - gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.5' unless declared_gems.include?('rubocop-lts-rspec') - gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.6' unless declared_gems.include?('rubocop-ruby3_2') + gem 'rubocop-lts', '~> 24.2', '>= 24.2.3' unless declared_gems.include?('rubocop-lts') + gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.6' unless declared_gems.include?('rubocop-lts-rspec') + gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.8' unless declared_gems.include?('rubocop-ruby3_2') else eval_gemfile('style_local.gemfile') end diff --git a/gems/ast-template/gemfiles/modular/templating.gemfile b/gems/ast-template/gemfiles/modular/templating.gemfile index 6af159bd7..ce51a08ed 100644 --- a/gems/ast-template/gemfiles/modular/templating.gemfile +++ b/gems/ast-template/gemfiles/modular/templating.gemfile @@ -18,7 +18,7 @@ end if structuredmerge_remote # Merge recipes for released installs. - gem 'kettle-jem', '>= 7.0' + gem 'kettle-jem', '~> 7.1', '>= 7.1.26' end if kettle_remote diff --git a/gems/ast-template/gemfiles/modular/templating_local.gemfile b/gems/ast-template/gemfiles/modular/templating_local.gemfile index e19209455..0af4cf914 100644 --- a/gems/ast-template/gemfiles/modular/templating_local.gemfile +++ b/gems/ast-template/gemfiles/modular/templating_local.gemfile @@ -65,9 +65,7 @@ structuredmerge_local_gems = %w[ kettle_dev_local_gems = %w[ kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift ] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[] -kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - (declared_gems - %w[kettle-dev]) if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( @@ -81,6 +79,28 @@ if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 end if ENV.fetch('KETTLE_DEV_DEV', 'false').casecmp('false') != 0 + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - declared_gems + eval_nomono_gems( gems: kettle_dev_local_gems_to_eval, prefix: 'KETTLE_DEV', From 95b662042fb11dd7eeef4e6ede7f316bdb6e2e07 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 23:50:48 -0400 Subject: [PATCH 091/137] =?UTF-8?q?=F0=9F=8E=A8=20Template=20binary-merge?= =?UTF-8?q?=20by=20kettle-family?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/binary-merge/.kettle-drift.lock | 76 ++++- gems/binary-merge/.rubocop_gradual.lock | 7 +- .../.structuredmerge/kettle-jem.lock | 145 ++++---- gems/binary-merge/Gemfile | 2 +- gems/binary-merge/Gemfile.lock | 318 +++++++++--------- gems/binary-merge/Rakefile | 2 +- gems/binary-merge/bin/rubocop-gradual | 16 + gems/binary-merge/binary-merge.gemspec | 2 +- .../gemfiles/modular/coverage_local.gemfile | 24 +- .../gemfiles/modular/style.gemfile | 6 +- .../gemfiles/modular/templating.gemfile | 2 +- .../gemfiles/modular/templating_local.gemfile | 24 +- 12 files changed, 387 insertions(+), 237 deletions(-) create mode 100755 gems/binary-merge/bin/rubocop-gradual diff --git a/gems/binary-merge/.kettle-drift.lock b/gems/binary-merge/.kettle-drift.lock index 98b009e1e..1b23f4793 100644 --- a/gems/binary-merge/.kettle-drift.lock +++ b/gems/binary-merge/.kettle-drift.lock @@ -1,10 +1,82 @@ { + "debug_env: 'KETTLE_DEV_DEBUG',\nroot: %w[src my kettle-dev]": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 46, + 63 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 93, + 110 + ] + } + ], + "path_env: 'KETTLE_DEV_DEV',\nvendored_gems_env: 'VENDORED_GEMS',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 43, + 60 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 90, + 107 + ] + } + ], + "prefix: 'KETTLE_DEV',\npath_env: 'KETTLE_DEV_DEV',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 42, + 59 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 89, + 106 + ] + } + ], + "vendor_gem_dir_env: 'VENDOR_GEM_DIR',\ndebug_env: 'KETTLE_DEV_DEBUG',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 45, + 62 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 92, + 109 + ] + } + ], "vendored_gems_env: 'VENDORED_GEMS',\nvendor_gem_dir_env: 'VENDOR_GEM_DIR',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 44, + 61 + ] + }, { "file": "gemfiles/modular/templating_local.gemfile", "lines": [ - 77, - 88 + 75, + 91, + 108 ] } ] diff --git a/gems/binary-merge/.rubocop_gradual.lock b/gems/binary-merge/.rubocop_gradual.lock index be7d3b7e8..e61df31ee 100644 --- a/gems/binary-merge/.rubocop_gradual.lock +++ b/gems/binary-merge/.rubocop_gradual.lock @@ -2,13 +2,13 @@ ".simplecov:658144869": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] ], - "Rakefile:2995556701": [ + "Rakefile:2222517694": [ [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], [81, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], [165, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], [168, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] ], - "binary-merge.gemspec:2979651516": [ + "binary-merge.gemspec:3289954553": [ [137, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4147388508], [148, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], [149, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] @@ -27,6 +27,9 @@ [1, 1, 0, "Naming/FileName: The name of this source file (`vHEAD.gemfile`) should use snake_case.", 5381], [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], + "gemfiles/modular/coverage_local.gemfile:2813372128": [ + [34, 1, 1586, "Metrics/BlockLength: Block has too many lines. [37/25]", 820328175] + ], "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], diff --git a/gems/binary-merge/.structuredmerge/kettle-jem.lock b/gems/binary-merge/.structuredmerge/kettle-jem.lock index ca47ea821..65dcd10d6 100644 --- a/gems/binary-merge/.structuredmerge/kettle-jem.lock +++ b/gems/binary-merge/.structuredmerge/kettle-jem.lock @@ -1,11 +1,12 @@ --- version: 1 template_state: - version: 7.1.18 - applied_at: '2026-09-07' + version: 7.1.26 + applied_at: '2026-09-10' changelog_replay: last_entry_key: kettle-jem-template-20260802-001 last_entry_date: '2026-08-02' + maintenance_changelog: {} checksums: ".aiignore.example": 48a5dfdd93afd1a15fdce39cc28ca9920263f00018b0968ab031fa744521e5ce ".config/mise/env.sh": aeea5a2ab489ba6e5467ae8de6e386ec8c8fe4ff31a044e69d0cd6a092dd6654 @@ -75,7 +76,7 @@ template_state: ".rubocop_rspec.yml.example": 288ad75e7eb14d87d80fafe6f7272217be5c57547536ee56c780a7d10ac7ec74 ".simplecov.example": 222f2e6ce8cf089c70a21f0f5e5423d4bd59a96fdb2ce7754b0fb3d6f430c229 ".structuredmerge/git-drivers.toml.example": 9d241a44c9edffcdbd3da018fa188a238089c3d1635040924df594a6929a4f97 - ".structuredmerge/kettle-jem.yml.example": 26949dc4ee0722415e72452cbc186bee6ef7b154eae33166d36f3fdb1ca6e46d + ".structuredmerge/kettle-jem.yml.example": ff65a738da1af7d60714026a81d3323a46c864e96ae3570b806afdf6e7149ff9 ".yard-lint.yml.example": 90def46867c9436b4e177c47d91fc8165f4602e335715aecc39f5587ae20b55b ".yardignore.example": 821f453c609df7d46145d675424b39dfbe6dfdca8edac5f367b85fff48502455 ".yardopts.example": 6fd6f2701713096a8a9ea095c213bbc68eeef37797c4754d97837e3229a3a5f6 @@ -88,7 +89,7 @@ template_state: CHANGELOG.transfer.md: 21331d8a9e58b4ff6e088b88eb408bcccb0f2f64e78f8f4d42ac3f11a24baad8 CITATION.cff.example: e404ea0a7919d78a83d53d80e211d17b9663576aa606583b709795dc023fd75c CODE_OF_CONDUCT.md.example: f1ad532f1860f73ef774c6b27a26d41f4bc1cb8813034f5957487766ebb0986b - CONTRIBUTING.md.example: 22570cfb3dde72be79b4b522b6d5ab13f95d778e40444483a096871fe0891b19 + CONTRIBUTING.md.example: 8d23cce2d061e0c20d619c3f66591df5f32821cd84c32d171df0b8ebe1217a55 FUNDING.md.example: 392d047904b1557b29f4b43d37ec403b7480edd5b6ab51180be979b57a91e6ba FUNDING.md.no-osc.example: 3ef0258dd3e3b7f7e17e8bc2d20dcbcb3e74aa5a5a6f51297075696645e34c77 Gemfile.example: 99500023987e81775a9b5ef14e92cb3992f2ac408e5f42454f2728eee9b49fb2 @@ -99,19 +100,19 @@ template_state: PolyForm-Small-Business-1.0.0.md.example: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 README.md.example: 21f491e3d73bfc1b74056a6dcba61f72c93dee3cfe5272ac164a20978454de21 REEK: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - RUBOCOP.md.example: c09e5533ccc59b70a2efa05c99f66e521137c1053d3c12eb43509cebd5b68b0e + RUBOCOP.md.example: d99871a0e4c1d323c92e7febf328f062bb4722069b2abfd0a83bf7daa8dcbf8c Rakefile.example: 569803e726b07ea26267fec6891367a3096a0dff3c266269a7081d36afe496af SECURITY.md.example: ee9411aa85f36d88363fdaea7a1baea4362b6ec112cf2688e711b05de1d3144c bin/setup.example: 0ac35089c95a91d8973fe7a318bf9fd98b9f8e00db92c5d9ca6cd858abb8d41b certs/pboling.pem.example: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - gem.gemspec.example: 83e834e8958a88e4817a57199f48f5ebb245548ce251c5c47372208693f03b17 + gem.gemspec.example: 12dcadc0b297ccd4e18b9d1e538b98ac8330ef9fb2a059ed6754ad59272b77fa gemfiles/modular/benchmark/r4/v0.5.gemfile.example: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 gemfiles/modular/benchmark/vHEAD.gemfile.example: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 gemfiles/modular/cgi/r4/v0.5.gemfile.example: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 gemfiles/modular/cgi/vHEAD.gemfile.example: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 gemfiles/modular/changelog.gemfile.example: 892598e0e7792eb205247ae28128cef6dfc647d2fb33968969152230d6f69288 gemfiles/modular/coverage.gemfile.example: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - gemfiles/modular/coverage_local.gemfile.example: 928d5f260d7b119c038baa56da9fb78dd524dee613aea33ab72894bbce5c506e + gemfiles/modular/coverage_local.gemfile.example: 92ea0d7a9d693553dc614afa2c43990f5c3778c2b00ef6c528e122c31bd506a1 gemfiles/modular/debug.gemfile.example: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 gemfiles/modular/documentation.gemfile.example: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c gemfiles/modular/documentation_local.gemfile.example: 84a20f5d4b0feb94c2cf2f7a8dce8f682f1483498e41484c2b447a5661fd1870 @@ -145,10 +146,10 @@ template_state: gemfiles/modular/stringio/r3/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/r4/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/vHEAD.gemfile.example: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - gemfiles/modular/style.gemfile.example: 3ad0585b4f2db8918580ca41ea8723f7a166d7a83cfd7f9613511094997106fd + gemfiles/modular/style.gemfile.example: 02fe3e8fd00e49b90c3ab30e19b51014ee50490f3eadcfd1d4a39f4c2c997dda gemfiles/modular/style_local.gemfile.example: c86beb711e766126a5be68be4be18255831625ac3650d5069383c4a83a9511f3 - gemfiles/modular/templating.gemfile.example: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - gemfiles/modular/templating_local.gemfile.example: 930057d3b909a72e39a39125c4e883a7ff71f5691e64426c0541f8c8fc75b83f + gemfiles/modular/templating.gemfile.example: 2b33c094677b53ad9dd2eafeb3a3be452f612380c61001a2e75b3c078b8ff72a + gemfiles/modular/templating_local.gemfile.example: ac7259516e69ffafb8b9342a897ddf6042adc46335743f474c342509cefd8f2e gemfiles/modular/webrick/r4/v1.9.gemfile.example: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea gemfiles/modular/webrick/vHEAD.gemfile.example: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b gemfiles/modular/x_std_libs.gemfile.example: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a @@ -175,7 +176,7 @@ template_state: shim/Gemfile.example: 0fb0d9d06fcfb1fd6ca6f0eeb5867253ca1ed221e03d28027719225f868b0637 shim/README.md.example: 3a2f7211b7f92a1dfae5e523b8e34b051a3d8af942144b05286eca0b3c8f6fbe shim/Rakefile.example: 572c94da7052083b39b62a6600785419e314a109efd7a3d8c3a96eb77ad34fd1 - shim/gem.gemspec.example: efae033238e4fd1355cfc134f5c9123f175d1ad1dc4a1a2e663899788c9e0870 + shim/gem.gemspec.example: 14a7015b3328005d1c3b5fda6886bd6da383707745f6eaaa781d6f9689600131 shim/lib/compat_require.rb.example: 94ee85e353a3ca08c8a35c9063d4ff789214ea594c7f803f6cf09d7142f48379 shim/lib/entrypoint.rb.example: dd57613520daca01d6f6bcaa9b83b00ff74505240dc04b84ceb686df3c0539d7 shim/lib/version.rb.example: 15e219ac3a928b5580035f891e415551213175020f1131f6e7ca0ccd55a1b2d6 @@ -189,370 +190,370 @@ files: recipe: template_source_application_simplecov action: write dest_sha256: 6294ea69090b2859ac3f516ea804b0429eaf888a01afe8511edc3373016cd2e9 - input_fingerprint: a128aa8f72216dbaab634f3ff9a6df83077050521e9b7e05da152134affadecb + input_fingerprint: 8802815dacf979cece98e001e5f867a8ae2e2e19beb0d3168db06c2308341cec template_sources: - ".simplecov.example" AGPL-3.0-only.md: recipe: template_source_application_AGPL_3_0_only_md action: write dest_sha256: d8a6cc31abc16b6748c7a21f21611f5a1ec33f67d22ca23d7da1c19b95496bee - input_fingerprint: 7c8a8955b26ea1adaa1d7a7e14ea43c6313561f6a6bbb549f2a4fe9b297782f6 + input_fingerprint: 4f453869e8d737616901524798af10fabab0e61818508bb106990dd616c4347a template_sources: - AGPL-3.0-only.md.example Gemfile: recipe: template_source_application_Gemfile action: write - dest_sha256: 040f841f8063bae3d316359c7204a8866a297340fda695366bd776436669462e - input_fingerprint: 96efbacb1747a9cd611aaf62593548c3e3025c050d29b52b5bdbcfae53abf011 + dest_sha256: 2072aaef9dcbd23d2b14964fccd09acd142a11c8aecbcf90be3f104b8ce1d64e + input_fingerprint: beed2423a6d0b5b86394570e89e21cce26c1e82a561cd759daf41b7d4dddd4f1 template_sources: - Gemfile.example LICENSE.md: recipe: template_source_application_LICENSE_md action: write dest_sha256: f6188bfd474a636d2a526420ebb411250faa447d94c9b9ccee097128ce4101b5 - input_fingerprint: 510d4abdaf3d4003bba289e00f80464f5c56dc67f0452ef3fb414187f2e963d2 + input_fingerprint: 9eba1b5431a3c648dfed787da35c81e6f0688413e79d0aa674722cba25bb8a80 template_sources: - LICENSE.md.example PolyForm-Small-Business-1.0.0.md: recipe: template_source_application_PolyForm_Small_Business_1_0_0_md action: write dest_sha256: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 - input_fingerprint: 6e73728b46970444a667e4061177cbfc66726365ab8c2dc34db516555fa02dc9 + input_fingerprint: 6e3b2e62304de1456030e8d9156ee4baf15ca228264f331a81b54b05a54f2c3c template_sources: - PolyForm-Small-Business-1.0.0.md.example README.md: recipe: template_source_application_README_md action: write dest_sha256: ae1a4c7f167a79f0c511f4f3b213697d8d7bec3696c168d3570482d29eb4eb1a - input_fingerprint: ef2b65bdd58976b1e3e3644d81d5b064024cf16ad7dec2b662d0d58cbed0f4a4 + input_fingerprint: 19bf4d50a460efeb12185a262dc7830f8ebebbf288f652dfa61aa408bb7c4a72 template_sources: - README.md.example Rakefile: recipe: template_source_application_Rakefile action: write - dest_sha256: bd19fb43110d18f1e05e1d2a8e6e5e38e0cee62e9040fb779363f7ada5817ff4 - input_fingerprint: 1783da7774b5bd6bc7c7aab0ffe08ec11d3f43e74e06bb5705ef34fd13d56e26 + dest_sha256: 6d2a39f49eefda5a52f656db81d27ff6d42199d87ea39a5091616c85643bfb78 + input_fingerprint: 77ad6ff0dc2963401fa2b50ee225e3dad42f149361edcaae237785e659c4e094 template_sources: - Rakefile.example binary-merge.gemspec: recipe: template_source_application_binary_merge_gemspec action: write - dest_sha256: 4131ffb37bbd274c24e8b62b74cf87b74d08cd42bed7484c21c0c02300127995 - input_fingerprint: 609eec9e3bcb3bd6bae6537b61fd77bbcfec095468bf7ca4064b750498694961 + dest_sha256: 4941cfc2de5321f2e98a3492c0a629fff54124e7584f07108f8fcc288615144a + input_fingerprint: 4f3804e1ddbec6aa637ef12fc99f7f20efda76eeec2d9ab2dbbb50b0daa8c52d template_sources: - gem.gemspec.example certs/pboling.pem: recipe: template_source_application_certs_pboling_pem action: write dest_sha256: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - input_fingerprint: cf543eace359ed2ee779feaef61f2bed1f16b54c8069d2afd972dad694d7a3fa + input_fingerprint: 4dd5dd7dd70118af94a0c542b97bc931eaa3924f2d1da2a6148bf59ae646b2c1 template_sources: - certs/pboling.pem.example gemfiles/modular/benchmark/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_r4_v0_5_gemfile action: write dest_sha256: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 - input_fingerprint: b668b4d79a7cf53e0536f6ad0000126f2770b1bc6fd8ac55754cc5c92a11d6b1 + input_fingerprint: ff1157e5d945d51364278c303a8d7c22fede2d0f17f7991b084b19e23064a38b template_sources: - gemfiles/modular/benchmark/r4/v0.5.gemfile.example gemfiles/modular/benchmark/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_vHEAD_gemfile action: write dest_sha256: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 - input_fingerprint: 1047417854f3c08be3d1de1a39a3fe20d9d961c54000d3acd3879ab4576eb64d + input_fingerprint: 761db1af37660f8cf58322b41960368c553936c64c0eb0c4675195bad16655e8 template_sources: - gemfiles/modular/benchmark/vHEAD.gemfile.example gemfiles/modular/cgi/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_cgi_r4_v0_5_gemfile action: write dest_sha256: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 - input_fingerprint: e715a78633a57dbcfdd31bec88e071c4e87e855798bd566460341b6de9a2525b + input_fingerprint: '08ed14ca3197b34e7ca5a9c5271ef48e2524d61d1152f14ec6e7821eb4a3c004' template_sources: - gemfiles/modular/cgi/r4/v0.5.gemfile.example gemfiles/modular/cgi/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_cgi_vHEAD_gemfile action: write dest_sha256: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 - input_fingerprint: f21d95a4c719f73a7f52195c0b2e26c9e084f85291b526d0fafdcb4358c01c60 + input_fingerprint: 61e993ee65fdcca4eda658a35e0b1d91a21416210efeed2205071bb3cfee5c71 template_sources: - gemfiles/modular/cgi/vHEAD.gemfile.example gemfiles/modular/changelog.gemfile: recipe: template_source_application_gemfiles_modular_changelog_gemfile action: write dest_sha256: da669526144fbff33aef207db9541b6fd6c254437f94dec2fab70fc55a7757cd - input_fingerprint: ab9501d118fb830d6e5cb79b975bcdc414561d24cd25b9948421c55b4b2fcef3 + input_fingerprint: 23cd4bd202f003f69364383bc7f740a47309bfa4e8609366a491847625f02576 template_sources: - gemfiles/modular/changelog.gemfile.example gemfiles/modular/coverage.gemfile: recipe: template_source_application_gemfiles_modular_coverage_gemfile action: write dest_sha256: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - input_fingerprint: 3a5780fc757168610890a059ee691ec3af5634b1928e61cc268792077a71fafe + input_fingerprint: 3c9e01681b085338e50bb77ed0bab132b4d5697b2ee6872c165e31ebda6f10b1 template_sources: - gemfiles/modular/coverage.gemfile.example gemfiles/modular/coverage_local.gemfile: recipe: template_source_application_gemfiles_modular_coverage_local_gemfile action: write - dest_sha256: 2b493414df06261ba8acb6f0eb18bf3fdd701d7cb5f967a9d15a3f42a4741827 - input_fingerprint: 17d70ebff796f7d6c94bafb0027298b6487db1200ed25c37bc84ea2345ba2fe5 + dest_sha256: 92c9a599c8f6867ec532880f73568f2736ac05d8973ec524b42fd5dbe6aeda3e + input_fingerprint: '0783ad02e14dc8472030a87dabaf774e2721f0dfc24ecfe35fa32deabf4d81c9' template_sources: - gemfiles/modular/coverage_local.gemfile.example gemfiles/modular/debug.gemfile: recipe: template_source_application_gemfiles_modular_debug_gemfile action: write dest_sha256: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 - input_fingerprint: bd200ed284561e430d484a657b766c5fae4477afbc0cb75f614e7771f87c3ee7 + input_fingerprint: 0bc438930d0ae27fcaaf8ca3de94025ad79097d90ed31dfe6ed5146475fc6c28 template_sources: - gemfiles/modular/debug.gemfile.example gemfiles/modular/documentation.gemfile: recipe: template_source_application_gemfiles_modular_documentation_gemfile action: write dest_sha256: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c - input_fingerprint: 6b43264e5ee55f4296c3da3278028e10253f79fbf43ec64e5d8a7d575f8c3ab9 + input_fingerprint: ac7e58bbb9dd77b8dcd1649d109e266471676bee67ad72730f46a0b2d4ab8a0d template_sources: - gemfiles/modular/documentation.gemfile.example gemfiles/modular/documentation_local.gemfile: recipe: template_source_application_gemfiles_modular_documentation_local_gemfile action: write dest_sha256: 2058173855b9a4acc6d5efa20520e49734243eef6cf0b5e9063e0e5866a08e9c - input_fingerprint: 7fdb5be3369a8f848a5dc688225f91dfd8b1f7a1c89c68729f39082d93bc3584 + input_fingerprint: d80b22bc0c22754a65f33a1fd86be8c1fbe210b724c69ec767f346332e47652a template_sources: - gemfiles/modular/documentation_local.gemfile.example gemfiles/modular/erb/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r2_v3_0_gemfile action: write dest_sha256: 3793e7dc9ef23a7ccd893d48cbba092fd27594c63e65cca011cc658218425670 - input_fingerprint: f40887ac15ef9b5dceb5a3e73b83ee0473e128398e7fe9146bcb1ff40df78355 + input_fingerprint: cc8528d8344dceed13edabbde01f4fa0338dc4922a2ccc7979098e9c5d274972 template_sources: - gemfiles/modular/erb/r2/v3.0.gemfile.example gemfiles/modular/erb/r3/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r3_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 2e56311cdb30a281659e2eccda94fb7db877a27e274207f49ede8a260cc69fd2 + input_fingerprint: 1d98a1abb94fb4b49ca8bbcdc14b8ec46f9ab49287557279997628baa13b324c template_sources: - gemfiles/modular/erb/r3/v5.0.gemfile.example gemfiles/modular/erb/r4/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r4_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 920f041b2b5570f2e6c5a9817ac8d340edd6af5f5ccbbd155f6d74ab0c10c6ef + input_fingerprint: 0ff65122f16e44ca0b6bebbfa645cbd508d8b35e2af9d3cd2f31a092b7b35c45 template_sources: - gemfiles/modular/erb/r4/v5.0.gemfile.example gemfiles/modular/erb/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_erb_vHEAD_gemfile action: write dest_sha256: ad6f104a49e80e0cf625440e3dc816343fe7e2f037fc4971df75e7bb4305c683 - input_fingerprint: b3bc66d7cee924648f3f5e4626ddd93b493d60a3e7ee2315cc4debee634d84d9 + input_fingerprint: 773413aeb9ccf70bd9ba27d40403be635f0cf50c60840982d845e97c4f8e417e template_sources: - gemfiles/modular/erb/vHEAD.gemfile.example gemfiles/modular/json/truffleruby_22_3.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_22_3_gemfile action: write dest_sha256: 249c12eacbe90f9d0d2e81e7a62c4c7e9102e504ededcda4ecf660cb3bb68be4 - input_fingerprint: 9b5fffd36b2cf25545813294770df0705e91717f3e1f9a8709a565df973d91fc + input_fingerprint: 4d8afe4ba1bbfba0773e4031f4cc67db4de5d732acb43d354726e46d69dfd545 template_sources: - gemfiles/modular/json/truffleruby_22_3.gemfile.example gemfiles/modular/json/truffleruby_23_0.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_0_gemfile action: write dest_sha256: 66aa010567f7afa1af8244a74c3c88ecaaf84dc87b6a25180691bb480d02ed28 - input_fingerprint: 5e32327fd54d1804a76b2016cbadca378c8d4e73a4f34a724d292a28333bf2a5 + input_fingerprint: 783a44fe2b99d0c1dccbce14ed09bc012af592e3f5116aa1f30c0ad60481c88f template_sources: - gemfiles/modular/json/truffleruby_23_0.gemfile.example gemfiles/modular/json/truffleruby_23_1.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_1_gemfile action: write dest_sha256: '080fcbdaf2bec73cad40832a3d51eebb380af789917b96f493d1460b0dd6361d' - input_fingerprint: 04d9f74c1498840285ac1348712b234a5de7a19891855d3eabad69056cdcfcef + input_fingerprint: 8f8beedba371eb935a734a40c5f6527f844b306356bf0ef76090e925b184fce5 template_sources: - gemfiles/modular/json/truffleruby_23_1.gemfile.example gemfiles/modular/mutex_m/r2/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r2_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: c4cf0d822c9f436cbdfb75e1d5b6965718de644603ca86d061889e00529ac76b + input_fingerprint: 1c1628bef52867b7e9df5c6163ec5eda94a06c1be9ad6c27a33110fd8c829ffe template_sources: - gemfiles/modular/mutex_m/r2/v0.3.gemfile.example gemfiles/modular/mutex_m/r3/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r3_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 2fc9574bbe01b1a5efb1717cb865561432f68b5c7bfa79f7abb19be31ef68964 + input_fingerprint: 2a464340613bcce63720039d6865df060ca00d72c2745262e29d54b1f13faf4d template_sources: - gemfiles/modular/mutex_m/r3/v0.3.gemfile.example gemfiles/modular/mutex_m/r4/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r4_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: b32f6de93e4205f56d338e0f15e4c54dfc8cec7aeb025c7601c293fea486deb7 + input_fingerprint: 560650124215d1b7d67caca42d9ba03e7c6c3e86b92a23781a5ce8c5f04a699e template_sources: - gemfiles/modular/mutex_m/r4/v0.3.gemfile.example gemfiles/modular/mutex_m/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_vHEAD_gemfile action: write dest_sha256: '08018641c97f894788fa91b462da504ab2237213d18d95404136c393274ae3cb' - input_fingerprint: b8f4016b237f47bea68d9071bda11b0592cdcf7abdb418827f99c23afaa0de90 + input_fingerprint: ccb30b6e8fb0ac1728cc2ae39cdc19d0482018828b84769f2f546c88cd5e933a template_sources: - gemfiles/modular/mutex_m/vHEAD.gemfile.example gemfiles/modular/optional.gemfile: recipe: template_source_application_gemfiles_modular_optional_gemfile action: write dest_sha256: f770e6e9a9dd2bd0f1f132e882d88038b2e21127dce3afe270908c7338c28bfd - input_fingerprint: 72104035e4bd483571e776188cba18d09e1642505327e77c63789bdf1acb7218 + input_fingerprint: 0db753f01be8662b9d9c994d24cec8726c9bca221ee2c36edab8512c8ae76734 template_sources: - gemfiles/modular/optional.gemfile.example gemfiles/modular/rspec.gemfile: recipe: template_source_application_gemfiles_modular_rspec_gemfile action: write dest_sha256: d043f5c9344f6435edb4607c5adaf42c78e7fb6b8b6726007de2bbedefb376c3 - input_fingerprint: 0bba928f3296478e5dff6a61f89a55ff709d9cd646dbaa9e6d41dd0a58e682aa + input_fingerprint: 8b2dab7b52622a15b3d19ffe3c72c1eb36fe28d6dbd132e6cbf4ec6a81b5f199 template_sources: - gemfiles/modular/rspec.gemfile.example gemfiles/modular/runtime_heads.gemfile: recipe: template_source_application_gemfiles_modular_runtime_heads_gemfile action: write dest_sha256: 6ac7158c4a3088190f2a9082f01439eb27eca2172ab3464b15c9cb045aa885e1 - input_fingerprint: a2e51a3e77f955f8788558ff35b90577704f3e2fcb203d30bf5b93a4ce34c999 + input_fingerprint: ad5c8c76f5ebe2885115b73125096d2ef337c8396e8481e17ac8271ceda53b52 template_sources: - gemfiles/modular/runtime_heads.gemfile.example gemfiles/modular/stringio/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r2_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 38ac2f5a5f9ce7f35a70b7801643d31e44678297f4a9c4826ecf7465b90ec7bd + input_fingerprint: 708a0cc4dc3309154fbdc1408a02b11011e34fb7e04b722412cdfe1f2c579d97 template_sources: - gemfiles/modular/stringio/r2/v3.0.gemfile.example gemfiles/modular/stringio/r3/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r3_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 9f08580c6bc1721d37a526b187a91bd6ab7a0272837d031d6608cb8436bb60b1 + input_fingerprint: 346b073a42fb60b1a78c957f5a04684e4d436d686331294676b58bfc1bb32ae9 template_sources: - gemfiles/modular/stringio/r3/v3.0.gemfile.example gemfiles/modular/stringio/r4/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r4_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 1ca47d9d6b1f1fb66feffc90004c1347db3187fafa5f9d87ed320658226d8800 + input_fingerprint: b477925cd2954386fe1eb754e6b8e6fdcc25c142a72299a204b74f6a568ecabc template_sources: - gemfiles/modular/stringio/r4/v3.0.gemfile.example gemfiles/modular/stringio/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_stringio_vHEAD_gemfile action: write dest_sha256: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - input_fingerprint: 2aa0616df6fa5364c6a7583440265c04acc9d707cb07fb14e719a0e090f1013f + input_fingerprint: 938a9475a179dbd49b6d2dba5ec1521b1c14235a719d65e09e4f7e77c5dca0f3 template_sources: - gemfiles/modular/stringio/vHEAD.gemfile.example gemfiles/modular/style.gemfile: recipe: template_source_application_gemfiles_modular_style_gemfile action: write - dest_sha256: 2a3d46dcb8a9394f595f273f5eb0403d0a552837754ab109afc9ba79a7159083 - input_fingerprint: 15ba8c45e53d2426fbcfb5b41a2546f619f13d8993d8f83715b159c0175ff709 + dest_sha256: 9a24acff0054573c30f5d84d0418cd465ba3794d075bb5a36801410ac40e0787 + input_fingerprint: 49cd0553f2b9306010cf08c87d8ac188211ec25fdaa4c7b5eb794f187f63dfe9 template_sources: - gemfiles/modular/style.gemfile.example gemfiles/modular/style_local.gemfile: recipe: template_source_application_gemfiles_modular_style_local_gemfile action: write dest_sha256: 55eb9c149cdb2f29c9f31abe2d55a4f334e00fb859681dd17c42149a3f28ca36 - input_fingerprint: 8822e7a9110258451437037ffdd173f128a949a48439333fd750aabfb6b011ae + input_fingerprint: 6074e999095cba8aa7c4c21811bc4b2c03a49a3d208479d7fbd94221399ccb17 template_sources: - gemfiles/modular/style_local.gemfile.example gemfiles/modular/templating.gemfile: recipe: template_source_application_gemfiles_modular_templating_gemfile action: write - dest_sha256: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - input_fingerprint: cfd52dc68f2245cf54abe091920eb511d7328e76877b39337a85f2f33d8c9a9b + dest_sha256: 432ba59798d31b899268257c432443a017c5a9bd2c0c7f9f2216617e14150cd3 + input_fingerprint: b62f6f4bb94b044d2a1b60c12a5e2e3ad8957ae462976cecaffe2730bb8a2da1 template_sources: - gemfiles/modular/templating.gemfile.example gemfiles/modular/templating_local.gemfile: recipe: template_source_application_gemfiles_modular_templating_local_gemfile action: write - dest_sha256: ee4f02bf7391533485d5a67f7da2a8f0e5236ca71d4938ab16006edb3dc5dfe3 - input_fingerprint: a591c09c03bb1d4317586961f95b57c8ee2bd7e2193dc706d0b65159f6a4286c + dest_sha256: 17ec13428cba45c51ded6266e515b2323f21332343fd17e9448846fa2b6bbfd1 + input_fingerprint: 91912bb37952d8278263d304d0e54a23cde7ace3742957ccf693f45c436e1640 template_sources: - gemfiles/modular/templating_local.gemfile.example gemfiles/modular/webrick/r4/v1.9.gemfile: recipe: template_source_application_gemfiles_modular_webrick_r4_v1_9_gemfile action: write dest_sha256: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea - input_fingerprint: 92ac857e987503ed9b67a5e8c5dab293291ec505c40b120f4c74ca24573b5ec2 + input_fingerprint: f24f95e9a1dd607ee13cd0432cd2d236b18b98188856cf78c0d774419e5d7ae2 template_sources: - gemfiles/modular/webrick/r4/v1.9.gemfile.example gemfiles/modular/webrick/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_webrick_vHEAD_gemfile action: write dest_sha256: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b - input_fingerprint: ea49552b673b40da0801b5fcb8a3f66a905be055a344150776d42bee9a2bfc12 + input_fingerprint: 99687cf34269d1cc6c9b3bbce73dec615fe7609a539b811f17f75997636a2695 template_sources: - gemfiles/modular/webrick/vHEAD.gemfile.example gemfiles/modular/x_std_libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_gemfile action: write dest_sha256: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a - input_fingerprint: 9683f942f4149ea95f3d9a90ece9efc4d055cd5de458829370249f6f7d7f57c0 + input_fingerprint: 1b1572c4d095eda6bb75b4b76ab58d77bfc43345485cf6d358e2f3bd6acc9732 template_sources: - gemfiles/modular/x_std_libs.gemfile.example gemfiles/modular/x_std_libs/r2/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r2_libs_gemfile action: write dest_sha256: e80ec8ad06cb1b31ac982bc25cf7696987fca131aa1001eaefd0bf5cd379c273 - input_fingerprint: 896b0de6f845e6628587360c19d79fad136081778a40179a9e534c8a53069ab4 + input_fingerprint: 9b1c2bce122ae6adf4009570fb8ca8184297d7b957d6645944b96d4df998f727 template_sources: - gemfiles/modular/x_std_libs/r2/libs.gemfile.example gemfiles/modular/x_std_libs/r3.1/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_1_libs_gemfile action: write dest_sha256: 9f8565c40b09bea1bc4c2e2ad87fe11400c3c51a2b235655bfcd8e491ed88ca8 - input_fingerprint: 6de4437cddfacb0c32720c0e9ba76e639587c5b349d1ed651692730f46193c83 + input_fingerprint: 76e569dadbac2a79af87ebc18726d53cd141d9d64040c2899544b901f5030fcb template_sources: - gemfiles/modular/x_std_libs/r3.1/libs.gemfile.example gemfiles/modular/x_std_libs/r3/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_libs_gemfile action: write dest_sha256: 546f8849f4267bb19aa10ff0de40be30957197f229e6887847181ea9127b2650 - input_fingerprint: 0dd8353692ba437dfb8465b1bc88d40a6537f54f1ff381c2f0b3b52de5e2f671 + input_fingerprint: 896ac2fca8cd03765c25e1c7b681f1594971d36eeea55faf6c79f7ffd940a7da template_sources: - gemfiles/modular/x_std_libs/r3/libs.gemfile.example gemfiles/modular/x_std_libs/r4/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r4_libs_gemfile action: write dest_sha256: 8c2582eaa218d216b98c86c933465295c8b4e43f3251ea388b9eaf6e471f8da6 - input_fingerprint: 6add4954b5c658b47c523f46738b24fd09f7ffccca9c8bc6ffe4a14928ffb206 + input_fingerprint: d0a7a12d3f269a05de4fc5b129367d68fc00886a6cbbdee727112408d275a038 template_sources: - gemfiles/modular/x_std_libs/r4/libs.gemfile.example gemfiles/modular/x_std_libs/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_vHEAD_gemfile action: write dest_sha256: d3133ec4c0638363a7fb025d19be7e95a615fd61c35ddb8d17f2280ee74a7486 - input_fingerprint: 1884084e767bcfe527a6a9049b09ee7fa1c313d1a116d488949bc4eea99b4a48 + input_fingerprint: 63b1624a215a0230219b9e6a08515b0f652e13b33f58c0e038e8aa9b5273015c template_sources: - gemfiles/modular/x_std_libs/vHEAD.gemfile.example lib/binary/merge/version.rb: recipe: template_source_application_lib_binary_merge_version_rb action: write - dest_sha256: a1a1c40f19376943a396587201ed99f191a366c9559e89984849e119df261f2b - input_fingerprint: 983e6be287c6dd76f32a2bd43dbfb7ed86d9f9747d59557970e294c8f7bcecc4 + dest_sha256: a4af2b151c58fb6ac99044d3aafbbd82d9ad3fa08786a7eb321e3729959742d3 + input_fingerprint: 79740f5bc04db4f48634809d9f019dc563075cb240b177f59220c0c846d8225a template_sources: - lib/gem/version.rb.example mise.toml: recipe: template_source_application_mise_toml action: write dest_sha256: 7d267154ca4f081b0ac7da804c0180c2b091aec5f1c877417c1c320f4f369c88 - input_fingerprint: 0d8263dd25336ce195d1bbacdac755ce834f3247c7ead720ef21c07ac554b482 + input_fingerprint: 9d17c0ed8e02d5466f006e50719b6d5b0164269fbafb338da80203d0b0f36c6a template_sources: - mise.toml.no-osc.example sig/binary/merge.rbs: recipe: template_source_application_sig_binary_merge_rbs action: write dest_sha256: 5e6cc9dfc65e7a7c7ae5c3dea1498caaf29264f68fc17fabd1142759677d8354 - input_fingerprint: ed8aa8981665356ad45dc5ca0781f2e9a1b1213824ae30b8b4b39c68f6fa0b7f + input_fingerprint: f4960a228e80ed1a79c2aa698d2ebb0a5b7614974ac85b7c7c88c40e69a57f8a template_sources: - sig/gem.rbs.example spec/spec_helper.rb: recipe: template_source_application_spec_spec_helper_rb action: write dest_sha256: d7fb51b57609a1cb8e1696ee7e456384968e3603bfc9c28639b39b5ee46efcff - input_fingerprint: d9c537ae4fe12d07133412ca0dae16c65ad123795e891421d44148f4a82f0b2a + input_fingerprint: 3f1e37a790e5768409ca70fd506da9ebc655989e916b35fd14b8b8a5063e419b template_sources: - spec/spec_helper.rb.example diff --git a/gems/binary-merge/Gemfile b/gems/binary-merge/Gemfile index 52d8c1cf6..649f3f63e 100644 --- a/gems/binary-merge/Gemfile +++ b/gems/binary-merge/Gemfile @@ -19,7 +19,7 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } # Include dependencies from binary-merge.gemspec gemspec -gem 'kettle-family', '~> 1.2', '>= 1.2.97' +gem 'kettle-family', '~> 1.2', '>= 1.2.100' # Local workspace dependency wiring for *_local.gemfile overrides gem 'nomono', '~> 1.1', '>= 1.1.5', require: false # ruby >= 3.2.0 diff --git a/gems/binary-merge/Gemfile.lock b/gems/binary-merge/Gemfile.lock index 7ae72513c..8d8376f54 100644 --- a/gems/binary-merge/Gemfile.lock +++ b/gems/binary-merge/Gemfile.lock @@ -10,123 +10,123 @@ GIT PATH remote: . specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + binary-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) + ast-crispr-markdown-markly (7.1.9) + ast-crispr (= 7.1.9) + markdown-merge (= 7.1.9) + markly-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism specs: - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) + ast-crispr-ruby-prism (7.1.9) + ast-crispr (= 7.1.9) + prism-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) + ast-crispr (7.1.9) + ast-merge (= 7.1.9) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ast-merge-git (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: - ast-merge (7.1.8) + ast-merge (7.1.9) benchmark token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) + ast-template (7.1.9) + ast-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + bash-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) + citrus-toml-merge (7.1.9) + ast-merge (= 7.1.9) + toml-merge (= 7.1.9) toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge specs: - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) commonmarker (~> 2.2) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) + dotenv-merge (7.1.9) + ast-merge (= 7.1.9) + plain-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + go-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + html-merge (7.1.9) + ast-crispr (= 7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + json-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: - kettle-jem (7.1.25) + kettle-jem (7.1.26) addressable (>= 2.8, < 3) ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) @@ -160,122 +160,122 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge specs: - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown (~> 2.5) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + markdown-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) + markly-merge (7.1.9) + markdown-merge (= 7.1.9) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge specs: - parslet-toml-merge (7.1.8) + parslet-toml-merge (7.1.9) toml (~> 0.3) - toml-merge (= 7.1.8) + toml-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + plain-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) + prism-merge (7.1.9) + ast-merge (= 7.1.9) prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + psych-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) + yaml-merge (= 7.1.9) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) + rbs-merge (7.1.9) + ast-merge (= 7.1.9) rbs (>= 3.10) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + rust-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) + smorg-rb (7.1.9) + ast-merge (= 7.1.9) + ast-merge-git (= 7.1.9) + bash-merge (= 7.1.9) diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) + dotenv-merge (= 7.1.9) + go-merge (= 7.1.9) + html-merge (= 7.1.9) + json-merge (= 7.1.9) kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) + markdown-merge (= 7.1.9) + plain-merge (= 7.1.9) + prism-merge (= 7.1.9) + psych-merge (= 7.1.9) + rbs-merge (= 7.1.9) + rust-merge (= 7.1.9) + toml-merge (= 7.1.9) + typescript-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + toml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: - tree_haver (7.1.8) + tree_haver (7.1.9) citrus (~> 3.0) parslet (~> 2.0) tree_sitter_language_pack (>= 1.16.2, < 2.0) @@ -284,25 +284,25 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + typescript-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + yaml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) + zip-merge (7.1.9) + binary-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) GEM @@ -336,6 +336,8 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) + commonmarker (2.10.0) + rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -465,11 +467,15 @@ GEM lint_roller (1.1.0) logger (1.7.0) markly (0.19.0) + mini_portile2 (2.8.9) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) reline (~> 0.6) mutex_m (0.3.0) + nokogiri (1.19.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-musl) @@ -503,6 +509,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) + rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -696,13 +705,16 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.16.2-aarch64-linux) + tree_sitter_language_pack (1.17.0) + rb_sys (>= 0.9.130, < 0.10) + sorbet-runtime (~> 0.5) + tree_sitter_language_pack (1.17.0-aarch64-linux) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-arm64-darwin) + tree_sitter_language_pack (1.17.0-arm64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-linux) + tree_sitter_language_pack (1.17.0-x86_64-linux) sorbet-runtime (~> 0.5) tsort (0.2.0) tty-cursor (0.7.1) @@ -784,9 +796,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.31) + kettle-dev (~> 3.0, >= 3.0.34) kettle-drift (~> 1.0, >= 1.0.13) - kettle-family (~> 1.2, >= 1.2.97) + kettle-family (~> 1.2, >= 1.2.100) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) @@ -807,12 +819,12 @@ DEPENDENCIES reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) - rubocop-lts (~> 24.2, >= 24.2.1) - rubocop-lts-rspec (~> 1.0, >= 1.0.5) + rubocop-lts (~> 24.2, >= 24.2.3) + rubocop-lts-rspec (~> 1.0, >= 1.0.6) rubocop-minitest (~> 0.40, >= 0.40.0) rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! - rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) ruby-merge! ruby-progressbar (~> 1.13) rust-merge! @@ -843,33 +855,34 @@ CHECKSUMS appraisal2 (3.2.3) sha256=3a6cfaf8a444e02707b9a34154af1c4902fbe99d9d2168d7e81dd83ec77e6db7 appraisal2-rubocop (1.0.2) sha256=1dae97c1be087cf9c098a3a72fd41f873435e9b8b39687e633b36c9ccb22bff4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.8) - ast-crispr-markdown-markly (7.1.8) - ast-crispr-ruby-prism (7.1.8) - ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) + ast-crispr (7.1.9) + ast-crispr-markdown-markly (7.1.9) + ast-crispr-ruby-prism (7.1.9) + ast-merge (7.1.9) + ast-merge-git (7.1.9) + ast-template (7.1.9) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.8) + bash-merge (7.1.9) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) - bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae + binary-merge (7.1.9) + bundler (4.1.0.beta1) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.8) + citrus-toml-merge (7.1.9) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 + commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e commonmarker (2.10.0-x86_64-darwin) sha256=01e0830ed0319825ecdc16411c90acd3f661d1568dfc178731b3f64d0ce2363d commonmarker (2.10.0-x86_64-linux) sha256=945c510c0bfca9022245928e2248468fe3ddad58c939be0c37b20082cc392880 commonmarker (2.10.0-x86_64-linux-musl) sha256=288cd4fb9f17eed2ffa73551ef241dcf594e0f484b2aee2a0999540333c0618e - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) completely (0.8.0) sha256=e493cd5d84805f47917a41f277ecbfe5f35363bed670be5a957d3acaed8c6c5e concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 @@ -878,7 +891,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docopt_ng (0.7.1) sha256=a024148ee4fa3ab1a8a04411aa4370f39cf2b446e63562097d418b7974a15667 - dotenv-merge (7.1.8) + dotenv-merge (7.1.9) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -891,35 +904,37 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) + go-merge (7.1.9) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) + html-merge (7.1.9) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a - json-merge (7.1.8) - kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + json-merge (7.1.9) + kettle-changelog (1.0.7) + kettle-dev (3.0.34) + kettle-drift (1.0.13) kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 - kettle-jem (7.1.25) + kettle-jem (7.1.26) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 - kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd + kettle-soup-cover (3.0.10) kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 - markdown-merge (7.1.8) + markdown-merge (7.1.9) markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca - markly-merge (7.1.8) + markly-merge (7.1.9) + mini_portile2 (2.8.9) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 + nokogiri (1.19.4) nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af nokogiri (1.19.4-arm64-darwin) sha256=a46db9853286e6597b36ebc6953817d15acf3a299583eb3f89fdc6f91dd63527 @@ -933,20 +948,22 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) - plain-merge (7.1.8) + parslet-toml-merge (7.1.9) + plain-merge (7.1.9) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.8) + prism-merge (7.1.9) psych (5.5.0) sha256=4b245bbbd0f3238df8ccee766ebc1a6b062b10e4ee1d3284eb588739ba156a0a - psych-merge (7.1.8) + psych-merge (7.1.9) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 - rbs-merge (7.1.8) + rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -982,11 +999,11 @@ CHECKSUMS rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.8) + ruby-merge (7.1.9) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) + rust-merge (7.1.9) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +1011,7 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) + smorg-rb (7.1.9) sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1011,24 +1028,25 @@ CHECKSUMS timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.8) + toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb - tree_haver (7.1.8) - tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 - tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 - tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 - tree_sitter_language_pack (1.16.2-x86_64-linux) sha256=d8151e6e44e35ace9de3611c76b730896beab17f427db06d8f76666332a5dc60 + tree_haver (7.1.9) + tree_sitter_language_pack (1.17.0) + tree_sitter_language_pack (1.17.0-aarch64-linux) + tree_sitter_language_pack (1.17.0-arm64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-linux) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f tty-cursor (0.7.1) sha256=79534185e6a777888d88628b14b6a1fdf5154a603f285f80b1753e1908e0bf48 tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) + typescript-merge (7.1.9) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 yaml-converter (0.2.5) sha256=a5214fe1a6c2df88bd34a35bcded1b1dcd30135548130df2e03b54ca8c0f2423 - yaml-merge (7.1.8) + yaml-merge (7.1.9) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.8) sha256=73d935d43e3479d65ce8aff25c7d3100e8bb83528a2adaa0ed824e5046ac99e7 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -1037,8 +1055,8 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) + zip-merge (7.1.9) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH - 4.0.20 + 4.1.0.beta1 diff --git a/gems/binary-merge/Rakefile b/gems/binary-merge/Rakefile index 6f44db49e..ada62b801 100644 --- a/gems/binary-merge/Rakefile +++ b/gems/binary-merge/Rakefile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -# binary-merge Rakefile v7.1.18 - 2026-09-07 +# binary-merge Rakefile v7.1.26 - 2026-09-09 # Ruby 2.3 (Safe Navigation) or higher required # # See LICENSE.md for license information. diff --git a/gems/binary-merge/bin/rubocop-gradual b/gems/binary-merge/bin/rubocop-gradual new file mode 100755 index 000000000..7c7ff0635 --- /dev/null +++ b/gems/binary-merge/bin/rubocop-gradual @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'rubocop-gradual' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'rubygems' +require 'bundler/setup' + +load Gem.bin_path('rubocop-gradual', 'rubocop-gradual') diff --git a/gems/binary-merge/binary-merge.gemspec b/gems/binary-merge/binary-merge.gemspec index b9a8238fa..64c97dac4 100644 --- a/gems/binary-merge/binary-merge.gemspec +++ b/gems/binary-merge/binary-merge.gemspec @@ -120,7 +120,7 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.31') # ruby >= 4.0.0 + spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.34') # ruby >= 4.0.0 # Security spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 diff --git a/gems/binary-merge/gemfiles/modular/coverage_local.gemfile b/gems/binary-merge/gemfiles/modular/coverage_local.gemfile index 37917caac..d6c890e46 100644 --- a/gems/binary-merge/gemfiles/modular/coverage_local.gemfile +++ b/gems/binary-merge/gemfiles/modular/coverage_local.gemfile @@ -29,11 +29,31 @@ Kernel.send(:gem, 'nomono', *nomono_activation_requirements) require 'nomono/bundler' local_gems = %w[kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -local_gems_to_eval = local_gems - %w[] - declared_gems # export KETTLE_DEV_DEV=/path/to/my platform :mri do + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + local_gems_to_eval = local_gems - %w[] - declared_gems + eval_nomono_gems( gems: local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/binary-merge/gemfiles/modular/style.gemfile b/gems/binary-merge/gemfiles/modular/style.gemfile index 59c5dc1a3..41ec99454 100644 --- a/gems/binary-merge/gemfiles/modular/style.gemfile +++ b/gems/binary-merge/gemfiles/modular/style.gemfile @@ -24,9 +24,9 @@ platform :mri do if ENV.fetch('RUBOCOP_LTS_DEV', 'false').casecmp('false').zero? declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) - gem 'rubocop-lts', '~> 24.2', '>= 24.2.1' unless declared_gems.include?('rubocop-lts') - gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.5' unless declared_gems.include?('rubocop-lts-rspec') - gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.6' unless declared_gems.include?('rubocop-ruby3_2') + gem 'rubocop-lts', '~> 24.2', '>= 24.2.3' unless declared_gems.include?('rubocop-lts') + gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.6' unless declared_gems.include?('rubocop-lts-rspec') + gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.8' unless declared_gems.include?('rubocop-ruby3_2') else eval_gemfile('style_local.gemfile') end diff --git a/gems/binary-merge/gemfiles/modular/templating.gemfile b/gems/binary-merge/gemfiles/modular/templating.gemfile index 6af159bd7..ce51a08ed 100644 --- a/gems/binary-merge/gemfiles/modular/templating.gemfile +++ b/gems/binary-merge/gemfiles/modular/templating.gemfile @@ -18,7 +18,7 @@ end if structuredmerge_remote # Merge recipes for released installs. - gem 'kettle-jem', '>= 7.0' + gem 'kettle-jem', '~> 7.1', '>= 7.1.26' end if kettle_remote diff --git a/gems/binary-merge/gemfiles/modular/templating_local.gemfile b/gems/binary-merge/gemfiles/modular/templating_local.gemfile index c05516ac2..a5cf125fc 100644 --- a/gems/binary-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/binary-merge/gemfiles/modular/templating_local.gemfile @@ -65,9 +65,7 @@ structuredmerge_local_gems = %w[ kettle_dev_local_gems = %w[ kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift ] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[] -kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - (declared_gems - %w[kettle-dev]) if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( @@ -81,6 +79,28 @@ if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 end if ENV.fetch('KETTLE_DEV_DEV', 'false').casecmp('false') != 0 + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - declared_gems + eval_nomono_gems( gems: kettle_dev_local_gems_to_eval, prefix: 'KETTLE_DEV', From a89a27d81069aae4031795d828eaa9193be690c3 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 23:54:26 -0400 Subject: [PATCH 092/137] =?UTF-8?q?=F0=9F=8E=A8=20Template=20prism-merge?= =?UTF-8?q?=20by=20kettle-family?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/prism-merge/.kettle-drift.lock | 76 ++++- gems/prism-merge/.rubocop_gradual.lock | 7 +- .../.structuredmerge/kettle-jem.lock | 145 ++++---- gems/prism-merge/Gemfile | 2 +- gems/prism-merge/Gemfile.lock | 320 +++++++++--------- gems/prism-merge/Rakefile | 2 +- gems/prism-merge/bin/rubocop-gradual | 16 + .../gemfiles/modular/coverage_local.gemfile | 24 +- .../gemfiles/modular/style.gemfile | 6 +- .../gemfiles/modular/templating.gemfile | 2 +- .../gemfiles/modular/templating_local.gemfile | 24 +- gems/prism-merge/prism-merge.gemspec | 2 +- 12 files changed, 388 insertions(+), 238 deletions(-) create mode 100755 gems/prism-merge/bin/rubocop-gradual diff --git a/gems/prism-merge/.kettle-drift.lock b/gems/prism-merge/.kettle-drift.lock index 98b009e1e..1b23f4793 100644 --- a/gems/prism-merge/.kettle-drift.lock +++ b/gems/prism-merge/.kettle-drift.lock @@ -1,10 +1,82 @@ { + "debug_env: 'KETTLE_DEV_DEBUG',\nroot: %w[src my kettle-dev]": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 46, + 63 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 93, + 110 + ] + } + ], + "path_env: 'KETTLE_DEV_DEV',\nvendored_gems_env: 'VENDORED_GEMS',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 43, + 60 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 90, + 107 + ] + } + ], + "prefix: 'KETTLE_DEV',\npath_env: 'KETTLE_DEV_DEV',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 42, + 59 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 89, + 106 + ] + } + ], + "vendor_gem_dir_env: 'VENDOR_GEM_DIR',\ndebug_env: 'KETTLE_DEV_DEBUG',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 45, + 62 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 92, + 109 + ] + } + ], "vendored_gems_env: 'VENDORED_GEMS',\nvendor_gem_dir_env: 'VENDOR_GEM_DIR',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 44, + 61 + ] + }, { "file": "gemfiles/modular/templating_local.gemfile", "lines": [ - 77, - 88 + 75, + 91, + 108 ] } ] diff --git a/gems/prism-merge/.rubocop_gradual.lock b/gems/prism-merge/.rubocop_gradual.lock index ee80f1f68..f4d822b3c 100644 --- a/gems/prism-merge/.rubocop_gradual.lock +++ b/gems/prism-merge/.rubocop_gradual.lock @@ -2,7 +2,7 @@ ".simplecov:4237457061": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] ], - "Rakefile:4038761437": [ + "Rakefile:2299597662": [ [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], [81, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], [165, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], @@ -22,6 +22,9 @@ [1, 1, 0, "Naming/FileName: The name of this source file (`vHEAD.gemfile`) should use snake_case.", 5381], [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], + "gemfiles/modular/coverage_local.gemfile:2813372128": [ + [34, 1, 1586, "Metrics/BlockLength: Block has too many lines. [37/25]", 820328175] + ], "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], @@ -627,7 +630,7 @@ [422, 7, 755, "Metrics/MethodLength: Method has too many lines. [14/10]", 3130034424], [452, 7, 850, "Metrics/AbcSize: Assignment Branch Condition size for `runtime_line_numbers_for` is too high. [<6, 26, 6> 27.35/17]", 966446340] ], - "prism-merge.gemspec:2975110287": [ + "prism-merge.gemspec:349653066": [ [139, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4147388508], [150, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], [151, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] diff --git a/gems/prism-merge/.structuredmerge/kettle-jem.lock b/gems/prism-merge/.structuredmerge/kettle-jem.lock index 3ba0ce793..bccc7c802 100644 --- a/gems/prism-merge/.structuredmerge/kettle-jem.lock +++ b/gems/prism-merge/.structuredmerge/kettle-jem.lock @@ -1,11 +1,12 @@ --- version: 1 template_state: - version: 7.1.18 - applied_at: '2026-09-07' + version: 7.1.26 + applied_at: '2026-09-10' changelog_replay: last_entry_key: kettle-jem-template-20260802-001 last_entry_date: '2026-08-02' + maintenance_changelog: {} checksums: ".aiignore.example": 48a5dfdd93afd1a15fdce39cc28ca9920263f00018b0968ab031fa744521e5ce ".config/mise/env.sh": aeea5a2ab489ba6e5467ae8de6e386ec8c8fe4ff31a044e69d0cd6a092dd6654 @@ -75,7 +76,7 @@ template_state: ".rubocop_rspec.yml.example": 288ad75e7eb14d87d80fafe6f7272217be5c57547536ee56c780a7d10ac7ec74 ".simplecov.example": 222f2e6ce8cf089c70a21f0f5e5423d4bd59a96fdb2ce7754b0fb3d6f430c229 ".structuredmerge/git-drivers.toml.example": 9d241a44c9edffcdbd3da018fa188a238089c3d1635040924df594a6929a4f97 - ".structuredmerge/kettle-jem.yml.example": 26949dc4ee0722415e72452cbc186bee6ef7b154eae33166d36f3fdb1ca6e46d + ".structuredmerge/kettle-jem.yml.example": ff65a738da1af7d60714026a81d3323a46c864e96ae3570b806afdf6e7149ff9 ".yard-lint.yml.example": 90def46867c9436b4e177c47d91fc8165f4602e335715aecc39f5587ae20b55b ".yardignore.example": 821f453c609df7d46145d675424b39dfbe6dfdca8edac5f367b85fff48502455 ".yardopts.example": 6fd6f2701713096a8a9ea095c213bbc68eeef37797c4754d97837e3229a3a5f6 @@ -88,7 +89,7 @@ template_state: CHANGELOG.transfer.md: 21331d8a9e58b4ff6e088b88eb408bcccb0f2f64e78f8f4d42ac3f11a24baad8 CITATION.cff.example: e404ea0a7919d78a83d53d80e211d17b9663576aa606583b709795dc023fd75c CODE_OF_CONDUCT.md.example: f1ad532f1860f73ef774c6b27a26d41f4bc1cb8813034f5957487766ebb0986b - CONTRIBUTING.md.example: 22570cfb3dde72be79b4b522b6d5ab13f95d778e40444483a096871fe0891b19 + CONTRIBUTING.md.example: 8d23cce2d061e0c20d619c3f66591df5f32821cd84c32d171df0b8ebe1217a55 FUNDING.md.example: 392d047904b1557b29f4b43d37ec403b7480edd5b6ab51180be979b57a91e6ba FUNDING.md.no-osc.example: 3ef0258dd3e3b7f7e17e8bc2d20dcbcb3e74aa5a5a6f51297075696645e34c77 Gemfile.example: 99500023987e81775a9b5ef14e92cb3992f2ac408e5f42454f2728eee9b49fb2 @@ -99,19 +100,19 @@ template_state: PolyForm-Small-Business-1.0.0.md.example: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 README.md.example: 21f491e3d73bfc1b74056a6dcba61f72c93dee3cfe5272ac164a20978454de21 REEK: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - RUBOCOP.md.example: c09e5533ccc59b70a2efa05c99f66e521137c1053d3c12eb43509cebd5b68b0e + RUBOCOP.md.example: d99871a0e4c1d323c92e7febf328f062bb4722069b2abfd0a83bf7daa8dcbf8c Rakefile.example: 569803e726b07ea26267fec6891367a3096a0dff3c266269a7081d36afe496af SECURITY.md.example: ee9411aa85f36d88363fdaea7a1baea4362b6ec112cf2688e711b05de1d3144c bin/setup.example: 0ac35089c95a91d8973fe7a318bf9fd98b9f8e00db92c5d9ca6cd858abb8d41b certs/pboling.pem.example: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - gem.gemspec.example: 83e834e8958a88e4817a57199f48f5ebb245548ce251c5c47372208693f03b17 + gem.gemspec.example: 12dcadc0b297ccd4e18b9d1e538b98ac8330ef9fb2a059ed6754ad59272b77fa gemfiles/modular/benchmark/r4/v0.5.gemfile.example: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 gemfiles/modular/benchmark/vHEAD.gemfile.example: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 gemfiles/modular/cgi/r4/v0.5.gemfile.example: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 gemfiles/modular/cgi/vHEAD.gemfile.example: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 gemfiles/modular/changelog.gemfile.example: 892598e0e7792eb205247ae28128cef6dfc647d2fb33968969152230d6f69288 gemfiles/modular/coverage.gemfile.example: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - gemfiles/modular/coverage_local.gemfile.example: 928d5f260d7b119c038baa56da9fb78dd524dee613aea33ab72894bbce5c506e + gemfiles/modular/coverage_local.gemfile.example: 92ea0d7a9d693553dc614afa2c43990f5c3778c2b00ef6c528e122c31bd506a1 gemfiles/modular/debug.gemfile.example: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 gemfiles/modular/documentation.gemfile.example: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c gemfiles/modular/documentation_local.gemfile.example: 84a20f5d4b0feb94c2cf2f7a8dce8f682f1483498e41484c2b447a5661fd1870 @@ -145,10 +146,10 @@ template_state: gemfiles/modular/stringio/r3/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/r4/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/vHEAD.gemfile.example: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - gemfiles/modular/style.gemfile.example: 3ad0585b4f2db8918580ca41ea8723f7a166d7a83cfd7f9613511094997106fd + gemfiles/modular/style.gemfile.example: 02fe3e8fd00e49b90c3ab30e19b51014ee50490f3eadcfd1d4a39f4c2c997dda gemfiles/modular/style_local.gemfile.example: c86beb711e766126a5be68be4be18255831625ac3650d5069383c4a83a9511f3 - gemfiles/modular/templating.gemfile.example: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - gemfiles/modular/templating_local.gemfile.example: 930057d3b909a72e39a39125c4e883a7ff71f5691e64426c0541f8c8fc75b83f + gemfiles/modular/templating.gemfile.example: 2b33c094677b53ad9dd2eafeb3a3be452f612380c61001a2e75b3c078b8ff72a + gemfiles/modular/templating_local.gemfile.example: ac7259516e69ffafb8b9342a897ddf6042adc46335743f474c342509cefd8f2e gemfiles/modular/webrick/r4/v1.9.gemfile.example: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea gemfiles/modular/webrick/vHEAD.gemfile.example: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b gemfiles/modular/x_std_libs.gemfile.example: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a @@ -175,7 +176,7 @@ template_state: shim/Gemfile.example: 0fb0d9d06fcfb1fd6ca6f0eeb5867253ca1ed221e03d28027719225f868b0637 shim/README.md.example: 3a2f7211b7f92a1dfae5e523b8e34b051a3d8af942144b05286eca0b3c8f6fbe shim/Rakefile.example: 572c94da7052083b39b62a6600785419e314a109efd7a3d8c3a96eb77ad34fd1 - shim/gem.gemspec.example: efae033238e4fd1355cfc134f5c9123f175d1ad1dc4a1a2e663899788c9e0870 + shim/gem.gemspec.example: 14a7015b3328005d1c3b5fda6886bd6da383707745f6eaaa781d6f9689600131 shim/lib/compat_require.rb.example: 94ee85e353a3ca08c8a35c9063d4ff789214ea594c7f803f6cf09d7142f48379 shim/lib/entrypoint.rb.example: dd57613520daca01d6f6bcaa9b83b00ff74505240dc04b84ceb686df3c0539d7 shim/lib/version.rb.example: 15e219ac3a928b5580035f891e415551213175020f1131f6e7ca0ccd55a1b2d6 @@ -189,370 +190,370 @@ files: recipe: template_source_application_simplecov action: write dest_sha256: b19d79fd2e8d972dbc822f5373f40a43ad08548611cacf1a9efc0066fc45206d - input_fingerprint: eb71d99f41059239c04fe9e1338685bb6baf899d5352ebd643311b6529a124bd + input_fingerprint: 8454ce5e496ddee6639f460969d2ae87c8196b8d2697fcc2231e6f51e2556a39 template_sources: - ".simplecov.example" AGPL-3.0-only.md: recipe: template_source_application_AGPL_3_0_only_md action: write dest_sha256: d8a6cc31abc16b6748c7a21f21611f5a1ec33f67d22ca23d7da1c19b95496bee - input_fingerprint: a36155acdc5ff70972fedd481359a18166fd545a8a3b4985879b367a22704605 + input_fingerprint: 8cf6e1b73ef51437755fbc7559f42c98ab126d424ba990806bf9e418817bdffd template_sources: - AGPL-3.0-only.md.example Gemfile: recipe: template_source_application_Gemfile action: write - dest_sha256: 58bd16b3b0b19ae02fc170b8cc14ef016647aca218b08031c1a1e4d4f33df111 - input_fingerprint: cbc73e25b756117daa6744d05d5510c9e3eef06534760678691ca001fe6b5333 + dest_sha256: 1e84467b4635f5a7afd540527c1cc79b51f061b94134926cb6350376763c040e + input_fingerprint: 1661f0934f9665dc0cff6394ddb301a30d0bcd89d0a9d90285887b268f1014de template_sources: - Gemfile.example LICENSE.md: recipe: template_source_application_LICENSE_md action: write dest_sha256: f6188bfd474a636d2a526420ebb411250faa447d94c9b9ccee097128ce4101b5 - input_fingerprint: 44ff6cf4252cbf4c0daa9a31ca0249a978cfd8e7893cdd707b66419d77003fa6 + input_fingerprint: 8dc0f9cdfd7faba0ce8614f22cbf123649f17c661abcf55b60f2dd68db936b76 template_sources: - LICENSE.md.example PolyForm-Small-Business-1.0.0.md: recipe: template_source_application_PolyForm_Small_Business_1_0_0_md action: write dest_sha256: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 - input_fingerprint: ef5bddfd3c587227f42378d7e252b54b8f2637fbe0e2d10ac31c7cebf7daa27e + input_fingerprint: 9f9ad5d7df0aa41c5c6bb03c5d80819270101105b601bc5e4e18360415a89a5d template_sources: - PolyForm-Small-Business-1.0.0.md.example README.md: recipe: template_source_application_README_md action: write dest_sha256: da146b911b250a330bb1ae59d6c21e5666d0c9607bfdfce21c523dba9e612abc - input_fingerprint: 79252074e2c3e574e37eeeb7ed344f414892e039536d43260a99f2d52da41f6e + input_fingerprint: c22fb7bd326670543280779380a97393a62f9fe922813ebbcf47802744604294 template_sources: - README.md.example Rakefile: recipe: template_source_application_Rakefile action: write - dest_sha256: ef1b852b4c9b6cf3ba1257cad74b00adac74128f7ac132dc2594a2589fb3feaa - input_fingerprint: 8380062c08739c9ca51fa85da46db19bbbcf4178fe65adad606826f7985ac194 + dest_sha256: b0594edd8bc2299cead18901310eeb8695869f06769d15a3695ea0e028c0fb11 + input_fingerprint: 892a4264a4b8841364495b829680b28453cccc56f3134e793fd621f7b59bfa28 template_sources: - Rakefile.example certs/pboling.pem: recipe: template_source_application_certs_pboling_pem action: write dest_sha256: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - input_fingerprint: 42c11dc05bb56c60fff6f1a10be4f470bc7e2e878e01b8edb4def3de4558c385 + input_fingerprint: 8c9f861d110ed5d52f57196aa886f1934abe2cd883c17425933d29550bd34d76 template_sources: - certs/pboling.pem.example gemfiles/modular/benchmark/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_r4_v0_5_gemfile action: write dest_sha256: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 - input_fingerprint: b9eae8f974b225950f538cfed802397d73028a3bf33ee3802d218aa895a52c10 + input_fingerprint: 32c3b5ffa92a60bf195df92f90c3b1cc85f8f9daa8c52ba88f94f41fc9752f2f template_sources: - gemfiles/modular/benchmark/r4/v0.5.gemfile.example gemfiles/modular/benchmark/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_vHEAD_gemfile action: write dest_sha256: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 - input_fingerprint: ed0528918cc7de34117cee981cc6ce86f7f08aacc3d63bc37d8342dc05d19dc9 + input_fingerprint: b32e6527bac3539684993a2184f4ea3866ca0d4ed0d7e9e22a311712d243f88b template_sources: - gemfiles/modular/benchmark/vHEAD.gemfile.example gemfiles/modular/cgi/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_cgi_r4_v0_5_gemfile action: write dest_sha256: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 - input_fingerprint: 6a45d92e718c3d18c158717ed41a9046d9ebbbb1f09635683248a48a8d4295cc + input_fingerprint: b7b473fe7140a07a8d8a90b82688345bece9bd2e4068e932c2bb4f045bdeb7fa template_sources: - gemfiles/modular/cgi/r4/v0.5.gemfile.example gemfiles/modular/cgi/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_cgi_vHEAD_gemfile action: write dest_sha256: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 - input_fingerprint: 64d8e4aebfdcf0ef2a57331c23702e67ff64924f3fbf1b5f3e3d674ea0e0cad7 + input_fingerprint: 15291096855e372b0cac1b6f4c71fbd059ed193422fa3d62d0bfebdd67602f74 template_sources: - gemfiles/modular/cgi/vHEAD.gemfile.example gemfiles/modular/changelog.gemfile: recipe: template_source_application_gemfiles_modular_changelog_gemfile action: write dest_sha256: da669526144fbff33aef207db9541b6fd6c254437f94dec2fab70fc55a7757cd - input_fingerprint: 55ca89f2fed55a0e85e01da6f47b3a59ad07246a252c9b968e08676e6ef5840e + input_fingerprint: 5c99218f046ebafc6b4fb9662b74ddde6f8e0b74e4d2307eed88aa913b4db637 template_sources: - gemfiles/modular/changelog.gemfile.example gemfiles/modular/coverage.gemfile: recipe: template_source_application_gemfiles_modular_coverage_gemfile action: write dest_sha256: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - input_fingerprint: 80a024728ebd12572ba95ba87e8055357173f0390a05ecfd0aa2ed686319d115 + input_fingerprint: 0ea1fc6a077055a381bfa302fd71ee1c4cbe7bea7ca888eb3f8a4b27a5fa4c90 template_sources: - gemfiles/modular/coverage.gemfile.example gemfiles/modular/coverage_local.gemfile: recipe: template_source_application_gemfiles_modular_coverage_local_gemfile action: write - dest_sha256: 2b493414df06261ba8acb6f0eb18bf3fdd701d7cb5f967a9d15a3f42a4741827 - input_fingerprint: 6d6b044de0a0c20d96e4ac75916c3492beff68761960111158f284d0c61333c8 + dest_sha256: 92c9a599c8f6867ec532880f73568f2736ac05d8973ec524b42fd5dbe6aeda3e + input_fingerprint: b425b0268bfc2822fd05de5eb4acc225f32b9e7c5597407431d8817ff6fd4f19 template_sources: - gemfiles/modular/coverage_local.gemfile.example gemfiles/modular/debug.gemfile: recipe: template_source_application_gemfiles_modular_debug_gemfile action: write dest_sha256: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 - input_fingerprint: 81844d51f031311709eaff3913521f052630ac69257f8a0421c444000aa40e08 + input_fingerprint: 90e590df8cd81735c9bd33aeb6020f45ec46e9e454dfa7ced0c29791194d9632 template_sources: - gemfiles/modular/debug.gemfile.example gemfiles/modular/documentation.gemfile: recipe: template_source_application_gemfiles_modular_documentation_gemfile action: write dest_sha256: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c - input_fingerprint: 4fb177cf79a304f2b6df519a8013b4ee46e11222540c0daa0f9360a715bb347a + input_fingerprint: 6b0c792cc8bc56a4360d9d34238fcff0d68352f038017e489793a60738aeed6f template_sources: - gemfiles/modular/documentation.gemfile.example gemfiles/modular/documentation_local.gemfile: recipe: template_source_application_gemfiles_modular_documentation_local_gemfile action: write dest_sha256: 2058173855b9a4acc6d5efa20520e49734243eef6cf0b5e9063e0e5866a08e9c - input_fingerprint: a71c61a36ce4346a973dab861c4ba037fe45246ffc95f984185e1d3a889c5540 + input_fingerprint: 8e45657867557b93d32258d971e6fb9b4fa9645e00a50f6223022beb05981a0e template_sources: - gemfiles/modular/documentation_local.gemfile.example gemfiles/modular/erb/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r2_v3_0_gemfile action: write dest_sha256: 3793e7dc9ef23a7ccd893d48cbba092fd27594c63e65cca011cc658218425670 - input_fingerprint: 143c31ed14110501ba1892e1d8549d94a1f8be2ac523c3b42d5584a17bd70ca7 + input_fingerprint: 57b770095b70ead05e4e9591a3115bbda1fd8c9a7a4dbe80d3c84cda03956713 template_sources: - gemfiles/modular/erb/r2/v3.0.gemfile.example gemfiles/modular/erb/r3/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r3_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 43d5004d344fb3db8b72a406b62e257e60a2c0cfd35ffec3d82e042687e9f381 + input_fingerprint: 63f7417e9174d7cff701f4812d1a9df7a0f3919b59e2893573392c752777f453 template_sources: - gemfiles/modular/erb/r3/v5.0.gemfile.example gemfiles/modular/erb/r4/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r4_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 0df50c39f7cf3b73397bd29c51eb0a632699d54f872e7a71ce96fe82602dcf18 + input_fingerprint: 4eea230995a17e43d25177766200e24bdf1b54476c238993bd792aceb8e12842 template_sources: - gemfiles/modular/erb/r4/v5.0.gemfile.example gemfiles/modular/erb/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_erb_vHEAD_gemfile action: write dest_sha256: ad6f104a49e80e0cf625440e3dc816343fe7e2f037fc4971df75e7bb4305c683 - input_fingerprint: 3934250e08ffc3263718300fd1736279e289b9fc546abc8b2970b152f3144d28 + input_fingerprint: 502cceb651a659edbbdabdf8cf26eb664de42affe808dc7829d3c53de093b910 template_sources: - gemfiles/modular/erb/vHEAD.gemfile.example gemfiles/modular/json/truffleruby_22_3.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_22_3_gemfile action: write dest_sha256: 249c12eacbe90f9d0d2e81e7a62c4c7e9102e504ededcda4ecf660cb3bb68be4 - input_fingerprint: f36aec1251090d3368a3df1bbaa1514dc84b5051b920bad4ec2294ca42c051d5 + input_fingerprint: 57dc4c56965093b16782691bdde4ee9a1213994f59481ad05f4a65ed8e9b79aa template_sources: - gemfiles/modular/json/truffleruby_22_3.gemfile.example gemfiles/modular/json/truffleruby_23_0.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_0_gemfile action: write dest_sha256: 66aa010567f7afa1af8244a74c3c88ecaaf84dc87b6a25180691bb480d02ed28 - input_fingerprint: 4789df5f73d963f9b2b60e0dd4da4e2e281fe71a6858f98d07051b2abdbb447d + input_fingerprint: e01488efb5ed56dc94ae675a07ebc36a6115bae846a6367ce3a9065a7c152c7f template_sources: - gemfiles/modular/json/truffleruby_23_0.gemfile.example gemfiles/modular/json/truffleruby_23_1.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_1_gemfile action: write dest_sha256: '080fcbdaf2bec73cad40832a3d51eebb380af789917b96f493d1460b0dd6361d' - input_fingerprint: e02d0b84b21a246cd8ac042bf99bce5f50e0e7adde0dbf235cbd85b2e0583f0a + input_fingerprint: c1a05f231d957980c89526f59c2f2d1a7e5e3ca063e7f81561bbc8e190a5a65d template_sources: - gemfiles/modular/json/truffleruby_23_1.gemfile.example gemfiles/modular/mutex_m/r2/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r2_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: a0d11c52563148884d91c1d1f0bafc09ddfd209686892a09880374e02d228aac + input_fingerprint: a2ce6383abcbcc7ed8833db6e24cab3276caaaec5fc2370f1a541a834df7b2bc template_sources: - gemfiles/modular/mutex_m/r2/v0.3.gemfile.example gemfiles/modular/mutex_m/r3/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r3_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 07e3df5ddf32c9a13756a649db6d00bc3a7f6ee79976584c0bf625da39282740 + input_fingerprint: c1b57b2d04932a900477b0d50b7fa3c2914bae5d4596daf94bc2adbadeee850c template_sources: - gemfiles/modular/mutex_m/r3/v0.3.gemfile.example gemfiles/modular/mutex_m/r4/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r4_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: ff749a728d4f1b987ec925ec4aae9cac57da60682db53d4769700b77c130e73e + input_fingerprint: 31f4a5fe49efa1fcbcbf13e915ab3cd3a0934c3da5a7747cb274775b4e9140df template_sources: - gemfiles/modular/mutex_m/r4/v0.3.gemfile.example gemfiles/modular/mutex_m/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_vHEAD_gemfile action: write dest_sha256: '08018641c97f894788fa91b462da504ab2237213d18d95404136c393274ae3cb' - input_fingerprint: e76d474bd3566a403a98e9b7cf2d7873ff1156e734c01a2f90de5e0a3f88f856 + input_fingerprint: ed744c97d9022122b11814a4a49e98a42a9c1e80a6ed189dc18d44d06f2f6faf template_sources: - gemfiles/modular/mutex_m/vHEAD.gemfile.example gemfiles/modular/optional.gemfile: recipe: template_source_application_gemfiles_modular_optional_gemfile action: write dest_sha256: f770e6e9a9dd2bd0f1f132e882d88038b2e21127dce3afe270908c7338c28bfd - input_fingerprint: 102ed65fd871875240cad2246bc5c9954bfe7af4fd65caea7f27ad5a8967ebb5 + input_fingerprint: a99dc327f6e3caca4efcc1ca03f46c4db64528e6d95b055ceeecd71677a8e870 template_sources: - gemfiles/modular/optional.gemfile.example gemfiles/modular/rspec.gemfile: recipe: template_source_application_gemfiles_modular_rspec_gemfile action: write dest_sha256: d043f5c9344f6435edb4607c5adaf42c78e7fb6b8b6726007de2bbedefb376c3 - input_fingerprint: 1d66f5de0857d542f9297a4fdd833939a5af3f8b276ad9d2f79e59c52b7de538 + input_fingerprint: 18c012791569b5a8f64e22c7203f803a8de76550bdbdf765c4617193db75eaf1 template_sources: - gemfiles/modular/rspec.gemfile.example gemfiles/modular/runtime_heads.gemfile: recipe: template_source_application_gemfiles_modular_runtime_heads_gemfile action: write dest_sha256: 6ac7158c4a3088190f2a9082f01439eb27eca2172ab3464b15c9cb045aa885e1 - input_fingerprint: c85fc34f3659f8bc3e1ab3f521a43a9be07c9b7e4c90cd57750024b647bb2e3c + input_fingerprint: 283a6d1d3a8e79c2834b81c56e10901117345ccfee6904a005673cd8f8ebb241 template_sources: - gemfiles/modular/runtime_heads.gemfile.example gemfiles/modular/stringio/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r2_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 5a456c071b3348f2ab0d34e095fc10184e7a55e2a3776ce82083e4793325196e + input_fingerprint: 86612d1642aec12d9c0d07b1cd270e448437b0c1fe6c946dbc7c31e5b6ab206c template_sources: - gemfiles/modular/stringio/r2/v3.0.gemfile.example gemfiles/modular/stringio/r3/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r3_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: f2bf916c9a6d19594ae26fa4bf812b95592d7118b6c027f0379a486fef56f0db + input_fingerprint: 956b6c1e4e22c439b6c96cb51e7eac1a85ab54bc2278e3dbc46352711bd9578a template_sources: - gemfiles/modular/stringio/r3/v3.0.gemfile.example gemfiles/modular/stringio/r4/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r4_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 8ceb48d6033946288001a3bae5ef1cfe618c33a4db78a70cdf66956f68ab0ba7 + input_fingerprint: 275bb41e4845c43ee586e399b6591b06b3a4eadf3f9769195c3bf23621796837 template_sources: - gemfiles/modular/stringio/r4/v3.0.gemfile.example gemfiles/modular/stringio/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_stringio_vHEAD_gemfile action: write dest_sha256: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - input_fingerprint: c0fedcdb0bed20942b64c45c85246f2f37eb740eeee4b894801ba90e5f84259a + input_fingerprint: 33e34460272044eec84e7d0bdb48df5a9d23c3fa6a9ae608db49443a5cb50537 template_sources: - gemfiles/modular/stringio/vHEAD.gemfile.example gemfiles/modular/style.gemfile: recipe: template_source_application_gemfiles_modular_style_gemfile action: write - dest_sha256: 2a3d46dcb8a9394f595f273f5eb0403d0a552837754ab109afc9ba79a7159083 - input_fingerprint: 6af122d58bdcd77a5776b22f84f70dff541d76e3a8b4f00801a05ddd82ca4765 + dest_sha256: 9a24acff0054573c30f5d84d0418cd465ba3794d075bb5a36801410ac40e0787 + input_fingerprint: '06993a263621cb7801e912ce4e135bc17db6667965935c008571a71236add761' template_sources: - gemfiles/modular/style.gemfile.example gemfiles/modular/style_local.gemfile: recipe: template_source_application_gemfiles_modular_style_local_gemfile action: write dest_sha256: 55eb9c149cdb2f29c9f31abe2d55a4f334e00fb859681dd17c42149a3f28ca36 - input_fingerprint: ec477d80dad8a4832f90a6615bce6b7a532058a7f0c6ee4815ea9b59c6f4afbe + input_fingerprint: fa3a8e2a1a3d7b218420d5740b28792b7e9d893394d8eddd7c1c56fab67fc785 template_sources: - gemfiles/modular/style_local.gemfile.example gemfiles/modular/templating.gemfile: recipe: template_source_application_gemfiles_modular_templating_gemfile action: write - dest_sha256: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - input_fingerprint: a7f40c720a40c78e6def4fd9a5234f81e37447e2bc67859fedf3a415917134c3 + dest_sha256: 432ba59798d31b899268257c432443a017c5a9bd2c0c7f9f2216617e14150cd3 + input_fingerprint: a4a149a2116f912ba84ddc9b293fc8d1b448d09bb7de92bf0538aa62d14fce27 template_sources: - gemfiles/modular/templating.gemfile.example gemfiles/modular/templating_local.gemfile: recipe: template_source_application_gemfiles_modular_templating_local_gemfile action: write - dest_sha256: 50a8af674167f90526b86c6533a876f019187c2e323f4f6dac5e165ae130a24d - input_fingerprint: 6ec0f7ed0b8a124fc0bb637e01754f5779f2afcd91418e258a42a7f1330202b6 + dest_sha256: 713a2483414579fd496b887f3bf746156b8861aac8bed449bd59ea3bdc89b82b + input_fingerprint: 3710cf450c672790bd29004f8ce9941b3dae1178ad3e9db70e714d4c6b562a8b template_sources: - gemfiles/modular/templating_local.gemfile.example gemfiles/modular/webrick/r4/v1.9.gemfile: recipe: template_source_application_gemfiles_modular_webrick_r4_v1_9_gemfile action: write dest_sha256: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea - input_fingerprint: cf7327960c26b8ee53e8068d7c376dea5237a250134eb363748570cc86fc9124 + input_fingerprint: 3044cc4b8086db2185965befa256af09971bdd629396e1a4782acb0af83d0f27 template_sources: - gemfiles/modular/webrick/r4/v1.9.gemfile.example gemfiles/modular/webrick/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_webrick_vHEAD_gemfile action: write dest_sha256: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b - input_fingerprint: 41c7572a8b803cef04a7fba3741ed2ccf2ff255be9943338fef777828e1177c4 + input_fingerprint: 4fc8344b7e464eb364127096409df2cae71235455e786bb2572ff24b2e18c00f template_sources: - gemfiles/modular/webrick/vHEAD.gemfile.example gemfiles/modular/x_std_libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_gemfile action: write dest_sha256: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a - input_fingerprint: 385b090d3b9bc0228b361cb24f86b5ec9ba1d2c9ab69f4b67ec3e5b54876071c + input_fingerprint: 2d31b96dd8b60a5de12c3ddeafe1ec7cc2b3dd0d3894caa48c0b3d4df42fe95c template_sources: - gemfiles/modular/x_std_libs.gemfile.example gemfiles/modular/x_std_libs/r2/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r2_libs_gemfile action: write dest_sha256: e80ec8ad06cb1b31ac982bc25cf7696987fca131aa1001eaefd0bf5cd379c273 - input_fingerprint: 1b7cdeb186e0bb8832dfa7343a1d5e4d13ae82ebf25930ef5103a5bdfed9fa0f + input_fingerprint: 1e6906dc3b09043b36dda3db3492403f5181f25f7ea4e2b1b5f1b49abbd5948d template_sources: - gemfiles/modular/x_std_libs/r2/libs.gemfile.example gemfiles/modular/x_std_libs/r3.1/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_1_libs_gemfile action: write dest_sha256: 9f8565c40b09bea1bc4c2e2ad87fe11400c3c51a2b235655bfcd8e491ed88ca8 - input_fingerprint: a9ba3b11d8cf02d36128a11d35844699bc843229e8b4957d629dff154bbd5afe + input_fingerprint: 600463778dfa732a33496e2bc60d36a59a3023c77abaf7d8594c3e87e9c3bc44 template_sources: - gemfiles/modular/x_std_libs/r3.1/libs.gemfile.example gemfiles/modular/x_std_libs/r3/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_libs_gemfile action: write dest_sha256: 546f8849f4267bb19aa10ff0de40be30957197f229e6887847181ea9127b2650 - input_fingerprint: 11f73d320ff91ceb6d6157db1c5bfa37be7aba53916b704404f97e5b334397c4 + input_fingerprint: 10760440ef037ebbf214c7e8cc0cbace5b15372dbb6871cb2fc252613c55756c template_sources: - gemfiles/modular/x_std_libs/r3/libs.gemfile.example gemfiles/modular/x_std_libs/r4/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r4_libs_gemfile action: write dest_sha256: 8c2582eaa218d216b98c86c933465295c8b4e43f3251ea388b9eaf6e471f8da6 - input_fingerprint: 0507277adca8b3968de2a7b64ec0a78e226776e44ff7ab2cb5387f0156fd3b55 + input_fingerprint: ef85def058d89066f4dcc9765ede0f783c640ab06962ca2feb80c14b6f1686b4 template_sources: - gemfiles/modular/x_std_libs/r4/libs.gemfile.example gemfiles/modular/x_std_libs/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_vHEAD_gemfile action: write dest_sha256: d3133ec4c0638363a7fb025d19be7e95a615fd61c35ddb8d17f2280ee74a7486 - input_fingerprint: bb79a4f7b1f3cd50222a003e6990074e398e66379a06d30b1f44f7c575fe82eb + input_fingerprint: cba655bf87f917681c2528b6cb2f3f549ac69b171864c3d031eb659dc0af1b5a template_sources: - gemfiles/modular/x_std_libs/vHEAD.gemfile.example lib/prism/merge/version.rb: recipe: template_source_application_lib_prism_merge_version_rb action: write - dest_sha256: 6cdda16ae1fab448156fa5c9071a3804650ebaeb011d5c0d2acf6975dd237f6a - input_fingerprint: e20446ba08cbf2135ba700aec73749803ce140e67fb4a7a94a554d92730942a0 + dest_sha256: 0cc8f363af2ad8fdd1663b785f8495fcf5cc11c45084181b5b4fd5c75c3b3338 + input_fingerprint: df2864fa16d384276f03d278de874089159c140bd27dc80aedeeabdd5fdf8806 template_sources: - lib/gem/version.rb.example mise.toml: recipe: template_source_application_mise_toml action: write dest_sha256: 7d267154ca4f081b0ac7da804c0180c2b091aec5f1c877417c1c320f4f369c88 - input_fingerprint: b02e7b935a4f0c765b86d3184e68001b22da2e3877348a8af0261c125f0b1601 + input_fingerprint: fc49104ce86bfa9c31abfe906c617d963522a2081ad048517373f17ac48d8ac7 template_sources: - mise.toml.no-osc.example prism-merge.gemspec: recipe: template_source_application_prism_merge_gemspec action: write - dest_sha256: 532d01468e1c6cfec3076a09435e23a269321774d8c090420d223e19ef4a90b2 - input_fingerprint: ae0f0313cea67c582fd8062d6a1d0f0c7fa6b9e0e45335392e218937e52d529a + dest_sha256: 2c67e15a69516ba14ccccae2c790e25de3eb93a9d91dfbeddbcfb364c79120e7 + input_fingerprint: f8fb3b81cfe119f74459a5c1caffb043498085dee82fa983ba34cb7ed7d49383 template_sources: - gem.gemspec.example sig/prism/merge.rbs: recipe: template_source_application_sig_prism_merge_rbs action: write dest_sha256: 11c5a52bb45effa4b82188004b73f1888197e0dbe0db221d22489504f3277388 - input_fingerprint: dec6475f3963dfd42b09708e91bdefd44ee84fc92e9391eb9b9efb57a0c65b9b + input_fingerprint: 15e3eafe66feaeae06653132c7835c867728e2d1ae1f76d4c367e820aca1ddc6 template_sources: - sig/gem.rbs.example spec/spec_helper.rb: recipe: template_source_application_spec_spec_helper_rb action: write dest_sha256: f49f21456bc730a54941b86a15a6b965624fa7947e58b5abf21779ec53e6ff1d - input_fingerprint: 26361da117afd6c6b5905d27ff8e1f25c547e2425683d1f0d1153a5e61c74466 + input_fingerprint: 88627e937b07cc76b36917030fd471d3548e4ae2c20ed3fc76e00eaedcbc7d4c template_sources: - spec/spec_helper.rb.example diff --git a/gems/prism-merge/Gemfile b/gems/prism-merge/Gemfile index d0f42d8e8..ced628b20 100644 --- a/gems/prism-merge/Gemfile +++ b/gems/prism-merge/Gemfile @@ -19,7 +19,7 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } # Include dependencies from prism-merge.gemspec gemspec -gem 'kettle-family', '~> 1.2', '>= 1.2.97' +gem 'kettle-family', '~> 1.2', '>= 1.2.100' # Local workspace dependency wiring for *_local.gemfile overrides gem 'nomono', '~> 1.1', '>= 1.1.5', require: false # ruby >= 3.2.0 diff --git a/gems/prism-merge/Gemfile.lock b/gems/prism-merge/Gemfile.lock index 4fd7a88ce..2e7654fed 100644 --- a/gems/prism-merge/Gemfile.lock +++ b/gems/prism-merge/Gemfile.lock @@ -10,133 +10,133 @@ GIT PATH remote: . specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) + prism-merge (7.1.9) + ast-merge (= 7.1.9) prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) + ast-crispr-markdown-markly (7.1.9) + ast-crispr (= 7.1.9) + markdown-merge (= 7.1.9) + markly-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism specs: - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) + ast-crispr-ruby-prism (7.1.9) + ast-crispr (= 7.1.9) + prism-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) + ast-crispr (7.1.9) + ast-merge (= 7.1.9) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ast-merge-git (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: - ast-merge (7.1.8) + ast-merge (7.1.9) benchmark token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) + ast-template (7.1.9) + ast-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + bash-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + binary-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) + citrus-toml-merge (7.1.9) + ast-merge (= 7.1.9) + toml-merge (= 7.1.9) toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge specs: - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) commonmarker (~> 2.2) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) + dotenv-merge (7.1.9) + ast-merge (= 7.1.9) + plain-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + go-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + html-merge (7.1.9) + ast-crispr (= 7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + json-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: - kettle-jem (7.1.25) + kettle-jem (7.1.26) addressable (>= 2.8, < 3) ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) @@ -170,112 +170,112 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge specs: - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown (~> 2.5) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + markdown-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) + markly-merge (7.1.9) + markdown-merge (= 7.1.9) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge specs: - parslet-toml-merge (7.1.8) + parslet-toml-merge (7.1.9) toml (~> 0.3) - toml-merge (= 7.1.8) + toml-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + plain-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + psych-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) + yaml-merge (= 7.1.9) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) + rbs-merge (7.1.9) + ast-merge (= 7.1.9) rbs (>= 3.10) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + rust-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) + smorg-rb (7.1.9) + ast-merge (= 7.1.9) + ast-merge-git (= 7.1.9) + bash-merge (= 7.1.9) diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) + dotenv-merge (= 7.1.9) + go-merge (= 7.1.9) + html-merge (= 7.1.9) + json-merge (= 7.1.9) kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) + markdown-merge (= 7.1.9) + plain-merge (= 7.1.9) + prism-merge (= 7.1.9) + psych-merge (= 7.1.9) + rbs-merge (= 7.1.9) + rust-merge (= 7.1.9) + toml-merge (= 7.1.9) + typescript-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + toml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: - tree_haver (7.1.8) + tree_haver (7.1.9) citrus (~> 3.0) parslet (~> 2.0) tree_sitter_language_pack (>= 1.16.2, < 2.0) @@ -284,25 +284,25 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + typescript-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + yaml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) + zip-merge (7.1.9) + binary-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) GEM @@ -336,6 +336,8 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) + commonmarker (2.10.0) + rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -465,11 +467,15 @@ GEM lint_roller (1.1.0) logger (1.7.0) markly (0.19.0) + mini_portile2 (2.8.9) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) reline (~> 0.6) mutex_m (0.3.0) + nokogiri (1.19.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-musl) @@ -503,6 +509,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) + rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -696,13 +705,16 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.16.2-aarch64-linux) + tree_sitter_language_pack (1.17.0) + rb_sys (>= 0.9.130, < 0.10) + sorbet-runtime (~> 0.5) + tree_sitter_language_pack (1.17.0-aarch64-linux) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-arm64-darwin) + tree_sitter_language_pack (1.17.0-arm64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-linux) + tree_sitter_language_pack (1.17.0-x86_64-linux) sorbet-runtime (~> 0.5) tsort (0.2.0) tty-cursor (0.7.1) @@ -784,9 +796,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.31) + kettle-dev (~> 3.0, >= 3.0.34) kettle-drift (~> 1.0, >= 1.0.13) - kettle-family (~> 1.2, >= 1.2.97) + kettle-family (~> 1.2, >= 1.2.100) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) @@ -807,12 +819,12 @@ DEPENDENCIES reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) - rubocop-lts (~> 24.2, >= 24.2.1) - rubocop-lts-rspec (~> 1.0, >= 1.0.5) + rubocop-lts (~> 24.2, >= 24.2.3) + rubocop-lts-rspec (~> 1.0, >= 1.0.6) rubocop-minitest (~> 0.40, >= 0.40.0) rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! - rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) ruby-merge! ruby-progressbar (~> 1.13) rust-merge! @@ -843,33 +855,34 @@ CHECKSUMS appraisal2 (3.2.3) sha256=3a6cfaf8a444e02707b9a34154af1c4902fbe99d9d2168d7e81dd83ec77e6db7 appraisal2-rubocop (1.0.2) sha256=1dae97c1be087cf9c098a3a72fd41f873435e9b8b39687e633b36c9ccb22bff4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.8) - ast-crispr-markdown-markly (7.1.8) - ast-crispr-ruby-prism (7.1.8) - ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) + ast-crispr (7.1.9) + ast-crispr-markdown-markly (7.1.9) + ast-crispr-ruby-prism (7.1.9) + ast-merge (7.1.9) + ast-merge-git (7.1.9) + ast-template (7.1.9) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.8) + bash-merge (7.1.9) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) - bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae + binary-merge (7.1.9) + bundler (4.1.0.beta1) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.8) + citrus-toml-merge (7.1.9) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 + commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e commonmarker (2.10.0-x86_64-darwin) sha256=01e0830ed0319825ecdc16411c90acd3f661d1568dfc178731b3f64d0ce2363d commonmarker (2.10.0-x86_64-linux) sha256=945c510c0bfca9022245928e2248468fe3ddad58c939be0c37b20082cc392880 commonmarker (2.10.0-x86_64-linux-musl) sha256=288cd4fb9f17eed2ffa73551ef241dcf594e0f484b2aee2a0999540333c0618e - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) completely (0.8.0) sha256=e493cd5d84805f47917a41f277ecbfe5f35363bed670be5a957d3acaed8c6c5e concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 @@ -878,7 +891,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docopt_ng (0.7.1) sha256=a024148ee4fa3ab1a8a04411aa4370f39cf2b446e63562097d418b7974a15667 - dotenv-merge (7.1.8) + dotenv-merge (7.1.9) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -891,35 +904,37 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) + go-merge (7.1.9) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) + html-merge (7.1.9) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a - json-merge (7.1.8) - kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + json-merge (7.1.9) + kettle-changelog (1.0.7) + kettle-dev (3.0.34) + kettle-drift (1.0.13) kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 - kettle-jem (7.1.25) + kettle-jem (7.1.26) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 - kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd + kettle-soup-cover (3.0.10) kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 - markdown-merge (7.1.8) + markdown-merge (7.1.9) markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca - markly-merge (7.1.8) + markly-merge (7.1.9) + mini_portile2 (2.8.9) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 + nokogiri (1.19.4) nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af nokogiri (1.19.4-arm64-darwin) sha256=a46db9853286e6597b36ebc6953817d15acf3a299583eb3f89fdc6f91dd63527 @@ -933,20 +948,22 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) - plain-merge (7.1.8) + parslet-toml-merge (7.1.9) + plain-merge (7.1.9) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.8) + prism-merge (7.1.9) psych (5.5.0) sha256=4b245bbbd0f3238df8ccee766ebc1a6b062b10e4ee1d3284eb588739ba156a0a - psych-merge (7.1.8) + psych-merge (7.1.9) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 - rbs-merge (7.1.8) + rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -982,11 +999,11 @@ CHECKSUMS rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.8) + ruby-merge (7.1.9) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) + rust-merge (7.1.9) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +1011,7 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) + smorg-rb (7.1.9) sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,25 +1027,26 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.8) + toml (0.3.0) + toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb - tree_haver (7.1.8) - tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 - tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 - tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 - tree_sitter_language_pack (1.16.2-x86_64-linux) sha256=d8151e6e44e35ace9de3611c76b730896beab17f427db06d8f76666332a5dc60 + tree_haver (7.1.9) + tree_sitter_language_pack (1.17.0) + tree_sitter_language_pack (1.17.0-aarch64-linux) + tree_sitter_language_pack (1.17.0-arm64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-linux) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f tty-cursor (0.7.1) sha256=79534185e6a777888d88628b14b6a1fdf5154a603f285f80b1753e1908e0bf48 tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) + typescript-merge (7.1.9) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 yaml-converter (0.2.5) sha256=a5214fe1a6c2df88bd34a35bcded1b1dcd30135548130df2e03b54ca8c0f2423 - yaml-merge (7.1.8) + yaml-merge (7.1.9) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.8) sha256=73d935d43e3479d65ce8aff25c7d3100e8bb83528a2adaa0ed824e5046ac99e7 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -1037,8 +1055,8 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) + zip-merge (7.1.9) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH - 4.0.20 + 4.1.0.beta1 diff --git a/gems/prism-merge/Rakefile b/gems/prism-merge/Rakefile index 64b865150..9453e5623 100644 --- a/gems/prism-merge/Rakefile +++ b/gems/prism-merge/Rakefile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -# prism-merge Rakefile v7.1.18 - 2026-09-07 +# prism-merge Rakefile v7.1.26 - 2026-09-09 # Ruby 2.3 (Safe Navigation) or higher required # # See LICENSE.md for license information. diff --git a/gems/prism-merge/bin/rubocop-gradual b/gems/prism-merge/bin/rubocop-gradual new file mode 100755 index 000000000..7c7ff0635 --- /dev/null +++ b/gems/prism-merge/bin/rubocop-gradual @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'rubocop-gradual' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'rubygems' +require 'bundler/setup' + +load Gem.bin_path('rubocop-gradual', 'rubocop-gradual') diff --git a/gems/prism-merge/gemfiles/modular/coverage_local.gemfile b/gems/prism-merge/gemfiles/modular/coverage_local.gemfile index 37917caac..d6c890e46 100644 --- a/gems/prism-merge/gemfiles/modular/coverage_local.gemfile +++ b/gems/prism-merge/gemfiles/modular/coverage_local.gemfile @@ -29,11 +29,31 @@ Kernel.send(:gem, 'nomono', *nomono_activation_requirements) require 'nomono/bundler' local_gems = %w[kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -local_gems_to_eval = local_gems - %w[] - declared_gems # export KETTLE_DEV_DEV=/path/to/my platform :mri do + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + local_gems_to_eval = local_gems - %w[] - declared_gems + eval_nomono_gems( gems: local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/prism-merge/gemfiles/modular/style.gemfile b/gems/prism-merge/gemfiles/modular/style.gemfile index 59c5dc1a3..41ec99454 100644 --- a/gems/prism-merge/gemfiles/modular/style.gemfile +++ b/gems/prism-merge/gemfiles/modular/style.gemfile @@ -24,9 +24,9 @@ platform :mri do if ENV.fetch('RUBOCOP_LTS_DEV', 'false').casecmp('false').zero? declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) - gem 'rubocop-lts', '~> 24.2', '>= 24.2.1' unless declared_gems.include?('rubocop-lts') - gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.5' unless declared_gems.include?('rubocop-lts-rspec') - gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.6' unless declared_gems.include?('rubocop-ruby3_2') + gem 'rubocop-lts', '~> 24.2', '>= 24.2.3' unless declared_gems.include?('rubocop-lts') + gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.6' unless declared_gems.include?('rubocop-lts-rspec') + gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.8' unless declared_gems.include?('rubocop-ruby3_2') else eval_gemfile('style_local.gemfile') end diff --git a/gems/prism-merge/gemfiles/modular/templating.gemfile b/gems/prism-merge/gemfiles/modular/templating.gemfile index 6af159bd7..ce51a08ed 100644 --- a/gems/prism-merge/gemfiles/modular/templating.gemfile +++ b/gems/prism-merge/gemfiles/modular/templating.gemfile @@ -18,7 +18,7 @@ end if structuredmerge_remote # Merge recipes for released installs. - gem 'kettle-jem', '>= 7.0' + gem 'kettle-jem', '~> 7.1', '>= 7.1.26' end if kettle_remote diff --git a/gems/prism-merge/gemfiles/modular/templating_local.gemfile b/gems/prism-merge/gemfiles/modular/templating_local.gemfile index 81ea6d0c2..df61bc4bd 100644 --- a/gems/prism-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/prism-merge/gemfiles/modular/templating_local.gemfile @@ -65,9 +65,7 @@ structuredmerge_local_gems = %w[ kettle_dev_local_gems = %w[ kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift ] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[] -kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - (declared_gems - %w[kettle-dev]) if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( @@ -81,6 +79,28 @@ if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 end if ENV.fetch('KETTLE_DEV_DEV', 'false').casecmp('false') != 0 + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - declared_gems + eval_nomono_gems( gems: kettle_dev_local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/prism-merge/prism-merge.gemspec b/gems/prism-merge/prism-merge.gemspec index 0862ca2ed..f5b945b70 100644 --- a/gems/prism-merge/prism-merge.gemspec +++ b/gems/prism-merge/prism-merge.gemspec @@ -122,7 +122,7 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.31') # ruby >= 4.0.0 + spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.34') # ruby >= 4.0.0 # Security spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 From a2519e354ac0589e4e266a968daef2cfc161fe44 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 23:54:26 -0400 Subject: [PATCH 093/137] =?UTF-8?q?=F0=9F=8E=A8=20Template=20markly-merge?= =?UTF-8?q?=20by=20kettle-family?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/markly-merge/.kettle-drift.lock | 76 ++++- gems/markly-merge/.rubocop_gradual.lock | 7 +- .../.structuredmerge/kettle-jem.lock | 145 ++++---- gems/markly-merge/Gemfile | 2 +- gems/markly-merge/Gemfile.lock | 320 +++++++++--------- gems/markly-merge/Rakefile | 2 +- gems/markly-merge/bin/rubocop-gradual | 16 + .../gemfiles/modular/coverage_local.gemfile | 24 +- .../gemfiles/modular/style.gemfile | 6 +- .../gemfiles/modular/templating.gemfile | 2 +- .../gemfiles/modular/templating_local.gemfile | 24 +- gems/markly-merge/markly-merge.gemspec | 2 +- 12 files changed, 388 insertions(+), 238 deletions(-) create mode 100755 gems/markly-merge/bin/rubocop-gradual diff --git a/gems/markly-merge/.kettle-drift.lock b/gems/markly-merge/.kettle-drift.lock index 98b009e1e..1b23f4793 100644 --- a/gems/markly-merge/.kettle-drift.lock +++ b/gems/markly-merge/.kettle-drift.lock @@ -1,10 +1,82 @@ { + "debug_env: 'KETTLE_DEV_DEBUG',\nroot: %w[src my kettle-dev]": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 46, + 63 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 93, + 110 + ] + } + ], + "path_env: 'KETTLE_DEV_DEV',\nvendored_gems_env: 'VENDORED_GEMS',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 43, + 60 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 90, + 107 + ] + } + ], + "prefix: 'KETTLE_DEV',\npath_env: 'KETTLE_DEV_DEV',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 42, + 59 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 89, + 106 + ] + } + ], + "vendor_gem_dir_env: 'VENDOR_GEM_DIR',\ndebug_env: 'KETTLE_DEV_DEBUG',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 45, + 62 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 92, + 109 + ] + } + ], "vendored_gems_env: 'VENDORED_GEMS',\nvendor_gem_dir_env: 'VENDOR_GEM_DIR',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 44, + 61 + ] + }, { "file": "gemfiles/modular/templating_local.gemfile", "lines": [ - 77, - 88 + 75, + 91, + 108 ] } ] diff --git a/gems/markly-merge/.rubocop_gradual.lock b/gems/markly-merge/.rubocop_gradual.lock index eee7278e8..6c189d21a 100644 --- a/gems/markly-merge/.rubocop_gradual.lock +++ b/gems/markly-merge/.rubocop_gradual.lock @@ -2,7 +2,7 @@ ".simplecov:4173840901": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] ], - "Rakefile:4049422109": [ + "Rakefile:1832489406": [ [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], [81, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], [165, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], @@ -22,6 +22,9 @@ [1, 1, 0, "Naming/FileName: The name of this source file (`vHEAD.gemfile`) should use snake_case.", 5381], [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], + "gemfiles/modular/coverage_local.gemfile:2813372128": [ + [34, 1, 1586, "Metrics/BlockLength: Block has too many lines. [37/25]", 820328175] + ], "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], @@ -114,7 +117,7 @@ [207, 9, 453, "Metrics/MethodLength: Method has too many lines. [13/10]", 2420537429], [227, 9, 405, "Metrics/MethodLength: Method has too many lines. [15/10]", 3219368428] ], - "markly-merge.gemspec:3292641942": [ + "markly-merge.gemspec:3934211795": [ [137, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4147388508], [148, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], [149, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] diff --git a/gems/markly-merge/.structuredmerge/kettle-jem.lock b/gems/markly-merge/.structuredmerge/kettle-jem.lock index 7dad1195f..46d08a4e0 100644 --- a/gems/markly-merge/.structuredmerge/kettle-jem.lock +++ b/gems/markly-merge/.structuredmerge/kettle-jem.lock @@ -1,11 +1,12 @@ --- version: 1 template_state: - version: 7.1.18 - applied_at: '2026-09-07' + version: 7.1.26 + applied_at: '2026-09-10' changelog_replay: last_entry_key: kettle-jem-template-20260802-001 last_entry_date: '2026-08-02' + maintenance_changelog: {} checksums: ".aiignore.example": 48a5dfdd93afd1a15fdce39cc28ca9920263f00018b0968ab031fa744521e5ce ".config/mise/env.sh": aeea5a2ab489ba6e5467ae8de6e386ec8c8fe4ff31a044e69d0cd6a092dd6654 @@ -75,7 +76,7 @@ template_state: ".rubocop_rspec.yml.example": 288ad75e7eb14d87d80fafe6f7272217be5c57547536ee56c780a7d10ac7ec74 ".simplecov.example": 222f2e6ce8cf089c70a21f0f5e5423d4bd59a96fdb2ce7754b0fb3d6f430c229 ".structuredmerge/git-drivers.toml.example": 9d241a44c9edffcdbd3da018fa188a238089c3d1635040924df594a6929a4f97 - ".structuredmerge/kettle-jem.yml.example": 26949dc4ee0722415e72452cbc186bee6ef7b154eae33166d36f3fdb1ca6e46d + ".structuredmerge/kettle-jem.yml.example": ff65a738da1af7d60714026a81d3323a46c864e96ae3570b806afdf6e7149ff9 ".yard-lint.yml.example": 90def46867c9436b4e177c47d91fc8165f4602e335715aecc39f5587ae20b55b ".yardignore.example": 821f453c609df7d46145d675424b39dfbe6dfdca8edac5f367b85fff48502455 ".yardopts.example": 6fd6f2701713096a8a9ea095c213bbc68eeef37797c4754d97837e3229a3a5f6 @@ -88,7 +89,7 @@ template_state: CHANGELOG.transfer.md: 21331d8a9e58b4ff6e088b88eb408bcccb0f2f64e78f8f4d42ac3f11a24baad8 CITATION.cff.example: e404ea0a7919d78a83d53d80e211d17b9663576aa606583b709795dc023fd75c CODE_OF_CONDUCT.md.example: f1ad532f1860f73ef774c6b27a26d41f4bc1cb8813034f5957487766ebb0986b - CONTRIBUTING.md.example: 22570cfb3dde72be79b4b522b6d5ab13f95d778e40444483a096871fe0891b19 + CONTRIBUTING.md.example: 8d23cce2d061e0c20d619c3f66591df5f32821cd84c32d171df0b8ebe1217a55 FUNDING.md.example: 392d047904b1557b29f4b43d37ec403b7480edd5b6ab51180be979b57a91e6ba FUNDING.md.no-osc.example: 3ef0258dd3e3b7f7e17e8bc2d20dcbcb3e74aa5a5a6f51297075696645e34c77 Gemfile.example: 99500023987e81775a9b5ef14e92cb3992f2ac408e5f42454f2728eee9b49fb2 @@ -99,19 +100,19 @@ template_state: PolyForm-Small-Business-1.0.0.md.example: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 README.md.example: 21f491e3d73bfc1b74056a6dcba61f72c93dee3cfe5272ac164a20978454de21 REEK: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - RUBOCOP.md.example: c09e5533ccc59b70a2efa05c99f66e521137c1053d3c12eb43509cebd5b68b0e + RUBOCOP.md.example: d99871a0e4c1d323c92e7febf328f062bb4722069b2abfd0a83bf7daa8dcbf8c Rakefile.example: 569803e726b07ea26267fec6891367a3096a0dff3c266269a7081d36afe496af SECURITY.md.example: ee9411aa85f36d88363fdaea7a1baea4362b6ec112cf2688e711b05de1d3144c bin/setup.example: 0ac35089c95a91d8973fe7a318bf9fd98b9f8e00db92c5d9ca6cd858abb8d41b certs/pboling.pem.example: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - gem.gemspec.example: 83e834e8958a88e4817a57199f48f5ebb245548ce251c5c47372208693f03b17 + gem.gemspec.example: 12dcadc0b297ccd4e18b9d1e538b98ac8330ef9fb2a059ed6754ad59272b77fa gemfiles/modular/benchmark/r4/v0.5.gemfile.example: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 gemfiles/modular/benchmark/vHEAD.gemfile.example: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 gemfiles/modular/cgi/r4/v0.5.gemfile.example: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 gemfiles/modular/cgi/vHEAD.gemfile.example: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 gemfiles/modular/changelog.gemfile.example: 892598e0e7792eb205247ae28128cef6dfc647d2fb33968969152230d6f69288 gemfiles/modular/coverage.gemfile.example: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - gemfiles/modular/coverage_local.gemfile.example: 928d5f260d7b119c038baa56da9fb78dd524dee613aea33ab72894bbce5c506e + gemfiles/modular/coverage_local.gemfile.example: 92ea0d7a9d693553dc614afa2c43990f5c3778c2b00ef6c528e122c31bd506a1 gemfiles/modular/debug.gemfile.example: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 gemfiles/modular/documentation.gemfile.example: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c gemfiles/modular/documentation_local.gemfile.example: 84a20f5d4b0feb94c2cf2f7a8dce8f682f1483498e41484c2b447a5661fd1870 @@ -145,10 +146,10 @@ template_state: gemfiles/modular/stringio/r3/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/r4/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/vHEAD.gemfile.example: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - gemfiles/modular/style.gemfile.example: 3ad0585b4f2db8918580ca41ea8723f7a166d7a83cfd7f9613511094997106fd + gemfiles/modular/style.gemfile.example: 02fe3e8fd00e49b90c3ab30e19b51014ee50490f3eadcfd1d4a39f4c2c997dda gemfiles/modular/style_local.gemfile.example: c86beb711e766126a5be68be4be18255831625ac3650d5069383c4a83a9511f3 - gemfiles/modular/templating.gemfile.example: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - gemfiles/modular/templating_local.gemfile.example: 930057d3b909a72e39a39125c4e883a7ff71f5691e64426c0541f8c8fc75b83f + gemfiles/modular/templating.gemfile.example: 2b33c094677b53ad9dd2eafeb3a3be452f612380c61001a2e75b3c078b8ff72a + gemfiles/modular/templating_local.gemfile.example: ac7259516e69ffafb8b9342a897ddf6042adc46335743f474c342509cefd8f2e gemfiles/modular/webrick/r4/v1.9.gemfile.example: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea gemfiles/modular/webrick/vHEAD.gemfile.example: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b gemfiles/modular/x_std_libs.gemfile.example: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a @@ -175,7 +176,7 @@ template_state: shim/Gemfile.example: 0fb0d9d06fcfb1fd6ca6f0eeb5867253ca1ed221e03d28027719225f868b0637 shim/README.md.example: 3a2f7211b7f92a1dfae5e523b8e34b051a3d8af942144b05286eca0b3c8f6fbe shim/Rakefile.example: 572c94da7052083b39b62a6600785419e314a109efd7a3d8c3a96eb77ad34fd1 - shim/gem.gemspec.example: efae033238e4fd1355cfc134f5c9123f175d1ad1dc4a1a2e663899788c9e0870 + shim/gem.gemspec.example: 14a7015b3328005d1c3b5fda6886bd6da383707745f6eaaa781d6f9689600131 shim/lib/compat_require.rb.example: 94ee85e353a3ca08c8a35c9063d4ff789214ea594c7f803f6cf09d7142f48379 shim/lib/entrypoint.rb.example: dd57613520daca01d6f6bcaa9b83b00ff74505240dc04b84ceb686df3c0539d7 shim/lib/version.rb.example: 15e219ac3a928b5580035f891e415551213175020f1131f6e7ca0ccd55a1b2d6 @@ -189,370 +190,370 @@ files: recipe: template_source_application_simplecov action: write dest_sha256: 0d1b9561168b659861f28247a7158e847c30108f0e3818161b6f88d5f78ab103 - input_fingerprint: 9960e610ed828387d36d1e4157330335f185fcb80d506e254213c8b50ae12390 + input_fingerprint: 72c1822baa4687b7c2ff3e94b4d57761fdf8abec24427b05a2dcd210e65f07fc template_sources: - ".simplecov.example" AGPL-3.0-only.md: recipe: template_source_application_AGPL_3_0_only_md action: write dest_sha256: d8a6cc31abc16b6748c7a21f21611f5a1ec33f67d22ca23d7da1c19b95496bee - input_fingerprint: 20ddcc51eccdbd7071bbaf4b8176e414382dc0946910c61a4c7b418e65613311 + input_fingerprint: 9686f836cc951de387bc89e3b7c84974c52d8adaa34ea8cfeb68125413c9ba68 template_sources: - AGPL-3.0-only.md.example Gemfile: recipe: template_source_application_Gemfile action: write - dest_sha256: 041c688b20398f6514111caa8d61a55ba2599f17ff4b5970533391359cbd5f60 - input_fingerprint: b1e2297b352d121bfb73b5b609c7ea679bdd7cb659eeb779f62260a43414bf8d + dest_sha256: 1bce46f4d442a585046910a0f789ab3920bc82367c37a1bff39f965c6b6c2323 + input_fingerprint: 1aaae99c32b807a214a7322b2f72266a1d0f0e63a2d85cb30ea9ebca7531c747 template_sources: - Gemfile.example LICENSE.md: recipe: template_source_application_LICENSE_md action: write dest_sha256: f6188bfd474a636d2a526420ebb411250faa447d94c9b9ccee097128ce4101b5 - input_fingerprint: 4c030fa9f7d2fc3654166e197cea92954a5f126bef56930be22b33d2cb402ecb + input_fingerprint: 73ac775705042f511bf9851afc73fcb403c563825079b003fd2703d00395fbb5 template_sources: - LICENSE.md.example PolyForm-Small-Business-1.0.0.md: recipe: template_source_application_PolyForm_Small_Business_1_0_0_md action: write dest_sha256: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 - input_fingerprint: b40f2049db7f1936e18eb65469fae344cb0d03540a10ad5af35d7872d23261cd + input_fingerprint: b3a991fc9154acf95a1e4516d2853ad3f7792199e6f5c90ae88b57bdc0bb7a20 template_sources: - PolyForm-Small-Business-1.0.0.md.example README.md: recipe: template_source_application_README_md action: write dest_sha256: df8c86378e17f6c97eded14dd1231ca6fbb3145f2acedc8c66775e12aa368adf - input_fingerprint: c0da31bc6ba37446063cc609000295948101405f511349d06f4c1c409a36370d + input_fingerprint: 0e518a3ad1f4a4e7cd151334b7a12a85a31a7a601b275d66aa82288ac0393ba7 template_sources: - README.md.example Rakefile: recipe: template_source_application_Rakefile action: write - dest_sha256: ca576d31cabe02db9c4c02a15bcacb6f0125072e77d809dfda40e71f32e15d4c - input_fingerprint: 9e3aa3f68a6e51bab09c5c01dd6d7e6676ee0e9a70a2279aa7ec7150323779cb + dest_sha256: 7638eca0e2b9ddd9d8d54da7d1796ad3485c504e67e5ffbef7f45735fa328cbb + input_fingerprint: 85c68f369979fee63c3ccb57ad7a6fd21d60f55f5816e272eb2189e59b2894f0 template_sources: - Rakefile.example certs/pboling.pem: recipe: template_source_application_certs_pboling_pem action: write dest_sha256: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - input_fingerprint: 3eff216c1e108796eced34baa98d55aac76514bab39b8c6d8bedf39884836d88 + input_fingerprint: 8928e1c00ca2afdba12e1c5adb60fc0f2df71ab3004b7892b8801f3830d10412 template_sources: - certs/pboling.pem.example gemfiles/modular/benchmark/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_r4_v0_5_gemfile action: write dest_sha256: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 - input_fingerprint: 7728151c9f517957a26e5c7df16f006d930d85007ae543138dffe7410b014148 + input_fingerprint: a4bc6499ccc57e8de51f2ea3808b06105be359170d034927547530e398aa7906 template_sources: - gemfiles/modular/benchmark/r4/v0.5.gemfile.example gemfiles/modular/benchmark/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_vHEAD_gemfile action: write dest_sha256: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 - input_fingerprint: 4c2e24cc181de53aca93c4f05953d8ee2a1261d9aaf1c743da25697f8c82396d + input_fingerprint: 22bd8c81da5e26e4ef387727fcdb6673b1f02d16d58e25f6fbf6870041287dd1 template_sources: - gemfiles/modular/benchmark/vHEAD.gemfile.example gemfiles/modular/cgi/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_cgi_r4_v0_5_gemfile action: write dest_sha256: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 - input_fingerprint: 29d094222554437f8860fa160e71ff04a7ed1747395c4ce239f61f4c56f1be03 + input_fingerprint: 8d1de8a16bc20f32e85d4b0f15895b37e2a964135d72ed27c694b249caeb7d18 template_sources: - gemfiles/modular/cgi/r4/v0.5.gemfile.example gemfiles/modular/cgi/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_cgi_vHEAD_gemfile action: write dest_sha256: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 - input_fingerprint: bb7a5c091507315b27b42c2fb538c30ee797993f4eeade7099e3f74ab0c71bbb + input_fingerprint: 7ccde7c0f7ef617278d0aa7577c3e95b262859badbb1d9b9699e213b108ccd86 template_sources: - gemfiles/modular/cgi/vHEAD.gemfile.example gemfiles/modular/changelog.gemfile: recipe: template_source_application_gemfiles_modular_changelog_gemfile action: write dest_sha256: da669526144fbff33aef207db9541b6fd6c254437f94dec2fab70fc55a7757cd - input_fingerprint: 898cd1d35df2806e418c11a7ed8cef12b72f8d60d85cf0dfa74a68fdfd540493 + input_fingerprint: f2f1ee6c99a59c336253962042f36dae5d8f95de7e41685bbe9d548300008605 template_sources: - gemfiles/modular/changelog.gemfile.example gemfiles/modular/coverage.gemfile: recipe: template_source_application_gemfiles_modular_coverage_gemfile action: write dest_sha256: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - input_fingerprint: 3d7ae648fe9017dd568f3223f2b8386d6ded7cc2bc6b051f1c12b31871e45038 + input_fingerprint: 301ae93dc5b5d9aac8e85e79d64bca32ae1ab2c3d20cb2979b0f2951419190ba template_sources: - gemfiles/modular/coverage.gemfile.example gemfiles/modular/coverage_local.gemfile: recipe: template_source_application_gemfiles_modular_coverage_local_gemfile action: write - dest_sha256: 2b493414df06261ba8acb6f0eb18bf3fdd701d7cb5f967a9d15a3f42a4741827 - input_fingerprint: d6e535992cdd070631e0dad8317061a3928ffe479140071e902e83f1a5de2b08 + dest_sha256: 92c9a599c8f6867ec532880f73568f2736ac05d8973ec524b42fd5dbe6aeda3e + input_fingerprint: 600c921b12795f0b76b01c76f3549a27ae9c62840adabc8746c8f827b47c17b2 template_sources: - gemfiles/modular/coverage_local.gemfile.example gemfiles/modular/debug.gemfile: recipe: template_source_application_gemfiles_modular_debug_gemfile action: write dest_sha256: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 - input_fingerprint: '08a3080b93307085cc44f6ee78a6b69764789fbad7bd75e6f8cd21899cfa56f8' + input_fingerprint: a18d3ea706344deede05ab3dee29aa9f457594b00efdfbbf71ee1852833f41a0 template_sources: - gemfiles/modular/debug.gemfile.example gemfiles/modular/documentation.gemfile: recipe: template_source_application_gemfiles_modular_documentation_gemfile action: write dest_sha256: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c - input_fingerprint: 6948b7bb8f5d0363c050ca893666290dae22708c56e85d0e3ac904422056fc21 + input_fingerprint: a67a6f032cee9db69b6fc77a8ede0901b34af79a1dd7e78844dba3c1f4dc20b9 template_sources: - gemfiles/modular/documentation.gemfile.example gemfiles/modular/documentation_local.gemfile: recipe: template_source_application_gemfiles_modular_documentation_local_gemfile action: write dest_sha256: 2058173855b9a4acc6d5efa20520e49734243eef6cf0b5e9063e0e5866a08e9c - input_fingerprint: 12700949c18873b494fa1a351b2a645eb62f8816f17eec0b2e2a4542b4e6f7d7 + input_fingerprint: 89f2f7796e06ae2deefebee38ef0edbf5a7e5b1edfa61eedd9f8a7e212d1db51 template_sources: - gemfiles/modular/documentation_local.gemfile.example gemfiles/modular/erb/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r2_v3_0_gemfile action: write dest_sha256: 3793e7dc9ef23a7ccd893d48cbba092fd27594c63e65cca011cc658218425670 - input_fingerprint: 2b16974bde33053c8043f9734f8443a92090871b4cb5ea708c1a1e96897a521c + input_fingerprint: a7766e338d2eeec5b1bce77f8e823212e685429a6b049b76b12aea66d414eea3 template_sources: - gemfiles/modular/erb/r2/v3.0.gemfile.example gemfiles/modular/erb/r3/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r3_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 191266cd233feee5d209c8efdd391c2b4dcfc8c0f79aa25b29122d4da65837f9 + input_fingerprint: 914f26cc393ce2c976b062e2fcc0979c9e6eeee9475903ca7b62ff9986fe68f5 template_sources: - gemfiles/modular/erb/r3/v5.0.gemfile.example gemfiles/modular/erb/r4/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r4_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 9a089453c32d7bbce40b643bc925442f8093ad42576b07cbf56cf1bcdbee84d7 + input_fingerprint: 8a046dc71773f9b5f816fc15877ff7055848192403ccfbb86ee5be09fbe99491 template_sources: - gemfiles/modular/erb/r4/v5.0.gemfile.example gemfiles/modular/erb/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_erb_vHEAD_gemfile action: write dest_sha256: ad6f104a49e80e0cf625440e3dc816343fe7e2f037fc4971df75e7bb4305c683 - input_fingerprint: f646db4b5ba957e2210b394a610839362cfdaaf8cf91fe9ea9ec38b729b9dd6a + input_fingerprint: 41162a98ae33c8ab789fb7113778f8d3ce72460f0dcf2f222836320c421ef236 template_sources: - gemfiles/modular/erb/vHEAD.gemfile.example gemfiles/modular/json/truffleruby_22_3.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_22_3_gemfile action: write dest_sha256: 249c12eacbe90f9d0d2e81e7a62c4c7e9102e504ededcda4ecf660cb3bb68be4 - input_fingerprint: afe15704df757be0367e75357e1d521148503f11d0e63c01c889e851fbddb07d + input_fingerprint: da8808e21b93f3750856ff9380e58798734e2819fa457ced289673a7bb8c5c12 template_sources: - gemfiles/modular/json/truffleruby_22_3.gemfile.example gemfiles/modular/json/truffleruby_23_0.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_0_gemfile action: write dest_sha256: 66aa010567f7afa1af8244a74c3c88ecaaf84dc87b6a25180691bb480d02ed28 - input_fingerprint: 9a9e175c7a6370fceadbd8630146ea6a7bd05e6a8aa82c3b95c7447a89dc729a + input_fingerprint: b7d15777eb20b5a5f5bc6646ca297b46d1816023625b085a78ef21ed4892ca25 template_sources: - gemfiles/modular/json/truffleruby_23_0.gemfile.example gemfiles/modular/json/truffleruby_23_1.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_1_gemfile action: write dest_sha256: '080fcbdaf2bec73cad40832a3d51eebb380af789917b96f493d1460b0dd6361d' - input_fingerprint: ad363e2b2d94f5ff43f45dec8e6c98afb54464625a39bd56923436f1bbc9403a + input_fingerprint: 584835301e3b07e4a244af4361cd2e83d61c7a88107fa04988ec7754146f4a8f template_sources: - gemfiles/modular/json/truffleruby_23_1.gemfile.example gemfiles/modular/mutex_m/r2/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r2_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 2d0011ba6f93f5fd2ac38dd0238f2b63658b4c4d0d72bd245354714b06a8ddf3 + input_fingerprint: 7a5deee2a13b2e60662ccd407f1bf873a23e2d7c3a6684bad5f30747688bd368 template_sources: - gemfiles/modular/mutex_m/r2/v0.3.gemfile.example gemfiles/modular/mutex_m/r3/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r3_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: bb30f6314a5932a7ad63bef58c3c95089c8c736f41b5163aff36db11a6406358 + input_fingerprint: dde4596ec1adcad332cd2112b9198ba9ec1f2451dfb4030d5c2ce34f6ac1a91b template_sources: - gemfiles/modular/mutex_m/r3/v0.3.gemfile.example gemfiles/modular/mutex_m/r4/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r4_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: c3e2860e727042d5421150325ffb7eedf2ee3c6922ff72891607464fa9c509df + input_fingerprint: ba51780169a868ea9ce1904f48867e5a0db1a136d9628764438111d5678fd494 template_sources: - gemfiles/modular/mutex_m/r4/v0.3.gemfile.example gemfiles/modular/mutex_m/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_vHEAD_gemfile action: write dest_sha256: '08018641c97f894788fa91b462da504ab2237213d18d95404136c393274ae3cb' - input_fingerprint: 3dc3385f2d8b179da8f9e5f0363488325aa50f19936a972a5ab0f328c5e7bf30 + input_fingerprint: a75398e393f077f8ed6b23ea0c87a25029e29a5ba9a3c34d2c5979eeff87da06 template_sources: - gemfiles/modular/mutex_m/vHEAD.gemfile.example gemfiles/modular/optional.gemfile: recipe: template_source_application_gemfiles_modular_optional_gemfile action: write dest_sha256: f770e6e9a9dd2bd0f1f132e882d88038b2e21127dce3afe270908c7338c28bfd - input_fingerprint: acc0b56ae9e56deae1565eb3761b58c2901907d7bca73f86f91d5ef179282e04 + input_fingerprint: 44bc398f7a39a72e5c3323cf34e8e83b37cbf5c017e6319046857dbf8828e90d template_sources: - gemfiles/modular/optional.gemfile.example gemfiles/modular/rspec.gemfile: recipe: template_source_application_gemfiles_modular_rspec_gemfile action: write dest_sha256: d043f5c9344f6435edb4607c5adaf42c78e7fb6b8b6726007de2bbedefb376c3 - input_fingerprint: fc0a1b50adce798abab6137bcd077a8a82a7685031079471eaa5df2726d7d77d + input_fingerprint: 2e62828cd1a553bf0690c646ad49639f476bd94ca1e0b8d8cff29872a9899685 template_sources: - gemfiles/modular/rspec.gemfile.example gemfiles/modular/runtime_heads.gemfile: recipe: template_source_application_gemfiles_modular_runtime_heads_gemfile action: write dest_sha256: 6ac7158c4a3088190f2a9082f01439eb27eca2172ab3464b15c9cb045aa885e1 - input_fingerprint: e1930fad71c931caca49d932c74324a4025e7123e88c50457f0d22f9ae81d3f0 + input_fingerprint: f847e0d04b1b7ace3241de6dd04cc012ce2eb12336142f291126ec9d1e354c6b template_sources: - gemfiles/modular/runtime_heads.gemfile.example gemfiles/modular/stringio/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r2_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 5e634f2734ccd5ce5193197f8d66bbef05778dd54a0d047fc066f13ce1f3cf04 + input_fingerprint: f52a66c160f23c2a062841d8c6f9737aaa3cafeb96c18536b93fc235936f8398 template_sources: - gemfiles/modular/stringio/r2/v3.0.gemfile.example gemfiles/modular/stringio/r3/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r3_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 4896cd8903181da2330369a3d38ff465bbe77ca26946d239c02ee94ebc2f53d9 + input_fingerprint: e272a02635250e7e56f0ecf3e730cccad90c63cf47d08640a7392f47087c05de template_sources: - gemfiles/modular/stringio/r3/v3.0.gemfile.example gemfiles/modular/stringio/r4/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r4_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: bbb4f76b24df1b5cdb7786ecb9956191fbbc9a2a974d4aa0215c54e07a96b33e + input_fingerprint: 8e08e2a9f07a87542a60f8c9fe8cc0c57733bd2b7612920fa07dffb2efd345b0 template_sources: - gemfiles/modular/stringio/r4/v3.0.gemfile.example gemfiles/modular/stringio/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_stringio_vHEAD_gemfile action: write dest_sha256: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - input_fingerprint: 9442b74907d1a3cbcf7d86febb9add81d872c7a6ea661f00e6a1c62432390333 + input_fingerprint: f0304426961b9e48a8b9bb88ff3c50b2bad0d1f095647ba8c561b1973ec3bb52 template_sources: - gemfiles/modular/stringio/vHEAD.gemfile.example gemfiles/modular/style.gemfile: recipe: template_source_application_gemfiles_modular_style_gemfile action: write - dest_sha256: 2a3d46dcb8a9394f595f273f5eb0403d0a552837754ab109afc9ba79a7159083 - input_fingerprint: 7820d527b24708b6682b12fcd343a2f627e1770e1621aaefb9ad120367b21be5 + dest_sha256: 9a24acff0054573c30f5d84d0418cd465ba3794d075bb5a36801410ac40e0787 + input_fingerprint: 38b5100ea0f11fa344f94fbc265e67d54117f7a72de098afbcda0a8ce91eaae9 template_sources: - gemfiles/modular/style.gemfile.example gemfiles/modular/style_local.gemfile: recipe: template_source_application_gemfiles_modular_style_local_gemfile action: write dest_sha256: 55eb9c149cdb2f29c9f31abe2d55a4f334e00fb859681dd17c42149a3f28ca36 - input_fingerprint: 3efccadaf12733a4e48206a6dd21cfa45371542fcf34c284f74926bf93a7bc51 + input_fingerprint: d394288b4af12b19ed00e72d45c1be90f90ed418909219dcddbebe1f10162746 template_sources: - gemfiles/modular/style_local.gemfile.example gemfiles/modular/templating.gemfile: recipe: template_source_application_gemfiles_modular_templating_gemfile action: write - dest_sha256: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - input_fingerprint: 3195eac6b2ac482516bd588c8244056d5197e526c534f986e9d0befc897cd84a + dest_sha256: 432ba59798d31b899268257c432443a017c5a9bd2c0c7f9f2216617e14150cd3 + input_fingerprint: da34789f37fe1b46d0cc762c637f249b0d7c8e42f7622ba5e2eafd2cd40effd2 template_sources: - gemfiles/modular/templating.gemfile.example gemfiles/modular/templating_local.gemfile: recipe: template_source_application_gemfiles_modular_templating_local_gemfile action: write - dest_sha256: 45e771f14243341903a0047810a772cc70a633f6e293c8e12570732ad78c510a - input_fingerprint: aadb22749d7bd98e9746759b00e4c1472775baa617a8f47eeb4abadadf74c955 + dest_sha256: d8aa779404e0d9a0fb5a4acadfbd6ef5b1ed34afe63674562d072cf4cb5eadfc + input_fingerprint: '052785772c24dcb354705badc411e8dd3c83fbca0a2173d30c43ceda4b8db07b' template_sources: - gemfiles/modular/templating_local.gemfile.example gemfiles/modular/webrick/r4/v1.9.gemfile: recipe: template_source_application_gemfiles_modular_webrick_r4_v1_9_gemfile action: write dest_sha256: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea - input_fingerprint: e11ced565da7637a22e741b109910e83e249649af6b634c6c281818466741415 + input_fingerprint: 81ad1a6f79711c565a288051567761a2cbda611f6a9c7baea611c7e9721dd95e template_sources: - gemfiles/modular/webrick/r4/v1.9.gemfile.example gemfiles/modular/webrick/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_webrick_vHEAD_gemfile action: write dest_sha256: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b - input_fingerprint: ec8da4d03c974cd189dbea0a978468edfeaf1aa87b44f08c1b31ead6d13ccbc2 + input_fingerprint: 2466bf0b02ef13dd5e3741feb5ec079c05b1e787623fba784637f93d4795b91d template_sources: - gemfiles/modular/webrick/vHEAD.gemfile.example gemfiles/modular/x_std_libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_gemfile action: write dest_sha256: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a - input_fingerprint: 6f05c3eae7d64c8d4f1a0085d96de6d18e198ff0fbf1f1a1f37eedf3aedff606 + input_fingerprint: e78a04cc36d71298e97ea2cf0667c561c3ed042895bfdea553f896f0c17b6a46 template_sources: - gemfiles/modular/x_std_libs.gemfile.example gemfiles/modular/x_std_libs/r2/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r2_libs_gemfile action: write dest_sha256: e80ec8ad06cb1b31ac982bc25cf7696987fca131aa1001eaefd0bf5cd379c273 - input_fingerprint: eb3dc897a3f6d3826c15556b7eb7e86f6536ec785efd4a12144c67928eb92d61 + input_fingerprint: c977a09313eb859f7e71f39465f33058a26ecb0887499b66c0317f868206d428 template_sources: - gemfiles/modular/x_std_libs/r2/libs.gemfile.example gemfiles/modular/x_std_libs/r3.1/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_1_libs_gemfile action: write dest_sha256: 9f8565c40b09bea1bc4c2e2ad87fe11400c3c51a2b235655bfcd8e491ed88ca8 - input_fingerprint: 98eae07d12914f8a19079f67f45ae98e32351a8e7a71da520ddfdc69f8320a6e + input_fingerprint: 779ed83e898accbe96571e53907c673d0ca5d41e8e4da54fd69dab5830bc9857 template_sources: - gemfiles/modular/x_std_libs/r3.1/libs.gemfile.example gemfiles/modular/x_std_libs/r3/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_libs_gemfile action: write dest_sha256: 546f8849f4267bb19aa10ff0de40be30957197f229e6887847181ea9127b2650 - input_fingerprint: 5dd37a6a60db9a3d96c49e6ab1b157d0a2ad9f4aca805c76c3ee5df57eb7499c + input_fingerprint: 07db2127a94eade8b0490db51e1fc31fa6dc0491d12980586b553caa8e0db1a1 template_sources: - gemfiles/modular/x_std_libs/r3/libs.gemfile.example gemfiles/modular/x_std_libs/r4/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r4_libs_gemfile action: write dest_sha256: 8c2582eaa218d216b98c86c933465295c8b4e43f3251ea388b9eaf6e471f8da6 - input_fingerprint: 3b8c4106a20da2163dd68425b909b0d467f48d9381f29bd61d54f9ad8514e90b + input_fingerprint: d850f2b07c24ce26a36c52b1906d8200910f58f81953ccb18968241d1b92fc2a template_sources: - gemfiles/modular/x_std_libs/r4/libs.gemfile.example gemfiles/modular/x_std_libs/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_vHEAD_gemfile action: write dest_sha256: d3133ec4c0638363a7fb025d19be7e95a615fd61c35ddb8d17f2280ee74a7486 - input_fingerprint: 42839fa0e7f52df351be596b17347d65d2a8e95afc019297f5b154feae049554 + input_fingerprint: ce5304a38503675fca7c489998bb41147335e28570d4641b251811b41a66d2f0 template_sources: - gemfiles/modular/x_std_libs/vHEAD.gemfile.example lib/markly/merge/version.rb: recipe: template_source_application_lib_markly_merge_version_rb action: write - dest_sha256: 545ee1dd743f25ae0bd0d6c18b1274c0941e461b0a7441faf97911cb3fdd9044 - input_fingerprint: 633a79268811a4285db927d7a1e26768e43b2c2a22a37f2614d5b9ce2762f9e6 + dest_sha256: f55468c52b8a3cb0a0ea3119a9c8e91ce4dc66d75e8bf8431885ed529d18cfb8 + input_fingerprint: 69c1111f009cee36bf5c1a364608d092c251151495117e14487494ef0097eed8 template_sources: - lib/gem/version.rb.example markly-merge.gemspec: recipe: template_source_application_markly_merge_gemspec action: write - dest_sha256: 9fb61b1b7fea67fbe6e49e0885204fc6247a223ef377f6adbf5235f7ca845a5d - input_fingerprint: 471c234365c6c90f2c548bdb0fcb3f88b788ab801234c13f0c178f4c84f1b656 + dest_sha256: 810afcc9337ad869aaca9dc38d02fd611f648141250974dc1d270fe4087fa7cb + input_fingerprint: 97ffda332bd169734d619fb8f7f0e720e2d5d5b4c48f023f5bb6549b19a6bb53 template_sources: - gem.gemspec.example mise.toml: recipe: template_source_application_mise_toml action: write dest_sha256: 7d267154ca4f081b0ac7da804c0180c2b091aec5f1c877417c1c320f4f369c88 - input_fingerprint: 21457711108a6db999e001cf77c9b7dc36f94a627c97189c1e149159a2bf8968 + input_fingerprint: 8f2f16bcec444a93422a827b3111e3b91018297c70dd972fd41a882fdf8f7005 template_sources: - mise.toml.no-osc.example sig/markly/merge.rbs: recipe: template_source_application_sig_markly_merge_rbs action: write dest_sha256: 2eba559e143b16cbbd5445f94f790f2c4f7ac4c0d80a2aebfdbcb1c9d6c86ef2 - input_fingerprint: e16450cc20a6a0c3ac6f8910f25305be8c0ea9176b66a824d6bcc5e0bdb89b9d + input_fingerprint: f744b51772c14018e3d55341dbeddc02e96fd6034f5ee9e574740c04a21c3e30 template_sources: - sig/gem.rbs.example spec/spec_helper.rb: recipe: template_source_application_spec_spec_helper_rb action: write dest_sha256: a0fa2c5365c37f1623e56f2b3b6595051ef85efb35110c047755ee4c229d6979 - input_fingerprint: 9cc3c112c7c4896794cd0cb725c54b300f6127ad39f324de647285c62a6cc412 + input_fingerprint: aafded80c6c83593cb5bef2e47945fa6549d1823a3dae54ed7f013d18d1b0520 template_sources: - spec/spec_helper.rb.example diff --git a/gems/markly-merge/Gemfile b/gems/markly-merge/Gemfile index 0ac7401b4..c27ab5972 100644 --- a/gems/markly-merge/Gemfile +++ b/gems/markly-merge/Gemfile @@ -19,7 +19,7 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } # Include dependencies from markly-merge.gemspec gemspec -gem 'kettle-family', '~> 1.2', '>= 1.2.97' +gem 'kettle-family', '~> 1.2', '>= 1.2.100' # Local workspace dependency wiring for *_local.gemfile overrides gem 'nomono', '~> 1.1', '>= 1.1.5', require: false # ruby >= 3.2.0 diff --git a/gems/markly-merge/Gemfile.lock b/gems/markly-merge/Gemfile.lock index 94a9d7487..73e1e7208 100644 --- a/gems/markly-merge/Gemfile.lock +++ b/gems/markly-merge/Gemfile.lock @@ -10,131 +10,131 @@ GIT PATH remote: . specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) + markly-merge (7.1.9) + markdown-merge (= 7.1.9) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) + ast-crispr-markdown-markly (7.1.9) + ast-crispr (= 7.1.9) + markdown-merge (= 7.1.9) + markly-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism specs: - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) + ast-crispr-ruby-prism (7.1.9) + ast-crispr (= 7.1.9) + prism-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) + ast-crispr (7.1.9) + ast-merge (= 7.1.9) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ast-merge-git (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: - ast-merge (7.1.8) + ast-merge (7.1.9) benchmark token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) + ast-template (7.1.9) + ast-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + bash-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + binary-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) + citrus-toml-merge (7.1.9) + ast-merge (= 7.1.9) + toml-merge (= 7.1.9) toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge specs: - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) commonmarker (~> 2.2) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) + dotenv-merge (7.1.9) + ast-merge (= 7.1.9) + plain-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + go-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + html-merge (7.1.9) + ast-crispr (= 7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + json-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: - kettle-jem (7.1.25) + kettle-jem (7.1.26) addressable (>= 2.8, < 3) ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) @@ -168,114 +168,114 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge specs: - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown (~> 2.5) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + markdown-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge specs: - parslet-toml-merge (7.1.8) + parslet-toml-merge (7.1.9) toml (~> 0.3) - toml-merge (= 7.1.8) + toml-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + plain-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) + prism-merge (7.1.9) + ast-merge (= 7.1.9) prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + psych-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) + yaml-merge (= 7.1.9) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) + rbs-merge (7.1.9) + ast-merge (= 7.1.9) rbs (>= 3.10) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + rust-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) + smorg-rb (7.1.9) + ast-merge (= 7.1.9) + ast-merge-git (= 7.1.9) + bash-merge (= 7.1.9) diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) + dotenv-merge (= 7.1.9) + go-merge (= 7.1.9) + html-merge (= 7.1.9) + json-merge (= 7.1.9) kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) + markdown-merge (= 7.1.9) + plain-merge (= 7.1.9) + prism-merge (= 7.1.9) + psych-merge (= 7.1.9) + rbs-merge (= 7.1.9) + rust-merge (= 7.1.9) + toml-merge (= 7.1.9) + typescript-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + toml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: - tree_haver (7.1.8) + tree_haver (7.1.9) citrus (~> 3.0) parslet (~> 2.0) tree_sitter_language_pack (>= 1.16.2, < 2.0) @@ -284,25 +284,25 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + typescript-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + yaml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) + zip-merge (7.1.9) + binary-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) GEM @@ -336,6 +336,8 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) + commonmarker (2.10.0) + rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -465,11 +467,15 @@ GEM lint_roller (1.1.0) logger (1.7.0) markly (0.19.0) + mini_portile2 (2.8.9) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) reline (~> 0.6) mutex_m (0.3.0) + nokogiri (1.19.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-musl) @@ -503,6 +509,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) + rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -696,13 +705,16 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.16.2-aarch64-linux) + tree_sitter_language_pack (1.17.0) + rb_sys (>= 0.9.130, < 0.10) + sorbet-runtime (~> 0.5) + tree_sitter_language_pack (1.17.0-aarch64-linux) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-arm64-darwin) + tree_sitter_language_pack (1.17.0-arm64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-linux) + tree_sitter_language_pack (1.17.0-x86_64-linux) sorbet-runtime (~> 0.5) tsort (0.2.0) tty-cursor (0.7.1) @@ -784,9 +796,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.31) + kettle-dev (~> 3.0, >= 3.0.34) kettle-drift (~> 1.0, >= 1.0.13) - kettle-family (~> 1.2, >= 1.2.97) + kettle-family (~> 1.2, >= 1.2.100) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) @@ -807,12 +819,12 @@ DEPENDENCIES reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) - rubocop-lts (~> 24.2, >= 24.2.1) - rubocop-lts-rspec (~> 1.0, >= 1.0.5) + rubocop-lts (~> 24.2, >= 24.2.3) + rubocop-lts-rspec (~> 1.0, >= 1.0.6) rubocop-minitest (~> 0.40, >= 0.40.0) rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! - rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) ruby-merge! ruby-progressbar (~> 1.13) rust-merge! @@ -843,33 +855,34 @@ CHECKSUMS appraisal2 (3.2.3) sha256=3a6cfaf8a444e02707b9a34154af1c4902fbe99d9d2168d7e81dd83ec77e6db7 appraisal2-rubocop (1.0.2) sha256=1dae97c1be087cf9c098a3a72fd41f873435e9b8b39687e633b36c9ccb22bff4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.8) - ast-crispr-markdown-markly (7.1.8) - ast-crispr-ruby-prism (7.1.8) - ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) + ast-crispr (7.1.9) + ast-crispr-markdown-markly (7.1.9) + ast-crispr-ruby-prism (7.1.9) + ast-merge (7.1.9) + ast-merge-git (7.1.9) + ast-template (7.1.9) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.8) + bash-merge (7.1.9) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) - bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae + binary-merge (7.1.9) + bundler (4.1.0.beta1) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.8) + citrus-toml-merge (7.1.9) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 + commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e commonmarker (2.10.0-x86_64-darwin) sha256=01e0830ed0319825ecdc16411c90acd3f661d1568dfc178731b3f64d0ce2363d commonmarker (2.10.0-x86_64-linux) sha256=945c510c0bfca9022245928e2248468fe3ddad58c939be0c37b20082cc392880 commonmarker (2.10.0-x86_64-linux-musl) sha256=288cd4fb9f17eed2ffa73551ef241dcf594e0f484b2aee2a0999540333c0618e - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) completely (0.8.0) sha256=e493cd5d84805f47917a41f277ecbfe5f35363bed670be5a957d3acaed8c6c5e concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 @@ -878,7 +891,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docopt_ng (0.7.1) sha256=a024148ee4fa3ab1a8a04411aa4370f39cf2b446e63562097d418b7974a15667 - dotenv-merge (7.1.8) + dotenv-merge (7.1.9) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -891,35 +904,37 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) + go-merge (7.1.9) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) + html-merge (7.1.9) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a - json-merge (7.1.8) - kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + json-merge (7.1.9) + kettle-changelog (1.0.7) + kettle-dev (3.0.34) + kettle-drift (1.0.13) kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 - kettle-jem (7.1.25) + kettle-jem (7.1.26) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 - kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd + kettle-soup-cover (3.0.10) kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 - markdown-merge (7.1.8) + markdown-merge (7.1.9) markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca - markly-merge (7.1.8) + markly-merge (7.1.9) + mini_portile2 (2.8.9) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 + nokogiri (1.19.4) nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af nokogiri (1.19.4-arm64-darwin) sha256=a46db9853286e6597b36ebc6953817d15acf3a299583eb3f89fdc6f91dd63527 @@ -933,20 +948,22 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) - plain-merge (7.1.8) + parslet-toml-merge (7.1.9) + plain-merge (7.1.9) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.8) + prism-merge (7.1.9) psych (5.5.0) sha256=4b245bbbd0f3238df8ccee766ebc1a6b062b10e4ee1d3284eb588739ba156a0a - psych-merge (7.1.8) + psych-merge (7.1.9) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 - rbs-merge (7.1.8) + rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -982,11 +999,11 @@ CHECKSUMS rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.8) + ruby-merge (7.1.9) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) + rust-merge (7.1.9) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +1011,7 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) + smorg-rb (7.1.9) sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,25 +1027,26 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.8) + toml (0.3.0) + toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb - tree_haver (7.1.8) - tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 - tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 - tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 - tree_sitter_language_pack (1.16.2-x86_64-linux) sha256=d8151e6e44e35ace9de3611c76b730896beab17f427db06d8f76666332a5dc60 + tree_haver (7.1.9) + tree_sitter_language_pack (1.17.0) + tree_sitter_language_pack (1.17.0-aarch64-linux) + tree_sitter_language_pack (1.17.0-arm64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-linux) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f tty-cursor (0.7.1) sha256=79534185e6a777888d88628b14b6a1fdf5154a603f285f80b1753e1908e0bf48 tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) + typescript-merge (7.1.9) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 yaml-converter (0.2.5) sha256=a5214fe1a6c2df88bd34a35bcded1b1dcd30135548130df2e03b54ca8c0f2423 - yaml-merge (7.1.8) + yaml-merge (7.1.9) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.8) sha256=73d935d43e3479d65ce8aff25c7d3100e8bb83528a2adaa0ed824e5046ac99e7 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -1037,8 +1055,8 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) + zip-merge (7.1.9) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH - 4.0.20 + 4.1.0.beta1 diff --git a/gems/markly-merge/Rakefile b/gems/markly-merge/Rakefile index 6931981de..da187ae2c 100644 --- a/gems/markly-merge/Rakefile +++ b/gems/markly-merge/Rakefile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -# markly-merge Rakefile v7.1.18 - 2026-09-07 +# markly-merge Rakefile v7.1.26 - 2026-09-09 # Ruby 2.3 (Safe Navigation) or higher required # # See LICENSE.md for license information. diff --git a/gems/markly-merge/bin/rubocop-gradual b/gems/markly-merge/bin/rubocop-gradual new file mode 100755 index 000000000..7c7ff0635 --- /dev/null +++ b/gems/markly-merge/bin/rubocop-gradual @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'rubocop-gradual' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'rubygems' +require 'bundler/setup' + +load Gem.bin_path('rubocop-gradual', 'rubocop-gradual') diff --git a/gems/markly-merge/gemfiles/modular/coverage_local.gemfile b/gems/markly-merge/gemfiles/modular/coverage_local.gemfile index 37917caac..d6c890e46 100644 --- a/gems/markly-merge/gemfiles/modular/coverage_local.gemfile +++ b/gems/markly-merge/gemfiles/modular/coverage_local.gemfile @@ -29,11 +29,31 @@ Kernel.send(:gem, 'nomono', *nomono_activation_requirements) require 'nomono/bundler' local_gems = %w[kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -local_gems_to_eval = local_gems - %w[] - declared_gems # export KETTLE_DEV_DEV=/path/to/my platform :mri do + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + local_gems_to_eval = local_gems - %w[] - declared_gems + eval_nomono_gems( gems: local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/markly-merge/gemfiles/modular/style.gemfile b/gems/markly-merge/gemfiles/modular/style.gemfile index 59c5dc1a3..41ec99454 100644 --- a/gems/markly-merge/gemfiles/modular/style.gemfile +++ b/gems/markly-merge/gemfiles/modular/style.gemfile @@ -24,9 +24,9 @@ platform :mri do if ENV.fetch('RUBOCOP_LTS_DEV', 'false').casecmp('false').zero? declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) - gem 'rubocop-lts', '~> 24.2', '>= 24.2.1' unless declared_gems.include?('rubocop-lts') - gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.5' unless declared_gems.include?('rubocop-lts-rspec') - gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.6' unless declared_gems.include?('rubocop-ruby3_2') + gem 'rubocop-lts', '~> 24.2', '>= 24.2.3' unless declared_gems.include?('rubocop-lts') + gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.6' unless declared_gems.include?('rubocop-lts-rspec') + gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.8' unless declared_gems.include?('rubocop-ruby3_2') else eval_gemfile('style_local.gemfile') end diff --git a/gems/markly-merge/gemfiles/modular/templating.gemfile b/gems/markly-merge/gemfiles/modular/templating.gemfile index 6af159bd7..ce51a08ed 100644 --- a/gems/markly-merge/gemfiles/modular/templating.gemfile +++ b/gems/markly-merge/gemfiles/modular/templating.gemfile @@ -18,7 +18,7 @@ end if structuredmerge_remote # Merge recipes for released installs. - gem 'kettle-jem', '>= 7.0' + gem 'kettle-jem', '~> 7.1', '>= 7.1.26' end if kettle_remote diff --git a/gems/markly-merge/gemfiles/modular/templating_local.gemfile b/gems/markly-merge/gemfiles/modular/templating_local.gemfile index 01a69856f..f427fa359 100644 --- a/gems/markly-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/markly-merge/gemfiles/modular/templating_local.gemfile @@ -65,9 +65,7 @@ structuredmerge_local_gems = %w[ kettle_dev_local_gems = %w[ kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift ] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[] -kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - (declared_gems - %w[kettle-dev]) if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( @@ -81,6 +79,28 @@ if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 end if ENV.fetch('KETTLE_DEV_DEV', 'false').casecmp('false') != 0 + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - declared_gems + eval_nomono_gems( gems: kettle_dev_local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/markly-merge/markly-merge.gemspec b/gems/markly-merge/markly-merge.gemspec index edbe7fbb5..d08964b36 100644 --- a/gems/markly-merge/markly-merge.gemspec +++ b/gems/markly-merge/markly-merge.gemspec @@ -120,7 +120,7 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.31') # ruby >= 4.0.0 + spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.34') # ruby >= 4.0.0 # Security spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 From 09f974d45b1b5b49b8ffcdb9d5ac7fc5cc2a4923 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 23:54:26 -0400 Subject: [PATCH 094/137] =?UTF-8?q?=F0=9F=8E=A8=20Template=20dotenv-merge?= =?UTF-8?q?=20by=20kettle-family?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/dotenv-merge/.kettle-drift.lock | 76 ++++- gems/dotenv-merge/.rubocop_gradual.lock | 7 +- .../.structuredmerge/kettle-jem.lock | 145 ++++---- gems/dotenv-merge/Gemfile | 2 +- gems/dotenv-merge/Gemfile.lock | 320 +++++++++--------- gems/dotenv-merge/Rakefile | 2 +- gems/dotenv-merge/bin/rubocop-gradual | 16 + gems/dotenv-merge/dotenv-merge.gemspec | 2 +- .../gemfiles/modular/coverage_local.gemfile | 24 +- .../gemfiles/modular/style.gemfile | 6 +- .../gemfiles/modular/templating.gemfile | 2 +- .../gemfiles/modular/templating_local.gemfile | 24 +- 12 files changed, 388 insertions(+), 238 deletions(-) create mode 100755 gems/dotenv-merge/bin/rubocop-gradual diff --git a/gems/dotenv-merge/.kettle-drift.lock b/gems/dotenv-merge/.kettle-drift.lock index 98b009e1e..1b23f4793 100644 --- a/gems/dotenv-merge/.kettle-drift.lock +++ b/gems/dotenv-merge/.kettle-drift.lock @@ -1,10 +1,82 @@ { + "debug_env: 'KETTLE_DEV_DEBUG',\nroot: %w[src my kettle-dev]": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 46, + 63 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 93, + 110 + ] + } + ], + "path_env: 'KETTLE_DEV_DEV',\nvendored_gems_env: 'VENDORED_GEMS',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 43, + 60 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 90, + 107 + ] + } + ], + "prefix: 'KETTLE_DEV',\npath_env: 'KETTLE_DEV_DEV',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 42, + 59 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 89, + 106 + ] + } + ], + "vendor_gem_dir_env: 'VENDOR_GEM_DIR',\ndebug_env: 'KETTLE_DEV_DEBUG',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 45, + 62 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 92, + 109 + ] + } + ], "vendored_gems_env: 'VENDORED_GEMS',\nvendor_gem_dir_env: 'VENDOR_GEM_DIR',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 44, + 61 + ] + }, { "file": "gemfiles/modular/templating_local.gemfile", "lines": [ - 77, - 88 + 75, + 91, + 108 ] } ] diff --git a/gems/dotenv-merge/.rubocop_gradual.lock b/gems/dotenv-merge/.rubocop_gradual.lock index 333757f21..5bd43b946 100644 --- a/gems/dotenv-merge/.rubocop_gradual.lock +++ b/gems/dotenv-merge/.rubocop_gradual.lock @@ -2,13 +2,13 @@ ".simplecov:3673321797": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] ], - "Rakefile:2021531421": [ + "Rakefile:3999369342": [ [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], [81, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], [165, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], [168, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] ], - "dotenv-merge.gemspec:852676139": [ + "dotenv-merge.gemspec:1666675950": [ [138, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4147388508], [149, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], [150, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] @@ -27,6 +27,9 @@ [1, 1, 0, "Naming/FileName: The name of this source file (`vHEAD.gemfile`) should use snake_case.", 5381], [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], + "gemfiles/modular/coverage_local.gemfile:2813372128": [ + [34, 1, 1586, "Metrics/BlockLength: Block has too many lines. [37/25]", 820328175] + ], "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], diff --git a/gems/dotenv-merge/.structuredmerge/kettle-jem.lock b/gems/dotenv-merge/.structuredmerge/kettle-jem.lock index bd48fa4d9..3c4d4f2df 100644 --- a/gems/dotenv-merge/.structuredmerge/kettle-jem.lock +++ b/gems/dotenv-merge/.structuredmerge/kettle-jem.lock @@ -1,11 +1,12 @@ --- version: 1 template_state: - version: 7.1.18 - applied_at: '2026-09-07' + version: 7.1.26 + applied_at: '2026-09-10' changelog_replay: last_entry_key: kettle-jem-template-20260802-001 last_entry_date: '2026-08-02' + maintenance_changelog: {} checksums: ".aiignore.example": 48a5dfdd93afd1a15fdce39cc28ca9920263f00018b0968ab031fa744521e5ce ".config/mise/env.sh": aeea5a2ab489ba6e5467ae8de6e386ec8c8fe4ff31a044e69d0cd6a092dd6654 @@ -75,7 +76,7 @@ template_state: ".rubocop_rspec.yml.example": 288ad75e7eb14d87d80fafe6f7272217be5c57547536ee56c780a7d10ac7ec74 ".simplecov.example": 222f2e6ce8cf089c70a21f0f5e5423d4bd59a96fdb2ce7754b0fb3d6f430c229 ".structuredmerge/git-drivers.toml.example": 9d241a44c9edffcdbd3da018fa188a238089c3d1635040924df594a6929a4f97 - ".structuredmerge/kettle-jem.yml.example": 26949dc4ee0722415e72452cbc186bee6ef7b154eae33166d36f3fdb1ca6e46d + ".structuredmerge/kettle-jem.yml.example": ff65a738da1af7d60714026a81d3323a46c864e96ae3570b806afdf6e7149ff9 ".yard-lint.yml.example": 90def46867c9436b4e177c47d91fc8165f4602e335715aecc39f5587ae20b55b ".yardignore.example": 821f453c609df7d46145d675424b39dfbe6dfdca8edac5f367b85fff48502455 ".yardopts.example": 6fd6f2701713096a8a9ea095c213bbc68eeef37797c4754d97837e3229a3a5f6 @@ -88,7 +89,7 @@ template_state: CHANGELOG.transfer.md: 21331d8a9e58b4ff6e088b88eb408bcccb0f2f64e78f8f4d42ac3f11a24baad8 CITATION.cff.example: e404ea0a7919d78a83d53d80e211d17b9663576aa606583b709795dc023fd75c CODE_OF_CONDUCT.md.example: f1ad532f1860f73ef774c6b27a26d41f4bc1cb8813034f5957487766ebb0986b - CONTRIBUTING.md.example: 22570cfb3dde72be79b4b522b6d5ab13f95d778e40444483a096871fe0891b19 + CONTRIBUTING.md.example: 8d23cce2d061e0c20d619c3f66591df5f32821cd84c32d171df0b8ebe1217a55 FUNDING.md.example: 392d047904b1557b29f4b43d37ec403b7480edd5b6ab51180be979b57a91e6ba FUNDING.md.no-osc.example: 3ef0258dd3e3b7f7e17e8bc2d20dcbcb3e74aa5a5a6f51297075696645e34c77 Gemfile.example: 99500023987e81775a9b5ef14e92cb3992f2ac408e5f42454f2728eee9b49fb2 @@ -99,19 +100,19 @@ template_state: PolyForm-Small-Business-1.0.0.md.example: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 README.md.example: 21f491e3d73bfc1b74056a6dcba61f72c93dee3cfe5272ac164a20978454de21 REEK: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - RUBOCOP.md.example: c09e5533ccc59b70a2efa05c99f66e521137c1053d3c12eb43509cebd5b68b0e + RUBOCOP.md.example: d99871a0e4c1d323c92e7febf328f062bb4722069b2abfd0a83bf7daa8dcbf8c Rakefile.example: 569803e726b07ea26267fec6891367a3096a0dff3c266269a7081d36afe496af SECURITY.md.example: ee9411aa85f36d88363fdaea7a1baea4362b6ec112cf2688e711b05de1d3144c bin/setup.example: 0ac35089c95a91d8973fe7a318bf9fd98b9f8e00db92c5d9ca6cd858abb8d41b certs/pboling.pem.example: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - gem.gemspec.example: 83e834e8958a88e4817a57199f48f5ebb245548ce251c5c47372208693f03b17 + gem.gemspec.example: 12dcadc0b297ccd4e18b9d1e538b98ac8330ef9fb2a059ed6754ad59272b77fa gemfiles/modular/benchmark/r4/v0.5.gemfile.example: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 gemfiles/modular/benchmark/vHEAD.gemfile.example: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 gemfiles/modular/cgi/r4/v0.5.gemfile.example: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 gemfiles/modular/cgi/vHEAD.gemfile.example: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 gemfiles/modular/changelog.gemfile.example: 892598e0e7792eb205247ae28128cef6dfc647d2fb33968969152230d6f69288 gemfiles/modular/coverage.gemfile.example: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - gemfiles/modular/coverage_local.gemfile.example: 928d5f260d7b119c038baa56da9fb78dd524dee613aea33ab72894bbce5c506e + gemfiles/modular/coverage_local.gemfile.example: 92ea0d7a9d693553dc614afa2c43990f5c3778c2b00ef6c528e122c31bd506a1 gemfiles/modular/debug.gemfile.example: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 gemfiles/modular/documentation.gemfile.example: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c gemfiles/modular/documentation_local.gemfile.example: 84a20f5d4b0feb94c2cf2f7a8dce8f682f1483498e41484c2b447a5661fd1870 @@ -145,10 +146,10 @@ template_state: gemfiles/modular/stringio/r3/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/r4/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/vHEAD.gemfile.example: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - gemfiles/modular/style.gemfile.example: 3ad0585b4f2db8918580ca41ea8723f7a166d7a83cfd7f9613511094997106fd + gemfiles/modular/style.gemfile.example: 02fe3e8fd00e49b90c3ab30e19b51014ee50490f3eadcfd1d4a39f4c2c997dda gemfiles/modular/style_local.gemfile.example: c86beb711e766126a5be68be4be18255831625ac3650d5069383c4a83a9511f3 - gemfiles/modular/templating.gemfile.example: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - gemfiles/modular/templating_local.gemfile.example: 930057d3b909a72e39a39125c4e883a7ff71f5691e64426c0541f8c8fc75b83f + gemfiles/modular/templating.gemfile.example: 2b33c094677b53ad9dd2eafeb3a3be452f612380c61001a2e75b3c078b8ff72a + gemfiles/modular/templating_local.gemfile.example: ac7259516e69ffafb8b9342a897ddf6042adc46335743f474c342509cefd8f2e gemfiles/modular/webrick/r4/v1.9.gemfile.example: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea gemfiles/modular/webrick/vHEAD.gemfile.example: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b gemfiles/modular/x_std_libs.gemfile.example: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a @@ -175,7 +176,7 @@ template_state: shim/Gemfile.example: 0fb0d9d06fcfb1fd6ca6f0eeb5867253ca1ed221e03d28027719225f868b0637 shim/README.md.example: 3a2f7211b7f92a1dfae5e523b8e34b051a3d8af942144b05286eca0b3c8f6fbe shim/Rakefile.example: 572c94da7052083b39b62a6600785419e314a109efd7a3d8c3a96eb77ad34fd1 - shim/gem.gemspec.example: efae033238e4fd1355cfc134f5c9123f175d1ad1dc4a1a2e663899788c9e0870 + shim/gem.gemspec.example: 14a7015b3328005d1c3b5fda6886bd6da383707745f6eaaa781d6f9689600131 shim/lib/compat_require.rb.example: 94ee85e353a3ca08c8a35c9063d4ff789214ea594c7f803f6cf09d7142f48379 shim/lib/entrypoint.rb.example: dd57613520daca01d6f6bcaa9b83b00ff74505240dc04b84ceb686df3c0539d7 shim/lib/version.rb.example: 15e219ac3a928b5580035f891e415551213175020f1131f6e7ca0ccd55a1b2d6 @@ -189,370 +190,370 @@ files: recipe: template_source_application_simplecov action: write dest_sha256: 0d63d370e3410162776dc88a2f1be3da7c64a91ca919283058f8cf60f54d8f58 - input_fingerprint: 8bdeca1dd9fe5e77395727f6cd7249194f18a8ab7f1b9fbb229b50ff116f398b + input_fingerprint: 4a7ba67f40dabf88936497e7ce1a1547e34ed143238200104db3f91a849d9f56 template_sources: - ".simplecov.example" AGPL-3.0-only.md: recipe: template_source_application_AGPL_3_0_only_md action: write dest_sha256: d8a6cc31abc16b6748c7a21f21611f5a1ec33f67d22ca23d7da1c19b95496bee - input_fingerprint: c320b66402115561ec5b5e986aa5a7e75acedd0e7cc79ae388b2de76fb8929df + input_fingerprint: 537e15d88a60d167ac148d7e43f8211372ce1e0a750332b8586867c5affceeba template_sources: - AGPL-3.0-only.md.example Gemfile: recipe: template_source_application_Gemfile action: write - dest_sha256: e5abc0f45d463cdd40336d0bebb0d0117ffa52c41d7d2c25ece649d4d9edd47f - input_fingerprint: 58855581b5b76e52e8c5607893037eb58b63410608527f2d1ccc6a8ce507fb0d + dest_sha256: 2b2537b56cdc0d419ac7e165bc77ec8cd1996196eb45272910b6eb5f67a32f2e + input_fingerprint: 874e01b35970b7656adbcfae641315baf822a696e98f9bb993f14d27d9944ad5 template_sources: - Gemfile.example LICENSE.md: recipe: template_source_application_LICENSE_md action: write dest_sha256: f6188bfd474a636d2a526420ebb411250faa447d94c9b9ccee097128ce4101b5 - input_fingerprint: 5758932f1edf3a940890bcc73fe02995d2b0644f6f94b501a771517ba3529a89 + input_fingerprint: beefb7781c4e0ac94801ca4fb6c5dab9f4e773d00c406387917c528d33e9fd22 template_sources: - LICENSE.md.example PolyForm-Small-Business-1.0.0.md: recipe: template_source_application_PolyForm_Small_Business_1_0_0_md action: write dest_sha256: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 - input_fingerprint: 3a8bdd6a107d155b5875a2a3bbb8df7b04f69ae98befd0c71327c258dcf165eb + input_fingerprint: acce5c72de3b5df20aaf020a867ff886ccf612481cfcc20816843585a0b40202 template_sources: - PolyForm-Small-Business-1.0.0.md.example README.md: recipe: template_source_application_README_md action: write dest_sha256: 65bd249aa16f80109d5cfab965a82392c8f88ebd5afd1a01334fb4208b7baa8d - input_fingerprint: 6ed3f18acc9a1e431675bfa3b95981f8c3c2bed268fbc3ec8e7bc4cd70c14d39 + input_fingerprint: d54bf3dbbf779924f577d386f940e9d4637898f6ba1658d4123905c8fcd615e7 template_sources: - README.md.example Rakefile: recipe: template_source_application_Rakefile action: write - dest_sha256: 961b6cc5cb4feb5e2876c6685171b5443e1cd35b5f01b8b0eb4d648cb53febca - input_fingerprint: 4e23069bc2db778947294f3eaab51e38b1ea0a2c6faaccabd4b8694a0935f992 + dest_sha256: 6e9ddf7f6dabf78dd514dc8588772872bc5bf55b9a7a91527b53e3086732bac1 + input_fingerprint: b652b6287529733eb9fff6e6676c9d43ebfc5c53ccff9dc20b82dcaf1db07f8a template_sources: - Rakefile.example certs/pboling.pem: recipe: template_source_application_certs_pboling_pem action: write dest_sha256: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - input_fingerprint: 26abcbcbc929cc7a62bf4ccf534411d4379e8d0c54a7fdf386cf23104b00a287 + input_fingerprint: 857cff1d951c006b2432e6a591dec9c64da19c1b054f17caa0745ec93dc32a0b template_sources: - certs/pboling.pem.example dotenv-merge.gemspec: recipe: template_source_application_dotenv_merge_gemspec action: write - dest_sha256: b7ebd4e588b20be3667a80dfe4a190ca1a59fcca2aca7cbebff96a8769cf3685 - input_fingerprint: 0a51872763307cd8005713cee0345030519e745c49da638730d91d433319f305 + dest_sha256: c65ef537a5c2e38737ddd82dca9c518734c335ec28207d577c72dacee763b185 + input_fingerprint: d5d2cfe9e9fb51f01d0783e3f5eb59cb8dd822361a896c7fdf88635b16740550 template_sources: - gem.gemspec.example gemfiles/modular/benchmark/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_r4_v0_5_gemfile action: write dest_sha256: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 - input_fingerprint: '090ac96becf640cf25d2cc6de9fecb841e208a46ba91095d483670f77e584f90' + input_fingerprint: c4ab9ee5a13814ee16fef1abc08652461e2240f3d336a98db67a24e32e796957 template_sources: - gemfiles/modular/benchmark/r4/v0.5.gemfile.example gemfiles/modular/benchmark/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_vHEAD_gemfile action: write dest_sha256: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 - input_fingerprint: 91378653b6ae2f6a18479944611d09a8aba2edde01572b86dbc84fc2b313dc68 + input_fingerprint: da6bf2191a84da5f900f7b9a74e0deb7c55182152608ef00c296fa3ab2d07c7a template_sources: - gemfiles/modular/benchmark/vHEAD.gemfile.example gemfiles/modular/cgi/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_cgi_r4_v0_5_gemfile action: write dest_sha256: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 - input_fingerprint: a097d76147430bed5a3881c6d3aee57e3dc970ca9b1534159f741661328eb991 + input_fingerprint: 7e87072308652f529351af061acbb50a7d407ae19ad7e3b0e9cff3c9e40356ff template_sources: - gemfiles/modular/cgi/r4/v0.5.gemfile.example gemfiles/modular/cgi/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_cgi_vHEAD_gemfile action: write dest_sha256: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 - input_fingerprint: fd68a8d322cfb853bf25e26a979f426d7ed1aad21236581e967f1799ff5f8921 + input_fingerprint: 7a28393fb3adb8cb49b47319e460b35a7f6602b1588b4b3156253e83e495099e template_sources: - gemfiles/modular/cgi/vHEAD.gemfile.example gemfiles/modular/changelog.gemfile: recipe: template_source_application_gemfiles_modular_changelog_gemfile action: write dest_sha256: da669526144fbff33aef207db9541b6fd6c254437f94dec2fab70fc55a7757cd - input_fingerprint: e631f02702ef0af6b75e0745c878d78faa27313dd2ce16d58ad6b51054983aef + input_fingerprint: 82db81032a744a45ce321eaf031f9a9db4cb6e9b3cbdea5c50589f1c6d82a21a template_sources: - gemfiles/modular/changelog.gemfile.example gemfiles/modular/coverage.gemfile: recipe: template_source_application_gemfiles_modular_coverage_gemfile action: write dest_sha256: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - input_fingerprint: 13d92095d32b83fed9aad64d03cd4321bcdc4e86508503f133230ce7f4905685 + input_fingerprint: 2191a5b57c4d4e296b2ec19f7ede5ecca75b05b78d5bea9ba5ab440c5e126d56 template_sources: - gemfiles/modular/coverage.gemfile.example gemfiles/modular/coverage_local.gemfile: recipe: template_source_application_gemfiles_modular_coverage_local_gemfile action: write - dest_sha256: 2b493414df06261ba8acb6f0eb18bf3fdd701d7cb5f967a9d15a3f42a4741827 - input_fingerprint: 43c91f7b367119287f6aa28478c12ef9ccf70efc0b3489faa79fe79301bec9cf + dest_sha256: 92c9a599c8f6867ec532880f73568f2736ac05d8973ec524b42fd5dbe6aeda3e + input_fingerprint: 5596225229886f7ea14fdfb41b188d859e7e99d36f78e7f6e380565958f593ec template_sources: - gemfiles/modular/coverage_local.gemfile.example gemfiles/modular/debug.gemfile: recipe: template_source_application_gemfiles_modular_debug_gemfile action: write dest_sha256: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 - input_fingerprint: 9e2f25bf721b0fb2208a279becbd7d468bb84570ee92a853edac2ae2252da311 + input_fingerprint: 0343d4c155bbf8f1d469a7ddc56f44d67cab831732b4356258ce120e8145e359 template_sources: - gemfiles/modular/debug.gemfile.example gemfiles/modular/documentation.gemfile: recipe: template_source_application_gemfiles_modular_documentation_gemfile action: write dest_sha256: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c - input_fingerprint: 817315836f88ad0d06df5dad502dcf170f750202fa494160263450081661ab28 + input_fingerprint: 831b521bd99e17850aa32e053f6ec77c7f85ebb48813654f1d9d98d97f8dfe44 template_sources: - gemfiles/modular/documentation.gemfile.example gemfiles/modular/documentation_local.gemfile: recipe: template_source_application_gemfiles_modular_documentation_local_gemfile action: write dest_sha256: 2058173855b9a4acc6d5efa20520e49734243eef6cf0b5e9063e0e5866a08e9c - input_fingerprint: 5bb546ce6b43eea41e9f016eb791f3ad0390105d7e7aa123692933974aca1db2 + input_fingerprint: 7e5d291ff2adc7f10f8090a5bc3ae8814814758947187d150b2d342b227cabca template_sources: - gemfiles/modular/documentation_local.gemfile.example gemfiles/modular/erb/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r2_v3_0_gemfile action: write dest_sha256: 3793e7dc9ef23a7ccd893d48cbba092fd27594c63e65cca011cc658218425670 - input_fingerprint: f55b1e36191f97c0003e481fab4bbdbd17693f09e0de1990d06f0d5371eec145 + input_fingerprint: f7f1bc93ffde9827ad453e1042f45b62047ef3f6894e51bca221bc1ae6342a9d template_sources: - gemfiles/modular/erb/r2/v3.0.gemfile.example gemfiles/modular/erb/r3/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r3_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 3ba89d184081dfb8b90e19663d07fd866a5e79ed748aab68fe3ecf22cc3ae3ae + input_fingerprint: ba744b3ff696becfb1960618c671c24ee93d9ea89211b3383a160a3f4ef4f4aa template_sources: - gemfiles/modular/erb/r3/v5.0.gemfile.example gemfiles/modular/erb/r4/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r4_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 12e2742e3c2ed941c561acbe02882f320d4b0df04aae9ca5b70402bf46dd8085 + input_fingerprint: 67aefbd5740c5a4877952b5142330dcb63eff5162813a31e9da3d782d00fcdd5 template_sources: - gemfiles/modular/erb/r4/v5.0.gemfile.example gemfiles/modular/erb/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_erb_vHEAD_gemfile action: write dest_sha256: ad6f104a49e80e0cf625440e3dc816343fe7e2f037fc4971df75e7bb4305c683 - input_fingerprint: 47659707344065e9d1ace7ce0e7df7319e1db93a286d96955b6e48c4bd0dea6b + input_fingerprint: 6f6868b08f4f280161d48faef4585472ed7b544da89a0f3277d0e193857722dd template_sources: - gemfiles/modular/erb/vHEAD.gemfile.example gemfiles/modular/json/truffleruby_22_3.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_22_3_gemfile action: write dest_sha256: 249c12eacbe90f9d0d2e81e7a62c4c7e9102e504ededcda4ecf660cb3bb68be4 - input_fingerprint: 90a4991bd179fd21c535602eb855758b7bac934f8665fafbbbe67470fca212f2 + input_fingerprint: 6df197d8156aedbf9b8ebbae6da3fa993ea07cf5db80f0a6354660575f715d0b template_sources: - gemfiles/modular/json/truffleruby_22_3.gemfile.example gemfiles/modular/json/truffleruby_23_0.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_0_gemfile action: write dest_sha256: 66aa010567f7afa1af8244a74c3c88ecaaf84dc87b6a25180691bb480d02ed28 - input_fingerprint: 736683d8a296e2160842394e6ec3d755f09e49771502b7e918a2d1a64d4bba56 + input_fingerprint: e182f6a7a9a114f8efe5f25ff3306e887333bc6412f2f3de98507a3454e3a013 template_sources: - gemfiles/modular/json/truffleruby_23_0.gemfile.example gemfiles/modular/json/truffleruby_23_1.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_1_gemfile action: write dest_sha256: '080fcbdaf2bec73cad40832a3d51eebb380af789917b96f493d1460b0dd6361d' - input_fingerprint: 569e97d3831c1e912c7846532d17963783652447d4712862f9c88fc10204aed8 + input_fingerprint: 5022a91c696d4f7ed39b3a97cf24c5ebbba162befc8e6c8850ef7eb54a35fd40 template_sources: - gemfiles/modular/json/truffleruby_23_1.gemfile.example gemfiles/modular/mutex_m/r2/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r2_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 07d12aa374cfe5a1ff8d0aeb333638880682693703d9f427c41250c864bd6d8b + input_fingerprint: bea76acf256df663b9a3c164ca8d069f3d025edaa90bce9ecf2a0781cb647bdb template_sources: - gemfiles/modular/mutex_m/r2/v0.3.gemfile.example gemfiles/modular/mutex_m/r3/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r3_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 7ca9ff4743f9cd31cb58f2cde8036ca33f102995d805a2bc4960c36ad8298bd5 + input_fingerprint: bbed6066e39bcc36ccfdae12c6758d57dcd866a34119a3c3bec8120114547379 template_sources: - gemfiles/modular/mutex_m/r3/v0.3.gemfile.example gemfiles/modular/mutex_m/r4/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r4_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 5f6cfbbeadad848a9c8e9133189d867f5061d5b3770d0c22fecb3dbb0b145505 + input_fingerprint: 93d9f3218478acc974d4caa3cd721c5e6248c99dd3b11957366a83a2b3ad6960 template_sources: - gemfiles/modular/mutex_m/r4/v0.3.gemfile.example gemfiles/modular/mutex_m/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_vHEAD_gemfile action: write dest_sha256: '08018641c97f894788fa91b462da504ab2237213d18d95404136c393274ae3cb' - input_fingerprint: 23b6287d9ad467477c70c40c4082bccbc963c3d9d716cddd67eae63b86fa551e + input_fingerprint: '01783482bb6989c4ee4f03731bf01c57020cdeb19429fbed058367a827011df7' template_sources: - gemfiles/modular/mutex_m/vHEAD.gemfile.example gemfiles/modular/optional.gemfile: recipe: template_source_application_gemfiles_modular_optional_gemfile action: write dest_sha256: f770e6e9a9dd2bd0f1f132e882d88038b2e21127dce3afe270908c7338c28bfd - input_fingerprint: f7e604ae5783cd2027426926dc1e956336d5a750b99ad8ca8e21035f750dc197 + input_fingerprint: 8fc4bca349ce67e8d3834d1c5c0ce6636a546a064126778ebf2cd55f2abe662e template_sources: - gemfiles/modular/optional.gemfile.example gemfiles/modular/rspec.gemfile: recipe: template_source_application_gemfiles_modular_rspec_gemfile action: write dest_sha256: d043f5c9344f6435edb4607c5adaf42c78e7fb6b8b6726007de2bbedefb376c3 - input_fingerprint: 1ab73b46653d907a6dcf80f03de3c66f1fec7d3fa3a7dc2ccad30b4190f06300 + input_fingerprint: fd5abe48aee3f671340e54f30b5ec317295765759ba20d503dd582b06fbf1387 template_sources: - gemfiles/modular/rspec.gemfile.example gemfiles/modular/runtime_heads.gemfile: recipe: template_source_application_gemfiles_modular_runtime_heads_gemfile action: write dest_sha256: 6ac7158c4a3088190f2a9082f01439eb27eca2172ab3464b15c9cb045aa885e1 - input_fingerprint: 6918d1fbe8cdf62db63f2c566518de841185a2bed2fb750b9bedf01dd1226f3d + input_fingerprint: 4aeddbf78126bc2041a18eed4228097f9badbfd18a3cea23d77a0eb75531a0e0 template_sources: - gemfiles/modular/runtime_heads.gemfile.example gemfiles/modular/stringio/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r2_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 0676d6e5badb94f0867503876e63f9f8e971c3b9295e91c41054c6cdc845447a + input_fingerprint: 4bd4e433ed8692b8d60b0cf8dac9a2760155a5980157a549dbf863876dfa5819 template_sources: - gemfiles/modular/stringio/r2/v3.0.gemfile.example gemfiles/modular/stringio/r3/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r3_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 8089c4f4e053919ade4da5b1687d00b6c3d7ba69b45fe281de1cb4f01732e4b6 + input_fingerprint: 59ca619187d6bb60e9a686a3b58317ae2466736938c84326e87bcc70b4ddc034 template_sources: - gemfiles/modular/stringio/r3/v3.0.gemfile.example gemfiles/modular/stringio/r4/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r4_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 38f13ae5239b0cc64ec91045eb65169b6b34b528617dd0fa7a0787cf97c24094 + input_fingerprint: 55aa51d9dddf70dd5697cce00255f7ed00482c90033a68316c194515379ed8fa template_sources: - gemfiles/modular/stringio/r4/v3.0.gemfile.example gemfiles/modular/stringio/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_stringio_vHEAD_gemfile action: write dest_sha256: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - input_fingerprint: 2b0da4cb4f399aba4857a5ed0770c18cd92faca14e08805f3cef2e0986149ad6 + input_fingerprint: 8a0efe820a4128d78642e85aedcb4d792be4167b50902cdef022b38392aaedc5 template_sources: - gemfiles/modular/stringio/vHEAD.gemfile.example gemfiles/modular/style.gemfile: recipe: template_source_application_gemfiles_modular_style_gemfile action: write - dest_sha256: 2a3d46dcb8a9394f595f273f5eb0403d0a552837754ab109afc9ba79a7159083 - input_fingerprint: 12ae896d37d435da0612dc65afedc1612f47e632b00b038df4b94f41bd9c0e4a + dest_sha256: 9a24acff0054573c30f5d84d0418cd465ba3794d075bb5a36801410ac40e0787 + input_fingerprint: 439cfbf914e8666d8796a474cc5b5442b5a9f9c9be28076bb93ee46ad877e414 template_sources: - gemfiles/modular/style.gemfile.example gemfiles/modular/style_local.gemfile: recipe: template_source_application_gemfiles_modular_style_local_gemfile action: write dest_sha256: 55eb9c149cdb2f29c9f31abe2d55a4f334e00fb859681dd17c42149a3f28ca36 - input_fingerprint: 276c4907bd71be99333822eaff8edff6bd69ca57627623ef1b7da8c0007bb55c + input_fingerprint: 2e44a2608ba950e6037146add9926334fac4bb8b9e74071b95ed695857b961e8 template_sources: - gemfiles/modular/style_local.gemfile.example gemfiles/modular/templating.gemfile: recipe: template_source_application_gemfiles_modular_templating_gemfile action: write - dest_sha256: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - input_fingerprint: b096d37e7db2ea54eba4c8629f921084148aec8604f3ae1c8a8910059b8cf34c + dest_sha256: 432ba59798d31b899268257c432443a017c5a9bd2c0c7f9f2216617e14150cd3 + input_fingerprint: 20ac470bf4427bf9699c094dc80a5c8f16e4324a9b222b678c7edcd70e5ae254 template_sources: - gemfiles/modular/templating.gemfile.example gemfiles/modular/templating_local.gemfile: recipe: template_source_application_gemfiles_modular_templating_local_gemfile action: write - dest_sha256: 0dddc2807b9f168e935ac84dbe5a6fcfb50ff4d5402832e14519137419049ef6 - input_fingerprint: c24d9968d8526952efa9c5e8b185f254d1cc80e0807dd70653f64512ef089793 + dest_sha256: e0170b6141e860778493482b982c47fcbc6d982b0aac95b8690077d2a73e826d + input_fingerprint: 67e9e264e199d8d98c43dc909a35df2d05482a550272adfe945d639eda281e2c template_sources: - gemfiles/modular/templating_local.gemfile.example gemfiles/modular/webrick/r4/v1.9.gemfile: recipe: template_source_application_gemfiles_modular_webrick_r4_v1_9_gemfile action: write dest_sha256: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea - input_fingerprint: bb5e71e50c17cca25ccbc1bead9bdbf937c758d1c587f5d84e08f3546fe642f6 + input_fingerprint: 906a7a034f62fac4b7175be819f050be6a346a899bc624f7464fdcdbca90aa6d template_sources: - gemfiles/modular/webrick/r4/v1.9.gemfile.example gemfiles/modular/webrick/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_webrick_vHEAD_gemfile action: write dest_sha256: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b - input_fingerprint: c649e174466062a5894c25ab11d9e835e357be33d1945b2dd9c77289e9a6e03d + input_fingerprint: 511697aa8e21b4fcafade7de3b8051e12541ef741b9f08a8b6ce9c08d96e8de7 template_sources: - gemfiles/modular/webrick/vHEAD.gemfile.example gemfiles/modular/x_std_libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_gemfile action: write dest_sha256: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a - input_fingerprint: ccf0f4f2a3365088a913616a83ec5873b3953dee71eb12b6f20a870e942357c0 + input_fingerprint: 57e20ce737452878d9fc971c207eb201f244d3a1b58cd6dad72d1e2e7844ac3b template_sources: - gemfiles/modular/x_std_libs.gemfile.example gemfiles/modular/x_std_libs/r2/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r2_libs_gemfile action: write dest_sha256: e80ec8ad06cb1b31ac982bc25cf7696987fca131aa1001eaefd0bf5cd379c273 - input_fingerprint: ad280fc536db1d0b492268a2e6b92cc808bade6e5fe8634f530f4c2c25e4361c + input_fingerprint: aa6baff1b757e42270b9c9678998a0df543f0204eadb3f9db176dd2d4eb71db2 template_sources: - gemfiles/modular/x_std_libs/r2/libs.gemfile.example gemfiles/modular/x_std_libs/r3.1/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_1_libs_gemfile action: write dest_sha256: 9f8565c40b09bea1bc4c2e2ad87fe11400c3c51a2b235655bfcd8e491ed88ca8 - input_fingerprint: 4410d2ae883f6ec0531b2f60a546b1953f75742d47e48ac5cd689c98630529e8 + input_fingerprint: e0b9cf74ea23a72155fa2ae10a75c2dfdb7924ffe2553223563aac4ca9826722 template_sources: - gemfiles/modular/x_std_libs/r3.1/libs.gemfile.example gemfiles/modular/x_std_libs/r3/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_libs_gemfile action: write dest_sha256: 546f8849f4267bb19aa10ff0de40be30957197f229e6887847181ea9127b2650 - input_fingerprint: b9ca4d86ff284756c7a0e3713ceedae574bbae9e901818b8a5b0a613fdd730ac + input_fingerprint: c921f1b1ad49c95a29ce0be24fb46cc86207a6b33405c9f45b58afad2073d341 template_sources: - gemfiles/modular/x_std_libs/r3/libs.gemfile.example gemfiles/modular/x_std_libs/r4/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r4_libs_gemfile action: write dest_sha256: 8c2582eaa218d216b98c86c933465295c8b4e43f3251ea388b9eaf6e471f8da6 - input_fingerprint: 6763db16765d817ca8f4ad4e4a7aedf0e8e559e450b7a303bdd5edeb9680744c + input_fingerprint: a263f57d5074fef60b6123d3095c40e7e881085579e4a3d7de435a6fd550807b template_sources: - gemfiles/modular/x_std_libs/r4/libs.gemfile.example gemfiles/modular/x_std_libs/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_vHEAD_gemfile action: write dest_sha256: d3133ec4c0638363a7fb025d19be7e95a615fd61c35ddb8d17f2280ee74a7486 - input_fingerprint: f922c81c123f3642d80cda662c21a2c0b6319349a9de9eda292cba9be77dd7c9 + input_fingerprint: 67a6b6144e19dded07de951863c74983fa0240b00acd0ab5df08ddeb784c58b6 template_sources: - gemfiles/modular/x_std_libs/vHEAD.gemfile.example lib/dotenv/merge/version.rb: recipe: template_source_application_lib_dotenv_merge_version_rb action: write - dest_sha256: 63272b26a0c4305fbc7e4e300bcaf804539d610d4d61e8df108072bfd4483906 - input_fingerprint: 5be47796d3b4e1bfd434609ce1e920a31d38f830a331de27d5ef65d610acc266 + dest_sha256: 678ed7ed27f123433adb13c1fb33a79c26ecfed3473e8c49715f0407f320bfae + input_fingerprint: f7d919c29effc9ff231315e732b33eaa03c2b5d61cd770e43e98ca6cd54c3430 template_sources: - lib/gem/version.rb.example mise.toml: recipe: template_source_application_mise_toml action: write dest_sha256: 7d267154ca4f081b0ac7da804c0180c2b091aec5f1c877417c1c320f4f369c88 - input_fingerprint: 53733e36246c4eddb8a55b8787484e562959a0046a272b29bf39273a5c15849e + input_fingerprint: 6a7e266d6932555c58359088e40c24bbe4fb94bc11bf0600ffcbda5f54e14a01 template_sources: - mise.toml.no-osc.example sig/dotenv/merge.rbs: recipe: template_source_application_sig_dotenv_merge_rbs action: write dest_sha256: 88d30f1710bf439297c0ae16bcb2331801776f05525c8207c2571e71f02e4895 - input_fingerprint: 96ab3a750f82a30eba547986f20531b9b03dba7067ba136e66e249e92acce833 + input_fingerprint: b5a6f90f8080d68bb534e4fe392988cc1118a2010c59cb59a6c3f44e8e74f7c9 template_sources: - sig/gem.rbs.example spec/spec_helper.rb: recipe: template_source_application_spec_spec_helper_rb action: write dest_sha256: f79c27ea9e252d9b84f568e029450cb522847de386998317f83f614d815262f5 - input_fingerprint: c5b1403971ede283b0456041458f113316a6b27e21fdc0504d796574e7e4aff0 + input_fingerprint: 87204939d8685037dc10acbf34e6fe677a615483afce13da7ca2f7d9cfac7543 template_sources: - spec/spec_helper.rb.example diff --git a/gems/dotenv-merge/Gemfile b/gems/dotenv-merge/Gemfile index ab5ae0a0e..1ff4f19fc 100644 --- a/gems/dotenv-merge/Gemfile +++ b/gems/dotenv-merge/Gemfile @@ -19,7 +19,7 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } # Include dependencies from dotenv-merge.gemspec gemspec -gem 'kettle-family', '~> 1.2', '>= 1.2.97' +gem 'kettle-family', '~> 1.2', '>= 1.2.100' # Local workspace dependency wiring for *_local.gemfile overrides gem 'nomono', '~> 1.1', '>= 1.1.5', require: false # ruby >= 3.2.0 diff --git a/gems/dotenv-merge/Gemfile.lock b/gems/dotenv-merge/Gemfile.lock index b45d64ddf..54a601316 100644 --- a/gems/dotenv-merge/Gemfile.lock +++ b/gems/dotenv-merge/Gemfile.lock @@ -10,123 +10,123 @@ GIT PATH remote: . specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) + dotenv-merge (7.1.9) + ast-merge (= 7.1.9) + plain-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) + ast-crispr-markdown-markly (7.1.9) + ast-crispr (= 7.1.9) + markdown-merge (= 7.1.9) + markly-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism specs: - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) + ast-crispr-ruby-prism (7.1.9) + ast-crispr (= 7.1.9) + prism-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) + ast-crispr (7.1.9) + ast-merge (= 7.1.9) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ast-merge-git (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: - ast-merge (7.1.8) + ast-merge (7.1.9) benchmark token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) + ast-template (7.1.9) + ast-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + bash-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + binary-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) + citrus-toml-merge (7.1.9) + ast-merge (= 7.1.9) + toml-merge (= 7.1.9) toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge specs: - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) commonmarker (~> 2.2) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + go-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + html-merge (7.1.9) + ast-crispr (= 7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + json-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: - kettle-jem (7.1.25) + kettle-jem (7.1.26) addressable (>= 2.8, < 3) ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) @@ -160,122 +160,122 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge specs: - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown (~> 2.5) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + markdown-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) + markly-merge (7.1.9) + markdown-merge (= 7.1.9) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge specs: - parslet-toml-merge (7.1.8) + parslet-toml-merge (7.1.9) toml (~> 0.3) - toml-merge (= 7.1.8) + toml-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + plain-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) + prism-merge (7.1.9) + ast-merge (= 7.1.9) prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + psych-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) + yaml-merge (= 7.1.9) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) + rbs-merge (7.1.9) + ast-merge (= 7.1.9) rbs (>= 3.10) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + rust-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) + smorg-rb (7.1.9) + ast-merge (= 7.1.9) + ast-merge-git (= 7.1.9) + bash-merge (= 7.1.9) diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) + dotenv-merge (= 7.1.9) + go-merge (= 7.1.9) + html-merge (= 7.1.9) + json-merge (= 7.1.9) kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) + markdown-merge (= 7.1.9) + plain-merge (= 7.1.9) + prism-merge (= 7.1.9) + psych-merge (= 7.1.9) + rbs-merge (= 7.1.9) + rust-merge (= 7.1.9) + toml-merge (= 7.1.9) + typescript-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + toml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: - tree_haver (7.1.8) + tree_haver (7.1.9) citrus (~> 3.0) parslet (~> 2.0) tree_sitter_language_pack (>= 1.16.2, < 2.0) @@ -284,25 +284,25 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + typescript-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + yaml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) + zip-merge (7.1.9) + binary-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) GEM @@ -336,6 +336,8 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) + commonmarker (2.10.0) + rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -465,11 +467,15 @@ GEM lint_roller (1.1.0) logger (1.7.0) markly (0.19.0) + mini_portile2 (2.8.9) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) reline (~> 0.6) mutex_m (0.3.0) + nokogiri (1.19.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-musl) @@ -503,6 +509,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) + rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -696,13 +705,16 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.16.2-aarch64-linux) + tree_sitter_language_pack (1.17.0) + rb_sys (>= 0.9.130, < 0.10) + sorbet-runtime (~> 0.5) + tree_sitter_language_pack (1.17.0-aarch64-linux) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-arm64-darwin) + tree_sitter_language_pack (1.17.0-arm64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-linux) + tree_sitter_language_pack (1.17.0-x86_64-linux) sorbet-runtime (~> 0.5) tsort (0.2.0) tty-cursor (0.7.1) @@ -784,9 +796,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.31) + kettle-dev (~> 3.0, >= 3.0.34) kettle-drift (~> 1.0, >= 1.0.13) - kettle-family (~> 1.2, >= 1.2.97) + kettle-family (~> 1.2, >= 1.2.100) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) @@ -807,12 +819,12 @@ DEPENDENCIES reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) - rubocop-lts (~> 24.2, >= 24.2.1) - rubocop-lts-rspec (~> 1.0, >= 1.0.5) + rubocop-lts (~> 24.2, >= 24.2.3) + rubocop-lts-rspec (~> 1.0, >= 1.0.6) rubocop-minitest (~> 0.40, >= 0.40.0) rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! - rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) ruby-merge! ruby-progressbar (~> 1.13) rust-merge! @@ -843,33 +855,34 @@ CHECKSUMS appraisal2 (3.2.3) sha256=3a6cfaf8a444e02707b9a34154af1c4902fbe99d9d2168d7e81dd83ec77e6db7 appraisal2-rubocop (1.0.2) sha256=1dae97c1be087cf9c098a3a72fd41f873435e9b8b39687e633b36c9ccb22bff4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.8) - ast-crispr-markdown-markly (7.1.8) - ast-crispr-ruby-prism (7.1.8) - ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) + ast-crispr (7.1.9) + ast-crispr-markdown-markly (7.1.9) + ast-crispr-ruby-prism (7.1.9) + ast-merge (7.1.9) + ast-merge-git (7.1.9) + ast-template (7.1.9) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.8) + bash-merge (7.1.9) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) - bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae + binary-merge (7.1.9) + bundler (4.1.0.beta1) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.8) + citrus-toml-merge (7.1.9) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 + commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e commonmarker (2.10.0-x86_64-darwin) sha256=01e0830ed0319825ecdc16411c90acd3f661d1568dfc178731b3f64d0ce2363d commonmarker (2.10.0-x86_64-linux) sha256=945c510c0bfca9022245928e2248468fe3ddad58c939be0c37b20082cc392880 commonmarker (2.10.0-x86_64-linux-musl) sha256=288cd4fb9f17eed2ffa73551ef241dcf594e0f484b2aee2a0999540333c0618e - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) completely (0.8.0) sha256=e493cd5d84805f47917a41f277ecbfe5f35363bed670be5a957d3acaed8c6c5e concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 @@ -878,7 +891,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docopt_ng (0.7.1) sha256=a024148ee4fa3ab1a8a04411aa4370f39cf2b446e63562097d418b7974a15667 - dotenv-merge (7.1.8) + dotenv-merge (7.1.9) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -891,35 +904,37 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) + go-merge (7.1.9) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) + html-merge (7.1.9) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a - json-merge (7.1.8) - kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + json-merge (7.1.9) + kettle-changelog (1.0.7) + kettle-dev (3.0.34) + kettle-drift (1.0.13) kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 - kettle-jem (7.1.25) + kettle-jem (7.1.26) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 - kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd + kettle-soup-cover (3.0.10) kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 - markdown-merge (7.1.8) + markdown-merge (7.1.9) markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca - markly-merge (7.1.8) + markly-merge (7.1.9) + mini_portile2 (2.8.9) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 + nokogiri (1.19.4) nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af nokogiri (1.19.4-arm64-darwin) sha256=a46db9853286e6597b36ebc6953817d15acf3a299583eb3f89fdc6f91dd63527 @@ -933,20 +948,22 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) - plain-merge (7.1.8) + parslet-toml-merge (7.1.9) + plain-merge (7.1.9) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.8) + prism-merge (7.1.9) psych (5.5.0) sha256=4b245bbbd0f3238df8ccee766ebc1a6b062b10e4ee1d3284eb588739ba156a0a - psych-merge (7.1.8) + psych-merge (7.1.9) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 - rbs-merge (7.1.8) + rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -982,11 +999,11 @@ CHECKSUMS rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.8) + ruby-merge (7.1.9) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) + rust-merge (7.1.9) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +1011,7 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) + smorg-rb (7.1.9) sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,25 +1027,26 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.8) + toml (0.3.0) + toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb - tree_haver (7.1.8) - tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 - tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 - tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 - tree_sitter_language_pack (1.16.2-x86_64-linux) sha256=d8151e6e44e35ace9de3611c76b730896beab17f427db06d8f76666332a5dc60 + tree_haver (7.1.9) + tree_sitter_language_pack (1.17.0) + tree_sitter_language_pack (1.17.0-aarch64-linux) + tree_sitter_language_pack (1.17.0-arm64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-linux) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f tty-cursor (0.7.1) sha256=79534185e6a777888d88628b14b6a1fdf5154a603f285f80b1753e1908e0bf48 tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) + typescript-merge (7.1.9) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 yaml-converter (0.2.5) sha256=a5214fe1a6c2df88bd34a35bcded1b1dcd30135548130df2e03b54ca8c0f2423 - yaml-merge (7.1.8) + yaml-merge (7.1.9) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.8) sha256=73d935d43e3479d65ce8aff25c7d3100e8bb83528a2adaa0ed824e5046ac99e7 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -1037,8 +1055,8 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) + zip-merge (7.1.9) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH - 4.0.20 + 4.1.0.beta1 diff --git a/gems/dotenv-merge/Rakefile b/gems/dotenv-merge/Rakefile index 7a21d73fe..77ed1ad23 100644 --- a/gems/dotenv-merge/Rakefile +++ b/gems/dotenv-merge/Rakefile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -# dotenv-merge Rakefile v7.1.18 - 2026-09-07 +# dotenv-merge Rakefile v7.1.26 - 2026-09-09 # Ruby 2.3 (Safe Navigation) or higher required # # See LICENSE.md for license information. diff --git a/gems/dotenv-merge/bin/rubocop-gradual b/gems/dotenv-merge/bin/rubocop-gradual new file mode 100755 index 000000000..7c7ff0635 --- /dev/null +++ b/gems/dotenv-merge/bin/rubocop-gradual @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'rubocop-gradual' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'rubygems' +require 'bundler/setup' + +load Gem.bin_path('rubocop-gradual', 'rubocop-gradual') diff --git a/gems/dotenv-merge/dotenv-merge.gemspec b/gems/dotenv-merge/dotenv-merge.gemspec index 6a506e1fe..88ca2ccd5 100644 --- a/gems/dotenv-merge/dotenv-merge.gemspec +++ b/gems/dotenv-merge/dotenv-merge.gemspec @@ -121,7 +121,7 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.31') # ruby >= 4.0.0 + spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.34') # ruby >= 4.0.0 # Security spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 diff --git a/gems/dotenv-merge/gemfiles/modular/coverage_local.gemfile b/gems/dotenv-merge/gemfiles/modular/coverage_local.gemfile index 37917caac..d6c890e46 100644 --- a/gems/dotenv-merge/gemfiles/modular/coverage_local.gemfile +++ b/gems/dotenv-merge/gemfiles/modular/coverage_local.gemfile @@ -29,11 +29,31 @@ Kernel.send(:gem, 'nomono', *nomono_activation_requirements) require 'nomono/bundler' local_gems = %w[kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -local_gems_to_eval = local_gems - %w[] - declared_gems # export KETTLE_DEV_DEV=/path/to/my platform :mri do + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + local_gems_to_eval = local_gems - %w[] - declared_gems + eval_nomono_gems( gems: local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/dotenv-merge/gemfiles/modular/style.gemfile b/gems/dotenv-merge/gemfiles/modular/style.gemfile index 59c5dc1a3..41ec99454 100644 --- a/gems/dotenv-merge/gemfiles/modular/style.gemfile +++ b/gems/dotenv-merge/gemfiles/modular/style.gemfile @@ -24,9 +24,9 @@ platform :mri do if ENV.fetch('RUBOCOP_LTS_DEV', 'false').casecmp('false').zero? declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) - gem 'rubocop-lts', '~> 24.2', '>= 24.2.1' unless declared_gems.include?('rubocop-lts') - gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.5' unless declared_gems.include?('rubocop-lts-rspec') - gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.6' unless declared_gems.include?('rubocop-ruby3_2') + gem 'rubocop-lts', '~> 24.2', '>= 24.2.3' unless declared_gems.include?('rubocop-lts') + gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.6' unless declared_gems.include?('rubocop-lts-rspec') + gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.8' unless declared_gems.include?('rubocop-ruby3_2') else eval_gemfile('style_local.gemfile') end diff --git a/gems/dotenv-merge/gemfiles/modular/templating.gemfile b/gems/dotenv-merge/gemfiles/modular/templating.gemfile index 6af159bd7..ce51a08ed 100644 --- a/gems/dotenv-merge/gemfiles/modular/templating.gemfile +++ b/gems/dotenv-merge/gemfiles/modular/templating.gemfile @@ -18,7 +18,7 @@ end if structuredmerge_remote # Merge recipes for released installs. - gem 'kettle-jem', '>= 7.0' + gem 'kettle-jem', '~> 7.1', '>= 7.1.26' end if kettle_remote diff --git a/gems/dotenv-merge/gemfiles/modular/templating_local.gemfile b/gems/dotenv-merge/gemfiles/modular/templating_local.gemfile index e007396e0..80b7f8c02 100644 --- a/gems/dotenv-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/dotenv-merge/gemfiles/modular/templating_local.gemfile @@ -65,9 +65,7 @@ structuredmerge_local_gems = %w[ kettle_dev_local_gems = %w[ kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift ] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[] -kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - (declared_gems - %w[kettle-dev]) if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( @@ -81,6 +79,28 @@ if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 end if ENV.fetch('KETTLE_DEV_DEV', 'false').casecmp('false') != 0 + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - declared_gems + eval_nomono_gems( gems: kettle_dev_local_gems_to_eval, prefix: 'KETTLE_DEV', From 6234412424ad06ba38dc50d4199a2cc0c13ee93f Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 23:54:26 -0400 Subject: [PATCH 095/137] =?UTF-8?q?=F0=9F=8E=A8=20Template=20html-merge=20?= =?UTF-8?q?by=20kettle-family?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/html-merge/.kettle-drift.lock | 18 + gems/html-merge/.rubocop_gradual.lock | 7 +- .../.structuredmerge/kettle-jem.lock | 143 ++++---- gems/html-merge/Gemfile | 2 +- gems/html-merge/Gemfile.lock | 318 +++++++++--------- gems/html-merge/Rakefile | 2 +- gems/html-merge/bin/rubocop-gradual | 16 + .../gemfiles/modular/coverage_local.gemfile | 24 +- .../html-merge/gemfiles/modular/style.gemfile | 6 +- .../gemfiles/modular/templating.gemfile | 2 +- .../gemfiles/modular/templating_local.gemfile | 24 +- gems/html-merge/html-merge.gemspec | 2 +- 12 files changed, 330 insertions(+), 234 deletions(-) create mode 100644 gems/html-merge/.kettle-drift.lock create mode 100755 gems/html-merge/bin/rubocop-gradual diff --git a/gems/html-merge/.kettle-drift.lock b/gems/html-merge/.kettle-drift.lock new file mode 100644 index 000000000..a4a032776 --- /dev/null +++ b/gems/html-merge/.kettle-drift.lock @@ -0,0 +1,18 @@ +{ + "debug_env: \"KETTLE_DEV_DEBUG\",\nroot: %w[src my kettle-dev]": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 46, + 63 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 93, + 110 + ] + } + ] +} diff --git a/gems/html-merge/.rubocop_gradual.lock b/gems/html-merge/.rubocop_gradual.lock index 2f11b688d..4f3a876f7 100644 --- a/gems/html-merge/.rubocop_gradual.lock +++ b/gems/html-merge/.rubocop_gradual.lock @@ -2,7 +2,7 @@ ".simplecov:1139357164": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] ], - "Rakefile:3149655517": [ + "Rakefile:3486742014": [ [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], [81, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 3698014046], [165, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], @@ -22,6 +22,9 @@ [1, 1, 0, "Naming/FileName: The name of this source file (`vHEAD.gemfile`) should use snake_case.", 5381], [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], + "gemfiles/modular/coverage_local.gemfile:2653357120": [ + [34, 1, 1586, "Metrics/BlockLength: Block has too many lines. [37/25]", 47547727] + ], "gemfiles/modular/erb/r2/v3.0.gemfile:2530925405": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], @@ -87,7 +90,7 @@ [1, 1, 0, "Naming/FileName: The name of this source file (`vHEAD.gemfile`) should use snake_case.", 5381], [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] ], - "html-merge.gemspec:3178347101": [ + "html-merge.gemspec:3660198488": [ [131, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4147388508], [142, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], [143, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] diff --git a/gems/html-merge/.structuredmerge/kettle-jem.lock b/gems/html-merge/.structuredmerge/kettle-jem.lock index 7eaf15262..e156094e9 100644 --- a/gems/html-merge/.structuredmerge/kettle-jem.lock +++ b/gems/html-merge/.structuredmerge/kettle-jem.lock @@ -1,11 +1,12 @@ --- version: 1 template_state: - version: 7.1.18 - applied_at: '2026-09-07' + version: 7.1.26 + applied_at: '2026-09-10' changelog_replay: last_entry_key: kettle-jem-template-20260802-001 last_entry_date: '2026-08-02' + maintenance_changelog: {} checksums: ".aiignore.example": 48a5dfdd93afd1a15fdce39cc28ca9920263f00018b0968ab031fa744521e5ce ".config/mise/env.sh": aeea5a2ab489ba6e5467ae8de6e386ec8c8fe4ff31a044e69d0cd6a092dd6654 @@ -75,7 +76,7 @@ template_state: ".rubocop_rspec.yml.example": 288ad75e7eb14d87d80fafe6f7272217be5c57547536ee56c780a7d10ac7ec74 ".simplecov.example": 222f2e6ce8cf089c70a21f0f5e5423d4bd59a96fdb2ce7754b0fb3d6f430c229 ".structuredmerge/git-drivers.toml.example": 9d241a44c9edffcdbd3da018fa188a238089c3d1635040924df594a6929a4f97 - ".structuredmerge/kettle-jem.yml.example": 26949dc4ee0722415e72452cbc186bee6ef7b154eae33166d36f3fdb1ca6e46d + ".structuredmerge/kettle-jem.yml.example": ff65a738da1af7d60714026a81d3323a46c864e96ae3570b806afdf6e7149ff9 ".yard-lint.yml.example": 90def46867c9436b4e177c47d91fc8165f4602e335715aecc39f5587ae20b55b ".yardignore.example": 821f453c609df7d46145d675424b39dfbe6dfdca8edac5f367b85fff48502455 ".yardopts.example": 6fd6f2701713096a8a9ea095c213bbc68eeef37797c4754d97837e3229a3a5f6 @@ -88,7 +89,7 @@ template_state: CHANGELOG.transfer.md: 21331d8a9e58b4ff6e088b88eb408bcccb0f2f64e78f8f4d42ac3f11a24baad8 CITATION.cff.example: e404ea0a7919d78a83d53d80e211d17b9663576aa606583b709795dc023fd75c CODE_OF_CONDUCT.md.example: f1ad532f1860f73ef774c6b27a26d41f4bc1cb8813034f5957487766ebb0986b - CONTRIBUTING.md.example: 22570cfb3dde72be79b4b522b6d5ab13f95d778e40444483a096871fe0891b19 + CONTRIBUTING.md.example: 8d23cce2d061e0c20d619c3f66591df5f32821cd84c32d171df0b8ebe1217a55 FUNDING.md.example: 392d047904b1557b29f4b43d37ec403b7480edd5b6ab51180be979b57a91e6ba FUNDING.md.no-osc.example: 3ef0258dd3e3b7f7e17e8bc2d20dcbcb3e74aa5a5a6f51297075696645e34c77 Gemfile.example: 99500023987e81775a9b5ef14e92cb3992f2ac408e5f42454f2728eee9b49fb2 @@ -99,19 +100,19 @@ template_state: PolyForm-Small-Business-1.0.0.md.example: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 README.md.example: 21f491e3d73bfc1b74056a6dcba61f72c93dee3cfe5272ac164a20978454de21 REEK: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - RUBOCOP.md.example: c09e5533ccc59b70a2efa05c99f66e521137c1053d3c12eb43509cebd5b68b0e + RUBOCOP.md.example: d99871a0e4c1d323c92e7febf328f062bb4722069b2abfd0a83bf7daa8dcbf8c Rakefile.example: 569803e726b07ea26267fec6891367a3096a0dff3c266269a7081d36afe496af SECURITY.md.example: ee9411aa85f36d88363fdaea7a1baea4362b6ec112cf2688e711b05de1d3144c bin/setup.example: 0ac35089c95a91d8973fe7a318bf9fd98b9f8e00db92c5d9ca6cd858abb8d41b certs/pboling.pem.example: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - gem.gemspec.example: 83e834e8958a88e4817a57199f48f5ebb245548ce251c5c47372208693f03b17 + gem.gemspec.example: 12dcadc0b297ccd4e18b9d1e538b98ac8330ef9fb2a059ed6754ad59272b77fa gemfiles/modular/benchmark/r4/v0.5.gemfile.example: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 gemfiles/modular/benchmark/vHEAD.gemfile.example: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 gemfiles/modular/cgi/r4/v0.5.gemfile.example: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 gemfiles/modular/cgi/vHEAD.gemfile.example: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 gemfiles/modular/changelog.gemfile.example: 892598e0e7792eb205247ae28128cef6dfc647d2fb33968969152230d6f69288 gemfiles/modular/coverage.gemfile.example: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - gemfiles/modular/coverage_local.gemfile.example: 928d5f260d7b119c038baa56da9fb78dd524dee613aea33ab72894bbce5c506e + gemfiles/modular/coverage_local.gemfile.example: 92ea0d7a9d693553dc614afa2c43990f5c3778c2b00ef6c528e122c31bd506a1 gemfiles/modular/debug.gemfile.example: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 gemfiles/modular/documentation.gemfile.example: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c gemfiles/modular/documentation_local.gemfile.example: 84a20f5d4b0feb94c2cf2f7a8dce8f682f1483498e41484c2b447a5661fd1870 @@ -145,10 +146,10 @@ template_state: gemfiles/modular/stringio/r3/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/r4/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/vHEAD.gemfile.example: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - gemfiles/modular/style.gemfile.example: 3ad0585b4f2db8918580ca41ea8723f7a166d7a83cfd7f9613511094997106fd + gemfiles/modular/style.gemfile.example: 02fe3e8fd00e49b90c3ab30e19b51014ee50490f3eadcfd1d4a39f4c2c997dda gemfiles/modular/style_local.gemfile.example: c86beb711e766126a5be68be4be18255831625ac3650d5069383c4a83a9511f3 - gemfiles/modular/templating.gemfile.example: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - gemfiles/modular/templating_local.gemfile.example: 930057d3b909a72e39a39125c4e883a7ff71f5691e64426c0541f8c8fc75b83f + gemfiles/modular/templating.gemfile.example: 2b33c094677b53ad9dd2eafeb3a3be452f612380c61001a2e75b3c078b8ff72a + gemfiles/modular/templating_local.gemfile.example: ac7259516e69ffafb8b9342a897ddf6042adc46335743f474c342509cefd8f2e gemfiles/modular/webrick/r4/v1.9.gemfile.example: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea gemfiles/modular/webrick/vHEAD.gemfile.example: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b gemfiles/modular/x_std_libs.gemfile.example: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a @@ -175,7 +176,7 @@ template_state: shim/Gemfile.example: 0fb0d9d06fcfb1fd6ca6f0eeb5867253ca1ed221e03d28027719225f868b0637 shim/README.md.example: 3a2f7211b7f92a1dfae5e523b8e34b051a3d8af942144b05286eca0b3c8f6fbe shim/Rakefile.example: 572c94da7052083b39b62a6600785419e314a109efd7a3d8c3a96eb77ad34fd1 - shim/gem.gemspec.example: efae033238e4fd1355cfc134f5c9123f175d1ad1dc4a1a2e663899788c9e0870 + shim/gem.gemspec.example: 14a7015b3328005d1c3b5fda6886bd6da383707745f6eaaa781d6f9689600131 shim/lib/compat_require.rb.example: 94ee85e353a3ca08c8a35c9063d4ff789214ea594c7f803f6cf09d7142f48379 shim/lib/entrypoint.rb.example: dd57613520daca01d6f6bcaa9b83b00ff74505240dc04b84ceb686df3c0539d7 shim/lib/version.rb.example: 15e219ac3a928b5580035f891e415551213175020f1131f6e7ca0ccd55a1b2d6 @@ -196,7 +197,7 @@ files: recipe: template_source_application_simplecov action: write dest_sha256: e4c4c96b1756e6458241b99f3d831713627675badf99cf2e57aa0e1b44579fce - input_fingerprint: 2de7293faf2f9b72321704e3d118161eddfc320c3674c258584de047659e7489 + input_fingerprint: 9c5bb378e59b12a642c9f9ffaffe5ee4b3a744d8ba2289193255b9c96768f390 template_sources: - ".simplecov.example" ".yard-lint.yml": @@ -223,36 +224,36 @@ files: Gemfile: recipe: template_source_application_Gemfile action: write - dest_sha256: c9dc01cf5536216dbc31dcca6554fa18369b266ba22c20d3e37c4bc7c35337c8 - input_fingerprint: ddd148b76eec767dc85e56130db3dd6a6021ef5ce756c68d79940046bf9ea1bb + dest_sha256: 9794b8e3e7241a51c00b833002760922ce15c9d4a1d590cb7e664c3085e5c5c8 + input_fingerprint: ace795c8fe0e9a10b8be3478a855a8d317832115bcd23f11b99657fc985f493d template_sources: - Gemfile.example LICENSE.md: recipe: template_source_application_LICENSE_md action: write dest_sha256: ef99780c0efe15727b462d8f1b3256be8ee55de5551e12784bae97d59956d1c8 - input_fingerprint: 7a55b706a5fa6d8abf0fde5b4d3c522e26e9de540b39507f1345ec8bb0d4e1ab + input_fingerprint: 4fd1e73933200d28c05116597867ea32a0aa9850ed45e675f4ca098a36d9a7eb template_sources: - LICENSE.md.example MIT.md: recipe: template_source_application_MIT_md action: write dest_sha256: 365fce2a82f9d258ada9a527accfd5754b406ee9cdd8f8ed86bbec64b8c42ab2 - input_fingerprint: d93e9961c7cb3c61ca02716d88dae88282e1bff015d0ec8d41ab14afb92b3d97 + input_fingerprint: b6089be9eb2e74e9abd412918c326a2eb5dd6355074ca6668ef56506d9c2e9ff template_sources: - MIT.md.example README.md: recipe: template_source_application_README_md action: write dest_sha256: 269df29020168a37f4af90c5796105ae6c009621a3418f8e2ac92bb605039cb6 - input_fingerprint: 7f08eac068f27ddfe67d80936ceaa47eef7d11dfa7fd1568bd1950cc0ad2df11 + input_fingerprint: 218e5defe0d6dad95ae89e1a6b7833a8a7e85b8a91e301045811773dfa6cc1d1 template_sources: - README.md.example Rakefile: recipe: template_source_application_Rakefile action: write - dest_sha256: 889e24d9b256c31ed4f80fdef4d27dd8f504dbb83a3d506bca3c8339bfafc02e - input_fingerprint: 1478c9bc29ec1c07c121780e50e077869521413b8567aea3c227dabb36c6fa82 + dest_sha256: b2e3758eca8877479471896dd607cdfee04ef0f9a5e02f1dfb38c225772c40e6 + input_fingerprint: 4fd69e86fffc5d6431f31c9b3ab10101c0e5f062dc8d85f84bd4b31f9ea8f205 template_sources: - Rakefile.example bin/setup: @@ -266,315 +267,315 @@ files: recipe: template_source_application_certs_pboling_pem action: write dest_sha256: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - input_fingerprint: 88de67c8c07ef38309b193117125117ca9b4e399baba34fb52f639cc8f170db5 + input_fingerprint: 28ccd30b3cb650ad1a23827f13444cee1d461c96548fbcac14cf32e5832a5829 template_sources: - certs/pboling.pem.example gemfiles/modular/benchmark/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_r4_v0_5_gemfile action: write dest_sha256: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 - input_fingerprint: e9f80df5d2629e1fbd679c697115663978a6b2deb09acb67a6a083fe0514acf2 + input_fingerprint: a5c91bcda42d73cd9f89db5e6ee8eab8ffbe209a4547d79dccdccf9bc7bde239 template_sources: - gemfiles/modular/benchmark/r4/v0.5.gemfile.example gemfiles/modular/benchmark/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_vHEAD_gemfile action: write dest_sha256: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 - input_fingerprint: 0a4bec7cfba32f47903fb3ad1ce5953a73679b546194869e9a06f270046f6bcb + input_fingerprint: 91ab60753ee429eb62140ac742fbe01eee292f6562a800be307e9bc9ff361ddd template_sources: - gemfiles/modular/benchmark/vHEAD.gemfile.example gemfiles/modular/cgi/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_cgi_r4_v0_5_gemfile action: write dest_sha256: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 - input_fingerprint: 1fe715df04e254f40c5807218e84b0ad3518c3db4b4d49a5818cbf6fadd3093e + input_fingerprint: f485a36ec03f8503771f66019731ec12fefdb64f556d28c13bea4a8409c103fc template_sources: - gemfiles/modular/cgi/r4/v0.5.gemfile.example gemfiles/modular/cgi/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_cgi_vHEAD_gemfile action: write dest_sha256: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 - input_fingerprint: 68a7b15861bc073d6bfb45573aceb80cb490877df4900bf90b4eb89e81f0e141 + input_fingerprint: f72001bd7b4e95621adcb429b5a518f6f5e347f0d5bb0625057636cdd528cd4e template_sources: - gemfiles/modular/cgi/vHEAD.gemfile.example gemfiles/modular/changelog.gemfile: recipe: template_source_application_gemfiles_modular_changelog_gemfile action: write dest_sha256: da669526144fbff33aef207db9541b6fd6c254437f94dec2fab70fc55a7757cd - input_fingerprint: c69028cbdc063bc683b5f4513db7c98c0ba124f39d70a9285291b7c28d88aa5f + input_fingerprint: d3a06b0d9d8f12ccd3ac7a674c7f8ad4c987fbcf10633982b2786e676aa35c3e template_sources: - gemfiles/modular/changelog.gemfile.example gemfiles/modular/coverage.gemfile: recipe: template_source_application_gemfiles_modular_coverage_gemfile action: write dest_sha256: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - input_fingerprint: 70cf1f4ab9e12b495fa231562573fa01c3ab0b3217cb9e84c86ae7a4c282a169 + input_fingerprint: '0823f56e4161da0443befc7d956b6550ec9fa907f2e98d64fe15a2d9ecbd1fe6' template_sources: - gemfiles/modular/coverage.gemfile.example gemfiles/modular/coverage_local.gemfile: recipe: template_source_application_gemfiles_modular_coverage_local_gemfile action: write - dest_sha256: 2b493414df06261ba8acb6f0eb18bf3fdd701d7cb5f967a9d15a3f42a4741827 - input_fingerprint: c2c692e59b355ff132c797c3d4caab5d38e767d2a6051c24291caa7119f1677c + dest_sha256: 92c9a599c8f6867ec532880f73568f2736ac05d8973ec524b42fd5dbe6aeda3e + input_fingerprint: 614ffb87a12cafe21c275bad14c84d79557889f03d6919863e89c952ec495a3a template_sources: - gemfiles/modular/coverage_local.gemfile.example gemfiles/modular/debug.gemfile: recipe: template_source_application_gemfiles_modular_debug_gemfile action: write dest_sha256: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 - input_fingerprint: 120c751f699c52334852f0ccc9a4edb112d36553ca31efc0dc2e27f207f07834 + input_fingerprint: 79833b7b8fd7eef3a50e255b3c7577a79da33fe25b0f38acc6735ac74c1c3aaa template_sources: - gemfiles/modular/debug.gemfile.example gemfiles/modular/documentation.gemfile: recipe: template_source_application_gemfiles_modular_documentation_gemfile action: write dest_sha256: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c - input_fingerprint: d70b1ebcc4802ce4e74b05d0bbd34ecc4311639537c99c0ea62d637468d7be8f + input_fingerprint: 4cf9fcbd6a533e9b573997e3266532731808daace46e21afeaf12fcbcabb326c template_sources: - gemfiles/modular/documentation.gemfile.example gemfiles/modular/documentation_local.gemfile: recipe: template_source_application_gemfiles_modular_documentation_local_gemfile action: write dest_sha256: 2058173855b9a4acc6d5efa20520e49734243eef6cf0b5e9063e0e5866a08e9c - input_fingerprint: 3cbd37fe2fdd997012ac41f9f4932b38679f990976f38718b9cdc26436eaf212 + input_fingerprint: 1aba2dcb701a17ec1c08d3be1d45d166e18f0a1820aab5d3e517eb3bc1a5a274 template_sources: - gemfiles/modular/documentation_local.gemfile.example gemfiles/modular/erb/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r2_v3_0_gemfile action: write dest_sha256: 3793e7dc9ef23a7ccd893d48cbba092fd27594c63e65cca011cc658218425670 - input_fingerprint: ddd47bc71814130dd5966972bf65d418dade33437c68807e1918893f3d209322 + input_fingerprint: d28214be0845a061e217e6fffcc2accef25f2537c5ff2564d6df505f0405c230 template_sources: - gemfiles/modular/erb/r2/v3.0.gemfile.example gemfiles/modular/erb/r3/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r3_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 3f23d228b35f032ce7134ce2fa4e5e2748c445cfa0b28f196f79a9769db9941a + input_fingerprint: 64b5963b20b3a5d86b4b08199f5cbb692b4a24e75c2a3764f66e9253d51cddc8 template_sources: - gemfiles/modular/erb/r3/v5.0.gemfile.example gemfiles/modular/erb/r4/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r4_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 3bfa635ab4db241a219204e625495cca14e350492cdc3da54b208376d4287f3b + input_fingerprint: 586d498d3ac7863e7ca50d41ea487518f4df1ae2acf5110a74df6febaaf22e3f template_sources: - gemfiles/modular/erb/r4/v5.0.gemfile.example gemfiles/modular/erb/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_erb_vHEAD_gemfile action: write dest_sha256: ad6f104a49e80e0cf625440e3dc816343fe7e2f037fc4971df75e7bb4305c683 - input_fingerprint: 81a91a099a89fd46e10d03663551d336413c802ed8c4e503317236aa3556d368 + input_fingerprint: e10b9ab8bd09be103c4420ce1499d6c17b44362f8d9fcf52f6d7140969e61bdf template_sources: - gemfiles/modular/erb/vHEAD.gemfile.example gemfiles/modular/json/truffleruby_22_3.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_22_3_gemfile action: write dest_sha256: 249c12eacbe90f9d0d2e81e7a62c4c7e9102e504ededcda4ecf660cb3bb68be4 - input_fingerprint: 830d1a8fc14fbd0d80a56edc1c04382fb5750ab6e1600e42ffcf58a49cd39cb0 + input_fingerprint: 074472cc9ee5f3ce33c8eb163c5880365fffb2cbc4d3408f73015c7023ebb27f template_sources: - gemfiles/modular/json/truffleruby_22_3.gemfile.example gemfiles/modular/json/truffleruby_23_0.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_0_gemfile action: write dest_sha256: 66aa010567f7afa1af8244a74c3c88ecaaf84dc87b6a25180691bb480d02ed28 - input_fingerprint: 0c155683111fde0c481439412067ae6533383536611d415ada4a282fc50bd30d + input_fingerprint: 1d892f72aa4aeafb4e0c14cd3a78217c1192d97ce90044e68994d98ddd4b9d98 template_sources: - gemfiles/modular/json/truffleruby_23_0.gemfile.example gemfiles/modular/json/truffleruby_23_1.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_1_gemfile action: write dest_sha256: '080fcbdaf2bec73cad40832a3d51eebb380af789917b96f493d1460b0dd6361d' - input_fingerprint: 4392a0446af5c7db7cd66b66c232ba8e540de7416ca6533fa3e9bb4caa195ba6 + input_fingerprint: 8d927040299647f4eda15a42b54aa5f4aa1db7a283d61cb6cbfe152f534653b1 template_sources: - gemfiles/modular/json/truffleruby_23_1.gemfile.example gemfiles/modular/mutex_m/r2/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r2_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 0be56bcf3b6bfb8a74a3005be484520949105a18c72cf0938e50957cc93869be + input_fingerprint: 45182c282707676a74c89723cfd92c6871e8e875db684cec4220ac388ed1d496 template_sources: - gemfiles/modular/mutex_m/r2/v0.3.gemfile.example gemfiles/modular/mutex_m/r3/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r3_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 94b416d75b8763087273d4e0ced17895d0b10bf3e6e8aeb6ef6b1fc0368e0a23 + input_fingerprint: af8a44344a3808bf232e873f98043846763ec5cc7afcc8208c18d091dae3e26c template_sources: - gemfiles/modular/mutex_m/r3/v0.3.gemfile.example gemfiles/modular/mutex_m/r4/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r4_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 269b559ff83bce99d8c02f4a9d28ff394966fe7d55b0dcdf8568445b8205c012 + input_fingerprint: ff08956ef870de64edf53d54bb7dad0bcf88eb91c65975bb0f951f43d4a90591 template_sources: - gemfiles/modular/mutex_m/r4/v0.3.gemfile.example gemfiles/modular/mutex_m/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_vHEAD_gemfile action: write dest_sha256: '08018641c97f894788fa91b462da504ab2237213d18d95404136c393274ae3cb' - input_fingerprint: 1942ed242ec1b4e76dcec10ddfe07cd60552b4973c4b6b784ba335ddda5ce14c + input_fingerprint: 6ca085db769c2b901e0e0238d20e86e5832623374779b1f2f54129d1f310e06e template_sources: - gemfiles/modular/mutex_m/vHEAD.gemfile.example gemfiles/modular/optional.gemfile: recipe: template_source_application_gemfiles_modular_optional_gemfile action: write dest_sha256: f770e6e9a9dd2bd0f1f132e882d88038b2e21127dce3afe270908c7338c28bfd - input_fingerprint: 5bf6ae5edc2f4a69ebc05bdbb572401f401ecfa4a9757cbe3a7c5da41fd36b39 + input_fingerprint: b2e81ac31b8a78630586e79fb730af53c2fa6feb785eec80fc845a71df28e415 template_sources: - gemfiles/modular/optional.gemfile.example gemfiles/modular/rspec.gemfile: recipe: template_source_application_gemfiles_modular_rspec_gemfile action: write dest_sha256: d043f5c9344f6435edb4607c5adaf42c78e7fb6b8b6726007de2bbedefb376c3 - input_fingerprint: c6d9f7787004e66a26acc5fc41d075c4d014e4fb5350f6f2281c2432f90b26fa + input_fingerprint: 6358f80316d0b1beaf53f44edf0c638b4fd0a5c2f840cc685645c66bda8d616e template_sources: - gemfiles/modular/rspec.gemfile.example gemfiles/modular/runtime_heads.gemfile: recipe: template_source_application_gemfiles_modular_runtime_heads_gemfile action: write dest_sha256: 6ac7158c4a3088190f2a9082f01439eb27eca2172ab3464b15c9cb045aa885e1 - input_fingerprint: d8c24ac0a01a48393f5bcd8a30672d1abfae4db934c75bbe32b1a829bced8fe4 + input_fingerprint: 7a614505fcb9edda910eb84c0eb1ea3338eb0e3086a4a0e20ec84a256da99b33 template_sources: - gemfiles/modular/runtime_heads.gemfile.example gemfiles/modular/stringio/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r2_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: f33f91851a79f54d41a8ec7c3df8531ba98cc57b48d024e029b0193cba6c44c8 + input_fingerprint: 76ca1014eab551b6bf6b2c0b16b8dfc7cbeed0d89564dca852cdcad3ccf661dd template_sources: - gemfiles/modular/stringio/r2/v3.0.gemfile.example gemfiles/modular/stringio/r3/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r3_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 0100ee9351c74b23a1c9e4af42ff7fee8e5aaa1d6944bf0d18c946278a8a2321 + input_fingerprint: 871bb28772f349bf6c333292104b00c6340d39574fb733f56ad86973d3feb7c6 template_sources: - gemfiles/modular/stringio/r3/v3.0.gemfile.example gemfiles/modular/stringio/r4/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r4_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 07c2b84dfd81820e00cafbd2c42988eac404ab554357e7c011b42570f9126737 + input_fingerprint: 165c287637a2a1e8801543ebac45f6e7e89438e59204457a60c70c9aca073944 template_sources: - gemfiles/modular/stringio/r4/v3.0.gemfile.example gemfiles/modular/stringio/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_stringio_vHEAD_gemfile action: write dest_sha256: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - input_fingerprint: 8b208b216acabaaa66c5c2b702afbe308bdc9ef3b05ec32e5e69b83f268b39a9 + input_fingerprint: 26b7970b19d2d06df91ed296a8b0f775def39849798b23b5cbe3b2d3c8aaae34 template_sources: - gemfiles/modular/stringio/vHEAD.gemfile.example gemfiles/modular/style.gemfile: recipe: template_source_application_gemfiles_modular_style_gemfile action: write - dest_sha256: 2a3d46dcb8a9394f595f273f5eb0403d0a552837754ab109afc9ba79a7159083 - input_fingerprint: 223c4e5917001c37fedc8265625db80a661a514db1b693574b351ef026fb98c2 + dest_sha256: 9a24acff0054573c30f5d84d0418cd465ba3794d075bb5a36801410ac40e0787 + input_fingerprint: 618958c0dbccbe4f749a73be9449fcbf69888c53d906a57c623282f29b4eefd0 template_sources: - gemfiles/modular/style.gemfile.example gemfiles/modular/style_local.gemfile: recipe: template_source_application_gemfiles_modular_style_local_gemfile action: write dest_sha256: 55eb9c149cdb2f29c9f31abe2d55a4f334e00fb859681dd17c42149a3f28ca36 - input_fingerprint: 0320c2b2f40e0dddc1b8161a075b6ff6e78a34b155d77bd30bcf7a621e36bbf9 + input_fingerprint: a3f5fbd93e2f1ad4974bc925e19312afe5fa654fb4a3558f485bfd5bb1f58910 template_sources: - gemfiles/modular/style_local.gemfile.example gemfiles/modular/templating.gemfile: recipe: template_source_application_gemfiles_modular_templating_gemfile action: write - dest_sha256: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - input_fingerprint: 865251379a44d6075798e30e7279d0f8d1d2f7392bee2920bd93ecb8c575d30e + dest_sha256: 432ba59798d31b899268257c432443a017c5a9bd2c0c7f9f2216617e14150cd3 + input_fingerprint: cb516a3dec5ef9e33c9c00a165d1a2c45f1d3ff2a1310b288912eda23f601f1f template_sources: - gemfiles/modular/templating.gemfile.example gemfiles/modular/templating_local.gemfile: recipe: template_source_application_gemfiles_modular_templating_local_gemfile action: write - dest_sha256: ddc9228e3f98b3ad08a395e70a9afb714c9f64aac365da6e8cb52a2f58f6c65b - input_fingerprint: eaacaa28daa805915465ef6742bae7775c5a8422727b028a150e22db9c194b86 + dest_sha256: 54d7184f078a2203c343a6c44362b7f041b675d0c7db0d357022fbdbed0caf4f + input_fingerprint: 826e6bb00931cbe4e3ca8a95b502779c34fafbe2eacc449116165429db480d79 template_sources: - gemfiles/modular/templating_local.gemfile.example gemfiles/modular/webrick/r4/v1.9.gemfile: recipe: template_source_application_gemfiles_modular_webrick_r4_v1_9_gemfile action: write dest_sha256: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea - input_fingerprint: 554c55f43a8a33d249c367d249debeca8e9af0bca9d7e45dc93a1e2f04137ef6 + input_fingerprint: 6b282a487e5ef254a7de4903c9e9171b989ff5bf9028f1241803801fe8d95a23 template_sources: - gemfiles/modular/webrick/r4/v1.9.gemfile.example gemfiles/modular/webrick/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_webrick_vHEAD_gemfile action: write dest_sha256: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b - input_fingerprint: 86c086e3d54a34dcd378b4d5cc13a88c2d005ec7525221fa9e033049b568c45b + input_fingerprint: 25cce6c0f58c3793d7e785c9fc8a9bd868535e0307c85e53ad79adf5183f7b3f template_sources: - gemfiles/modular/webrick/vHEAD.gemfile.example gemfiles/modular/x_std_libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_gemfile action: write dest_sha256: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a - input_fingerprint: d6ed821edfc1af65229a0229461afe10b66ac6ee95d901acd89d0dd3b5bbc710 + input_fingerprint: 7c150e5c6dddba9613d22bd0bc32132b3abcd13926b7b483f058af36969d7084 template_sources: - gemfiles/modular/x_std_libs.gemfile.example gemfiles/modular/x_std_libs/r2/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r2_libs_gemfile action: write dest_sha256: e80ec8ad06cb1b31ac982bc25cf7696987fca131aa1001eaefd0bf5cd379c273 - input_fingerprint: 9ff4965db49845ff84b032da9caac6bd176f8124fce4f1631680a05da6f43404 + input_fingerprint: d38886ea6f5925cda5476b15afa3c8294e770cf6ecac99b69e133345d86e0034 template_sources: - gemfiles/modular/x_std_libs/r2/libs.gemfile.example gemfiles/modular/x_std_libs/r3.1/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_1_libs_gemfile action: write dest_sha256: 9f8565c40b09bea1bc4c2e2ad87fe11400c3c51a2b235655bfcd8e491ed88ca8 - input_fingerprint: 89f425314cd7ee9842d31405d6cf8e22817948b31c084221b8d6571ae8badc04 + input_fingerprint: e7374c481962c395769d0dd89e37fb8efbfb04c1729594ab8be7c910232fa85a template_sources: - gemfiles/modular/x_std_libs/r3.1/libs.gemfile.example gemfiles/modular/x_std_libs/r3/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_libs_gemfile action: write dest_sha256: 546f8849f4267bb19aa10ff0de40be30957197f229e6887847181ea9127b2650 - input_fingerprint: cd9b4701e58bfa80973a4ba51351d0acbda5b93fb1c258eaf0cae7bcbc07c060 + input_fingerprint: b14dacc9822a641ad5aad40bca8ff7fa019726709d4ea38a4f49f9982cf2273b template_sources: - gemfiles/modular/x_std_libs/r3/libs.gemfile.example gemfiles/modular/x_std_libs/r4/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r4_libs_gemfile action: write dest_sha256: 8c2582eaa218d216b98c86c933465295c8b4e43f3251ea388b9eaf6e471f8da6 - input_fingerprint: 414d8e71712de787a9773c9e63c99ac125c9c617408a89c66870744906b2713b + input_fingerprint: a523954f4cabe0a516c7b6d024a5db2e9b83694211019a549e82a0cc6caa7fa9 template_sources: - gemfiles/modular/x_std_libs/r4/libs.gemfile.example gemfiles/modular/x_std_libs/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_vHEAD_gemfile action: write dest_sha256: d3133ec4c0638363a7fb025d19be7e95a615fd61c35ddb8d17f2280ee74a7486 - input_fingerprint: 5b6551974353cf332e44455f8001d6a05b5ec98197ae160001d5653107960856 + input_fingerprint: 39b03f05da24ae63523d5db6b5fbbcdc2ee82aae058916f03b7ad0f623e6dc22 template_sources: - gemfiles/modular/x_std_libs/vHEAD.gemfile.example html-merge.gemspec: recipe: template_source_application_html_merge_gemspec action: write - dest_sha256: c9c8154e13c8b0bbe0c1b7867244ba2d268966bf994f1da3fcfd2867f6934315 - input_fingerprint: 454c88e9cdc89c17efc80ac36bf5530b0e8a805d51473a9f88f024e85b94f566 + dest_sha256: e568827ade980a8e5a469c712d08fccfaf6a57e86b13e14c1259a6910db01a0f + input_fingerprint: 678cc1dbd04ad93a2591e45aebc69ee7a3afce3df7f7dd2468c4893de8919f50 template_sources: - gem.gemspec.example lib/html/merge/version.rb: recipe: template_source_application_lib_html_merge_version_rb action: write - dest_sha256: d84bc457ea8ebc020fffd2a3b31a112ae89ddc8001b333e4d8a4cae2cc766cbd - input_fingerprint: 11fa9567940c3873b86d9626f3fab294de500b3da6024e4dfebb391e77d0c8c3 + dest_sha256: 84afdb43f3cc83eddee2df1cf3d5dce60fe715a6ed0078119f780c62d76b382f + input_fingerprint: f9608159771b90b8346d27dad8bb26a193fafcbdcbecfc31ebee7201062bedfd template_sources: - lib/gem/version.rb.example mise.toml: recipe: template_source_application_mise_toml action: write dest_sha256: c264fd6b5da8a3591197f0d112a772574f2665cc8a98207994c1eb1f4ca66b4f - input_fingerprint: 4c3af13d7dd6294ff21fbb72590c4a9ed615b3e33c878d9f636a8c5467b5a459 + input_fingerprint: 76d21d8c45f47b6553947746dbe37ca248d0adeaa440dc2adc4a970ec8fb9e3a template_sources: - mise.toml.no-osc.example sig/html/merge.rbs: recipe: template_source_application_sig_html_merge_rbs action: write dest_sha256: fc86d3b7d072e15a72500ec3fc0f9c0b163f048e81c9e5369616e3d232d5d63a - input_fingerprint: 8c6e8ffec7f34872809a3c11fd5374e26f6bbee595f24909bba3a328e86a4653 + input_fingerprint: 9bf809833142dbb4c08e564a083d5f47fd73667d7d23a66c4ceaf077ad0e97ad template_sources: - sig/gem.rbs.example spec/README.md: @@ -588,6 +589,6 @@ files: recipe: template_source_application_spec_spec_helper_rb action: write dest_sha256: 826cd12cde413730cc030c0d9550f0c8f63d000c3e1ae6d4ab6ef7877eecffbe - input_fingerprint: e2b6990305e3585efa4e8243287344ae35e73bb4e68ad99aecc149195d96b688 + input_fingerprint: a24b4858132593e4db5bb46bbb861289e0a874b268373f16eae0006abd9da674 template_sources: - spec/spec_helper.rb.example diff --git a/gems/html-merge/Gemfile b/gems/html-merge/Gemfile index 491e59339..b6d54f631 100644 --- a/gems/html-merge/Gemfile +++ b/gems/html-merge/Gemfile @@ -19,7 +19,7 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } # Include dependencies from html-merge.gemspec gemspec -gem "kettle-family", "~> 1.2", ">= 1.2.92" +gem "kettle-family", "~> 1.2", ">= 1.2.100" # Local workspace dependency wiring for *_local.gemfile overrides gem "nomono", "~> 1.1", ">= 1.1.5", require: false # ruby >= 3.2.0 diff --git a/gems/html-merge/Gemfile.lock b/gems/html-merge/Gemfile.lock index 786dac475..f6f8b7048 100644 --- a/gems/html-merge/Gemfile.lock +++ b/gems/html-merge/Gemfile.lock @@ -10,123 +10,123 @@ GIT PATH remote: . specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + html-merge (7.1.9) + ast-crispr (= 7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) + ast-crispr-markdown-markly (7.1.9) + ast-crispr (= 7.1.9) + markdown-merge (= 7.1.9) + markly-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism specs: - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) + ast-crispr-ruby-prism (7.1.9) + ast-crispr (= 7.1.9) + prism-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) + ast-crispr (7.1.9) + ast-merge (= 7.1.9) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ast-merge-git (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: - ast-merge (7.1.8) + ast-merge (7.1.9) benchmark token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) + ast-template (7.1.9) + ast-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + bash-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + binary-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) + citrus-toml-merge (7.1.9) + ast-merge (= 7.1.9) + toml-merge (= 7.1.9) toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge specs: - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) commonmarker (~> 2.2) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) + dotenv-merge (7.1.9) + ast-merge (= 7.1.9) + plain-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + go-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + json-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: - kettle-jem (7.1.25) + kettle-jem (7.1.26) addressable (>= 2.8, < 3) ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) @@ -160,122 +160,122 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge specs: - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown (~> 2.5) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + markdown-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) + markly-merge (7.1.9) + markdown-merge (= 7.1.9) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge specs: - parslet-toml-merge (7.1.8) + parslet-toml-merge (7.1.9) toml (~> 0.3) - toml-merge (= 7.1.8) + toml-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + plain-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) + prism-merge (7.1.9) + ast-merge (= 7.1.9) prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + psych-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) + yaml-merge (= 7.1.9) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) + rbs-merge (7.1.9) + ast-merge (= 7.1.9) rbs (>= 3.10) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + rust-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) + smorg-rb (7.1.9) + ast-merge (= 7.1.9) + ast-merge-git (= 7.1.9) + bash-merge (= 7.1.9) diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) + dotenv-merge (= 7.1.9) + go-merge (= 7.1.9) + html-merge (= 7.1.9) + json-merge (= 7.1.9) kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) + markdown-merge (= 7.1.9) + plain-merge (= 7.1.9) + prism-merge (= 7.1.9) + psych-merge (= 7.1.9) + rbs-merge (= 7.1.9) + rust-merge (= 7.1.9) + toml-merge (= 7.1.9) + typescript-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + toml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: - tree_haver (7.1.8) + tree_haver (7.1.9) citrus (~> 3.0) parslet (~> 2.0) tree_sitter_language_pack (>= 1.16.2, < 2.0) @@ -284,25 +284,25 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + typescript-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + yaml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) + zip-merge (7.1.9) + binary-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) GEM @@ -336,6 +336,8 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) + commonmarker (2.10.0) + rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -465,11 +467,15 @@ GEM lint_roller (1.1.0) logger (1.7.0) markly (0.19.0) + mini_portile2 (2.8.9) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) reline (~> 0.6) mutex_m (0.3.0) + nokogiri (1.19.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-musl) @@ -503,6 +509,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) + rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -696,13 +705,16 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.16.2-aarch64-linux) + tree_sitter_language_pack (1.17.0) + rb_sys (>= 0.9.130, < 0.10) + sorbet-runtime (~> 0.5) + tree_sitter_language_pack (1.17.0-aarch64-linux) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-arm64-darwin) + tree_sitter_language_pack (1.17.0-arm64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-linux) + tree_sitter_language_pack (1.17.0-x86_64-linux) sorbet-runtime (~> 0.5) tsort (0.2.0) tty-cursor (0.7.1) @@ -784,9 +796,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.31) + kettle-dev (~> 3.0, >= 3.0.34) kettle-drift (~> 1.0, >= 1.0.13) - kettle-family (~> 1.2, >= 1.2.92) + kettle-family (~> 1.2, >= 1.2.100) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) @@ -807,12 +819,12 @@ DEPENDENCIES reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) - rubocop-lts (~> 24.2, >= 24.2.1) - rubocop-lts-rspec (~> 1.0, >= 1.0.5) + rubocop-lts (~> 24.2, >= 24.2.3) + rubocop-lts-rspec (~> 1.0, >= 1.0.6) rubocop-minitest (~> 0.40, >= 0.40.0) rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! - rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) ruby-merge! ruby-progressbar (~> 1.13) rust-merge! @@ -843,33 +855,34 @@ CHECKSUMS appraisal2 (3.2.3) sha256=3a6cfaf8a444e02707b9a34154af1c4902fbe99d9d2168d7e81dd83ec77e6db7 appraisal2-rubocop (1.0.2) sha256=1dae97c1be087cf9c098a3a72fd41f873435e9b8b39687e633b36c9ccb22bff4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.8) - ast-crispr-markdown-markly (7.1.8) - ast-crispr-ruby-prism (7.1.8) - ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) + ast-crispr (7.1.9) + ast-crispr-markdown-markly (7.1.9) + ast-crispr-ruby-prism (7.1.9) + ast-merge (7.1.9) + ast-merge-git (7.1.9) + ast-template (7.1.9) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.8) + bash-merge (7.1.9) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) - bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae + binary-merge (7.1.9) + bundler (4.1.0.beta1) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.8) + citrus-toml-merge (7.1.9) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 + commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e commonmarker (2.10.0-x86_64-darwin) sha256=01e0830ed0319825ecdc16411c90acd3f661d1568dfc178731b3f64d0ce2363d commonmarker (2.10.0-x86_64-linux) sha256=945c510c0bfca9022245928e2248468fe3ddad58c939be0c37b20082cc392880 commonmarker (2.10.0-x86_64-linux-musl) sha256=288cd4fb9f17eed2ffa73551ef241dcf594e0f484b2aee2a0999540333c0618e - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) completely (0.8.0) sha256=e493cd5d84805f47917a41f277ecbfe5f35363bed670be5a957d3acaed8c6c5e concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 @@ -878,7 +891,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docopt_ng (0.7.1) sha256=a024148ee4fa3ab1a8a04411aa4370f39cf2b446e63562097d418b7974a15667 - dotenv-merge (7.1.8) + dotenv-merge (7.1.9) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -891,35 +904,37 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) + go-merge (7.1.9) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) + html-merge (7.1.9) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a - json-merge (7.1.8) - kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + json-merge (7.1.9) + kettle-changelog (1.0.7) + kettle-dev (3.0.34) + kettle-drift (1.0.13) kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 - kettle-jem (7.1.25) + kettle-jem (7.1.26) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 - kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd + kettle-soup-cover (3.0.10) kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 - markdown-merge (7.1.8) + markdown-merge (7.1.9) markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca - markly-merge (7.1.8) + markly-merge (7.1.9) + mini_portile2 (2.8.9) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 + nokogiri (1.19.4) nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af nokogiri (1.19.4-arm64-darwin) sha256=a46db9853286e6597b36ebc6953817d15acf3a299583eb3f89fdc6f91dd63527 @@ -933,20 +948,22 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) - plain-merge (7.1.8) + parslet-toml-merge (7.1.9) + plain-merge (7.1.9) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.8) + prism-merge (7.1.9) psych (5.5.0) sha256=4b245bbbd0f3238df8ccee766ebc1a6b062b10e4ee1d3284eb588739ba156a0a - psych-merge (7.1.8) + psych-merge (7.1.9) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 - rbs-merge (7.1.8) + rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -982,11 +999,11 @@ CHECKSUMS rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.8) + ruby-merge (7.1.9) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) + rust-merge (7.1.9) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +1011,7 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) + smorg-rb (7.1.9) sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1011,24 +1028,25 @@ CHECKSUMS timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.8) + toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb - tree_haver (7.1.8) - tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 - tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 - tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 - tree_sitter_language_pack (1.16.2-x86_64-linux) sha256=d8151e6e44e35ace9de3611c76b730896beab17f427db06d8f76666332a5dc60 + tree_haver (7.1.9) + tree_sitter_language_pack (1.17.0) + tree_sitter_language_pack (1.17.0-aarch64-linux) + tree_sitter_language_pack (1.17.0-arm64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-linux) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f tty-cursor (0.7.1) sha256=79534185e6a777888d88628b14b6a1fdf5154a603f285f80b1753e1908e0bf48 tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) + typescript-merge (7.1.9) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 yaml-converter (0.2.5) sha256=a5214fe1a6c2df88bd34a35bcded1b1dcd30135548130df2e03b54ca8c0f2423 - yaml-merge (7.1.8) + yaml-merge (7.1.9) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.8) sha256=73d935d43e3479d65ce8aff25c7d3100e8bb83528a2adaa0ed824e5046ac99e7 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -1037,8 +1055,8 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) + zip-merge (7.1.9) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH - 4.0.20 + 4.1.0.beta1 diff --git a/gems/html-merge/Rakefile b/gems/html-merge/Rakefile index e5b4a0a67..9a1ff06ac 100644 --- a/gems/html-merge/Rakefile +++ b/gems/html-merge/Rakefile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -# html-merge Rakefile v7.1.18 - 2026-09-07 +# html-merge Rakefile v7.1.26 - 2026-09-09 # Ruby 2.3 (Safe Navigation) or higher required # # See LICENSE.md for license information. diff --git a/gems/html-merge/bin/rubocop-gradual b/gems/html-merge/bin/rubocop-gradual new file mode 100755 index 000000000..3d21eeaec --- /dev/null +++ b/gems/html-merge/bin/rubocop-gradual @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'rubocop-gradual' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__) + +require "rubygems" +require "bundler/setup" + +load Gem.bin_path("rubocop-gradual", "rubocop-gradual") diff --git a/gems/html-merge/gemfiles/modular/coverage_local.gemfile b/gems/html-merge/gemfiles/modular/coverage_local.gemfile index 9a2d5695f..d36d03645 100644 --- a/gems/html-merge/gemfiles/modular/coverage_local.gemfile +++ b/gems/html-merge/gemfiles/modular/coverage_local.gemfile @@ -29,11 +29,31 @@ Kernel.send(:gem, "nomono", *nomono_activation_requirements) require "nomono/bundler" local_gems = %w[kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -local_gems_to_eval = local_gems - %w[] - declared_gems # export KETTLE_DEV_DEV=/path/to/my platform :mri do + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == "kettle-dev" + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: "KETTLE_DEV", + path_env: "KETTLE_DEV_DEV", + vendored_gems_env: "VENDORED_GEMS", + vendor_gem_dir_env: "VENDOR_GEM_DIR", + debug_env: "KETTLE_DEV_DEBUG", + root: %w[src my kettle-dev] + ).fetch("kettle-dev", nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + local_gems_to_eval = local_gems - %w[] - declared_gems + eval_nomono_gems( gems: local_gems_to_eval, prefix: "KETTLE_DEV", diff --git a/gems/html-merge/gemfiles/modular/style.gemfile b/gems/html-merge/gemfiles/modular/style.gemfile index 3061e1b57..c2418fbcc 100644 --- a/gems/html-merge/gemfiles/modular/style.gemfile +++ b/gems/html-merge/gemfiles/modular/style.gemfile @@ -24,9 +24,9 @@ platform :mri do if ENV.fetch("RUBOCOP_LTS_DEV", "false").casecmp("false").zero? declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) - gem "rubocop-lts", "~> 24.2", ">= 24.2.1" unless declared_gems.include?("rubocop-lts") - gem "rubocop-lts-rspec", "~> 1.0", ">= 1.0.5" unless declared_gems.include?("rubocop-lts-rspec") - gem "rubocop-ruby3_2", "~> 3.0", ">= 3.0.6" unless declared_gems.include?("rubocop-ruby3_2") + gem "rubocop-lts", "~> 24.2", ">= 24.2.3" unless declared_gems.include?("rubocop-lts") + gem "rubocop-lts-rspec", "~> 1.0", ">= 1.0.6" unless declared_gems.include?("rubocop-lts-rspec") + gem "rubocop-ruby3_2", "~> 3.0", ">= 3.0.8" unless declared_gems.include?("rubocop-ruby3_2") else eval_gemfile("style_local.gemfile") end diff --git a/gems/html-merge/gemfiles/modular/templating.gemfile b/gems/html-merge/gemfiles/modular/templating.gemfile index 2df8682f8..c52b3d28f 100644 --- a/gems/html-merge/gemfiles/modular/templating.gemfile +++ b/gems/html-merge/gemfiles/modular/templating.gemfile @@ -18,7 +18,7 @@ end if structuredmerge_remote # Merge recipes for released installs. - gem "kettle-jem", ">= 7.0" + gem "kettle-jem", "~> 7.1", ">= 7.1.26" end if kettle_remote diff --git a/gems/html-merge/gemfiles/modular/templating_local.gemfile b/gems/html-merge/gemfiles/modular/templating_local.gemfile index 073098262..232ae8b27 100644 --- a/gems/html-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/html-merge/gemfiles/modular/templating_local.gemfile @@ -65,9 +65,7 @@ structuredmerge_local_gems = %w[ kettle_dev_local_gems = %w[ kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift ] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[] -kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - (declared_gems - %w[kettle-dev]) if ENV.fetch("STRUCTUREDMERGE_DEV", "false").casecmp("false") != 0 eval_nomono_gems( @@ -81,6 +79,28 @@ if ENV.fetch("STRUCTUREDMERGE_DEV", "false").casecmp("false") != 0 end if ENV.fetch("KETTLE_DEV_DEV", "false").casecmp("false") != 0 + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == "kettle-dev" + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: "KETTLE_DEV", + path_env: "KETTLE_DEV_DEV", + vendored_gems_env: "VENDORED_GEMS", + vendor_gem_dir_env: "VENDOR_GEM_DIR", + debug_env: "KETTLE_DEV_DEBUG", + root: %w[src my kettle-dev] + ).fetch("kettle-dev", nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - declared_gems + eval_nomono_gems( gems: kettle_dev_local_gems_to_eval, prefix: "KETTLE_DEV", diff --git a/gems/html-merge/html-merge.gemspec b/gems/html-merge/html-merge.gemspec index d759eb099..be917828e 100644 --- a/gems/html-merge/html-merge.gemspec +++ b/gems/html-merge/html-merge.gemspec @@ -114,7 +114,7 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency("kettle-dev", "~> 3.0", ">= 3.0.31") # ruby >= 3.2.0 + spec.add_development_dependency("kettle-dev", "~> 3.0", ">= 3.0.34") # ruby >= 3.2.0 # Security spec.add_development_dependency("bundler-audit", "~> 0.9.3") # ruby >= 2.0.0 From 37306d2b7eb6ef670d52b4be805fc4ae6058c968 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 23:54:27 -0400 Subject: [PATCH 096/137] =?UTF-8?q?=F0=9F=8E=A8=20Template=20zip-merge=20b?= =?UTF-8?q?y=20kettle-family?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/zip-merge/.kettle-drift.lock | 76 ++++- gems/zip-merge/.rubocop_gradual.lock | 7 +- .../.structuredmerge/kettle-jem.lock | 145 ++++---- gems/zip-merge/Gemfile | 2 +- gems/zip-merge/Gemfile.lock | 318 +++++++++--------- gems/zip-merge/Rakefile | 2 +- gems/zip-merge/bin/rubocop-gradual | 16 + .../gemfiles/modular/coverage_local.gemfile | 24 +- gems/zip-merge/gemfiles/modular/style.gemfile | 6 +- .../gemfiles/modular/templating.gemfile | 2 +- .../gemfiles/modular/templating_local.gemfile | 24 +- gems/zip-merge/zip-merge.gemspec | 2 +- 12 files changed, 387 insertions(+), 237 deletions(-) create mode 100755 gems/zip-merge/bin/rubocop-gradual diff --git a/gems/zip-merge/.kettle-drift.lock b/gems/zip-merge/.kettle-drift.lock index 98b009e1e..1b23f4793 100644 --- a/gems/zip-merge/.kettle-drift.lock +++ b/gems/zip-merge/.kettle-drift.lock @@ -1,10 +1,82 @@ { + "debug_env: 'KETTLE_DEV_DEBUG',\nroot: %w[src my kettle-dev]": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 46, + 63 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 93, + 110 + ] + } + ], + "path_env: 'KETTLE_DEV_DEV',\nvendored_gems_env: 'VENDORED_GEMS',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 43, + 60 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 90, + 107 + ] + } + ], + "prefix: 'KETTLE_DEV',\npath_env: 'KETTLE_DEV_DEV',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 42, + 59 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 89, + 106 + ] + } + ], + "vendor_gem_dir_env: 'VENDOR_GEM_DIR',\ndebug_env: 'KETTLE_DEV_DEBUG',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 45, + 62 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 92, + 109 + ] + } + ], "vendored_gems_env: 'VENDORED_GEMS',\nvendor_gem_dir_env: 'VENDOR_GEM_DIR',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 44, + 61 + ] + }, { "file": "gemfiles/modular/templating_local.gemfile", "lines": [ - 77, - 88 + 75, + 91, + 108 ] } ] diff --git a/gems/zip-merge/.rubocop_gradual.lock b/gems/zip-merge/.rubocop_gradual.lock index 87a2d526b..00023f008 100644 --- a/gems/zip-merge/.rubocop_gradual.lock +++ b/gems/zip-merge/.rubocop_gradual.lock @@ -2,7 +2,7 @@ ".simplecov:692617253": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] ], - "Rakefile:26169565": [ + "Rakefile:2736151390": [ [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], [81, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], [165, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], @@ -22,6 +22,9 @@ [1, 1, 0, "Naming/FileName: The name of this source file (`vHEAD.gemfile`) should use snake_case.", 5381], [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], + "gemfiles/modular/coverage_local.gemfile:2813372128": [ + [34, 1, 1586, "Metrics/BlockLength: Block has too many lines. [37/25]", 820328175] + ], "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], @@ -129,7 +132,7 @@ [319, 179, 1, "Style/FormatString: Favor `format` over `String#%`.", 177536], [361, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 302415094] ], - "zip-merge.gemspec:2734886980": [ + "zip-merge.gemspec:2185965697": [ [16, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3441493590], [137, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4147388508], [148, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], diff --git a/gems/zip-merge/.structuredmerge/kettle-jem.lock b/gems/zip-merge/.structuredmerge/kettle-jem.lock index 4c83bcc92..f452ec5dd 100644 --- a/gems/zip-merge/.structuredmerge/kettle-jem.lock +++ b/gems/zip-merge/.structuredmerge/kettle-jem.lock @@ -1,11 +1,12 @@ --- version: 1 template_state: - version: 7.1.18 - applied_at: '2026-09-07' + version: 7.1.26 + applied_at: '2026-09-10' changelog_replay: last_entry_key: kettle-jem-template-20260802-001 last_entry_date: '2026-08-02' + maintenance_changelog: {} checksums: ".aiignore.example": 48a5dfdd93afd1a15fdce39cc28ca9920263f00018b0968ab031fa744521e5ce ".config/mise/env.sh": aeea5a2ab489ba6e5467ae8de6e386ec8c8fe4ff31a044e69d0cd6a092dd6654 @@ -75,7 +76,7 @@ template_state: ".rubocop_rspec.yml.example": 288ad75e7eb14d87d80fafe6f7272217be5c57547536ee56c780a7d10ac7ec74 ".simplecov.example": 222f2e6ce8cf089c70a21f0f5e5423d4bd59a96fdb2ce7754b0fb3d6f430c229 ".structuredmerge/git-drivers.toml.example": 9d241a44c9edffcdbd3da018fa188a238089c3d1635040924df594a6929a4f97 - ".structuredmerge/kettle-jem.yml.example": 26949dc4ee0722415e72452cbc186bee6ef7b154eae33166d36f3fdb1ca6e46d + ".structuredmerge/kettle-jem.yml.example": ff65a738da1af7d60714026a81d3323a46c864e96ae3570b806afdf6e7149ff9 ".yard-lint.yml.example": 90def46867c9436b4e177c47d91fc8165f4602e335715aecc39f5587ae20b55b ".yardignore.example": 821f453c609df7d46145d675424b39dfbe6dfdca8edac5f367b85fff48502455 ".yardopts.example": 6fd6f2701713096a8a9ea095c213bbc68eeef37797c4754d97837e3229a3a5f6 @@ -88,7 +89,7 @@ template_state: CHANGELOG.transfer.md: 21331d8a9e58b4ff6e088b88eb408bcccb0f2f64e78f8f4d42ac3f11a24baad8 CITATION.cff.example: e404ea0a7919d78a83d53d80e211d17b9663576aa606583b709795dc023fd75c CODE_OF_CONDUCT.md.example: f1ad532f1860f73ef774c6b27a26d41f4bc1cb8813034f5957487766ebb0986b - CONTRIBUTING.md.example: 22570cfb3dde72be79b4b522b6d5ab13f95d778e40444483a096871fe0891b19 + CONTRIBUTING.md.example: 8d23cce2d061e0c20d619c3f66591df5f32821cd84c32d171df0b8ebe1217a55 FUNDING.md.example: 392d047904b1557b29f4b43d37ec403b7480edd5b6ab51180be979b57a91e6ba FUNDING.md.no-osc.example: 3ef0258dd3e3b7f7e17e8bc2d20dcbcb3e74aa5a5a6f51297075696645e34c77 Gemfile.example: 99500023987e81775a9b5ef14e92cb3992f2ac408e5f42454f2728eee9b49fb2 @@ -99,19 +100,19 @@ template_state: PolyForm-Small-Business-1.0.0.md.example: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 README.md.example: 21f491e3d73bfc1b74056a6dcba61f72c93dee3cfe5272ac164a20978454de21 REEK: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - RUBOCOP.md.example: c09e5533ccc59b70a2efa05c99f66e521137c1053d3c12eb43509cebd5b68b0e + RUBOCOP.md.example: d99871a0e4c1d323c92e7febf328f062bb4722069b2abfd0a83bf7daa8dcbf8c Rakefile.example: 569803e726b07ea26267fec6891367a3096a0dff3c266269a7081d36afe496af SECURITY.md.example: ee9411aa85f36d88363fdaea7a1baea4362b6ec112cf2688e711b05de1d3144c bin/setup.example: 0ac35089c95a91d8973fe7a318bf9fd98b9f8e00db92c5d9ca6cd858abb8d41b certs/pboling.pem.example: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - gem.gemspec.example: 83e834e8958a88e4817a57199f48f5ebb245548ce251c5c47372208693f03b17 + gem.gemspec.example: 12dcadc0b297ccd4e18b9d1e538b98ac8330ef9fb2a059ed6754ad59272b77fa gemfiles/modular/benchmark/r4/v0.5.gemfile.example: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 gemfiles/modular/benchmark/vHEAD.gemfile.example: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 gemfiles/modular/cgi/r4/v0.5.gemfile.example: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 gemfiles/modular/cgi/vHEAD.gemfile.example: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 gemfiles/modular/changelog.gemfile.example: 892598e0e7792eb205247ae28128cef6dfc647d2fb33968969152230d6f69288 gemfiles/modular/coverage.gemfile.example: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - gemfiles/modular/coverage_local.gemfile.example: 928d5f260d7b119c038baa56da9fb78dd524dee613aea33ab72894bbce5c506e + gemfiles/modular/coverage_local.gemfile.example: 92ea0d7a9d693553dc614afa2c43990f5c3778c2b00ef6c528e122c31bd506a1 gemfiles/modular/debug.gemfile.example: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 gemfiles/modular/documentation.gemfile.example: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c gemfiles/modular/documentation_local.gemfile.example: 84a20f5d4b0feb94c2cf2f7a8dce8f682f1483498e41484c2b447a5661fd1870 @@ -145,10 +146,10 @@ template_state: gemfiles/modular/stringio/r3/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/r4/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/vHEAD.gemfile.example: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - gemfiles/modular/style.gemfile.example: 3ad0585b4f2db8918580ca41ea8723f7a166d7a83cfd7f9613511094997106fd + gemfiles/modular/style.gemfile.example: 02fe3e8fd00e49b90c3ab30e19b51014ee50490f3eadcfd1d4a39f4c2c997dda gemfiles/modular/style_local.gemfile.example: c86beb711e766126a5be68be4be18255831625ac3650d5069383c4a83a9511f3 - gemfiles/modular/templating.gemfile.example: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - gemfiles/modular/templating_local.gemfile.example: 930057d3b909a72e39a39125c4e883a7ff71f5691e64426c0541f8c8fc75b83f + gemfiles/modular/templating.gemfile.example: 2b33c094677b53ad9dd2eafeb3a3be452f612380c61001a2e75b3c078b8ff72a + gemfiles/modular/templating_local.gemfile.example: ac7259516e69ffafb8b9342a897ddf6042adc46335743f474c342509cefd8f2e gemfiles/modular/webrick/r4/v1.9.gemfile.example: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea gemfiles/modular/webrick/vHEAD.gemfile.example: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b gemfiles/modular/x_std_libs.gemfile.example: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a @@ -175,7 +176,7 @@ template_state: shim/Gemfile.example: 0fb0d9d06fcfb1fd6ca6f0eeb5867253ca1ed221e03d28027719225f868b0637 shim/README.md.example: 3a2f7211b7f92a1dfae5e523b8e34b051a3d8af942144b05286eca0b3c8f6fbe shim/Rakefile.example: 572c94da7052083b39b62a6600785419e314a109efd7a3d8c3a96eb77ad34fd1 - shim/gem.gemspec.example: efae033238e4fd1355cfc134f5c9123f175d1ad1dc4a1a2e663899788c9e0870 + shim/gem.gemspec.example: 14a7015b3328005d1c3b5fda6886bd6da383707745f6eaaa781d6f9689600131 shim/lib/compat_require.rb.example: 94ee85e353a3ca08c8a35c9063d4ff789214ea594c7f803f6cf09d7142f48379 shim/lib/entrypoint.rb.example: dd57613520daca01d6f6bcaa9b83b00ff74505240dc04b84ceb686df3c0539d7 shim/lib/version.rb.example: 15e219ac3a928b5580035f891e415551213175020f1131f6e7ca0ccd55a1b2d6 @@ -189,370 +190,370 @@ files: recipe: template_source_application_simplecov action: write dest_sha256: 98d0611bac349eec9d0e178b837332da1aa404150e3a7229e95f906a7bff1901 - input_fingerprint: '09e4561dfc7d55dc73462c8319de0890f0c9df6744ab285e93545027abf5c18c' + input_fingerprint: 389bc53b6c7c864f21aaf623991f3d785ffa044dad41e0124eb8a2f74e73cff2 template_sources: - ".simplecov.example" AGPL-3.0-only.md: recipe: template_source_application_AGPL_3_0_only_md action: write dest_sha256: d8a6cc31abc16b6748c7a21f21611f5a1ec33f67d22ca23d7da1c19b95496bee - input_fingerprint: ff6bfbb973a73cb9dbfae2dd30faba7ac7828d21f16b7eac726fd0d6c3bb4136 + input_fingerprint: 71f7c7fa476c5ace00d13e5ac0e2a229528d1bd9325b8c8c278d6b891c2ded98 template_sources: - AGPL-3.0-only.md.example Gemfile: recipe: template_source_application_Gemfile action: write - dest_sha256: 94c1d34f1421694d2b9299665f320e71c5a8f1168c5ecd8bf1854f5c9f0d43c0 - input_fingerprint: 91e41776440220edbbb21618ca90a94ec48c3f3c96f298e4dd4df91e90e8ea41 + dest_sha256: 4c9a94fdc3707153b5ee5d211af6634b20435411f9a7f2a4e058c921184b010e + input_fingerprint: 1810a83bda1295a17da800e94845e539814c4a08c4245d3c1a7a04811a671a02 template_sources: - Gemfile.example LICENSE.md: recipe: template_source_application_LICENSE_md action: write dest_sha256: f6188bfd474a636d2a526420ebb411250faa447d94c9b9ccee097128ce4101b5 - input_fingerprint: a24eb23e2a932f9efd2f16d8a459e32033f4e9e8cd98baa41f4f4ad735668130 + input_fingerprint: 60982b0200cd2f9416c4d3018b0a080df48805e7ebd82a01d60fdb15d206e9c1 template_sources: - LICENSE.md.example PolyForm-Small-Business-1.0.0.md: recipe: template_source_application_PolyForm_Small_Business_1_0_0_md action: write dest_sha256: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 - input_fingerprint: 42ee54d8f657e7485fe252459fed0aaeef8c41ea704bec75be9a8e40ae96cab4 + input_fingerprint: 4d4d2517d82a1582495bcfea8ddf01370578f760b4f048ed9559937f0cd55315 template_sources: - PolyForm-Small-Business-1.0.0.md.example README.md: recipe: template_source_application_README_md action: write dest_sha256: 0afb5e351717772399e722f911a16692768ef16cd2b389aa11786bb908aed416 - input_fingerprint: 9fe73bf75c4638704becdc0bcd00e991383efb4806f72b21ef81fd1c4b9ee06f + input_fingerprint: a6c75828b2f731877dbecc63a615c5258ddf1a93cf5ba26259236fcbef345088 template_sources: - README.md.example Rakefile: recipe: template_source_application_Rakefile action: write - dest_sha256: cdf22b628703f13ec057a81215dbf568b8c1e0253ef9fb442d0467e102f6bca4 - input_fingerprint: 41bcaf0874c29edf84da105242754ced86884ce1e7064e8d9bdf5cacdaa35766 + dest_sha256: 7fae4aff0140ac5c74e2143d2bb45cad01248cc0fd612df00e95fadf8f315482 + input_fingerprint: e836c2aa90d2dafa2e4ba639d14cebd85e0a921f503689e2ad499d12da8d76fe template_sources: - Rakefile.example certs/pboling.pem: recipe: template_source_application_certs_pboling_pem action: write dest_sha256: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - input_fingerprint: b2491d94655c052aa51d7916dc8e3dec76abb5957bcfb0ab928c5f9c37387880 + input_fingerprint: 5b5bb220b61e674bd52afe4884ebad68ceecee3f9fa69a7763880ac5357357ac template_sources: - certs/pboling.pem.example gemfiles/modular/benchmark/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_r4_v0_5_gemfile action: write dest_sha256: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 - input_fingerprint: ed6cf72f416306ab30406589a1dea8d35ca502f752f312d4e9e188613117eb63 + input_fingerprint: 62090670e77b391077ed7a5ea65ba96d36c0f830f4243314fe2a67f17c4bdf26 template_sources: - gemfiles/modular/benchmark/r4/v0.5.gemfile.example gemfiles/modular/benchmark/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_vHEAD_gemfile action: write dest_sha256: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 - input_fingerprint: 6564ef9e405f5d61074a1e16e77b9068b740c8716f28dc64c28211b107ab8f74 + input_fingerprint: afe18dc86e75fdb7dc5cd9d492ddbe8cf41b7cc8f8835d7b09b08cba79ce99a5 template_sources: - gemfiles/modular/benchmark/vHEAD.gemfile.example gemfiles/modular/cgi/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_cgi_r4_v0_5_gemfile action: write dest_sha256: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 - input_fingerprint: c343a85f9c7984fa20f31812ffeb5c059dff48a2c95edea93812e4f29e300b71 + input_fingerprint: '0309e8900cbc7ab55168665af5e9441a1e4bed635cc7bad7f1e7b52ffd5c76b5' template_sources: - gemfiles/modular/cgi/r4/v0.5.gemfile.example gemfiles/modular/cgi/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_cgi_vHEAD_gemfile action: write dest_sha256: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 - input_fingerprint: 22aa6c83f62ae70f5a518abaffb47bf71102bf1eb38ba8e7654142aa01692930 + input_fingerprint: 28346b249eda22ec4b34ce718dcda5ae7aa4af0c104af634da2e49d2cc27f893 template_sources: - gemfiles/modular/cgi/vHEAD.gemfile.example gemfiles/modular/changelog.gemfile: recipe: template_source_application_gemfiles_modular_changelog_gemfile action: write dest_sha256: da669526144fbff33aef207db9541b6fd6c254437f94dec2fab70fc55a7757cd - input_fingerprint: 676d1e7644667646463152fdaeb420c74a89d1b6e9a5b7cb01c6f985a8f303e9 + input_fingerprint: ed15974321a615eaf319158766256144e7d8c4aaeac6da2e35f42c1ffacf2a5d template_sources: - gemfiles/modular/changelog.gemfile.example gemfiles/modular/coverage.gemfile: recipe: template_source_application_gemfiles_modular_coverage_gemfile action: write dest_sha256: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - input_fingerprint: 7c69573f3aac3c5a98d7958bfc2a5e5c09bb64aff65878e7b88fb59ee2b82b4f + input_fingerprint: 057d86b6bbc94435ec3de6d3ed16205a6bccba471ecd5a5c5df82fb3618c454a template_sources: - gemfiles/modular/coverage.gemfile.example gemfiles/modular/coverage_local.gemfile: recipe: template_source_application_gemfiles_modular_coverage_local_gemfile action: write - dest_sha256: 2b493414df06261ba8acb6f0eb18bf3fdd701d7cb5f967a9d15a3f42a4741827 - input_fingerprint: 4fe2f3cbfdbaa5ca3cbd72d90b9396f0a727cb43d2ef188e203d06a49579971d + dest_sha256: 92c9a599c8f6867ec532880f73568f2736ac05d8973ec524b42fd5dbe6aeda3e + input_fingerprint: 8d040225dfa4aaccb8ff8bb3f7a8f9e07329089760e830dc2cbee8664bdd8af2 template_sources: - gemfiles/modular/coverage_local.gemfile.example gemfiles/modular/debug.gemfile: recipe: template_source_application_gemfiles_modular_debug_gemfile action: write dest_sha256: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 - input_fingerprint: c77e9ecc0f8b248d64524557cf33dfc3b4fcbd851d7e2c0c10017adbb991bf19 + input_fingerprint: dee9814316a9173528263f8fd944737761519e7d846cce55f5717bcbc6364475 template_sources: - gemfiles/modular/debug.gemfile.example gemfiles/modular/documentation.gemfile: recipe: template_source_application_gemfiles_modular_documentation_gemfile action: write dest_sha256: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c - input_fingerprint: d207102e0c54ca48a79a02406ae6ce3967d7a5dde18367955c32392bab59714c + input_fingerprint: 4567405f415ee7926657de9823235af71bcf68e29759f13d0823fb352eaad191 template_sources: - gemfiles/modular/documentation.gemfile.example gemfiles/modular/documentation_local.gemfile: recipe: template_source_application_gemfiles_modular_documentation_local_gemfile action: write dest_sha256: 2058173855b9a4acc6d5efa20520e49734243eef6cf0b5e9063e0e5866a08e9c - input_fingerprint: 18e55d18a2dc344828a3b6223c6cad8b5b0010dfe439ccb2359d0e7dbe6ad818 + input_fingerprint: 72c1e06d52b828858d3f1edc42ea974d1a9b842fe4995d96982e17ef671df732 template_sources: - gemfiles/modular/documentation_local.gemfile.example gemfiles/modular/erb/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r2_v3_0_gemfile action: write dest_sha256: 3793e7dc9ef23a7ccd893d48cbba092fd27594c63e65cca011cc658218425670 - input_fingerprint: f78dbe43bfda2d4bc8f6efcdba616eab61b440e7bbf0148bfc50e88bda33406e + input_fingerprint: 6693ff7fd18541e9e6e51cd549dfdaa3d8228d71c5fcab0039ddf6a3eb3b4ac5 template_sources: - gemfiles/modular/erb/r2/v3.0.gemfile.example gemfiles/modular/erb/r3/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r3_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: ee214a776d20f53ccecb3613e6048668f0a793632cc3b1d964273a7254c2e0f6 + input_fingerprint: df23f53bf24af25327327c6d2e06febaf30a36f71acf0e881339862353dd623f template_sources: - gemfiles/modular/erb/r3/v5.0.gemfile.example gemfiles/modular/erb/r4/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r4_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: e5c786c088cadc790974976d59c5eadbccecf435b64f008ab113d7bc579d6189 + input_fingerprint: e82e9d99fedbf2501b5938fee06a13922a45cdf5c84d39b7dff991254f176616 template_sources: - gemfiles/modular/erb/r4/v5.0.gemfile.example gemfiles/modular/erb/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_erb_vHEAD_gemfile action: write dest_sha256: ad6f104a49e80e0cf625440e3dc816343fe7e2f037fc4971df75e7bb4305c683 - input_fingerprint: 459b3186edb7c08949103c8c252cd721c402439c8d567bccde34c51f22f99a92 + input_fingerprint: ec624f16bab26dc9be036847d44bd3192973e291b7642fce4aa0e0cb48c8a8cc template_sources: - gemfiles/modular/erb/vHEAD.gemfile.example gemfiles/modular/json/truffleruby_22_3.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_22_3_gemfile action: write dest_sha256: 249c12eacbe90f9d0d2e81e7a62c4c7e9102e504ededcda4ecf660cb3bb68be4 - input_fingerprint: 6846f386dbb1f286174101ffac53f8da91671c04864fdea054c8108c9b7d9a18 + input_fingerprint: 9dfff778a0eaffa83b51e278b66ce013d49e8c26a010af73255256a19fea2f87 template_sources: - gemfiles/modular/json/truffleruby_22_3.gemfile.example gemfiles/modular/json/truffleruby_23_0.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_0_gemfile action: write dest_sha256: 66aa010567f7afa1af8244a74c3c88ecaaf84dc87b6a25180691bb480d02ed28 - input_fingerprint: f930c961935011aa2295b123ad108c3b1decb7f06a997eacbee1044213f080a1 + input_fingerprint: ed6c9057e16170c39148b3f55a730d5aca0247ce73b16ff3536a10faa2f37c2e template_sources: - gemfiles/modular/json/truffleruby_23_0.gemfile.example gemfiles/modular/json/truffleruby_23_1.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_1_gemfile action: write dest_sha256: '080fcbdaf2bec73cad40832a3d51eebb380af789917b96f493d1460b0dd6361d' - input_fingerprint: 5b4dc408998d280240448f7c5e26b4905148cd267d87ee854817090868cc6387 + input_fingerprint: 95c82b8a1cf498de2150caa4113b982abb925bc26fcb7da2920a61ccdd4c8b67 template_sources: - gemfiles/modular/json/truffleruby_23_1.gemfile.example gemfiles/modular/mutex_m/r2/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r2_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 73a32c5053e12baa9efb87b6579d0b7039009bd1b996393a7682f6ee78bfa844 + input_fingerprint: 27604fa30e9420d32119fa276b7aaec0cb1372727197d904fed89dc538dad860 template_sources: - gemfiles/modular/mutex_m/r2/v0.3.gemfile.example gemfiles/modular/mutex_m/r3/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r3_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: b21b857f36f35a404e23f562b80444224aca37e1ae1a0b805a0bd8b4a424d4eb + input_fingerprint: f57e6b165c4abe60261fa63341389cbcc6de66b2721bdbef6f904e55d6fa377d template_sources: - gemfiles/modular/mutex_m/r3/v0.3.gemfile.example gemfiles/modular/mutex_m/r4/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r4_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: '0628440749988f45adfe933dbf73b2cdc43e97fd95095124b76b8815664262ef' + input_fingerprint: 39e0322b0b734f09c586aa2a4390fb829e083a37620c0d39d85ecdcc259ee7f0 template_sources: - gemfiles/modular/mutex_m/r4/v0.3.gemfile.example gemfiles/modular/mutex_m/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_vHEAD_gemfile action: write dest_sha256: '08018641c97f894788fa91b462da504ab2237213d18d95404136c393274ae3cb' - input_fingerprint: b391766a9ddcc4c6b05b9ead42e737303b204e0d211284e5ff502fc1a497a2a2 + input_fingerprint: 7e1c92015ff597f47dec4fdc805d0c8c2cc73ca9f600584c04f330e53e17af0e template_sources: - gemfiles/modular/mutex_m/vHEAD.gemfile.example gemfiles/modular/optional.gemfile: recipe: template_source_application_gemfiles_modular_optional_gemfile action: write dest_sha256: f770e6e9a9dd2bd0f1f132e882d88038b2e21127dce3afe270908c7338c28bfd - input_fingerprint: 6cfedd965192fdc8fbd06e53dde80d77271de5d30899e5c694ffc8f3b57f22cc + input_fingerprint: 133a5b9ede32bedfde7433efce6561e61d853aecf4504d973a2e082500a44b15 template_sources: - gemfiles/modular/optional.gemfile.example gemfiles/modular/rspec.gemfile: recipe: template_source_application_gemfiles_modular_rspec_gemfile action: write dest_sha256: d043f5c9344f6435edb4607c5adaf42c78e7fb6b8b6726007de2bbedefb376c3 - input_fingerprint: 9652a1deed943788393751b783ffcd64ebf03e0701f1562265d23f3e0704100e + input_fingerprint: 11714cdb28f1080303dc66a6f75a4aa40f4a6f2df5ecd728dea330589d404cee template_sources: - gemfiles/modular/rspec.gemfile.example gemfiles/modular/runtime_heads.gemfile: recipe: template_source_application_gemfiles_modular_runtime_heads_gemfile action: write dest_sha256: 6ac7158c4a3088190f2a9082f01439eb27eca2172ab3464b15c9cb045aa885e1 - input_fingerprint: a722e3b11082c2333d0fddac7a366869887aba16cd271be4875e5b434a0a85a3 + input_fingerprint: 65ab6367c765ce58a7f39e0073d7a7d78c8bb55a366ce0b841415fe173ad896d template_sources: - gemfiles/modular/runtime_heads.gemfile.example gemfiles/modular/stringio/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r2_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: ae2d74bd4f1667f35ea33bc52bf04f21995a00ab94842007853b60c9b2acf125 + input_fingerprint: cab1b9543c3b643780506499796ed5217aa49a2fa352b184d6eca1ab8e4276ea template_sources: - gemfiles/modular/stringio/r2/v3.0.gemfile.example gemfiles/modular/stringio/r3/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r3_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 7a1603bd7b61761d4a023dbf3f9718a8ebed54d6789f86db09a3f04eabc9a799 + input_fingerprint: 834729346af5be8616044d9f7df976313842318d477baa9b23d2d246debabaaa template_sources: - gemfiles/modular/stringio/r3/v3.0.gemfile.example gemfiles/modular/stringio/r4/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r4_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 681e9121870e32e2fcacadc766a4d20b4550f9592b912c1750e446f47dfc475f + input_fingerprint: e7388cf98f96208112101088956eba6b4d34e3ea7007464252d02a439ba8538c template_sources: - gemfiles/modular/stringio/r4/v3.0.gemfile.example gemfiles/modular/stringio/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_stringio_vHEAD_gemfile action: write dest_sha256: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - input_fingerprint: ca8bd4cc46d6e1d707f98e960523e1175114632666fb6637d8de6a001ccd283e + input_fingerprint: b4e87e98d5fd485d3d3f904c4a2ed6430fec8c60d03ef2c9e408c6c9b8757b09 template_sources: - gemfiles/modular/stringio/vHEAD.gemfile.example gemfiles/modular/style.gemfile: recipe: template_source_application_gemfiles_modular_style_gemfile action: write - dest_sha256: 2a3d46dcb8a9394f595f273f5eb0403d0a552837754ab109afc9ba79a7159083 - input_fingerprint: 7f6c8a9b0d4ae6d54c18dd24b46dd3affaed3f5f65d50bac7b8979f4c389e6e4 + dest_sha256: 9a24acff0054573c30f5d84d0418cd465ba3794d075bb5a36801410ac40e0787 + input_fingerprint: d053705cbf70b19cbe2c649e5a684e2cb6c038523a1067755ef8afed7832c8ce template_sources: - gemfiles/modular/style.gemfile.example gemfiles/modular/style_local.gemfile: recipe: template_source_application_gemfiles_modular_style_local_gemfile action: write dest_sha256: 55eb9c149cdb2f29c9f31abe2d55a4f334e00fb859681dd17c42149a3f28ca36 - input_fingerprint: dc97b5ad287b98fde912121036ed4698386cac8475e4703e8635edc37ffb279a + input_fingerprint: 73b9cf0e76a64abab71d035785afa631914c586015868cf67ce231491df3fb1e template_sources: - gemfiles/modular/style_local.gemfile.example gemfiles/modular/templating.gemfile: recipe: template_source_application_gemfiles_modular_templating_gemfile action: write - dest_sha256: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - input_fingerprint: 5a278fb5cfe5c91dcbda336ac9348729fa0e694548a82ef294217babd81e0906 + dest_sha256: 432ba59798d31b899268257c432443a017c5a9bd2c0c7f9f2216617e14150cd3 + input_fingerprint: d225e31c6d04baa8be00ed3e7807bc5c526cfe04d2983c5eb31ea20e8a9c3f37 template_sources: - gemfiles/modular/templating.gemfile.example gemfiles/modular/templating_local.gemfile: recipe: template_source_application_gemfiles_modular_templating_local_gemfile action: write - dest_sha256: 0d00a9555e7050baffd785df4c45a5717234b256d8f8c97d00a74a9832ff04ac - input_fingerprint: 68e8c875f025bf47794d94c005b3ba04e3ed34782738f1fe3fd91b20e1836d50 + dest_sha256: 16978ca2df2d3e07a22f62de1aa96d5c349396fc3246590fe2fb8d42ef099ee7 + input_fingerprint: 20d48d4a07e1c7941f4af387d1f207328d7ceee52e2cc904aa719858cc29652f template_sources: - gemfiles/modular/templating_local.gemfile.example gemfiles/modular/webrick/r4/v1.9.gemfile: recipe: template_source_application_gemfiles_modular_webrick_r4_v1_9_gemfile action: write dest_sha256: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea - input_fingerprint: 5fe0b6792633b7ad763a37bafc31f873c1233109fa1aad5606cf3557bc0b5967 + input_fingerprint: 851feb60ac8e10fdd8b41b00fcc93962d694a2397cca4a332327c6e6d67dad31 template_sources: - gemfiles/modular/webrick/r4/v1.9.gemfile.example gemfiles/modular/webrick/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_webrick_vHEAD_gemfile action: write dest_sha256: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b - input_fingerprint: 88f7960b4acaed60dc7a0112bb4ebb5519043bfbf7dc3fb921e402ece60f7fac + input_fingerprint: 5ea1a5fcbe2134d3947a866437bdc01635706c901dbbd268f76a75b6d501a7b1 template_sources: - gemfiles/modular/webrick/vHEAD.gemfile.example gemfiles/modular/x_std_libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_gemfile action: write dest_sha256: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a - input_fingerprint: 2bef8e9bc88938df0bbbca5d275952eecfdb13bca3bdd42f75d63368cf9029c8 + input_fingerprint: 22de0ca4b25fa28c5e39c4c15e7b809d4dd3b70aba1a601737a09fae04144b32 template_sources: - gemfiles/modular/x_std_libs.gemfile.example gemfiles/modular/x_std_libs/r2/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r2_libs_gemfile action: write dest_sha256: e80ec8ad06cb1b31ac982bc25cf7696987fca131aa1001eaefd0bf5cd379c273 - input_fingerprint: 414508af995b3ba51ecd2ff138f4a5dc8e7ca7c116ef4a09495f942d8a530e81 + input_fingerprint: 4c025ed066a7861f8617d55601698fbd0a9480e9554acd43d96db8a1ae7c0e07 template_sources: - gemfiles/modular/x_std_libs/r2/libs.gemfile.example gemfiles/modular/x_std_libs/r3.1/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_1_libs_gemfile action: write dest_sha256: 9f8565c40b09bea1bc4c2e2ad87fe11400c3c51a2b235655bfcd8e491ed88ca8 - input_fingerprint: bea2b9695e4b681c6756018bb1d5e667900c84a3b862cbfc1ae35f72a018726d + input_fingerprint: 290222f7f8cd191f8ab3d64d12a0b1a0569962e51dd30aa5a7f575de07092871 template_sources: - gemfiles/modular/x_std_libs/r3.1/libs.gemfile.example gemfiles/modular/x_std_libs/r3/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_libs_gemfile action: write dest_sha256: 546f8849f4267bb19aa10ff0de40be30957197f229e6887847181ea9127b2650 - input_fingerprint: 13b90225824b6a5b9d43bb5781037c133c06e9002e8f30104d08f0a0b4658ccc + input_fingerprint: 4a56a88497b55a9ae816cfc39045d89ea5d5af14b4f62cda399e3194b67fdbe4 template_sources: - gemfiles/modular/x_std_libs/r3/libs.gemfile.example gemfiles/modular/x_std_libs/r4/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r4_libs_gemfile action: write dest_sha256: 8c2582eaa218d216b98c86c933465295c8b4e43f3251ea388b9eaf6e471f8da6 - input_fingerprint: e4d8e3d342409bd1ce27f3b46a82ae85287cc9e6274dcad2cd867b802ca832e1 + input_fingerprint: 53b88a287dccb085f71f7bc2d04e1a78cf796bfdf6def954aeee0d0f6ed77e7b template_sources: - gemfiles/modular/x_std_libs/r4/libs.gemfile.example gemfiles/modular/x_std_libs/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_vHEAD_gemfile action: write dest_sha256: d3133ec4c0638363a7fb025d19be7e95a615fd61c35ddb8d17f2280ee74a7486 - input_fingerprint: 91acf08ac9dfdb7121d50e5de2f9b80b52d36524e37fe43045f6389cb2513107 + input_fingerprint: e211e2ddd842d0586b9dd4345393199346276442387fa28577687c577d9f7e02 template_sources: - gemfiles/modular/x_std_libs/vHEAD.gemfile.example lib/zip/merge/version.rb: recipe: template_source_application_lib_zip_merge_version_rb action: write - dest_sha256: 408570159247b599ed1932fc982db0863cfc0f923cf754dda4681143f082aa64 - input_fingerprint: 2022315dc78a026129d61a9b142e2b26bebbd9e3fd8b246438647a5fd304b9ee + dest_sha256: f545a57e76d29efa2c4d226fa72105c0f801f7519b674e407fe6bedc9f691e9f + input_fingerprint: a9392bc03ac45efa6c6396ea958e38412e6b664392305201666c5675d4630526 template_sources: - lib/gem/version.rb.example mise.toml: recipe: template_source_application_mise_toml action: write dest_sha256: 7d267154ca4f081b0ac7da804c0180c2b091aec5f1c877417c1c320f4f369c88 - input_fingerprint: 292c3dc0ee8e606f244603ce2dc24a626910458c4b23504a98cf35dd024eba4e + input_fingerprint: 265f69724eb95584f287b197fc2e207d4ccde0960137b1631ba1eb2682b7d050 template_sources: - mise.toml.no-osc.example sig/zip/merge.rbs: recipe: template_source_application_sig_zip_merge_rbs action: write dest_sha256: 9ab8ccfca661cdc3837dd86f2a026f4354fb7ac8681737741cc7672f15f19063 - input_fingerprint: 16798ffcd32ab9165398f17aa599e70cde37470172cb9bee5a3e0060ab93d2d8 + input_fingerprint: 1a9991f7fb267f18d584912dbfc664db7a5ae88fff026bc100f5b93f8be01703 template_sources: - sig/gem.rbs.example spec/spec_helper.rb: recipe: template_source_application_spec_spec_helper_rb action: write dest_sha256: e0dfd37d765e0521932f0b44a0cdae7534bb77c89ae57a5bd4f87c4c8b051cc7 - input_fingerprint: 0dfe19d4ea2ae6515e1f3d0819ae35c918805c1c7f1128eed49f1244a039d6ec + input_fingerprint: bd0acd16e19dec53ee5fb6233fdf2a27dedb882177d8925c3234ebad438497ed template_sources: - spec/spec_helper.rb.example zip-merge.gemspec: recipe: template_source_application_zip_merge_gemspec action: write - dest_sha256: f13166e76787590476743be98a24cd72db9d8fa74968dae9345f60e5e45895a5 - input_fingerprint: 38126ef6e2b2d071913f540bee1878fd1110ca49b72d51db6a0645eb785eba41 + dest_sha256: 11b718d7dfaf51395e3bff967e1e3f5098485b1ef76ec707f6ef07bc94c2f86c + input_fingerprint: 8809e8fc9fc4cebd5f15d44fb80dc492d7febf934b934d08a2cdee49cacf8a2d template_sources: - gem.gemspec.example diff --git a/gems/zip-merge/Gemfile b/gems/zip-merge/Gemfile index fa50f84c0..ea5aac7c4 100644 --- a/gems/zip-merge/Gemfile +++ b/gems/zip-merge/Gemfile @@ -19,7 +19,7 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } # Include dependencies from zip-merge.gemspec gemspec -gem 'kettle-family', '~> 1.2', '>= 1.2.97' +gem 'kettle-family', '~> 1.2', '>= 1.2.100' # Local workspace dependency wiring for *_local.gemfile overrides gem 'nomono', '~> 1.1', '>= 1.1.5', require: false # ruby >= 3.2.0 diff --git a/gems/zip-merge/Gemfile.lock b/gems/zip-merge/Gemfile.lock index 65cbdd6d0..a3ec3a0c3 100644 --- a/gems/zip-merge/Gemfile.lock +++ b/gems/zip-merge/Gemfile.lock @@ -10,131 +10,131 @@ GIT PATH remote: . specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) + zip-merge (7.1.9) + binary-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) + ast-crispr-markdown-markly (7.1.9) + ast-crispr (= 7.1.9) + markdown-merge (= 7.1.9) + markly-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism specs: - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) + ast-crispr-ruby-prism (7.1.9) + ast-crispr (= 7.1.9) + prism-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) + ast-crispr (7.1.9) + ast-merge (= 7.1.9) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ast-merge-git (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: - ast-merge (7.1.8) + ast-merge (7.1.9) benchmark token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) + ast-template (7.1.9) + ast-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + bash-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + binary-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) + citrus-toml-merge (7.1.9) + ast-merge (= 7.1.9) + toml-merge (= 7.1.9) toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge specs: - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) commonmarker (~> 2.2) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) + dotenv-merge (7.1.9) + ast-merge (= 7.1.9) + plain-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + go-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + html-merge (7.1.9) + ast-crispr (= 7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + json-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: - kettle-jem (7.1.25) + kettle-jem (7.1.26) addressable (>= 2.8, < 3) ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) @@ -168,122 +168,122 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge specs: - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown (~> 2.5) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + markdown-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) + markly-merge (7.1.9) + markdown-merge (= 7.1.9) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge specs: - parslet-toml-merge (7.1.8) + parslet-toml-merge (7.1.9) toml (~> 0.3) - toml-merge (= 7.1.8) + toml-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + plain-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) + prism-merge (7.1.9) + ast-merge (= 7.1.9) prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + psych-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) + yaml-merge (= 7.1.9) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) + rbs-merge (7.1.9) + ast-merge (= 7.1.9) rbs (>= 3.10) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + rust-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) + smorg-rb (7.1.9) + ast-merge (= 7.1.9) + ast-merge-git (= 7.1.9) + bash-merge (= 7.1.9) diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) + dotenv-merge (= 7.1.9) + go-merge (= 7.1.9) + html-merge (= 7.1.9) + json-merge (= 7.1.9) kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) + markdown-merge (= 7.1.9) + plain-merge (= 7.1.9) + prism-merge (= 7.1.9) + psych-merge (= 7.1.9) + rbs-merge (= 7.1.9) + rust-merge (= 7.1.9) + toml-merge (= 7.1.9) + typescript-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + toml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: - tree_haver (7.1.8) + tree_haver (7.1.9) citrus (~> 3.0) parslet (~> 2.0) tree_sitter_language_pack (>= 1.16.2, < 2.0) @@ -292,17 +292,17 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + typescript-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + yaml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) GEM @@ -336,6 +336,8 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) + commonmarker (2.10.0) + rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -465,11 +467,15 @@ GEM lint_roller (1.1.0) logger (1.7.0) markly (0.19.0) + mini_portile2 (2.8.9) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) reline (~> 0.6) mutex_m (0.3.0) + nokogiri (1.19.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-musl) @@ -503,6 +509,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) + rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -696,13 +705,16 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.16.2-aarch64-linux) + tree_sitter_language_pack (1.17.0) + rb_sys (>= 0.9.130, < 0.10) + sorbet-runtime (~> 0.5) + tree_sitter_language_pack (1.17.0-aarch64-linux) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-arm64-darwin) + tree_sitter_language_pack (1.17.0-arm64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-linux) + tree_sitter_language_pack (1.17.0-x86_64-linux) sorbet-runtime (~> 0.5) tsort (0.2.0) tty-cursor (0.7.1) @@ -784,9 +796,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.31) + kettle-dev (~> 3.0, >= 3.0.34) kettle-drift (~> 1.0, >= 1.0.13) - kettle-family (~> 1.2, >= 1.2.97) + kettle-family (~> 1.2, >= 1.2.100) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) @@ -807,12 +819,12 @@ DEPENDENCIES reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) - rubocop-lts (~> 24.2, >= 24.2.1) - rubocop-lts-rspec (~> 1.0, >= 1.0.5) + rubocop-lts (~> 24.2, >= 24.2.3) + rubocop-lts-rspec (~> 1.0, >= 1.0.6) rubocop-minitest (~> 0.40, >= 0.40.0) rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! - rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) ruby-merge! ruby-progressbar (~> 1.13) rust-merge! @@ -843,33 +855,34 @@ CHECKSUMS appraisal2 (3.2.3) sha256=3a6cfaf8a444e02707b9a34154af1c4902fbe99d9d2168d7e81dd83ec77e6db7 appraisal2-rubocop (1.0.2) sha256=1dae97c1be087cf9c098a3a72fd41f873435e9b8b39687e633b36c9ccb22bff4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.8) - ast-crispr-markdown-markly (7.1.8) - ast-crispr-ruby-prism (7.1.8) - ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) + ast-crispr (7.1.9) + ast-crispr-markdown-markly (7.1.9) + ast-crispr-ruby-prism (7.1.9) + ast-merge (7.1.9) + ast-merge-git (7.1.9) + ast-template (7.1.9) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.8) + bash-merge (7.1.9) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) - bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae + binary-merge (7.1.9) + bundler (4.1.0.beta1) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.8) + citrus-toml-merge (7.1.9) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 + commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e commonmarker (2.10.0-x86_64-darwin) sha256=01e0830ed0319825ecdc16411c90acd3f661d1568dfc178731b3f64d0ce2363d commonmarker (2.10.0-x86_64-linux) sha256=945c510c0bfca9022245928e2248468fe3ddad58c939be0c37b20082cc392880 commonmarker (2.10.0-x86_64-linux-musl) sha256=288cd4fb9f17eed2ffa73551ef241dcf594e0f484b2aee2a0999540333c0618e - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) completely (0.8.0) sha256=e493cd5d84805f47917a41f277ecbfe5f35363bed670be5a957d3acaed8c6c5e concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 @@ -878,7 +891,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docopt_ng (0.7.1) sha256=a024148ee4fa3ab1a8a04411aa4370f39cf2b446e63562097d418b7974a15667 - dotenv-merge (7.1.8) + dotenv-merge (7.1.9) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -891,35 +904,37 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) + go-merge (7.1.9) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) + html-merge (7.1.9) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a - json-merge (7.1.8) - kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + json-merge (7.1.9) + kettle-changelog (1.0.7) + kettle-dev (3.0.34) + kettle-drift (1.0.13) kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 - kettle-jem (7.1.25) + kettle-jem (7.1.26) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 - kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd + kettle-soup-cover (3.0.10) kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 - markdown-merge (7.1.8) + markdown-merge (7.1.9) markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca - markly-merge (7.1.8) + markly-merge (7.1.9) + mini_portile2 (2.8.9) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 + nokogiri (1.19.4) nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af nokogiri (1.19.4-arm64-darwin) sha256=a46db9853286e6597b36ebc6953817d15acf3a299583eb3f89fdc6f91dd63527 @@ -933,20 +948,22 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) - plain-merge (7.1.8) + parslet-toml-merge (7.1.9) + plain-merge (7.1.9) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.8) + prism-merge (7.1.9) psych (5.5.0) sha256=4b245bbbd0f3238df8ccee766ebc1a6b062b10e4ee1d3284eb588739ba156a0a - psych-merge (7.1.8) + psych-merge (7.1.9) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 - rbs-merge (7.1.8) + rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -982,11 +999,11 @@ CHECKSUMS rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.8) + ruby-merge (7.1.9) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) + rust-merge (7.1.9) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +1011,7 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) + smorg-rb (7.1.9) sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1011,24 +1028,25 @@ CHECKSUMS timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.8) + toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb - tree_haver (7.1.8) - tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 - tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 - tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 - tree_sitter_language_pack (1.16.2-x86_64-linux) sha256=d8151e6e44e35ace9de3611c76b730896beab17f427db06d8f76666332a5dc60 + tree_haver (7.1.9) + tree_sitter_language_pack (1.17.0) + tree_sitter_language_pack (1.17.0-aarch64-linux) + tree_sitter_language_pack (1.17.0-arm64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-linux) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f tty-cursor (0.7.1) sha256=79534185e6a777888d88628b14b6a1fdf5154a603f285f80b1753e1908e0bf48 tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) + typescript-merge (7.1.9) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 yaml-converter (0.2.5) sha256=a5214fe1a6c2df88bd34a35bcded1b1dcd30135548130df2e03b54ca8c0f2423 - yaml-merge (7.1.8) + yaml-merge (7.1.9) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.8) sha256=73d935d43e3479d65ce8aff25c7d3100e8bb83528a2adaa0ed824e5046ac99e7 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -1037,8 +1055,8 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) + zip-merge (7.1.9) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH - 4.0.20 + 4.1.0.beta1 diff --git a/gems/zip-merge/Rakefile b/gems/zip-merge/Rakefile index 903de97f1..e0398683b 100644 --- a/gems/zip-merge/Rakefile +++ b/gems/zip-merge/Rakefile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -# zip-merge Rakefile v7.1.18 - 2026-09-07 +# zip-merge Rakefile v7.1.26 - 2026-09-09 # Ruby 2.3 (Safe Navigation) or higher required # # See LICENSE.md for license information. diff --git a/gems/zip-merge/bin/rubocop-gradual b/gems/zip-merge/bin/rubocop-gradual new file mode 100755 index 000000000..7c7ff0635 --- /dev/null +++ b/gems/zip-merge/bin/rubocop-gradual @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'rubocop-gradual' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'rubygems' +require 'bundler/setup' + +load Gem.bin_path('rubocop-gradual', 'rubocop-gradual') diff --git a/gems/zip-merge/gemfiles/modular/coverage_local.gemfile b/gems/zip-merge/gemfiles/modular/coverage_local.gemfile index 37917caac..d6c890e46 100644 --- a/gems/zip-merge/gemfiles/modular/coverage_local.gemfile +++ b/gems/zip-merge/gemfiles/modular/coverage_local.gemfile @@ -29,11 +29,31 @@ Kernel.send(:gem, 'nomono', *nomono_activation_requirements) require 'nomono/bundler' local_gems = %w[kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -local_gems_to_eval = local_gems - %w[] - declared_gems # export KETTLE_DEV_DEV=/path/to/my platform :mri do + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + local_gems_to_eval = local_gems - %w[] - declared_gems + eval_nomono_gems( gems: local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/zip-merge/gemfiles/modular/style.gemfile b/gems/zip-merge/gemfiles/modular/style.gemfile index 59c5dc1a3..41ec99454 100644 --- a/gems/zip-merge/gemfiles/modular/style.gemfile +++ b/gems/zip-merge/gemfiles/modular/style.gemfile @@ -24,9 +24,9 @@ platform :mri do if ENV.fetch('RUBOCOP_LTS_DEV', 'false').casecmp('false').zero? declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) - gem 'rubocop-lts', '~> 24.2', '>= 24.2.1' unless declared_gems.include?('rubocop-lts') - gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.5' unless declared_gems.include?('rubocop-lts-rspec') - gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.6' unless declared_gems.include?('rubocop-ruby3_2') + gem 'rubocop-lts', '~> 24.2', '>= 24.2.3' unless declared_gems.include?('rubocop-lts') + gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.6' unless declared_gems.include?('rubocop-lts-rspec') + gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.8' unless declared_gems.include?('rubocop-ruby3_2') else eval_gemfile('style_local.gemfile') end diff --git a/gems/zip-merge/gemfiles/modular/templating.gemfile b/gems/zip-merge/gemfiles/modular/templating.gemfile index 6af159bd7..ce51a08ed 100644 --- a/gems/zip-merge/gemfiles/modular/templating.gemfile +++ b/gems/zip-merge/gemfiles/modular/templating.gemfile @@ -18,7 +18,7 @@ end if structuredmerge_remote # Merge recipes for released installs. - gem 'kettle-jem', '>= 7.0' + gem 'kettle-jem', '~> 7.1', '>= 7.1.26' end if kettle_remote diff --git a/gems/zip-merge/gemfiles/modular/templating_local.gemfile b/gems/zip-merge/gemfiles/modular/templating_local.gemfile index d0dfb1133..cf16bd3cd 100644 --- a/gems/zip-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/zip-merge/gemfiles/modular/templating_local.gemfile @@ -65,9 +65,7 @@ structuredmerge_local_gems = %w[ kettle_dev_local_gems = %w[ kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift ] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[] -kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - (declared_gems - %w[kettle-dev]) if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( @@ -81,6 +79,28 @@ if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 end if ENV.fetch('KETTLE_DEV_DEV', 'false').casecmp('false') != 0 + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - declared_gems + eval_nomono_gems( gems: kettle_dev_local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/zip-merge/zip-merge.gemspec b/gems/zip-merge/zip-merge.gemspec index d8f44ef4a..62e0df440 100644 --- a/gems/zip-merge/zip-merge.gemspec +++ b/gems/zip-merge/zip-merge.gemspec @@ -120,7 +120,7 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.31') # ruby >= 4.0.0 + spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.34') # ruby >= 4.0.0 # Security spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 From ea0461b0eb96a3a12c4dfd05f6bdb11443ffe799 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 23:54:27 -0400 Subject: [PATCH 097/137] =?UTF-8?q?=F0=9F=8E=A8=20Template=20psych-merge?= =?UTF-8?q?=20by=20kettle-family?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/psych-merge/.kettle-drift.lock | 76 ++++- gems/psych-merge/.rubocop_gradual.lock | 7 +- .../.structuredmerge/kettle-jem.lock | 145 ++++---- gems/psych-merge/Gemfile | 2 +- gems/psych-merge/Gemfile.lock | 318 +++++++++--------- gems/psych-merge/Rakefile | 2 +- gems/psych-merge/bin/rubocop-gradual | 16 + .../gemfiles/modular/coverage_local.gemfile | 24 +- .../gemfiles/modular/style.gemfile | 6 +- .../gemfiles/modular/templating.gemfile | 2 +- .../gemfiles/modular/templating_local.gemfile | 24 +- gems/psych-merge/psych-merge.gemspec | 2 +- 12 files changed, 387 insertions(+), 237 deletions(-) create mode 100755 gems/psych-merge/bin/rubocop-gradual diff --git a/gems/psych-merge/.kettle-drift.lock b/gems/psych-merge/.kettle-drift.lock index 98b009e1e..1b23f4793 100644 --- a/gems/psych-merge/.kettle-drift.lock +++ b/gems/psych-merge/.kettle-drift.lock @@ -1,10 +1,82 @@ { + "debug_env: 'KETTLE_DEV_DEBUG',\nroot: %w[src my kettle-dev]": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 46, + 63 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 93, + 110 + ] + } + ], + "path_env: 'KETTLE_DEV_DEV',\nvendored_gems_env: 'VENDORED_GEMS',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 43, + 60 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 90, + 107 + ] + } + ], + "prefix: 'KETTLE_DEV',\npath_env: 'KETTLE_DEV_DEV',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 42, + 59 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 89, + 106 + ] + } + ], + "vendor_gem_dir_env: 'VENDOR_GEM_DIR',\ndebug_env: 'KETTLE_DEV_DEBUG',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 45, + 62 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 92, + 109 + ] + } + ], "vendored_gems_env: 'VENDORED_GEMS',\nvendor_gem_dir_env: 'VENDOR_GEM_DIR',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 44, + 61 + ] + }, { "file": "gemfiles/modular/templating_local.gemfile", "lines": [ - 77, - 88 + 75, + 91, + 108 ] } ] diff --git a/gems/psych-merge/.rubocop_gradual.lock b/gems/psych-merge/.rubocop_gradual.lock index da59dca8f..c27a8d3e0 100644 --- a/gems/psych-merge/.rubocop_gradual.lock +++ b/gems/psych-merge/.rubocop_gradual.lock @@ -2,7 +2,7 @@ ".simplecov:2330981413": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] ], - "Rakefile:673839453": [ + "Rakefile:1798853534": [ [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], [81, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], [165, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], @@ -22,6 +22,9 @@ [1, 1, 0, "Naming/FileName: The name of this source file (`vHEAD.gemfile`) should use snake_case.", 5381], [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], + "gemfiles/modular/coverage_local.gemfile:2813372128": [ + [34, 1, 1586, "Metrics/BlockLength: Block has too many lines. [37/25]", 820328175] + ], "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], @@ -367,7 +370,7 @@ [243, 7, 635, "Metrics/MethodLength: Method has too many lines. [14/10]", 1970994061], [277, 7, 1176, "Metrics/MethodLength: Method has too many lines. [27/10]", 3083136477] ], - "psych-merge.gemspec:3777109583": [ + "psych-merge.gemspec:2603096586": [ [138, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4147388508], [149, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], [150, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] diff --git a/gems/psych-merge/.structuredmerge/kettle-jem.lock b/gems/psych-merge/.structuredmerge/kettle-jem.lock index 09955e14c..850a8d049 100644 --- a/gems/psych-merge/.structuredmerge/kettle-jem.lock +++ b/gems/psych-merge/.structuredmerge/kettle-jem.lock @@ -1,11 +1,12 @@ --- version: 1 template_state: - version: 7.1.18 - applied_at: '2026-09-07' + version: 7.1.26 + applied_at: '2026-09-10' changelog_replay: last_entry_key: kettle-jem-template-20260802-001 last_entry_date: '2026-08-02' + maintenance_changelog: {} checksums: ".aiignore.example": 48a5dfdd93afd1a15fdce39cc28ca9920263f00018b0968ab031fa744521e5ce ".config/mise/env.sh": aeea5a2ab489ba6e5467ae8de6e386ec8c8fe4ff31a044e69d0cd6a092dd6654 @@ -75,7 +76,7 @@ template_state: ".rubocop_rspec.yml.example": 288ad75e7eb14d87d80fafe6f7272217be5c57547536ee56c780a7d10ac7ec74 ".simplecov.example": 222f2e6ce8cf089c70a21f0f5e5423d4bd59a96fdb2ce7754b0fb3d6f430c229 ".structuredmerge/git-drivers.toml.example": 9d241a44c9edffcdbd3da018fa188a238089c3d1635040924df594a6929a4f97 - ".structuredmerge/kettle-jem.yml.example": 26949dc4ee0722415e72452cbc186bee6ef7b154eae33166d36f3fdb1ca6e46d + ".structuredmerge/kettle-jem.yml.example": ff65a738da1af7d60714026a81d3323a46c864e96ae3570b806afdf6e7149ff9 ".yard-lint.yml.example": 90def46867c9436b4e177c47d91fc8165f4602e335715aecc39f5587ae20b55b ".yardignore.example": 821f453c609df7d46145d675424b39dfbe6dfdca8edac5f367b85fff48502455 ".yardopts.example": 6fd6f2701713096a8a9ea095c213bbc68eeef37797c4754d97837e3229a3a5f6 @@ -88,7 +89,7 @@ template_state: CHANGELOG.transfer.md: 21331d8a9e58b4ff6e088b88eb408bcccb0f2f64e78f8f4d42ac3f11a24baad8 CITATION.cff.example: e404ea0a7919d78a83d53d80e211d17b9663576aa606583b709795dc023fd75c CODE_OF_CONDUCT.md.example: f1ad532f1860f73ef774c6b27a26d41f4bc1cb8813034f5957487766ebb0986b - CONTRIBUTING.md.example: 22570cfb3dde72be79b4b522b6d5ab13f95d778e40444483a096871fe0891b19 + CONTRIBUTING.md.example: 8d23cce2d061e0c20d619c3f66591df5f32821cd84c32d171df0b8ebe1217a55 FUNDING.md.example: 392d047904b1557b29f4b43d37ec403b7480edd5b6ab51180be979b57a91e6ba FUNDING.md.no-osc.example: 3ef0258dd3e3b7f7e17e8bc2d20dcbcb3e74aa5a5a6f51297075696645e34c77 Gemfile.example: 99500023987e81775a9b5ef14e92cb3992f2ac408e5f42454f2728eee9b49fb2 @@ -99,19 +100,19 @@ template_state: PolyForm-Small-Business-1.0.0.md.example: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 README.md.example: 21f491e3d73bfc1b74056a6dcba61f72c93dee3cfe5272ac164a20978454de21 REEK: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - RUBOCOP.md.example: c09e5533ccc59b70a2efa05c99f66e521137c1053d3c12eb43509cebd5b68b0e + RUBOCOP.md.example: d99871a0e4c1d323c92e7febf328f062bb4722069b2abfd0a83bf7daa8dcbf8c Rakefile.example: 569803e726b07ea26267fec6891367a3096a0dff3c266269a7081d36afe496af SECURITY.md.example: ee9411aa85f36d88363fdaea7a1baea4362b6ec112cf2688e711b05de1d3144c bin/setup.example: 0ac35089c95a91d8973fe7a318bf9fd98b9f8e00db92c5d9ca6cd858abb8d41b certs/pboling.pem.example: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - gem.gemspec.example: 83e834e8958a88e4817a57199f48f5ebb245548ce251c5c47372208693f03b17 + gem.gemspec.example: 12dcadc0b297ccd4e18b9d1e538b98ac8330ef9fb2a059ed6754ad59272b77fa gemfiles/modular/benchmark/r4/v0.5.gemfile.example: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 gemfiles/modular/benchmark/vHEAD.gemfile.example: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 gemfiles/modular/cgi/r4/v0.5.gemfile.example: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 gemfiles/modular/cgi/vHEAD.gemfile.example: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 gemfiles/modular/changelog.gemfile.example: 892598e0e7792eb205247ae28128cef6dfc647d2fb33968969152230d6f69288 gemfiles/modular/coverage.gemfile.example: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - gemfiles/modular/coverage_local.gemfile.example: 928d5f260d7b119c038baa56da9fb78dd524dee613aea33ab72894bbce5c506e + gemfiles/modular/coverage_local.gemfile.example: 92ea0d7a9d693553dc614afa2c43990f5c3778c2b00ef6c528e122c31bd506a1 gemfiles/modular/debug.gemfile.example: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 gemfiles/modular/documentation.gemfile.example: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c gemfiles/modular/documentation_local.gemfile.example: 84a20f5d4b0feb94c2cf2f7a8dce8f682f1483498e41484c2b447a5661fd1870 @@ -145,10 +146,10 @@ template_state: gemfiles/modular/stringio/r3/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/r4/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/vHEAD.gemfile.example: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - gemfiles/modular/style.gemfile.example: 3ad0585b4f2db8918580ca41ea8723f7a166d7a83cfd7f9613511094997106fd + gemfiles/modular/style.gemfile.example: 02fe3e8fd00e49b90c3ab30e19b51014ee50490f3eadcfd1d4a39f4c2c997dda gemfiles/modular/style_local.gemfile.example: c86beb711e766126a5be68be4be18255831625ac3650d5069383c4a83a9511f3 - gemfiles/modular/templating.gemfile.example: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - gemfiles/modular/templating_local.gemfile.example: 930057d3b909a72e39a39125c4e883a7ff71f5691e64426c0541f8c8fc75b83f + gemfiles/modular/templating.gemfile.example: 2b33c094677b53ad9dd2eafeb3a3be452f612380c61001a2e75b3c078b8ff72a + gemfiles/modular/templating_local.gemfile.example: ac7259516e69ffafb8b9342a897ddf6042adc46335743f474c342509cefd8f2e gemfiles/modular/webrick/r4/v1.9.gemfile.example: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea gemfiles/modular/webrick/vHEAD.gemfile.example: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b gemfiles/modular/x_std_libs.gemfile.example: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a @@ -175,7 +176,7 @@ template_state: shim/Gemfile.example: 0fb0d9d06fcfb1fd6ca6f0eeb5867253ca1ed221e03d28027719225f868b0637 shim/README.md.example: 3a2f7211b7f92a1dfae5e523b8e34b051a3d8af942144b05286eca0b3c8f6fbe shim/Rakefile.example: 572c94da7052083b39b62a6600785419e314a109efd7a3d8c3a96eb77ad34fd1 - shim/gem.gemspec.example: efae033238e4fd1355cfc134f5c9123f175d1ad1dc4a1a2e663899788c9e0870 + shim/gem.gemspec.example: 14a7015b3328005d1c3b5fda6886bd6da383707745f6eaaa781d6f9689600131 shim/lib/compat_require.rb.example: 94ee85e353a3ca08c8a35c9063d4ff789214ea594c7f803f6cf09d7142f48379 shim/lib/entrypoint.rb.example: dd57613520daca01d6f6bcaa9b83b00ff74505240dc04b84ceb686df3c0539d7 shim/lib/version.rb.example: 15e219ac3a928b5580035f891e415551213175020f1131f6e7ca0ccd55a1b2d6 @@ -189,370 +190,370 @@ files: recipe: template_source_application_simplecov action: write dest_sha256: 20cd38889f92669ce43b0af972ab18b4118adc3fd8bc8d8935c8dbe1d9c36253 - input_fingerprint: 9548958e8c5b66b1401c14204b0b69da4f2ec407353bf51ba812ad77041c56e6 + input_fingerprint: f93f7deb33342d09d7796c8adab6f55513e9023f50f72c6cbef7b4ef45b62ed3 template_sources: - ".simplecov.example" AGPL-3.0-only.md: recipe: template_source_application_AGPL_3_0_only_md action: write dest_sha256: d8a6cc31abc16b6748c7a21f21611f5a1ec33f67d22ca23d7da1c19b95496bee - input_fingerprint: 223a92c5aa6e0efb5679b65aa0d875c6ea798960df7803cbba6c4e4293c3e8ec + input_fingerprint: 67b63f86e3ced86cfc201042a67eb18735bbc4785fc7d8b471ac284f754a1e69 template_sources: - AGPL-3.0-only.md.example Gemfile: recipe: template_source_application_Gemfile action: write - dest_sha256: 42f948ae40a91dfbb20221543a0c963986e020f612b127d01a38f246ca957deb - input_fingerprint: 6d3e36bb6a85e2293eef227ca4af963ae2b9c56721ed9062148a7340c1adfa87 + dest_sha256: 8b31cd80002463a39b19cbb3f6b842ed33de24cce1cefba871fb63da03c1a11a + input_fingerprint: 4dd07eb2d7cba241845d9a93b1a3271a2b3474d13472e61d6d5b92e1e7b4d74f template_sources: - Gemfile.example LICENSE.md: recipe: template_source_application_LICENSE_md action: write dest_sha256: f6188bfd474a636d2a526420ebb411250faa447d94c9b9ccee097128ce4101b5 - input_fingerprint: 4c91874f8906e9b4f2403f4026f322f1cf6bbe099cdd3120d1bd75dd2b38acf1 + input_fingerprint: 4a94098b2ff2153caaf65588e009e633efbbd2e5f46747c9f0dad73e33f4b21f template_sources: - LICENSE.md.example PolyForm-Small-Business-1.0.0.md: recipe: template_source_application_PolyForm_Small_Business_1_0_0_md action: write dest_sha256: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 - input_fingerprint: e36bbd053f9b3dc11d0a9c21c8d37bfe47ce739cf578307df16aace06d979d69 + input_fingerprint: 827ac1597db257400dbda3d4e4f8051cdb70514323ece955222ca4aeef4b9f0e template_sources: - PolyForm-Small-Business-1.0.0.md.example README.md: recipe: template_source_application_README_md action: write dest_sha256: b8bca04e3acab16b6b8baf8a7614c4cf0f29f2cfb65feaaf133b7ae4951bf559 - input_fingerprint: 8d855da14f79ccfe4558d70f8aef5bef3b3749c49cc04d165a29b95e71253977 + input_fingerprint: 04f1056ef1c06d3562d2aea353c58b7ca55a4311f6df973f97f556ddb1d2a3e2 template_sources: - README.md.example Rakefile: recipe: template_source_application_Rakefile action: write - dest_sha256: '0539ef1efeb92859d872eac3ebbebc68a51d155486f5b42933989661af4f4631' - input_fingerprint: 4fdf5e2d92b87b3c70a06546080ee09b172f3ba83c0bf8c9a56ad15a56954bab + dest_sha256: adda2a192d0024cc3a799d88a54c69b6f1c463065108d791f0e3127de985e9b0 + input_fingerprint: b9040113c1a92696b8dfa1b20463e849300b7ea270da0a342d147eb8742f72b3 template_sources: - Rakefile.example certs/pboling.pem: recipe: template_source_application_certs_pboling_pem action: write dest_sha256: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - input_fingerprint: a06d6969d8f96a4dc0ec9196923b2c61c82e0a96aea19e11f07bbc59b18aa158 + input_fingerprint: 9d8a2ae05b683c1a2d4eb37cc02399db90f2199f47d3e6348b9507d9e0aa4272 template_sources: - certs/pboling.pem.example gemfiles/modular/benchmark/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_r4_v0_5_gemfile action: write dest_sha256: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 - input_fingerprint: b674768bb3148971d2a65386ce9e72789cbe575396511299955be6e7947375f8 + input_fingerprint: 62b9e8716eef61d6312b7f2e7dd9813530241c36b45f45da8b6306842404a693 template_sources: - gemfiles/modular/benchmark/r4/v0.5.gemfile.example gemfiles/modular/benchmark/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_vHEAD_gemfile action: write dest_sha256: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 - input_fingerprint: cef4ee69cb569dbd8d4bf9d9bb5a81da2fe2566dbb822e9f5bfec555f2e140ed + input_fingerprint: 5251a25b4862c9bed81826a6b0e0cade00dff9cedd8d1bd32244f81e97a5c498 template_sources: - gemfiles/modular/benchmark/vHEAD.gemfile.example gemfiles/modular/cgi/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_cgi_r4_v0_5_gemfile action: write dest_sha256: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 - input_fingerprint: 46b92cbad5a2d9307cd49ad81085d90a4521983fd973d37d32b45bb88de61e35 + input_fingerprint: 1376b5f6267c9732b24f8a3dd38b58e33802e2f33886fb72fd08b5fc33273921 template_sources: - gemfiles/modular/cgi/r4/v0.5.gemfile.example gemfiles/modular/cgi/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_cgi_vHEAD_gemfile action: write dest_sha256: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 - input_fingerprint: 7d6f1cdcb1bbe99dd7ac2866bed4fc0bc34193858412451ea03e28ab160442fa + input_fingerprint: 7f2a3a08fb7fcbdfd871f1c5d6f30188c12e1d3a90ca86b3d0e31495c42b8271 template_sources: - gemfiles/modular/cgi/vHEAD.gemfile.example gemfiles/modular/changelog.gemfile: recipe: template_source_application_gemfiles_modular_changelog_gemfile action: write dest_sha256: da669526144fbff33aef207db9541b6fd6c254437f94dec2fab70fc55a7757cd - input_fingerprint: e792ea908cfc930ff7b2f5d9ba1ca8c453bc1d2c210189ccb291b83e813a5632 + input_fingerprint: 4a02f56e7a122c7e886a8bf61f073ab61a0289578c76431a39010dd7040cc98e template_sources: - gemfiles/modular/changelog.gemfile.example gemfiles/modular/coverage.gemfile: recipe: template_source_application_gemfiles_modular_coverage_gemfile action: write dest_sha256: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - input_fingerprint: 91c6d6d1f8ba17f2f1560a956cfc604e4ec74d82de7a9b557080ad141b835401 + input_fingerprint: 8660913e9ec624de47f8ab0143b1a0ef95e4c4b4cda0e8a8429cf6a5ce01f9da template_sources: - gemfiles/modular/coverage.gemfile.example gemfiles/modular/coverage_local.gemfile: recipe: template_source_application_gemfiles_modular_coverage_local_gemfile action: write - dest_sha256: 2b493414df06261ba8acb6f0eb18bf3fdd701d7cb5f967a9d15a3f42a4741827 - input_fingerprint: a02886efe0f69f96d709c651d31dcd5d5fc9d1e2b57c4227ffca384602ed6462 + dest_sha256: 92c9a599c8f6867ec532880f73568f2736ac05d8973ec524b42fd5dbe6aeda3e + input_fingerprint: ffbfbabba5b5a54b339649a5250af01ca7bede6d5975d8d8e9fee612dd9341a9 template_sources: - gemfiles/modular/coverage_local.gemfile.example gemfiles/modular/debug.gemfile: recipe: template_source_application_gemfiles_modular_debug_gemfile action: write dest_sha256: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 - input_fingerprint: 6777ff22ead9de99081b56c3a8875c9baf0ffc4ae98428c84b318d20eab45550 + input_fingerprint: 23e9c0df8d73bd6c61ed2f2a43fafbf21198ca05ffb95d43410318d9a3e02ac5 template_sources: - gemfiles/modular/debug.gemfile.example gemfiles/modular/documentation.gemfile: recipe: template_source_application_gemfiles_modular_documentation_gemfile action: write dest_sha256: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c - input_fingerprint: 3d283faa22888b7fe3accc049432b7d596e0163f129a60ddecc9a7bd35b63a6f + input_fingerprint: ec222044f0b684aff855e400cec091a52afe488d3790ede124307e5fabcf76b5 template_sources: - gemfiles/modular/documentation.gemfile.example gemfiles/modular/documentation_local.gemfile: recipe: template_source_application_gemfiles_modular_documentation_local_gemfile action: write dest_sha256: 2058173855b9a4acc6d5efa20520e49734243eef6cf0b5e9063e0e5866a08e9c - input_fingerprint: 02205f63ca531ad4f1fe1db5b050c7c6eff526df00375e3b944a02862b11b257 + input_fingerprint: 40b306a9ec1aaf342926be06dab742986ac057b5f5bfb6ea95cae2f08723ccd4 template_sources: - gemfiles/modular/documentation_local.gemfile.example gemfiles/modular/erb/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r2_v3_0_gemfile action: write dest_sha256: 3793e7dc9ef23a7ccd893d48cbba092fd27594c63e65cca011cc658218425670 - input_fingerprint: 8c238533b2a7c6e1eb7630dfd3f62fb561114d88ebfba9610ff7e77f8a123933 + input_fingerprint: 6dc3cd90090a04008256e646701974fdae52c0965d39627a22ea310bf2ac152e template_sources: - gemfiles/modular/erb/r2/v3.0.gemfile.example gemfiles/modular/erb/r3/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r3_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 9534d8d311f1bfe04a9a4a17a1991c744dbc26b50f54d7e7837ac3bf7cfbc57d + input_fingerprint: 5b193bd426a7a05d6955d25ae7f13fa1b3b1eb3b240762b16fd799e68511137b template_sources: - gemfiles/modular/erb/r3/v5.0.gemfile.example gemfiles/modular/erb/r4/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r4_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 0f4d586ad0cb99db118761db2afa705372b0feea50f57bde47a85e45aceef9a9 + input_fingerprint: bb3acb8aa2dec30a0f66637052ae7298aa5926362884cb6a149d3503770ccfc9 template_sources: - gemfiles/modular/erb/r4/v5.0.gemfile.example gemfiles/modular/erb/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_erb_vHEAD_gemfile action: write dest_sha256: ad6f104a49e80e0cf625440e3dc816343fe7e2f037fc4971df75e7bb4305c683 - input_fingerprint: 5b3d666131274cabc07c4f8a3625d17a7a50efa42737d32a6383166e1276e3d0 + input_fingerprint: 0a1f33eea25f2728879d7f56f9eb8ebb43cf10dfd37773cf904b3db583390e51 template_sources: - gemfiles/modular/erb/vHEAD.gemfile.example gemfiles/modular/json/truffleruby_22_3.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_22_3_gemfile action: write dest_sha256: 249c12eacbe90f9d0d2e81e7a62c4c7e9102e504ededcda4ecf660cb3bb68be4 - input_fingerprint: 804a40286924d5dfb50659be3ad24984eafb508fb36c9e0ff550fed7aa0f5a52 + input_fingerprint: 92a786df28f8a7716525714abcf010ddab78680d40aeb0dbb5d18f08c5dd1a8e template_sources: - gemfiles/modular/json/truffleruby_22_3.gemfile.example gemfiles/modular/json/truffleruby_23_0.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_0_gemfile action: write dest_sha256: 66aa010567f7afa1af8244a74c3c88ecaaf84dc87b6a25180691bb480d02ed28 - input_fingerprint: fab90c64bf476018386eff23080932a20ba45280454194cc9eff98e27d18ebfe + input_fingerprint: 0f7ca86e7bfd61e5e6974097d3a92cab6cd04f2b6906c0bda0ee67457ec8d502 template_sources: - gemfiles/modular/json/truffleruby_23_0.gemfile.example gemfiles/modular/json/truffleruby_23_1.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_1_gemfile action: write dest_sha256: '080fcbdaf2bec73cad40832a3d51eebb380af789917b96f493d1460b0dd6361d' - input_fingerprint: 93205996abe6977b9909aea69d15657595b05ea695f1f0150f611cd6b48000c2 + input_fingerprint: b081dd07898791a12e51428e965b294b7549db6a120f60382371184eb4693f8a template_sources: - gemfiles/modular/json/truffleruby_23_1.gemfile.example gemfiles/modular/mutex_m/r2/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r2_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 5adf1dee22a1a0e2d560a35e65305efa0c309f2bc204296fe89b973e163e0a74 + input_fingerprint: 68b58659f85b5fbb06aecfdcf9449579a5e3d416d2410fb99b4bd4381e5d866e template_sources: - gemfiles/modular/mutex_m/r2/v0.3.gemfile.example gemfiles/modular/mutex_m/r3/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r3_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 211edb048b8b963a4842b2546887af072f258fb8e58d6d5d4e75d8c9ca997c30 + input_fingerprint: c75d0f207002d5847e4c62fe3bb7b3fbfcb946b599b497f06a03e2ddafd262f8 template_sources: - gemfiles/modular/mutex_m/r3/v0.3.gemfile.example gemfiles/modular/mutex_m/r4/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r4_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 72f43599464a63abceba80016ef9c6fcbccc56239c2254344dc62fa83d3c353b + input_fingerprint: d22f505529954625965fad59a99ba6706d1b220b6b1ba5c2549a1ff5a8c21304 template_sources: - gemfiles/modular/mutex_m/r4/v0.3.gemfile.example gemfiles/modular/mutex_m/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_vHEAD_gemfile action: write dest_sha256: '08018641c97f894788fa91b462da504ab2237213d18d95404136c393274ae3cb' - input_fingerprint: 7e189afab8b9e72ec4c369b4979a8719f28f551970978a83a22e46fcd665b092 + input_fingerprint: 456119a32af1fa74c50971c694f508c7e02659772abb608f6f434f5075be5dbb template_sources: - gemfiles/modular/mutex_m/vHEAD.gemfile.example gemfiles/modular/optional.gemfile: recipe: template_source_application_gemfiles_modular_optional_gemfile action: write dest_sha256: f770e6e9a9dd2bd0f1f132e882d88038b2e21127dce3afe270908c7338c28bfd - input_fingerprint: 03f6860de6e44abf5955400d657e0c996b50ad93892e08be00b663d3755658bf + input_fingerprint: a207362a91a47cd9831098d87a0a226495396bf11a5c9796ae2548e71f671fc5 template_sources: - gemfiles/modular/optional.gemfile.example gemfiles/modular/rspec.gemfile: recipe: template_source_application_gemfiles_modular_rspec_gemfile action: write dest_sha256: d043f5c9344f6435edb4607c5adaf42c78e7fb6b8b6726007de2bbedefb376c3 - input_fingerprint: 3b77ebe60925342249dbc749a2409775283ca6b795538ff10381e461ddd2ee20 + input_fingerprint: 8ab80927a090635759b8eed1fdcdf09a56cfbb1e94d0c92b0ca9b6563a6f39f9 template_sources: - gemfiles/modular/rspec.gemfile.example gemfiles/modular/runtime_heads.gemfile: recipe: template_source_application_gemfiles_modular_runtime_heads_gemfile action: write dest_sha256: 6ac7158c4a3088190f2a9082f01439eb27eca2172ab3464b15c9cb045aa885e1 - input_fingerprint: 9a33fb08ba190f558994efbf57259c62cc90875ccf37f5f432621774b47d9c8f + input_fingerprint: 5340659928903f62b8a941ead25211d23dab5774cff055fde43e8af867eec1aa template_sources: - gemfiles/modular/runtime_heads.gemfile.example gemfiles/modular/stringio/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r2_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 4c1ccd8c103ad63dad6b9f9ddc85a75a4155448c3080c000415f1932569b5543 + input_fingerprint: c75cb4769b3029868f2bd0a86a23063ac8e4ac45625226411cdef04d6ed734e4 template_sources: - gemfiles/modular/stringio/r2/v3.0.gemfile.example gemfiles/modular/stringio/r3/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r3_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 7aedc8416eb21dc23e98713575ea968cd44560e54e68f89f7d7eaa5bb4fd7261 + input_fingerprint: 38fd5c149a744d7043af804a402e7c7b09df14e97c33c8db4569a2b6bb351865 template_sources: - gemfiles/modular/stringio/r3/v3.0.gemfile.example gemfiles/modular/stringio/r4/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r4_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: dcf650d563321de2fc1a8cbb2218aa71bea07463e603a7ff1a9c2b9029e47108 + input_fingerprint: bd5f0eb1d716392d612d98d650b72e76b295254a56e8b658d94a1b651e6eab13 template_sources: - gemfiles/modular/stringio/r4/v3.0.gemfile.example gemfiles/modular/stringio/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_stringio_vHEAD_gemfile action: write dest_sha256: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - input_fingerprint: fcb688a13042d47d032befb93d2b2dfd53f1316947fcd60180546c84e136aa45 + input_fingerprint: ba0698e05df0b2feb0bf4d77e41efa1358059a6165352cffee12b8200eede4d4 template_sources: - gemfiles/modular/stringio/vHEAD.gemfile.example gemfiles/modular/style.gemfile: recipe: template_source_application_gemfiles_modular_style_gemfile action: write - dest_sha256: 2a3d46dcb8a9394f595f273f5eb0403d0a552837754ab109afc9ba79a7159083 - input_fingerprint: 360bd3116f7f79193b105252c58c4d3bc2c87cf1a26590a841f29dfb88fef2b5 + dest_sha256: 9a24acff0054573c30f5d84d0418cd465ba3794d075bb5a36801410ac40e0787 + input_fingerprint: 10111a007af7537be5a0b278cfdf7b4f3fe2c6bbdc2be6b10e0dc15dacb40594 template_sources: - gemfiles/modular/style.gemfile.example gemfiles/modular/style_local.gemfile: recipe: template_source_application_gemfiles_modular_style_local_gemfile action: write dest_sha256: 55eb9c149cdb2f29c9f31abe2d55a4f334e00fb859681dd17c42149a3f28ca36 - input_fingerprint: 20e87b2fab9cd3f9ed7dba023e3f43859a8019ddae6253f86cef21798cf22343 + input_fingerprint: b3049d600d37cecfb8dc5568daa5d2b16fdf8ce2b2ac536ed2915eeb470eeb8d template_sources: - gemfiles/modular/style_local.gemfile.example gemfiles/modular/templating.gemfile: recipe: template_source_application_gemfiles_modular_templating_gemfile action: write - dest_sha256: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - input_fingerprint: 605f71e325bd238937114b071bc50d154d35bd102d8fb0f989ee9a9b28f67c60 + dest_sha256: 432ba59798d31b899268257c432443a017c5a9bd2c0c7f9f2216617e14150cd3 + input_fingerprint: 33d0df425d89a93abbf4d6c1e4283633029815c6efc9d768c24d0bfb80ee18f3 template_sources: - gemfiles/modular/templating.gemfile.example gemfiles/modular/templating_local.gemfile: recipe: template_source_application_gemfiles_modular_templating_local_gemfile action: write - dest_sha256: 7ca2ed5ae3371334f45a1dff77e7b4ed78522f598c1b906423053d1855f47880 - input_fingerprint: e70a284a8111b637126d40e1c22782f698da13ab26731e4083cb9193ff4f66ef + dest_sha256: 3a012f1092845a1be54d3738b9ed70bdf32089cc25736d06692122a1b3b3a95c + input_fingerprint: d7ce41238e91f4900e1cf9fa2cc6fd138cb9d6014cf60d7dcfa2a8948c7b47a7 template_sources: - gemfiles/modular/templating_local.gemfile.example gemfiles/modular/webrick/r4/v1.9.gemfile: recipe: template_source_application_gemfiles_modular_webrick_r4_v1_9_gemfile action: write dest_sha256: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea - input_fingerprint: d3930c6814703c0dea241888c0b56dccbcc727571495ad377ac5443fd1f8163f + input_fingerprint: a5b834234a28a15faf106b488a608da9413104f500c37aed9429023b7117c8c6 template_sources: - gemfiles/modular/webrick/r4/v1.9.gemfile.example gemfiles/modular/webrick/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_webrick_vHEAD_gemfile action: write dest_sha256: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b - input_fingerprint: 9bd04d8e52996d6cbcf231baace8cf81cf172a6505f1ea1fa5b927e926f7358a + input_fingerprint: 455f2757cdac234bf0064a25ed4b2c9957024a0c9cec79124e4a48a451080967 template_sources: - gemfiles/modular/webrick/vHEAD.gemfile.example gemfiles/modular/x_std_libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_gemfile action: write dest_sha256: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a - input_fingerprint: dc7e25b3cf4727d782ccbe169713b3002480dd1899b2ac635869fe5a9c1b6bef + input_fingerprint: dc7cfb442a0e18d01b84027844fe84515c977147e3bbb8dceb6640576d46baae template_sources: - gemfiles/modular/x_std_libs.gemfile.example gemfiles/modular/x_std_libs/r2/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r2_libs_gemfile action: write dest_sha256: e80ec8ad06cb1b31ac982bc25cf7696987fca131aa1001eaefd0bf5cd379c273 - input_fingerprint: 9ec14a400943fa0c2d4132ca5b482cb85e592a09ba02b72cf566cd178614888b + input_fingerprint: b3655d9d45a4641276890017946d22c95ce8f728627d44e853c4dc262662adce template_sources: - gemfiles/modular/x_std_libs/r2/libs.gemfile.example gemfiles/modular/x_std_libs/r3.1/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_1_libs_gemfile action: write dest_sha256: 9f8565c40b09bea1bc4c2e2ad87fe11400c3c51a2b235655bfcd8e491ed88ca8 - input_fingerprint: 2589596eccab9c3b26a93fbaf7285a01aa7fb36b44a54c5543c36e8d50be1831 + input_fingerprint: 20667271f1afb5ba9bf1c5bc20a6b6c6583ceb679b72bd65fb0adf3d8009faa0 template_sources: - gemfiles/modular/x_std_libs/r3.1/libs.gemfile.example gemfiles/modular/x_std_libs/r3/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_libs_gemfile action: write dest_sha256: 546f8849f4267bb19aa10ff0de40be30957197f229e6887847181ea9127b2650 - input_fingerprint: 5984ce9ff80cbb3a362d3e6c69997e15d7a5e45dc80fc1d5a6a610570889aa46 + input_fingerprint: 568a038b497c96d649245956ae06e1cbb0b39366acaff5d95b7fa9513baee8c4 template_sources: - gemfiles/modular/x_std_libs/r3/libs.gemfile.example gemfiles/modular/x_std_libs/r4/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r4_libs_gemfile action: write dest_sha256: 8c2582eaa218d216b98c86c933465295c8b4e43f3251ea388b9eaf6e471f8da6 - input_fingerprint: 80ec8860fb0309862f9793b95983e67a4e8df33135137e8eb3df5e0f152f98db + input_fingerprint: 800af1452fb2a2faa0d04756ce4b244ff3549c62ca5e0c3c5e7de94c049f88a6 template_sources: - gemfiles/modular/x_std_libs/r4/libs.gemfile.example gemfiles/modular/x_std_libs/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_vHEAD_gemfile action: write dest_sha256: d3133ec4c0638363a7fb025d19be7e95a615fd61c35ddb8d17f2280ee74a7486 - input_fingerprint: ae386b09eb38906a371e7d5ffc59bdeaba65fda3df8b80976c71b9d9d440606e + input_fingerprint: cfb93874e4a95092321c6e48d39c4f064b281732d7500f4d6bcea8f278ff6fa4 template_sources: - gemfiles/modular/x_std_libs/vHEAD.gemfile.example lib/psych/merge/version.rb: recipe: template_source_application_lib_psych_merge_version_rb action: write - dest_sha256: 478c65d2b81eba904b0e8151ad7cff0156c842ce103efc6888eb88d3fe95ec82 - input_fingerprint: 1617577c93165996e2947ef5145847ae66de113e412b3c5bc82e09d328df1ec7 + dest_sha256: 672e2468c5f621634589137d4a0a8af5973e35809a7eb58e2ae5882bf7a39eb6 + input_fingerprint: 9b8da217b568dc6c08269e56ee570879b7594abf024a6b2edb8a9d05af22860e template_sources: - lib/gem/version.rb.example mise.toml: recipe: template_source_application_mise_toml action: write dest_sha256: 7d267154ca4f081b0ac7da804c0180c2b091aec5f1c877417c1c320f4f369c88 - input_fingerprint: 45c34d55db8760406c5d031a10a4a1b779527bbc78354a1b9a8683106a7775c2 + input_fingerprint: 0ccbd988e8fb81603e6fd4d972b9640e26ea3f27fa3c2072af893787a89ef9cc template_sources: - mise.toml.no-osc.example psych-merge.gemspec: recipe: template_source_application_psych_merge_gemspec action: write - dest_sha256: e137b9415fe247ad8f52a8113b17c1986918ea04406e2c0dbeb7e046e0d601c2 - input_fingerprint: 5470b39539cfea9befaf535d80912df93bdcac1f5f32789539ae3e27c80585c3 + dest_sha256: e461e4cb5fdcbb249bc12b996c67a6d403263fcdd264563383289ce08174aafa + input_fingerprint: 1ec3c179f61bd516b9a6409ac7530640fb8c3441a665424df6e47f15e2f1c440 template_sources: - gem.gemspec.example sig/psych/merge.rbs: recipe: template_source_application_sig_psych_merge_rbs action: write dest_sha256: 4c163818842196437028b08b69cb96b9259df757f05ea1939711add9b0e3e39a - input_fingerprint: c7bcb5a6105b8eb79667f2417f6f5a4086478e2bc5ddcf4c4028918bdbb00e68 + input_fingerprint: d404670c1f803eeedc9cd7c8e0dec2997f30ffb138b213fb90eb2f5e608938d3 template_sources: - sig/gem.rbs.example spec/spec_helper.rb: recipe: template_source_application_spec_spec_helper_rb action: write dest_sha256: 2cf50b3c7c3a74325873f2fe4bc87c24a08ebec7d23e196386d5e6ea09ed46f1 - input_fingerprint: 16cd3fb065d53526c8a69a5baff085fa3cc5856b481c46ee1ece5832ed372bc2 + input_fingerprint: c6dda87b045b58c947d3f38e601df234bdb5654a2f94226d3eef9892bdb5b7c0 template_sources: - spec/spec_helper.rb.example diff --git a/gems/psych-merge/Gemfile b/gems/psych-merge/Gemfile index d7a31204a..ad60a729e 100644 --- a/gems/psych-merge/Gemfile +++ b/gems/psych-merge/Gemfile @@ -19,7 +19,7 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } # Include dependencies from psych-merge.gemspec gemspec -gem 'kettle-family', '~> 1.2', '>= 1.2.97' +gem 'kettle-family', '~> 1.2', '>= 1.2.100' # Local workspace dependency wiring for *_local.gemfile overrides gem 'nomono', '~> 1.1', '>= 1.1.5', require: false # ruby >= 3.2.0 diff --git a/gems/psych-merge/Gemfile.lock b/gems/psych-merge/Gemfile.lock index 37584a704..1b7caaab4 100644 --- a/gems/psych-merge/Gemfile.lock +++ b/gems/psych-merge/Gemfile.lock @@ -10,132 +10,132 @@ GIT PATH remote: . specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + psych-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) + yaml-merge (= 7.1.9) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) + ast-crispr-markdown-markly (7.1.9) + ast-crispr (= 7.1.9) + markdown-merge (= 7.1.9) + markly-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism specs: - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) + ast-crispr-ruby-prism (7.1.9) + ast-crispr (= 7.1.9) + prism-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) + ast-crispr (7.1.9) + ast-merge (= 7.1.9) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ast-merge-git (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: - ast-merge (7.1.8) + ast-merge (7.1.9) benchmark token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) + ast-template (7.1.9) + ast-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + bash-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + binary-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) + citrus-toml-merge (7.1.9) + ast-merge (= 7.1.9) + toml-merge (= 7.1.9) toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge specs: - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) commonmarker (~> 2.2) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) + dotenv-merge (7.1.9) + ast-merge (= 7.1.9) + plain-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + go-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + html-merge (7.1.9) + ast-crispr (= 7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + json-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: - kettle-jem (7.1.25) + kettle-jem (7.1.26) addressable (>= 2.8, < 3) ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) @@ -169,113 +169,113 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge specs: - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown (~> 2.5) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + markdown-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) + markly-merge (7.1.9) + markdown-merge (= 7.1.9) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge specs: - parslet-toml-merge (7.1.8) + parslet-toml-merge (7.1.9) toml (~> 0.3) - toml-merge (= 7.1.8) + toml-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + plain-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) + prism-merge (7.1.9) + ast-merge (= 7.1.9) prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) + rbs-merge (7.1.9) + ast-merge (= 7.1.9) rbs (>= 3.10) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + rust-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) + smorg-rb (7.1.9) + ast-merge (= 7.1.9) + ast-merge-git (= 7.1.9) + bash-merge (= 7.1.9) diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) + dotenv-merge (= 7.1.9) + go-merge (= 7.1.9) + html-merge (= 7.1.9) + json-merge (= 7.1.9) kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) + markdown-merge (= 7.1.9) + plain-merge (= 7.1.9) + prism-merge (= 7.1.9) + psych-merge (= 7.1.9) + rbs-merge (= 7.1.9) + rust-merge (= 7.1.9) + toml-merge (= 7.1.9) + typescript-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + toml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: - tree_haver (7.1.8) + tree_haver (7.1.9) citrus (~> 3.0) parslet (~> 2.0) tree_sitter_language_pack (>= 1.16.2, < 2.0) @@ -284,25 +284,25 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + typescript-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + yaml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) + zip-merge (7.1.9) + binary-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) GEM @@ -336,6 +336,8 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) + commonmarker (2.10.0) + rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -465,11 +467,15 @@ GEM lint_roller (1.1.0) logger (1.7.0) markly (0.19.0) + mini_portile2 (2.8.9) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) reline (~> 0.6) mutex_m (0.3.0) + nokogiri (1.19.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-musl) @@ -503,6 +509,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) + rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -696,13 +705,16 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.16.2-aarch64-linux) + tree_sitter_language_pack (1.17.0) + rb_sys (>= 0.9.130, < 0.10) + sorbet-runtime (~> 0.5) + tree_sitter_language_pack (1.17.0-aarch64-linux) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-arm64-darwin) + tree_sitter_language_pack (1.17.0-arm64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-linux) + tree_sitter_language_pack (1.17.0-x86_64-linux) sorbet-runtime (~> 0.5) tsort (0.2.0) tty-cursor (0.7.1) @@ -784,9 +796,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.31) + kettle-dev (~> 3.0, >= 3.0.34) kettle-drift (~> 1.0, >= 1.0.13) - kettle-family (~> 1.2, >= 1.2.97) + kettle-family (~> 1.2, >= 1.2.100) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) @@ -807,12 +819,12 @@ DEPENDENCIES reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) - rubocop-lts (~> 24.2, >= 24.2.1) - rubocop-lts-rspec (~> 1.0, >= 1.0.5) + rubocop-lts (~> 24.2, >= 24.2.3) + rubocop-lts-rspec (~> 1.0, >= 1.0.6) rubocop-minitest (~> 0.40, >= 0.40.0) rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! - rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) ruby-merge! ruby-progressbar (~> 1.13) rust-merge! @@ -843,33 +855,34 @@ CHECKSUMS appraisal2 (3.2.3) sha256=3a6cfaf8a444e02707b9a34154af1c4902fbe99d9d2168d7e81dd83ec77e6db7 appraisal2-rubocop (1.0.2) sha256=1dae97c1be087cf9c098a3a72fd41f873435e9b8b39687e633b36c9ccb22bff4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.8) - ast-crispr-markdown-markly (7.1.8) - ast-crispr-ruby-prism (7.1.8) - ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) + ast-crispr (7.1.9) + ast-crispr-markdown-markly (7.1.9) + ast-crispr-ruby-prism (7.1.9) + ast-merge (7.1.9) + ast-merge-git (7.1.9) + ast-template (7.1.9) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.8) + bash-merge (7.1.9) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) - bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae + binary-merge (7.1.9) + bundler (4.1.0.beta1) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.8) + citrus-toml-merge (7.1.9) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 + commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e commonmarker (2.10.0-x86_64-darwin) sha256=01e0830ed0319825ecdc16411c90acd3f661d1568dfc178731b3f64d0ce2363d commonmarker (2.10.0-x86_64-linux) sha256=945c510c0bfca9022245928e2248468fe3ddad58c939be0c37b20082cc392880 commonmarker (2.10.0-x86_64-linux-musl) sha256=288cd4fb9f17eed2ffa73551ef241dcf594e0f484b2aee2a0999540333c0618e - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) completely (0.8.0) sha256=e493cd5d84805f47917a41f277ecbfe5f35363bed670be5a957d3acaed8c6c5e concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 @@ -878,7 +891,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docopt_ng (0.7.1) sha256=a024148ee4fa3ab1a8a04411aa4370f39cf2b446e63562097d418b7974a15667 - dotenv-merge (7.1.8) + dotenv-merge (7.1.9) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -891,35 +904,37 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) + go-merge (7.1.9) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) + html-merge (7.1.9) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a - json-merge (7.1.8) - kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + json-merge (7.1.9) + kettle-changelog (1.0.7) + kettle-dev (3.0.34) + kettle-drift (1.0.13) kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 - kettle-jem (7.1.25) + kettle-jem (7.1.26) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 - kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd + kettle-soup-cover (3.0.10) kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 - markdown-merge (7.1.8) + markdown-merge (7.1.9) markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca - markly-merge (7.1.8) + markly-merge (7.1.9) + mini_portile2 (2.8.9) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 + nokogiri (1.19.4) nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af nokogiri (1.19.4-arm64-darwin) sha256=a46db9853286e6597b36ebc6953817d15acf3a299583eb3f89fdc6f91dd63527 @@ -933,20 +948,22 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) - plain-merge (7.1.8) + parslet-toml-merge (7.1.9) + plain-merge (7.1.9) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.8) + prism-merge (7.1.9) psych (5.5.0) sha256=4b245bbbd0f3238df8ccee766ebc1a6b062b10e4ee1d3284eb588739ba156a0a - psych-merge (7.1.8) + psych-merge (7.1.9) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 - rbs-merge (7.1.8) + rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -982,11 +999,11 @@ CHECKSUMS rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.8) + ruby-merge (7.1.9) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) + rust-merge (7.1.9) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +1011,7 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) + smorg-rb (7.1.9) sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1011,24 +1028,25 @@ CHECKSUMS timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.8) + toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb - tree_haver (7.1.8) - tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 - tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 - tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 - tree_sitter_language_pack (1.16.2-x86_64-linux) sha256=d8151e6e44e35ace9de3611c76b730896beab17f427db06d8f76666332a5dc60 + tree_haver (7.1.9) + tree_sitter_language_pack (1.17.0) + tree_sitter_language_pack (1.17.0-aarch64-linux) + tree_sitter_language_pack (1.17.0-arm64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-linux) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f tty-cursor (0.7.1) sha256=79534185e6a777888d88628b14b6a1fdf5154a603f285f80b1753e1908e0bf48 tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) + typescript-merge (7.1.9) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 yaml-converter (0.2.5) sha256=a5214fe1a6c2df88bd34a35bcded1b1dcd30135548130df2e03b54ca8c0f2423 - yaml-merge (7.1.8) + yaml-merge (7.1.9) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.8) sha256=73d935d43e3479d65ce8aff25c7d3100e8bb83528a2adaa0ed824e5046ac99e7 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -1037,8 +1055,8 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) + zip-merge (7.1.9) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH - 4.0.20 + 4.1.0.beta1 diff --git a/gems/psych-merge/Rakefile b/gems/psych-merge/Rakefile index 0d08b5f98..71dab7aab 100644 --- a/gems/psych-merge/Rakefile +++ b/gems/psych-merge/Rakefile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -# psych-merge Rakefile v7.1.18 - 2026-09-07 +# psych-merge Rakefile v7.1.26 - 2026-09-09 # Ruby 2.3 (Safe Navigation) or higher required # # See LICENSE.md for license information. diff --git a/gems/psych-merge/bin/rubocop-gradual b/gems/psych-merge/bin/rubocop-gradual new file mode 100755 index 000000000..7c7ff0635 --- /dev/null +++ b/gems/psych-merge/bin/rubocop-gradual @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'rubocop-gradual' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'rubygems' +require 'bundler/setup' + +load Gem.bin_path('rubocop-gradual', 'rubocop-gradual') diff --git a/gems/psych-merge/gemfiles/modular/coverage_local.gemfile b/gems/psych-merge/gemfiles/modular/coverage_local.gemfile index 37917caac..d6c890e46 100644 --- a/gems/psych-merge/gemfiles/modular/coverage_local.gemfile +++ b/gems/psych-merge/gemfiles/modular/coverage_local.gemfile @@ -29,11 +29,31 @@ Kernel.send(:gem, 'nomono', *nomono_activation_requirements) require 'nomono/bundler' local_gems = %w[kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -local_gems_to_eval = local_gems - %w[] - declared_gems # export KETTLE_DEV_DEV=/path/to/my platform :mri do + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + local_gems_to_eval = local_gems - %w[] - declared_gems + eval_nomono_gems( gems: local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/psych-merge/gemfiles/modular/style.gemfile b/gems/psych-merge/gemfiles/modular/style.gemfile index 59c5dc1a3..41ec99454 100644 --- a/gems/psych-merge/gemfiles/modular/style.gemfile +++ b/gems/psych-merge/gemfiles/modular/style.gemfile @@ -24,9 +24,9 @@ platform :mri do if ENV.fetch('RUBOCOP_LTS_DEV', 'false').casecmp('false').zero? declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) - gem 'rubocop-lts', '~> 24.2', '>= 24.2.1' unless declared_gems.include?('rubocop-lts') - gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.5' unless declared_gems.include?('rubocop-lts-rspec') - gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.6' unless declared_gems.include?('rubocop-ruby3_2') + gem 'rubocop-lts', '~> 24.2', '>= 24.2.3' unless declared_gems.include?('rubocop-lts') + gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.6' unless declared_gems.include?('rubocop-lts-rspec') + gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.8' unless declared_gems.include?('rubocop-ruby3_2') else eval_gemfile('style_local.gemfile') end diff --git a/gems/psych-merge/gemfiles/modular/templating.gemfile b/gems/psych-merge/gemfiles/modular/templating.gemfile index 6af159bd7..ce51a08ed 100644 --- a/gems/psych-merge/gemfiles/modular/templating.gemfile +++ b/gems/psych-merge/gemfiles/modular/templating.gemfile @@ -18,7 +18,7 @@ end if structuredmerge_remote # Merge recipes for released installs. - gem 'kettle-jem', '>= 7.0' + gem 'kettle-jem', '~> 7.1', '>= 7.1.26' end if kettle_remote diff --git a/gems/psych-merge/gemfiles/modular/templating_local.gemfile b/gems/psych-merge/gemfiles/modular/templating_local.gemfile index c715fd747..a112b0243 100644 --- a/gems/psych-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/psych-merge/gemfiles/modular/templating_local.gemfile @@ -65,9 +65,7 @@ structuredmerge_local_gems = %w[ kettle_dev_local_gems = %w[ kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift ] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[] -kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - (declared_gems - %w[kettle-dev]) if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( @@ -81,6 +79,28 @@ if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 end if ENV.fetch('KETTLE_DEV_DEV', 'false').casecmp('false') != 0 + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - declared_gems + eval_nomono_gems( gems: kettle_dev_local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/psych-merge/psych-merge.gemspec b/gems/psych-merge/psych-merge.gemspec index d5111fd21..4ff8e165d 100644 --- a/gems/psych-merge/psych-merge.gemspec +++ b/gems/psych-merge/psych-merge.gemspec @@ -121,7 +121,7 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.31') # ruby >= 4.0.0 + spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.34') # ruby >= 4.0.0 # Security spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 From 286c743b3a1536476708044ecce84a43f24fbd78 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 23:54:27 -0400 Subject: [PATCH 098/137] =?UTF-8?q?=F0=9F=8E=A8=20Template=20citrus-toml-m?= =?UTF-8?q?erge=20by=20kettle-family?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/citrus-toml-merge/.kettle-drift.lock | 76 ++++- gems/citrus-toml-merge/.rubocop_gradual.lock | 7 +- .../.structuredmerge/kettle-jem.lock | 145 ++++---- gems/citrus-toml-merge/Gemfile | 2 +- gems/citrus-toml-merge/Gemfile.lock | 318 +++++++++--------- gems/citrus-toml-merge/Rakefile | 2 +- gems/citrus-toml-merge/bin/rubocop-gradual | 16 + .../citrus-toml-merge.gemspec | 2 +- .../gemfiles/modular/coverage_local.gemfile | 24 +- .../gemfiles/modular/style.gemfile | 6 +- .../gemfiles/modular/templating.gemfile | 2 +- .../gemfiles/modular/templating_local.gemfile | 24 +- 12 files changed, 387 insertions(+), 237 deletions(-) create mode 100755 gems/citrus-toml-merge/bin/rubocop-gradual diff --git a/gems/citrus-toml-merge/.kettle-drift.lock b/gems/citrus-toml-merge/.kettle-drift.lock index 98b009e1e..1b23f4793 100644 --- a/gems/citrus-toml-merge/.kettle-drift.lock +++ b/gems/citrus-toml-merge/.kettle-drift.lock @@ -1,10 +1,82 @@ { + "debug_env: 'KETTLE_DEV_DEBUG',\nroot: %w[src my kettle-dev]": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 46, + 63 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 93, + 110 + ] + } + ], + "path_env: 'KETTLE_DEV_DEV',\nvendored_gems_env: 'VENDORED_GEMS',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 43, + 60 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 90, + 107 + ] + } + ], + "prefix: 'KETTLE_DEV',\npath_env: 'KETTLE_DEV_DEV',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 42, + 59 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 89, + 106 + ] + } + ], + "vendor_gem_dir_env: 'VENDOR_GEM_DIR',\ndebug_env: 'KETTLE_DEV_DEBUG',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 45, + 62 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 92, + 109 + ] + } + ], "vendored_gems_env: 'VENDORED_GEMS',\nvendor_gem_dir_env: 'VENDOR_GEM_DIR',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 44, + 61 + ] + }, { "file": "gemfiles/modular/templating_local.gemfile", "lines": [ - 77, - 88 + 75, + 91, + 108 ] } ] diff --git a/gems/citrus-toml-merge/.rubocop_gradual.lock b/gems/citrus-toml-merge/.rubocop_gradual.lock index b00fbbdaf..2078c2cf9 100644 --- a/gems/citrus-toml-merge/.rubocop_gradual.lock +++ b/gems/citrus-toml-merge/.rubocop_gradual.lock @@ -2,13 +2,13 @@ ".simplecov:514631589": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] ], - "Rakefile:1833401821": [ + "Rakefile:3877194206": [ [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], [81, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], [165, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], [168, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] ], - "citrus-toml-merge.gemspec:1182937878": [ + "citrus-toml-merge.gemspec:1824507731": [ [138, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4147388508], [149, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], [150, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] @@ -27,6 +27,9 @@ [1, 1, 0, "Naming/FileName: The name of this source file (`vHEAD.gemfile`) should use snake_case.", 5381], [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], + "gemfiles/modular/coverage_local.gemfile:2813372128": [ + [34, 1, 1586, "Metrics/BlockLength: Block has too many lines. [37/25]", 820328175] + ], "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], diff --git a/gems/citrus-toml-merge/.structuredmerge/kettle-jem.lock b/gems/citrus-toml-merge/.structuredmerge/kettle-jem.lock index 03e0e3b08..fec45460f 100644 --- a/gems/citrus-toml-merge/.structuredmerge/kettle-jem.lock +++ b/gems/citrus-toml-merge/.structuredmerge/kettle-jem.lock @@ -1,11 +1,12 @@ --- version: 1 template_state: - version: 7.1.18 - applied_at: '2026-09-07' + version: 7.1.26 + applied_at: '2026-09-10' changelog_replay: last_entry_key: kettle-jem-template-20260802-001 last_entry_date: '2026-08-02' + maintenance_changelog: {} checksums: ".aiignore.example": 48a5dfdd93afd1a15fdce39cc28ca9920263f00018b0968ab031fa744521e5ce ".config/mise/env.sh": aeea5a2ab489ba6e5467ae8de6e386ec8c8fe4ff31a044e69d0cd6a092dd6654 @@ -75,7 +76,7 @@ template_state: ".rubocop_rspec.yml.example": 288ad75e7eb14d87d80fafe6f7272217be5c57547536ee56c780a7d10ac7ec74 ".simplecov.example": 222f2e6ce8cf089c70a21f0f5e5423d4bd59a96fdb2ce7754b0fb3d6f430c229 ".structuredmerge/git-drivers.toml.example": 9d241a44c9edffcdbd3da018fa188a238089c3d1635040924df594a6929a4f97 - ".structuredmerge/kettle-jem.yml.example": 26949dc4ee0722415e72452cbc186bee6ef7b154eae33166d36f3fdb1ca6e46d + ".structuredmerge/kettle-jem.yml.example": ff65a738da1af7d60714026a81d3323a46c864e96ae3570b806afdf6e7149ff9 ".yard-lint.yml.example": 90def46867c9436b4e177c47d91fc8165f4602e335715aecc39f5587ae20b55b ".yardignore.example": 821f453c609df7d46145d675424b39dfbe6dfdca8edac5f367b85fff48502455 ".yardopts.example": 6fd6f2701713096a8a9ea095c213bbc68eeef37797c4754d97837e3229a3a5f6 @@ -88,7 +89,7 @@ template_state: CHANGELOG.transfer.md: 21331d8a9e58b4ff6e088b88eb408bcccb0f2f64e78f8f4d42ac3f11a24baad8 CITATION.cff.example: e404ea0a7919d78a83d53d80e211d17b9663576aa606583b709795dc023fd75c CODE_OF_CONDUCT.md.example: f1ad532f1860f73ef774c6b27a26d41f4bc1cb8813034f5957487766ebb0986b - CONTRIBUTING.md.example: 22570cfb3dde72be79b4b522b6d5ab13f95d778e40444483a096871fe0891b19 + CONTRIBUTING.md.example: 8d23cce2d061e0c20d619c3f66591df5f32821cd84c32d171df0b8ebe1217a55 FUNDING.md.example: 392d047904b1557b29f4b43d37ec403b7480edd5b6ab51180be979b57a91e6ba FUNDING.md.no-osc.example: 3ef0258dd3e3b7f7e17e8bc2d20dcbcb3e74aa5a5a6f51297075696645e34c77 Gemfile.example: 99500023987e81775a9b5ef14e92cb3992f2ac408e5f42454f2728eee9b49fb2 @@ -99,19 +100,19 @@ template_state: PolyForm-Small-Business-1.0.0.md.example: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 README.md.example: 21f491e3d73bfc1b74056a6dcba61f72c93dee3cfe5272ac164a20978454de21 REEK: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - RUBOCOP.md.example: c09e5533ccc59b70a2efa05c99f66e521137c1053d3c12eb43509cebd5b68b0e + RUBOCOP.md.example: d99871a0e4c1d323c92e7febf328f062bb4722069b2abfd0a83bf7daa8dcbf8c Rakefile.example: 569803e726b07ea26267fec6891367a3096a0dff3c266269a7081d36afe496af SECURITY.md.example: ee9411aa85f36d88363fdaea7a1baea4362b6ec112cf2688e711b05de1d3144c bin/setup.example: 0ac35089c95a91d8973fe7a318bf9fd98b9f8e00db92c5d9ca6cd858abb8d41b certs/pboling.pem.example: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - gem.gemspec.example: 83e834e8958a88e4817a57199f48f5ebb245548ce251c5c47372208693f03b17 + gem.gemspec.example: 12dcadc0b297ccd4e18b9d1e538b98ac8330ef9fb2a059ed6754ad59272b77fa gemfiles/modular/benchmark/r4/v0.5.gemfile.example: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 gemfiles/modular/benchmark/vHEAD.gemfile.example: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 gemfiles/modular/cgi/r4/v0.5.gemfile.example: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 gemfiles/modular/cgi/vHEAD.gemfile.example: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 gemfiles/modular/changelog.gemfile.example: 892598e0e7792eb205247ae28128cef6dfc647d2fb33968969152230d6f69288 gemfiles/modular/coverage.gemfile.example: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - gemfiles/modular/coverage_local.gemfile.example: 928d5f260d7b119c038baa56da9fb78dd524dee613aea33ab72894bbce5c506e + gemfiles/modular/coverage_local.gemfile.example: 92ea0d7a9d693553dc614afa2c43990f5c3778c2b00ef6c528e122c31bd506a1 gemfiles/modular/debug.gemfile.example: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 gemfiles/modular/documentation.gemfile.example: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c gemfiles/modular/documentation_local.gemfile.example: 84a20f5d4b0feb94c2cf2f7a8dce8f682f1483498e41484c2b447a5661fd1870 @@ -145,10 +146,10 @@ template_state: gemfiles/modular/stringio/r3/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/r4/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/vHEAD.gemfile.example: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - gemfiles/modular/style.gemfile.example: 3ad0585b4f2db8918580ca41ea8723f7a166d7a83cfd7f9613511094997106fd + gemfiles/modular/style.gemfile.example: 02fe3e8fd00e49b90c3ab30e19b51014ee50490f3eadcfd1d4a39f4c2c997dda gemfiles/modular/style_local.gemfile.example: c86beb711e766126a5be68be4be18255831625ac3650d5069383c4a83a9511f3 - gemfiles/modular/templating.gemfile.example: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - gemfiles/modular/templating_local.gemfile.example: 930057d3b909a72e39a39125c4e883a7ff71f5691e64426c0541f8c8fc75b83f + gemfiles/modular/templating.gemfile.example: 2b33c094677b53ad9dd2eafeb3a3be452f612380c61001a2e75b3c078b8ff72a + gemfiles/modular/templating_local.gemfile.example: ac7259516e69ffafb8b9342a897ddf6042adc46335743f474c342509cefd8f2e gemfiles/modular/webrick/r4/v1.9.gemfile.example: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea gemfiles/modular/webrick/vHEAD.gemfile.example: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b gemfiles/modular/x_std_libs.gemfile.example: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a @@ -175,7 +176,7 @@ template_state: shim/Gemfile.example: 0fb0d9d06fcfb1fd6ca6f0eeb5867253ca1ed221e03d28027719225f868b0637 shim/README.md.example: 3a2f7211b7f92a1dfae5e523b8e34b051a3d8af942144b05286eca0b3c8f6fbe shim/Rakefile.example: 572c94da7052083b39b62a6600785419e314a109efd7a3d8c3a96eb77ad34fd1 - shim/gem.gemspec.example: efae033238e4fd1355cfc134f5c9123f175d1ad1dc4a1a2e663899788c9e0870 + shim/gem.gemspec.example: 14a7015b3328005d1c3b5fda6886bd6da383707745f6eaaa781d6f9689600131 shim/lib/compat_require.rb.example: 94ee85e353a3ca08c8a35c9063d4ff789214ea594c7f803f6cf09d7142f48379 shim/lib/entrypoint.rb.example: dd57613520daca01d6f6bcaa9b83b00ff74505240dc04b84ceb686df3c0539d7 shim/lib/version.rb.example: 15e219ac3a928b5580035f891e415551213175020f1131f6e7ca0ccd55a1b2d6 @@ -189,370 +190,370 @@ files: recipe: template_source_application_simplecov action: write dest_sha256: 3999132f4dd0d5f94cc733ec9cc47b81ebbce8d3d4d094e150dbc3edcb96a4a4 - input_fingerprint: 414370ab5cef256338ee8b0383790fd94f0805853f0953507c1ce970a93935ec + input_fingerprint: 0eeae5dd879ee89ec1b59cab4f7543c969776739ce12b5c23fbfe76a54fbc4fd template_sources: - ".simplecov.example" AGPL-3.0-only.md: recipe: template_source_application_AGPL_3_0_only_md action: write dest_sha256: d8a6cc31abc16b6748c7a21f21611f5a1ec33f67d22ca23d7da1c19b95496bee - input_fingerprint: 73631e1a14af0d189bbaaff9a3d3372a92401220a252ef753d9d90946c76f044 + input_fingerprint: c3ae2e07ab96f0af6b8820db574a6fcc74a44fd8e5b6082dbce2086eb39c9f79 template_sources: - AGPL-3.0-only.md.example Gemfile: recipe: template_source_application_Gemfile action: write - dest_sha256: d2b20656db3b2df1cc6bb9e88b01826fe212a6dc38526eb888c6362592ff810b - input_fingerprint: e7b8afd8976599d622b121b4c454795247927f99476c602e48a586e7ef159369 + dest_sha256: 0cc41d5ba274f613be0d9986a706d6b3026671b4e9a727238f1d790a81b90890 + input_fingerprint: 362626a24e6c37d2e6af4cdcc58d591b1f42a641bcdbd24e5dc61aadf588adc2 template_sources: - Gemfile.example LICENSE.md: recipe: template_source_application_LICENSE_md action: write dest_sha256: f6188bfd474a636d2a526420ebb411250faa447d94c9b9ccee097128ce4101b5 - input_fingerprint: 62813a9d5e44be19fad35e43c302abf49099ffc0dabc6ef2c5e5409a8a28c16f + input_fingerprint: 92ca52a859e500879eb97e3e2ab8f43f2c2e5270b50050cb7abee5b56a96b2a7 template_sources: - LICENSE.md.example PolyForm-Small-Business-1.0.0.md: recipe: template_source_application_PolyForm_Small_Business_1_0_0_md action: write dest_sha256: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 - input_fingerprint: 65e227561432d55b1b885198ca1a307e56562f28e48c65832c7b61537e781e26 + input_fingerprint: 52dff438632d6c77ea42d911caef86424c9ae73597b04d3c5e4e7d42c5e81a07 template_sources: - PolyForm-Small-Business-1.0.0.md.example README.md: recipe: template_source_application_README_md action: write dest_sha256: ee33642e7ea91283e57ce01aee1c06dbfaaf03e4849bc7ea1370bb3336503e5a - input_fingerprint: ab5c2737d3c0522f686177ac0388bd5e3a716af2f961d0e3ad992c6bd9f39795 + input_fingerprint: 794e14705ebad71bee6007b74f78715004fb2f844d3c120299c17a63a881fb9b template_sources: - README.md.example Rakefile: recipe: template_source_application_Rakefile action: write - dest_sha256: 9b8b5b099a95421d4c27d04894e11222b18d24492e50170a3647708504458aff - input_fingerprint: 8b743b7a7a460a89c86b0ee3850d6b6126b0a9c66837a91437274fdc43ef9da3 + dest_sha256: 1e87b3f98bc54600f41ed9fc0d930576142a173b9e6c4dd77fcee81e0a44c835 + input_fingerprint: c2b2b5a00518a9551b635a800fb0f99faad1f99419ea1b3122cbe74794679941 template_sources: - Rakefile.example certs/pboling.pem: recipe: template_source_application_certs_pboling_pem action: write dest_sha256: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - input_fingerprint: 28ccd6b689080662fafbb4b39a8540157fa024ead41aa926484b3ec17d71ec74 + input_fingerprint: f1e77508d7d477ee0e78a9e1db045f938dd3698d1d162d42f0a97113a8b2d79a template_sources: - certs/pboling.pem.example citrus-toml-merge.gemspec: recipe: template_source_application_citrus_toml_merge_gemspec action: write - dest_sha256: 7aeb3af974877700ef2b8f48e56ab86b1a1be0b0f2ff1bdcb6e69371587311f4 - input_fingerprint: 36daa5086d73cd3c714ae988bde122a0109162be9d75859297e34d4e3dffbb18 + dest_sha256: 1cd416560dfadb4d866fa9d8b3977a548a17a166a290cb8ed9a84d9994c11cbc + input_fingerprint: 166b85e60c8f475075d73559220c44d507bf8aba6a494802c1582c4dfa8948a9 template_sources: - gem.gemspec.example gemfiles/modular/benchmark/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_r4_v0_5_gemfile action: write dest_sha256: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 - input_fingerprint: 8ce239bd68a1f7b3bbfe60811a5630d9145b8eb39346926f91159285a0d1109e + input_fingerprint: b7de1866e5f7b87649e3a2daffdf9b4e6c3806e8133630b9ee2ba9d5834a2ecb template_sources: - gemfiles/modular/benchmark/r4/v0.5.gemfile.example gemfiles/modular/benchmark/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_vHEAD_gemfile action: write dest_sha256: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 - input_fingerprint: 614585c8c293a8a2e76e7e77d0c1b8215ac3cda29f85eff1b83fa1be4560d1be + input_fingerprint: 5881c115bcc07345f12850cdfafc5e1dd2f5620acd6a1447c4604a875d41edea template_sources: - gemfiles/modular/benchmark/vHEAD.gemfile.example gemfiles/modular/cgi/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_cgi_r4_v0_5_gemfile action: write dest_sha256: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 - input_fingerprint: 985d9e517395bff06a7d788f3bf6da22b0b5ef0b849d585404c0af116cfe1c15 + input_fingerprint: 775587434e81756a459b97f4b12260be43d50ed1e181357bc674012b1b9789e1 template_sources: - gemfiles/modular/cgi/r4/v0.5.gemfile.example gemfiles/modular/cgi/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_cgi_vHEAD_gemfile action: write dest_sha256: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 - input_fingerprint: 3b34ff30edff15207bebce8abc914bbc947accf069214adac77860dc895a58ec + input_fingerprint: 7a1f2b2d6833ca618e5f83d0c2e1a707354998f708aae4b68dda154cd828a01a template_sources: - gemfiles/modular/cgi/vHEAD.gemfile.example gemfiles/modular/changelog.gemfile: recipe: template_source_application_gemfiles_modular_changelog_gemfile action: write dest_sha256: da669526144fbff33aef207db9541b6fd6c254437f94dec2fab70fc55a7757cd - input_fingerprint: a1a5c58ae22fd74b5fb15f9e6a8b7575df014cc72cb030617aaec742bd3d7a1a + input_fingerprint: f7afb51714b68ac58dc031b39bfdb3275a3ffc15df96ecfbbd0816880c616af4 template_sources: - gemfiles/modular/changelog.gemfile.example gemfiles/modular/coverage.gemfile: recipe: template_source_application_gemfiles_modular_coverage_gemfile action: write dest_sha256: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - input_fingerprint: 9938fa379248cb08896d54d3e8886d89dc02d82858b5924c673d39be23d0e442 + input_fingerprint: cd28f77a828e2c3e612e8c3f20fccfa4e494d935bfe40d4b59fd56d27accbc85 template_sources: - gemfiles/modular/coverage.gemfile.example gemfiles/modular/coverage_local.gemfile: recipe: template_source_application_gemfiles_modular_coverage_local_gemfile action: write - dest_sha256: 2b493414df06261ba8acb6f0eb18bf3fdd701d7cb5f967a9d15a3f42a4741827 - input_fingerprint: 9dace8e6da62e8eedd26b8dd4d127a451b5e583c7ed6aa04947bbaec5d0f83a7 + dest_sha256: 92c9a599c8f6867ec532880f73568f2736ac05d8973ec524b42fd5dbe6aeda3e + input_fingerprint: 79c3f62f6cc3790cf0dffae25a1ae517d3e3025230c0bc9b400c059f6898b905 template_sources: - gemfiles/modular/coverage_local.gemfile.example gemfiles/modular/debug.gemfile: recipe: template_source_application_gemfiles_modular_debug_gemfile action: write dest_sha256: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 - input_fingerprint: 5b5a22ec66e58ac15b2ea834989f7b44689a62a05146d305d4bb19a95ff9d2dc + input_fingerprint: 2cc45c4cbb012e9a3e85b0797613afc746d0f7c06007b7b560f92929095a4e68 template_sources: - gemfiles/modular/debug.gemfile.example gemfiles/modular/documentation.gemfile: recipe: template_source_application_gemfiles_modular_documentation_gemfile action: write dest_sha256: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c - input_fingerprint: c136f585ea9b5737da7bc28174747f7abcfe158a2dd9f98f9d5f07e6962db79a + input_fingerprint: 6bb30b08054e61c53a1ae34daf94120699abd6db3bd2ba8123e730ba50e63696 template_sources: - gemfiles/modular/documentation.gemfile.example gemfiles/modular/documentation_local.gemfile: recipe: template_source_application_gemfiles_modular_documentation_local_gemfile action: write dest_sha256: 2058173855b9a4acc6d5efa20520e49734243eef6cf0b5e9063e0e5866a08e9c - input_fingerprint: efa627c36442597670c10e65942c1cda3e5bc33915bea6d98ad89e8adc4725d5 + input_fingerprint: 1176a922e16ac3a8814be6d3a3614d9026077747a71c61773ba500597291f295 template_sources: - gemfiles/modular/documentation_local.gemfile.example gemfiles/modular/erb/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r2_v3_0_gemfile action: write dest_sha256: 3793e7dc9ef23a7ccd893d48cbba092fd27594c63e65cca011cc658218425670 - input_fingerprint: 6b0cb1de630e07e8107cca2d841d33de12618b7bd4dd859d9179bf7b6de2f164 + input_fingerprint: 92b55c0736e63eb5ab8fad48a596eef29337c097b4817a4879bbe778f807c56d template_sources: - gemfiles/modular/erb/r2/v3.0.gemfile.example gemfiles/modular/erb/r3/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r3_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 40a21f77c08cbe81af5cac0e76568c1e5d29db87a7982e15497666d38e2a1642 + input_fingerprint: 165456884f48afa4e4c2ad5215eb40f80bef0033c3d739ca830419620d3e39b4 template_sources: - gemfiles/modular/erb/r3/v5.0.gemfile.example gemfiles/modular/erb/r4/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r4_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 025ad3597e52d5a58842ac31ac8e10dffa9d83903e1efdf5adfd15baded97cad + input_fingerprint: f3ec7fad05536517a20a90f5e6652193cc5cc70fc36fb68787ea577e3cd8b731 template_sources: - gemfiles/modular/erb/r4/v5.0.gemfile.example gemfiles/modular/erb/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_erb_vHEAD_gemfile action: write dest_sha256: ad6f104a49e80e0cf625440e3dc816343fe7e2f037fc4971df75e7bb4305c683 - input_fingerprint: 7ed35e6c71447553289d75464b7eea0c01bf4d0561ca20f4796b73508a8919c8 + input_fingerprint: 5ffc79af2fc3b9bdcbca7599499ea6cacc24149fb721a808c152acc50ed40857 template_sources: - gemfiles/modular/erb/vHEAD.gemfile.example gemfiles/modular/json/truffleruby_22_3.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_22_3_gemfile action: write dest_sha256: 249c12eacbe90f9d0d2e81e7a62c4c7e9102e504ededcda4ecf660cb3bb68be4 - input_fingerprint: 932dc83efa3aacade7610619da4d895c172769c9f04366a2818b9d64f7ba4f8a + input_fingerprint: 826fd7353ef496f022a234a334e630157c96b6f1f61cf19139ee38ccf5ba04ab template_sources: - gemfiles/modular/json/truffleruby_22_3.gemfile.example gemfiles/modular/json/truffleruby_23_0.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_0_gemfile action: write dest_sha256: 66aa010567f7afa1af8244a74c3c88ecaaf84dc87b6a25180691bb480d02ed28 - input_fingerprint: 78791195c18b0198b54e8c45c8de82b45a3441af1851507eab212faa917453d8 + input_fingerprint: f2010a0792d54d99ee33f5f809a17c49e05b1094d6d1bd48673ad40cc4a18783 template_sources: - gemfiles/modular/json/truffleruby_23_0.gemfile.example gemfiles/modular/json/truffleruby_23_1.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_1_gemfile action: write dest_sha256: '080fcbdaf2bec73cad40832a3d51eebb380af789917b96f493d1460b0dd6361d' - input_fingerprint: e2d8c9580f7c648b732319f3488496fa6b3cb33a3926b4ac335b8d858b2f7f20 + input_fingerprint: '087ce78cc94fbf330a937cd6f5705c68cb58cf54c767268ae587619f7cad97a3' template_sources: - gemfiles/modular/json/truffleruby_23_1.gemfile.example gemfiles/modular/mutex_m/r2/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r2_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 87c1f67f8e212f3a9ec92ae9d54f8a190a2fba2fa4ca62c81fb9527a93eac463 + input_fingerprint: 9cf7a392c85f02e4af0bd6807eb7c6ba6d3f7d5c810b1276612b0f918a5f4f53 template_sources: - gemfiles/modular/mutex_m/r2/v0.3.gemfile.example gemfiles/modular/mutex_m/r3/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r3_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: a8bd60e51b952f0e168b5e1785b1864723c94877534772cb5277176b52f2d636 + input_fingerprint: 942701be64b3523f7afcc0412aa5745d79aab4e1526222d2f367d011c2c45f5a template_sources: - gemfiles/modular/mutex_m/r3/v0.3.gemfile.example gemfiles/modular/mutex_m/r4/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r4_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: c7ac3af5c4b79c95f160488e776c05a575c78800cad7fc3a1839eeb6b6c64f4b + input_fingerprint: 045c4981b3896263956c2c2c56fc563268923b394e453e0cbdef546103a8299c template_sources: - gemfiles/modular/mutex_m/r4/v0.3.gemfile.example gemfiles/modular/mutex_m/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_vHEAD_gemfile action: write dest_sha256: '08018641c97f894788fa91b462da504ab2237213d18d95404136c393274ae3cb' - input_fingerprint: 96f037399a39d6a0a5fb1eaf70602a4108ce73596b6d2885e782757613a6537d + input_fingerprint: 6a30313e8ee09f5b6698ea03ca591eaefa3a1ba87e5fce129f2fc87b133675c0 template_sources: - gemfiles/modular/mutex_m/vHEAD.gemfile.example gemfiles/modular/optional.gemfile: recipe: template_source_application_gemfiles_modular_optional_gemfile action: write dest_sha256: f770e6e9a9dd2bd0f1f132e882d88038b2e21127dce3afe270908c7338c28bfd - input_fingerprint: 7a17681fcc942f4e7f35828f94504140b07fee236927f66b1b323021e589bb6a + input_fingerprint: 32dba5b337fe41b981623b0380a2308307025a98ecf35cea7af533f99204e2c1 template_sources: - gemfiles/modular/optional.gemfile.example gemfiles/modular/rspec.gemfile: recipe: template_source_application_gemfiles_modular_rspec_gemfile action: write dest_sha256: d043f5c9344f6435edb4607c5adaf42c78e7fb6b8b6726007de2bbedefb376c3 - input_fingerprint: 95a578ec43ff071db2df178dc11f5629eea8a4980150a508ff954df6ec0c1d9a + input_fingerprint: 40822db502f99e984210f517a557df26ff5d938fb21f27398026591adf9c2d91 template_sources: - gemfiles/modular/rspec.gemfile.example gemfiles/modular/runtime_heads.gemfile: recipe: template_source_application_gemfiles_modular_runtime_heads_gemfile action: write dest_sha256: 6ac7158c4a3088190f2a9082f01439eb27eca2172ab3464b15c9cb045aa885e1 - input_fingerprint: 00dc687c72817368898f29b396ffe922157de4ed4e056cd13d00822d5f0796c0 + input_fingerprint: 31f5283172436fe33239e7a98349803f09b17035a382d7eb555d8015ab84b30f template_sources: - gemfiles/modular/runtime_heads.gemfile.example gemfiles/modular/stringio/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r2_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: e0daa576b8a9d6416cb7cc38e6a1378ca29dae7286657846bc922a15190331a0 + input_fingerprint: a6b9bada0b30ec11dea090e7fd0637577c4e96c90a71d9f217097f20ab57e438 template_sources: - gemfiles/modular/stringio/r2/v3.0.gemfile.example gemfiles/modular/stringio/r3/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r3_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 020e046ff643e7c963b763609907ae6e1f9ecc181fdc79f451e528136a5a7123 + input_fingerprint: 0b7f80cc4b8f00d8d3010a8ff2937a7cb7fd93009e8606ac1d2375837bfd8051 template_sources: - gemfiles/modular/stringio/r3/v3.0.gemfile.example gemfiles/modular/stringio/r4/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r4_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: b37a216a65038c8c2416799082ffb6a21310069599a4474394d563cf1ee28268 + input_fingerprint: 66cf2618d72b34a535a128a3b13acace798c4d4aec64dd68937bfce7f9866bea template_sources: - gemfiles/modular/stringio/r4/v3.0.gemfile.example gemfiles/modular/stringio/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_stringio_vHEAD_gemfile action: write dest_sha256: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - input_fingerprint: 006b7fad67a7284eca7d9081822132348b8a153bc514670bef0f28ec86a33b9c + input_fingerprint: f19ad5f15132c6fcb81865c032de0951e570039d81fe3e0bde238ad380ef794f template_sources: - gemfiles/modular/stringio/vHEAD.gemfile.example gemfiles/modular/style.gemfile: recipe: template_source_application_gemfiles_modular_style_gemfile action: write - dest_sha256: 2a3d46dcb8a9394f595f273f5eb0403d0a552837754ab109afc9ba79a7159083 - input_fingerprint: 22a0244cb896e942af482700081dee517adb7bb0bd469f9878c43eac4cec18cd + dest_sha256: 9a24acff0054573c30f5d84d0418cd465ba3794d075bb5a36801410ac40e0787 + input_fingerprint: 116da50e50c50d19bca0cbd3dac27076d533b9ec39f8396de98356d25b33b9f2 template_sources: - gemfiles/modular/style.gemfile.example gemfiles/modular/style_local.gemfile: recipe: template_source_application_gemfiles_modular_style_local_gemfile action: write dest_sha256: 55eb9c149cdb2f29c9f31abe2d55a4f334e00fb859681dd17c42149a3f28ca36 - input_fingerprint: 314f5d716a143efb3b6c9497aa4ee18caa75b2cc57b7c87c9430863ad94b1880 + input_fingerprint: f4a0a07ce6984f8039df7b57523480a1b695ccd65c45bb26fac0cbdbccd2fcad template_sources: - gemfiles/modular/style_local.gemfile.example gemfiles/modular/templating.gemfile: recipe: template_source_application_gemfiles_modular_templating_gemfile action: write - dest_sha256: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - input_fingerprint: a50a82714781edeccc10d03e293d1f24fd1d44eb2c16ff8a682bdbc7feed720a + dest_sha256: 432ba59798d31b899268257c432443a017c5a9bd2c0c7f9f2216617e14150cd3 + input_fingerprint: f1c9fd733c83c6331e30728b72b488d52f93c6f01b54e5d857d88e19e28b48fa template_sources: - gemfiles/modular/templating.gemfile.example gemfiles/modular/templating_local.gemfile: recipe: template_source_application_gemfiles_modular_templating_local_gemfile action: write - dest_sha256: 1089fcfd4283d7153e78a879925066c8ea7b6a86faada35e7786a3ac1f024257 - input_fingerprint: 63d6020853081982f4ce213ee01eaedc2882bfa79c1668dc8e9e9262c5bf88ae + dest_sha256: 25eaf5fc67bff2112097b88e5f88f47df8b6a505ec7c8bbfa3f7f90bf3b44334 + input_fingerprint: bb88ce62aa2c303baa5828f3cb03b1fc9e729a0e1aa4c2eedc6aea4dd79aaf1c template_sources: - gemfiles/modular/templating_local.gemfile.example gemfiles/modular/webrick/r4/v1.9.gemfile: recipe: template_source_application_gemfiles_modular_webrick_r4_v1_9_gemfile action: write dest_sha256: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea - input_fingerprint: 20eddafdbd69f1bd905d8ffec2c5eb33d696bb97f4dba8c1df3e45ebab0ee783 + input_fingerprint: b0e4c7f21970bd34af817eb1a63f162824e810e609ccab2a0969230aaf91e9e3 template_sources: - gemfiles/modular/webrick/r4/v1.9.gemfile.example gemfiles/modular/webrick/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_webrick_vHEAD_gemfile action: write dest_sha256: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b - input_fingerprint: 53eee758600233caeeb4edcf194d2b8f39912ec40eea85472a040afc5f47fc07 + input_fingerprint: f5f4d536fe8f659208615497dafd47007a31f43510026c80e4272819be86efdf template_sources: - gemfiles/modular/webrick/vHEAD.gemfile.example gemfiles/modular/x_std_libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_gemfile action: write dest_sha256: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a - input_fingerprint: 78cea1aa5a643a0b98afd1201a5b93e8e9338403d327a4180dc2d4078a99bf46 + input_fingerprint: aa2936f9f210ef3cd5cd5fbf2a959828edeb7b759e96b68643c3fdbdce125e24 template_sources: - gemfiles/modular/x_std_libs.gemfile.example gemfiles/modular/x_std_libs/r2/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r2_libs_gemfile action: write dest_sha256: e80ec8ad06cb1b31ac982bc25cf7696987fca131aa1001eaefd0bf5cd379c273 - input_fingerprint: e6271fa0dfbe29794bb9d11c00dba701697123bf1f50014022f4305612337298 + input_fingerprint: c2015e4aaa675aee8183c811519c333b54af53993d465977bcc88d6a28dcab72 template_sources: - gemfiles/modular/x_std_libs/r2/libs.gemfile.example gemfiles/modular/x_std_libs/r3.1/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_1_libs_gemfile action: write dest_sha256: 9f8565c40b09bea1bc4c2e2ad87fe11400c3c51a2b235655bfcd8e491ed88ca8 - input_fingerprint: b896680c90a1998c0d885c7f715c63f9184fe0d01a9032b2920ea25708ec4e86 + input_fingerprint: 5f4d190a36afaf5f8a341e120e2a9931e61fed8b35f64454fd6a13601262cf81 template_sources: - gemfiles/modular/x_std_libs/r3.1/libs.gemfile.example gemfiles/modular/x_std_libs/r3/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_libs_gemfile action: write dest_sha256: 546f8849f4267bb19aa10ff0de40be30957197f229e6887847181ea9127b2650 - input_fingerprint: 1dc708a1af0f48d075485b41e00f3dd14ca507f567dfd3ab60b95ac25fad2921 + input_fingerprint: c6bbbe944881465b60782674e18580aa7fbb0df4a85e20f72a1bd60930533c19 template_sources: - gemfiles/modular/x_std_libs/r3/libs.gemfile.example gemfiles/modular/x_std_libs/r4/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r4_libs_gemfile action: write dest_sha256: 8c2582eaa218d216b98c86c933465295c8b4e43f3251ea388b9eaf6e471f8da6 - input_fingerprint: 18fd72856fc64de909c30de1231859a31a1b8f187aba16cc9d277af7a357acb0 + input_fingerprint: eed6f378c3dd0c3f58c9647fe43a5c703f9f7a28315591c654f324c85e455fab template_sources: - gemfiles/modular/x_std_libs/r4/libs.gemfile.example gemfiles/modular/x_std_libs/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_vHEAD_gemfile action: write dest_sha256: d3133ec4c0638363a7fb025d19be7e95a615fd61c35ddb8d17f2280ee74a7486 - input_fingerprint: 0a190a2b9005379af9449f279dff176c8ec928c06195d050f28bbb0acdc41eba + input_fingerprint: b5e317459e07c3686375cae7421b01c961be138561793baa6442d4ff956e0d57 template_sources: - gemfiles/modular/x_std_libs/vHEAD.gemfile.example lib/citrus/toml/merge/version.rb: recipe: template_source_application_lib_citrus_toml_merge_version_rb action: write - dest_sha256: cffa5c08daab75befd2ca4bbcfa6eb313a96c9a59c40efd39d93462913237bc7 - input_fingerprint: 062eea9f5f13d3efeb7ec15383017650560b6d25871a60de42882c2fcfbc8787 + dest_sha256: 237a8c7c820ce9e0e2d23d9fcdb4d3110f10525158f5d034a9442e4131fb99dd + input_fingerprint: 144141d5a8b69a17487fdbb2b25136457ec5a6afbd01bddbee139bbe3c026b5c template_sources: - lib/gem/version.rb.example mise.toml: recipe: template_source_application_mise_toml action: write dest_sha256: 7d267154ca4f081b0ac7da804c0180c2b091aec5f1c877417c1c320f4f369c88 - input_fingerprint: 23b1034cba0eb3ed8cc395c24697323894dd21019ba393fa5de42b5f2669191a + input_fingerprint: 0ae4d78bee26fc17d166aa3292520cdb353e1026b9cf4ecd6f8dfbecd0ba5112 template_sources: - mise.toml.no-osc.example sig/citrus/toml/merge.rbs: recipe: template_source_application_sig_citrus_toml_merge_rbs action: write dest_sha256: 32399c4a113e661f4d98352c8c1f74bdac55a89cb327d31d29dcf6fc3344251c - input_fingerprint: f4f9ea2787ec4ea549cda029b30ee1e9f9de7448738fd9f2e846f6bed0e5b8c9 + input_fingerprint: 8a97ad7b47ea42a365a993e75381639fbbbf11910130e1b3d6d30c85108836d0 template_sources: - sig/gem.rbs.example spec/spec_helper.rb: recipe: template_source_application_spec_spec_helper_rb action: write dest_sha256: a67bcbcfd2e9bfd01af6bbaeb0d8ac5b5c6ebe926da145fe8868c9903ee96091 - input_fingerprint: 5423f9a8a7b6f10de1ea091b88585d6580b8afcc693d9b30e90da4287670db67 + input_fingerprint: 8b44c20bad03f0a3f20d97fb1a1c02c79b5ca7a547d062633230bbeac4b7077f template_sources: - spec/spec_helper.rb.example diff --git a/gems/citrus-toml-merge/Gemfile b/gems/citrus-toml-merge/Gemfile index ea1b64df2..b24e2b1e6 100644 --- a/gems/citrus-toml-merge/Gemfile +++ b/gems/citrus-toml-merge/Gemfile @@ -19,7 +19,7 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } # Include dependencies from citrus-toml-merge.gemspec gemspec -gem 'kettle-family', '~> 1.2', '>= 1.2.97' +gem 'kettle-family', '~> 1.2', '>= 1.2.100' # Local workspace dependency wiring for *_local.gemfile overrides gem 'nomono', '~> 1.1', '>= 1.1.5', require: false # ruby >= 3.2.0 diff --git a/gems/citrus-toml-merge/Gemfile.lock b/gems/citrus-toml-merge/Gemfile.lock index 8c4316133..9ffc2178d 100644 --- a/gems/citrus-toml-merge/Gemfile.lock +++ b/gems/citrus-toml-merge/Gemfile.lock @@ -10,123 +10,123 @@ GIT PATH remote: . specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) + citrus-toml-merge (7.1.9) + ast-merge (= 7.1.9) + toml-merge (= 7.1.9) toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) + ast-crispr-markdown-markly (7.1.9) + ast-crispr (= 7.1.9) + markdown-merge (= 7.1.9) + markly-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism specs: - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) + ast-crispr-ruby-prism (7.1.9) + ast-crispr (= 7.1.9) + prism-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) + ast-crispr (7.1.9) + ast-merge (= 7.1.9) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ast-merge-git (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: - ast-merge (7.1.8) + ast-merge (7.1.9) benchmark token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) + ast-template (7.1.9) + ast-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + bash-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + binary-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge specs: - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) commonmarker (~> 2.2) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) + dotenv-merge (7.1.9) + ast-merge (= 7.1.9) + plain-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + go-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + html-merge (7.1.9) + ast-crispr (= 7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + json-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: - kettle-jem (7.1.25) + kettle-jem (7.1.26) addressable (>= 2.8, < 3) ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) @@ -160,122 +160,122 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge specs: - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown (~> 2.5) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + markdown-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) + markly-merge (7.1.9) + markdown-merge (= 7.1.9) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge specs: - parslet-toml-merge (7.1.8) + parslet-toml-merge (7.1.9) toml (~> 0.3) - toml-merge (= 7.1.8) + toml-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + plain-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) + prism-merge (7.1.9) + ast-merge (= 7.1.9) prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + psych-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) + yaml-merge (= 7.1.9) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) + rbs-merge (7.1.9) + ast-merge (= 7.1.9) rbs (>= 3.10) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + rust-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) + smorg-rb (7.1.9) + ast-merge (= 7.1.9) + ast-merge-git (= 7.1.9) + bash-merge (= 7.1.9) diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) + dotenv-merge (= 7.1.9) + go-merge (= 7.1.9) + html-merge (= 7.1.9) + json-merge (= 7.1.9) kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) + markdown-merge (= 7.1.9) + plain-merge (= 7.1.9) + prism-merge (= 7.1.9) + psych-merge (= 7.1.9) + rbs-merge (= 7.1.9) + rust-merge (= 7.1.9) + toml-merge (= 7.1.9) + typescript-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + toml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: - tree_haver (7.1.8) + tree_haver (7.1.9) citrus (~> 3.0) parslet (~> 2.0) tree_sitter_language_pack (>= 1.16.2, < 2.0) @@ -284,25 +284,25 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + typescript-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + yaml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) + zip-merge (7.1.9) + binary-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) GEM @@ -336,6 +336,8 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) + commonmarker (2.10.0) + rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -465,11 +467,15 @@ GEM lint_roller (1.1.0) logger (1.7.0) markly (0.19.0) + mini_portile2 (2.8.9) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) reline (~> 0.6) mutex_m (0.3.0) + nokogiri (1.19.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-musl) @@ -503,6 +509,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) + rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -696,13 +705,16 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.16.2-aarch64-linux) + tree_sitter_language_pack (1.17.0) + rb_sys (>= 0.9.130, < 0.10) + sorbet-runtime (~> 0.5) + tree_sitter_language_pack (1.17.0-aarch64-linux) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-arm64-darwin) + tree_sitter_language_pack (1.17.0-arm64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-linux) + tree_sitter_language_pack (1.17.0-x86_64-linux) sorbet-runtime (~> 0.5) tsort (0.2.0) tty-cursor (0.7.1) @@ -784,9 +796,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.31) + kettle-dev (~> 3.0, >= 3.0.34) kettle-drift (~> 1.0, >= 1.0.13) - kettle-family (~> 1.2, >= 1.2.97) + kettle-family (~> 1.2, >= 1.2.100) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) @@ -807,12 +819,12 @@ DEPENDENCIES reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) - rubocop-lts (~> 24.2, >= 24.2.1) - rubocop-lts-rspec (~> 1.0, >= 1.0.5) + rubocop-lts (~> 24.2, >= 24.2.3) + rubocop-lts-rspec (~> 1.0, >= 1.0.6) rubocop-minitest (~> 0.40, >= 0.40.0) rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! - rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) ruby-merge! ruby-progressbar (~> 1.13) rust-merge! @@ -843,33 +855,34 @@ CHECKSUMS appraisal2 (3.2.3) sha256=3a6cfaf8a444e02707b9a34154af1c4902fbe99d9d2168d7e81dd83ec77e6db7 appraisal2-rubocop (1.0.2) sha256=1dae97c1be087cf9c098a3a72fd41f873435e9b8b39687e633b36c9ccb22bff4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.8) - ast-crispr-markdown-markly (7.1.8) - ast-crispr-ruby-prism (7.1.8) - ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) + ast-crispr (7.1.9) + ast-crispr-markdown-markly (7.1.9) + ast-crispr-ruby-prism (7.1.9) + ast-merge (7.1.9) + ast-merge-git (7.1.9) + ast-template (7.1.9) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.8) + bash-merge (7.1.9) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) - bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae + binary-merge (7.1.9) + bundler (4.1.0.beta1) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.8) + citrus-toml-merge (7.1.9) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 + commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e commonmarker (2.10.0-x86_64-darwin) sha256=01e0830ed0319825ecdc16411c90acd3f661d1568dfc178731b3f64d0ce2363d commonmarker (2.10.0-x86_64-linux) sha256=945c510c0bfca9022245928e2248468fe3ddad58c939be0c37b20082cc392880 commonmarker (2.10.0-x86_64-linux-musl) sha256=288cd4fb9f17eed2ffa73551ef241dcf594e0f484b2aee2a0999540333c0618e - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) completely (0.8.0) sha256=e493cd5d84805f47917a41f277ecbfe5f35363bed670be5a957d3acaed8c6c5e concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 @@ -878,7 +891,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docopt_ng (0.7.1) sha256=a024148ee4fa3ab1a8a04411aa4370f39cf2b446e63562097d418b7974a15667 - dotenv-merge (7.1.8) + dotenv-merge (7.1.9) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -891,35 +904,37 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) + go-merge (7.1.9) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) + html-merge (7.1.9) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a - json-merge (7.1.8) - kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + json-merge (7.1.9) + kettle-changelog (1.0.7) + kettle-dev (3.0.34) + kettle-drift (1.0.13) kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 - kettle-jem (7.1.25) + kettle-jem (7.1.26) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 - kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd + kettle-soup-cover (3.0.10) kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 - markdown-merge (7.1.8) + markdown-merge (7.1.9) markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca - markly-merge (7.1.8) + markly-merge (7.1.9) + mini_portile2 (2.8.9) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 + nokogiri (1.19.4) nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af nokogiri (1.19.4-arm64-darwin) sha256=a46db9853286e6597b36ebc6953817d15acf3a299583eb3f89fdc6f91dd63527 @@ -933,20 +948,22 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) - plain-merge (7.1.8) + parslet-toml-merge (7.1.9) + plain-merge (7.1.9) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.8) + prism-merge (7.1.9) psych (5.5.0) sha256=4b245bbbd0f3238df8ccee766ebc1a6b062b10e4ee1d3284eb588739ba156a0a - psych-merge (7.1.8) + psych-merge (7.1.9) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 - rbs-merge (7.1.8) + rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -982,11 +999,11 @@ CHECKSUMS rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.8) + ruby-merge (7.1.9) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) + rust-merge (7.1.9) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +1011,7 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) + smorg-rb (7.1.9) sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1011,24 +1028,25 @@ CHECKSUMS timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.8) + toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb - tree_haver (7.1.8) - tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 - tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 - tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 - tree_sitter_language_pack (1.16.2-x86_64-linux) sha256=d8151e6e44e35ace9de3611c76b730896beab17f427db06d8f76666332a5dc60 + tree_haver (7.1.9) + tree_sitter_language_pack (1.17.0) + tree_sitter_language_pack (1.17.0-aarch64-linux) + tree_sitter_language_pack (1.17.0-arm64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-linux) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f tty-cursor (0.7.1) sha256=79534185e6a777888d88628b14b6a1fdf5154a603f285f80b1753e1908e0bf48 tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) + typescript-merge (7.1.9) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 yaml-converter (0.2.5) sha256=a5214fe1a6c2df88bd34a35bcded1b1dcd30135548130df2e03b54ca8c0f2423 - yaml-merge (7.1.8) + yaml-merge (7.1.9) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.8) sha256=73d935d43e3479d65ce8aff25c7d3100e8bb83528a2adaa0ed824e5046ac99e7 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -1037,8 +1055,8 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) + zip-merge (7.1.9) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH - 4.0.20 + 4.1.0.beta1 diff --git a/gems/citrus-toml-merge/Rakefile b/gems/citrus-toml-merge/Rakefile index 0396c84c0..e8a562511 100644 --- a/gems/citrus-toml-merge/Rakefile +++ b/gems/citrus-toml-merge/Rakefile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -# citrus-toml-merge Rakefile v7.1.18 - 2026-09-07 +# citrus-toml-merge Rakefile v7.1.26 - 2026-09-09 # Ruby 2.3 (Safe Navigation) or higher required # # See LICENSE.md for license information. diff --git a/gems/citrus-toml-merge/bin/rubocop-gradual b/gems/citrus-toml-merge/bin/rubocop-gradual new file mode 100755 index 000000000..7c7ff0635 --- /dev/null +++ b/gems/citrus-toml-merge/bin/rubocop-gradual @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'rubocop-gradual' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'rubygems' +require 'bundler/setup' + +load Gem.bin_path('rubocop-gradual', 'rubocop-gradual') diff --git a/gems/citrus-toml-merge/citrus-toml-merge.gemspec b/gems/citrus-toml-merge/citrus-toml-merge.gemspec index abea34c73..b8b25ec2f 100644 --- a/gems/citrus-toml-merge/citrus-toml-merge.gemspec +++ b/gems/citrus-toml-merge/citrus-toml-merge.gemspec @@ -121,7 +121,7 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.31') # ruby >= 4.0.0 + spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.34') # ruby >= 4.0.0 # Security spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 diff --git a/gems/citrus-toml-merge/gemfiles/modular/coverage_local.gemfile b/gems/citrus-toml-merge/gemfiles/modular/coverage_local.gemfile index 37917caac..d6c890e46 100644 --- a/gems/citrus-toml-merge/gemfiles/modular/coverage_local.gemfile +++ b/gems/citrus-toml-merge/gemfiles/modular/coverage_local.gemfile @@ -29,11 +29,31 @@ Kernel.send(:gem, 'nomono', *nomono_activation_requirements) require 'nomono/bundler' local_gems = %w[kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -local_gems_to_eval = local_gems - %w[] - declared_gems # export KETTLE_DEV_DEV=/path/to/my platform :mri do + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + local_gems_to_eval = local_gems - %w[] - declared_gems + eval_nomono_gems( gems: local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/citrus-toml-merge/gemfiles/modular/style.gemfile b/gems/citrus-toml-merge/gemfiles/modular/style.gemfile index 59c5dc1a3..41ec99454 100644 --- a/gems/citrus-toml-merge/gemfiles/modular/style.gemfile +++ b/gems/citrus-toml-merge/gemfiles/modular/style.gemfile @@ -24,9 +24,9 @@ platform :mri do if ENV.fetch('RUBOCOP_LTS_DEV', 'false').casecmp('false').zero? declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) - gem 'rubocop-lts', '~> 24.2', '>= 24.2.1' unless declared_gems.include?('rubocop-lts') - gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.5' unless declared_gems.include?('rubocop-lts-rspec') - gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.6' unless declared_gems.include?('rubocop-ruby3_2') + gem 'rubocop-lts', '~> 24.2', '>= 24.2.3' unless declared_gems.include?('rubocop-lts') + gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.6' unless declared_gems.include?('rubocop-lts-rspec') + gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.8' unless declared_gems.include?('rubocop-ruby3_2') else eval_gemfile('style_local.gemfile') end diff --git a/gems/citrus-toml-merge/gemfiles/modular/templating.gemfile b/gems/citrus-toml-merge/gemfiles/modular/templating.gemfile index 6af159bd7..ce51a08ed 100644 --- a/gems/citrus-toml-merge/gemfiles/modular/templating.gemfile +++ b/gems/citrus-toml-merge/gemfiles/modular/templating.gemfile @@ -18,7 +18,7 @@ end if structuredmerge_remote # Merge recipes for released installs. - gem 'kettle-jem', '>= 7.0' + gem 'kettle-jem', '~> 7.1', '>= 7.1.26' end if kettle_remote diff --git a/gems/citrus-toml-merge/gemfiles/modular/templating_local.gemfile b/gems/citrus-toml-merge/gemfiles/modular/templating_local.gemfile index e44bd00bf..d3fd5bad0 100644 --- a/gems/citrus-toml-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/citrus-toml-merge/gemfiles/modular/templating_local.gemfile @@ -65,9 +65,7 @@ structuredmerge_local_gems = %w[ kettle_dev_local_gems = %w[ kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift ] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[] -kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - (declared_gems - %w[kettle-dev]) if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( @@ -81,6 +79,28 @@ if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 end if ENV.fetch('KETTLE_DEV_DEV', 'false').casecmp('false') != 0 + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - declared_gems + eval_nomono_gems( gems: kettle_dev_local_gems_to_eval, prefix: 'KETTLE_DEV', From 26a3e1ad11752e796c1fc0f4f6a54f82c30e5903 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 23:54:27 -0400 Subject: [PATCH 099/137] =?UTF-8?q?=F0=9F=8E=A8=20Template=20parslet-toml-?= =?UTF-8?q?merge=20by=20kettle-family?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/parslet-toml-merge/.kettle-drift.lock | 76 ++++- gems/parslet-toml-merge/.rubocop_gradual.lock | 7 +- .../.structuredmerge/kettle-jem.lock | 145 ++++---- gems/parslet-toml-merge/Gemfile | 2 +- gems/parslet-toml-merge/Gemfile.lock | 320 +++++++++--------- gems/parslet-toml-merge/Rakefile | 2 +- gems/parslet-toml-merge/bin/rubocop-gradual | 16 + .../gemfiles/modular/coverage_local.gemfile | 24 +- .../gemfiles/modular/style.gemfile | 6 +- .../gemfiles/modular/templating.gemfile | 2 +- .../gemfiles/modular/templating_local.gemfile | 24 +- .../parslet-toml-merge.gemspec | 2 +- 12 files changed, 388 insertions(+), 238 deletions(-) create mode 100755 gems/parslet-toml-merge/bin/rubocop-gradual diff --git a/gems/parslet-toml-merge/.kettle-drift.lock b/gems/parslet-toml-merge/.kettle-drift.lock index 98b009e1e..1b23f4793 100644 --- a/gems/parslet-toml-merge/.kettle-drift.lock +++ b/gems/parslet-toml-merge/.kettle-drift.lock @@ -1,10 +1,82 @@ { + "debug_env: 'KETTLE_DEV_DEBUG',\nroot: %w[src my kettle-dev]": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 46, + 63 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 93, + 110 + ] + } + ], + "path_env: 'KETTLE_DEV_DEV',\nvendored_gems_env: 'VENDORED_GEMS',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 43, + 60 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 90, + 107 + ] + } + ], + "prefix: 'KETTLE_DEV',\npath_env: 'KETTLE_DEV_DEV',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 42, + 59 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 89, + 106 + ] + } + ], + "vendor_gem_dir_env: 'VENDOR_GEM_DIR',\ndebug_env: 'KETTLE_DEV_DEBUG',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 45, + 62 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 92, + 109 + ] + } + ], "vendored_gems_env: 'VENDORED_GEMS',\nvendor_gem_dir_env: 'VENDOR_GEM_DIR',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 44, + 61 + ] + }, { "file": "gemfiles/modular/templating_local.gemfile", "lines": [ - 77, - 88 + 75, + 91, + 108 ] } ] diff --git a/gems/parslet-toml-merge/.rubocop_gradual.lock b/gems/parslet-toml-merge/.rubocop_gradual.lock index bd75f9740..827eb078b 100644 --- a/gems/parslet-toml-merge/.rubocop_gradual.lock +++ b/gems/parslet-toml-merge/.rubocop_gradual.lock @@ -2,7 +2,7 @@ ".simplecov:2844028997": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] ], - "Rakefile:3974557469": [ + "Rakefile:3628169150": [ [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], [81, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], [165, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], @@ -22,6 +22,9 @@ [1, 1, 0, "Naming/FileName: The name of this source file (`vHEAD.gemfile`) should use snake_case.", 5381], [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], + "gemfiles/modular/coverage_local.gemfile:2813372128": [ + [34, 1, 1586, "Metrics/BlockLength: Block has too many lines. [37/25]", 820328175] + ], "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], @@ -97,7 +100,7 @@ [75, 7, 1663, "Metrics/MethodLength: Method has too many lines. [27/10]", 3550313116], [138, 7, 17, "Style/Documentation: Missing top-level documentation comment for `class Parslet::Toml::Merge::SmartMerger`.", 497427992] ], - "parslet-toml-merge.gemspec:2266672520": [ + "parslet-toml-merge.gemspec:4221228877": [ [137, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4147388508], [148, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], [149, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], diff --git a/gems/parslet-toml-merge/.structuredmerge/kettle-jem.lock b/gems/parslet-toml-merge/.structuredmerge/kettle-jem.lock index 97b34efe1..1449d44f5 100644 --- a/gems/parslet-toml-merge/.structuredmerge/kettle-jem.lock +++ b/gems/parslet-toml-merge/.structuredmerge/kettle-jem.lock @@ -1,11 +1,12 @@ --- version: 1 template_state: - version: 7.1.18 - applied_at: '2026-09-07' + version: 7.1.26 + applied_at: '2026-09-10' changelog_replay: last_entry_key: kettle-jem-template-20260802-001 last_entry_date: '2026-08-02' + maintenance_changelog: {} checksums: ".aiignore.example": 48a5dfdd93afd1a15fdce39cc28ca9920263f00018b0968ab031fa744521e5ce ".config/mise/env.sh": aeea5a2ab489ba6e5467ae8de6e386ec8c8fe4ff31a044e69d0cd6a092dd6654 @@ -75,7 +76,7 @@ template_state: ".rubocop_rspec.yml.example": 288ad75e7eb14d87d80fafe6f7272217be5c57547536ee56c780a7d10ac7ec74 ".simplecov.example": 222f2e6ce8cf089c70a21f0f5e5423d4bd59a96fdb2ce7754b0fb3d6f430c229 ".structuredmerge/git-drivers.toml.example": 9d241a44c9edffcdbd3da018fa188a238089c3d1635040924df594a6929a4f97 - ".structuredmerge/kettle-jem.yml.example": 26949dc4ee0722415e72452cbc186bee6ef7b154eae33166d36f3fdb1ca6e46d + ".structuredmerge/kettle-jem.yml.example": ff65a738da1af7d60714026a81d3323a46c864e96ae3570b806afdf6e7149ff9 ".yard-lint.yml.example": 90def46867c9436b4e177c47d91fc8165f4602e335715aecc39f5587ae20b55b ".yardignore.example": 821f453c609df7d46145d675424b39dfbe6dfdca8edac5f367b85fff48502455 ".yardopts.example": 6fd6f2701713096a8a9ea095c213bbc68eeef37797c4754d97837e3229a3a5f6 @@ -88,7 +89,7 @@ template_state: CHANGELOG.transfer.md: 21331d8a9e58b4ff6e088b88eb408bcccb0f2f64e78f8f4d42ac3f11a24baad8 CITATION.cff.example: e404ea0a7919d78a83d53d80e211d17b9663576aa606583b709795dc023fd75c CODE_OF_CONDUCT.md.example: f1ad532f1860f73ef774c6b27a26d41f4bc1cb8813034f5957487766ebb0986b - CONTRIBUTING.md.example: 22570cfb3dde72be79b4b522b6d5ab13f95d778e40444483a096871fe0891b19 + CONTRIBUTING.md.example: 8d23cce2d061e0c20d619c3f66591df5f32821cd84c32d171df0b8ebe1217a55 FUNDING.md.example: 392d047904b1557b29f4b43d37ec403b7480edd5b6ab51180be979b57a91e6ba FUNDING.md.no-osc.example: 3ef0258dd3e3b7f7e17e8bc2d20dcbcb3e74aa5a5a6f51297075696645e34c77 Gemfile.example: 99500023987e81775a9b5ef14e92cb3992f2ac408e5f42454f2728eee9b49fb2 @@ -99,19 +100,19 @@ template_state: PolyForm-Small-Business-1.0.0.md.example: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 README.md.example: 21f491e3d73bfc1b74056a6dcba61f72c93dee3cfe5272ac164a20978454de21 REEK: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - RUBOCOP.md.example: c09e5533ccc59b70a2efa05c99f66e521137c1053d3c12eb43509cebd5b68b0e + RUBOCOP.md.example: d99871a0e4c1d323c92e7febf328f062bb4722069b2abfd0a83bf7daa8dcbf8c Rakefile.example: 569803e726b07ea26267fec6891367a3096a0dff3c266269a7081d36afe496af SECURITY.md.example: ee9411aa85f36d88363fdaea7a1baea4362b6ec112cf2688e711b05de1d3144c bin/setup.example: 0ac35089c95a91d8973fe7a318bf9fd98b9f8e00db92c5d9ca6cd858abb8d41b certs/pboling.pem.example: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - gem.gemspec.example: 83e834e8958a88e4817a57199f48f5ebb245548ce251c5c47372208693f03b17 + gem.gemspec.example: 12dcadc0b297ccd4e18b9d1e538b98ac8330ef9fb2a059ed6754ad59272b77fa gemfiles/modular/benchmark/r4/v0.5.gemfile.example: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 gemfiles/modular/benchmark/vHEAD.gemfile.example: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 gemfiles/modular/cgi/r4/v0.5.gemfile.example: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 gemfiles/modular/cgi/vHEAD.gemfile.example: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 gemfiles/modular/changelog.gemfile.example: 892598e0e7792eb205247ae28128cef6dfc647d2fb33968969152230d6f69288 gemfiles/modular/coverage.gemfile.example: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - gemfiles/modular/coverage_local.gemfile.example: 928d5f260d7b119c038baa56da9fb78dd524dee613aea33ab72894bbce5c506e + gemfiles/modular/coverage_local.gemfile.example: 92ea0d7a9d693553dc614afa2c43990f5c3778c2b00ef6c528e122c31bd506a1 gemfiles/modular/debug.gemfile.example: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 gemfiles/modular/documentation.gemfile.example: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c gemfiles/modular/documentation_local.gemfile.example: 84a20f5d4b0feb94c2cf2f7a8dce8f682f1483498e41484c2b447a5661fd1870 @@ -145,10 +146,10 @@ template_state: gemfiles/modular/stringio/r3/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/r4/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/vHEAD.gemfile.example: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - gemfiles/modular/style.gemfile.example: 3ad0585b4f2db8918580ca41ea8723f7a166d7a83cfd7f9613511094997106fd + gemfiles/modular/style.gemfile.example: 02fe3e8fd00e49b90c3ab30e19b51014ee50490f3eadcfd1d4a39f4c2c997dda gemfiles/modular/style_local.gemfile.example: c86beb711e766126a5be68be4be18255831625ac3650d5069383c4a83a9511f3 - gemfiles/modular/templating.gemfile.example: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - gemfiles/modular/templating_local.gemfile.example: 930057d3b909a72e39a39125c4e883a7ff71f5691e64426c0541f8c8fc75b83f + gemfiles/modular/templating.gemfile.example: 2b33c094677b53ad9dd2eafeb3a3be452f612380c61001a2e75b3c078b8ff72a + gemfiles/modular/templating_local.gemfile.example: ac7259516e69ffafb8b9342a897ddf6042adc46335743f474c342509cefd8f2e gemfiles/modular/webrick/r4/v1.9.gemfile.example: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea gemfiles/modular/webrick/vHEAD.gemfile.example: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b gemfiles/modular/x_std_libs.gemfile.example: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a @@ -175,7 +176,7 @@ template_state: shim/Gemfile.example: 0fb0d9d06fcfb1fd6ca6f0eeb5867253ca1ed221e03d28027719225f868b0637 shim/README.md.example: 3a2f7211b7f92a1dfae5e523b8e34b051a3d8af942144b05286eca0b3c8f6fbe shim/Rakefile.example: 572c94da7052083b39b62a6600785419e314a109efd7a3d8c3a96eb77ad34fd1 - shim/gem.gemspec.example: efae033238e4fd1355cfc134f5c9123f175d1ad1dc4a1a2e663899788c9e0870 + shim/gem.gemspec.example: 14a7015b3328005d1c3b5fda6886bd6da383707745f6eaaa781d6f9689600131 shim/lib/compat_require.rb.example: 94ee85e353a3ca08c8a35c9063d4ff789214ea594c7f803f6cf09d7142f48379 shim/lib/entrypoint.rb.example: dd57613520daca01d6f6bcaa9b83b00ff74505240dc04b84ceb686df3c0539d7 shim/lib/version.rb.example: 15e219ac3a928b5580035f891e415551213175020f1131f6e7ca0ccd55a1b2d6 @@ -189,370 +190,370 @@ files: recipe: template_source_application_simplecov action: write dest_sha256: 876988bacff2468af1c87cdafd8aa634b13af6c2e2d948117451189bcd3daa9a - input_fingerprint: 73430eda38d4705d152d0a73b44a00be6c18b0fe4cab6998d7841cb480c9201f + input_fingerprint: d77b94b0e4834da1bae108635906eab63c34c34503e41edb4074cc748213be88 template_sources: - ".simplecov.example" AGPL-3.0-only.md: recipe: template_source_application_AGPL_3_0_only_md action: write dest_sha256: d8a6cc31abc16b6748c7a21f21611f5a1ec33f67d22ca23d7da1c19b95496bee - input_fingerprint: f3a452ab7ae5688e259404adb78e11c6f518150065bc010ee2ab5bdd3a8d8894 + input_fingerprint: 99ddd598800e404ec5fcc3cab1b51f31ef33ad96e0dcdb5ab9a15ac57013baf3 template_sources: - AGPL-3.0-only.md.example Gemfile: recipe: template_source_application_Gemfile action: write - dest_sha256: 5b38f3b2951b9279e0794591b8c0628474af8c3887fe5a580cf14c609a8fc784 - input_fingerprint: 04da9ce281c168160e5bc7cfd58db8597c03faf0d96c31fa0dfa13dded2dfd60 + dest_sha256: b03be5c187418e6c0f05b3cd2062dad41e9c0a0d647bb10b45373b11c83c0048 + input_fingerprint: de3abd146597d3988f63761a7f21d67a49dcab43898023081d07b47766889657 template_sources: - Gemfile.example LICENSE.md: recipe: template_source_application_LICENSE_md action: write dest_sha256: f6188bfd474a636d2a526420ebb411250faa447d94c9b9ccee097128ce4101b5 - input_fingerprint: bad44e54f72ea929dee4df4f71fe135ec3d25c31b1d5f9d8621d11c9c9bc0ddc + input_fingerprint: 0703e6a9d89c7be85d772d98e74df7d0705abf4b0864c75008b1a8c952e8a607 template_sources: - LICENSE.md.example PolyForm-Small-Business-1.0.0.md: recipe: template_source_application_PolyForm_Small_Business_1_0_0_md action: write dest_sha256: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 - input_fingerprint: 2e8b86c40f51d12b591b8c36cbe1007d46f41a7dc1be94aaabd1ed573ccf9d87 + input_fingerprint: 0fcf055a439af0143f26956822248f0c82fcee799c6daa1e8d24c9a51e87abf1 template_sources: - PolyForm-Small-Business-1.0.0.md.example README.md: recipe: template_source_application_README_md action: write dest_sha256: d27eb2018e7bf4c4dc358649b0ef9505a113f9bbf69a097f640ff3e55be555da - input_fingerprint: 33a6862b4a075fa5dcedfc1e16ccea09d1ef016244253d4b46235d8f2af9a4a8 + input_fingerprint: 4146be348ab9c8b4dbc2b61ca84de2d6beae319ecf3da77b52e50d1bd12bc23e template_sources: - README.md.example Rakefile: recipe: template_source_application_Rakefile action: write - dest_sha256: 5faa756e4101e5a4a858e5b455cc2d0a9b1266fbe4ed78c4f0d7004d5301297b - input_fingerprint: 59f47630aab039ca1bdf2a8095c3a73b1db56818dbc758d19ec7216f04bf55f6 + dest_sha256: f497e600deda3684a77095acee14ede9df5a48410735e9d3433c1dced56e5e14 + input_fingerprint: bb80122c463d861a639512507f15d543e5353e2d515a799b1247edc34cd16b1b template_sources: - Rakefile.example certs/pboling.pem: recipe: template_source_application_certs_pboling_pem action: write dest_sha256: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - input_fingerprint: cd0c20348734cc50c563740a085b5c7fee3ac90afa2a22b9c3364a097e0b7ad0 + input_fingerprint: ca4356d79d9eee3fdb799a909ffd9339f79e7f7dce9c9fbaddbecc04be358397 template_sources: - certs/pboling.pem.example gemfiles/modular/benchmark/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_r4_v0_5_gemfile action: write dest_sha256: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 - input_fingerprint: 32c4af9833fad6bf5cf5171527b6f54ff10a9aa7833c54eca2b201a50b7e3939 + input_fingerprint: 553967705eb6215d205ceb13f4ef35be01c4ebc298799f09df0f2d68d2ced0b6 template_sources: - gemfiles/modular/benchmark/r4/v0.5.gemfile.example gemfiles/modular/benchmark/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_vHEAD_gemfile action: write dest_sha256: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 - input_fingerprint: 769cb892f722b0e4c3f05f2149f87c2315e2396a400b65cd3347a1068cf1d5a0 + input_fingerprint: a65353c06e2ef3dbb0338552d95cfec6dd12046923980a2bb6e0ea2191b2455b template_sources: - gemfiles/modular/benchmark/vHEAD.gemfile.example gemfiles/modular/cgi/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_cgi_r4_v0_5_gemfile action: write dest_sha256: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 - input_fingerprint: aa42845f8323723eb220c6b2b39c1e8f0904bcf79f1683efb1431b0f1fa2de12 + input_fingerprint: 823a9a9f0d32b90d09a237069adac24f38f15d26dc78c31da5da21814cffa74a template_sources: - gemfiles/modular/cgi/r4/v0.5.gemfile.example gemfiles/modular/cgi/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_cgi_vHEAD_gemfile action: write dest_sha256: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 - input_fingerprint: 0efc58b5e7cabc18474ec3f692f910c39bf8ca371ef3fa69da7f0090d8a1236c + input_fingerprint: f0eea32d055030e5bca989ed2b2c0fc0c423a620f2a89a64fd3a867d9f541069 template_sources: - gemfiles/modular/cgi/vHEAD.gemfile.example gemfiles/modular/changelog.gemfile: recipe: template_source_application_gemfiles_modular_changelog_gemfile action: write dest_sha256: da669526144fbff33aef207db9541b6fd6c254437f94dec2fab70fc55a7757cd - input_fingerprint: 1ecb9bf3f313cefba515b4c01a48b660e44def7de0f12951443d4cda07a669c5 + input_fingerprint: 39144f1830329f01a0fde058968de015995c993a8d135442c6392a55e041b608 template_sources: - gemfiles/modular/changelog.gemfile.example gemfiles/modular/coverage.gemfile: recipe: template_source_application_gemfiles_modular_coverage_gemfile action: write dest_sha256: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - input_fingerprint: 8834a924e51cbcfbfd04b90b7a2e0431bf8b2cac25151f097f4684ab36e307c7 + input_fingerprint: 48d648136e9700a0232139bd80645026093e363decd9f9724963274fc986de09 template_sources: - gemfiles/modular/coverage.gemfile.example gemfiles/modular/coverage_local.gemfile: recipe: template_source_application_gemfiles_modular_coverage_local_gemfile action: write - dest_sha256: 2b493414df06261ba8acb6f0eb18bf3fdd701d7cb5f967a9d15a3f42a4741827 - input_fingerprint: dc94f72068b5a092e7a795304862c4e3047aa3d2e33064b9eb570f51fdf3e1fb + dest_sha256: 92c9a599c8f6867ec532880f73568f2736ac05d8973ec524b42fd5dbe6aeda3e + input_fingerprint: 75bb1c385f8ba8987d04f136525423332bd93c9ad30e43b6d3da89fcb1a55556 template_sources: - gemfiles/modular/coverage_local.gemfile.example gemfiles/modular/debug.gemfile: recipe: template_source_application_gemfiles_modular_debug_gemfile action: write dest_sha256: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 - input_fingerprint: 6652072b6978b9d2db1b215889b4d3e197ef23148ec0950ed10024c94fb8c200 + input_fingerprint: 7fcc81f91cb3370658e6eba04c9acc3ca1ad9e99b06332f3f4b9146862f20efa template_sources: - gemfiles/modular/debug.gemfile.example gemfiles/modular/documentation.gemfile: recipe: template_source_application_gemfiles_modular_documentation_gemfile action: write dest_sha256: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c - input_fingerprint: b497d8a9ee4b8afcc1b143f9fc2d46f599e35472803e7a3067785d6df22c0274 + input_fingerprint: 555e77e29e394d2e7a112b8202964d19bcf8f70b7be8bd6711adb4eab0976e2d template_sources: - gemfiles/modular/documentation.gemfile.example gemfiles/modular/documentation_local.gemfile: recipe: template_source_application_gemfiles_modular_documentation_local_gemfile action: write dest_sha256: 2058173855b9a4acc6d5efa20520e49734243eef6cf0b5e9063e0e5866a08e9c - input_fingerprint: 777cb51f7ce94a1da93426da12e60281da21a197b374ba6fe7a3bf5eba3f7756 + input_fingerprint: f4cc010fda81fe2e798bb5fd5f68752b995be48b9fce81ce4d1e7904991c684e template_sources: - gemfiles/modular/documentation_local.gemfile.example gemfiles/modular/erb/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r2_v3_0_gemfile action: write dest_sha256: 3793e7dc9ef23a7ccd893d48cbba092fd27594c63e65cca011cc658218425670 - input_fingerprint: 5348624efb7fc514bd3c92f30040c52c24fedd3d034636ced853ea5ce6547dee + input_fingerprint: 4179b0f0480cdb6d708998ef3525d1fa9edf0a5b1eb81385cfc1e7b5b07ac84e template_sources: - gemfiles/modular/erb/r2/v3.0.gemfile.example gemfiles/modular/erb/r3/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r3_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 261251319b9584eac787f738b2ff3b8a7ebbc975571631ef4bc303ec143392ad + input_fingerprint: 8feaf6ecb8243b783b112a6b143827391348d17f4ece10cb3703c10621babfed template_sources: - gemfiles/modular/erb/r3/v5.0.gemfile.example gemfiles/modular/erb/r4/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r4_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 9db029aa5f0acd71968df0de2f6b77b205ca777d6e04ddfd2f674e4a81bb40c8 + input_fingerprint: e8d126c82cdcdedf862460be2b84a42a95150b0ec573892d56cb61100658041f template_sources: - gemfiles/modular/erb/r4/v5.0.gemfile.example gemfiles/modular/erb/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_erb_vHEAD_gemfile action: write dest_sha256: ad6f104a49e80e0cf625440e3dc816343fe7e2f037fc4971df75e7bb4305c683 - input_fingerprint: e1fed0d49353cbb6f66e55483c9022d2c58ec66b8308bfa5f4466dac413f2ba2 + input_fingerprint: 53589bc56467d954e992a2eca17c90b02d0f3e7dbf7eeabff4dee5ed87f965a8 template_sources: - gemfiles/modular/erb/vHEAD.gemfile.example gemfiles/modular/json/truffleruby_22_3.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_22_3_gemfile action: write dest_sha256: 249c12eacbe90f9d0d2e81e7a62c4c7e9102e504ededcda4ecf660cb3bb68be4 - input_fingerprint: ce77e93387ac568cf0b2c05ae855a4ffe775805a5c571d522f8127bf1686812d + input_fingerprint: aed93a2e31520d7c51729ed7b91d5788596a27a87e24e87842b0c402b7b179ec template_sources: - gemfiles/modular/json/truffleruby_22_3.gemfile.example gemfiles/modular/json/truffleruby_23_0.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_0_gemfile action: write dest_sha256: 66aa010567f7afa1af8244a74c3c88ecaaf84dc87b6a25180691bb480d02ed28 - input_fingerprint: 6cee721e9bee63eca4f1b1cf9f1719b20c26ed52c9a9621914649254222ccc31 + input_fingerprint: 407fd78472c492c4628d76ab5f2c4edfc78b764d99834a66027997af4703cc85 template_sources: - gemfiles/modular/json/truffleruby_23_0.gemfile.example gemfiles/modular/json/truffleruby_23_1.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_1_gemfile action: write dest_sha256: '080fcbdaf2bec73cad40832a3d51eebb380af789917b96f493d1460b0dd6361d' - input_fingerprint: 2adb7bce2668a0b80b1077977ba4a381f2a83352064219439a5d17f8a2c036a3 + input_fingerprint: 44e77d8bff2a60cbb7be228621dd2eb26331bef6a1f93f0597605e481c216f30 template_sources: - gemfiles/modular/json/truffleruby_23_1.gemfile.example gemfiles/modular/mutex_m/r2/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r2_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: ea2e2eb261041d477d0781159f71274cf5420f27e72b0a990c44f2046ee3f59f + input_fingerprint: 1e7de32e0635c12393b8a659680ae2a5e9fbd485f914998efa8c92f9cd6cabf0 template_sources: - gemfiles/modular/mutex_m/r2/v0.3.gemfile.example gemfiles/modular/mutex_m/r3/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r3_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 2e10c608a7988dc719bed4dce94ccd0c05bb161e31529f8a2408140403249bbf + input_fingerprint: c730d4ae0defc0883b64efe2148132c052f757a412403e29ae0456ce4517e6eb template_sources: - gemfiles/modular/mutex_m/r3/v0.3.gemfile.example gemfiles/modular/mutex_m/r4/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r4_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 4af6cab334fbcd169770944ad010a492a53532b8554db4c149cf3d19593b3f3e + input_fingerprint: 99023bd130cc9253d104de4f62b407db8e574b196d888cecc954ace73dddba85 template_sources: - gemfiles/modular/mutex_m/r4/v0.3.gemfile.example gemfiles/modular/mutex_m/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_vHEAD_gemfile action: write dest_sha256: '08018641c97f894788fa91b462da504ab2237213d18d95404136c393274ae3cb' - input_fingerprint: 3b9ef4b88bb0ddccbd8546b601e5e959885b0c073f8304a1bc1567dd5ce4c87d + input_fingerprint: 6f10cb0d3bf9e44484848f5010b0eb20e386c7f0636cae7a305947e901084829 template_sources: - gemfiles/modular/mutex_m/vHEAD.gemfile.example gemfiles/modular/optional.gemfile: recipe: template_source_application_gemfiles_modular_optional_gemfile action: write dest_sha256: f770e6e9a9dd2bd0f1f132e882d88038b2e21127dce3afe270908c7338c28bfd - input_fingerprint: 4a6088726534b9f4796904ab3fc165ae2d498ea22d269ad7dfe387772da649a8 + input_fingerprint: 78963472a2dab580b3ca1ca66dacc450032ec29c5dfebe5829a630f17cb3a662 template_sources: - gemfiles/modular/optional.gemfile.example gemfiles/modular/rspec.gemfile: recipe: template_source_application_gemfiles_modular_rspec_gemfile action: write dest_sha256: d043f5c9344f6435edb4607c5adaf42c78e7fb6b8b6726007de2bbedefb376c3 - input_fingerprint: c69e0434f9efa15939a0e8b47535b9964adbcede946b0f6aa74900a30cf8506b + input_fingerprint: 4ba02660601c0977104dabd1f7a7bbd3092ae2f951cd2354a687fb2f29486d45 template_sources: - gemfiles/modular/rspec.gemfile.example gemfiles/modular/runtime_heads.gemfile: recipe: template_source_application_gemfiles_modular_runtime_heads_gemfile action: write dest_sha256: 6ac7158c4a3088190f2a9082f01439eb27eca2172ab3464b15c9cb045aa885e1 - input_fingerprint: b91a01d2afae0a7dbf1f05bc334307862507cca39a6edb0f3b40840acb509620 + input_fingerprint: 762f446070a9cb77abfb997ffa4c673e7eeb2709d2d51dd7379a6af13f3f283b template_sources: - gemfiles/modular/runtime_heads.gemfile.example gemfiles/modular/stringio/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r2_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 7098d316ec133a1824c4f9b67f5d60d49b03531b8fe845af94e0eeeb999b692d + input_fingerprint: ac8d91b8f535282c92cb487bc6b0d0acfdf46ab074860b5aebb1e6ad0ee03277 template_sources: - gemfiles/modular/stringio/r2/v3.0.gemfile.example gemfiles/modular/stringio/r3/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r3_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: cb50d12798798529d2910ed0e62af1ecc12568f588ea8e8ef8f904537d2a1162 + input_fingerprint: 839e2784c8780a0dd11fc6139e55c6a8190857913192761f5de0fdc457b4fe3d template_sources: - gemfiles/modular/stringio/r3/v3.0.gemfile.example gemfiles/modular/stringio/r4/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r4_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: ff791f43c24790b8290840d787ea4b4847ec305802ef8e035fdc3ffbfbf328d5 + input_fingerprint: 5e58634d2730af914f5f318db4af4d191ad83554e05355730926e04cfc411b60 template_sources: - gemfiles/modular/stringio/r4/v3.0.gemfile.example gemfiles/modular/stringio/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_stringio_vHEAD_gemfile action: write dest_sha256: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - input_fingerprint: 952085d15352e3daac730e94d902237f17f96620c2de8856a71a1fc589cc6853 + input_fingerprint: 5b4a4dbbf15de13557368f817c0caeba2a45f00dc27333921068fa9bab3418a3 template_sources: - gemfiles/modular/stringio/vHEAD.gemfile.example gemfiles/modular/style.gemfile: recipe: template_source_application_gemfiles_modular_style_gemfile action: write - dest_sha256: 2a3d46dcb8a9394f595f273f5eb0403d0a552837754ab109afc9ba79a7159083 - input_fingerprint: 242c1df9a6fdb071e04e085e9cc564169e4b4ef76c2e3904ae71e6e59a1ecb5e + dest_sha256: 9a24acff0054573c30f5d84d0418cd465ba3794d075bb5a36801410ac40e0787 + input_fingerprint: 66cba6df13feaa855cbeec7963227b0aebd004bff4dec86ba227dfa0c455aa6f template_sources: - gemfiles/modular/style.gemfile.example gemfiles/modular/style_local.gemfile: recipe: template_source_application_gemfiles_modular_style_local_gemfile action: write dest_sha256: 55eb9c149cdb2f29c9f31abe2d55a4f334e00fb859681dd17c42149a3f28ca36 - input_fingerprint: 51b79956d1d668747e4257b91a91602573aefab0bc25d4e9efb398074f8c457d + input_fingerprint: 5e787fc04e5afa1d46cc1f6fe274947d20b709f4f179a2a9b1f10f615467412a template_sources: - gemfiles/modular/style_local.gemfile.example gemfiles/modular/templating.gemfile: recipe: template_source_application_gemfiles_modular_templating_gemfile action: write - dest_sha256: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - input_fingerprint: d5ee0fa315efbfa579116cd689ca68768fb11cdd19928ee4c844a7397f20121d + dest_sha256: 432ba59798d31b899268257c432443a017c5a9bd2c0c7f9f2216617e14150cd3 + input_fingerprint: cee70e0bd80e2ea1685f24a8cd91b55f23a3f8db96c93fffd2e188a7ffb822d2 template_sources: - gemfiles/modular/templating.gemfile.example gemfiles/modular/templating_local.gemfile: recipe: template_source_application_gemfiles_modular_templating_local_gemfile action: write - dest_sha256: c9ed3f044e0abe58e1a0ed80570a9cf23413f88e83391ddbb4a186d60c38dcd7 - input_fingerprint: 3a27e616bc4bef39561eebf753ecaebb7799717ec0c5b7c2970a719a0feccd3c + dest_sha256: cb054e7bb04d0462661ca6d3d56a649e5247e1e3c518a312695e11ceb2077f05 + input_fingerprint: 6bc151e333f61e198294441b0a628d3d09b80d86ad2be1a54e774c7e54af868f template_sources: - gemfiles/modular/templating_local.gemfile.example gemfiles/modular/webrick/r4/v1.9.gemfile: recipe: template_source_application_gemfiles_modular_webrick_r4_v1_9_gemfile action: write dest_sha256: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea - input_fingerprint: 2b909d668f81806138077ea15c45a364343497aa0c4994b7c3b6d53fc26d08ae + input_fingerprint: fe4752de1fe8e14a0222eada94bd708452e3a4f9449ce5c7074012d6d78e3e96 template_sources: - gemfiles/modular/webrick/r4/v1.9.gemfile.example gemfiles/modular/webrick/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_webrick_vHEAD_gemfile action: write dest_sha256: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b - input_fingerprint: 4ed8dcadb78d25b19c0e2a382c0b9997ed67dc0f92a1410c05959755a7d35ead + input_fingerprint: fc79a3b5580231beb22f3c6f291052edabbadf7d9a5c2f1a553838a947b4e86a template_sources: - gemfiles/modular/webrick/vHEAD.gemfile.example gemfiles/modular/x_std_libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_gemfile action: write dest_sha256: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a - input_fingerprint: 8667e6fa8c2908560f7a3adac2ea1b511610d963cb80b99645de57c7ab9fd4bb + input_fingerprint: cb0bb2b1981bad09e562512ba321dc3ddccfbfd154a9d998ab291a23332cbfa6 template_sources: - gemfiles/modular/x_std_libs.gemfile.example gemfiles/modular/x_std_libs/r2/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r2_libs_gemfile action: write dest_sha256: e80ec8ad06cb1b31ac982bc25cf7696987fca131aa1001eaefd0bf5cd379c273 - input_fingerprint: 352552a3c663ea806d091ac28791a1cb32f53180ced4f6cca6aa42f278825b6c + input_fingerprint: 1e6f8b859217864c84171c0413003d5b2c403436af63cbe6fab066af11b9f264 template_sources: - gemfiles/modular/x_std_libs/r2/libs.gemfile.example gemfiles/modular/x_std_libs/r3.1/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_1_libs_gemfile action: write dest_sha256: 9f8565c40b09bea1bc4c2e2ad87fe11400c3c51a2b235655bfcd8e491ed88ca8 - input_fingerprint: 68e669b2a63b0dc6d9c9addc2443bd2c0171b503dacfde4e61b35f9b360ec26c + input_fingerprint: 8e180831ddd945356649b357b3f76f4bcecd9fa8df0b10c9e7ea1cfb3c320099 template_sources: - gemfiles/modular/x_std_libs/r3.1/libs.gemfile.example gemfiles/modular/x_std_libs/r3/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_libs_gemfile action: write dest_sha256: 546f8849f4267bb19aa10ff0de40be30957197f229e6887847181ea9127b2650 - input_fingerprint: c4aed29bcc41eff201ca06c41b2269f8026e62bb97bea65400877b002644546b + input_fingerprint: 1177c5ed60ffdf09cf672a54eb10126ab050a885e415703df709a7e08a98c5db template_sources: - gemfiles/modular/x_std_libs/r3/libs.gemfile.example gemfiles/modular/x_std_libs/r4/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r4_libs_gemfile action: write dest_sha256: 8c2582eaa218d216b98c86c933465295c8b4e43f3251ea388b9eaf6e471f8da6 - input_fingerprint: 5a053d2ad93c8eef8426a271aac74f51f6f2d93fc4b02b111f80dae2d463506e + input_fingerprint: dcf0030f4b802a6f888d1ef4a414915468a4588d0ad8f2a3cb8fd678207f0b59 template_sources: - gemfiles/modular/x_std_libs/r4/libs.gemfile.example gemfiles/modular/x_std_libs/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_vHEAD_gemfile action: write dest_sha256: d3133ec4c0638363a7fb025d19be7e95a615fd61c35ddb8d17f2280ee74a7486 - input_fingerprint: 2c1280da5182f1d5c6968f1402b736d16e86661a984ca5ec66ef48e3339e86a8 + input_fingerprint: 6d77d26cab9633b6d130d69308fba3384b80df6878742c9a4aadd7507627df71 template_sources: - gemfiles/modular/x_std_libs/vHEAD.gemfile.example lib/parslet/toml/merge/version.rb: recipe: template_source_application_lib_parslet_toml_merge_version_rb action: write - dest_sha256: 30c1d07654d2143c7f6f67ed5561344d4ea43a3f1ad4153913f93ad8bbacfb8a - input_fingerprint: 4ac8097fbc63f1fc1addf7d83ba740e9e4663d0cd86e880ee66b13da2fc46fc6 + dest_sha256: a66d076017fdce72b1bce13f53887c3ea6485851d8317cec8ff99fd5f8347528 + input_fingerprint: 4f46d3e17deaaf921b330792c144b1509004437039b541160066187b67774864 template_sources: - lib/gem/version.rb.example mise.toml: recipe: template_source_application_mise_toml action: write dest_sha256: 7d267154ca4f081b0ac7da804c0180c2b091aec5f1c877417c1c320f4f369c88 - input_fingerprint: 27d4ecd270328f038e57cf2b15e88f4ca2d913276953757987e7d23126a971ff + input_fingerprint: cb37248357fa5b3f7f3e408114e203916e32bfb464fac2b14d2b480354b82089 template_sources: - mise.toml.no-osc.example parslet-toml-merge.gemspec: recipe: template_source_application_parslet_toml_merge_gemspec action: write - dest_sha256: a2257ab5e90f5f82590407096bcc375ba50c58c902d21785cc86c10b595a9fad - input_fingerprint: 3d7e809eb49212bf56cac37d7be5837f99058665d726fda014a6cac00d5b0078 + dest_sha256: 85a9b45fa32e8e39d26e0160a3d9d1834d5a1538e43d4041eba9f4659cf5ec2d + input_fingerprint: 16e7581344adbcc51b56915f88608293a21475a2d14fca8a040a9d185eccfed2 template_sources: - gem.gemspec.example sig/parslet/toml/merge.rbs: recipe: template_source_application_sig_parslet_toml_merge_rbs action: write dest_sha256: bd4cf236fad3bdf8c8a9c64fa566f496507d5f9ff037235fa85e49e0987ee798 - input_fingerprint: b72f882a556425629ba85c78ea2968035f630dbea0c70b0c6df776f4e6087909 + input_fingerprint: 4079f65aeec939a1fed02ba728738d73c1ed8103c878968f99bdd3cec084a624 template_sources: - sig/gem.rbs.example spec/spec_helper.rb: recipe: template_source_application_spec_spec_helper_rb action: write dest_sha256: 22b1ba5033625193297c5b3d0a0afd47b46343aec9c25bd1477af02f356a9d38 - input_fingerprint: baedcfd75a634362fb6c01c0f44397020a3d6e48fea879e977f186da6535dcb8 + input_fingerprint: d49af62c42ea0c8b6ea0bcf6ee5a1e627a09d72c684c002af0a94982177690f8 template_sources: - spec/spec_helper.rb.example diff --git a/gems/parslet-toml-merge/Gemfile b/gems/parslet-toml-merge/Gemfile index 45a83168a..5ea3f9a42 100644 --- a/gems/parslet-toml-merge/Gemfile +++ b/gems/parslet-toml-merge/Gemfile @@ -19,7 +19,7 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } # Include dependencies from parslet-toml-merge.gemspec gemspec -gem 'kettle-family', '~> 1.2', '>= 1.2.97' +gem 'kettle-family', '~> 1.2', '>= 1.2.100' # Local workspace dependency wiring for *_local.gemfile overrides gem 'nomono', '~> 1.1', '>= 1.1.5', require: false # ruby >= 3.2.0 diff --git a/gems/parslet-toml-merge/Gemfile.lock b/gems/parslet-toml-merge/Gemfile.lock index 6841a64b5..270e83f0d 100644 --- a/gems/parslet-toml-merge/Gemfile.lock +++ b/gems/parslet-toml-merge/Gemfile.lock @@ -10,131 +10,131 @@ GIT PATH remote: . specs: - parslet-toml-merge (7.1.8) + parslet-toml-merge (7.1.9) toml (~> 0.3) - toml-merge (= 7.1.8) + toml-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) + ast-crispr-markdown-markly (7.1.9) + ast-crispr (= 7.1.9) + markdown-merge (= 7.1.9) + markly-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism specs: - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) + ast-crispr-ruby-prism (7.1.9) + ast-crispr (= 7.1.9) + prism-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) + ast-crispr (7.1.9) + ast-merge (= 7.1.9) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ast-merge-git (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: - ast-merge (7.1.8) + ast-merge (7.1.9) benchmark token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) + ast-template (7.1.9) + ast-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + bash-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + binary-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) + citrus-toml-merge (7.1.9) + ast-merge (= 7.1.9) + toml-merge (= 7.1.9) toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge specs: - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) commonmarker (~> 2.2) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) + dotenv-merge (7.1.9) + ast-merge (= 7.1.9) + plain-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + go-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + html-merge (7.1.9) + ast-crispr (= 7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + json-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: - kettle-jem (7.1.25) + kettle-jem (7.1.26) addressable (>= 2.8, < 3) ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) @@ -168,114 +168,114 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge specs: - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown (~> 2.5) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + markdown-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) + markly-merge (7.1.9) + markdown-merge (= 7.1.9) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + plain-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) + prism-merge (7.1.9) + ast-merge (= 7.1.9) prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + psych-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) + yaml-merge (= 7.1.9) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) + rbs-merge (7.1.9) + ast-merge (= 7.1.9) rbs (>= 3.10) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + rust-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) + smorg-rb (7.1.9) + ast-merge (= 7.1.9) + ast-merge-git (= 7.1.9) + bash-merge (= 7.1.9) diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) + dotenv-merge (= 7.1.9) + go-merge (= 7.1.9) + html-merge (= 7.1.9) + json-merge (= 7.1.9) kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) + markdown-merge (= 7.1.9) + plain-merge (= 7.1.9) + prism-merge (= 7.1.9) + psych-merge (= 7.1.9) + rbs-merge (= 7.1.9) + rust-merge (= 7.1.9) + toml-merge (= 7.1.9) + typescript-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + toml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: - tree_haver (7.1.8) + tree_haver (7.1.9) citrus (~> 3.0) parslet (~> 2.0) tree_sitter_language_pack (>= 1.16.2, < 2.0) @@ -284,25 +284,25 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + typescript-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + yaml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) + zip-merge (7.1.9) + binary-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) GEM @@ -336,6 +336,8 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) + commonmarker (2.10.0) + rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -465,11 +467,15 @@ GEM lint_roller (1.1.0) logger (1.7.0) markly (0.19.0) + mini_portile2 (2.8.9) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) reline (~> 0.6) mutex_m (0.3.0) + nokogiri (1.19.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-musl) @@ -503,6 +509,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) + rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -696,13 +705,16 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.16.2-aarch64-linux) + tree_sitter_language_pack (1.17.0) + rb_sys (>= 0.9.130, < 0.10) + sorbet-runtime (~> 0.5) + tree_sitter_language_pack (1.17.0-aarch64-linux) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-arm64-darwin) + tree_sitter_language_pack (1.17.0-arm64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-linux) + tree_sitter_language_pack (1.17.0-x86_64-linux) sorbet-runtime (~> 0.5) tsort (0.2.0) tty-cursor (0.7.1) @@ -772,7 +784,7 @@ DEPENDENCIES binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) - citrus-toml-merge (>= 0, = 7.1.8)! + citrus-toml-merge (>= 0, = 7.1.9)! commonmarker-merge! debug (>= 1.1) dotenv-merge! @@ -784,9 +796,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.31) + kettle-dev (~> 3.0, >= 3.0.34) kettle-drift (~> 1.0, >= 1.0.13) - kettle-family (~> 1.2, >= 1.2.97) + kettle-family (~> 1.2, >= 1.2.100) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) @@ -807,12 +819,12 @@ DEPENDENCIES reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) - rubocop-lts (~> 24.2, >= 24.2.1) - rubocop-lts-rspec (~> 1.0, >= 1.0.5) + rubocop-lts (~> 24.2, >= 24.2.3) + rubocop-lts-rspec (~> 1.0, >= 1.0.6) rubocop-minitest (~> 0.40, >= 0.40.0) rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! - rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) ruby-merge! ruby-progressbar (~> 1.13) rust-merge! @@ -843,33 +855,34 @@ CHECKSUMS appraisal2 (3.2.3) sha256=3a6cfaf8a444e02707b9a34154af1c4902fbe99d9d2168d7e81dd83ec77e6db7 appraisal2-rubocop (1.0.2) sha256=1dae97c1be087cf9c098a3a72fd41f873435e9b8b39687e633b36c9ccb22bff4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.8) - ast-crispr-markdown-markly (7.1.8) - ast-crispr-ruby-prism (7.1.8) - ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) + ast-crispr (7.1.9) + ast-crispr-markdown-markly (7.1.9) + ast-crispr-ruby-prism (7.1.9) + ast-merge (7.1.9) + ast-merge-git (7.1.9) + ast-template (7.1.9) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.8) + bash-merge (7.1.9) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) - bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae + binary-merge (7.1.9) + bundler (4.1.0.beta1) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.8) + citrus-toml-merge (7.1.9) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 + commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e commonmarker (2.10.0-x86_64-darwin) sha256=01e0830ed0319825ecdc16411c90acd3f661d1568dfc178731b3f64d0ce2363d commonmarker (2.10.0-x86_64-linux) sha256=945c510c0bfca9022245928e2248468fe3ddad58c939be0c37b20082cc392880 commonmarker (2.10.0-x86_64-linux-musl) sha256=288cd4fb9f17eed2ffa73551ef241dcf594e0f484b2aee2a0999540333c0618e - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) completely (0.8.0) sha256=e493cd5d84805f47917a41f277ecbfe5f35363bed670be5a957d3acaed8c6c5e concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 @@ -878,7 +891,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docopt_ng (0.7.1) sha256=a024148ee4fa3ab1a8a04411aa4370f39cf2b446e63562097d418b7974a15667 - dotenv-merge (7.1.8) + dotenv-merge (7.1.9) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -891,35 +904,37 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) + go-merge (7.1.9) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) + html-merge (7.1.9) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a - json-merge (7.1.8) - kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + json-merge (7.1.9) + kettle-changelog (1.0.7) + kettle-dev (3.0.34) + kettle-drift (1.0.13) kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 - kettle-jem (7.1.25) + kettle-jem (7.1.26) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 - kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd + kettle-soup-cover (3.0.10) kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 - markdown-merge (7.1.8) + markdown-merge (7.1.9) markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca - markly-merge (7.1.8) + markly-merge (7.1.9) + mini_portile2 (2.8.9) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 + nokogiri (1.19.4) nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af nokogiri (1.19.4-arm64-darwin) sha256=a46db9853286e6597b36ebc6953817d15acf3a299583eb3f89fdc6f91dd63527 @@ -933,20 +948,22 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) - plain-merge (7.1.8) + parslet-toml-merge (7.1.9) + plain-merge (7.1.9) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.8) + prism-merge (7.1.9) psych (5.5.0) sha256=4b245bbbd0f3238df8ccee766ebc1a6b062b10e4ee1d3284eb588739ba156a0a - psych-merge (7.1.8) + psych-merge (7.1.9) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 - rbs-merge (7.1.8) + rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -982,11 +999,11 @@ CHECKSUMS rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.8) + ruby-merge (7.1.9) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) + rust-merge (7.1.9) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +1011,7 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) + smorg-rb (7.1.9) sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1011,24 +1028,25 @@ CHECKSUMS timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.8) + toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb - tree_haver (7.1.8) - tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 - tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 - tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 - tree_sitter_language_pack (1.16.2-x86_64-linux) sha256=d8151e6e44e35ace9de3611c76b730896beab17f427db06d8f76666332a5dc60 + tree_haver (7.1.9) + tree_sitter_language_pack (1.17.0) + tree_sitter_language_pack (1.17.0-aarch64-linux) + tree_sitter_language_pack (1.17.0-arm64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-linux) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f tty-cursor (0.7.1) sha256=79534185e6a777888d88628b14b6a1fdf5154a603f285f80b1753e1908e0bf48 tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) + typescript-merge (7.1.9) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 yaml-converter (0.2.5) sha256=a5214fe1a6c2df88bd34a35bcded1b1dcd30135548130df2e03b54ca8c0f2423 - yaml-merge (7.1.8) + yaml-merge (7.1.9) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.8) sha256=73d935d43e3479d65ce8aff25c7d3100e8bb83528a2adaa0ed824e5046ac99e7 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -1037,8 +1055,8 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) + zip-merge (7.1.9) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH - 4.0.20 + 4.1.0.beta1 diff --git a/gems/parslet-toml-merge/Rakefile b/gems/parslet-toml-merge/Rakefile index d82a92dcf..fc62da3a0 100644 --- a/gems/parslet-toml-merge/Rakefile +++ b/gems/parslet-toml-merge/Rakefile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -# parslet-toml-merge Rakefile v7.1.18 - 2026-09-07 +# parslet-toml-merge Rakefile v7.1.26 - 2026-09-09 # Ruby 2.3 (Safe Navigation) or higher required # # See LICENSE.md for license information. diff --git a/gems/parslet-toml-merge/bin/rubocop-gradual b/gems/parslet-toml-merge/bin/rubocop-gradual new file mode 100755 index 000000000..7c7ff0635 --- /dev/null +++ b/gems/parslet-toml-merge/bin/rubocop-gradual @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'rubocop-gradual' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'rubygems' +require 'bundler/setup' + +load Gem.bin_path('rubocop-gradual', 'rubocop-gradual') diff --git a/gems/parslet-toml-merge/gemfiles/modular/coverage_local.gemfile b/gems/parslet-toml-merge/gemfiles/modular/coverage_local.gemfile index 37917caac..d6c890e46 100644 --- a/gems/parslet-toml-merge/gemfiles/modular/coverage_local.gemfile +++ b/gems/parslet-toml-merge/gemfiles/modular/coverage_local.gemfile @@ -29,11 +29,31 @@ Kernel.send(:gem, 'nomono', *nomono_activation_requirements) require 'nomono/bundler' local_gems = %w[kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -local_gems_to_eval = local_gems - %w[] - declared_gems # export KETTLE_DEV_DEV=/path/to/my platform :mri do + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + local_gems_to_eval = local_gems - %w[] - declared_gems + eval_nomono_gems( gems: local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/parslet-toml-merge/gemfiles/modular/style.gemfile b/gems/parslet-toml-merge/gemfiles/modular/style.gemfile index 59c5dc1a3..41ec99454 100644 --- a/gems/parslet-toml-merge/gemfiles/modular/style.gemfile +++ b/gems/parslet-toml-merge/gemfiles/modular/style.gemfile @@ -24,9 +24,9 @@ platform :mri do if ENV.fetch('RUBOCOP_LTS_DEV', 'false').casecmp('false').zero? declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) - gem 'rubocop-lts', '~> 24.2', '>= 24.2.1' unless declared_gems.include?('rubocop-lts') - gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.5' unless declared_gems.include?('rubocop-lts-rspec') - gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.6' unless declared_gems.include?('rubocop-ruby3_2') + gem 'rubocop-lts', '~> 24.2', '>= 24.2.3' unless declared_gems.include?('rubocop-lts') + gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.6' unless declared_gems.include?('rubocop-lts-rspec') + gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.8' unless declared_gems.include?('rubocop-ruby3_2') else eval_gemfile('style_local.gemfile') end diff --git a/gems/parslet-toml-merge/gemfiles/modular/templating.gemfile b/gems/parslet-toml-merge/gemfiles/modular/templating.gemfile index 6af159bd7..ce51a08ed 100644 --- a/gems/parslet-toml-merge/gemfiles/modular/templating.gemfile +++ b/gems/parslet-toml-merge/gemfiles/modular/templating.gemfile @@ -18,7 +18,7 @@ end if structuredmerge_remote # Merge recipes for released installs. - gem 'kettle-jem', '>= 7.0' + gem 'kettle-jem', '~> 7.1', '>= 7.1.26' end if kettle_remote diff --git a/gems/parslet-toml-merge/gemfiles/modular/templating_local.gemfile b/gems/parslet-toml-merge/gemfiles/modular/templating_local.gemfile index 5e1649f29..7c069b52b 100644 --- a/gems/parslet-toml-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/parslet-toml-merge/gemfiles/modular/templating_local.gemfile @@ -65,9 +65,7 @@ structuredmerge_local_gems = %w[ kettle_dev_local_gems = %w[ kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift ] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[] -kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - (declared_gems - %w[kettle-dev]) if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( @@ -81,6 +79,28 @@ if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 end if ENV.fetch('KETTLE_DEV_DEV', 'false').casecmp('false') != 0 + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - declared_gems + eval_nomono_gems( gems: kettle_dev_local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/parslet-toml-merge/parslet-toml-merge.gemspec b/gems/parslet-toml-merge/parslet-toml-merge.gemspec index 7fbf9272b..a09599d91 100644 --- a/gems/parslet-toml-merge/parslet-toml-merge.gemspec +++ b/gems/parslet-toml-merge/parslet-toml-merge.gemspec @@ -120,7 +120,7 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.31') # ruby >= 4.0.0 + spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.34') # ruby >= 4.0.0 # Security spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 From 22a57963bf191f8bfeb9425397e38431766d86d8 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 23:54:28 -0400 Subject: [PATCH 100/137] =?UTF-8?q?=F0=9F=8E=A8=20Template=20commonmarker-?= =?UTF-8?q?merge=20by=20kettle-family?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/commonmarker-merge/.kettle-drift.lock | 76 ++++- gems/commonmarker-merge/.rubocop_gradual.lock | 7 +- .../.structuredmerge/kettle-jem.lock | 145 ++++---- gems/commonmarker-merge/Gemfile | 2 +- gems/commonmarker-merge/Gemfile.lock | 318 +++++++++--------- gems/commonmarker-merge/Rakefile | 2 +- gems/commonmarker-merge/bin/rubocop-gradual | 16 + .../commonmarker-merge.gemspec | 2 +- .../gemfiles/modular/coverage_local.gemfile | 24 +- .../gemfiles/modular/style.gemfile | 6 +- .../gemfiles/modular/templating.gemfile | 2 +- .../gemfiles/modular/templating_local.gemfile | 24 +- 12 files changed, 387 insertions(+), 237 deletions(-) create mode 100755 gems/commonmarker-merge/bin/rubocop-gradual diff --git a/gems/commonmarker-merge/.kettle-drift.lock b/gems/commonmarker-merge/.kettle-drift.lock index 98b009e1e..1b23f4793 100644 --- a/gems/commonmarker-merge/.kettle-drift.lock +++ b/gems/commonmarker-merge/.kettle-drift.lock @@ -1,10 +1,82 @@ { + "debug_env: 'KETTLE_DEV_DEBUG',\nroot: %w[src my kettle-dev]": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 46, + 63 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 93, + 110 + ] + } + ], + "path_env: 'KETTLE_DEV_DEV',\nvendored_gems_env: 'VENDORED_GEMS',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 43, + 60 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 90, + 107 + ] + } + ], + "prefix: 'KETTLE_DEV',\npath_env: 'KETTLE_DEV_DEV',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 42, + 59 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 89, + 106 + ] + } + ], + "vendor_gem_dir_env: 'VENDOR_GEM_DIR',\ndebug_env: 'KETTLE_DEV_DEBUG',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 45, + 62 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 92, + 109 + ] + } + ], "vendored_gems_env: 'VENDORED_GEMS',\nvendor_gem_dir_env: 'VENDOR_GEM_DIR',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 44, + 61 + ] + }, { "file": "gemfiles/modular/templating_local.gemfile", "lines": [ - 77, - 88 + 75, + 91, + 108 ] } ] diff --git a/gems/commonmarker-merge/.rubocop_gradual.lock b/gems/commonmarker-merge/.rubocop_gradual.lock index 2d3e761ad..788a943d0 100644 --- a/gems/commonmarker-merge/.rubocop_gradual.lock +++ b/gems/commonmarker-merge/.rubocop_gradual.lock @@ -2,13 +2,13 @@ ".simplecov:24508197": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] ], - "Rakefile:1591037661": [ + "Rakefile:904075390": [ [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], [81, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], [165, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], [168, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] ], - "commonmarker-merge.gemspec:3751224144": [ + "commonmarker-merge.gemspec:3734746005": [ [137, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4147388508], [148, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], [149, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] @@ -27,6 +27,9 @@ [1, 1, 0, "Naming/FileName: The name of this source file (`vHEAD.gemfile`) should use snake_case.", 5381], [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], + "gemfiles/modular/coverage_local.gemfile:2813372128": [ + [34, 1, 1586, "Metrics/BlockLength: Block has too many lines. [37/25]", 820328175] + ], "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], diff --git a/gems/commonmarker-merge/.structuredmerge/kettle-jem.lock b/gems/commonmarker-merge/.structuredmerge/kettle-jem.lock index dbd951094..3eba49ccd 100644 --- a/gems/commonmarker-merge/.structuredmerge/kettle-jem.lock +++ b/gems/commonmarker-merge/.structuredmerge/kettle-jem.lock @@ -1,11 +1,12 @@ --- version: 1 template_state: - version: 7.1.18 - applied_at: '2026-09-07' + version: 7.1.26 + applied_at: '2026-09-10' changelog_replay: last_entry_key: kettle-jem-template-20260802-001 last_entry_date: '2026-08-02' + maintenance_changelog: {} checksums: ".aiignore.example": 48a5dfdd93afd1a15fdce39cc28ca9920263f00018b0968ab031fa744521e5ce ".config/mise/env.sh": aeea5a2ab489ba6e5467ae8de6e386ec8c8fe4ff31a044e69d0cd6a092dd6654 @@ -75,7 +76,7 @@ template_state: ".rubocop_rspec.yml.example": 288ad75e7eb14d87d80fafe6f7272217be5c57547536ee56c780a7d10ac7ec74 ".simplecov.example": 222f2e6ce8cf089c70a21f0f5e5423d4bd59a96fdb2ce7754b0fb3d6f430c229 ".structuredmerge/git-drivers.toml.example": 9d241a44c9edffcdbd3da018fa188a238089c3d1635040924df594a6929a4f97 - ".structuredmerge/kettle-jem.yml.example": 26949dc4ee0722415e72452cbc186bee6ef7b154eae33166d36f3fdb1ca6e46d + ".structuredmerge/kettle-jem.yml.example": ff65a738da1af7d60714026a81d3323a46c864e96ae3570b806afdf6e7149ff9 ".yard-lint.yml.example": 90def46867c9436b4e177c47d91fc8165f4602e335715aecc39f5587ae20b55b ".yardignore.example": 821f453c609df7d46145d675424b39dfbe6dfdca8edac5f367b85fff48502455 ".yardopts.example": 6fd6f2701713096a8a9ea095c213bbc68eeef37797c4754d97837e3229a3a5f6 @@ -88,7 +89,7 @@ template_state: CHANGELOG.transfer.md: 21331d8a9e58b4ff6e088b88eb408bcccb0f2f64e78f8f4d42ac3f11a24baad8 CITATION.cff.example: e404ea0a7919d78a83d53d80e211d17b9663576aa606583b709795dc023fd75c CODE_OF_CONDUCT.md.example: f1ad532f1860f73ef774c6b27a26d41f4bc1cb8813034f5957487766ebb0986b - CONTRIBUTING.md.example: 22570cfb3dde72be79b4b522b6d5ab13f95d778e40444483a096871fe0891b19 + CONTRIBUTING.md.example: 8d23cce2d061e0c20d619c3f66591df5f32821cd84c32d171df0b8ebe1217a55 FUNDING.md.example: 392d047904b1557b29f4b43d37ec403b7480edd5b6ab51180be979b57a91e6ba FUNDING.md.no-osc.example: 3ef0258dd3e3b7f7e17e8bc2d20dcbcb3e74aa5a5a6f51297075696645e34c77 Gemfile.example: 99500023987e81775a9b5ef14e92cb3992f2ac408e5f42454f2728eee9b49fb2 @@ -99,19 +100,19 @@ template_state: PolyForm-Small-Business-1.0.0.md.example: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 README.md.example: 21f491e3d73bfc1b74056a6dcba61f72c93dee3cfe5272ac164a20978454de21 REEK: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - RUBOCOP.md.example: c09e5533ccc59b70a2efa05c99f66e521137c1053d3c12eb43509cebd5b68b0e + RUBOCOP.md.example: d99871a0e4c1d323c92e7febf328f062bb4722069b2abfd0a83bf7daa8dcbf8c Rakefile.example: 569803e726b07ea26267fec6891367a3096a0dff3c266269a7081d36afe496af SECURITY.md.example: ee9411aa85f36d88363fdaea7a1baea4362b6ec112cf2688e711b05de1d3144c bin/setup.example: 0ac35089c95a91d8973fe7a318bf9fd98b9f8e00db92c5d9ca6cd858abb8d41b certs/pboling.pem.example: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - gem.gemspec.example: 83e834e8958a88e4817a57199f48f5ebb245548ce251c5c47372208693f03b17 + gem.gemspec.example: 12dcadc0b297ccd4e18b9d1e538b98ac8330ef9fb2a059ed6754ad59272b77fa gemfiles/modular/benchmark/r4/v0.5.gemfile.example: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 gemfiles/modular/benchmark/vHEAD.gemfile.example: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 gemfiles/modular/cgi/r4/v0.5.gemfile.example: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 gemfiles/modular/cgi/vHEAD.gemfile.example: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 gemfiles/modular/changelog.gemfile.example: 892598e0e7792eb205247ae28128cef6dfc647d2fb33968969152230d6f69288 gemfiles/modular/coverage.gemfile.example: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - gemfiles/modular/coverage_local.gemfile.example: 928d5f260d7b119c038baa56da9fb78dd524dee613aea33ab72894bbce5c506e + gemfiles/modular/coverage_local.gemfile.example: 92ea0d7a9d693553dc614afa2c43990f5c3778c2b00ef6c528e122c31bd506a1 gemfiles/modular/debug.gemfile.example: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 gemfiles/modular/documentation.gemfile.example: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c gemfiles/modular/documentation_local.gemfile.example: 84a20f5d4b0feb94c2cf2f7a8dce8f682f1483498e41484c2b447a5661fd1870 @@ -145,10 +146,10 @@ template_state: gemfiles/modular/stringio/r3/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/r4/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/vHEAD.gemfile.example: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - gemfiles/modular/style.gemfile.example: 3ad0585b4f2db8918580ca41ea8723f7a166d7a83cfd7f9613511094997106fd + gemfiles/modular/style.gemfile.example: 02fe3e8fd00e49b90c3ab30e19b51014ee50490f3eadcfd1d4a39f4c2c997dda gemfiles/modular/style_local.gemfile.example: c86beb711e766126a5be68be4be18255831625ac3650d5069383c4a83a9511f3 - gemfiles/modular/templating.gemfile.example: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - gemfiles/modular/templating_local.gemfile.example: 930057d3b909a72e39a39125c4e883a7ff71f5691e64426c0541f8c8fc75b83f + gemfiles/modular/templating.gemfile.example: 2b33c094677b53ad9dd2eafeb3a3be452f612380c61001a2e75b3c078b8ff72a + gemfiles/modular/templating_local.gemfile.example: ac7259516e69ffafb8b9342a897ddf6042adc46335743f474c342509cefd8f2e gemfiles/modular/webrick/r4/v1.9.gemfile.example: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea gemfiles/modular/webrick/vHEAD.gemfile.example: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b gemfiles/modular/x_std_libs.gemfile.example: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a @@ -175,7 +176,7 @@ template_state: shim/Gemfile.example: 0fb0d9d06fcfb1fd6ca6f0eeb5867253ca1ed221e03d28027719225f868b0637 shim/README.md.example: 3a2f7211b7f92a1dfae5e523b8e34b051a3d8af942144b05286eca0b3c8f6fbe shim/Rakefile.example: 572c94da7052083b39b62a6600785419e314a109efd7a3d8c3a96eb77ad34fd1 - shim/gem.gemspec.example: efae033238e4fd1355cfc134f5c9123f175d1ad1dc4a1a2e663899788c9e0870 + shim/gem.gemspec.example: 14a7015b3328005d1c3b5fda6886bd6da383707745f6eaaa781d6f9689600131 shim/lib/compat_require.rb.example: 94ee85e353a3ca08c8a35c9063d4ff789214ea594c7f803f6cf09d7142f48379 shim/lib/entrypoint.rb.example: dd57613520daca01d6f6bcaa9b83b00ff74505240dc04b84ceb686df3c0539d7 shim/lib/version.rb.example: 15e219ac3a928b5580035f891e415551213175020f1131f6e7ca0ccd55a1b2d6 @@ -189,370 +190,370 @@ files: recipe: template_source_application_simplecov action: write dest_sha256: f21e52e71447bb3857779cf92410fca8230ceffce77483d9f689cac3ee3a356e - input_fingerprint: ba626427d27ce591dd0d41206224cc534e47eb377358ca609c1180b58621f75c + input_fingerprint: c4d368d633cb262c4c13bbb4835f831dca73dff57f0d22c627f809f895df5300 template_sources: - ".simplecov.example" AGPL-3.0-only.md: recipe: template_source_application_AGPL_3_0_only_md action: write dest_sha256: d8a6cc31abc16b6748c7a21f21611f5a1ec33f67d22ca23d7da1c19b95496bee - input_fingerprint: 7a7a2890165f78c926abf6ffff0889104d2f5c47936328f238406ee69d662b6b + input_fingerprint: 999ba8afffd926972eeb3fe17a6eb8a1febe6176d1ef218c047b66b5ea7bc0a3 template_sources: - AGPL-3.0-only.md.example Gemfile: recipe: template_source_application_Gemfile action: write - dest_sha256: 64998cb8c0624a80c8ce1dbe8fd6ea96ec543f74e52f745660d591d77c32ec4f - input_fingerprint: 2504ad22d959707890eb2141afb4d0468d6625816d64de617996ea6cabcba182 + dest_sha256: 259b8707897f94451c7c89a20f32c6b9b6f0c398518816622f78fd44b5058bbb + input_fingerprint: 9578eef0d4d9c70d3f1833cb23049e3c485a0e576673164771e43f365f7ff808 template_sources: - Gemfile.example LICENSE.md: recipe: template_source_application_LICENSE_md action: write dest_sha256: f6188bfd474a636d2a526420ebb411250faa447d94c9b9ccee097128ce4101b5 - input_fingerprint: f6a29ace9bc89f7bb0b5672a04b31fafc896fa9b73938db6a2c3a2772b7093d4 + input_fingerprint: 84105132e52fbd2cb6348e0516ba1cd1810b97d21cc6007e8fa8bbf35c9ed8fb template_sources: - LICENSE.md.example PolyForm-Small-Business-1.0.0.md: recipe: template_source_application_PolyForm_Small_Business_1_0_0_md action: write dest_sha256: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 - input_fingerprint: 0b5ed97ca4919a04c8f6871c121dd5bf8607f1d1bfa56947f0095feb88e9fdb2 + input_fingerprint: 245d1a4df797931fdb13684f6ba3b1c3924309bacc4b588a58d0b6df46c5fc93 template_sources: - PolyForm-Small-Business-1.0.0.md.example README.md: recipe: template_source_application_README_md action: write dest_sha256: a918942a74d0a34e8398fbfd9b059b07e600a57f8b8e6a9e25bee16a344c315e - input_fingerprint: b5b33c8c14e286c5e562c1602d49d62511658f7296ae6fd186894b4476359055 + input_fingerprint: ac5cdb61822149f773e9bd76e1873ef44d0bd9ad9c65810bbe6fe033ffd44cc4 template_sources: - README.md.example Rakefile: recipe: template_source_application_Rakefile action: write - dest_sha256: e64dad663c08c7d4a7a8cd8fb653805231878d693b9a0ed23f4297ee891d588c - input_fingerprint: c2db83f8545cff423a94acc2257a5857e99fac9fdda233330af72d7846034054 + dest_sha256: c6f45bca4d5f69b7a7d95413a281240bf888b2a4919053a26e8249071287202f + input_fingerprint: b47939d7d9da30710715e3036541d8ad3b1da03843a38d399440659ddcf0ef86 template_sources: - Rakefile.example certs/pboling.pem: recipe: template_source_application_certs_pboling_pem action: write dest_sha256: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - input_fingerprint: 37fb314b2a9ce5c8b1abcff0698841d7bf48e3630e8b835c2bdbeb15ba591a4e + input_fingerprint: 1a5ff535120cecd31679404bc80d3067869ae3fd86753cd1b2cd83a7d8249c7a template_sources: - certs/pboling.pem.example commonmarker-merge.gemspec: recipe: template_source_application_commonmarker_merge_gemspec action: write - dest_sha256: f309a53e8c56d32447907f16d9de26c98bb44c43ce755254079e04201b9165fb - input_fingerprint: bf5ec54204639a6665a595a50cd42836607e29a5c851cbec78d4b5dc5cafa902 + dest_sha256: 45ff427226fc0815ed8fe1bb9cf1d526c36131de2273b8f9e90f768bb46ba050 + input_fingerprint: 46b172e4d294415e95aef1754d18759b05728230b988504ad1dd6b02c5a7b2b5 template_sources: - gem.gemspec.example gemfiles/modular/benchmark/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_r4_v0_5_gemfile action: write dest_sha256: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 - input_fingerprint: 86a6f0fc55fb587b0097c0031de590c9bae3f5ba19790b4c339afd3243dec15e + input_fingerprint: 905ce6d57a87527b577c7b0ae3c465aacd7623e94f940b535452b8c908a325f8 template_sources: - gemfiles/modular/benchmark/r4/v0.5.gemfile.example gemfiles/modular/benchmark/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_vHEAD_gemfile action: write dest_sha256: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 - input_fingerprint: 825b9deb56d958eded2ec5add5de7c45e8f360ef967f8b7b302e0af1c3dccded + input_fingerprint: f7cb6b10c7b6bb3eb7fc01fde0ca499e3ef271cf33b82dbc0d81c27c1019c2ab template_sources: - gemfiles/modular/benchmark/vHEAD.gemfile.example gemfiles/modular/cgi/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_cgi_r4_v0_5_gemfile action: write dest_sha256: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 - input_fingerprint: a05956acaa38cbd8d05e3f4b69f6ee1ebc2a9489a72b60d491d55026321ed976 + input_fingerprint: 62d6b4cc8f289914c79e96d9980471327e57dfba6f22443134a2e8a3a129b0c5 template_sources: - gemfiles/modular/cgi/r4/v0.5.gemfile.example gemfiles/modular/cgi/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_cgi_vHEAD_gemfile action: write dest_sha256: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 - input_fingerprint: be72651ab84e24b8ac8299d85447cb36b1ada2d218cdd6f3418708c19040451b + input_fingerprint: b6ab7e0d085fe789427137d9454c5cc67dee31c39fc984493153f2c2b2f4f404 template_sources: - gemfiles/modular/cgi/vHEAD.gemfile.example gemfiles/modular/changelog.gemfile: recipe: template_source_application_gemfiles_modular_changelog_gemfile action: write dest_sha256: da669526144fbff33aef207db9541b6fd6c254437f94dec2fab70fc55a7757cd - input_fingerprint: d66c0462d5d1806dd1022481f5e60a85d00a0baf83c45ffaa82d2e2d5c6fafeb + input_fingerprint: ec4c98e05b3d75963dac135c4f71b829645404fdbbc63165438e0ed697e442b7 template_sources: - gemfiles/modular/changelog.gemfile.example gemfiles/modular/coverage.gemfile: recipe: template_source_application_gemfiles_modular_coverage_gemfile action: write dest_sha256: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - input_fingerprint: 77548b8a15316d8e63179933aad613650c6d8328395a603d7b729a6b1c72cc70 + input_fingerprint: 1975960f320b05c0f7da6fb6e01707ae645e46cfb20d61eced4a26eead25bb4b template_sources: - gemfiles/modular/coverage.gemfile.example gemfiles/modular/coverage_local.gemfile: recipe: template_source_application_gemfiles_modular_coverage_local_gemfile action: write - dest_sha256: 2b493414df06261ba8acb6f0eb18bf3fdd701d7cb5f967a9d15a3f42a4741827 - input_fingerprint: cabebf3838a254284ab048c4e199b5db6ed420262297c6edbe79f5a0a62f0baf + dest_sha256: 92c9a599c8f6867ec532880f73568f2736ac05d8973ec524b42fd5dbe6aeda3e + input_fingerprint: 4b3f4c467700b70230463addb4e44b5e079072e84f594805ec161599b1a3f3e6 template_sources: - gemfiles/modular/coverage_local.gemfile.example gemfiles/modular/debug.gemfile: recipe: template_source_application_gemfiles_modular_debug_gemfile action: write dest_sha256: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 - input_fingerprint: c8053e1c7c6a1784b49c4d9f8259fdf02bb0cca7515a2d64275e11c04eeebeec + input_fingerprint: 234b0eed6e388f34b19a264e197bca4445a165b78281ff8f8a20e9c1455fe012 template_sources: - gemfiles/modular/debug.gemfile.example gemfiles/modular/documentation.gemfile: recipe: template_source_application_gemfiles_modular_documentation_gemfile action: write dest_sha256: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c - input_fingerprint: 47201c5491d1899e65a88ea5aa57a3b0643865ef1fcd734976c8f385c9f619ee + input_fingerprint: 2ee17f315bfcb361bbc23eb1b820d05b72137d7212ffd4767ca96b192790e8ea template_sources: - gemfiles/modular/documentation.gemfile.example gemfiles/modular/documentation_local.gemfile: recipe: template_source_application_gemfiles_modular_documentation_local_gemfile action: write dest_sha256: 2058173855b9a4acc6d5efa20520e49734243eef6cf0b5e9063e0e5866a08e9c - input_fingerprint: 8d364dff0ab62b655997d3ef5b26301020830a7605ab254dbf227e6b813962c3 + input_fingerprint: e461717cb7f260058dae8d917a5e902e073e6732abe1107333d01553b2865d7e template_sources: - gemfiles/modular/documentation_local.gemfile.example gemfiles/modular/erb/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r2_v3_0_gemfile action: write dest_sha256: 3793e7dc9ef23a7ccd893d48cbba092fd27594c63e65cca011cc658218425670 - input_fingerprint: 84b8b671d97833ac10689ababd3579d40a70e5de12e380e4c6a75977d719102f + input_fingerprint: 79503083ea7dd88b159adc1fa29a1172331c3aaeb052d2c328422199a522f4a1 template_sources: - gemfiles/modular/erb/r2/v3.0.gemfile.example gemfiles/modular/erb/r3/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r3_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: d8f5e0b1ef5ba74cc4662b25a79306fa534192c0ae658eb9502a5dfdfb23dd74 + input_fingerprint: 7a1c8826d7fee3597939b31986ea68e2f9569114b9742b216bedafc8e4e7bd6f template_sources: - gemfiles/modular/erb/r3/v5.0.gemfile.example gemfiles/modular/erb/r4/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r4_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: e97acda6b2bebaed72c1ac0b0c5cc410c8de883d72fae012ecc836c4e0e12573 + input_fingerprint: 87fb2cc9df458e5c040785199db3bd2c690e0008b44a05b2570568e02198f1b9 template_sources: - gemfiles/modular/erb/r4/v5.0.gemfile.example gemfiles/modular/erb/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_erb_vHEAD_gemfile action: write dest_sha256: ad6f104a49e80e0cf625440e3dc816343fe7e2f037fc4971df75e7bb4305c683 - input_fingerprint: 4d3e4a7cdfc4dea8daf6b91e3881ed9f8ead57eeb65ce1ecca6e7d9c2bd61c6c + input_fingerprint: d701aa1e58d317ac8cf65105f3b0f2d6814e5c864d04f0301fc065d52cfc2dc8 template_sources: - gemfiles/modular/erb/vHEAD.gemfile.example gemfiles/modular/json/truffleruby_22_3.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_22_3_gemfile action: write dest_sha256: 249c12eacbe90f9d0d2e81e7a62c4c7e9102e504ededcda4ecf660cb3bb68be4 - input_fingerprint: a60cc6475a98f6965b7dd92fefca6e2eb5cad851ba25d36152a7232df982c5f5 + input_fingerprint: c10a8b0eacc7e410b23e450102807680a1f7d9663dc73c2e491ca60f7f2e12fb template_sources: - gemfiles/modular/json/truffleruby_22_3.gemfile.example gemfiles/modular/json/truffleruby_23_0.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_0_gemfile action: write dest_sha256: 66aa010567f7afa1af8244a74c3c88ecaaf84dc87b6a25180691bb480d02ed28 - input_fingerprint: 78119372cf248268d20107c7e78a7e883e1a46b83e3eddb397a80455e86a6cbb + input_fingerprint: 3c3a5e7db1fd68708a9e954cda24ca1c0df47de52f603736d90b194be1dee842 template_sources: - gemfiles/modular/json/truffleruby_23_0.gemfile.example gemfiles/modular/json/truffleruby_23_1.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_1_gemfile action: write dest_sha256: '080fcbdaf2bec73cad40832a3d51eebb380af789917b96f493d1460b0dd6361d' - input_fingerprint: ee7d7f73050f416082e9638b708b2704224c2376527e5dded197205b7ac38f74 + input_fingerprint: 42039e8c0fdefc6330b76921f4a9e3601b86ee3ca25a13f073bd22acf083be79 template_sources: - gemfiles/modular/json/truffleruby_23_1.gemfile.example gemfiles/modular/mutex_m/r2/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r2_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: b38493100bd820feecb45d6ee1f69a9cacb98eadfad32770a23b54870820bec5 + input_fingerprint: 30839e8e21e0846d689ab24035248982bd0628d2cc583913b560381b2d7963c5 template_sources: - gemfiles/modular/mutex_m/r2/v0.3.gemfile.example gemfiles/modular/mutex_m/r3/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r3_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 522798f933a318e95ca283fc1b4e92fb0f61efc2ae8fc2f58f72924ad2a37ec6 + input_fingerprint: 419b868f81dd38090682fb7baa85689fdb93f0b9267f2448105ed8a2d4414012 template_sources: - gemfiles/modular/mutex_m/r3/v0.3.gemfile.example gemfiles/modular/mutex_m/r4/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r4_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: ca5004ea69f5f2f7e2abeac7f91244f75296fdc3a13c7c1691068c83b60a5aee + input_fingerprint: 8107385210c1b26a9e5586d884a1aac79ee3ab4bc1f780b4e9e6bfe86591a8d5 template_sources: - gemfiles/modular/mutex_m/r4/v0.3.gemfile.example gemfiles/modular/mutex_m/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_vHEAD_gemfile action: write dest_sha256: '08018641c97f894788fa91b462da504ab2237213d18d95404136c393274ae3cb' - input_fingerprint: c481fb567442cde8492994af136a5ea88ef379a480e31931bcc154762990184c + input_fingerprint: b10bc018265c8e99e534824f75b350e00f58b2e3511e3ea8c1fd9b5eb34a9764 template_sources: - gemfiles/modular/mutex_m/vHEAD.gemfile.example gemfiles/modular/optional.gemfile: recipe: template_source_application_gemfiles_modular_optional_gemfile action: write dest_sha256: f770e6e9a9dd2bd0f1f132e882d88038b2e21127dce3afe270908c7338c28bfd - input_fingerprint: a9ffc2d979a036b16cc46393d15336d827df9061f2e90dbd085cb88ceec7470f + input_fingerprint: a151bd78e317ee5a54e44277fa146650e259551a9a11cfa305d3c12938bd6467 template_sources: - gemfiles/modular/optional.gemfile.example gemfiles/modular/rspec.gemfile: recipe: template_source_application_gemfiles_modular_rspec_gemfile action: write dest_sha256: d043f5c9344f6435edb4607c5adaf42c78e7fb6b8b6726007de2bbedefb376c3 - input_fingerprint: 3b948320bf661eef3b2fa59ef8fbdf1daba7800c9b9941fb1d5a44ed733d6fb0 + input_fingerprint: 8fc880c16948cafaf27e5ad31ebf9d28ea2ea1a03f536fd510d287b2ab42df6f template_sources: - gemfiles/modular/rspec.gemfile.example gemfiles/modular/runtime_heads.gemfile: recipe: template_source_application_gemfiles_modular_runtime_heads_gemfile action: write dest_sha256: 6ac7158c4a3088190f2a9082f01439eb27eca2172ab3464b15c9cb045aa885e1 - input_fingerprint: 1a01be202cce3a7a9b42c78c7b343e0f2959dd2c742ed29ec696678a40fb89e7 + input_fingerprint: 33185c3b51ce562cf88f90a35605b0516239b65a981ff926f24b34e9230f80e0 template_sources: - gemfiles/modular/runtime_heads.gemfile.example gemfiles/modular/stringio/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r2_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: a40cd7d6db43a154e70934d75ce7e4446c79cbf7f7ae8970e392e60f45e15143 + input_fingerprint: c420d3ae591a5aa5de4006f6f6a75d647a131c42da121bc5f9887ed3f3aa0d77 template_sources: - gemfiles/modular/stringio/r2/v3.0.gemfile.example gemfiles/modular/stringio/r3/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r3_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: f32d176d57ccc63264661ed25279e37960698c8130c444ad09971f4b475a52a9 + input_fingerprint: 8b1c3ccedfeda56e166d249d88d13a8b7da585772001395dc6338d9c2f444f2e template_sources: - gemfiles/modular/stringio/r3/v3.0.gemfile.example gemfiles/modular/stringio/r4/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r4_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: bf1e461a623a57c84828626a37003c1ac61379db7edf83ed91a467756bd2db4e + input_fingerprint: e9b27c12fdbcad09dec891eac0406af3bc601a6bb122ac8afe7cebcda41c2c64 template_sources: - gemfiles/modular/stringio/r4/v3.0.gemfile.example gemfiles/modular/stringio/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_stringio_vHEAD_gemfile action: write dest_sha256: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - input_fingerprint: 9b4bbcf0c07cc366f07c9b49b86a1cad3d68ce4167057fa5ae2f41ecece09e29 + input_fingerprint: 2f1f4492fdce151c494d013fedaacc8e6d0e68dd7e5d6b81241642b6adbfc116 template_sources: - gemfiles/modular/stringio/vHEAD.gemfile.example gemfiles/modular/style.gemfile: recipe: template_source_application_gemfiles_modular_style_gemfile action: write - dest_sha256: 2a3d46dcb8a9394f595f273f5eb0403d0a552837754ab109afc9ba79a7159083 - input_fingerprint: be94d7bea03a442a1ed199535bf8266ac200c72902e5b070250a39b590293351 + dest_sha256: 9a24acff0054573c30f5d84d0418cd465ba3794d075bb5a36801410ac40e0787 + input_fingerprint: 623f7740c52a257b0f01c5090a36ba680a9945eeed8eb337ab5f1de2d3170610 template_sources: - gemfiles/modular/style.gemfile.example gemfiles/modular/style_local.gemfile: recipe: template_source_application_gemfiles_modular_style_local_gemfile action: write dest_sha256: 55eb9c149cdb2f29c9f31abe2d55a4f334e00fb859681dd17c42149a3f28ca36 - input_fingerprint: df29b31a39013bd8994c51c6cf595fbc2f23d5568a47e22a0840ef6ebdfb966e + input_fingerprint: abeb86708d09357f81568a3df6ecffdb8843d7ff51e05d43c463bdd5f95441f5 template_sources: - gemfiles/modular/style_local.gemfile.example gemfiles/modular/templating.gemfile: recipe: template_source_application_gemfiles_modular_templating_gemfile action: write - dest_sha256: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - input_fingerprint: eebefc24ed694779ca959de4b223d19b39ffcaaa59298d5e6477cbbe07699c05 + dest_sha256: 432ba59798d31b899268257c432443a017c5a9bd2c0c7f9f2216617e14150cd3 + input_fingerprint: 17f932e62144be2be26eaa1c4b10e64f8ad884ecf99b3ecc012fadedd1450cdb template_sources: - gemfiles/modular/templating.gemfile.example gemfiles/modular/templating_local.gemfile: recipe: template_source_application_gemfiles_modular_templating_local_gemfile action: write - dest_sha256: 87de158a48654f28048be4c8f2071b5baae64eae35801983129826313f94ac62 - input_fingerprint: e08454b687c7c6c02e54d2a6b9fc4f8c64b410d3529afeed95a6b08162bde643 + dest_sha256: 2ae0232af6f0ec710741c1384d9ecce5770431f9a16a5d49ffb83c98fab58c1b + input_fingerprint: a997b662a9f24c98504ba678008eecef0e1dd466d56460c93007bd20082b7c63 template_sources: - gemfiles/modular/templating_local.gemfile.example gemfiles/modular/webrick/r4/v1.9.gemfile: recipe: template_source_application_gemfiles_modular_webrick_r4_v1_9_gemfile action: write dest_sha256: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea - input_fingerprint: 9d2b75be17b9229c0d311d502e3f51b0c89589d6a7fd77a6ae71092db1ae2c7c + input_fingerprint: 1f1869d23761daf9746986b53c93fb21697c1cc5275a667194ad168fe749bc2f template_sources: - gemfiles/modular/webrick/r4/v1.9.gemfile.example gemfiles/modular/webrick/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_webrick_vHEAD_gemfile action: write dest_sha256: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b - input_fingerprint: a29cef7cf7248bb04ffc7e338c453c354dd8e5be852127e19d86642265ea24cc + input_fingerprint: ca25aa6e795abfec90b6d4842f0154523bc19cb53f284d946f3d78b0900a24fa template_sources: - gemfiles/modular/webrick/vHEAD.gemfile.example gemfiles/modular/x_std_libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_gemfile action: write dest_sha256: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a - input_fingerprint: e29ec47e30b1dc5a0defe26747a76eeeed742e2aa0c03af7f2e387ffe830c47d + input_fingerprint: 7a7f6e105aeaa3206e79c387ee478e01e17a6749d7717f446b188e161aa29b97 template_sources: - gemfiles/modular/x_std_libs.gemfile.example gemfiles/modular/x_std_libs/r2/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r2_libs_gemfile action: write dest_sha256: e80ec8ad06cb1b31ac982bc25cf7696987fca131aa1001eaefd0bf5cd379c273 - input_fingerprint: 2b268eaf4c13e0dbb3c6493cdf8f8d808d7e7c5f0eb70a1189e50887edaea728 + input_fingerprint: 3d52abf840b53bb36c94306267828e509b52b8db47a867680151a108884ffdda template_sources: - gemfiles/modular/x_std_libs/r2/libs.gemfile.example gemfiles/modular/x_std_libs/r3.1/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_1_libs_gemfile action: write dest_sha256: 9f8565c40b09bea1bc4c2e2ad87fe11400c3c51a2b235655bfcd8e491ed88ca8 - input_fingerprint: f655d750fd1ea49ded30c58b52be1e98aa2bf4bd86adcd647e2a7808bf6bb336 + input_fingerprint: 04c48b7c4fdb44658e7e0b5ebc9e6da878527ff38e0d568850828981ec432db0 template_sources: - gemfiles/modular/x_std_libs/r3.1/libs.gemfile.example gemfiles/modular/x_std_libs/r3/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_libs_gemfile action: write dest_sha256: 546f8849f4267bb19aa10ff0de40be30957197f229e6887847181ea9127b2650 - input_fingerprint: 9a96d3682f3314c8aced26d6b9e895a8fc564da7d78dfb2fefbdda719130806e + input_fingerprint: 0ac3e8dbac9659e9b97c9464dfc8e01f8fb1f1ec0e4127a98435344cba6043cf template_sources: - gemfiles/modular/x_std_libs/r3/libs.gemfile.example gemfiles/modular/x_std_libs/r4/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r4_libs_gemfile action: write dest_sha256: 8c2582eaa218d216b98c86c933465295c8b4e43f3251ea388b9eaf6e471f8da6 - input_fingerprint: 4bef759333659123f394f1f26c1315094d3fba545e09128f8be3bb14ba7ca886 + input_fingerprint: 4206fd76a7244329ea306a5b82760114c6d8ac40780135cfc38e1226da6d877d template_sources: - gemfiles/modular/x_std_libs/r4/libs.gemfile.example gemfiles/modular/x_std_libs/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_vHEAD_gemfile action: write dest_sha256: d3133ec4c0638363a7fb025d19be7e95a615fd61c35ddb8d17f2280ee74a7486 - input_fingerprint: 8f191289b00bbaa243ec0885f87d9850eccd40e986ce92ede2b9a636f45a7d74 + input_fingerprint: ec134dab39eb74e8c9064e08d87ed86e737b57e86bf7e9e2e0fb7133f51addc1 template_sources: - gemfiles/modular/x_std_libs/vHEAD.gemfile.example lib/commonmarker/merge/version.rb: recipe: template_source_application_lib_commonmarker_merge_version_rb action: write - dest_sha256: 9691e44856edebdf1f7ff47886e925c9faa4912a03edc5aca7ff805268c9ed47 - input_fingerprint: 4f7a7bc2dbc290937723d5c939b5c5fc14ed3caefd2313379d05dcfc6448afac + dest_sha256: 65122007fc6636c365b21d87103cb1b9cb2032e7df48048cf72e5b928240306c + input_fingerprint: 1178d88518aef4da75f1ee8f773b908618b39873c5afabd7e444c63c5ba4ff06 template_sources: - lib/gem/version.rb.example mise.toml: recipe: template_source_application_mise_toml action: write dest_sha256: 7d267154ca4f081b0ac7da804c0180c2b091aec5f1c877417c1c320f4f369c88 - input_fingerprint: 93cdb5aa74cb767fbd913f438dedff533183b1a9ef8071d31042211ea5097169 + input_fingerprint: 86d5acba81abe78945b33caa936180fbbbac2d260ad20fc41a3d19a0315547c2 template_sources: - mise.toml.no-osc.example sig/commonmarker/merge.rbs: recipe: template_source_application_sig_commonmarker_merge_rbs action: write dest_sha256: d2ad2df7036b196ecd31f228e49ad30db38dbf8f06bf6a7c523b20e34c274dfa - input_fingerprint: 91ecb29041031dad069de50885affcd3edab1f40c75a91b5f36fe21d6f37d63d + input_fingerprint: 5f52d26f9215d38a0daf2b3cb3dd72eadc9bb2b64d6d0a926d61eee4fde053f9 template_sources: - sig/gem.rbs.example spec/spec_helper.rb: recipe: template_source_application_spec_spec_helper_rb action: write dest_sha256: 5059fd7c63a5cb213d0236aa34fff24277b53442294a2b2f85dda3d3d62925fc - input_fingerprint: 27e38ccc26a69056a71e92ad5d08ddafe46d1ecd4eb242580752f906b12f279b + input_fingerprint: 97f95380165095754eb87ba92990c079f5eac0b3f9b75c5885c0898937028978 template_sources: - spec/spec_helper.rb.example diff --git a/gems/commonmarker-merge/Gemfile b/gems/commonmarker-merge/Gemfile index 9d0ad49ab..d73bed1ee 100644 --- a/gems/commonmarker-merge/Gemfile +++ b/gems/commonmarker-merge/Gemfile @@ -19,7 +19,7 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } # Include dependencies from commonmarker-merge.gemspec gemspec -gem 'kettle-family', '~> 1.2', '>= 1.2.97' +gem 'kettle-family', '~> 1.2', '>= 1.2.100' # Local workspace dependency wiring for *_local.gemfile overrides gem 'nomono', '~> 1.1', '>= 1.1.5', require: false # ruby >= 3.2.0 diff --git a/gems/commonmarker-merge/Gemfile.lock b/gems/commonmarker-merge/Gemfile.lock index 53aa82675..599cff035 100644 --- a/gems/commonmarker-merge/Gemfile.lock +++ b/gems/commonmarker-merge/Gemfile.lock @@ -10,123 +10,123 @@ GIT PATH remote: . specs: - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) commonmarker (~> 2.2) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) + ast-crispr-markdown-markly (7.1.9) + ast-crispr (= 7.1.9) + markdown-merge (= 7.1.9) + markly-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism specs: - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) + ast-crispr-ruby-prism (7.1.9) + ast-crispr (= 7.1.9) + prism-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) + ast-crispr (7.1.9) + ast-merge (= 7.1.9) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ast-merge-git (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: - ast-merge (7.1.8) + ast-merge (7.1.9) benchmark token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) + ast-template (7.1.9) + ast-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + bash-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + binary-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) + citrus-toml-merge (7.1.9) + ast-merge (= 7.1.9) + toml-merge (= 7.1.9) toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) + dotenv-merge (7.1.9) + ast-merge (= 7.1.9) + plain-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + go-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + html-merge (7.1.9) + ast-crispr (= 7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + json-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: - kettle-jem (7.1.25) + kettle-jem (7.1.26) addressable (>= 2.8, < 3) ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) @@ -160,122 +160,122 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge specs: - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown (~> 2.5) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + markdown-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) + markly-merge (7.1.9) + markdown-merge (= 7.1.9) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge specs: - parslet-toml-merge (7.1.8) + parslet-toml-merge (7.1.9) toml (~> 0.3) - toml-merge (= 7.1.8) + toml-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + plain-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) + prism-merge (7.1.9) + ast-merge (= 7.1.9) prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + psych-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) + yaml-merge (= 7.1.9) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) + rbs-merge (7.1.9) + ast-merge (= 7.1.9) rbs (>= 3.10) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + rust-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) + smorg-rb (7.1.9) + ast-merge (= 7.1.9) + ast-merge-git (= 7.1.9) + bash-merge (= 7.1.9) diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) + dotenv-merge (= 7.1.9) + go-merge (= 7.1.9) + html-merge (= 7.1.9) + json-merge (= 7.1.9) kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) + markdown-merge (= 7.1.9) + plain-merge (= 7.1.9) + prism-merge (= 7.1.9) + psych-merge (= 7.1.9) + rbs-merge (= 7.1.9) + rust-merge (= 7.1.9) + toml-merge (= 7.1.9) + typescript-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + toml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: - tree_haver (7.1.8) + tree_haver (7.1.9) citrus (~> 3.0) parslet (~> 2.0) tree_sitter_language_pack (>= 1.16.2, < 2.0) @@ -284,25 +284,25 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + typescript-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + yaml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) + zip-merge (7.1.9) + binary-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) GEM @@ -336,6 +336,8 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) + commonmarker (2.10.0) + rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -465,11 +467,15 @@ GEM lint_roller (1.1.0) logger (1.7.0) markly (0.19.0) + mini_portile2 (2.8.9) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) reline (~> 0.6) mutex_m (0.3.0) + nokogiri (1.19.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-musl) @@ -503,6 +509,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) + rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -696,13 +705,16 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.16.2-aarch64-linux) + tree_sitter_language_pack (1.17.0) + rb_sys (>= 0.9.130, < 0.10) + sorbet-runtime (~> 0.5) + tree_sitter_language_pack (1.17.0-aarch64-linux) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-arm64-darwin) + tree_sitter_language_pack (1.17.0-arm64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-linux) + tree_sitter_language_pack (1.17.0-x86_64-linux) sorbet-runtime (~> 0.5) tsort (0.2.0) tty-cursor (0.7.1) @@ -784,9 +796,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.31) + kettle-dev (~> 3.0, >= 3.0.34) kettle-drift (~> 1.0, >= 1.0.13) - kettle-family (~> 1.2, >= 1.2.97) + kettle-family (~> 1.2, >= 1.2.100) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) @@ -807,12 +819,12 @@ DEPENDENCIES reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) - rubocop-lts (~> 24.2, >= 24.2.1) - rubocop-lts-rspec (~> 1.0, >= 1.0.5) + rubocop-lts (~> 24.2, >= 24.2.3) + rubocop-lts-rspec (~> 1.0, >= 1.0.6) rubocop-minitest (~> 0.40, >= 0.40.0) rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! - rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) ruby-merge! ruby-progressbar (~> 1.13) rust-merge! @@ -843,33 +855,34 @@ CHECKSUMS appraisal2 (3.2.3) sha256=3a6cfaf8a444e02707b9a34154af1c4902fbe99d9d2168d7e81dd83ec77e6db7 appraisal2-rubocop (1.0.2) sha256=1dae97c1be087cf9c098a3a72fd41f873435e9b8b39687e633b36c9ccb22bff4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.8) - ast-crispr-markdown-markly (7.1.8) - ast-crispr-ruby-prism (7.1.8) - ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) + ast-crispr (7.1.9) + ast-crispr-markdown-markly (7.1.9) + ast-crispr-ruby-prism (7.1.9) + ast-merge (7.1.9) + ast-merge-git (7.1.9) + ast-template (7.1.9) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.8) + bash-merge (7.1.9) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) - bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae + binary-merge (7.1.9) + bundler (4.1.0.beta1) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.8) + citrus-toml-merge (7.1.9) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 + commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e commonmarker (2.10.0-x86_64-darwin) sha256=01e0830ed0319825ecdc16411c90acd3f661d1568dfc178731b3f64d0ce2363d commonmarker (2.10.0-x86_64-linux) sha256=945c510c0bfca9022245928e2248468fe3ddad58c939be0c37b20082cc392880 commonmarker (2.10.0-x86_64-linux-musl) sha256=288cd4fb9f17eed2ffa73551ef241dcf594e0f484b2aee2a0999540333c0618e - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) completely (0.8.0) sha256=e493cd5d84805f47917a41f277ecbfe5f35363bed670be5a957d3acaed8c6c5e concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 @@ -878,7 +891,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docopt_ng (0.7.1) sha256=a024148ee4fa3ab1a8a04411aa4370f39cf2b446e63562097d418b7974a15667 - dotenv-merge (7.1.8) + dotenv-merge (7.1.9) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -891,35 +904,37 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) + go-merge (7.1.9) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) + html-merge (7.1.9) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a - json-merge (7.1.8) - kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + json-merge (7.1.9) + kettle-changelog (1.0.7) + kettle-dev (3.0.34) + kettle-drift (1.0.13) kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 - kettle-jem (7.1.25) + kettle-jem (7.1.26) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 - kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd + kettle-soup-cover (3.0.10) kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 - markdown-merge (7.1.8) + markdown-merge (7.1.9) markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca - markly-merge (7.1.8) + markly-merge (7.1.9) + mini_portile2 (2.8.9) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 + nokogiri (1.19.4) nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af nokogiri (1.19.4-arm64-darwin) sha256=a46db9853286e6597b36ebc6953817d15acf3a299583eb3f89fdc6f91dd63527 @@ -933,20 +948,22 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) - plain-merge (7.1.8) + parslet-toml-merge (7.1.9) + plain-merge (7.1.9) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.8) + prism-merge (7.1.9) psych (5.5.0) sha256=4b245bbbd0f3238df8ccee766ebc1a6b062b10e4ee1d3284eb588739ba156a0a - psych-merge (7.1.8) + psych-merge (7.1.9) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 - rbs-merge (7.1.8) + rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -982,11 +999,11 @@ CHECKSUMS rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.8) + ruby-merge (7.1.9) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) + rust-merge (7.1.9) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +1011,7 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) + smorg-rb (7.1.9) sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1011,24 +1028,25 @@ CHECKSUMS timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.8) + toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb - tree_haver (7.1.8) - tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 - tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 - tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 - tree_sitter_language_pack (1.16.2-x86_64-linux) sha256=d8151e6e44e35ace9de3611c76b730896beab17f427db06d8f76666332a5dc60 + tree_haver (7.1.9) + tree_sitter_language_pack (1.17.0) + tree_sitter_language_pack (1.17.0-aarch64-linux) + tree_sitter_language_pack (1.17.0-arm64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-linux) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f tty-cursor (0.7.1) sha256=79534185e6a777888d88628b14b6a1fdf5154a603f285f80b1753e1908e0bf48 tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) + typescript-merge (7.1.9) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 yaml-converter (0.2.5) sha256=a5214fe1a6c2df88bd34a35bcded1b1dcd30135548130df2e03b54ca8c0f2423 - yaml-merge (7.1.8) + yaml-merge (7.1.9) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.8) sha256=73d935d43e3479d65ce8aff25c7d3100e8bb83528a2adaa0ed824e5046ac99e7 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -1037,8 +1055,8 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) + zip-merge (7.1.9) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH - 4.0.20 + 4.1.0.beta1 diff --git a/gems/commonmarker-merge/Rakefile b/gems/commonmarker-merge/Rakefile index e415b633f..f969c8ce3 100644 --- a/gems/commonmarker-merge/Rakefile +++ b/gems/commonmarker-merge/Rakefile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -# commonmarker-merge Rakefile v7.1.18 - 2026-09-07 +# commonmarker-merge Rakefile v7.1.26 - 2026-09-09 # Ruby 2.3 (Safe Navigation) or higher required # # See LICENSE.md for license information. diff --git a/gems/commonmarker-merge/bin/rubocop-gradual b/gems/commonmarker-merge/bin/rubocop-gradual new file mode 100755 index 000000000..7c7ff0635 --- /dev/null +++ b/gems/commonmarker-merge/bin/rubocop-gradual @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'rubocop-gradual' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'rubygems' +require 'bundler/setup' + +load Gem.bin_path('rubocop-gradual', 'rubocop-gradual') diff --git a/gems/commonmarker-merge/commonmarker-merge.gemspec b/gems/commonmarker-merge/commonmarker-merge.gemspec index 9468644dd..5c149a9fc 100644 --- a/gems/commonmarker-merge/commonmarker-merge.gemspec +++ b/gems/commonmarker-merge/commonmarker-merge.gemspec @@ -120,7 +120,7 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.31') # ruby >= 4.0.0 + spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.34') # ruby >= 4.0.0 # Security spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 diff --git a/gems/commonmarker-merge/gemfiles/modular/coverage_local.gemfile b/gems/commonmarker-merge/gemfiles/modular/coverage_local.gemfile index 37917caac..d6c890e46 100644 --- a/gems/commonmarker-merge/gemfiles/modular/coverage_local.gemfile +++ b/gems/commonmarker-merge/gemfiles/modular/coverage_local.gemfile @@ -29,11 +29,31 @@ Kernel.send(:gem, 'nomono', *nomono_activation_requirements) require 'nomono/bundler' local_gems = %w[kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -local_gems_to_eval = local_gems - %w[] - declared_gems # export KETTLE_DEV_DEV=/path/to/my platform :mri do + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + local_gems_to_eval = local_gems - %w[] - declared_gems + eval_nomono_gems( gems: local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/commonmarker-merge/gemfiles/modular/style.gemfile b/gems/commonmarker-merge/gemfiles/modular/style.gemfile index 59c5dc1a3..41ec99454 100644 --- a/gems/commonmarker-merge/gemfiles/modular/style.gemfile +++ b/gems/commonmarker-merge/gemfiles/modular/style.gemfile @@ -24,9 +24,9 @@ platform :mri do if ENV.fetch('RUBOCOP_LTS_DEV', 'false').casecmp('false').zero? declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) - gem 'rubocop-lts', '~> 24.2', '>= 24.2.1' unless declared_gems.include?('rubocop-lts') - gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.5' unless declared_gems.include?('rubocop-lts-rspec') - gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.6' unless declared_gems.include?('rubocop-ruby3_2') + gem 'rubocop-lts', '~> 24.2', '>= 24.2.3' unless declared_gems.include?('rubocop-lts') + gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.6' unless declared_gems.include?('rubocop-lts-rspec') + gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.8' unless declared_gems.include?('rubocop-ruby3_2') else eval_gemfile('style_local.gemfile') end diff --git a/gems/commonmarker-merge/gemfiles/modular/templating.gemfile b/gems/commonmarker-merge/gemfiles/modular/templating.gemfile index 6af159bd7..ce51a08ed 100644 --- a/gems/commonmarker-merge/gemfiles/modular/templating.gemfile +++ b/gems/commonmarker-merge/gemfiles/modular/templating.gemfile @@ -18,7 +18,7 @@ end if structuredmerge_remote # Merge recipes for released installs. - gem 'kettle-jem', '>= 7.0' + gem 'kettle-jem', '~> 7.1', '>= 7.1.26' end if kettle_remote diff --git a/gems/commonmarker-merge/gemfiles/modular/templating_local.gemfile b/gems/commonmarker-merge/gemfiles/modular/templating_local.gemfile index 99bfa03ee..94d306569 100644 --- a/gems/commonmarker-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/commonmarker-merge/gemfiles/modular/templating_local.gemfile @@ -65,9 +65,7 @@ structuredmerge_local_gems = %w[ kettle_dev_local_gems = %w[ kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift ] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[] -kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - (declared_gems - %w[kettle-dev]) if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( @@ -81,6 +79,28 @@ if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 end if ENV.fetch('KETTLE_DEV_DEV', 'false').casecmp('false') != 0 + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - declared_gems + eval_nomono_gems( gems: kettle_dev_local_gems_to_eval, prefix: 'KETTLE_DEV', From 504be1ef83cc3a4849c446730b4e68d9234237c5 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 23:54:28 -0400 Subject: [PATCH 101/137] =?UTF-8?q?=F0=9F=8E=A8=20Template=20kramdown-merg?= =?UTF-8?q?e=20by=20kettle-family?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kramdown-merge/.kettle-drift.lock | 76 ++++- gems/kramdown-merge/.rubocop_gradual.lock | 7 +- .../.structuredmerge/kettle-jem.lock | 145 ++++---- gems/kramdown-merge/Gemfile | 2 +- gems/kramdown-merge/Gemfile.lock | 318 +++++++++--------- gems/kramdown-merge/Rakefile | 2 +- gems/kramdown-merge/bin/rubocop-gradual | 16 + .../gemfiles/modular/coverage_local.gemfile | 24 +- .../gemfiles/modular/style.gemfile | 6 +- .../gemfiles/modular/templating.gemfile | 2 +- .../gemfiles/modular/templating_local.gemfile | 24 +- gems/kramdown-merge/kramdown-merge.gemspec | 2 +- 12 files changed, 387 insertions(+), 237 deletions(-) create mode 100755 gems/kramdown-merge/bin/rubocop-gradual diff --git a/gems/kramdown-merge/.kettle-drift.lock b/gems/kramdown-merge/.kettle-drift.lock index 98b009e1e..1b23f4793 100644 --- a/gems/kramdown-merge/.kettle-drift.lock +++ b/gems/kramdown-merge/.kettle-drift.lock @@ -1,10 +1,82 @@ { + "debug_env: 'KETTLE_DEV_DEBUG',\nroot: %w[src my kettle-dev]": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 46, + 63 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 93, + 110 + ] + } + ], + "path_env: 'KETTLE_DEV_DEV',\nvendored_gems_env: 'VENDORED_GEMS',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 43, + 60 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 90, + 107 + ] + } + ], + "prefix: 'KETTLE_DEV',\npath_env: 'KETTLE_DEV_DEV',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 42, + 59 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 89, + 106 + ] + } + ], + "vendor_gem_dir_env: 'VENDOR_GEM_DIR',\ndebug_env: 'KETTLE_DEV_DEBUG',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 45, + 62 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 92, + 109 + ] + } + ], "vendored_gems_env: 'VENDORED_GEMS',\nvendor_gem_dir_env: 'VENDOR_GEM_DIR',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 44, + 61 + ] + }, { "file": "gemfiles/modular/templating_local.gemfile", "lines": [ - 77, - 88 + 75, + 91, + 108 ] } ] diff --git a/gems/kramdown-merge/.rubocop_gradual.lock b/gems/kramdown-merge/.rubocop_gradual.lock index a274962b1..761b283f5 100644 --- a/gems/kramdown-merge/.rubocop_gradual.lock +++ b/gems/kramdown-merge/.rubocop_gradual.lock @@ -2,7 +2,7 @@ ".simplecov:2131666085": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] ], - "Rakefile:600833373": [ + "Rakefile:113103102": [ [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], [81, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], [165, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], @@ -22,6 +22,9 @@ [1, 1, 0, "Naming/FileName: The name of this source file (`vHEAD.gemfile`) should use snake_case.", 5381], [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], + "gemfiles/modular/coverage_local.gemfile:2813372128": [ + [34, 1, 1586, "Metrics/BlockLength: Block has too many lines. [37/25]", 820328175] + ], "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], @@ -87,7 +90,7 @@ [1, 1, 0, "Naming/FileName: The name of this source file (`vHEAD.gemfile`) should use snake_case.", 5381], [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] ], - "kramdown-merge.gemspec:3780026847": [ + "kramdown-merge.gemspec:2606013850": [ [137, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4147388508], [148, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], [149, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] diff --git a/gems/kramdown-merge/.structuredmerge/kettle-jem.lock b/gems/kramdown-merge/.structuredmerge/kettle-jem.lock index c5c9605e4..891ad33d0 100644 --- a/gems/kramdown-merge/.structuredmerge/kettle-jem.lock +++ b/gems/kramdown-merge/.structuredmerge/kettle-jem.lock @@ -1,11 +1,12 @@ --- version: 1 template_state: - version: 7.1.18 - applied_at: '2026-09-07' + version: 7.1.26 + applied_at: '2026-09-10' changelog_replay: last_entry_key: kettle-jem-template-20260802-001 last_entry_date: '2026-08-02' + maintenance_changelog: {} checksums: ".aiignore.example": 48a5dfdd93afd1a15fdce39cc28ca9920263f00018b0968ab031fa744521e5ce ".config/mise/env.sh": aeea5a2ab489ba6e5467ae8de6e386ec8c8fe4ff31a044e69d0cd6a092dd6654 @@ -75,7 +76,7 @@ template_state: ".rubocop_rspec.yml.example": 288ad75e7eb14d87d80fafe6f7272217be5c57547536ee56c780a7d10ac7ec74 ".simplecov.example": 222f2e6ce8cf089c70a21f0f5e5423d4bd59a96fdb2ce7754b0fb3d6f430c229 ".structuredmerge/git-drivers.toml.example": 9d241a44c9edffcdbd3da018fa188a238089c3d1635040924df594a6929a4f97 - ".structuredmerge/kettle-jem.yml.example": 26949dc4ee0722415e72452cbc186bee6ef7b154eae33166d36f3fdb1ca6e46d + ".structuredmerge/kettle-jem.yml.example": ff65a738da1af7d60714026a81d3323a46c864e96ae3570b806afdf6e7149ff9 ".yard-lint.yml.example": 90def46867c9436b4e177c47d91fc8165f4602e335715aecc39f5587ae20b55b ".yardignore.example": 821f453c609df7d46145d675424b39dfbe6dfdca8edac5f367b85fff48502455 ".yardopts.example": 6fd6f2701713096a8a9ea095c213bbc68eeef37797c4754d97837e3229a3a5f6 @@ -88,7 +89,7 @@ template_state: CHANGELOG.transfer.md: 21331d8a9e58b4ff6e088b88eb408bcccb0f2f64e78f8f4d42ac3f11a24baad8 CITATION.cff.example: e404ea0a7919d78a83d53d80e211d17b9663576aa606583b709795dc023fd75c CODE_OF_CONDUCT.md.example: f1ad532f1860f73ef774c6b27a26d41f4bc1cb8813034f5957487766ebb0986b - CONTRIBUTING.md.example: 22570cfb3dde72be79b4b522b6d5ab13f95d778e40444483a096871fe0891b19 + CONTRIBUTING.md.example: 8d23cce2d061e0c20d619c3f66591df5f32821cd84c32d171df0b8ebe1217a55 FUNDING.md.example: 392d047904b1557b29f4b43d37ec403b7480edd5b6ab51180be979b57a91e6ba FUNDING.md.no-osc.example: 3ef0258dd3e3b7f7e17e8bc2d20dcbcb3e74aa5a5a6f51297075696645e34c77 Gemfile.example: 99500023987e81775a9b5ef14e92cb3992f2ac408e5f42454f2728eee9b49fb2 @@ -99,19 +100,19 @@ template_state: PolyForm-Small-Business-1.0.0.md.example: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 README.md.example: 21f491e3d73bfc1b74056a6dcba61f72c93dee3cfe5272ac164a20978454de21 REEK: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - RUBOCOP.md.example: c09e5533ccc59b70a2efa05c99f66e521137c1053d3c12eb43509cebd5b68b0e + RUBOCOP.md.example: d99871a0e4c1d323c92e7febf328f062bb4722069b2abfd0a83bf7daa8dcbf8c Rakefile.example: 569803e726b07ea26267fec6891367a3096a0dff3c266269a7081d36afe496af SECURITY.md.example: ee9411aa85f36d88363fdaea7a1baea4362b6ec112cf2688e711b05de1d3144c bin/setup.example: 0ac35089c95a91d8973fe7a318bf9fd98b9f8e00db92c5d9ca6cd858abb8d41b certs/pboling.pem.example: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - gem.gemspec.example: 83e834e8958a88e4817a57199f48f5ebb245548ce251c5c47372208693f03b17 + gem.gemspec.example: 12dcadc0b297ccd4e18b9d1e538b98ac8330ef9fb2a059ed6754ad59272b77fa gemfiles/modular/benchmark/r4/v0.5.gemfile.example: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 gemfiles/modular/benchmark/vHEAD.gemfile.example: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 gemfiles/modular/cgi/r4/v0.5.gemfile.example: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 gemfiles/modular/cgi/vHEAD.gemfile.example: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 gemfiles/modular/changelog.gemfile.example: 892598e0e7792eb205247ae28128cef6dfc647d2fb33968969152230d6f69288 gemfiles/modular/coverage.gemfile.example: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - gemfiles/modular/coverage_local.gemfile.example: 928d5f260d7b119c038baa56da9fb78dd524dee613aea33ab72894bbce5c506e + gemfiles/modular/coverage_local.gemfile.example: 92ea0d7a9d693553dc614afa2c43990f5c3778c2b00ef6c528e122c31bd506a1 gemfiles/modular/debug.gemfile.example: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 gemfiles/modular/documentation.gemfile.example: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c gemfiles/modular/documentation_local.gemfile.example: 84a20f5d4b0feb94c2cf2f7a8dce8f682f1483498e41484c2b447a5661fd1870 @@ -145,10 +146,10 @@ template_state: gemfiles/modular/stringio/r3/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/r4/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/vHEAD.gemfile.example: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - gemfiles/modular/style.gemfile.example: 3ad0585b4f2db8918580ca41ea8723f7a166d7a83cfd7f9613511094997106fd + gemfiles/modular/style.gemfile.example: 02fe3e8fd00e49b90c3ab30e19b51014ee50490f3eadcfd1d4a39f4c2c997dda gemfiles/modular/style_local.gemfile.example: c86beb711e766126a5be68be4be18255831625ac3650d5069383c4a83a9511f3 - gemfiles/modular/templating.gemfile.example: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - gemfiles/modular/templating_local.gemfile.example: 930057d3b909a72e39a39125c4e883a7ff71f5691e64426c0541f8c8fc75b83f + gemfiles/modular/templating.gemfile.example: 2b33c094677b53ad9dd2eafeb3a3be452f612380c61001a2e75b3c078b8ff72a + gemfiles/modular/templating_local.gemfile.example: ac7259516e69ffafb8b9342a897ddf6042adc46335743f474c342509cefd8f2e gemfiles/modular/webrick/r4/v1.9.gemfile.example: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea gemfiles/modular/webrick/vHEAD.gemfile.example: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b gemfiles/modular/x_std_libs.gemfile.example: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a @@ -175,7 +176,7 @@ template_state: shim/Gemfile.example: 0fb0d9d06fcfb1fd6ca6f0eeb5867253ca1ed221e03d28027719225f868b0637 shim/README.md.example: 3a2f7211b7f92a1dfae5e523b8e34b051a3d8af942144b05286eca0b3c8f6fbe shim/Rakefile.example: 572c94da7052083b39b62a6600785419e314a109efd7a3d8c3a96eb77ad34fd1 - shim/gem.gemspec.example: efae033238e4fd1355cfc134f5c9123f175d1ad1dc4a1a2e663899788c9e0870 + shim/gem.gemspec.example: 14a7015b3328005d1c3b5fda6886bd6da383707745f6eaaa781d6f9689600131 shim/lib/compat_require.rb.example: 94ee85e353a3ca08c8a35c9063d4ff789214ea594c7f803f6cf09d7142f48379 shim/lib/entrypoint.rb.example: dd57613520daca01d6f6bcaa9b83b00ff74505240dc04b84ceb686df3c0539d7 shim/lib/version.rb.example: 15e219ac3a928b5580035f891e415551213175020f1131f6e7ca0ccd55a1b2d6 @@ -189,370 +190,370 @@ files: recipe: template_source_application_simplecov action: write dest_sha256: 0107722ac11c4cbfaa22f358fea8d353396829f4687da697bafc25764b198dae - input_fingerprint: 9c0ccf798a73f1d336d5e670050a73b9f29551316d360d0391c6e3dfc9f83f7f + input_fingerprint: b2013d751773b6531ee3957ad6d5d352df9cd75a5c34cebcfdfcfa670236de4a template_sources: - ".simplecov.example" AGPL-3.0-only.md: recipe: template_source_application_AGPL_3_0_only_md action: write dest_sha256: d8a6cc31abc16b6748c7a21f21611f5a1ec33f67d22ca23d7da1c19b95496bee - input_fingerprint: 5bf726e22779cdaa67536bcd9757523b24656ad06c1d32b6dc1101d7d6c3feba + input_fingerprint: '09233521a959ca616974a85a940c53c69817ecc5377b52962335727819ae5fa1' template_sources: - AGPL-3.0-only.md.example Gemfile: recipe: template_source_application_Gemfile action: write - dest_sha256: 0f25c92ae5d32c13d99f46af7e0e1fde59eab5a61f675e3680193e23a28ee624 - input_fingerprint: 54f231ad317f12526ea985a2d531df41eed1a350cd7278a027c7c3b6f4e64ff2 + dest_sha256: 6c1cf3bdf2ff32e91824ca1cdc3856c0eea70fd80c192f6c404f96c9e59f9231 + input_fingerprint: 84e538c90e69d3e71b8072d8469444fc604a89838a548d07c5ec5f8de1bb23bd template_sources: - Gemfile.example LICENSE.md: recipe: template_source_application_LICENSE_md action: write dest_sha256: f6188bfd474a636d2a526420ebb411250faa447d94c9b9ccee097128ce4101b5 - input_fingerprint: 4dcb50b0df470df8e9596732ffb22138eb4bc4431b2304fae3ab5a2ac9d5a30c + input_fingerprint: ce611d5fb8cbe9d145a4c9867b07291afcc375fd03c2f91d270c62b540eeef3d template_sources: - LICENSE.md.example PolyForm-Small-Business-1.0.0.md: recipe: template_source_application_PolyForm_Small_Business_1_0_0_md action: write dest_sha256: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 - input_fingerprint: a3b6bc2582751e0669f87c289615962b1651f6a1bc592c9e68bfa1c73bd6db5f + input_fingerprint: e9b9a3a7abf6ee712f1427c1cbc3fc5f5f0c259f3bb0102e6480688e48fdb9d6 template_sources: - PolyForm-Small-Business-1.0.0.md.example README.md: recipe: template_source_application_README_md action: write dest_sha256: b085178f7a933527ce5f313ab645c9058d61a49d7c4f1493a52ac05ff40eeba8 - input_fingerprint: 948ecd921f1dbdc769af458dae3879550b4f47fde7415a9bc267711726fc64cd + input_fingerprint: 79299eb5781b2a6cf1910be4062009287ffdb52c9d8cbf81a44b8fa80e5e851f template_sources: - README.md.example Rakefile: recipe: template_source_application_Rakefile action: write - dest_sha256: e6ed6599e9c275e7ed1e9ea9ff2562b870182fe63aa32249c2c6ded9c858abb7 - input_fingerprint: 3417d89c483d3f9bee474e22cec7b09683c5b3279fbd2626dd1e957674ff35c6 + dest_sha256: e0d5bab87c4c3143e14b6c19fd717a29aea76d6fc08e637ace1801146c67ea51 + input_fingerprint: 6b62a0f9008b4044e94c2c004ffa60f1040e0f51f79b2d44be465ed11df3b127 template_sources: - Rakefile.example certs/pboling.pem: recipe: template_source_application_certs_pboling_pem action: write dest_sha256: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - input_fingerprint: 8da31e4452baf5f94643e436f505c4c294d70a52e1843bc7932c446698d2593b + input_fingerprint: 75cc8cf1fa7b62a3af41aec3a166b0b72a6dfce0029add9a7a0a280fc3f77cc1 template_sources: - certs/pboling.pem.example gemfiles/modular/benchmark/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_r4_v0_5_gemfile action: write dest_sha256: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 - input_fingerprint: 0d663c947c6f5200a9828cbc2de7854c015e0ae71253a9be1b97c0d6a122c6f3 + input_fingerprint: 4806585974918d2321696d5b3b8f519974e2bd5743389dc93ffee5b6d8d27055 template_sources: - gemfiles/modular/benchmark/r4/v0.5.gemfile.example gemfiles/modular/benchmark/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_vHEAD_gemfile action: write dest_sha256: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 - input_fingerprint: 4dbe797dbb503f4d866362cdb4fdb0989bf5a41b56c5c67e037e708a3a4ef051 + input_fingerprint: b6cf9b7d934ca49f2d8d545e5ea0e69ee362f36b7209cd95e83f4ba61a681153 template_sources: - gemfiles/modular/benchmark/vHEAD.gemfile.example gemfiles/modular/cgi/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_cgi_r4_v0_5_gemfile action: write dest_sha256: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 - input_fingerprint: ab50d16707ee41c39954e06c2c90e33a741dbde44bc7c4a8a06c7ff74a2c6f2e + input_fingerprint: 5a71d45cd3d97a1cf6924e59a0eb6fd7a16b4f6426dc171755042d68087de107 template_sources: - gemfiles/modular/cgi/r4/v0.5.gemfile.example gemfiles/modular/cgi/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_cgi_vHEAD_gemfile action: write dest_sha256: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 - input_fingerprint: 976fc3821f9235b13616ea77873185ada5c26f93dd33219a3eb9319b4467f21b + input_fingerprint: 8ac90bcf1a5e452bb7c1a9733ebec54cb6553b72f5d6c176ea34d49ff528ae23 template_sources: - gemfiles/modular/cgi/vHEAD.gemfile.example gemfiles/modular/changelog.gemfile: recipe: template_source_application_gemfiles_modular_changelog_gemfile action: write dest_sha256: da669526144fbff33aef207db9541b6fd6c254437f94dec2fab70fc55a7757cd - input_fingerprint: 311839beb97d1d0c4d150ff18383bb36087d2eec45877f05c2d2baa4e57ce915 + input_fingerprint: b3fb91945714f388286690fd93fb2bc34932a1f6c75049d75d48984d57d7c9e3 template_sources: - gemfiles/modular/changelog.gemfile.example gemfiles/modular/coverage.gemfile: recipe: template_source_application_gemfiles_modular_coverage_gemfile action: write dest_sha256: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - input_fingerprint: da85c413e4bbf0c63f4f8b89ddb373681bbe42af24cb30d698f3d671fadcee5e + input_fingerprint: 1e082486438219bf3bbc7e2b8eec06679f682ff0d1383e6f712b146dca81bd01 template_sources: - gemfiles/modular/coverage.gemfile.example gemfiles/modular/coverage_local.gemfile: recipe: template_source_application_gemfiles_modular_coverage_local_gemfile action: write - dest_sha256: 2b493414df06261ba8acb6f0eb18bf3fdd701d7cb5f967a9d15a3f42a4741827 - input_fingerprint: 27224e8c1e7036f90a6f12ea9a9607c270f762f66fe25b1d5abf62354c5297ed + dest_sha256: 92c9a599c8f6867ec532880f73568f2736ac05d8973ec524b42fd5dbe6aeda3e + input_fingerprint: 65ae35e5c6613fa2e8bfe795ccc2d45cffe234e6cf9e2e129de4b71d01bdb59c template_sources: - gemfiles/modular/coverage_local.gemfile.example gemfiles/modular/debug.gemfile: recipe: template_source_application_gemfiles_modular_debug_gemfile action: write dest_sha256: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 - input_fingerprint: f2eaeb8ee30bd240dcee38e516bfe123025b61016553bf6c9649a57bba3aab9c + input_fingerprint: c4413ef36129102e3bba236b2697771e69766bee686d9d15b4d6b9a9d1916381 template_sources: - gemfiles/modular/debug.gemfile.example gemfiles/modular/documentation.gemfile: recipe: template_source_application_gemfiles_modular_documentation_gemfile action: write dest_sha256: ca1509606c1a4eb810d10f0b2b9dd8ba97bd18fa84ef81e473d9ecad71ebf96d - input_fingerprint: ef93e4daad890891d3d04c5fda8aa7a753f453ba35d0de1a24dc5ac88a2d2f8f + input_fingerprint: c55c8c38623d493e3a25b2693c9107fa92b324df56a9c7283972586361dcb6c3 template_sources: - gemfiles/modular/documentation.gemfile.example gemfiles/modular/documentation_local.gemfile: recipe: template_source_application_gemfiles_modular_documentation_local_gemfile action: write dest_sha256: 2058173855b9a4acc6d5efa20520e49734243eef6cf0b5e9063e0e5866a08e9c - input_fingerprint: b2cbb9545236d8f7826675eac32d28ec31f8e2213f28502a16b946d55416fad9 + input_fingerprint: c64f10216cfaa1755acd9f0016087f842cf6e78236233c8a50e10941f13264d5 template_sources: - gemfiles/modular/documentation_local.gemfile.example gemfiles/modular/erb/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r2_v3_0_gemfile action: write dest_sha256: 3793e7dc9ef23a7ccd893d48cbba092fd27594c63e65cca011cc658218425670 - input_fingerprint: 1a7351f67e736878af0630ba939257e9e51d1b546fe94453755ecdf0dc98f6df + input_fingerprint: 8f70bf507e1fad4a6ae2783b18c2a40f8ea401c50fcf91f65e359007284ec996 template_sources: - gemfiles/modular/erb/r2/v3.0.gemfile.example gemfiles/modular/erb/r3/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r3_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 4cacc26880c605ea429b29f2f266abf98fadb6e2f214cedf215c62ae20e75b1b + input_fingerprint: f49d8543314e95ee00af246f3067bbec3e6c200e78d75a73705561ac97ee85fc template_sources: - gemfiles/modular/erb/r3/v5.0.gemfile.example gemfiles/modular/erb/r4/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r4_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 1ad3426afbade65d39530472015ef638f1801da7b7b22a1f1b8618460ac5f215 + input_fingerprint: 8c3fb91c4227f3ad8c17582fd174675d20c1c3ba045e2d82d4123b13d95b5227 template_sources: - gemfiles/modular/erb/r4/v5.0.gemfile.example gemfiles/modular/erb/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_erb_vHEAD_gemfile action: write dest_sha256: ad6f104a49e80e0cf625440e3dc816343fe7e2f037fc4971df75e7bb4305c683 - input_fingerprint: 7e54025b45ea53f888b63deb0f26011a3a0547d178fe2428a192d0a35bb74391 + input_fingerprint: 283cbb3e5335783343377d374054654d2c14eec304901453720bd262e0656c9f template_sources: - gemfiles/modular/erb/vHEAD.gemfile.example gemfiles/modular/json/truffleruby_22_3.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_22_3_gemfile action: write dest_sha256: 249c12eacbe90f9d0d2e81e7a62c4c7e9102e504ededcda4ecf660cb3bb68be4 - input_fingerprint: 899dd0e62e852b76d1994d3609f73c9d318527c4e88df65e98ce04e4376b31e9 + input_fingerprint: 031e215d54a94bf7699e6c042b2b6d6c4d33711320f7a27facbd5c572eb426cd template_sources: - gemfiles/modular/json/truffleruby_22_3.gemfile.example gemfiles/modular/json/truffleruby_23_0.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_0_gemfile action: write dest_sha256: 66aa010567f7afa1af8244a74c3c88ecaaf84dc87b6a25180691bb480d02ed28 - input_fingerprint: ea8fdce63ce80fbf067cb60f57b8e97845cc5f455020d31c6061b7398f1b17e6 + input_fingerprint: 486c0f9d6e88a3495e214cd70f1f9f0fd1cc6224be10c96094b79bb680d92c50 template_sources: - gemfiles/modular/json/truffleruby_23_0.gemfile.example gemfiles/modular/json/truffleruby_23_1.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_1_gemfile action: write dest_sha256: '080fcbdaf2bec73cad40832a3d51eebb380af789917b96f493d1460b0dd6361d' - input_fingerprint: ba13d544f57d62e9e32fab172b66e7c49a008a1da850a540f901ace2da9afdcc + input_fingerprint: af09cae3319f80a2d70788f9518d2305ef3d675b3e5b6e15ae7ac97a1447c429 template_sources: - gemfiles/modular/json/truffleruby_23_1.gemfile.example gemfiles/modular/mutex_m/r2/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r2_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 584163ac81d510135fa565500cc9c044ace925da027d793677a2b97cdb89d4c0 + input_fingerprint: f32af0a268e46cafbbb2ab9734e0911df4ed7e68da39c38b02bf56e305308bd1 template_sources: - gemfiles/modular/mutex_m/r2/v0.3.gemfile.example gemfiles/modular/mutex_m/r3/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r3_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 5bfcb28054ab5f05f1ecef71da738fbff959b5f5c0eaf63a34f4478b3becb520 + input_fingerprint: b2a529f2a30cf8c48c17421dfcc8752722157ca6da21da823dc8206dff46d003 template_sources: - gemfiles/modular/mutex_m/r3/v0.3.gemfile.example gemfiles/modular/mutex_m/r4/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r4_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: c17b8882ca2f4a2a5e587fbb9ffcb0c283c84ac021b1d726058dd34e1d58acd0 + input_fingerprint: c8e91f6277a1d80ea23844a0355e7ee61c4740d3c9bf0bbde7a51c8f8061abf4 template_sources: - gemfiles/modular/mutex_m/r4/v0.3.gemfile.example gemfiles/modular/mutex_m/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_vHEAD_gemfile action: write dest_sha256: '08018641c97f894788fa91b462da504ab2237213d18d95404136c393274ae3cb' - input_fingerprint: 64f04e783311d5656439e37ada615ef7acd62afe4c94ea467f4eaad4f9a58518 + input_fingerprint: 81be4ef31768371a7c5ff75964da29d56e9558c442d7c11ba66fda32945818bf template_sources: - gemfiles/modular/mutex_m/vHEAD.gemfile.example gemfiles/modular/optional.gemfile: recipe: template_source_application_gemfiles_modular_optional_gemfile action: write dest_sha256: f770e6e9a9dd2bd0f1f132e882d88038b2e21127dce3afe270908c7338c28bfd - input_fingerprint: 772e33cb38697289a2db172429d7345816ba03059de78f124aeaf2ca7c2fc7aa + input_fingerprint: 866958e4f5cd33c5c99f8813a30baa6ff10bfb9d539d4499251a6cc2cd823350 template_sources: - gemfiles/modular/optional.gemfile.example gemfiles/modular/rspec.gemfile: recipe: template_source_application_gemfiles_modular_rspec_gemfile action: write dest_sha256: d043f5c9344f6435edb4607c5adaf42c78e7fb6b8b6726007de2bbedefb376c3 - input_fingerprint: 71ca8c8e11d553e381850be309bc22af3aaa35ad087c38d8fd02deb8bbe99b98 + input_fingerprint: 1518a46c263b0e99028560d10a5465e9cd10f7c61c456cf88eeb0b7173e50096 template_sources: - gemfiles/modular/rspec.gemfile.example gemfiles/modular/runtime_heads.gemfile: recipe: template_source_application_gemfiles_modular_runtime_heads_gemfile action: write dest_sha256: 6ac7158c4a3088190f2a9082f01439eb27eca2172ab3464b15c9cb045aa885e1 - input_fingerprint: af083fe1a6e4641431d3abe6627dec2ffe62700c11a0685c7dc5e1e453fc1552 + input_fingerprint: 0756572ac62500e7dc268b580d2105eb3a26fafa83ba66b01d2e875d19d563ef template_sources: - gemfiles/modular/runtime_heads.gemfile.example gemfiles/modular/stringio/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r2_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: e0bb43d15374bea6e247e26336df3e61c9f2f228a376a2d0a588c5485dd6eaa2 + input_fingerprint: c9d03d9d7d6d9d2190a228d3bd30ad017635da5b6651015f0fd0d859a52f0577 template_sources: - gemfiles/modular/stringio/r2/v3.0.gemfile.example gemfiles/modular/stringio/r3/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r3_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 01c7a957734ed20b2d8e074ab56fab009ff1220aaf40d9b72eab017cde1485ff + input_fingerprint: 804f311674b4507ae03af2997ebbf5dbb5d15b4c040636d842c3fa9f335cd655 template_sources: - gemfiles/modular/stringio/r3/v3.0.gemfile.example gemfiles/modular/stringio/r4/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r4_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 7965e003101e454893b6b97beb51d25624415c9f9a3080092e82a3a0686148be + input_fingerprint: 241f2a6cf39466239eb0cb8896c7d332ee1b337b03021dfd6717c3a21aac8c7d template_sources: - gemfiles/modular/stringio/r4/v3.0.gemfile.example gemfiles/modular/stringio/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_stringio_vHEAD_gemfile action: write dest_sha256: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - input_fingerprint: ffb1229b96e241f4542cb4e9ccaef82d4ddaa7a2220360d98742567078860667 + input_fingerprint: a63859e5484bcbc009b4e1c57fd723809bd21d0b3bcfe8db35c4d18d77d270c1 template_sources: - gemfiles/modular/stringio/vHEAD.gemfile.example gemfiles/modular/style.gemfile: recipe: template_source_application_gemfiles_modular_style_gemfile action: write - dest_sha256: 2a3d46dcb8a9394f595f273f5eb0403d0a552837754ab109afc9ba79a7159083 - input_fingerprint: b64e8cb2165801c79d59b5796abaeda20972ccb0f11dc1c594530a38c172f04f + dest_sha256: 9a24acff0054573c30f5d84d0418cd465ba3794d075bb5a36801410ac40e0787 + input_fingerprint: 9e2e567552d76a63548c6ce61dc80e596023d03d9f7711765b21457611962b13 template_sources: - gemfiles/modular/style.gemfile.example gemfiles/modular/style_local.gemfile: recipe: template_source_application_gemfiles_modular_style_local_gemfile action: write dest_sha256: 55eb9c149cdb2f29c9f31abe2d55a4f334e00fb859681dd17c42149a3f28ca36 - input_fingerprint: 59bd7d31f22c49651aad051b272cbb02a6fe48319f2fe6c558e2268cb78f68dd + input_fingerprint: 9d5ad0c2046205558d7faef2a3d594e3f9d0258b08832f1bcdafeffe023da7a0 template_sources: - gemfiles/modular/style_local.gemfile.example gemfiles/modular/templating.gemfile: recipe: template_source_application_gemfiles_modular_templating_gemfile action: write - dest_sha256: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - input_fingerprint: 50dab17700749cd3a5bf417e3ff29a19d2a9f64d5c1dd605cef4296e922204eb + dest_sha256: 432ba59798d31b899268257c432443a017c5a9bd2c0c7f9f2216617e14150cd3 + input_fingerprint: 70aa5d1e844ab703be2ffc06f026481f7576bf8f34a2950089892cb1c77ffc2d template_sources: - gemfiles/modular/templating.gemfile.example gemfiles/modular/templating_local.gemfile: recipe: template_source_application_gemfiles_modular_templating_local_gemfile action: write - dest_sha256: 7b86bcf9409c3ea7b73fd056778492cb17ba35d5b42eff809594b75db961e132 - input_fingerprint: '0840798c0405bb348518a38f3cdf816e5a204f9e8a1f1e9b2c3c47b8bcc9bc70' + dest_sha256: 992b32b60b979d074bd107eb5fbd887da322f1653a13e949a3f2be6ae6cee876 + input_fingerprint: fdc859388a55160093b76c3f668f963d6a9eb01adb74dcd61cf73600ce047d35 template_sources: - gemfiles/modular/templating_local.gemfile.example gemfiles/modular/webrick/r4/v1.9.gemfile: recipe: template_source_application_gemfiles_modular_webrick_r4_v1_9_gemfile action: write dest_sha256: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea - input_fingerprint: 2e82b947763ee3ee19706d357a9271e929ff15ed6f440bc70e5db1a03ad2937d + input_fingerprint: 6b2efb0ddfdc434d9d5fde79a4a2600f1ba9ad0d57d3b137eb263190646f56d2 template_sources: - gemfiles/modular/webrick/r4/v1.9.gemfile.example gemfiles/modular/webrick/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_webrick_vHEAD_gemfile action: write dest_sha256: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b - input_fingerprint: 69716c47222fb67b6e5d6c9e834be102a3ce24fa6d51112f212a8043b39d9ed7 + input_fingerprint: a9bd1ccc3a4322e9f750f2bcbd248f132a1f4ed7999d3b20f8c4e3fe7081beeb template_sources: - gemfiles/modular/webrick/vHEAD.gemfile.example gemfiles/modular/x_std_libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_gemfile action: write dest_sha256: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a - input_fingerprint: cdee78f50366ed6cae42c154d43aae447eb0b9349e7283230055ab07cdd8e012 + input_fingerprint: dcda8241eb4926af5a25c310a2f928d69a7b5f6e67ef7bf02d90be06d440b4f2 template_sources: - gemfiles/modular/x_std_libs.gemfile.example gemfiles/modular/x_std_libs/r2/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r2_libs_gemfile action: write dest_sha256: e80ec8ad06cb1b31ac982bc25cf7696987fca131aa1001eaefd0bf5cd379c273 - input_fingerprint: 91f53d29d4bd23739ce29c2a4fee5f03d147535a4aec41a6a3d5fb682b71cd36 + input_fingerprint: c5f8775a21d45dff771329dafafac903423c52e964a61e9b5ded2c44905d06a3 template_sources: - gemfiles/modular/x_std_libs/r2/libs.gemfile.example gemfiles/modular/x_std_libs/r3.1/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_1_libs_gemfile action: write dest_sha256: 9f8565c40b09bea1bc4c2e2ad87fe11400c3c51a2b235655bfcd8e491ed88ca8 - input_fingerprint: e2521ed18ec9cfb9eba6a0d00241457e872ecd49ed235ae5846eb15428af4ff9 + input_fingerprint: 43055161714ae0faf33e604f9400ea9535f524e374221f32c75dea4ce9df6f3b template_sources: - gemfiles/modular/x_std_libs/r3.1/libs.gemfile.example gemfiles/modular/x_std_libs/r3/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_libs_gemfile action: write dest_sha256: 546f8849f4267bb19aa10ff0de40be30957197f229e6887847181ea9127b2650 - input_fingerprint: 793756db63d4966cd933f7d57d19be5bfd3a78ecbcefbef4ac2bd8ceedcc0170 + input_fingerprint: 4519f072a19a6ce6d7a84e55226a5fd828953343d77744e4135d467d82c6776b template_sources: - gemfiles/modular/x_std_libs/r3/libs.gemfile.example gemfiles/modular/x_std_libs/r4/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r4_libs_gemfile action: write dest_sha256: 8c2582eaa218d216b98c86c933465295c8b4e43f3251ea388b9eaf6e471f8da6 - input_fingerprint: fdcc00347807c7cc65ee25421529095277a92b6ede933272dde2d3b3bc740648 + input_fingerprint: af002e9289ed8d9872c0b16883ac723c337135eb83471ebb046cb53aa7a74b4e template_sources: - gemfiles/modular/x_std_libs/r4/libs.gemfile.example gemfiles/modular/x_std_libs/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_vHEAD_gemfile action: write dest_sha256: d3133ec4c0638363a7fb025d19be7e95a615fd61c35ddb8d17f2280ee74a7486 - input_fingerprint: a135c34c593da36f28c53d59a5de4e8681eb07c393bf556fe737b2857f1cdb78 + input_fingerprint: 884c443948714d7a7a8901232313c3b01251def29957eac7cefb52854ea77df7 template_sources: - gemfiles/modular/x_std_libs/vHEAD.gemfile.example kramdown-merge.gemspec: recipe: template_source_application_kramdown_merge_gemspec action: write - dest_sha256: 07a3542589295b05925c06f040883e90aecb97af689752e36d06596dd539705f - input_fingerprint: 4132bb801e3c5ba6e26e72229289ac6b36174cae65f22338f77b87fbef3927cc + dest_sha256: 8129f43f23cbef69a4b2ce5634394a3d665ed9e186519fa1f481ab16ad0df331 + input_fingerprint: 3baf3ab05e9213e1dce5a716f772f30589c3e7dcfe2f427c6ec420bbdb4a77c5 template_sources: - gem.gemspec.example lib/kramdown/merge/version.rb: recipe: template_source_application_lib_kramdown_merge_version_rb action: write - dest_sha256: b1ceec596249426c712dde1abfbf20faac90e7061b1aecdce83b15d7e5e8e0cf - input_fingerprint: e766ce32df41d13fd481765c9c72b4a1838c572050c1d7915bb790c21e2c6024 + dest_sha256: 693bbf1bfeacce7bf1eb36bad51d82aa19f4b4beff01673a895003ed785b7f59 + input_fingerprint: cdbdee9c0a50e912eef1d96230ebf7d871200b43cf87a244ca8447b6491c88a1 template_sources: - lib/gem/version.rb.example mise.toml: recipe: template_source_application_mise_toml action: write dest_sha256: 7d267154ca4f081b0ac7da804c0180c2b091aec5f1c877417c1c320f4f369c88 - input_fingerprint: a3ae5b6c1b00b73132c90475cd0f48c5de9d8f56d16109897e19a1c9a5ffe8e4 + input_fingerprint: 8fe26a9aaf3ba4e82f2aef6905c6fac9cf2dc5c28eabda9e0f02512a277acf85 template_sources: - mise.toml.no-osc.example sig/kramdown/merge.rbs: recipe: template_source_application_sig_kramdown_merge_rbs action: write dest_sha256: 0fe9c2c359aef76b2098cfadb7009b7cf75cb3a23427a06d64b58ce1a803f0b2 - input_fingerprint: 922c9d36d501a3d6ea5a75d9648c5516bfb87e8777eb871b2917587cbfa50453 + input_fingerprint: a5ea92b0357d314bb8db8a8908ebd7bcafcc3bc27e4f70368ede23ab9e7dec48 template_sources: - sig/gem.rbs.example spec/spec_helper.rb: recipe: template_source_application_spec_spec_helper_rb action: write dest_sha256: 662575e604bbdf6b101c9f45b1c9183ff3aa84b217817a8835d7651d8e31ac9c - input_fingerprint: 11233d9c9a47daaa320c782b8bdded997717f8dea30c4beeeb64200f695660ad + input_fingerprint: 802b741179f45bc1be9b678c273572de42e52d61e3a0c57ecf0f2b1655c9a19a template_sources: - spec/spec_helper.rb.example diff --git a/gems/kramdown-merge/Gemfile b/gems/kramdown-merge/Gemfile index a5ac1eee4..ca03e7ec1 100644 --- a/gems/kramdown-merge/Gemfile +++ b/gems/kramdown-merge/Gemfile @@ -19,7 +19,7 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } # Include dependencies from kramdown-merge.gemspec gemspec -gem 'kettle-family', '~> 1.2', '>= 1.2.97' +gem 'kettle-family', '~> 1.2', '>= 1.2.100' # Local workspace dependency wiring for *_local.gemfile overrides gem 'nomono', '~> 1.1', '>= 1.1.5', require: false # ruby >= 3.2.0 diff --git a/gems/kramdown-merge/Gemfile.lock b/gems/kramdown-merge/Gemfile.lock index 4301768e7..830acb80d 100644 --- a/gems/kramdown-merge/Gemfile.lock +++ b/gems/kramdown-merge/Gemfile.lock @@ -10,131 +10,131 @@ GIT PATH remote: . specs: - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown (~> 2.5) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) + ast-crispr-markdown-markly (7.1.9) + ast-crispr (= 7.1.9) + markdown-merge (= 7.1.9) + markly-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism specs: - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) + ast-crispr-ruby-prism (7.1.9) + ast-crispr (= 7.1.9) + prism-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) + ast-crispr (7.1.9) + ast-merge (= 7.1.9) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ast-merge-git (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: - ast-merge (7.1.8) + ast-merge (7.1.9) benchmark token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) + ast-template (7.1.9) + ast-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + bash-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + binary-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) + citrus-toml-merge (7.1.9) + ast-merge (= 7.1.9) + toml-merge (= 7.1.9) toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge specs: - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) commonmarker (~> 2.2) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) + dotenv-merge (7.1.9) + ast-merge (= 7.1.9) + plain-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + go-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + html-merge (7.1.9) + ast-crispr (= 7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + json-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: - kettle-jem (7.1.25) + kettle-jem (7.1.26) addressable (>= 2.8, < 3) ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) @@ -168,114 +168,114 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + markdown-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) + markly-merge (7.1.9) + markdown-merge (= 7.1.9) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge specs: - parslet-toml-merge (7.1.8) + parslet-toml-merge (7.1.9) toml (~> 0.3) - toml-merge (= 7.1.8) + toml-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + plain-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) + prism-merge (7.1.9) + ast-merge (= 7.1.9) prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + psych-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) + yaml-merge (= 7.1.9) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) + rbs-merge (7.1.9) + ast-merge (= 7.1.9) rbs (>= 3.10) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + rust-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) + smorg-rb (7.1.9) + ast-merge (= 7.1.9) + ast-merge-git (= 7.1.9) + bash-merge (= 7.1.9) diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) + dotenv-merge (= 7.1.9) + go-merge (= 7.1.9) + html-merge (= 7.1.9) + json-merge (= 7.1.9) kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) + markdown-merge (= 7.1.9) + plain-merge (= 7.1.9) + prism-merge (= 7.1.9) + psych-merge (= 7.1.9) + rbs-merge (= 7.1.9) + rust-merge (= 7.1.9) + toml-merge (= 7.1.9) + typescript-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + toml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: - tree_haver (7.1.8) + tree_haver (7.1.9) citrus (~> 3.0) parslet (~> 2.0) tree_sitter_language_pack (>= 1.16.2, < 2.0) @@ -284,25 +284,25 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + typescript-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + yaml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) + zip-merge (7.1.9) + binary-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) GEM @@ -336,6 +336,8 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) + commonmarker (2.10.0) + rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -465,11 +467,15 @@ GEM lint_roller (1.1.0) logger (1.7.0) markly (0.19.0) + mini_portile2 (2.8.9) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) reline (~> 0.6) mutex_m (0.3.0) + nokogiri (1.19.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-musl) @@ -503,6 +509,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) + rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -696,13 +705,16 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.16.2-aarch64-linux) + tree_sitter_language_pack (1.17.0) + rb_sys (>= 0.9.130, < 0.10) + sorbet-runtime (~> 0.5) + tree_sitter_language_pack (1.17.0-aarch64-linux) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-arm64-darwin) + tree_sitter_language_pack (1.17.0-arm64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-linux) + tree_sitter_language_pack (1.17.0-x86_64-linux) sorbet-runtime (~> 0.5) tsort (0.2.0) tty-cursor (0.7.1) @@ -784,9 +796,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.31) + kettle-dev (~> 3.0, >= 3.0.34) kettle-drift (~> 1.0, >= 1.0.13) - kettle-family (~> 1.2, >= 1.2.97) + kettle-family (~> 1.2, >= 1.2.100) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) @@ -806,12 +818,12 @@ DEPENDENCIES reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) - rubocop-lts (~> 24.2, >= 24.2.1) - rubocop-lts-rspec (~> 1.0, >= 1.0.5) + rubocop-lts (~> 24.2, >= 24.2.3) + rubocop-lts-rspec (~> 1.0, >= 1.0.6) rubocop-minitest (~> 0.40, >= 0.40.0) rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! - rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) ruby-merge! ruby-progressbar (~> 1.13) rust-merge! @@ -842,33 +854,34 @@ CHECKSUMS appraisal2 (3.2.3) sha256=3a6cfaf8a444e02707b9a34154af1c4902fbe99d9d2168d7e81dd83ec77e6db7 appraisal2-rubocop (1.0.2) sha256=1dae97c1be087cf9c098a3a72fd41f873435e9b8b39687e633b36c9ccb22bff4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.8) - ast-crispr-markdown-markly (7.1.8) - ast-crispr-ruby-prism (7.1.8) - ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) + ast-crispr (7.1.9) + ast-crispr-markdown-markly (7.1.9) + ast-crispr-ruby-prism (7.1.9) + ast-merge (7.1.9) + ast-merge-git (7.1.9) + ast-template (7.1.9) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.8) + bash-merge (7.1.9) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) - bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae + binary-merge (7.1.9) + bundler (4.1.0.beta1) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.8) + citrus-toml-merge (7.1.9) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 + commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e commonmarker (2.10.0-x86_64-darwin) sha256=01e0830ed0319825ecdc16411c90acd3f661d1568dfc178731b3f64d0ce2363d commonmarker (2.10.0-x86_64-linux) sha256=945c510c0bfca9022245928e2248468fe3ddad58c939be0c37b20082cc392880 commonmarker (2.10.0-x86_64-linux-musl) sha256=288cd4fb9f17eed2ffa73551ef241dcf594e0f484b2aee2a0999540333c0618e - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) completely (0.8.0) sha256=e493cd5d84805f47917a41f277ecbfe5f35363bed670be5a957d3acaed8c6c5e concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 @@ -877,7 +890,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docopt_ng (0.7.1) sha256=a024148ee4fa3ab1a8a04411aa4370f39cf2b446e63562097d418b7974a15667 - dotenv-merge (7.1.8) + dotenv-merge (7.1.9) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -890,35 +903,37 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) + go-merge (7.1.9) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) + html-merge (7.1.9) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a - json-merge (7.1.8) - kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + json-merge (7.1.9) + kettle-changelog (1.0.7) + kettle-dev (3.0.34) + kettle-drift (1.0.13) kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 - kettle-jem (7.1.25) + kettle-jem (7.1.26) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 - kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd + kettle-soup-cover (3.0.10) kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 - markdown-merge (7.1.8) + markdown-merge (7.1.9) markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca - markly-merge (7.1.8) + markly-merge (7.1.9) + mini_portile2 (2.8.9) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 + nokogiri (1.19.4) nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af nokogiri (1.19.4-arm64-darwin) sha256=a46db9853286e6597b36ebc6953817d15acf3a299583eb3f89fdc6f91dd63527 @@ -932,20 +947,22 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) - plain-merge (7.1.8) + parslet-toml-merge (7.1.9) + plain-merge (7.1.9) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.8) + prism-merge (7.1.9) psych (5.5.0) sha256=4b245bbbd0f3238df8ccee766ebc1a6b062b10e4ee1d3284eb588739ba156a0a - psych-merge (7.1.8) + psych-merge (7.1.9) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 - rbs-merge (7.1.8) + rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -981,11 +998,11 @@ CHECKSUMS rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.8) + ruby-merge (7.1.9) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) + rust-merge (7.1.9) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -993,7 +1010,7 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) + smorg-rb (7.1.9) sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,24 +1027,25 @@ CHECKSUMS timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.8) + toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb - tree_haver (7.1.8) - tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 - tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 - tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 - tree_sitter_language_pack (1.16.2-x86_64-linux) sha256=d8151e6e44e35ace9de3611c76b730896beab17f427db06d8f76666332a5dc60 + tree_haver (7.1.9) + tree_sitter_language_pack (1.17.0) + tree_sitter_language_pack (1.17.0-aarch64-linux) + tree_sitter_language_pack (1.17.0-arm64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-linux) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f tty-cursor (0.7.1) sha256=79534185e6a777888d88628b14b6a1fdf5154a603f285f80b1753e1908e0bf48 tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) + typescript-merge (7.1.9) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 yaml-converter (0.2.5) sha256=a5214fe1a6c2df88bd34a35bcded1b1dcd30135548130df2e03b54ca8c0f2423 - yaml-merge (7.1.8) + yaml-merge (7.1.9) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.8) sha256=73d935d43e3479d65ce8aff25c7d3100e8bb83528a2adaa0ed824e5046ac99e7 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -1036,8 +1054,8 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) + zip-merge (7.1.9) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH - 4.0.20 + 4.1.0.beta1 diff --git a/gems/kramdown-merge/Rakefile b/gems/kramdown-merge/Rakefile index fa9c5cfb1..2a45a30a3 100644 --- a/gems/kramdown-merge/Rakefile +++ b/gems/kramdown-merge/Rakefile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -# kramdown-merge Rakefile v7.1.18 - 2026-09-07 +# kramdown-merge Rakefile v7.1.26 - 2026-09-09 # Ruby 2.3 (Safe Navigation) or higher required # # See LICENSE.md for license information. diff --git a/gems/kramdown-merge/bin/rubocop-gradual b/gems/kramdown-merge/bin/rubocop-gradual new file mode 100755 index 000000000..7c7ff0635 --- /dev/null +++ b/gems/kramdown-merge/bin/rubocop-gradual @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'rubocop-gradual' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'rubygems' +require 'bundler/setup' + +load Gem.bin_path('rubocop-gradual', 'rubocop-gradual') diff --git a/gems/kramdown-merge/gemfiles/modular/coverage_local.gemfile b/gems/kramdown-merge/gemfiles/modular/coverage_local.gemfile index 37917caac..d6c890e46 100644 --- a/gems/kramdown-merge/gemfiles/modular/coverage_local.gemfile +++ b/gems/kramdown-merge/gemfiles/modular/coverage_local.gemfile @@ -29,11 +29,31 @@ Kernel.send(:gem, 'nomono', *nomono_activation_requirements) require 'nomono/bundler' local_gems = %w[kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -local_gems_to_eval = local_gems - %w[] - declared_gems # export KETTLE_DEV_DEV=/path/to/my platform :mri do + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + local_gems_to_eval = local_gems - %w[] - declared_gems + eval_nomono_gems( gems: local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/kramdown-merge/gemfiles/modular/style.gemfile b/gems/kramdown-merge/gemfiles/modular/style.gemfile index 59c5dc1a3..41ec99454 100644 --- a/gems/kramdown-merge/gemfiles/modular/style.gemfile +++ b/gems/kramdown-merge/gemfiles/modular/style.gemfile @@ -24,9 +24,9 @@ platform :mri do if ENV.fetch('RUBOCOP_LTS_DEV', 'false').casecmp('false').zero? declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) - gem 'rubocop-lts', '~> 24.2', '>= 24.2.1' unless declared_gems.include?('rubocop-lts') - gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.5' unless declared_gems.include?('rubocop-lts-rspec') - gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.6' unless declared_gems.include?('rubocop-ruby3_2') + gem 'rubocop-lts', '~> 24.2', '>= 24.2.3' unless declared_gems.include?('rubocop-lts') + gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.6' unless declared_gems.include?('rubocop-lts-rspec') + gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.8' unless declared_gems.include?('rubocop-ruby3_2') else eval_gemfile('style_local.gemfile') end diff --git a/gems/kramdown-merge/gemfiles/modular/templating.gemfile b/gems/kramdown-merge/gemfiles/modular/templating.gemfile index 6af159bd7..ce51a08ed 100644 --- a/gems/kramdown-merge/gemfiles/modular/templating.gemfile +++ b/gems/kramdown-merge/gemfiles/modular/templating.gemfile @@ -18,7 +18,7 @@ end if structuredmerge_remote # Merge recipes for released installs. - gem 'kettle-jem', '>= 7.0' + gem 'kettle-jem', '~> 7.1', '>= 7.1.26' end if kettle_remote diff --git a/gems/kramdown-merge/gemfiles/modular/templating_local.gemfile b/gems/kramdown-merge/gemfiles/modular/templating_local.gemfile index 3be621fde..5094b0323 100644 --- a/gems/kramdown-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/kramdown-merge/gemfiles/modular/templating_local.gemfile @@ -65,9 +65,7 @@ structuredmerge_local_gems = %w[ kettle_dev_local_gems = %w[ kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift ] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[] -kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - (declared_gems - %w[kettle-dev]) if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( @@ -81,6 +79,28 @@ if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 end if ENV.fetch('KETTLE_DEV_DEV', 'false').casecmp('false') != 0 + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - declared_gems + eval_nomono_gems( gems: kettle_dev_local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/kramdown-merge/kramdown-merge.gemspec b/gems/kramdown-merge/kramdown-merge.gemspec index ad74b4801..94e9d42bb 100644 --- a/gems/kramdown-merge/kramdown-merge.gemspec +++ b/gems/kramdown-merge/kramdown-merge.gemspec @@ -120,7 +120,7 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.31') # ruby >= 4.0.0 + spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.34') # ruby >= 4.0.0 # Security spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 From 454d78d10aa6d7cc55b44e7b9eea1e2f04cdb653 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 23:56:02 -0400 Subject: [PATCH 102/137] =?UTF-8?q?=F0=9F=8E=A8=20Template=20ast-crispr-ru?= =?UTF-8?q?by-prism=20by=20kettle-family?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr-ruby-prism/.kettle-drift.lock | 76 ++++- .../.rubocop_gradual.lock | 7 +- .../.structuredmerge/kettle-jem.lock | 145 ++++---- gems/ast-crispr-ruby-prism/Gemfile | 2 +- gems/ast-crispr-ruby-prism/Gemfile.lock | 320 +++++++++--------- gems/ast-crispr-ruby-prism/Rakefile | 2 +- .../ast-crispr-ruby-prism.gemspec | 2 +- .../ast-crispr-ruby-prism/bin/rubocop-gradual | 16 + .../gemfiles/modular/coverage_local.gemfile | 24 +- .../gemfiles/modular/style.gemfile | 6 +- .../gemfiles/modular/templating.gemfile | 2 +- .../gemfiles/modular/templating_local.gemfile | 24 +- 12 files changed, 388 insertions(+), 238 deletions(-) create mode 100755 gems/ast-crispr-ruby-prism/bin/rubocop-gradual diff --git a/gems/ast-crispr-ruby-prism/.kettle-drift.lock b/gems/ast-crispr-ruby-prism/.kettle-drift.lock index 98b009e1e..1b23f4793 100644 --- a/gems/ast-crispr-ruby-prism/.kettle-drift.lock +++ b/gems/ast-crispr-ruby-prism/.kettle-drift.lock @@ -1,10 +1,82 @@ { + "debug_env: 'KETTLE_DEV_DEBUG',\nroot: %w[src my kettle-dev]": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 46, + 63 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 93, + 110 + ] + } + ], + "path_env: 'KETTLE_DEV_DEV',\nvendored_gems_env: 'VENDORED_GEMS',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 43, + 60 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 90, + 107 + ] + } + ], + "prefix: 'KETTLE_DEV',\npath_env: 'KETTLE_DEV_DEV',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 42, + 59 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 89, + 106 + ] + } + ], + "vendor_gem_dir_env: 'VENDOR_GEM_DIR',\ndebug_env: 'KETTLE_DEV_DEBUG',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 45, + 62 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 92, + 109 + ] + } + ], "vendored_gems_env: 'VENDORED_GEMS',\nvendor_gem_dir_env: 'VENDOR_GEM_DIR',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 44, + 61 + ] + }, { "file": "gemfiles/modular/templating_local.gemfile", "lines": [ - 77, - 88 + 75, + 91, + 108 ] } ] diff --git a/gems/ast-crispr-ruby-prism/.rubocop_gradual.lock b/gems/ast-crispr-ruby-prism/.rubocop_gradual.lock index 497f7a16c..f96374016 100644 --- a/gems/ast-crispr-ruby-prism/.rubocop_gradual.lock +++ b/gems/ast-crispr-ruby-prism/.rubocop_gradual.lock @@ -2,13 +2,13 @@ ".simplecov:852812133": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] ], - "Rakefile:3929978397": [ + "Rakefile:4140725214": [ [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], [81, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], [165, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], [168, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] ], - "ast-crispr-ruby-prism.gemspec:1469887299": [ + "ast-crispr-ruby-prism.gemspec:828317446": [ [137, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4147388508], [148, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], [149, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] @@ -27,6 +27,9 @@ [1, 1, 0, "Naming/FileName: The name of this source file (`vHEAD.gemfile`) should use snake_case.", 5381], [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], + "gemfiles/modular/coverage_local.gemfile:2813372128": [ + [34, 1, 1586, "Metrics/BlockLength: Block has too many lines. [37/25]", 820328175] + ], "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], diff --git a/gems/ast-crispr-ruby-prism/.structuredmerge/kettle-jem.lock b/gems/ast-crispr-ruby-prism/.structuredmerge/kettle-jem.lock index 34d1891e7..f4e8757dc 100644 --- a/gems/ast-crispr-ruby-prism/.structuredmerge/kettle-jem.lock +++ b/gems/ast-crispr-ruby-prism/.structuredmerge/kettle-jem.lock @@ -1,11 +1,12 @@ --- version: 1 template_state: - version: 7.1.18 - applied_at: '2026-09-07' + version: 7.1.26 + applied_at: '2026-09-10' changelog_replay: last_entry_key: kettle-jem-template-20260802-001 last_entry_date: '2026-08-02' + maintenance_changelog: {} checksums: ".aiignore.example": 48a5dfdd93afd1a15fdce39cc28ca9920263f00018b0968ab031fa744521e5ce ".config/mise/env.sh": aeea5a2ab489ba6e5467ae8de6e386ec8c8fe4ff31a044e69d0cd6a092dd6654 @@ -75,7 +76,7 @@ template_state: ".rubocop_rspec.yml.example": 288ad75e7eb14d87d80fafe6f7272217be5c57547536ee56c780a7d10ac7ec74 ".simplecov.example": 222f2e6ce8cf089c70a21f0f5e5423d4bd59a96fdb2ce7754b0fb3d6f430c229 ".structuredmerge/git-drivers.toml.example": 9d241a44c9edffcdbd3da018fa188a238089c3d1635040924df594a6929a4f97 - ".structuredmerge/kettle-jem.yml.example": 26949dc4ee0722415e72452cbc186bee6ef7b154eae33166d36f3fdb1ca6e46d + ".structuredmerge/kettle-jem.yml.example": ff65a738da1af7d60714026a81d3323a46c864e96ae3570b806afdf6e7149ff9 ".yard-lint.yml.example": 90def46867c9436b4e177c47d91fc8165f4602e335715aecc39f5587ae20b55b ".yardignore.example": 821f453c609df7d46145d675424b39dfbe6dfdca8edac5f367b85fff48502455 ".yardopts.example": 6fd6f2701713096a8a9ea095c213bbc68eeef37797c4754d97837e3229a3a5f6 @@ -88,7 +89,7 @@ template_state: CHANGELOG.transfer.md: 21331d8a9e58b4ff6e088b88eb408bcccb0f2f64e78f8f4d42ac3f11a24baad8 CITATION.cff.example: e404ea0a7919d78a83d53d80e211d17b9663576aa606583b709795dc023fd75c CODE_OF_CONDUCT.md.example: f1ad532f1860f73ef774c6b27a26d41f4bc1cb8813034f5957487766ebb0986b - CONTRIBUTING.md.example: 22570cfb3dde72be79b4b522b6d5ab13f95d778e40444483a096871fe0891b19 + CONTRIBUTING.md.example: 8d23cce2d061e0c20d619c3f66591df5f32821cd84c32d171df0b8ebe1217a55 FUNDING.md.example: 392d047904b1557b29f4b43d37ec403b7480edd5b6ab51180be979b57a91e6ba FUNDING.md.no-osc.example: 3ef0258dd3e3b7f7e17e8bc2d20dcbcb3e74aa5a5a6f51297075696645e34c77 Gemfile.example: 99500023987e81775a9b5ef14e92cb3992f2ac408e5f42454f2728eee9b49fb2 @@ -99,19 +100,19 @@ template_state: PolyForm-Small-Business-1.0.0.md.example: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 README.md.example: 21f491e3d73bfc1b74056a6dcba61f72c93dee3cfe5272ac164a20978454de21 REEK: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - RUBOCOP.md.example: c09e5533ccc59b70a2efa05c99f66e521137c1053d3c12eb43509cebd5b68b0e + RUBOCOP.md.example: d99871a0e4c1d323c92e7febf328f062bb4722069b2abfd0a83bf7daa8dcbf8c Rakefile.example: 569803e726b07ea26267fec6891367a3096a0dff3c266269a7081d36afe496af SECURITY.md.example: ee9411aa85f36d88363fdaea7a1baea4362b6ec112cf2688e711b05de1d3144c bin/setup.example: 0ac35089c95a91d8973fe7a318bf9fd98b9f8e00db92c5d9ca6cd858abb8d41b certs/pboling.pem.example: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - gem.gemspec.example: 83e834e8958a88e4817a57199f48f5ebb245548ce251c5c47372208693f03b17 + gem.gemspec.example: 12dcadc0b297ccd4e18b9d1e538b98ac8330ef9fb2a059ed6754ad59272b77fa gemfiles/modular/benchmark/r4/v0.5.gemfile.example: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 gemfiles/modular/benchmark/vHEAD.gemfile.example: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 gemfiles/modular/cgi/r4/v0.5.gemfile.example: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 gemfiles/modular/cgi/vHEAD.gemfile.example: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 gemfiles/modular/changelog.gemfile.example: 892598e0e7792eb205247ae28128cef6dfc647d2fb33968969152230d6f69288 gemfiles/modular/coverage.gemfile.example: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - gemfiles/modular/coverage_local.gemfile.example: 928d5f260d7b119c038baa56da9fb78dd524dee613aea33ab72894bbce5c506e + gemfiles/modular/coverage_local.gemfile.example: 92ea0d7a9d693553dc614afa2c43990f5c3778c2b00ef6c528e122c31bd506a1 gemfiles/modular/debug.gemfile.example: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 gemfiles/modular/documentation.gemfile.example: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c gemfiles/modular/documentation_local.gemfile.example: 84a20f5d4b0feb94c2cf2f7a8dce8f682f1483498e41484c2b447a5661fd1870 @@ -145,10 +146,10 @@ template_state: gemfiles/modular/stringio/r3/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/r4/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/vHEAD.gemfile.example: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - gemfiles/modular/style.gemfile.example: 3ad0585b4f2db8918580ca41ea8723f7a166d7a83cfd7f9613511094997106fd + gemfiles/modular/style.gemfile.example: 02fe3e8fd00e49b90c3ab30e19b51014ee50490f3eadcfd1d4a39f4c2c997dda gemfiles/modular/style_local.gemfile.example: c86beb711e766126a5be68be4be18255831625ac3650d5069383c4a83a9511f3 - gemfiles/modular/templating.gemfile.example: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - gemfiles/modular/templating_local.gemfile.example: 930057d3b909a72e39a39125c4e883a7ff71f5691e64426c0541f8c8fc75b83f + gemfiles/modular/templating.gemfile.example: 2b33c094677b53ad9dd2eafeb3a3be452f612380c61001a2e75b3c078b8ff72a + gemfiles/modular/templating_local.gemfile.example: ac7259516e69ffafb8b9342a897ddf6042adc46335743f474c342509cefd8f2e gemfiles/modular/webrick/r4/v1.9.gemfile.example: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea gemfiles/modular/webrick/vHEAD.gemfile.example: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b gemfiles/modular/x_std_libs.gemfile.example: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a @@ -175,7 +176,7 @@ template_state: shim/Gemfile.example: 0fb0d9d06fcfb1fd6ca6f0eeb5867253ca1ed221e03d28027719225f868b0637 shim/README.md.example: 3a2f7211b7f92a1dfae5e523b8e34b051a3d8af942144b05286eca0b3c8f6fbe shim/Rakefile.example: 572c94da7052083b39b62a6600785419e314a109efd7a3d8c3a96eb77ad34fd1 - shim/gem.gemspec.example: efae033238e4fd1355cfc134f5c9123f175d1ad1dc4a1a2e663899788c9e0870 + shim/gem.gemspec.example: 14a7015b3328005d1c3b5fda6886bd6da383707745f6eaaa781d6f9689600131 shim/lib/compat_require.rb.example: 94ee85e353a3ca08c8a35c9063d4ff789214ea594c7f803f6cf09d7142f48379 shim/lib/entrypoint.rb.example: dd57613520daca01d6f6bcaa9b83b00ff74505240dc04b84ceb686df3c0539d7 shim/lib/version.rb.example: 15e219ac3a928b5580035f891e415551213175020f1131f6e7ca0ccd55a1b2d6 @@ -189,370 +190,370 @@ files: recipe: template_source_application_simplecov action: write dest_sha256: 3529fc201f57ea59449f472121b9163f9757ed7bc64d69028bbaf75fafde992f - input_fingerprint: 2db877f70f19c927c17ab43544a19bcb93a93bb0468bd8dcc3255ac85597d265 + input_fingerprint: f3ec650342e1912eb27e2c68afb76cd3840cd532a2debee02e3e20b259606879 template_sources: - ".simplecov.example" AGPL-3.0-only.md: recipe: template_source_application_AGPL_3_0_only_md action: write dest_sha256: d8a6cc31abc16b6748c7a21f21611f5a1ec33f67d22ca23d7da1c19b95496bee - input_fingerprint: 70de6372bb9ceb82e5ef106c8633964bc9a35295cdcb6feb9a6b36683155d427 + input_fingerprint: bee811e4c60ea44bd0f6eb3ac2f69ffd127136ee9a89c789fba94dc4dd3c001b template_sources: - AGPL-3.0-only.md.example Gemfile: recipe: template_source_application_Gemfile action: write - dest_sha256: 9ee7483bdca4cadea10ce50d8bdee9474aff0c9d23f29a1a96bfc61fca3c5114 - input_fingerprint: 50d573884a5832fd093b54cf1e55db543a42701f995c48b243d22e8f651c94e4 + dest_sha256: e9063965042cd75535d7cd934cf86ac2f502310f747e3059d066668f7182a8d1 + input_fingerprint: 76e2a94db2e3f64f8eb3d7821293a9c8f655ddd94cb7b5c5d9604a05f2a6ee80 template_sources: - Gemfile.example LICENSE.md: recipe: template_source_application_LICENSE_md action: write dest_sha256: f6188bfd474a636d2a526420ebb411250faa447d94c9b9ccee097128ce4101b5 - input_fingerprint: b9ddc45df96225a76e9514a28258a5ccb8628af499307396a7e285868342980e + input_fingerprint: f1dc8a391a54b1af9adbb85db6c7e7d3ab0f98bc455c78f058082956cbdb0de1 template_sources: - LICENSE.md.example PolyForm-Small-Business-1.0.0.md: recipe: template_source_application_PolyForm_Small_Business_1_0_0_md action: write dest_sha256: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 - input_fingerprint: e36a4c83acbfc9e6a84333bf13519fabcff773ac080e83173ab5bd3df79cea56 + input_fingerprint: ab27e04523e2f7a26da3f1d961c9edbf0d160d6ce8b961c6e5af982b6d625a7b template_sources: - PolyForm-Small-Business-1.0.0.md.example README.md: recipe: template_source_application_README_md action: write dest_sha256: d78d0165db5c243cc84028aca30282746facee5110ce418f8f91197173d360fe - input_fingerprint: 48e3e6ea0b23e728ff60b1ca5c541db64fd0e80199fd5c2d0937b4026a45891c + input_fingerprint: 3af8b7b2d2276b4cdd355cb129cdba2101f1f53aa79c69feeb2cee13e463902a template_sources: - README.md.example Rakefile: recipe: template_source_application_Rakefile action: write - dest_sha256: fc2cb4a653bea44eb006feeee4f1ee235fa11f9e28587fa1c58f2491fb440364 - input_fingerprint: b3d94b2fd6ebbe225ed0000432207156cd874b4347fb0fde73563393af8cf518 + dest_sha256: b61811476c028584d2c49847881e446bf0f8199039af1cf6fe60f6f694867aea + input_fingerprint: bd5df839fa7e3c0b11677f5fef465500d53040472c051fa3f1bc47f4626c72df template_sources: - Rakefile.example ast-crispr-ruby-prism.gemspec: recipe: template_source_application_ast_crispr_ruby_prism_gemspec action: write - dest_sha256: e460d3f5f5111cfcdf221411b77516a2c06479ce5006e782f6c320ba6748d781 - input_fingerprint: b4c63c1bbf00c07bc05566b7431df887d845f4041459f59286c52c8af135b001 + dest_sha256: df0862ccfa4ed3d689bb4486e46427e20125d3441e88c7510f1ebf82cd4dbcde + input_fingerprint: 4ec66f128160c80f383e03f051272f0ed1159246af8c877de9b2d7ccd17f2c3a template_sources: - gem.gemspec.example certs/pboling.pem: recipe: template_source_application_certs_pboling_pem action: write dest_sha256: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - input_fingerprint: '085a571d60a4ff60465cb8f7f970243a1bfd4f1b8cb6f87fcacb241f70118703' + input_fingerprint: 1961465349629b0e8f33400ef2c33182bcecc5303d21889aa97efaacd80f8f4a template_sources: - certs/pboling.pem.example gemfiles/modular/benchmark/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_r4_v0_5_gemfile action: write dest_sha256: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 - input_fingerprint: e8454473b6c856a80252b4a5e479182b370fdc6c750c5e55a137a277e3c7f67b + input_fingerprint: bd58fc6b8e4b01451ef0cb49e7852538e0fa582518d1a1c71e9bee900a256604 template_sources: - gemfiles/modular/benchmark/r4/v0.5.gemfile.example gemfiles/modular/benchmark/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_vHEAD_gemfile action: write dest_sha256: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 - input_fingerprint: 5cc85e63ea9b0f71e24c93b4003340f39e2d09fd0a9f1dcb5515de991f661aa0 + input_fingerprint: 6f33a380dd7ddcfc6b48c68fbc78663771dd9c1015391e6f67f17b8e07fbfcc0 template_sources: - gemfiles/modular/benchmark/vHEAD.gemfile.example gemfiles/modular/cgi/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_cgi_r4_v0_5_gemfile action: write dest_sha256: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 - input_fingerprint: f058c90577705a62584d6596381dbccfccf0ff37fe20ea600d5bed74a2358fc8 + input_fingerprint: aaeac3c828c36315f3716c7a35d92b0409d13351c7f66431274e88f21edbd874 template_sources: - gemfiles/modular/cgi/r4/v0.5.gemfile.example gemfiles/modular/cgi/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_cgi_vHEAD_gemfile action: write dest_sha256: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 - input_fingerprint: ded5b385df6d9ddfcd1828a479dff25b58bd194755632f24551875d5e824316d + input_fingerprint: ff20578a99606e8e8a2e07c7e355d10a6f6ae8782dd19f750e3ba215d122642b template_sources: - gemfiles/modular/cgi/vHEAD.gemfile.example gemfiles/modular/changelog.gemfile: recipe: template_source_application_gemfiles_modular_changelog_gemfile action: write dest_sha256: da669526144fbff33aef207db9541b6fd6c254437f94dec2fab70fc55a7757cd - input_fingerprint: a927e74bb2fbe9b7769fdaf70850da2cb6c045d1ffe447f9cb685eecc1761cca + input_fingerprint: 22e0886d2374fc1bf8e8dbf142f468d6ce7cec0ceecad963c6a653456bfbf9c0 template_sources: - gemfiles/modular/changelog.gemfile.example gemfiles/modular/coverage.gemfile: recipe: template_source_application_gemfiles_modular_coverage_gemfile action: write dest_sha256: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - input_fingerprint: 2bd827ddeea933d770585fe07b46f877f78d36fe7979518650ec2523ae55946f + input_fingerprint: 74de52ecaeffa45d205426f98008d4f2685b28f7ef8a5be0a82fb29409371fb2 template_sources: - gemfiles/modular/coverage.gemfile.example gemfiles/modular/coverage_local.gemfile: recipe: template_source_application_gemfiles_modular_coverage_local_gemfile action: write - dest_sha256: 2b493414df06261ba8acb6f0eb18bf3fdd701d7cb5f967a9d15a3f42a4741827 - input_fingerprint: 4376db0af56115a5cdbbd838533192b0567601b0117920c1a5747bd7c1f74282 + dest_sha256: 92c9a599c8f6867ec532880f73568f2736ac05d8973ec524b42fd5dbe6aeda3e + input_fingerprint: fff48a32ddba65bd61ee1ba3ffde421c87d32ce9f6ac86bda502fbcae4327e50 template_sources: - gemfiles/modular/coverage_local.gemfile.example gemfiles/modular/debug.gemfile: recipe: template_source_application_gemfiles_modular_debug_gemfile action: write dest_sha256: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 - input_fingerprint: 8a94e8e086dfc2c554e8cc446d165980f6e4942e3cdbc8d7c25b53fb90900fd8 + input_fingerprint: 1757a47f48f0da8dbb818c27af9e982df25f15c9173e642f309c011d7c84ab9e template_sources: - gemfiles/modular/debug.gemfile.example gemfiles/modular/documentation.gemfile: recipe: template_source_application_gemfiles_modular_documentation_gemfile action: write dest_sha256: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c - input_fingerprint: b6f32fb7b35447b56ef8154acc995bb9b5d6ad1c21a153c62b33aa0249f26201 + input_fingerprint: 23544f9c68be703b06ea36e7a38f992e761b794969cf0a2b4854852543c5d184 template_sources: - gemfiles/modular/documentation.gemfile.example gemfiles/modular/documentation_local.gemfile: recipe: template_source_application_gemfiles_modular_documentation_local_gemfile action: write dest_sha256: 2058173855b9a4acc6d5efa20520e49734243eef6cf0b5e9063e0e5866a08e9c - input_fingerprint: e0dc1916a84ba713c9494960b4f0346fbab11128ae979e21e15b8f0d1c8b8394 + input_fingerprint: c5e292c770323cd9f2b2ec694847764abaed7dab39b1e3483bd4202688f5f96d template_sources: - gemfiles/modular/documentation_local.gemfile.example gemfiles/modular/erb/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r2_v3_0_gemfile action: write dest_sha256: 3793e7dc9ef23a7ccd893d48cbba092fd27594c63e65cca011cc658218425670 - input_fingerprint: 736e8e8486d59f0c99958a6d92a8f77f00672585447a399577b21eeddca92b53 + input_fingerprint: da594ea242b208f8be609e3f4d3ce802abc3150a9a47ac74482f0dc6648ea725 template_sources: - gemfiles/modular/erb/r2/v3.0.gemfile.example gemfiles/modular/erb/r3/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r3_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 692850ae66745a0a19b7b749e3b62aa675f00824505f0750c6c6f76a3a245a51 + input_fingerprint: ae7c324e3a93394d045346a6ecee423667440aed6b973db664a85267a95c9bd9 template_sources: - gemfiles/modular/erb/r3/v5.0.gemfile.example gemfiles/modular/erb/r4/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r4_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 2a4261909bfd52a6c3a510a0188975fb78afb1285ccf818375ef91a2e816504b + input_fingerprint: 892e007cbe9bc0473d616ee969a150044a9eedfa72bec1b4b70cdffd6944ff68 template_sources: - gemfiles/modular/erb/r4/v5.0.gemfile.example gemfiles/modular/erb/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_erb_vHEAD_gemfile action: write dest_sha256: ad6f104a49e80e0cf625440e3dc816343fe7e2f037fc4971df75e7bb4305c683 - input_fingerprint: ba4d537e4961e7790fd989fb6ecf6f68a6394f85c4c6e94742f789791ce1aaf7 + input_fingerprint: 96a7c58121f36fae92965d9efae84586aae39cf55398aa14d1aa4858c154711b template_sources: - gemfiles/modular/erb/vHEAD.gemfile.example gemfiles/modular/json/truffleruby_22_3.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_22_3_gemfile action: write dest_sha256: 249c12eacbe90f9d0d2e81e7a62c4c7e9102e504ededcda4ecf660cb3bb68be4 - input_fingerprint: 4843b95f3d52646119e91bbbc8a7f1a5f3ed57259ec3e7fd2030d7683f1aac96 + input_fingerprint: 0a439d1b88a7035472ce7ddeb23be9415627d5f5f7b06c07029a09e7991478f6 template_sources: - gemfiles/modular/json/truffleruby_22_3.gemfile.example gemfiles/modular/json/truffleruby_23_0.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_0_gemfile action: write dest_sha256: 66aa010567f7afa1af8244a74c3c88ecaaf84dc87b6a25180691bb480d02ed28 - input_fingerprint: 17c16bd3fc300c606d5682f8ef3e5124fff428e74982cfe8ba4156c5f9d77d69 + input_fingerprint: a598a3da99363504d55f281a188d2c0fc7077e17e82e34dae05cce701b2bd0c2 template_sources: - gemfiles/modular/json/truffleruby_23_0.gemfile.example gemfiles/modular/json/truffleruby_23_1.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_1_gemfile action: write dest_sha256: '080fcbdaf2bec73cad40832a3d51eebb380af789917b96f493d1460b0dd6361d' - input_fingerprint: ea7c657daed2e3b041ba07ea45d7eb95e5e78cc4ae9e38ffe3fc6a1eef575570 + input_fingerprint: 6e19ff989b1620564b8d634a2280af7c3c96dd3e1f8c96fdfc85fc4ca7c35fca template_sources: - gemfiles/modular/json/truffleruby_23_1.gemfile.example gemfiles/modular/mutex_m/r2/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r2_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: f88a7cba4566d53e2f14a9808b3fc387f45838822d85d619738e177911c5d196 + input_fingerprint: 56f3191564567f470344415c144ca7f34b5d5bff5738e4a2eff630290474ce18 template_sources: - gemfiles/modular/mutex_m/r2/v0.3.gemfile.example gemfiles/modular/mutex_m/r3/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r3_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 8447e06cc5d095ac46206393c179bd43f5025b1083efdbfc96f53d40d5c75c72 + input_fingerprint: 8fcfe7b5965c0376d550bbbdd89a97d340dfd03d1d029db04050fa13bb1ff3c9 template_sources: - gemfiles/modular/mutex_m/r3/v0.3.gemfile.example gemfiles/modular/mutex_m/r4/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r4_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 41b784f44bfc823a19e7e7d3197c645f351cf9d40fa6cbe0edb6309ec27e4013 + input_fingerprint: c881c1a27e0485e4073b4d039030ac46011d1c3dc0028f2b65c85ec88ea74486 template_sources: - gemfiles/modular/mutex_m/r4/v0.3.gemfile.example gemfiles/modular/mutex_m/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_vHEAD_gemfile action: write dest_sha256: '08018641c97f894788fa91b462da504ab2237213d18d95404136c393274ae3cb' - input_fingerprint: e0fb11d20d1d76fe758cf6486a8a1fb139ae5c218ac2270da05311effecf43cf + input_fingerprint: 8e9dee894d0fbee1ad71fd18443f94ef0129d403fa9640cfe8957b6f42478ada template_sources: - gemfiles/modular/mutex_m/vHEAD.gemfile.example gemfiles/modular/optional.gemfile: recipe: template_source_application_gemfiles_modular_optional_gemfile action: write dest_sha256: f770e6e9a9dd2bd0f1f132e882d88038b2e21127dce3afe270908c7338c28bfd - input_fingerprint: 2bf8249bd7f4b8eb4a5318fb112ffbf3d84f6acffb7da6ed7c982a18a42296a0 + input_fingerprint: b0585b57610278b4b19a749e7eebfcc8f31a0f8c2957ecc31361e858d4260d87 template_sources: - gemfiles/modular/optional.gemfile.example gemfiles/modular/rspec.gemfile: recipe: template_source_application_gemfiles_modular_rspec_gemfile action: write dest_sha256: d043f5c9344f6435edb4607c5adaf42c78e7fb6b8b6726007de2bbedefb376c3 - input_fingerprint: 20e144b693335b6097b222901f5381544f48b4eb0169ce0c21d264978522a794 + input_fingerprint: d3ac8c6609497053aca638e21def7e0f5d28d9d4475989c0f5cff91975732014 template_sources: - gemfiles/modular/rspec.gemfile.example gemfiles/modular/runtime_heads.gemfile: recipe: template_source_application_gemfiles_modular_runtime_heads_gemfile action: write dest_sha256: 6ac7158c4a3088190f2a9082f01439eb27eca2172ab3464b15c9cb045aa885e1 - input_fingerprint: f09d4d3b26228fb7b44c9be378d2fba32b8fca7c37bb821d8307847c2fb85548 + input_fingerprint: c77fc5b64f2b39c2359af2791000c5cec416c682cd508d738b37c4e0b0185882 template_sources: - gemfiles/modular/runtime_heads.gemfile.example gemfiles/modular/stringio/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r2_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: d6e2128e1cb7999476f1f1d6175b2ef543b3eb2427e4b41ce970a3f9280b6f88 + input_fingerprint: 76c9c9a7d0136664fd945232c8ff46d4fa6c8ebdc8200783cf27a2e29004f05e template_sources: - gemfiles/modular/stringio/r2/v3.0.gemfile.example gemfiles/modular/stringio/r3/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r3_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 32f8e4d0e29354e328ba10f48d9562c1ffccb9bb6fce33dd6604faf5f1a9dd08 + input_fingerprint: bfa1828f32725973a5bc817dc9573b30d029ec2132146c61a32607bfe9babd95 template_sources: - gemfiles/modular/stringio/r3/v3.0.gemfile.example gemfiles/modular/stringio/r4/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r4_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: d8523670df4e4019c6bbee75f2ce45c7260cfe78a0276601b2cb94770189cf88 + input_fingerprint: 71b525394900801d539f5554cd8b6ae7173df5afb27c606f9d7967f4dfcad9d6 template_sources: - gemfiles/modular/stringio/r4/v3.0.gemfile.example gemfiles/modular/stringio/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_stringio_vHEAD_gemfile action: write dest_sha256: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - input_fingerprint: 005bab3541674f3a75a4b76e17b2c7c298814aec98fb258ed49fb7bbad05dbc4 + input_fingerprint: 0b7a8ed9ec01e1650185be43f66332baeb74c8b63ce4ed608a635b96771c5510 template_sources: - gemfiles/modular/stringio/vHEAD.gemfile.example gemfiles/modular/style.gemfile: recipe: template_source_application_gemfiles_modular_style_gemfile action: write - dest_sha256: 2a3d46dcb8a9394f595f273f5eb0403d0a552837754ab109afc9ba79a7159083 - input_fingerprint: 6ecf0513532f0ac58bfd53b9e5920fd4a91a1ed49c904c7948722543e36672a5 + dest_sha256: 9a24acff0054573c30f5d84d0418cd465ba3794d075bb5a36801410ac40e0787 + input_fingerprint: c4674164f32a2ac33042d5cf11418521a279fe88026f1d355577335ec8227e79 template_sources: - gemfiles/modular/style.gemfile.example gemfiles/modular/style_local.gemfile: recipe: template_source_application_gemfiles_modular_style_local_gemfile action: write dest_sha256: 55eb9c149cdb2f29c9f31abe2d55a4f334e00fb859681dd17c42149a3f28ca36 - input_fingerprint: f8509a4a5e436f32ea9fc8a372b5bf7e304de8efd40bd279e603026c7b9c27eb + input_fingerprint: 80c1f75cb780cb7f372a4e3b546c856be41614fa2498ac84df2a06fad80d83d7 template_sources: - gemfiles/modular/style_local.gemfile.example gemfiles/modular/templating.gemfile: recipe: template_source_application_gemfiles_modular_templating_gemfile action: write - dest_sha256: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - input_fingerprint: 9ed178bf17432bc1be651a936216475dc0472cc5dcf0d4e360c40ea8f0eec7d8 + dest_sha256: 432ba59798d31b899268257c432443a017c5a9bd2c0c7f9f2216617e14150cd3 + input_fingerprint: 69b2d7d6d7fdff8236bed48333843c8704c24e878753481428c6c98792715277 template_sources: - gemfiles/modular/templating.gemfile.example gemfiles/modular/templating_local.gemfile: recipe: template_source_application_gemfiles_modular_templating_local_gemfile action: write - dest_sha256: c8721bf489ee2d83e2c58670fabe698591f288e92b67ae11290e5365a6d04347 - input_fingerprint: ec85e1bea80a02c5b56cf806eb92a0f7a3c736a6e52fbe8fc8c3419d0f8760ab + dest_sha256: cc8656eb41bfac98651cd3166ad0c219b27b07e7ce743b361a4318b34c60f18f + input_fingerprint: 5a465db95e7c17ec2f337286720b116c3046764a1a25e5d021434cd8510657a0 template_sources: - gemfiles/modular/templating_local.gemfile.example gemfiles/modular/webrick/r4/v1.9.gemfile: recipe: template_source_application_gemfiles_modular_webrick_r4_v1_9_gemfile action: write dest_sha256: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea - input_fingerprint: b41efa2c948fe49985061c36718c3e48d533f619676520a00e66d0d5bd45c223 + input_fingerprint: ebbb55fe93d0a482fa78b982a5bfeba7bb4fbac5bae9a23b88a9d1e652ae24dc template_sources: - gemfiles/modular/webrick/r4/v1.9.gemfile.example gemfiles/modular/webrick/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_webrick_vHEAD_gemfile action: write dest_sha256: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b - input_fingerprint: 1f5ceddefda5e80594db521bcbff4a3eb456e6e72c7cf11cd3b3a50cb6939a5d + input_fingerprint: 4aae9b8b9f848067e2d4339f81359813d38d9d0ab100fda1a40e7a7dbb2d4b28 template_sources: - gemfiles/modular/webrick/vHEAD.gemfile.example gemfiles/modular/x_std_libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_gemfile action: write dest_sha256: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a - input_fingerprint: 79e042b61d421e9c1e4fe69b4e6c59ee8769b2c9b3106c4ab707babb82b66e27 + input_fingerprint: e4ad90bd52f6997e76192a6dfecdc2350fb18201f0ff8caa054da6d15aa2bffc template_sources: - gemfiles/modular/x_std_libs.gemfile.example gemfiles/modular/x_std_libs/r2/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r2_libs_gemfile action: write dest_sha256: e80ec8ad06cb1b31ac982bc25cf7696987fca131aa1001eaefd0bf5cd379c273 - input_fingerprint: 17dcf2e9138ea7a94d480f4c9bac9cc9006032210987f9e35537bbeaa116c91b + input_fingerprint: 90216debfe649c42be3b9cfb4c87dfbcc795d772f4235e3f2b871c73c47ba97b template_sources: - gemfiles/modular/x_std_libs/r2/libs.gemfile.example gemfiles/modular/x_std_libs/r3.1/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_1_libs_gemfile action: write dest_sha256: 9f8565c40b09bea1bc4c2e2ad87fe11400c3c51a2b235655bfcd8e491ed88ca8 - input_fingerprint: 83059a1c25808a1d5e849e69a500f5d9e0a20ed7e48fcf4cf58a0437cb87b6e5 + input_fingerprint: f164174d509012063b73aaa5714b83bbc52d8ea11484e9503bcd1d710a12875b template_sources: - gemfiles/modular/x_std_libs/r3.1/libs.gemfile.example gemfiles/modular/x_std_libs/r3/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_libs_gemfile action: write dest_sha256: 546f8849f4267bb19aa10ff0de40be30957197f229e6887847181ea9127b2650 - input_fingerprint: 7d411e75d2eb251378e77e97bddd963c01e2fd242b9fbc576e6f21fd4cd7f42c + input_fingerprint: 85176ae520a824c0ac5fd87e1b1ddc877d2a5d3b84efc0dfbca5ef7d9eb3862c template_sources: - gemfiles/modular/x_std_libs/r3/libs.gemfile.example gemfiles/modular/x_std_libs/r4/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r4_libs_gemfile action: write dest_sha256: 8c2582eaa218d216b98c86c933465295c8b4e43f3251ea388b9eaf6e471f8da6 - input_fingerprint: deb6c126ae8affde7c101f91393662bb842acb477a98559c8c94d5dd5a3dcbd4 + input_fingerprint: fa48d04500e5752aa045d34cb849950e3e4a46dc191ba776a08e40bcdb43db1e template_sources: - gemfiles/modular/x_std_libs/r4/libs.gemfile.example gemfiles/modular/x_std_libs/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_vHEAD_gemfile action: write dest_sha256: d3133ec4c0638363a7fb025d19be7e95a615fd61c35ddb8d17f2280ee74a7486 - input_fingerprint: 4c87ea68086f98c29bad54f5c2a46357a8dd607a9dae8a06b751780d7ef0b8bd + input_fingerprint: 661c149eaa00de9019e5c6cc94dd9ecbc67ca48a24ac70762324c8efef2fb3bf template_sources: - gemfiles/modular/x_std_libs/vHEAD.gemfile.example lib/ast/crispr/ruby/prism/version.rb: recipe: template_source_application_lib_ast_crispr_ruby_prism_version_rb action: write - dest_sha256: d780662879fc898fe9afa5c93429d95bce7e71a81b21a5c85afe95b67c18e6ca - input_fingerprint: 65b2d706bd91cd1380462768eebf242b9ca4f9c42ff7af2b24e68f07c7d45c9d + dest_sha256: 422f3f9fcd8135690f4dbeb24ada37d0693cd5d40dfd80e880707c9b12a5cfbf + input_fingerprint: ca73f885dcecc041fc5d6e913c3cba722f6b4a36f7953d1387e1f20e412d5225 template_sources: - lib/gem/version.rb.example mise.toml: recipe: template_source_application_mise_toml action: write dest_sha256: 491df76688079679de0a0b7cef55cad315b5b5907f92e825cb9a4655e9c671bd - input_fingerprint: 80bb35378da4c865640be4577fef4178b3f295fcfd9b2b858472565d07f03dc8 + input_fingerprint: 515f0b64926a1d8495a33b0742bb31ecad7c1ccad64655d7fb5b4afbf136ed67 template_sources: - mise.toml.no-osc.example sig/ast/crispr/ruby/prism.rbs: recipe: template_source_application_sig_ast_crispr_ruby_prism_rbs action: write dest_sha256: 557ce194cb22954d85f6c7356a5a1ef1706641a97952ad43fddefefeb4f8f3ee - input_fingerprint: 717e06b75bb78cef4cc1f91d8e572de567a501f1062b2004b4004196f60b65cf + input_fingerprint: a1f2b0a3cedda35bb190fcbc8ef58313939e7192ef0266de5c43e8c2d1511082 template_sources: - sig/gem.rbs.example spec/spec_helper.rb: recipe: template_source_application_spec_spec_helper_rb action: write dest_sha256: 675694e53166020637da23df83cf172942571cfeee0e35775431afff5fffd001 - input_fingerprint: c11c9cee80bdc457ea805248f97a7d40d25e7f7ec6508a5a3135a5d872a8a5f5 + input_fingerprint: e255df08a8eda26cbe52d0337abccfaef5c758ea055c5b65f00cae28ab1208ef template_sources: - spec/spec_helper.rb.example diff --git a/gems/ast-crispr-ruby-prism/Gemfile b/gems/ast-crispr-ruby-prism/Gemfile index d0508757d..e8f059964 100644 --- a/gems/ast-crispr-ruby-prism/Gemfile +++ b/gems/ast-crispr-ruby-prism/Gemfile @@ -19,7 +19,7 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } # Include dependencies from ast-crispr-ruby-prism.gemspec gemspec -gem 'kettle-family', '~> 1.2', '>= 1.2.97' +gem 'kettle-family', '~> 1.2', '>= 1.2.100' # Local workspace dependency wiring for *_local.gemfile overrides gem 'nomono', '~> 1.1', '>= 1.1.5', require: false # ruby >= 3.2.0 diff --git a/gems/ast-crispr-ruby-prism/Gemfile.lock b/gems/ast-crispr-ruby-prism/Gemfile.lock index 2cef44d1b..6a3868f91 100644 --- a/gems/ast-crispr-ruby-prism/Gemfile.lock +++ b/gems/ast-crispr-ruby-prism/Gemfile.lock @@ -10,123 +10,123 @@ GIT PATH remote: . specs: - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) + ast-crispr-ruby-prism (7.1.9) + ast-crispr (= 7.1.9) + prism-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) + ast-crispr-markdown-markly (7.1.9) + ast-crispr (= 7.1.9) + markdown-merge (= 7.1.9) + markly-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) + ast-crispr (7.1.9) + ast-merge (= 7.1.9) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ast-merge-git (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: - ast-merge (7.1.8) + ast-merge (7.1.9) benchmark token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) + ast-template (7.1.9) + ast-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + bash-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + binary-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) + citrus-toml-merge (7.1.9) + ast-merge (= 7.1.9) + toml-merge (= 7.1.9) toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge specs: - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) commonmarker (~> 2.2) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) + dotenv-merge (7.1.9) + ast-merge (= 7.1.9) + plain-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + go-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + html-merge (7.1.9) + ast-crispr (= 7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + json-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: - kettle-jem (7.1.25) + kettle-jem (7.1.26) addressable (>= 2.8, < 3) ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) @@ -160,122 +160,122 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge specs: - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown (~> 2.5) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + markdown-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) + markly-merge (7.1.9) + markdown-merge (= 7.1.9) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge specs: - parslet-toml-merge (7.1.8) + parslet-toml-merge (7.1.9) toml (~> 0.3) - toml-merge (= 7.1.8) + toml-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + plain-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) + prism-merge (7.1.9) + ast-merge (= 7.1.9) prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + psych-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) + yaml-merge (= 7.1.9) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) + rbs-merge (7.1.9) + ast-merge (= 7.1.9) rbs (>= 3.10) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + rust-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) + smorg-rb (7.1.9) + ast-merge (= 7.1.9) + ast-merge-git (= 7.1.9) + bash-merge (= 7.1.9) diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) + dotenv-merge (= 7.1.9) + go-merge (= 7.1.9) + html-merge (= 7.1.9) + json-merge (= 7.1.9) kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) + markdown-merge (= 7.1.9) + plain-merge (= 7.1.9) + prism-merge (= 7.1.9) + psych-merge (= 7.1.9) + rbs-merge (= 7.1.9) + rust-merge (= 7.1.9) + toml-merge (= 7.1.9) + typescript-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + toml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: - tree_haver (7.1.8) + tree_haver (7.1.9) citrus (~> 3.0) parslet (~> 2.0) tree_sitter_language_pack (>= 1.16.2, < 2.0) @@ -284,25 +284,25 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + typescript-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + yaml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) + zip-merge (7.1.9) + binary-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) GEM @@ -336,6 +336,8 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) + commonmarker (2.10.0) + rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -465,11 +467,15 @@ GEM lint_roller (1.1.0) logger (1.7.0) markly (0.19.0) + mini_portile2 (2.8.9) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) reline (~> 0.6) mutex_m (0.3.0) + nokogiri (1.19.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-musl) @@ -503,6 +509,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) + rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -696,13 +705,16 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.16.2-aarch64-linux) + tree_sitter_language_pack (1.17.0) + rb_sys (>= 0.9.130, < 0.10) + sorbet-runtime (~> 0.5) + tree_sitter_language_pack (1.17.0-aarch64-linux) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-arm64-darwin) + tree_sitter_language_pack (1.17.0-arm64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-linux) + tree_sitter_language_pack (1.17.0-x86_64-linux) sorbet-runtime (~> 0.5) tsort (0.2.0) tty-cursor (0.7.1) @@ -784,9 +796,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.31) + kettle-dev (~> 3.0, >= 3.0.34) kettle-drift (~> 1.0, >= 1.0.13) - kettle-family (~> 1.2, >= 1.2.97) + kettle-family (~> 1.2, >= 1.2.100) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) @@ -807,12 +819,12 @@ DEPENDENCIES reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) - rubocop-lts (~> 24.2, >= 24.2.1) - rubocop-lts-rspec (~> 1.0, >= 1.0.5) + rubocop-lts (~> 24.2, >= 24.2.3) + rubocop-lts-rspec (~> 1.0, >= 1.0.6) rubocop-minitest (~> 0.40, >= 0.40.0) rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! - rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) ruby-merge! ruby-progressbar (~> 1.13) rust-merge! @@ -843,33 +855,34 @@ CHECKSUMS appraisal2 (3.2.3) sha256=3a6cfaf8a444e02707b9a34154af1c4902fbe99d9d2168d7e81dd83ec77e6db7 appraisal2-rubocop (1.0.2) sha256=1dae97c1be087cf9c098a3a72fd41f873435e9b8b39687e633b36c9ccb22bff4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.8) - ast-crispr-markdown-markly (7.1.8) - ast-crispr-ruby-prism (7.1.8) - ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) + ast-crispr (7.1.9) + ast-crispr-markdown-markly (7.1.9) + ast-crispr-ruby-prism (7.1.9) + ast-merge (7.1.9) + ast-merge-git (7.1.9) + ast-template (7.1.9) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.8) + bash-merge (7.1.9) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) - bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae + binary-merge (7.1.9) + bundler (4.1.0.beta1) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.8) + citrus-toml-merge (7.1.9) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 + commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e commonmarker (2.10.0-x86_64-darwin) sha256=01e0830ed0319825ecdc16411c90acd3f661d1568dfc178731b3f64d0ce2363d commonmarker (2.10.0-x86_64-linux) sha256=945c510c0bfca9022245928e2248468fe3ddad58c939be0c37b20082cc392880 commonmarker (2.10.0-x86_64-linux-musl) sha256=288cd4fb9f17eed2ffa73551ef241dcf594e0f484b2aee2a0999540333c0618e - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) completely (0.8.0) sha256=e493cd5d84805f47917a41f277ecbfe5f35363bed670be5a957d3acaed8c6c5e concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 @@ -878,7 +891,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docopt_ng (0.7.1) sha256=a024148ee4fa3ab1a8a04411aa4370f39cf2b446e63562097d418b7974a15667 - dotenv-merge (7.1.8) + dotenv-merge (7.1.9) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -891,35 +904,37 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) + go-merge (7.1.9) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) + html-merge (7.1.9) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a - json-merge (7.1.8) - kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + json-merge (7.1.9) + kettle-changelog (1.0.7) + kettle-dev (3.0.34) + kettle-drift (1.0.13) kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 - kettle-jem (7.1.25) + kettle-jem (7.1.26) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 - kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd + kettle-soup-cover (3.0.10) kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 - markdown-merge (7.1.8) + markdown-merge (7.1.9) markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca - markly-merge (7.1.8) + markly-merge (7.1.9) + mini_portile2 (2.8.9) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 + nokogiri (1.19.4) nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af nokogiri (1.19.4-arm64-darwin) sha256=a46db9853286e6597b36ebc6953817d15acf3a299583eb3f89fdc6f91dd63527 @@ -933,20 +948,22 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) - plain-merge (7.1.8) + parslet-toml-merge (7.1.9) + plain-merge (7.1.9) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.8) + prism-merge (7.1.9) psych (5.5.0) sha256=4b245bbbd0f3238df8ccee766ebc1a6b062b10e4ee1d3284eb588739ba156a0a - psych-merge (7.1.8) + psych-merge (7.1.9) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 - rbs-merge (7.1.8) + rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -982,11 +999,11 @@ CHECKSUMS rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.8) + ruby-merge (7.1.9) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) + rust-merge (7.1.9) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +1011,7 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) + smorg-rb (7.1.9) sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,25 +1027,26 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.8) + toml (0.3.0) + toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb - tree_haver (7.1.8) - tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 - tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 - tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 - tree_sitter_language_pack (1.16.2-x86_64-linux) sha256=d8151e6e44e35ace9de3611c76b730896beab17f427db06d8f76666332a5dc60 + tree_haver (7.1.9) + tree_sitter_language_pack (1.17.0) + tree_sitter_language_pack (1.17.0-aarch64-linux) + tree_sitter_language_pack (1.17.0-arm64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-linux) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f tty-cursor (0.7.1) sha256=79534185e6a777888d88628b14b6a1fdf5154a603f285f80b1753e1908e0bf48 tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) + typescript-merge (7.1.9) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 yaml-converter (0.2.5) sha256=a5214fe1a6c2df88bd34a35bcded1b1dcd30135548130df2e03b54ca8c0f2423 - yaml-merge (7.1.8) + yaml-merge (7.1.9) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.8) sha256=73d935d43e3479d65ce8aff25c7d3100e8bb83528a2adaa0ed824e5046ac99e7 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -1037,8 +1055,8 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) + zip-merge (7.1.9) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH - 4.0.20 + 4.1.0.beta1 diff --git a/gems/ast-crispr-ruby-prism/Rakefile b/gems/ast-crispr-ruby-prism/Rakefile index 75b35e581..4ba5def6f 100644 --- a/gems/ast-crispr-ruby-prism/Rakefile +++ b/gems/ast-crispr-ruby-prism/Rakefile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -# ast-crispr-ruby-prism Rakefile v7.1.18 - 2026-09-07 +# ast-crispr-ruby-prism Rakefile v7.1.26 - 2026-09-09 # Ruby 2.3 (Safe Navigation) or higher required # # See LICENSE.md for license information. diff --git a/gems/ast-crispr-ruby-prism/ast-crispr-ruby-prism.gemspec b/gems/ast-crispr-ruby-prism/ast-crispr-ruby-prism.gemspec index 09d85c6d9..1347de254 100644 --- a/gems/ast-crispr-ruby-prism/ast-crispr-ruby-prism.gemspec +++ b/gems/ast-crispr-ruby-prism/ast-crispr-ruby-prism.gemspec @@ -120,7 +120,7 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.31') # ruby >= 4.0.0 + spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.34') # ruby >= 4.0.0 # Security spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 diff --git a/gems/ast-crispr-ruby-prism/bin/rubocop-gradual b/gems/ast-crispr-ruby-prism/bin/rubocop-gradual new file mode 100755 index 000000000..7c7ff0635 --- /dev/null +++ b/gems/ast-crispr-ruby-prism/bin/rubocop-gradual @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'rubocop-gradual' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'rubygems' +require 'bundler/setup' + +load Gem.bin_path('rubocop-gradual', 'rubocop-gradual') diff --git a/gems/ast-crispr-ruby-prism/gemfiles/modular/coverage_local.gemfile b/gems/ast-crispr-ruby-prism/gemfiles/modular/coverage_local.gemfile index 37917caac..d6c890e46 100644 --- a/gems/ast-crispr-ruby-prism/gemfiles/modular/coverage_local.gemfile +++ b/gems/ast-crispr-ruby-prism/gemfiles/modular/coverage_local.gemfile @@ -29,11 +29,31 @@ Kernel.send(:gem, 'nomono', *nomono_activation_requirements) require 'nomono/bundler' local_gems = %w[kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -local_gems_to_eval = local_gems - %w[] - declared_gems # export KETTLE_DEV_DEV=/path/to/my platform :mri do + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + local_gems_to_eval = local_gems - %w[] - declared_gems + eval_nomono_gems( gems: local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/ast-crispr-ruby-prism/gemfiles/modular/style.gemfile b/gems/ast-crispr-ruby-prism/gemfiles/modular/style.gemfile index 59c5dc1a3..41ec99454 100644 --- a/gems/ast-crispr-ruby-prism/gemfiles/modular/style.gemfile +++ b/gems/ast-crispr-ruby-prism/gemfiles/modular/style.gemfile @@ -24,9 +24,9 @@ platform :mri do if ENV.fetch('RUBOCOP_LTS_DEV', 'false').casecmp('false').zero? declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) - gem 'rubocop-lts', '~> 24.2', '>= 24.2.1' unless declared_gems.include?('rubocop-lts') - gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.5' unless declared_gems.include?('rubocop-lts-rspec') - gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.6' unless declared_gems.include?('rubocop-ruby3_2') + gem 'rubocop-lts', '~> 24.2', '>= 24.2.3' unless declared_gems.include?('rubocop-lts') + gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.6' unless declared_gems.include?('rubocop-lts-rspec') + gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.8' unless declared_gems.include?('rubocop-ruby3_2') else eval_gemfile('style_local.gemfile') end diff --git a/gems/ast-crispr-ruby-prism/gemfiles/modular/templating.gemfile b/gems/ast-crispr-ruby-prism/gemfiles/modular/templating.gemfile index 6af159bd7..ce51a08ed 100644 --- a/gems/ast-crispr-ruby-prism/gemfiles/modular/templating.gemfile +++ b/gems/ast-crispr-ruby-prism/gemfiles/modular/templating.gemfile @@ -18,7 +18,7 @@ end if structuredmerge_remote # Merge recipes for released installs. - gem 'kettle-jem', '>= 7.0' + gem 'kettle-jem', '~> 7.1', '>= 7.1.26' end if kettle_remote diff --git a/gems/ast-crispr-ruby-prism/gemfiles/modular/templating_local.gemfile b/gems/ast-crispr-ruby-prism/gemfiles/modular/templating_local.gemfile index a900c5171..e4b106f21 100644 --- a/gems/ast-crispr-ruby-prism/gemfiles/modular/templating_local.gemfile +++ b/gems/ast-crispr-ruby-prism/gemfiles/modular/templating_local.gemfile @@ -65,9 +65,7 @@ structuredmerge_local_gems = %w[ kettle_dev_local_gems = %w[ kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift ] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[] -kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - (declared_gems - %w[kettle-dev]) if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( @@ -81,6 +79,28 @@ if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 end if ENV.fetch('KETTLE_DEV_DEV', 'false').casecmp('false') != 0 + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - declared_gems + eval_nomono_gems( gems: kettle_dev_local_gems_to_eval, prefix: 'KETTLE_DEV', From 73779758d91909e9c7038aecb8b997109e79e0de Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Wed, 9 Sep 2026 23:56:02 -0400 Subject: [PATCH 103/137] =?UTF-8?q?=F0=9F=8E=A8=20Template=20ast-crispr-ma?= =?UTF-8?q?rkdown-markly=20by=20kettle-family?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.kettle-drift.lock | 76 ++++- .../.rubocop_gradual.lock | 7 +- .../.structuredmerge/kettle-jem.lock | 145 ++++---- gems/ast-crispr-markdown-markly/Gemfile | 2 +- gems/ast-crispr-markdown-markly/Gemfile.lock | 320 +++++++++--------- gems/ast-crispr-markdown-markly/Rakefile | 2 +- .../ast-crispr-markdown-markly.gemspec | 2 +- .../bin/rubocop-gradual | 16 + .../gemfiles/modular/coverage_local.gemfile | 24 +- .../gemfiles/modular/style.gemfile | 6 +- .../gemfiles/modular/templating.gemfile | 2 +- .../gemfiles/modular/templating_local.gemfile | 24 +- 12 files changed, 388 insertions(+), 238 deletions(-) create mode 100755 gems/ast-crispr-markdown-markly/bin/rubocop-gradual diff --git a/gems/ast-crispr-markdown-markly/.kettle-drift.lock b/gems/ast-crispr-markdown-markly/.kettle-drift.lock index 98b009e1e..1b23f4793 100644 --- a/gems/ast-crispr-markdown-markly/.kettle-drift.lock +++ b/gems/ast-crispr-markdown-markly/.kettle-drift.lock @@ -1,10 +1,82 @@ { + "debug_env: 'KETTLE_DEV_DEBUG',\nroot: %w[src my kettle-dev]": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 46, + 63 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 93, + 110 + ] + } + ], + "path_env: 'KETTLE_DEV_DEV',\nvendored_gems_env: 'VENDORED_GEMS',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 43, + 60 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 90, + 107 + ] + } + ], + "prefix: 'KETTLE_DEV',\npath_env: 'KETTLE_DEV_DEV',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 42, + 59 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 89, + 106 + ] + } + ], + "vendor_gem_dir_env: 'VENDOR_GEM_DIR',\ndebug_env: 'KETTLE_DEV_DEBUG',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 45, + 62 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 92, + 109 + ] + } + ], "vendored_gems_env: 'VENDORED_GEMS',\nvendor_gem_dir_env: 'VENDOR_GEM_DIR',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 44, + 61 + ] + }, { "file": "gemfiles/modular/templating_local.gemfile", "lines": [ - 77, - 88 + 75, + 91, + 108 ] } ] diff --git a/gems/ast-crispr-markdown-markly/.rubocop_gradual.lock b/gems/ast-crispr-markdown-markly/.rubocop_gradual.lock index 76f7d07ce..a1263e1af 100644 --- a/gems/ast-crispr-markdown-markly/.rubocop_gradual.lock +++ b/gems/ast-crispr-markdown-markly/.rubocop_gradual.lock @@ -2,13 +2,13 @@ ".simplecov:3645595653": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] ], - "Rakefile:2893818525": [ + "Rakefile:2100260286": [ [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], [81, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], [165, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], [168, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] ], - "ast-crispr-markdown-markly.gemspec:3272350231": [ + "ast-crispr-markdown-markly.gemspec:646893010": [ [138, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4147388508], [149, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], [150, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] @@ -27,6 +27,9 @@ [1, 1, 0, "Naming/FileName: The name of this source file (`vHEAD.gemfile`) should use snake_case.", 5381], [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], + "gemfiles/modular/coverage_local.gemfile:2813372128": [ + [34, 1, 1586, "Metrics/BlockLength: Block has too many lines. [37/25]", 820328175] + ], "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], diff --git a/gems/ast-crispr-markdown-markly/.structuredmerge/kettle-jem.lock b/gems/ast-crispr-markdown-markly/.structuredmerge/kettle-jem.lock index fc18ba27e..07238bbdc 100644 --- a/gems/ast-crispr-markdown-markly/.structuredmerge/kettle-jem.lock +++ b/gems/ast-crispr-markdown-markly/.structuredmerge/kettle-jem.lock @@ -1,11 +1,12 @@ --- version: 1 template_state: - version: 7.1.18 - applied_at: '2026-09-07' + version: 7.1.26 + applied_at: '2026-09-10' changelog_replay: last_entry_key: kettle-jem-template-20260802-001 last_entry_date: '2026-08-02' + maintenance_changelog: {} checksums: ".aiignore.example": 48a5dfdd93afd1a15fdce39cc28ca9920263f00018b0968ab031fa744521e5ce ".config/mise/env.sh": aeea5a2ab489ba6e5467ae8de6e386ec8c8fe4ff31a044e69d0cd6a092dd6654 @@ -75,7 +76,7 @@ template_state: ".rubocop_rspec.yml.example": 288ad75e7eb14d87d80fafe6f7272217be5c57547536ee56c780a7d10ac7ec74 ".simplecov.example": 222f2e6ce8cf089c70a21f0f5e5423d4bd59a96fdb2ce7754b0fb3d6f430c229 ".structuredmerge/git-drivers.toml.example": 9d241a44c9edffcdbd3da018fa188a238089c3d1635040924df594a6929a4f97 - ".structuredmerge/kettle-jem.yml.example": 26949dc4ee0722415e72452cbc186bee6ef7b154eae33166d36f3fdb1ca6e46d + ".structuredmerge/kettle-jem.yml.example": ff65a738da1af7d60714026a81d3323a46c864e96ae3570b806afdf6e7149ff9 ".yard-lint.yml.example": 90def46867c9436b4e177c47d91fc8165f4602e335715aecc39f5587ae20b55b ".yardignore.example": 821f453c609df7d46145d675424b39dfbe6dfdca8edac5f367b85fff48502455 ".yardopts.example": 6fd6f2701713096a8a9ea095c213bbc68eeef37797c4754d97837e3229a3a5f6 @@ -88,7 +89,7 @@ template_state: CHANGELOG.transfer.md: 21331d8a9e58b4ff6e088b88eb408bcccb0f2f64e78f8f4d42ac3f11a24baad8 CITATION.cff.example: e404ea0a7919d78a83d53d80e211d17b9663576aa606583b709795dc023fd75c CODE_OF_CONDUCT.md.example: f1ad532f1860f73ef774c6b27a26d41f4bc1cb8813034f5957487766ebb0986b - CONTRIBUTING.md.example: 22570cfb3dde72be79b4b522b6d5ab13f95d778e40444483a096871fe0891b19 + CONTRIBUTING.md.example: 8d23cce2d061e0c20d619c3f66591df5f32821cd84c32d171df0b8ebe1217a55 FUNDING.md.example: 392d047904b1557b29f4b43d37ec403b7480edd5b6ab51180be979b57a91e6ba FUNDING.md.no-osc.example: 3ef0258dd3e3b7f7e17e8bc2d20dcbcb3e74aa5a5a6f51297075696645e34c77 Gemfile.example: 99500023987e81775a9b5ef14e92cb3992f2ac408e5f42454f2728eee9b49fb2 @@ -99,19 +100,19 @@ template_state: PolyForm-Small-Business-1.0.0.md.example: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 README.md.example: 21f491e3d73bfc1b74056a6dcba61f72c93dee3cfe5272ac164a20978454de21 REEK: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - RUBOCOP.md.example: c09e5533ccc59b70a2efa05c99f66e521137c1053d3c12eb43509cebd5b68b0e + RUBOCOP.md.example: d99871a0e4c1d323c92e7febf328f062bb4722069b2abfd0a83bf7daa8dcbf8c Rakefile.example: 569803e726b07ea26267fec6891367a3096a0dff3c266269a7081d36afe496af SECURITY.md.example: ee9411aa85f36d88363fdaea7a1baea4362b6ec112cf2688e711b05de1d3144c bin/setup.example: 0ac35089c95a91d8973fe7a318bf9fd98b9f8e00db92c5d9ca6cd858abb8d41b certs/pboling.pem.example: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - gem.gemspec.example: 83e834e8958a88e4817a57199f48f5ebb245548ce251c5c47372208693f03b17 + gem.gemspec.example: 12dcadc0b297ccd4e18b9d1e538b98ac8330ef9fb2a059ed6754ad59272b77fa gemfiles/modular/benchmark/r4/v0.5.gemfile.example: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 gemfiles/modular/benchmark/vHEAD.gemfile.example: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 gemfiles/modular/cgi/r4/v0.5.gemfile.example: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 gemfiles/modular/cgi/vHEAD.gemfile.example: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 gemfiles/modular/changelog.gemfile.example: 892598e0e7792eb205247ae28128cef6dfc647d2fb33968969152230d6f69288 gemfiles/modular/coverage.gemfile.example: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - gemfiles/modular/coverage_local.gemfile.example: 928d5f260d7b119c038baa56da9fb78dd524dee613aea33ab72894bbce5c506e + gemfiles/modular/coverage_local.gemfile.example: 92ea0d7a9d693553dc614afa2c43990f5c3778c2b00ef6c528e122c31bd506a1 gemfiles/modular/debug.gemfile.example: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 gemfiles/modular/documentation.gemfile.example: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c gemfiles/modular/documentation_local.gemfile.example: 84a20f5d4b0feb94c2cf2f7a8dce8f682f1483498e41484c2b447a5661fd1870 @@ -145,10 +146,10 @@ template_state: gemfiles/modular/stringio/r3/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/r4/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/vHEAD.gemfile.example: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - gemfiles/modular/style.gemfile.example: 3ad0585b4f2db8918580ca41ea8723f7a166d7a83cfd7f9613511094997106fd + gemfiles/modular/style.gemfile.example: 02fe3e8fd00e49b90c3ab30e19b51014ee50490f3eadcfd1d4a39f4c2c997dda gemfiles/modular/style_local.gemfile.example: c86beb711e766126a5be68be4be18255831625ac3650d5069383c4a83a9511f3 - gemfiles/modular/templating.gemfile.example: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - gemfiles/modular/templating_local.gemfile.example: 930057d3b909a72e39a39125c4e883a7ff71f5691e64426c0541f8c8fc75b83f + gemfiles/modular/templating.gemfile.example: 2b33c094677b53ad9dd2eafeb3a3be452f612380c61001a2e75b3c078b8ff72a + gemfiles/modular/templating_local.gemfile.example: ac7259516e69ffafb8b9342a897ddf6042adc46335743f474c342509cefd8f2e gemfiles/modular/webrick/r4/v1.9.gemfile.example: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea gemfiles/modular/webrick/vHEAD.gemfile.example: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b gemfiles/modular/x_std_libs.gemfile.example: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a @@ -175,7 +176,7 @@ template_state: shim/Gemfile.example: 0fb0d9d06fcfb1fd6ca6f0eeb5867253ca1ed221e03d28027719225f868b0637 shim/README.md.example: 3a2f7211b7f92a1dfae5e523b8e34b051a3d8af942144b05286eca0b3c8f6fbe shim/Rakefile.example: 572c94da7052083b39b62a6600785419e314a109efd7a3d8c3a96eb77ad34fd1 - shim/gem.gemspec.example: efae033238e4fd1355cfc134f5c9123f175d1ad1dc4a1a2e663899788c9e0870 + shim/gem.gemspec.example: 14a7015b3328005d1c3b5fda6886bd6da383707745f6eaaa781d6f9689600131 shim/lib/compat_require.rb.example: 94ee85e353a3ca08c8a35c9063d4ff789214ea594c7f803f6cf09d7142f48379 shim/lib/entrypoint.rb.example: dd57613520daca01d6f6bcaa9b83b00ff74505240dc04b84ceb686df3c0539d7 shim/lib/version.rb.example: 15e219ac3a928b5580035f891e415551213175020f1131f6e7ca0ccd55a1b2d6 @@ -189,370 +190,370 @@ files: recipe: template_source_application_simplecov action: write dest_sha256: 767a285b587467f444db2c154caa8ea69a5cb5ab647744838222cb6540f17007 - input_fingerprint: 3fcfbfcb7a0ff254b87e3b97894fe40a2a0d9e8e24610b73be11b5438118c965 + input_fingerprint: ded757c36f7ccb0f91d90d7b2bec4cbff2b0c6f3ab54ce5cd33e5d1a07f54975 template_sources: - ".simplecov.example" AGPL-3.0-only.md: recipe: template_source_application_AGPL_3_0_only_md action: write dest_sha256: d8a6cc31abc16b6748c7a21f21611f5a1ec33f67d22ca23d7da1c19b95496bee - input_fingerprint: 2bb62524e82286993a650a134b809aacc65c487912c1b108221cf191298a8c03 + input_fingerprint: 15d200e4d2820ea4812476406083a0d694e85181743490247edc9e63b861b74c template_sources: - AGPL-3.0-only.md.example Gemfile: recipe: template_source_application_Gemfile action: write - dest_sha256: 27666c5377561b0694fcad8b7d4b84b0e0cb2c74aaedc46ff987d11b41141db3 - input_fingerprint: f0479f8e80a789cf74b3acc88494d3e034e556b0aac6eb17271873c8c720da2c + dest_sha256: b587adeb20c94aa05283c38401689fe639154fd63295e9e1c5e9813da7cfed3a + input_fingerprint: 56409f3f5a4477ff109f522887c3873744e311afecfcaefdb7e4ff07ce4bdfd5 template_sources: - Gemfile.example LICENSE.md: recipe: template_source_application_LICENSE_md action: write dest_sha256: f6188bfd474a636d2a526420ebb411250faa447d94c9b9ccee097128ce4101b5 - input_fingerprint: 444a5e8a45dba34e8f04a97abe592c8161377c6f634a414fadd04d77e647f8a7 + input_fingerprint: 702a7eeb872ff54a061894c29b76a4519db89278e5f122f4fac58d3030d0e424 template_sources: - LICENSE.md.example PolyForm-Small-Business-1.0.0.md: recipe: template_source_application_PolyForm_Small_Business_1_0_0_md action: write dest_sha256: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 - input_fingerprint: 235bc2c12e2403c148dec823153f5b74d69a626aa2c014a8823ef23df9de6004 + input_fingerprint: 07dd624943ebcfbe592786aed5affc074d5a87f483afbcf0af4ba05a3bf3c255 template_sources: - PolyForm-Small-Business-1.0.0.md.example README.md: recipe: template_source_application_README_md action: write dest_sha256: 383c53a1b82db1fee2089047940a9362da810bb40e24b3ad3967f843bc0c6271 - input_fingerprint: f0e63a54f2be96555aeabcb4503ce60c5dbd3d4c417637c7289454c39e81dc6f + input_fingerprint: 951dd9cd5615883bc0484b970594ecdfa3059aa56d47848afb2c6acc37e0102e template_sources: - README.md.example Rakefile: recipe: template_source_application_Rakefile action: write - dest_sha256: 26f366c4d69a9ab283704cb831b4ca0d4d2f6a0bf8ce6368128945120f53ab4a - input_fingerprint: 15b924e54cc32cfdc725c76b3356fbd8cfd6599ad5b6a61b6c03cd427e067932 + dest_sha256: 61762aea8c8b35802c80b1b9ab2881b5fe4d601a428c62d7bab6505a39a57f82 + input_fingerprint: e09807f7ba2c50a1e1f73ea1407fb782934d5067fb36f23d6dbecf2b58477e8e template_sources: - Rakefile.example ast-crispr-markdown-markly.gemspec: recipe: template_source_application_ast_crispr_markdown_markly_gemspec action: write - dest_sha256: 91f08076672e15c1ad1c7452432d1177aa98b4791da84526de474d8f4bc0b637 - input_fingerprint: c2b467b8db2d434fad4aa008b119a13684824c888be11b8c3c9feafb20ac61df + dest_sha256: f23f784d995ed9896132ac9d3ab7d5647d0e8457eb12a03e5f4ca6068690fa0a + input_fingerprint: c527b3f8af90ee3977dea3e9252dcb587ab4683a48459f0f448d6cf6702e9344 template_sources: - gem.gemspec.example certs/pboling.pem: recipe: template_source_application_certs_pboling_pem action: write dest_sha256: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - input_fingerprint: 4ba0085c764175f2f15e36e15a08f6a3114723c1ba5cc6858aecdb73a9ff3c57 + input_fingerprint: 517725229848249e027efc00c2d6b89cd3cdd11f52855c78874ddfd7b856b31b template_sources: - certs/pboling.pem.example gemfiles/modular/benchmark/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_r4_v0_5_gemfile action: write dest_sha256: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 - input_fingerprint: ecaa47b94673c1e1713a33441d1c873557b5208157aad5b791e5aa9476d6932f + input_fingerprint: 6499ad5cde3109a79226fe084227ecdc9ed1d0954f536e190c23e9127b23ec3c template_sources: - gemfiles/modular/benchmark/r4/v0.5.gemfile.example gemfiles/modular/benchmark/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_vHEAD_gemfile action: write dest_sha256: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 - input_fingerprint: 68e0c84136cfbff3e9b703cc0550e2bde818ea3b38ae17cac212e75436ce9644 + input_fingerprint: c314b859fa562d42d2143ebb1e39a6ad7dec4580628172db250a5954d860532a template_sources: - gemfiles/modular/benchmark/vHEAD.gemfile.example gemfiles/modular/cgi/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_cgi_r4_v0_5_gemfile action: write dest_sha256: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 - input_fingerprint: 4ad73fb393b34655848654b19d3083aef24543cfe9dd8e7c48ed0d892daf6378 + input_fingerprint: 4360b41e3c447dfa8085205a99ce231b53b9d67d25632cdf0f564905aa2e689c template_sources: - gemfiles/modular/cgi/r4/v0.5.gemfile.example gemfiles/modular/cgi/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_cgi_vHEAD_gemfile action: write dest_sha256: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 - input_fingerprint: 675a22398a8b5b67cdb652f23aae21968d47a0677983d44dfa58e63c8e4e16bc + input_fingerprint: 4fdf3d4343d2fea62589006a74f50749fea52d4c7bd7439aee020309c315c829 template_sources: - gemfiles/modular/cgi/vHEAD.gemfile.example gemfiles/modular/changelog.gemfile: recipe: template_source_application_gemfiles_modular_changelog_gemfile action: write dest_sha256: da669526144fbff33aef207db9541b6fd6c254437f94dec2fab70fc55a7757cd - input_fingerprint: c3fa8469cfe29c79774f024bf902ab9b8e4c4fe0629eed00f49b33ebc0cfbfa8 + input_fingerprint: 8b8662fa11e52a470c64c56d03491bf05764481dd27d141b8dabcc4d63ad774d template_sources: - gemfiles/modular/changelog.gemfile.example gemfiles/modular/coverage.gemfile: recipe: template_source_application_gemfiles_modular_coverage_gemfile action: write dest_sha256: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - input_fingerprint: d4408d70b5296b323f8f8e630fa6f18eca04899a3d2ffeaefb98d444fa3b4ae2 + input_fingerprint: 77664b0fe98b9e5007b152af54179b836170febf7d92477decf3770298f69f41 template_sources: - gemfiles/modular/coverage.gemfile.example gemfiles/modular/coverage_local.gemfile: recipe: template_source_application_gemfiles_modular_coverage_local_gemfile action: write - dest_sha256: 2b493414df06261ba8acb6f0eb18bf3fdd701d7cb5f967a9d15a3f42a4741827 - input_fingerprint: 4858a68f07dc40a4a86f98386b15860be5fe216ec4ee8b17463f646ec045c18e + dest_sha256: 92c9a599c8f6867ec532880f73568f2736ac05d8973ec524b42fd5dbe6aeda3e + input_fingerprint: 74fe7d51208d9fed1ac6cac1009bb18ff25b3a58053a1b8376497d37a9cb2918 template_sources: - gemfiles/modular/coverage_local.gemfile.example gemfiles/modular/debug.gemfile: recipe: template_source_application_gemfiles_modular_debug_gemfile action: write dest_sha256: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 - input_fingerprint: 2b154de514e0ec18e3a150595063d1ed3a6e5bdb1062cdb19f2380fbf3412364 + input_fingerprint: e46c6f069f7e4d4573f0fe4b36be0fdf8693ede86035035d71e09a5060b3b65c template_sources: - gemfiles/modular/debug.gemfile.example gemfiles/modular/documentation.gemfile: recipe: template_source_application_gemfiles_modular_documentation_gemfile action: write dest_sha256: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c - input_fingerprint: 9042d9ba478c3b7f9bb18a45f09891516c1bd34e4ab07b5228f60dd06fda5533 + input_fingerprint: 91904f61e4b4e0b698983a50eed3a8b70974c4d2e24ea5958ab1c844fe56b5a8 template_sources: - gemfiles/modular/documentation.gemfile.example gemfiles/modular/documentation_local.gemfile: recipe: template_source_application_gemfiles_modular_documentation_local_gemfile action: write dest_sha256: 2058173855b9a4acc6d5efa20520e49734243eef6cf0b5e9063e0e5866a08e9c - input_fingerprint: 1140331154d51235c4327d26f12a30753b9eb7b0340730f8317363293be04ee2 + input_fingerprint: e8fff4ebbacf52142231c113413ea48bdc38c7be12acc6a0f4a82b16e08e6db2 template_sources: - gemfiles/modular/documentation_local.gemfile.example gemfiles/modular/erb/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r2_v3_0_gemfile action: write dest_sha256: 3793e7dc9ef23a7ccd893d48cbba092fd27594c63e65cca011cc658218425670 - input_fingerprint: b533c809468dd0fa535e280c52a45f811fb86b96af80516bbcd6a70f2765b027 + input_fingerprint: c0fcdedeb42daf7e37f8065a416cd52d18b3d879b742a5badbe2dc8aae8f8960 template_sources: - gemfiles/modular/erb/r2/v3.0.gemfile.example gemfiles/modular/erb/r3/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r3_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: ed62fab843c89ba9e5364e685f17a2e443060d4c879429ef46f392f209202c6e + input_fingerprint: a275017b4036f69f9388b4b28110dc1a8751e7a2957be2d68d876c6166afcc2d template_sources: - gemfiles/modular/erb/r3/v5.0.gemfile.example gemfiles/modular/erb/r4/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r4_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: f0489fa31b78816ac2a823f24a24445f1a62ebd15c53ea073cd11f0a0186d679 + input_fingerprint: c762d1fd48d4efe768badc3ce7f8c3bcb6258448fb811be4f69a429669e75b45 template_sources: - gemfiles/modular/erb/r4/v5.0.gemfile.example gemfiles/modular/erb/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_erb_vHEAD_gemfile action: write dest_sha256: ad6f104a49e80e0cf625440e3dc816343fe7e2f037fc4971df75e7bb4305c683 - input_fingerprint: 66dd2a6e65fc44c656d56c227f80794593eecfddd9d621e3cbe9b302bb0065c0 + input_fingerprint: 50a6ae44f5365fb7c0c6fe0a75e0675cb4c0179b8544601a1d543e7ea3076ce2 template_sources: - gemfiles/modular/erb/vHEAD.gemfile.example gemfiles/modular/json/truffleruby_22_3.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_22_3_gemfile action: write dest_sha256: 249c12eacbe90f9d0d2e81e7a62c4c7e9102e504ededcda4ecf660cb3bb68be4 - input_fingerprint: 112c1adf8daffec38ec6d0125bca556dcdf62a6b5318c506f03b91d735330654 + input_fingerprint: b6f72c5e3570976e25d7a60d2d0392fa3895e1cc9c35d1a356bc0b5d781f90e1 template_sources: - gemfiles/modular/json/truffleruby_22_3.gemfile.example gemfiles/modular/json/truffleruby_23_0.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_0_gemfile action: write dest_sha256: 66aa010567f7afa1af8244a74c3c88ecaaf84dc87b6a25180691bb480d02ed28 - input_fingerprint: aadff8fb09c119a3e144577f242d9776305e18de9449d07c2647f2ea7635c7cb + input_fingerprint: b9bb21e1b0351632e71cf82ca3980d1ad4959f7ba9eeae4b3ff804ac8c55de93 template_sources: - gemfiles/modular/json/truffleruby_23_0.gemfile.example gemfiles/modular/json/truffleruby_23_1.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_1_gemfile action: write dest_sha256: '080fcbdaf2bec73cad40832a3d51eebb380af789917b96f493d1460b0dd6361d' - input_fingerprint: 5cc03d1c8c16dfca4e488350482a5ce71800e9b6a9413d603ccee02f61bc4880 + input_fingerprint: 531f8c285d12ae806e534a7e9211fbea793b0d1fa1eb4efa96595f74ad8f7c20 template_sources: - gemfiles/modular/json/truffleruby_23_1.gemfile.example gemfiles/modular/mutex_m/r2/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r2_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: ebc9418038b3f9d379971a0947be82f43c9c7cd4d67d79c4e7cc7ec349996767 + input_fingerprint: e87c00a503f1b5bd2b96350cac98b875d558db8b890f1e6ad2f0084163408033 template_sources: - gemfiles/modular/mutex_m/r2/v0.3.gemfile.example gemfiles/modular/mutex_m/r3/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r3_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 2c0e8bd4d6086f3cb9b54d8eb4d3aa056c30e567f2dbf29a0406ccbbb002e3cd + input_fingerprint: f891ba770a782d5dfe83ae369ef4db7491b9a6c796babda905eab604623e5fa7 template_sources: - gemfiles/modular/mutex_m/r3/v0.3.gemfile.example gemfiles/modular/mutex_m/r4/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r4_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 21d3c2fa8a6866e07f9174287a742c77a0f14b8c82e4037174a923764787647d + input_fingerprint: 41d77acd13601563d179073975c9bb50916427bccaa2998d20a0b2400477ba0e template_sources: - gemfiles/modular/mutex_m/r4/v0.3.gemfile.example gemfiles/modular/mutex_m/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_vHEAD_gemfile action: write dest_sha256: '08018641c97f894788fa91b462da504ab2237213d18d95404136c393274ae3cb' - input_fingerprint: 74ae31db1af766899b9f1676ce219e71c38ba3009629c45d7698d22153503d20 + input_fingerprint: c881ea6d5c84d76b1e8ba5c7ef8f79db7021eb8d7cf9b7cc95bd3e2e724c1955 template_sources: - gemfiles/modular/mutex_m/vHEAD.gemfile.example gemfiles/modular/optional.gemfile: recipe: template_source_application_gemfiles_modular_optional_gemfile action: write dest_sha256: f770e6e9a9dd2bd0f1f132e882d88038b2e21127dce3afe270908c7338c28bfd - input_fingerprint: 244f017e49b8869ff70310b55b4c7c9453612fc957b34e3f9b70c3ff674448f7 + input_fingerprint: 94ff1739a193a0a287b69f5de06fd01165c10da9c8bb5f0067f4003aed37ebb6 template_sources: - gemfiles/modular/optional.gemfile.example gemfiles/modular/rspec.gemfile: recipe: template_source_application_gemfiles_modular_rspec_gemfile action: write dest_sha256: d043f5c9344f6435edb4607c5adaf42c78e7fb6b8b6726007de2bbedefb376c3 - input_fingerprint: 43664558519dc16a03869366f5860a8f58e62c9cbffe3c7e1cfe25f7bb2dc9b1 + input_fingerprint: 6925c06e0bc495bc6d6963e12d1d521f332b8b708bdedf23048c665c13eb77af template_sources: - gemfiles/modular/rspec.gemfile.example gemfiles/modular/runtime_heads.gemfile: recipe: template_source_application_gemfiles_modular_runtime_heads_gemfile action: write dest_sha256: 6ac7158c4a3088190f2a9082f01439eb27eca2172ab3464b15c9cb045aa885e1 - input_fingerprint: aaa1a598f528dbd29e9a395c939b4e1c47b6e2b89eb291749a102bac9d28d299 + input_fingerprint: 4514f552a9445ddb99e36075c2c2f721bce37bb2a371185115757cd89685fb52 template_sources: - gemfiles/modular/runtime_heads.gemfile.example gemfiles/modular/stringio/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r2_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: e43a66178436ee08fbfa080c3e0886cd9bceeae673d6cd7e0efe06136f4de78f + input_fingerprint: 7360962fd9fab78968bd6424c12142624483cc89d7d3e32a984e9f37fb68c003 template_sources: - gemfiles/modular/stringio/r2/v3.0.gemfile.example gemfiles/modular/stringio/r3/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r3_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 2141b83248b4ac84166ed15fc71eb1433b566f85ae76b13bcb1e2b02096e614a + input_fingerprint: eb55c6b809c6714e588a678c0a6e35119a08180d2ff4ebb24e7182247d60d5c4 template_sources: - gemfiles/modular/stringio/r3/v3.0.gemfile.example gemfiles/modular/stringio/r4/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r4_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: e5229d21f3c6978637e8ccdc7541b9acd973bbc70731cba10557e51389c3c4bf + input_fingerprint: 1cff4ac139600029d417164e64c997c41a7bbe90109e8003180b5f12bf46a750 template_sources: - gemfiles/modular/stringio/r4/v3.0.gemfile.example gemfiles/modular/stringio/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_stringio_vHEAD_gemfile action: write dest_sha256: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - input_fingerprint: c75d8e98ff3e6becee904bd8a597b4f994a53cb86dd66ae101292401651ea37e + input_fingerprint: d279b600851667a4a371a121cfe75e411ea07f1b83d9324e1f975701bb900e5f template_sources: - gemfiles/modular/stringio/vHEAD.gemfile.example gemfiles/modular/style.gemfile: recipe: template_source_application_gemfiles_modular_style_gemfile action: write - dest_sha256: 2a3d46dcb8a9394f595f273f5eb0403d0a552837754ab109afc9ba79a7159083 - input_fingerprint: a15cba947bd6656dee943aac3651f594327ee62e6eac659d4ad31552dc75584d + dest_sha256: 9a24acff0054573c30f5d84d0418cd465ba3794d075bb5a36801410ac40e0787 + input_fingerprint: 55b062cdb9312e2e1d80cce0fac24ea1adb836777c82b978af52311751a9be1a template_sources: - gemfiles/modular/style.gemfile.example gemfiles/modular/style_local.gemfile: recipe: template_source_application_gemfiles_modular_style_local_gemfile action: write dest_sha256: 55eb9c149cdb2f29c9f31abe2d55a4f334e00fb859681dd17c42149a3f28ca36 - input_fingerprint: 8c508ba9eb8d9a7ea505566b23f1dbab793af25716e93acb55fdd2bddb9c411f + input_fingerprint: '09d3a85a7f466b5386bf0462edb603b11b30426fee9f50f180c1f1eaeed82b7a' template_sources: - gemfiles/modular/style_local.gemfile.example gemfiles/modular/templating.gemfile: recipe: template_source_application_gemfiles_modular_templating_gemfile action: write - dest_sha256: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - input_fingerprint: 4c160041f23f2e9b3c997ad17d6269c1bdb315db0000704f52e29301623951d5 + dest_sha256: 432ba59798d31b899268257c432443a017c5a9bd2c0c7f9f2216617e14150cd3 + input_fingerprint: 5cc4d29311eb2efc830fd25b6769feb01fd07c22d79c70eed81a9952058b1fd2 template_sources: - gemfiles/modular/templating.gemfile.example gemfiles/modular/templating_local.gemfile: recipe: template_source_application_gemfiles_modular_templating_local_gemfile action: write - dest_sha256: 05b7a92cc901a569fab880683faeb464f9cf5c12c5afb587826f49cd1f024442 - input_fingerprint: bbacdd6989678cb001c1152b893cae77e66030508586d64eb4c5613fadcf7d32 + dest_sha256: f9d3680962ee8ceec753a5f8079e8f9027c0a7324bd2aaf24f657703a4b14da0 + input_fingerprint: 33f01677dc998cfb700b6175fa2a156b5eed61b34936d79509d68925ca619f3f template_sources: - gemfiles/modular/templating_local.gemfile.example gemfiles/modular/webrick/r4/v1.9.gemfile: recipe: template_source_application_gemfiles_modular_webrick_r4_v1_9_gemfile action: write dest_sha256: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea - input_fingerprint: 23a4a0bdb3e617462205b37048db54f0421604c8d33a09192debf29a2f168174 + input_fingerprint: 3037260104556055e7f1fbfbd6acf8c6828b12f7821d354a0d983877a4fd6de1 template_sources: - gemfiles/modular/webrick/r4/v1.9.gemfile.example gemfiles/modular/webrick/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_webrick_vHEAD_gemfile action: write dest_sha256: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b - input_fingerprint: 87d81bfa26c46fd5a96fe175591404f8eb6e6ea3d5da8a44816d0412901a0781 + input_fingerprint: 5c9855f39be5f8c55bbe2f98b1fa440f247231591ecf7581bf9276b0931add03 template_sources: - gemfiles/modular/webrick/vHEAD.gemfile.example gemfiles/modular/x_std_libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_gemfile action: write dest_sha256: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a - input_fingerprint: d6dd15770f4d3999cd34f770ad711b64c6704b9c706b50ffcbbd32c3b624762b + input_fingerprint: 4bfbc50a2e22dd5f82b8c3c9dc9b4dc640925373569bb0c6a4873cdbcce6b25c template_sources: - gemfiles/modular/x_std_libs.gemfile.example gemfiles/modular/x_std_libs/r2/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r2_libs_gemfile action: write dest_sha256: e80ec8ad06cb1b31ac982bc25cf7696987fca131aa1001eaefd0bf5cd379c273 - input_fingerprint: e63d7f3e84d67b443a745ebac743c322d9a09c838bf53c45e3bd3588d90a7733 + input_fingerprint: 2fd1a53cb172759d2aa1aba16e6a0fce47efc469145eb0adab66cf68afeee692 template_sources: - gemfiles/modular/x_std_libs/r2/libs.gemfile.example gemfiles/modular/x_std_libs/r3.1/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_1_libs_gemfile action: write dest_sha256: 9f8565c40b09bea1bc4c2e2ad87fe11400c3c51a2b235655bfcd8e491ed88ca8 - input_fingerprint: 82152b0a2553ab83a57e27797ed9d9d399997a05475db7ca716db83f5b5c1e47 + input_fingerprint: 6c8889019711abad4e5a561ae901194e2c99654c30980ad1423124e7d5b6ae99 template_sources: - gemfiles/modular/x_std_libs/r3.1/libs.gemfile.example gemfiles/modular/x_std_libs/r3/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_libs_gemfile action: write dest_sha256: 546f8849f4267bb19aa10ff0de40be30957197f229e6887847181ea9127b2650 - input_fingerprint: 07455ba14337e55e00792146fa193e103347ee477be5d625f1c88d025eff52dd + input_fingerprint: 02eb0ed2b0b50c0b0fcba48b58c5857fcee41600fba19c429ee46f48ac2f7d3d template_sources: - gemfiles/modular/x_std_libs/r3/libs.gemfile.example gemfiles/modular/x_std_libs/r4/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r4_libs_gemfile action: write dest_sha256: 8c2582eaa218d216b98c86c933465295c8b4e43f3251ea388b9eaf6e471f8da6 - input_fingerprint: 64fcaf6d8e5154530fa13239d7c2ca536afe79f6da83492c22dba88fbccd9d12 + input_fingerprint: 6d7819360f2f6afec3ad82d0d93e0c02168979cf429093659e26670f3ebed3f3 template_sources: - gemfiles/modular/x_std_libs/r4/libs.gemfile.example gemfiles/modular/x_std_libs/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_vHEAD_gemfile action: write dest_sha256: d3133ec4c0638363a7fb025d19be7e95a615fd61c35ddb8d17f2280ee74a7486 - input_fingerprint: 35a9488d54e502cbdcc3b31e2ccdb3f7393145cb3b9c3f5a5accc6fc1280223c + input_fingerprint: e9093910a535743de3644946c0e623145735c6a7b4b9ba07aa7922de50a2e767 template_sources: - gemfiles/modular/x_std_libs/vHEAD.gemfile.example lib/ast/crispr/markdown/markly/version.rb: recipe: template_source_application_lib_ast_crispr_markdown_markly_version_rb action: write - dest_sha256: fac0fd2944a17a18e2d115dca4476451f76c10e50b9306282d7105c51709def2 - input_fingerprint: d29cc553a90f56b6232015a599eee68521022bf731b80121db4e0edbe64e4027 + dest_sha256: 8d5e24691f06296f70231acd9cdc2c9310e2f6b5b832a8e7c1cded99e9ebe4db + input_fingerprint: 169668e2e61687c63299cf15bf41da9e8915b04c8d5ef7095c6a8de306dfacf4 template_sources: - lib/gem/version.rb.example mise.toml: recipe: template_source_application_mise_toml action: write dest_sha256: 491df76688079679de0a0b7cef55cad315b5b5907f92e825cb9a4655e9c671bd - input_fingerprint: 98569c51f1e868cfbc838695dbbd70ae54ac6d645a68c00afae5e9377a4379ff + input_fingerprint: 34dff5bddac81b0a6664fecf89580646adac4140f0cf31d534cfeac534ca9424 template_sources: - mise.toml.no-osc.example sig/ast/crispr/markdown/markly.rbs: recipe: template_source_application_sig_ast_crispr_markdown_markly_rbs action: write dest_sha256: e6edddabcca5268e48bb90d2e7711ba5b1565a370052a46b33652bcd12938ae0 - input_fingerprint: 40d24ed8e765cefe243ca993878c218527cc0ae23cddd0c8b71f02adb3df03c4 + input_fingerprint: 9c8d32be1852bffee7187869064d4670063a3b6f5deea3e0c2ef005471d269c3 template_sources: - sig/gem.rbs.example spec/spec_helper.rb: recipe: template_source_application_spec_spec_helper_rb action: write dest_sha256: effc700ec0650ba337172553c32ca9093ce1168943e471ea65676f2cd59290f7 - input_fingerprint: 11121ca14fa60c7f6cf959b3825e77e88e52cc0a57b82ed8b33582f1814f6fab + input_fingerprint: 3aa19574f9b05712c8824131c9dab0ba7f0e478113f519796af4f36f1150c0da template_sources: - spec/spec_helper.rb.example diff --git a/gems/ast-crispr-markdown-markly/Gemfile b/gems/ast-crispr-markdown-markly/Gemfile index 782c49fe8..7d22e5347 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile +++ b/gems/ast-crispr-markdown-markly/Gemfile @@ -19,7 +19,7 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } # Include dependencies from ast-crispr-markdown-markly.gemspec gemspec -gem 'kettle-family', '~> 1.2', '>= 1.2.97' +gem 'kettle-family', '~> 1.2', '>= 1.2.100' # Local workspace dependency wiring for *_local.gemfile overrides gem 'nomono', '~> 1.1', '>= 1.1.5', require: false # ruby >= 3.2.0 diff --git a/gems/ast-crispr-markdown-markly/Gemfile.lock b/gems/ast-crispr-markdown-markly/Gemfile.lock index fb860da64..bec784c6d 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile.lock +++ b/gems/ast-crispr-markdown-markly/Gemfile.lock @@ -10,123 +10,123 @@ GIT PATH remote: . specs: - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) + ast-crispr-markdown-markly (7.1.9) + ast-crispr (= 7.1.9) + markdown-merge (= 7.1.9) + markly-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism specs: - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) + ast-crispr-ruby-prism (7.1.9) + ast-crispr (= 7.1.9) + prism-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) + ast-crispr (7.1.9) + ast-merge (= 7.1.9) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ast-merge-git (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: - ast-merge (7.1.8) + ast-merge (7.1.9) benchmark token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) + ast-template (7.1.9) + ast-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + bash-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + binary-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) + citrus-toml-merge (7.1.9) + ast-merge (= 7.1.9) + toml-merge (= 7.1.9) toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge specs: - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) commonmarker (~> 2.2) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) + dotenv-merge (7.1.9) + ast-merge (= 7.1.9) + plain-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + go-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + html-merge (7.1.9) + ast-crispr (= 7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + json-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: - kettle-jem (7.1.25) + kettle-jem (7.1.26) addressable (>= 2.8, < 3) ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) @@ -160,122 +160,122 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge specs: - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown (~> 2.5) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + markdown-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) + markly-merge (7.1.9) + markdown-merge (= 7.1.9) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge specs: - parslet-toml-merge (7.1.8) + parslet-toml-merge (7.1.9) toml (~> 0.3) - toml-merge (= 7.1.8) + toml-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + plain-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) + prism-merge (7.1.9) + ast-merge (= 7.1.9) prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + psych-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) + yaml-merge (= 7.1.9) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) + rbs-merge (7.1.9) + ast-merge (= 7.1.9) rbs (>= 3.10) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + rust-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) + smorg-rb (7.1.9) + ast-merge (= 7.1.9) + ast-merge-git (= 7.1.9) + bash-merge (= 7.1.9) diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) + dotenv-merge (= 7.1.9) + go-merge (= 7.1.9) + html-merge (= 7.1.9) + json-merge (= 7.1.9) kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) + markdown-merge (= 7.1.9) + plain-merge (= 7.1.9) + prism-merge (= 7.1.9) + psych-merge (= 7.1.9) + rbs-merge (= 7.1.9) + rust-merge (= 7.1.9) + toml-merge (= 7.1.9) + typescript-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + toml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: - tree_haver (7.1.8) + tree_haver (7.1.9) citrus (~> 3.0) parslet (~> 2.0) tree_sitter_language_pack (>= 1.16.2, < 2.0) @@ -284,25 +284,25 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + typescript-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + yaml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) + zip-merge (7.1.9) + binary-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) GEM @@ -336,6 +336,8 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) + commonmarker (2.10.0) + rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -465,11 +467,15 @@ GEM lint_roller (1.1.0) logger (1.7.0) markly (0.19.0) + mini_portile2 (2.8.9) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) reline (~> 0.6) mutex_m (0.3.0) + nokogiri (1.19.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-musl) @@ -503,6 +509,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) + rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -696,13 +705,16 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.16.2-aarch64-linux) + tree_sitter_language_pack (1.17.0) + rb_sys (>= 0.9.130, < 0.10) + sorbet-runtime (~> 0.5) + tree_sitter_language_pack (1.17.0-aarch64-linux) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-arm64-darwin) + tree_sitter_language_pack (1.17.0-arm64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-linux) + tree_sitter_language_pack (1.17.0-x86_64-linux) sorbet-runtime (~> 0.5) tsort (0.2.0) tty-cursor (0.7.1) @@ -784,9 +796,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.31) + kettle-dev (~> 3.0, >= 3.0.34) kettle-drift (~> 1.0, >= 1.0.13) - kettle-family (~> 1.2, >= 1.2.97) + kettle-family (~> 1.2, >= 1.2.100) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) @@ -807,12 +819,12 @@ DEPENDENCIES reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) - rubocop-lts (~> 24.2, >= 24.2.1) - rubocop-lts-rspec (~> 1.0, >= 1.0.5) + rubocop-lts (~> 24.2, >= 24.2.3) + rubocop-lts-rspec (~> 1.0, >= 1.0.6) rubocop-minitest (~> 0.40, >= 0.40.0) rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! - rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) ruby-merge! ruby-progressbar (~> 1.13) rust-merge! @@ -843,33 +855,34 @@ CHECKSUMS appraisal2 (3.2.3) sha256=3a6cfaf8a444e02707b9a34154af1c4902fbe99d9d2168d7e81dd83ec77e6db7 appraisal2-rubocop (1.0.2) sha256=1dae97c1be087cf9c098a3a72fd41f873435e9b8b39687e633b36c9ccb22bff4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.8) - ast-crispr-markdown-markly (7.1.8) - ast-crispr-ruby-prism (7.1.8) - ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) + ast-crispr (7.1.9) + ast-crispr-markdown-markly (7.1.9) + ast-crispr-ruby-prism (7.1.9) + ast-merge (7.1.9) + ast-merge-git (7.1.9) + ast-template (7.1.9) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.8) + bash-merge (7.1.9) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) - bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae + binary-merge (7.1.9) + bundler (4.1.0.beta1) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.8) + citrus-toml-merge (7.1.9) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 + commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e commonmarker (2.10.0-x86_64-darwin) sha256=01e0830ed0319825ecdc16411c90acd3f661d1568dfc178731b3f64d0ce2363d commonmarker (2.10.0-x86_64-linux) sha256=945c510c0bfca9022245928e2248468fe3ddad58c939be0c37b20082cc392880 commonmarker (2.10.0-x86_64-linux-musl) sha256=288cd4fb9f17eed2ffa73551ef241dcf594e0f484b2aee2a0999540333c0618e - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) completely (0.8.0) sha256=e493cd5d84805f47917a41f277ecbfe5f35363bed670be5a957d3acaed8c6c5e concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 @@ -878,7 +891,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docopt_ng (0.7.1) sha256=a024148ee4fa3ab1a8a04411aa4370f39cf2b446e63562097d418b7974a15667 - dotenv-merge (7.1.8) + dotenv-merge (7.1.9) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -891,35 +904,37 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) + go-merge (7.1.9) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) + html-merge (7.1.9) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a - json-merge (7.1.8) - kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + json-merge (7.1.9) + kettle-changelog (1.0.7) + kettle-dev (3.0.34) + kettle-drift (1.0.13) kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 - kettle-jem (7.1.25) + kettle-jem (7.1.26) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 - kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd + kettle-soup-cover (3.0.10) kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 - markdown-merge (7.1.8) + markdown-merge (7.1.9) markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca - markly-merge (7.1.8) + markly-merge (7.1.9) + mini_portile2 (2.8.9) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 + nokogiri (1.19.4) nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af nokogiri (1.19.4-arm64-darwin) sha256=a46db9853286e6597b36ebc6953817d15acf3a299583eb3f89fdc6f91dd63527 @@ -933,20 +948,22 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) - plain-merge (7.1.8) + parslet-toml-merge (7.1.9) + plain-merge (7.1.9) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.8) + prism-merge (7.1.9) psych (5.5.0) sha256=4b245bbbd0f3238df8ccee766ebc1a6b062b10e4ee1d3284eb588739ba156a0a - psych-merge (7.1.8) + psych-merge (7.1.9) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 - rbs-merge (7.1.8) + rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -982,11 +999,11 @@ CHECKSUMS rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.8) + ruby-merge (7.1.9) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) + rust-merge (7.1.9) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -994,7 +1011,7 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) + smorg-rb (7.1.9) sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1010,25 +1027,26 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.8) + toml (0.3.0) + toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb - tree_haver (7.1.8) - tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 - tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 - tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 - tree_sitter_language_pack (1.16.2-x86_64-linux) sha256=d8151e6e44e35ace9de3611c76b730896beab17f427db06d8f76666332a5dc60 + tree_haver (7.1.9) + tree_sitter_language_pack (1.17.0) + tree_sitter_language_pack (1.17.0-aarch64-linux) + tree_sitter_language_pack (1.17.0-arm64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-linux) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f tty-cursor (0.7.1) sha256=79534185e6a777888d88628b14b6a1fdf5154a603f285f80b1753e1908e0bf48 tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) + typescript-merge (7.1.9) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 yaml-converter (0.2.5) sha256=a5214fe1a6c2df88bd34a35bcded1b1dcd30135548130df2e03b54ca8c0f2423 - yaml-merge (7.1.8) + yaml-merge (7.1.9) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.8) sha256=73d935d43e3479d65ce8aff25c7d3100e8bb83528a2adaa0ed824e5046ac99e7 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -1037,8 +1055,8 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) + zip-merge (7.1.9) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH - 4.0.20 + 4.1.0.beta1 diff --git a/gems/ast-crispr-markdown-markly/Rakefile b/gems/ast-crispr-markdown-markly/Rakefile index 481dc97e0..2306ef4f2 100644 --- a/gems/ast-crispr-markdown-markly/Rakefile +++ b/gems/ast-crispr-markdown-markly/Rakefile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -# ast-crispr-markdown-markly Rakefile v7.1.18 - 2026-09-07 +# ast-crispr-markdown-markly Rakefile v7.1.26 - 2026-09-09 # Ruby 2.3 (Safe Navigation) or higher required # # See LICENSE.md for license information. diff --git a/gems/ast-crispr-markdown-markly/ast-crispr-markdown-markly.gemspec b/gems/ast-crispr-markdown-markly/ast-crispr-markdown-markly.gemspec index 186464b04..658ed32dc 100644 --- a/gems/ast-crispr-markdown-markly/ast-crispr-markdown-markly.gemspec +++ b/gems/ast-crispr-markdown-markly/ast-crispr-markdown-markly.gemspec @@ -121,7 +121,7 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.31') # ruby >= 4.0.0 + spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.34') # ruby >= 4.0.0 # Security spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 diff --git a/gems/ast-crispr-markdown-markly/bin/rubocop-gradual b/gems/ast-crispr-markdown-markly/bin/rubocop-gradual new file mode 100755 index 000000000..7c7ff0635 --- /dev/null +++ b/gems/ast-crispr-markdown-markly/bin/rubocop-gradual @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'rubocop-gradual' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'rubygems' +require 'bundler/setup' + +load Gem.bin_path('rubocop-gradual', 'rubocop-gradual') diff --git a/gems/ast-crispr-markdown-markly/gemfiles/modular/coverage_local.gemfile b/gems/ast-crispr-markdown-markly/gemfiles/modular/coverage_local.gemfile index 37917caac..d6c890e46 100644 --- a/gems/ast-crispr-markdown-markly/gemfiles/modular/coverage_local.gemfile +++ b/gems/ast-crispr-markdown-markly/gemfiles/modular/coverage_local.gemfile @@ -29,11 +29,31 @@ Kernel.send(:gem, 'nomono', *nomono_activation_requirements) require 'nomono/bundler' local_gems = %w[kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -local_gems_to_eval = local_gems - %w[] - declared_gems # export KETTLE_DEV_DEV=/path/to/my platform :mri do + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + local_gems_to_eval = local_gems - %w[] - declared_gems + eval_nomono_gems( gems: local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/ast-crispr-markdown-markly/gemfiles/modular/style.gemfile b/gems/ast-crispr-markdown-markly/gemfiles/modular/style.gemfile index 59c5dc1a3..41ec99454 100644 --- a/gems/ast-crispr-markdown-markly/gemfiles/modular/style.gemfile +++ b/gems/ast-crispr-markdown-markly/gemfiles/modular/style.gemfile @@ -24,9 +24,9 @@ platform :mri do if ENV.fetch('RUBOCOP_LTS_DEV', 'false').casecmp('false').zero? declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) - gem 'rubocop-lts', '~> 24.2', '>= 24.2.1' unless declared_gems.include?('rubocop-lts') - gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.5' unless declared_gems.include?('rubocop-lts-rspec') - gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.6' unless declared_gems.include?('rubocop-ruby3_2') + gem 'rubocop-lts', '~> 24.2', '>= 24.2.3' unless declared_gems.include?('rubocop-lts') + gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.6' unless declared_gems.include?('rubocop-lts-rspec') + gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.8' unless declared_gems.include?('rubocop-ruby3_2') else eval_gemfile('style_local.gemfile') end diff --git a/gems/ast-crispr-markdown-markly/gemfiles/modular/templating.gemfile b/gems/ast-crispr-markdown-markly/gemfiles/modular/templating.gemfile index 6af159bd7..ce51a08ed 100644 --- a/gems/ast-crispr-markdown-markly/gemfiles/modular/templating.gemfile +++ b/gems/ast-crispr-markdown-markly/gemfiles/modular/templating.gemfile @@ -18,7 +18,7 @@ end if structuredmerge_remote # Merge recipes for released installs. - gem 'kettle-jem', '>= 7.0' + gem 'kettle-jem', '~> 7.1', '>= 7.1.26' end if kettle_remote diff --git a/gems/ast-crispr-markdown-markly/gemfiles/modular/templating_local.gemfile b/gems/ast-crispr-markdown-markly/gemfiles/modular/templating_local.gemfile index 99af57bd2..fad60ffee 100644 --- a/gems/ast-crispr-markdown-markly/gemfiles/modular/templating_local.gemfile +++ b/gems/ast-crispr-markdown-markly/gemfiles/modular/templating_local.gemfile @@ -65,9 +65,7 @@ structuredmerge_local_gems = %w[ kettle_dev_local_gems = %w[ kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift ] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[] -kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - (declared_gems - %w[kettle-dev]) if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( @@ -81,6 +79,28 @@ if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 end if ENV.fetch('KETTLE_DEV_DEV', 'false').casecmp('false') != 0 + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - declared_gems + eval_nomono_gems( gems: kettle_dev_local_gems_to_eval, prefix: 'KETTLE_DEV', From 59a29532bc9b0b0a697d29c17d24e50ac34ffc75 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Thu, 10 Sep 2026 00:02:58 -0400 Subject: [PATCH 104/137] =?UTF-8?q?=F0=9F=8E=A8=20Template=20kettle-jem=20?= =?UTF-8?q?by=20kettle-family?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kettle-jem/.kettle-drift.lock | 38 +-- .../.structuredmerge/kettle-jem.lock | 166 +++++---- gems/kettle-jem/CHANGELOG.md | 8 + gems/kettle-jem/Gemfile | 2 +- gems/kettle-jem/Gemfile.lock | 322 +++++++++--------- gems/kettle-jem/Rakefile | 2 +- gems/kettle-jem/bin/rubocop-gradual | 16 + .../gemfiles/modular/coverage_local.gemfile | 22 +- .../gemfiles/modular/runtime_heads.gemfile | 3 - .../kettle-jem/gemfiles/modular/style.gemfile | 6 +- .../gemfiles/modular/templating_local.gemfile | 22 +- gems/kettle-jem/kettle-jem.gemspec | 17 +- 12 files changed, 362 insertions(+), 262 deletions(-) create mode 100755 gems/kettle-jem/bin/rubocop-gradual diff --git a/gems/kettle-jem/.kettle-drift.lock b/gems/kettle-jem/.kettle-drift.lock index 7b340c95c..81d267ed0 100644 --- a/gems/kettle-jem/.kettle-drift.lock +++ b/gems/kettle-jem/.kettle-drift.lock @@ -3,8 +3,8 @@ { "file": "CHANGELOG.md", "lines": [ - 117, - 266 + 253, + 402 ] } ], @@ -12,8 +12,8 @@ { "file": "CHANGELOG.md", "lines": [ - 135, - 203 + 271, + 339 ] } ], @@ -21,9 +21,9 @@ { "file": "CHANGELOG.md", "lines": [ - 118, - 267, - 357 + 254, + 403, + 493 ] } ], @@ -31,8 +31,8 @@ { "file": "CHANGELOG.md", "lines": [ - 136, - 204 + 272, + 340 ] } ], @@ -40,8 +40,8 @@ { "file": "CHANGELOG.md", "lines": [ - 137, - 205 + 273, + 341 ] } ], @@ -49,8 +49,8 @@ { "file": "CHANGELOG.md", "lines": [ - 119, - 268 + 255, + 404 ] } ], @@ -58,8 +58,8 @@ { "file": "CHANGELOG.md", "lines": [ - 138, - 206 + 274, + 342 ] } ], @@ -67,8 +67,8 @@ { "file": "CHANGELOG.md", "lines": [ - 139, - 207 + 275, + 343 ] } ], @@ -76,8 +76,8 @@ { "file": "CHANGELOG.md", "lines": [ - 140, - 208 + 276, + 344 ] } ], diff --git a/gems/kettle-jem/.structuredmerge/kettle-jem.lock b/gems/kettle-jem/.structuredmerge/kettle-jem.lock index b1ef712f5..97ca64080 100644 --- a/gems/kettle-jem/.structuredmerge/kettle-jem.lock +++ b/gems/kettle-jem/.structuredmerge/kettle-jem.lock @@ -1,11 +1,29 @@ --- version: 1 template_state: - version: 7.1.18 - applied_at: '2026-09-07' + version: 7.1.26 + applied_at: '2026-09-10' changelog_replay: last_entry_key: kettle-jem-template-20260802-001 last_entry_date: '2026-08-02' + maintenance_changelog: + kettle-jem/prepare: + - Gemfile + - gemfiles/modular/coverage_local.gemfile + - gemfiles/modular/documentation_local.gemfile + - gemfiles/modular/optional.gemfile + - gemfiles/modular/runtime_heads.gemfile + - gemfiles/modular/style.gemfile + - gemfiles/modular/style_local.gemfile + - gemfiles/modular/templating.gemfile + - gemfiles/modular/templating_local.gemfile + - kettle-jem.gemspec + kettle-jem/template: + - ".simplecov" + - Gemfile + - Rakefile + - gemfiles/modular/optional.gemfile + - gemfiles/modular/templating.gemfile checksums: ".aiignore.example": 48a5dfdd93afd1a15fdce39cc28ca9920263f00018b0968ab031fa744521e5ce ".config/mise/env.sh": aeea5a2ab489ba6e5467ae8de6e386ec8c8fe4ff31a044e69d0cd6a092dd6654 @@ -75,7 +93,7 @@ template_state: ".rubocop_rspec.yml.example": 288ad75e7eb14d87d80fafe6f7272217be5c57547536ee56c780a7d10ac7ec74 ".simplecov.example": 222f2e6ce8cf089c70a21f0f5e5423d4bd59a96fdb2ce7754b0fb3d6f430c229 ".structuredmerge/git-drivers.toml.example": 9d241a44c9edffcdbd3da018fa188a238089c3d1635040924df594a6929a4f97 - ".structuredmerge/kettle-jem.yml.example": 26949dc4ee0722415e72452cbc186bee6ef7b154eae33166d36f3fdb1ca6e46d + ".structuredmerge/kettle-jem.yml.example": ff65a738da1af7d60714026a81d3323a46c864e96ae3570b806afdf6e7149ff9 ".yard-lint.yml.example": 90def46867c9436b4e177c47d91fc8165f4602e335715aecc39f5587ae20b55b ".yardignore.example": 821f453c609df7d46145d675424b39dfbe6dfdca8edac5f367b85fff48502455 ".yardopts.example": 6fd6f2701713096a8a9ea095c213bbc68eeef37797c4754d97837e3229a3a5f6 @@ -88,7 +106,7 @@ template_state: CHANGELOG.transfer.md: 21331d8a9e58b4ff6e088b88eb408bcccb0f2f64e78f8f4d42ac3f11a24baad8 CITATION.cff.example: e404ea0a7919d78a83d53d80e211d17b9663576aa606583b709795dc023fd75c CODE_OF_CONDUCT.md.example: f1ad532f1860f73ef774c6b27a26d41f4bc1cb8813034f5957487766ebb0986b - CONTRIBUTING.md.example: 22570cfb3dde72be79b4b522b6d5ab13f95d778e40444483a096871fe0891b19 + CONTRIBUTING.md.example: 8d23cce2d061e0c20d619c3f66591df5f32821cd84c32d171df0b8ebe1217a55 FUNDING.md.example: 392d047904b1557b29f4b43d37ec403b7480edd5b6ab51180be979b57a91e6ba FUNDING.md.no-osc.example: 3ef0258dd3e3b7f7e17e8bc2d20dcbcb3e74aa5a5a6f51297075696645e34c77 Gemfile.example: 99500023987e81775a9b5ef14e92cb3992f2ac408e5f42454f2728eee9b49fb2 @@ -99,19 +117,19 @@ template_state: PolyForm-Small-Business-1.0.0.md.example: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 README.md.example: 21f491e3d73bfc1b74056a6dcba61f72c93dee3cfe5272ac164a20978454de21 REEK: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - RUBOCOP.md.example: c09e5533ccc59b70a2efa05c99f66e521137c1053d3c12eb43509cebd5b68b0e + RUBOCOP.md.example: d99871a0e4c1d323c92e7febf328f062bb4722069b2abfd0a83bf7daa8dcbf8c Rakefile.example: 569803e726b07ea26267fec6891367a3096a0dff3c266269a7081d36afe496af SECURITY.md.example: ee9411aa85f36d88363fdaea7a1baea4362b6ec112cf2688e711b05de1d3144c bin/setup.example: 0ac35089c95a91d8973fe7a318bf9fd98b9f8e00db92c5d9ca6cd858abb8d41b certs/pboling.pem.example: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - gem.gemspec.example: 83e834e8958a88e4817a57199f48f5ebb245548ce251c5c47372208693f03b17 + gem.gemspec.example: 12dcadc0b297ccd4e18b9d1e538b98ac8330ef9fb2a059ed6754ad59272b77fa gemfiles/modular/benchmark/r4/v0.5.gemfile.example: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 gemfiles/modular/benchmark/vHEAD.gemfile.example: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 gemfiles/modular/cgi/r4/v0.5.gemfile.example: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 gemfiles/modular/cgi/vHEAD.gemfile.example: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 gemfiles/modular/changelog.gemfile.example: 892598e0e7792eb205247ae28128cef6dfc647d2fb33968969152230d6f69288 gemfiles/modular/coverage.gemfile.example: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - gemfiles/modular/coverage_local.gemfile.example: 928d5f260d7b119c038baa56da9fb78dd524dee613aea33ab72894bbce5c506e + gemfiles/modular/coverage_local.gemfile.example: 92ea0d7a9d693553dc614afa2c43990f5c3778c2b00ef6c528e122c31bd506a1 gemfiles/modular/debug.gemfile.example: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 gemfiles/modular/documentation.gemfile.example: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c gemfiles/modular/documentation_local.gemfile.example: 84a20f5d4b0feb94c2cf2f7a8dce8f682f1483498e41484c2b447a5661fd1870 @@ -145,10 +163,10 @@ template_state: gemfiles/modular/stringio/r3/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/r4/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/vHEAD.gemfile.example: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - gemfiles/modular/style.gemfile.example: 3ad0585b4f2db8918580ca41ea8723f7a166d7a83cfd7f9613511094997106fd + gemfiles/modular/style.gemfile.example: 02fe3e8fd00e49b90c3ab30e19b51014ee50490f3eadcfd1d4a39f4c2c997dda gemfiles/modular/style_local.gemfile.example: c86beb711e766126a5be68be4be18255831625ac3650d5069383c4a83a9511f3 - gemfiles/modular/templating.gemfile.example: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - gemfiles/modular/templating_local.gemfile.example: 930057d3b909a72e39a39125c4e883a7ff71f5691e64426c0541f8c8fc75b83f + gemfiles/modular/templating.gemfile.example: 2b33c094677b53ad9dd2eafeb3a3be452f612380c61001a2e75b3c078b8ff72a + gemfiles/modular/templating_local.gemfile.example: ac7259516e69ffafb8b9342a897ddf6042adc46335743f474c342509cefd8f2e gemfiles/modular/webrick/r4/v1.9.gemfile.example: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea gemfiles/modular/webrick/vHEAD.gemfile.example: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b gemfiles/modular/x_std_libs.gemfile.example: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a @@ -175,7 +193,7 @@ template_state: shim/Gemfile.example: 0fb0d9d06fcfb1fd6ca6f0eeb5867253ca1ed221e03d28027719225f868b0637 shim/README.md.example: 3a2f7211b7f92a1dfae5e523b8e34b051a3d8af942144b05286eca0b3c8f6fbe shim/Rakefile.example: 572c94da7052083b39b62a6600785419e314a109efd7a3d8c3a96eb77ad34fd1 - shim/gem.gemspec.example: efae033238e4fd1355cfc134f5c9123f175d1ad1dc4a1a2e663899788c9e0870 + shim/gem.gemspec.example: 14a7015b3328005d1c3b5fda6886bd6da383707745f6eaaa781d6f9689600131 shim/lib/compat_require.rb.example: 94ee85e353a3ca08c8a35c9063d4ff789214ea594c7f803f6cf09d7142f48379 shim/lib/entrypoint.rb.example: dd57613520daca01d6f6bcaa9b83b00ff74505240dc04b84ceb686df3c0539d7 shim/lib/version.rb.example: 15e219ac3a928b5580035f891e415551213175020f1131f6e7ca0ccd55a1b2d6 @@ -441,7 +459,7 @@ files: recipe: template_source_application_simplecov action: write dest_sha256: f70c7e365789684e5272e4268fbcd62914661e2c53d2f2dccb61eee0c9f04c79 - input_fingerprint: b1b673ede17fcffee4575e447c3a57aadfea45be2ce923d9a55340e7495b2e71 + input_fingerprint: 0d83abe9e7c7744ad90cc5fcac50c50b05a46885e2d85f1884ae8c09bfb00ea1 template_sources: - ".simplecov.example" ".structuredmerge/git-drivers.toml": @@ -490,7 +508,7 @@ files: recipe: template_source_application_AGPL_3_0_only_md action: write dest_sha256: d8a6cc31abc16b6748c7a21f21611f5a1ec33f67d22ca23d7da1c19b95496bee - input_fingerprint: 1bbb8c90c5ee7c60d923e9b3efa893c2642ed7e9c8fcc8c49f20f7106ee409bc + input_fingerprint: '09019224f448a60b5b1c9bb457b9e8fda9a51caf820cd4dc87ae2a67e4b993c7' template_sources: - AGPL-3.0-only.md.example Appraisal.root.gemfile: @@ -545,8 +563,8 @@ files: Gemfile: recipe: template_source_application_Gemfile action: write - dest_sha256: edd38cf37d5434f826f365d1a9b9f7d75b9f49a848df381909bdb7a428e00e8c - input_fingerprint: 9b866ce15ed02e96ddba86c185776ff188b46cd8514237fe9bb0d6edfd78654a + dest_sha256: e7a759ef23e757dafd747228746cf26d3e92d87990144319fcad31a41af3f6c2 + input_fingerprint: ad2f9bec1ca30196ea77f081c384b595460fcab7774ddb56543a504d8a6a47ec template_sources: - Gemfile.example IRP.md: @@ -560,21 +578,21 @@ files: recipe: template_source_application_LICENSE_md action: write dest_sha256: f6188bfd474a636d2a526420ebb411250faa447d94c9b9ccee097128ce4101b5 - input_fingerprint: cda203228334d8d2b1e07e1cd93e445648fbedbf6e853fb9972e7299e2e479bd + input_fingerprint: 231cb6a32259e5fffbbe7cc0984036a8d821e4ba2351373b0f1c875f73e86a88 template_sources: - LICENSE.md.example PolyForm-Small-Business-1.0.0.md: recipe: template_source_application_PolyForm_Small_Business_1_0_0_md action: write dest_sha256: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 - input_fingerprint: 2e63d2f3936a42a76f4f3788f04773b7a2626193892c8a3d644ee4eff5178759 + input_fingerprint: 5f1100ae1789157d458a6e72544320c8f7bc080257ff7613a83d777de86cd72f template_sources: - PolyForm-Small-Business-1.0.0.md.example README.md: recipe: template_source_application_README_md action: write - dest_sha256: '0739804a1d76c1652c290202d6de299c685eb66511199185230b2b714233ef5c' - input_fingerprint: 31c42f65b94e5169a1a15f28bf41e2812e646b9fa882a25740e4181354115f05 + dest_sha256: 947c8378602fd939d288008de4a1f26acad57aa0e041a4b89c735b02e48ac13d + input_fingerprint: f605d39af3fb9a6b5cabb55933ffcd693a711530792f720beec1b28c0f7bac50 template_sources: - README.md.example REEK: @@ -594,8 +612,8 @@ files: Rakefile: recipe: template_source_application_Rakefile action: write - dest_sha256: b5a1b9d7ec38aa0908f93e1066219a7aedbf6ea0c35625be45db72c258749278 - input_fingerprint: 28330a595668de84a9436b693c7716f9b022885700394da21b43219040a40a21 + dest_sha256: eabeb2db5c802222c73997f52b19b4f67e5110c9caa3937127768aa89377d4b3 + input_fingerprint: f34fb441498f2b17227c4757450c820e774160f7abbfbfb417a2faae1fcf5438 template_sources: - Rakefile.example SECURITY.md: @@ -616,315 +634,315 @@ files: recipe: template_source_application_certs_pboling_pem action: write dest_sha256: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - input_fingerprint: 4042512e5737277f2361646fb1e18686724e8f7334fa10dab9eee2f0b4d1a1cd + input_fingerprint: 15ef4be5dd8e6669ee5c393f35c990e8a9477ea036197232f6db7945347de53c template_sources: - certs/pboling.pem.example gemfiles/modular/benchmark/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_r4_v0_5_gemfile action: write dest_sha256: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 - input_fingerprint: d95efe378d2b4d13333350d254ad547c5afb9a3392cb2310a5940be5df50f6f4 + input_fingerprint: f3a985929b2bdefe67d163acb010bdf56e60693b4580a439f64fe10473a93739 template_sources: - gemfiles/modular/benchmark/r4/v0.5.gemfile.example gemfiles/modular/benchmark/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_vHEAD_gemfile action: write dest_sha256: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 - input_fingerprint: 0bf862ba9d2e7a93bcec359b6ccd6c9938030cec361c73d272d1ba8ce4ead09a + input_fingerprint: 49a0441c4533adc8853183c317db41466b4691ca048f62e8ebf8a4c5b355567d template_sources: - gemfiles/modular/benchmark/vHEAD.gemfile.example gemfiles/modular/cgi/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_cgi_r4_v0_5_gemfile action: write dest_sha256: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 - input_fingerprint: 1ba391a736ad72049d533fbb9909bd993a2b7567aa697ba745fb6da6235b7813 + input_fingerprint: 48f05f89358dd859112f3914632d0b06cc4e475611634926bb9a38fbd1744cb3 template_sources: - gemfiles/modular/cgi/r4/v0.5.gemfile.example gemfiles/modular/cgi/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_cgi_vHEAD_gemfile action: write dest_sha256: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 - input_fingerprint: 11233a9e3076b3a2699cd39eaacf32fca85d10ec81c0dcc38b01505a0a8d7387 + input_fingerprint: d66bd33512dcb9551ce03e21963571584b430aad141504d6efb000c49c037368 template_sources: - gemfiles/modular/cgi/vHEAD.gemfile.example gemfiles/modular/changelog.gemfile: recipe: template_source_application_gemfiles_modular_changelog_gemfile action: write dest_sha256: c9fc1872ba274e7c00b99927c3cb4e04a234eaeb16d1998f526b1f15687837d1 - input_fingerprint: 369776322a1bf2e3b144cae77125427fff63ce00094a0f873d646e19ba9a69a7 + input_fingerprint: ac6957cd7e7a3280ceb041e942121584742f5a7ccbde89c5c026159dc05425bb template_sources: - gemfiles/modular/changelog.gemfile.example gemfiles/modular/coverage.gemfile: recipe: template_source_application_gemfiles_modular_coverage_gemfile action: write dest_sha256: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - input_fingerprint: e048696162bbb029a0ac9d70cd6e4490ca7983142b43744dd2df6b82260035f9 + input_fingerprint: 17c7050a971b0ae63ad5e1ccc3dbc664baa63c916f4f4f95740605f421e4538b template_sources: - gemfiles/modular/coverage.gemfile.example gemfiles/modular/coverage_local.gemfile: recipe: template_source_application_gemfiles_modular_coverage_local_gemfile action: write - dest_sha256: 2b493414df06261ba8acb6f0eb18bf3fdd701d7cb5f967a9d15a3f42a4741827 - input_fingerprint: 46e82811b56ac98b19544aa60a0b93aa41fc9af89f8feb54b253959475c51123 + dest_sha256: 92c9a599c8f6867ec532880f73568f2736ac05d8973ec524b42fd5dbe6aeda3e + input_fingerprint: 6f3e199993cd52f5440314e3eceb964cdc1c62b144c1647b7f6f8797397e68b7 template_sources: - gemfiles/modular/coverage_local.gemfile.example gemfiles/modular/debug.gemfile: recipe: template_source_application_gemfiles_modular_debug_gemfile action: write dest_sha256: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 - input_fingerprint: 07f311550802cb2bceadf6b956bfa17ca57ebf476de10983f4e88435327ad805 + input_fingerprint: c5d51c5a9da860124baba1889a154423e0895c20fc3bd6495996b4f8352798aa template_sources: - gemfiles/modular/debug.gemfile.example gemfiles/modular/documentation.gemfile: recipe: template_source_application_gemfiles_modular_documentation_gemfile action: write dest_sha256: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c - input_fingerprint: b22a568fd028ea737d35b7b371f189d5608486566d1ba667d1691f5c287709d4 + input_fingerprint: e6ccbfbd9c52f9775e33bb0fa0533524f3d9e2cc23f3be933034acdc13b61525 template_sources: - gemfiles/modular/documentation.gemfile.example gemfiles/modular/documentation_local.gemfile: recipe: template_source_application_gemfiles_modular_documentation_local_gemfile action: write dest_sha256: 2058173855b9a4acc6d5efa20520e49734243eef6cf0b5e9063e0e5866a08e9c - input_fingerprint: eb799accdad5d7a2aa6b37e0cf25762978a0750a42b683b7b137136a29b7bb0d + input_fingerprint: 47aa318dd380e2119b8406f4913429816fe9c9e975c4772d9b59b736709e5c43 template_sources: - gemfiles/modular/documentation_local.gemfile.example gemfiles/modular/erb/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r2_v3_0_gemfile action: write dest_sha256: 3793e7dc9ef23a7ccd893d48cbba092fd27594c63e65cca011cc658218425670 - input_fingerprint: 4884fe7dc5104085e30af34aabb8456d6a4bbc1939e2f9d6e4e732af466d7850 + input_fingerprint: 5f4316bb4a582be634710f7bf052e7660a224bcd63886078357628ee0efc7262 template_sources: - gemfiles/modular/erb/r2/v3.0.gemfile.example gemfiles/modular/erb/r3/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r3_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: f13cc87d0e1e6f3d23d54212bb5f6cf507aa2b646d954856d0278cf807ddbd41 + input_fingerprint: 4e3f64f17a31073b3883e4a13089d9df84b8a77ae3f75b9ff42fdb6a8d7f163a template_sources: - gemfiles/modular/erb/r3/v5.0.gemfile.example gemfiles/modular/erb/r4/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r4_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: 4618cc2a502bcddffa5008a9826460d5918f0e6330acee8b6ae673e8e5ab8bde + input_fingerprint: 39db5dff4f0cdbd85bda9d77c3f48ae659ef036c5dbdf5889728d5194dbf06a8 template_sources: - gemfiles/modular/erb/r4/v5.0.gemfile.example gemfiles/modular/erb/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_erb_vHEAD_gemfile action: write dest_sha256: ad6f104a49e80e0cf625440e3dc816343fe7e2f037fc4971df75e7bb4305c683 - input_fingerprint: 236d5e16d0c7e92868a36105dc58c8de8000774e8b8bb4ea2d0dd7eefd991baf + input_fingerprint: cfa718f2d9a7a08acc3b390f825a6b86dc75204e3a8bf814b7cbb4932cf3e472 template_sources: - gemfiles/modular/erb/vHEAD.gemfile.example gemfiles/modular/json/truffleruby_22_3.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_22_3_gemfile action: write dest_sha256: 249c12eacbe90f9d0d2e81e7a62c4c7e9102e504ededcda4ecf660cb3bb68be4 - input_fingerprint: c8df1de473a4f6ffef0972a66ad9ac20c3835db71e869356a7eaa9a3ec889537 + input_fingerprint: 550adedcf4e9552875205a79c7a08f9a2e5a65f98adbfca6abebe22eebf0cfcc template_sources: - gemfiles/modular/json/truffleruby_22_3.gemfile.example gemfiles/modular/json/truffleruby_23_0.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_0_gemfile action: write dest_sha256: 66aa010567f7afa1af8244a74c3c88ecaaf84dc87b6a25180691bb480d02ed28 - input_fingerprint: 21604d1038ce4bd873788759fecf180fa0c9db849b92298f2a937013aa5cf6b3 + input_fingerprint: 4b3b0c5d38df04a6b977f44eec1599fa144c0f479fa921e46b98dc4b640611c5 template_sources: - gemfiles/modular/json/truffleruby_23_0.gemfile.example gemfiles/modular/json/truffleruby_23_1.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_1_gemfile action: write dest_sha256: '080fcbdaf2bec73cad40832a3d51eebb380af789917b96f493d1460b0dd6361d' - input_fingerprint: fef8b6741bd4fc9a35d0409e426c83286603cdf053f228f4083be1a8ecfc4785 + input_fingerprint: b5cb99483485f3de1b64b946b101b8fa126ca915648cb4bd36fd520b9900968a template_sources: - gemfiles/modular/json/truffleruby_23_1.gemfile.example gemfiles/modular/mutex_m/r2/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r2_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: ef4ed085e653f8faf19bf2f74ae63da5ae8eb7d48cfdccd9c3559bca648ecf04 + input_fingerprint: 5764ab4def7c0486ed8cf0d417228ecb279bf76b3ef1ed34ff4a3a13a87c8cb1 template_sources: - gemfiles/modular/mutex_m/r2/v0.3.gemfile.example gemfiles/modular/mutex_m/r3/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r3_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 78239648f5dc311cc8581cb075be64549bd1225016eaf4c3147c3ed7093f2099 + input_fingerprint: 34a6563b1eb2c4a96b3d4af6aa574395c79d98f24b1323467408dad9543ab393 template_sources: - gemfiles/modular/mutex_m/r3/v0.3.gemfile.example gemfiles/modular/mutex_m/r4/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r4_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: 299382eb4f5f0a62fa49c3e876e90836695dfe3e896f1e5aa46b06cd65d703bf + input_fingerprint: 36d5a8f3b679b5eb7c3ab97ecfef445bfac318cb7d2d1b11c7f1a6ddc450d201 template_sources: - gemfiles/modular/mutex_m/r4/v0.3.gemfile.example gemfiles/modular/mutex_m/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_vHEAD_gemfile action: write dest_sha256: '08018641c97f894788fa91b462da504ab2237213d18d95404136c393274ae3cb' - input_fingerprint: 1a0e0b5514fce713003c9a856f069f76724d63efc4da09aea92f2e6e7095357b + input_fingerprint: a719ca32504c8cbf3563a266ffe00c7264ce1589e4dcd5ce1f2895d0b015f50d template_sources: - gemfiles/modular/mutex_m/vHEAD.gemfile.example gemfiles/modular/optional.gemfile: recipe: template_source_application_gemfiles_modular_optional_gemfile action: write dest_sha256: 89a23369d64c01fff8ccc5b65b247d749fe6f296914d31746810c063d92c3d11 - input_fingerprint: 4b9bcc1ce065e49ca0f4e717b26af82bfec278c7fa5764908b33998792821646 + input_fingerprint: 5aeaecdc2f77884d6d26969b0df92e25c25305aefb4bf70e537bb58e84f1d8e0 template_sources: - gemfiles/modular/optional.gemfile.example gemfiles/modular/rspec.gemfile: recipe: template_source_application_gemfiles_modular_rspec_gemfile action: write dest_sha256: d043f5c9344f6435edb4607c5adaf42c78e7fb6b8b6726007de2bbedefb376c3 - input_fingerprint: b8a1575d05e3f7c723fc7076616497a380e8476a1aabf93672dc5858144446fb + input_fingerprint: 283a5a7add27f6924ac844afd0639f7139b2877ab3fc332ec6aa419fa36222e6 template_sources: - gemfiles/modular/rspec.gemfile.example gemfiles/modular/runtime_heads.gemfile: recipe: template_source_application_gemfiles_modular_runtime_heads_gemfile action: write - dest_sha256: 5d82e02e7ddd41c49d2f2c7cba0659a0e256b53c2f4fa7d65800f1e2239a870a - input_fingerprint: 7c7e12c942bf6d73277b4e77a4f3e0d6543b9a3524c2c1b661c7ea041336fa40 + dest_sha256: 6ac7158c4a3088190f2a9082f01439eb27eca2172ab3464b15c9cb045aa885e1 + input_fingerprint: 29df8df56215bdbefdf03b7fd5f6c46cec66e64aefb9f6ac5a95269eec9f2fbb template_sources: - gemfiles/modular/runtime_heads.gemfile.example gemfiles/modular/stringio/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r2_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 347a1fa89c2eb843752a590a8f29610f4b767458897a0f8f3ede4638178feb1d + input_fingerprint: 6cdaa73e193d11b1e8cd0257d05aa9ce18c42300eafb84ebb68b8ae9b4f67d5e template_sources: - gemfiles/modular/stringio/r2/v3.0.gemfile.example gemfiles/modular/stringio/r3/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r3_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: b4c8961c8c55b2da50439d201d25614233435a5901798c7ae7ac55e8c985d5e7 + input_fingerprint: d4409c7c5f7e88c9d9c341f327944797f0fe11da12be0b99c60152c8a51707a4 template_sources: - gemfiles/modular/stringio/r3/v3.0.gemfile.example gemfiles/modular/stringio/r4/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r4_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 3617fa346cb68bdf1a8c319c20fb969d5f60fff1acd9d096265d6cd68c0bce28 + input_fingerprint: bd418359399a2dc5acd1215263aded9966014685e1580dae89ca7bc9908c747d template_sources: - gemfiles/modular/stringio/r4/v3.0.gemfile.example gemfiles/modular/stringio/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_stringio_vHEAD_gemfile action: write dest_sha256: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - input_fingerprint: 212c8ee7581f66bc27c4ab37c0c1d5fa11eac293ae2b72cba9ed8731f2982722 + input_fingerprint: 8d35a5f8340d1d3fa75825dcec9a28db8b39141e1552f48a015264161e79996e template_sources: - gemfiles/modular/stringio/vHEAD.gemfile.example gemfiles/modular/style.gemfile: recipe: template_source_application_gemfiles_modular_style_gemfile action: write - dest_sha256: 2a3d46dcb8a9394f595f273f5eb0403d0a552837754ab109afc9ba79a7159083 - input_fingerprint: 83cee6c02bc6297e88aa8dd9b6432766edd5e89b72e58cb8d8b8c66a18738771 + dest_sha256: 9a24acff0054573c30f5d84d0418cd465ba3794d075bb5a36801410ac40e0787 + input_fingerprint: b7aa36b604c556d40cf08edccd645721503c7ca157028b81dc15d0307a23e789 template_sources: - gemfiles/modular/style.gemfile.example gemfiles/modular/style_local.gemfile: recipe: template_source_application_gemfiles_modular_style_local_gemfile action: write dest_sha256: 55eb9c149cdb2f29c9f31abe2d55a4f334e00fb859681dd17c42149a3f28ca36 - input_fingerprint: a5bf9c0646184fc83d282d654352cc40de88f4ed3646595abfae00e64e92602f + input_fingerprint: 5d84ff50d3e7922b328ea15d3a5f70feba7cb85deee9c0f22ef21e83b89db3d4 template_sources: - gemfiles/modular/style_local.gemfile.example gemfiles/modular/templating.gemfile: recipe: template_source_application_gemfiles_modular_templating_gemfile action: write dest_sha256: 8fbffde1c48cd71c18795fe8ffdb4ec5b5649909e03e801683fc8dbee9c83672 - input_fingerprint: e8f2a9db4b2975d00e875a61d909cac69f4ab9bc80764859801c547cbcddfbfc + input_fingerprint: a26bd5e47df076c5bd5a09787137a568b97ec88b8ae99eb103e2deacfaf59c26 template_sources: - gemfiles/modular/templating.gemfile.example gemfiles/modular/templating_local.gemfile: recipe: template_source_application_gemfiles_modular_templating_local_gemfile action: write - dest_sha256: a2ae026d4ba5a73343c2a0418f73aa4a84559bf55ca411324de8544ac1b2b0ee - input_fingerprint: 66755ae0f734a4ed14a1c82f44637dfc2903a150d0239d825a367802fc47f9c8 + dest_sha256: 0c0733f60709131f33183bd82936ee11ac5e421c082a299b65a80791a409390c + input_fingerprint: 214a999bbccdf6d454435e8ced8fe9e3219aab51da954a71d48a5ce2bda325bb template_sources: - gemfiles/modular/templating_local.gemfile.example gemfiles/modular/webrick/r4/v1.9.gemfile: recipe: template_source_application_gemfiles_modular_webrick_r4_v1_9_gemfile action: write dest_sha256: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea - input_fingerprint: 9b416e033a27667906ecd16c55f295e71f48a2bc0944251998b64f01b6129b32 + input_fingerprint: 0c1f34206c015d8b4e953d6379b4d97f8ed29545882b0bbe0d67f528f0a7ca42 template_sources: - gemfiles/modular/webrick/r4/v1.9.gemfile.example gemfiles/modular/webrick/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_webrick_vHEAD_gemfile action: write dest_sha256: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b - input_fingerprint: 8516af2575be1449be8f556fa01be554d7fd87ba23ce8666c271eda24bb56894 + input_fingerprint: d024b57d4eb899ac25034b74419f48994ee3340fffa514e15ede4af562169dba template_sources: - gemfiles/modular/webrick/vHEAD.gemfile.example gemfiles/modular/x_std_libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_gemfile action: write dest_sha256: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a - input_fingerprint: c162115e584c231f97662db270f712882b70f9e927db7872d2ba897b65cee86d + input_fingerprint: 6870537b287cb3b789af44bf4a6716def0f38119dd37377f0006741986c36345 template_sources: - gemfiles/modular/x_std_libs.gemfile.example gemfiles/modular/x_std_libs/r2/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r2_libs_gemfile action: write dest_sha256: e80ec8ad06cb1b31ac982bc25cf7696987fca131aa1001eaefd0bf5cd379c273 - input_fingerprint: b81191947218ba164c3737c2797170f8a99916c562c41d377fb6d86171752803 + input_fingerprint: a0bdf6e1788adde8bb2a2bad49f23fd098b94d74862c2847fe07b1374f8b2908 template_sources: - gemfiles/modular/x_std_libs/r2/libs.gemfile.example gemfiles/modular/x_std_libs/r3.1/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_1_libs_gemfile action: write dest_sha256: 9f8565c40b09bea1bc4c2e2ad87fe11400c3c51a2b235655bfcd8e491ed88ca8 - input_fingerprint: ee6898609d117dab350e26bb2525f8ca5e08cc76e84a63df1cd7ac6610cf7b52 + input_fingerprint: ce957eb9686c22cece005c897097151f20a4f40ab988831eaf4430d595163ed6 template_sources: - gemfiles/modular/x_std_libs/r3.1/libs.gemfile.example gemfiles/modular/x_std_libs/r3/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_libs_gemfile action: write dest_sha256: 546f8849f4267bb19aa10ff0de40be30957197f229e6887847181ea9127b2650 - input_fingerprint: 8e79601c391baa37cb75a63d74db9327808db141f57a73a9a551b529786ef468 + input_fingerprint: ea4263d540f116041c656641863c9477ef50f470617dd10a2ca484e0b21d33ad template_sources: - gemfiles/modular/x_std_libs/r3/libs.gemfile.example gemfiles/modular/x_std_libs/r4/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r4_libs_gemfile action: write dest_sha256: 8c2582eaa218d216b98c86c933465295c8b4e43f3251ea388b9eaf6e471f8da6 - input_fingerprint: bc7e57fe39a114340dedcba921aad38f79c70ddc85da8aca669e65189623e24f + input_fingerprint: 0e548d840de109a279f93c5440f59a73e202cba812e5da15beea2daed962a763 template_sources: - gemfiles/modular/x_std_libs/r4/libs.gemfile.example gemfiles/modular/x_std_libs/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_vHEAD_gemfile action: write dest_sha256: d3133ec4c0638363a7fb025d19be7e95a615fd61c35ddb8d17f2280ee74a7486 - input_fingerprint: 93a0fc15717e90b9147da4333c3cdefa083c532d3a1d997115e068582cf9d2f9 + input_fingerprint: ef4b20ce1259bd3a0a5efc8d43646dbf13b9a08267f327d07262e4fe797337f3 template_sources: - gemfiles/modular/x_std_libs/vHEAD.gemfile.example kettle-jem.gemspec: recipe: template_source_application_kettle_jem_gemspec action: write - dest_sha256: 5fc8c52c1fbf45bbe9da49d34e3e9cdb1a6121cd04d0e48b52ad98571b8897f4 - input_fingerprint: 19043e1aa6ccd0a15a0f2c87685f74a6211fc0bcee51dd91e2923a3f2e192409 + dest_sha256: 438ac65e21c1b4dfe41f83379f05c1f82d73c02124c153eb4f8d6b6dd5ec083b + input_fingerprint: f2c246e79485fdf3f50adb655a84dc10c38c5c1a3470c383b06ab9514e1e61ee template_sources: - gem.gemspec.example lib/kettle/jem/version.rb: recipe: template_source_application_lib_kettle_jem_version_rb action: write - dest_sha256: 76d7d1a0bb751e36051ebe2152294fa5fe554457bf38402816d63ac5396f3679 - input_fingerprint: c02db3837b68848533bab3aa7b79ce626c66d780ec9eed8321e3ac5d39f93fa3 + dest_sha256: 1ba202fd7eab7afb4eb5f0a94904e1f495c92142eecb8fe15c6568159ccfb33b + input_fingerprint: c01058d2d18dad67f87fa1b91172ca700b0ff84922c3f98db49e1c9d92f9fe87 template_sources: - lib/gem/version.rb.example lib/kettle/jem/version_gem.rb: recipe: template_source_application_lib_kettle_jem_version_gem_rb action: write dest_sha256: 8735ec432abf3233f1636dcc7c198a3f90725bf921612246ad031c7b1c0a8bf7 - input_fingerprint: 638b590a21795f4c8e60dbc7e602b33e49d628e365bf8d4a4f6226f5b34c96f2 + input_fingerprint: ff700c93fa3eeb3eb09f7fa3b5ee305b02e018fa746150a470ea54eaa3f49b12 template_sources: - lib/gem/version_gem.rb.example mise.toml: recipe: template_source_application_mise_toml action: write dest_sha256: b4ee7c2080a449fd4080f44b969e79837ba1c788b5f411729571d29e4369463d - input_fingerprint: 771e0438369a9f058a256423f77554377dd30ecf494c93a998df2e89ad1f16c9 + input_fingerprint: 0e96921f0747657a51c60c7f7e3fbafa5e0da97335b64e5f46b58268f16072ce template_sources: - mise.toml.example parsers.toml: @@ -938,7 +956,7 @@ files: recipe: template_source_application_sig_kettle_jem_rbs action: write dest_sha256: 2cfaba5a844e5b5b4b889126d646b88edbce9de48e192409f4ae50fb3fbc1dc3 - input_fingerprint: d6f7b1b37c8b39b20e7c202d568086b485a531d78186066b29fbab44a90d2f96 + input_fingerprint: 8c4adfed2e46fcfe697cbd7d91c5b338095ca8b2a8d7c03a968dcf53c3b671a4 template_sources: - sig/gem.rbs.example spec/README.md: @@ -952,6 +970,6 @@ files: recipe: template_source_application_spec_spec_helper_rb action: write dest_sha256: 7046c34e71ad161660bfb12be257d9e1faf1577858882529f64b98f6bb593c85 - input_fingerprint: feeccd05034763df61b69c8af27735a9aa3b997eb64d9e8b7a9826096f6a33c6 + input_fingerprint: c41863bd180b40cc79634643672593648163d371e966758d87df6bbb846e1ec0 template_sources: - spec/spec_helper.rb.example diff --git a/gems/kettle-jem/CHANGELOG.md b/gems/kettle-jem/CHANGELOG.md index 668b84f22..900b6cbee 100644 --- a/gems/kettle-jem/CHANGELOG.md +++ b/gems/kettle-jem/CHANGELOG.md @@ -28,6 +28,14 @@ Please file a bug if you notice a violation of semantic versioning. - kettle-dev (>= 3.0.33 -> >= 3.0.34) - kettle-family (>= 1.2.97 -> >= 1.2.100) +- [kc] kettle-jem/prepare: updated 10 project files: + - dependencies (10) + +- [kc] kettle-jem/template: updated 5 project files: + - code and tests (1) + - dependencies (3) + - other (1) + ### Deprecated ### Removed diff --git a/gems/kettle-jem/Gemfile b/gems/kettle-jem/Gemfile index ef93b7d54..1e906e4e7 100644 --- a/gems/kettle-jem/Gemfile +++ b/gems/kettle-jem/Gemfile @@ -19,7 +19,7 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } # Include dependencies from kettle-jem.gemspec gemspec -gem "kettle-family", "~> 1.2", ">= 1.2.92" +gem "kettle-family", "~> 1.2", ">= 1.2.100" # Local workspace dependency wiring for *_local.gemfile overrides gem "nomono", "~> 1.1", ">= 1.1.5", require: false # ruby >= 3.2.0 diff --git a/gems/kettle-jem/Gemfile.lock b/gems/kettle-jem/Gemfile.lock index 7f8bdda1a..b98a3f9eb 100644 --- a/gems/kettle-jem/Gemfile.lock +++ b/gems/kettle-jem/Gemfile.lock @@ -10,7 +10,7 @@ GIT PATH remote: . specs: - kettle-jem (7.1.25) + kettle-jem (7.1.26) addressable (>= 2.8, < 3) ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) @@ -20,8 +20,8 @@ PATH commonmarker-merge (~> 7.1, >= 7.1.8) dotenv-merge (~> 7.1, >= 7.1.8) json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) + kettle-changelog (~> 1.0, >= 1.0.7) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.13) kettle-rb (~> 0.1, >= 0.1.11) @@ -44,238 +44,238 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) + ast-crispr-markdown-markly (7.1.9) + ast-crispr (= 7.1.9) + markdown-merge (= 7.1.9) + markly-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism specs: - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) + ast-crispr-ruby-prism (7.1.9) + ast-crispr (= 7.1.9) + prism-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) + ast-crispr (7.1.9) + ast-merge (= 7.1.9) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ast-merge-git (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: - ast-merge (7.1.8) + ast-merge (7.1.9) benchmark token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) + ast-template (7.1.9) + ast-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + bash-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + binary-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) + citrus-toml-merge (7.1.9) + ast-merge (= 7.1.9) + toml-merge (= 7.1.9) toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge specs: - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) commonmarker (~> 2.2) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) + dotenv-merge (7.1.9) + ast-merge (= 7.1.9) + plain-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + go-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + html-merge (7.1.9) + ast-crispr (= 7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + json-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge specs: - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown (~> 2.5) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + markdown-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) + markly-merge (7.1.9) + markdown-merge (= 7.1.9) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge specs: - parslet-toml-merge (7.1.8) + parslet-toml-merge (7.1.9) toml (~> 0.3) - toml-merge (= 7.1.8) + toml-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + plain-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) + prism-merge (7.1.9) + ast-merge (= 7.1.9) prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + psych-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) + yaml-merge (= 7.1.9) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) + rbs-merge (7.1.9) + ast-merge (= 7.1.9) rbs (>= 3.10) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + rust-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) + smorg-rb (7.1.9) + ast-merge (= 7.1.9) + ast-merge-git (= 7.1.9) + bash-merge (= 7.1.9) diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) + dotenv-merge (= 7.1.9) + go-merge (= 7.1.9) + html-merge (= 7.1.9) + json-merge (= 7.1.9) kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) + markdown-merge (= 7.1.9) + plain-merge (= 7.1.9) + prism-merge (= 7.1.9) + psych-merge (= 7.1.9) + rbs-merge (= 7.1.9) + rust-merge (= 7.1.9) + toml-merge (= 7.1.9) + typescript-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + toml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: - tree_haver (7.1.8) + tree_haver (7.1.9) citrus (~> 3.0) parslet (~> 2.0) tree_sitter_language_pack (>= 1.16.2, < 2.0) @@ -284,25 +284,25 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + typescript-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + yaml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) + zip-merge (7.1.9) + binary-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) GEM @@ -336,6 +336,8 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) + commonmarker (2.10.0) + rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -465,11 +467,15 @@ GEM lint_roller (1.1.0) logger (1.7.0) markly (0.19.0) + mini_portile2 (2.8.9) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) reline (~> 0.6) mutex_m (0.3.0) + nokogiri (1.19.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-musl) @@ -503,6 +509,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) + rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -696,13 +705,16 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.16.2-aarch64-linux) + tree_sitter_language_pack (1.17.0) + rb_sys (>= 0.9.130, < 0.10) + sorbet-runtime (~> 0.5) + tree_sitter_language_pack (1.17.0-aarch64-linux) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-arm64-darwin) + tree_sitter_language_pack (1.17.0-arm64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-linux) + tree_sitter_language_pack (1.17.0-x86_64-linux) sorbet-runtime (~> 0.5) tsort (0.2.0) tty-cursor (0.7.1) @@ -784,7 +796,7 @@ DEPENDENCIES json (~> 2.0, >= 2.21.2) json-merge! kettle-drift (~> 1.0, >= 1.0.13) - kettle-family (~> 1.2, >= 1.2.92) + kettle-family (~> 1.2, >= 1.2.100) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) @@ -804,12 +816,12 @@ DEPENDENCIES reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) - rubocop-lts (~> 24.2, >= 24.2.1) - rubocop-lts-rspec (~> 1.0, >= 1.0.5) + rubocop-lts (~> 24.2, >= 24.2.3) + rubocop-lts-rspec (~> 1.0, >= 1.0.6) rubocop-minitest (~> 0.40, >= 0.40.0) rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! - rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) ruby-merge! ruby-progressbar (~> 1.13) rust-merge! @@ -840,33 +852,34 @@ CHECKSUMS appraisal2 (3.2.3) sha256=3a6cfaf8a444e02707b9a34154af1c4902fbe99d9d2168d7e81dd83ec77e6db7 appraisal2-rubocop (1.0.2) sha256=1dae97c1be087cf9c098a3a72fd41f873435e9b8b39687e633b36c9ccb22bff4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.8) - ast-crispr-markdown-markly (7.1.8) - ast-crispr-ruby-prism (7.1.8) - ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) + ast-crispr (7.1.9) + ast-crispr-markdown-markly (7.1.9) + ast-crispr-ruby-prism (7.1.9) + ast-merge (7.1.9) + ast-merge-git (7.1.9) + ast-template (7.1.9) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.8) + bash-merge (7.1.9) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) - bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae + binary-merge (7.1.9) + bundler (4.1.0.beta1) sha256=8a2dac8ca276ff4eff5efc2c6457b0044080fc1e431534ad7c5cc6187232b800 bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.8) + citrus-toml-merge (7.1.9) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 + commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e commonmarker (2.10.0-x86_64-darwin) sha256=01e0830ed0319825ecdc16411c90acd3f661d1568dfc178731b3f64d0ce2363d commonmarker (2.10.0-x86_64-linux) sha256=945c510c0bfca9022245928e2248468fe3ddad58c939be0c37b20082cc392880 commonmarker (2.10.0-x86_64-linux-musl) sha256=288cd4fb9f17eed2ffa73551ef241dcf594e0f484b2aee2a0999540333c0618e - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) completely (0.8.0) sha256=e493cd5d84805f47917a41f277ecbfe5f35363bed670be5a957d3acaed8c6c5e concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 @@ -875,7 +888,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docopt_ng (0.7.1) sha256=a024148ee4fa3ab1a8a04411aa4370f39cf2b446e63562097d418b7974a15667 - dotenv-merge (7.1.8) + dotenv-merge (7.1.9) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -888,35 +901,37 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) + go-merge (7.1.9) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) + html-merge (7.1.9) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a - json-merge (7.1.8) - kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + json-merge (7.1.9) + kettle-changelog (1.0.7) + kettle-dev (3.0.34) + kettle-drift (1.0.13) kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 - kettle-jem (7.1.25) + kettle-jem (7.1.26) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 - kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd + kettle-soup-cover (3.0.10) kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 - markdown-merge (7.1.8) + markdown-merge (7.1.9) markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca - markly-merge (7.1.8) + markly-merge (7.1.9) + mini_portile2 (2.8.9) sha256=0cd7c7f824e010c072e33f68bc02d85a00aeb6fce05bb4819c03dfd3c140c289 mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 + nokogiri (1.19.4) sha256=50c951611c92bca05c51411aef45f1cbc50f2821c4802758c5c6d34696533ab5 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af nokogiri (1.19.4-arm64-darwin) sha256=a46db9853286e6597b36ebc6953817d15acf3a299583eb3f89fdc6f91dd63527 @@ -930,20 +945,22 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) - plain-merge (7.1.8) + parslet-toml-merge (7.1.9) + plain-merge (7.1.9) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.8) + prism-merge (7.1.9) psych (5.5.0) sha256=4b245bbbd0f3238df8ccee766ebc1a6b062b10e4ee1d3284eb588739ba156a0a - psych-merge (7.1.8) + psych-merge (7.1.9) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 - rbs-merge (7.1.8) + rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -979,11 +996,11 @@ CHECKSUMS rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.8) + ruby-merge (7.1.9) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) + rust-merge (7.1.9) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -991,7 +1008,7 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) + smorg-rb (7.1.9) sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1007,25 +1024,26 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.8) + toml (0.3.0) + toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb - tree_haver (7.1.8) - tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 - tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 - tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 - tree_sitter_language_pack (1.16.2-x86_64-linux) sha256=d8151e6e44e35ace9de3611c76b730896beab17f427db06d8f76666332a5dc60 + tree_haver (7.1.9) + tree_sitter_language_pack (1.17.0) + tree_sitter_language_pack (1.17.0-aarch64-linux) sha256=0f9f10371105573903d277f4239d49798d9e01eb961b009b558399edc0c71c0a + tree_sitter_language_pack (1.17.0-arm64-darwin) sha256=25b2d7ba9ab0a53b842263e47ab1b2ab72b1d046a9fc2d60fea66dbf7fcaf875 + tree_sitter_language_pack (1.17.0-x86_64-darwin) sha256=8f92864fe368752c9bf99ed34d8edb06bb45f1826fa144f9956f05c6806c56e2 + tree_sitter_language_pack (1.17.0-x86_64-linux) sha256=a457e4956013c919a1f32858fc0554a229cec766a455b0a3c21c845925e2334d tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f tty-cursor (0.7.1) sha256=79534185e6a777888d88628b14b6a1fdf5154a603f285f80b1753e1908e0bf48 tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) + typescript-merge (7.1.9) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 yaml-converter (0.2.5) sha256=a5214fe1a6c2df88bd34a35bcded1b1dcd30135548130df2e03b54ca8c0f2423 - yaml-merge (7.1.8) + yaml-merge (7.1.9) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.8) sha256=73d935d43e3479d65ce8aff25c7d3100e8bb83528a2adaa0ed824e5046ac99e7 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -1034,8 +1052,8 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) + zip-merge (7.1.9) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH - 4.0.20 + 4.1.0.beta1 diff --git a/gems/kettle-jem/Rakefile b/gems/kettle-jem/Rakefile index 110aaa611..b039877ab 100644 --- a/gems/kettle-jem/Rakefile +++ b/gems/kettle-jem/Rakefile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -# kettle-jem Rakefile v7.1.18 - 2026-09-07 +# kettle-jem Rakefile v7.1.26 - 2026-09-10 # Ruby 2.3 (Safe Navigation) or higher required # # See LICENSE.md for license information. diff --git a/gems/kettle-jem/bin/rubocop-gradual b/gems/kettle-jem/bin/rubocop-gradual new file mode 100755 index 000000000..3d21eeaec --- /dev/null +++ b/gems/kettle-jem/bin/rubocop-gradual @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'rubocop-gradual' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__) + +require "rubygems" +require "bundler/setup" + +load Gem.bin_path("rubocop-gradual", "rubocop-gradual") diff --git a/gems/kettle-jem/gemfiles/modular/coverage_local.gemfile b/gems/kettle-jem/gemfiles/modular/coverage_local.gemfile index f67278b29..5d6a9ee79 100644 --- a/gems/kettle-jem/gemfiles/modular/coverage_local.gemfile +++ b/gems/kettle-jem/gemfiles/modular/coverage_local.gemfile @@ -29,11 +29,29 @@ Kernel.send(:gem, "nomono", *nomono_activation_requirements) require "nomono/bundler" local_gems = %w[kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -local_gems_to_eval = local_gems - %w[] - (declared_gems - %w[kettle-dev]) # export KETTLE_DEV_DEV=/path/to/my platform :mri do + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find { |dependency| dependency.name == "kettle-dev" } + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: "KETTLE_DEV", + path_env: "KETTLE_DEV_DEV", + vendored_gems_env: "VENDORED_GEMS", + vendor_gem_dir_env: "VENDOR_GEM_DIR", + debug_env: "KETTLE_DEV_DEBUG", + root: ["src", "my", "kettle-dev"] + ).fetch("kettle-dev", nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + local_gems_to_eval = local_gems - %w[] - declared_gems + eval_nomono_gems( gems: local_gems_to_eval, prefix: "KETTLE_DEV", diff --git a/gems/kettle-jem/gemfiles/modular/runtime_heads.gemfile b/gems/kettle-jem/gemfiles/modular/runtime_heads.gemfile index 976bd444b..02f134c7f 100644 --- a/gems/kettle-jem/gemfiles/modular/runtime_heads.gemfile +++ b/gems/kettle-jem/gemfiles/modular/runtime_heads.gemfile @@ -8,7 +8,4 @@ # Test against HEAD of runtime dependencies so we can proactively file bugs -# Ruby >= 2.2 -gem "version_gem", github: "ruby-oauth/version_gem", branch: "main" - eval_gemfile("x_std_libs/vHEAD.gemfile") diff --git a/gems/kettle-jem/gemfiles/modular/style.gemfile b/gems/kettle-jem/gemfiles/modular/style.gemfile index 8d48377ae..f0af1ac43 100644 --- a/gems/kettle-jem/gemfiles/modular/style.gemfile +++ b/gems/kettle-jem/gemfiles/modular/style.gemfile @@ -24,9 +24,9 @@ platform :mri do if ENV.fetch("RUBOCOP_LTS_DEV", "false").casecmp("false").zero? declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) - gem "rubocop-lts", "~> 24.2", ">= 24.2.1" unless declared_gems.include?("rubocop-lts") - gem "rubocop-lts-rspec", "~> 1.0", ">= 1.0.5" unless declared_gems.include?("rubocop-lts-rspec") - gem "rubocop-ruby3_2", "~> 3.0", ">= 3.0.6" unless declared_gems.include?("rubocop-ruby3_2") + gem "rubocop-lts", "~> 24.2", ">= 24.2.3" unless declared_gems.include?("rubocop-lts") + gem "rubocop-lts-rspec", "~> 1.0", ">= 1.0.6" unless declared_gems.include?("rubocop-lts-rspec") + gem "rubocop-ruby3_2", "~> 3.0", ">= 3.0.8" unless declared_gems.include?("rubocop-ruby3_2") else eval_gemfile("style_local.gemfile") end diff --git a/gems/kettle-jem/gemfiles/modular/templating_local.gemfile b/gems/kettle-jem/gemfiles/modular/templating_local.gemfile index fad2ab4b6..2ef66ef42 100644 --- a/gems/kettle-jem/gemfiles/modular/templating_local.gemfile +++ b/gems/kettle-jem/gemfiles/modular/templating_local.gemfile @@ -65,9 +65,7 @@ structuredmerge_local_gems = %w[ kettle_dev_local_gems = %w[ kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift ] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[] -kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - (declared_gems - %w[kettle-dev]) if ENV.fetch("STRUCTUREDMERGE_DEV", "false").casecmp("false") != 0 eval_nomono_gems( @@ -81,6 +79,26 @@ if ENV.fetch("STRUCTUREDMERGE_DEV", "false").casecmp("false") != 0 end if ENV.fetch("KETTLE_DEV_DEV", "false").casecmp("false") != 0 + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find { |dependency| dependency.name == "kettle-dev" } + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: "KETTLE_DEV", + path_env: "KETTLE_DEV_DEV", + vendored_gems_env: "VENDORED_GEMS", + vendor_gem_dir_env: "VENDOR_GEM_DIR", + debug_env: "KETTLE_DEV_DEBUG", + root: ["src", "my", "kettle-dev"] + ).fetch("kettle-dev", nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - declared_gems + eval_nomono_gems( gems: kettle_dev_local_gems_to_eval, prefix: "KETTLE_DEV", diff --git a/gems/kettle-jem/kettle-jem.gemspec b/gems/kettle-jem/kettle-jem.gemspec index 1fce2849e..e6cf0700e 100644 --- a/gems/kettle-jem/kettle-jem.gemspec +++ b/gems/kettle-jem/kettle-jem.gemspec @@ -20,6 +20,7 @@ Gem::Specification.new do |spec| # Linux distros often package gems and securely certify them independent # of the official RubyGem certification process. Allowed via ENV["SKIP_GEM_SIGNING"] + # Ref: https://gitlab.com/ruby-oauth/version_gem/-/issues/3 # Hence, only enable signing if `SKIP_GEM_SIGNING` is not set in ENV. # See CONTRIBUTING.md unless ENV.include?("SKIP_GEM_SIGNING") @@ -103,8 +104,8 @@ Gem::Specification.new do |spec| spec.add_dependency("commonmarker-merge", "~> 7.1", ">= 7.1.8") # ruby >= 4.0.0 spec.add_dependency("dotenv-merge", "~> 7.1", ">= 7.1.8") # ruby >= 4.0.0 spec.add_dependency("json-merge", "~> 7.1", ">= 7.1.8") # ruby >= 4.0.0 - spec.add_dependency("kettle-changelog", "~> 1.0", ">= 1.0.6") # ruby >= 4.0.0 - spec.add_dependency("kettle-dev", ">= 3.0.17", "< 4.0.0") # ruby >= 2.3.0 + spec.add_dependency("kettle-changelog", "~> 1.0", ">= 1.0.7") # ruby >= 4.0.0 + spec.add_dependency("kettle-dev", "~> 3.0", ">= 3.0.34") # ruby >= 2.3.0 spec.add_dependency("kettle-gha-pins", "~> 0.3", ">= 0.3.14") # ruby >= 2.4.0 spec.add_dependency("kettle-ndjson", "~> 0.1", ">= 0.1.13") # ruby >= 2.4.0 spec.add_dependency("kettle-rb", "~> 0.1", ">= 0.1.11") # ruby >= 1.8.7 @@ -121,7 +122,7 @@ Gem::Specification.new do |spec| spec.add_dependency("toml-merge", "~> 7.1", ">= 7.1.8") # ruby >= 4.0.0 spec.add_dependency("toml-rb", "~> 4.2") # ruby >= 3.2.0 spec.add_dependency("tree_haver", "~> 7.1", ">= 7.1.8") # ruby >= 4.0.0 - spec.add_dependency("version_gem", "~> 1.1", ">= 1.1.15") # ruby >= 2.2.0 + spec.add_dependency("version_gem", "~> 1.1", ">= 1.1.15") # ruby >= 2.2.0 spec.add_dependency("yaml-merge", "~> 7.1", ">= 7.1.8") # ruby >= 4.0.0 # NOTE: It is preferable to list development dependencies in the gemspec due to increased @@ -141,8 +142,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency("bundler-audit", "~> 0.9.3") # ruby >= 2.0.0 # Tasks - # Required by repository-local maintenance executables before loading Kettle Jem. - spec.add_development_dependency("json", "~> 2.0", ">= 2.21.2") # ruby >= 4.0.0 spec.add_development_dependency("rake", "~> 13.0") # ruby >= 2.2.0 # Debugging @@ -165,4 +164,12 @@ Gem::Specification.new do |spec| # /opt/hostedtoolcache/Ruby/2.3.8/x64/lib/ruby/gems/2.3.0/gems/erb-2.2.2/lib/erb.rb:670:in `prepare_trim_mode': undefined method `match?' for "-":String (NoMethodError) # spec.add_development_dependency("erb", ">= 2.2") # ruby >= 2.3.0, not SemVer, old rubies get dropped in a patch. spec.add_development_dependency("gitmoji-regex", "~> 2.0", ">= 2.0.12") # ruby >= 2.4 + + # HTTP recording for deterministic specs + # In Ruby 3.5 (HEAD) the CGI library has been pared down, so we also need to depend on gem "cgi" for ruby@head + # This is done in the "head" appraisal. + # See: https://github.com/vcr/vcr/issues/1057 + # spec.add_development_dependency("vcr", ">= 4") # 6.0 claims to support ruby >= 2.3, but fails on ruby 2.4 + # spec.add_development_dependency("webmock", ">= 3") # Last version to support ruby >= 2.3 + spec.add_development_dependency("json", "~> 2.0", ">= 2.21.2") # ruby >= 4.0.0 end From 1a0e95bc86307b28619827176892c62eb7633618 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Thu, 10 Sep 2026 00:04:20 -0400 Subject: [PATCH 105/137] =?UTF-8?q?=F0=9F=8E=A8=20Template=20smorg-rb=20by?= =?UTF-8?q?=20kettle-family?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/smorg-rb/.kettle-drift.lock | 76 +++- gems/smorg-rb/.rubocop_gradual.lock | 7 +- .../smorg-rb/.structuredmerge/kettle-jem.lock | 143 ++++---- gems/smorg-rb/Gemfile | 2 +- gems/smorg-rb/Gemfile.lock | 326 +++++++++--------- gems/smorg-rb/Rakefile | 2 +- gems/smorg-rb/bin/rubocop-gradual | 16 + .../gemfiles/modular/coverage_local.gemfile | 24 +- gems/smorg-rb/gemfiles/modular/style.gemfile | 6 +- .../gemfiles/modular/templating_local.gemfile | 24 +- gems/smorg-rb/smorg-rb.gemspec | 4 +- 11 files changed, 390 insertions(+), 240 deletions(-) create mode 100755 gems/smorg-rb/bin/rubocop-gradual diff --git a/gems/smorg-rb/.kettle-drift.lock b/gems/smorg-rb/.kettle-drift.lock index 98b009e1e..1b23f4793 100644 --- a/gems/smorg-rb/.kettle-drift.lock +++ b/gems/smorg-rb/.kettle-drift.lock @@ -1,10 +1,82 @@ { + "debug_env: 'KETTLE_DEV_DEBUG',\nroot: %w[src my kettle-dev]": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 46, + 63 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 93, + 110 + ] + } + ], + "path_env: 'KETTLE_DEV_DEV',\nvendored_gems_env: 'VENDORED_GEMS',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 43, + 60 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 90, + 107 + ] + } + ], + "prefix: 'KETTLE_DEV',\npath_env: 'KETTLE_DEV_DEV',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 42, + 59 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 89, + 106 + ] + } + ], + "vendor_gem_dir_env: 'VENDOR_GEM_DIR',\ndebug_env: 'KETTLE_DEV_DEBUG',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 45, + 62 + ] + }, + { + "file": "gemfiles/modular/templating_local.gemfile", + "lines": [ + 92, + 109 + ] + } + ], "vendored_gems_env: 'VENDORED_GEMS',\nvendor_gem_dir_env: 'VENDOR_GEM_DIR',": [ + { + "file": "gemfiles/modular/coverage_local.gemfile", + "lines": [ + 44, + 61 + ] + }, { "file": "gemfiles/modular/templating_local.gemfile", "lines": [ - 77, - 88 + 75, + 91, + 108 ] } ] diff --git a/gems/smorg-rb/.rubocop_gradual.lock b/gems/smorg-rb/.rubocop_gradual.lock index cb6d91af8..f003c7e7f 100644 --- a/gems/smorg-rb/.rubocop_gradual.lock +++ b/gems/smorg-rb/.rubocop_gradual.lock @@ -2,7 +2,7 @@ ".simplecov:1472788997": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] ], - "Rakefile:526094109": [ + "Rakefile:1039524182": [ [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], [81, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], [165, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], @@ -22,6 +22,9 @@ [1, 1, 0, "Naming/FileName: The name of this source file (`vHEAD.gemfile`) should use snake_case.", 5381], [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], + "gemfiles/modular/coverage_local.gemfile:2813372128": [ + [34, 1, 1586, "Metrics/BlockLength: Block has too many lines. [37/25]", 820328175] + ], "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] ], @@ -140,7 +143,7 @@ [740, 5, 355, "Metrics/MethodLength: Method has too many lines. [11/10]", 39262550], [932, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1186836706] ], - "smorg-rb.gemspec:3234654165": [ + "smorg-rb.gemspec:690154803": [ [152, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4147388508], [163, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], [164, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] diff --git a/gems/smorg-rb/.structuredmerge/kettle-jem.lock b/gems/smorg-rb/.structuredmerge/kettle-jem.lock index e309624c1..296d0930f 100644 --- a/gems/smorg-rb/.structuredmerge/kettle-jem.lock +++ b/gems/smorg-rb/.structuredmerge/kettle-jem.lock @@ -1,11 +1,12 @@ --- version: 1 template_state: - version: 7.1.18 - applied_at: '2026-09-07' + version: 7.1.26 + applied_at: '2026-09-10' changelog_replay: last_entry_key: kettle-jem-template-20260802-001 last_entry_date: '2026-08-02' + maintenance_changelog: {} checksums: ".aiignore.example": 48a5dfdd93afd1a15fdce39cc28ca9920263f00018b0968ab031fa744521e5ce ".config/mise/env.sh": aeea5a2ab489ba6e5467ae8de6e386ec8c8fe4ff31a044e69d0cd6a092dd6654 @@ -75,7 +76,7 @@ template_state: ".rubocop_rspec.yml.example": 288ad75e7eb14d87d80fafe6f7272217be5c57547536ee56c780a7d10ac7ec74 ".simplecov.example": 222f2e6ce8cf089c70a21f0f5e5423d4bd59a96fdb2ce7754b0fb3d6f430c229 ".structuredmerge/git-drivers.toml.example": 9d241a44c9edffcdbd3da018fa188a238089c3d1635040924df594a6929a4f97 - ".structuredmerge/kettle-jem.yml.example": 26949dc4ee0722415e72452cbc186bee6ef7b154eae33166d36f3fdb1ca6e46d + ".structuredmerge/kettle-jem.yml.example": ff65a738da1af7d60714026a81d3323a46c864e96ae3570b806afdf6e7149ff9 ".yard-lint.yml.example": 90def46867c9436b4e177c47d91fc8165f4602e335715aecc39f5587ae20b55b ".yardignore.example": 821f453c609df7d46145d675424b39dfbe6dfdca8edac5f367b85fff48502455 ".yardopts.example": 6fd6f2701713096a8a9ea095c213bbc68eeef37797c4754d97837e3229a3a5f6 @@ -88,7 +89,7 @@ template_state: CHANGELOG.transfer.md: 21331d8a9e58b4ff6e088b88eb408bcccb0f2f64e78f8f4d42ac3f11a24baad8 CITATION.cff.example: e404ea0a7919d78a83d53d80e211d17b9663576aa606583b709795dc023fd75c CODE_OF_CONDUCT.md.example: f1ad532f1860f73ef774c6b27a26d41f4bc1cb8813034f5957487766ebb0986b - CONTRIBUTING.md.example: 22570cfb3dde72be79b4b522b6d5ab13f95d778e40444483a096871fe0891b19 + CONTRIBUTING.md.example: 8d23cce2d061e0c20d619c3f66591df5f32821cd84c32d171df0b8ebe1217a55 FUNDING.md.example: 392d047904b1557b29f4b43d37ec403b7480edd5b6ab51180be979b57a91e6ba FUNDING.md.no-osc.example: 3ef0258dd3e3b7f7e17e8bc2d20dcbcb3e74aa5a5a6f51297075696645e34c77 Gemfile.example: 99500023987e81775a9b5ef14e92cb3992f2ac408e5f42454f2728eee9b49fb2 @@ -99,19 +100,19 @@ template_state: PolyForm-Small-Business-1.0.0.md.example: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 README.md.example: 21f491e3d73bfc1b74056a6dcba61f72c93dee3cfe5272ac164a20978454de21 REEK: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - RUBOCOP.md.example: c09e5533ccc59b70a2efa05c99f66e521137c1053d3c12eb43509cebd5b68b0e + RUBOCOP.md.example: d99871a0e4c1d323c92e7febf328f062bb4722069b2abfd0a83bf7daa8dcbf8c Rakefile.example: 569803e726b07ea26267fec6891367a3096a0dff3c266269a7081d36afe496af SECURITY.md.example: ee9411aa85f36d88363fdaea7a1baea4362b6ec112cf2688e711b05de1d3144c bin/setup.example: 0ac35089c95a91d8973fe7a318bf9fd98b9f8e00db92c5d9ca6cd858abb8d41b certs/pboling.pem.example: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - gem.gemspec.example: 83e834e8958a88e4817a57199f48f5ebb245548ce251c5c47372208693f03b17 + gem.gemspec.example: 12dcadc0b297ccd4e18b9d1e538b98ac8330ef9fb2a059ed6754ad59272b77fa gemfiles/modular/benchmark/r4/v0.5.gemfile.example: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 gemfiles/modular/benchmark/vHEAD.gemfile.example: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 gemfiles/modular/cgi/r4/v0.5.gemfile.example: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 gemfiles/modular/cgi/vHEAD.gemfile.example: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 gemfiles/modular/changelog.gemfile.example: 892598e0e7792eb205247ae28128cef6dfc647d2fb33968969152230d6f69288 gemfiles/modular/coverage.gemfile.example: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - gemfiles/modular/coverage_local.gemfile.example: 928d5f260d7b119c038baa56da9fb78dd524dee613aea33ab72894bbce5c506e + gemfiles/modular/coverage_local.gemfile.example: 92ea0d7a9d693553dc614afa2c43990f5c3778c2b00ef6c528e122c31bd506a1 gemfiles/modular/debug.gemfile.example: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 gemfiles/modular/documentation.gemfile.example: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c gemfiles/modular/documentation_local.gemfile.example: 84a20f5d4b0feb94c2cf2f7a8dce8f682f1483498e41484c2b447a5661fd1870 @@ -145,10 +146,10 @@ template_state: gemfiles/modular/stringio/r3/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/r4/v3.0.gemfile.example: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c gemfiles/modular/stringio/vHEAD.gemfile.example: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - gemfiles/modular/style.gemfile.example: 3ad0585b4f2db8918580ca41ea8723f7a166d7a83cfd7f9613511094997106fd + gemfiles/modular/style.gemfile.example: 02fe3e8fd00e49b90c3ab30e19b51014ee50490f3eadcfd1d4a39f4c2c997dda gemfiles/modular/style_local.gemfile.example: c86beb711e766126a5be68be4be18255831625ac3650d5069383c4a83a9511f3 - gemfiles/modular/templating.gemfile.example: d157abef231a22c3d635c5223876df3197052daac13e361b68137c052b8a47f6 - gemfiles/modular/templating_local.gemfile.example: 930057d3b909a72e39a39125c4e883a7ff71f5691e64426c0541f8c8fc75b83f + gemfiles/modular/templating.gemfile.example: 2b33c094677b53ad9dd2eafeb3a3be452f612380c61001a2e75b3c078b8ff72a + gemfiles/modular/templating_local.gemfile.example: ac7259516e69ffafb8b9342a897ddf6042adc46335743f474c342509cefd8f2e gemfiles/modular/webrick/r4/v1.9.gemfile.example: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea gemfiles/modular/webrick/vHEAD.gemfile.example: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b gemfiles/modular/x_std_libs.gemfile.example: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a @@ -175,7 +176,7 @@ template_state: shim/Gemfile.example: 0fb0d9d06fcfb1fd6ca6f0eeb5867253ca1ed221e03d28027719225f868b0637 shim/README.md.example: 3a2f7211b7f92a1dfae5e523b8e34b051a3d8af942144b05286eca0b3c8f6fbe shim/Rakefile.example: 572c94da7052083b39b62a6600785419e314a109efd7a3d8c3a96eb77ad34fd1 - shim/gem.gemspec.example: efae033238e4fd1355cfc134f5c9123f175d1ad1dc4a1a2e663899788c9e0870 + shim/gem.gemspec.example: 14a7015b3328005d1c3b5fda6886bd6da383707745f6eaaa781d6f9689600131 shim/lib/compat_require.rb.example: 94ee85e353a3ca08c8a35c9063d4ff789214ea594c7f803f6cf09d7142f48379 shim/lib/entrypoint.rb.example: dd57613520daca01d6f6bcaa9b83b00ff74505240dc04b84ceb686df3c0539d7 shim/lib/version.rb.example: 15e219ac3a928b5580035f891e415551213175020f1131f6e7ca0ccd55a1b2d6 @@ -189,370 +190,370 @@ files: recipe: template_source_application_simplecov action: write dest_sha256: 253f660758d9e9a663d45683bc0df4cc12c1097ada1b571c3f61358849a0aeac - input_fingerprint: b6991b6b289d1b204c7a765221b29fd496e830fdcf6e4ec96dcb6720e37e0790 + input_fingerprint: 58ecc6dc0d6b523591d21e37d3b5cadb1509ba66bc047db35f844020b857e9e2 template_sources: - ".simplecov.example" AGPL-3.0-only.md: recipe: template_source_application_AGPL_3_0_only_md action: write dest_sha256: d8a6cc31abc16b6748c7a21f21611f5a1ec33f67d22ca23d7da1c19b95496bee - input_fingerprint: db0f1339f676e653ed0026d43ad18ceb1fea129e9c92fbfa031b44a44f225e76 + input_fingerprint: 55f55c6b402029ed8316c02609ca877478b8dbadb86e497fc2247a9f555b564a template_sources: - AGPL-3.0-only.md.example Gemfile: recipe: template_source_application_Gemfile action: write - dest_sha256: 2617bd06ae0115af1c7b69b77d9673d4721e8c6357f723888e1bef436786842f - input_fingerprint: 98f36fce3927c1436aca6781703a2125093160c77679084e62454f87c68c4cf3 + dest_sha256: ced9e74e5bbe55f1ba9bdec95a0603c29ae0c3c21db4ae99b8fb8c42d37f0184 + input_fingerprint: fb9872ab560e3873a52973f0ddc4decd63b60578c2d1bc2e37e752740915d70d template_sources: - Gemfile.example LICENSE.md: recipe: template_source_application_LICENSE_md action: write dest_sha256: f6188bfd474a636d2a526420ebb411250faa447d94c9b9ccee097128ce4101b5 - input_fingerprint: ce815f8b9337ab90245b75803e0a96bc3018b0f9708b55235d921178affffa03 + input_fingerprint: 7f9ec94f3338c387fef9e42d8115ea06f4425b4af771f1fef43f61fae37c33b5 template_sources: - LICENSE.md.example PolyForm-Small-Business-1.0.0.md: recipe: template_source_application_PolyForm_Small_Business_1_0_0_md action: write dest_sha256: 2f81e317d36f83a199c9fa10bcb250775fd90510303eaeb15aac2d8f0c1fc2d6 - input_fingerprint: cec6f0cac9bda8cecc147458393ac590bb049691b075370d46be8ff201a4b1aa + input_fingerprint: 72a772084c2e0ec3fe966e75d6d7f1ec8655942b3ffa9981c50203a4ee695061 template_sources: - PolyForm-Small-Business-1.0.0.md.example README.md: recipe: template_source_application_README_md action: write dest_sha256: f70c7dcb37e27c6165f4d1291ebcaa5fe38dbc8fc398076d44692f7e866f5264 - input_fingerprint: c143f29f1a81f6407891e910ceebba4e30212680d85ffb36b7ff8f8c0fdf0cf1 + input_fingerprint: 6cce592ca09c07738cdc9fd4a7a6b13635de00f9a9fef0e9099a2d7f3a807e29 template_sources: - README.md.example Rakefile: recipe: template_source_application_Rakefile action: write - dest_sha256: 389c3d94abbebaefdd31065df34705210815e8050d3f6f4e56e86e799bb33afd - input_fingerprint: 944c1b6a72fe54259cb87338b856a336fba7f89184d91a25c95242f4cce0607d + dest_sha256: f65cf02261c331a20389785391c040f014f474a2d5d5ace0c950d0ba132feed9 + input_fingerprint: 102e5e0919583950ed437e7a7079d898978daed2076aceb36f493cc7ab30c323 template_sources: - Rakefile.example certs/pboling.pem: recipe: template_source_application_certs_pboling_pem action: write dest_sha256: 18956f60643666cc181e2743b3b3691bec08c5326f514f60af54d0cdb9ebc554 - input_fingerprint: de2a2f911d7ea2794997119efbf26d79196d3d1c8e848da28418b7bc0b509751 + input_fingerprint: 1c74d3bb623e35368a2d0b707ac394423bb368e2cf54ab83542ae63fa866a114 template_sources: - certs/pboling.pem.example gemfiles/modular/benchmark/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_r4_v0_5_gemfile action: write dest_sha256: 5bc3190090ae456df1a8cce28dd47a7fb293495f6d845ec7e53a7a8b50f14ae1 - input_fingerprint: 06b265f6fc0d4a8dfbfc1e7def74988edc0c1cb3d20caa0c42c9a6412f756160 + input_fingerprint: 56b732b757cb0b7ba9a612233a76485bce17cd8a6bf55ee33bdeeadf3e5a364a template_sources: - gemfiles/modular/benchmark/r4/v0.5.gemfile.example gemfiles/modular/benchmark/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_benchmark_vHEAD_gemfile action: write dest_sha256: ca6cd52c55c3082759c6ddc97638970f12d953aec1822470823d316086aa6e25 - input_fingerprint: b7454cf7580728f65b7912dbde84eca6bfe081d209d23a819c9b20f4331e5789 + input_fingerprint: ba93434af2751fba7d3dc2e9aacbbe31099689c1206594386ee49a31b6a6d439 template_sources: - gemfiles/modular/benchmark/vHEAD.gemfile.example gemfiles/modular/cgi/r4/v0.5.gemfile: recipe: template_source_application_gemfiles_modular_cgi_r4_v0_5_gemfile action: write dest_sha256: c2d14a39377a2435419ceaca22a3421ebd899e9cba943df8a90b576a33624870 - input_fingerprint: 317a696344cfe7870ad8a1c66d5db28ea8d3c20e2fef5f54b1c907158bc28670 + input_fingerprint: 85834646d2db9e4276120e93536e24cdb96eacb698ff48663f58217213db2594 template_sources: - gemfiles/modular/cgi/r4/v0.5.gemfile.example gemfiles/modular/cgi/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_cgi_vHEAD_gemfile action: write dest_sha256: 9ff3dc789b3279642876c0aad4b0094c1139bb8fbbf36daab804d3b2b3a60b43 - input_fingerprint: fa72c491214e76df94ad5cae09304669f08d91871f94a2dd47a545e7cbc64afe + input_fingerprint: 5643e1fee05c5730561cde02df37025f67a047b26e23fad7d7e9e70040a4bb95 template_sources: - gemfiles/modular/cgi/vHEAD.gemfile.example gemfiles/modular/changelog.gemfile: recipe: template_source_application_gemfiles_modular_changelog_gemfile action: write dest_sha256: da669526144fbff33aef207db9541b6fd6c254437f94dec2fab70fc55a7757cd - input_fingerprint: 3f6b52f6ae1a8d52444d3decb78e41fde8fb40459e70fe914762c6c175e761de + input_fingerprint: cb829495a25ee2b9183a3758fd2fa57ad41dfef8c3dbdbe7a41407ea3c2eb8b6 template_sources: - gemfiles/modular/changelog.gemfile.example gemfiles/modular/coverage.gemfile: recipe: template_source_application_gemfiles_modular_coverage_gemfile action: write dest_sha256: a037f6768c6def5839bc8695e3fab7f7afd2a4a69ade6171b3cd586eed82b9bc - input_fingerprint: 1a2fb1a2e43faa40b8d1b94e14e6175f9d4ac6aa3d27d8f96e4afb16d5211153 + input_fingerprint: 157a2ea5e8d2654167882499e86ef8383bf9eba4a7f0c87d2fd0e4cba67a4e59 template_sources: - gemfiles/modular/coverage.gemfile.example gemfiles/modular/coverage_local.gemfile: recipe: template_source_application_gemfiles_modular_coverage_local_gemfile action: write - dest_sha256: 2b493414df06261ba8acb6f0eb18bf3fdd701d7cb5f967a9d15a3f42a4741827 - input_fingerprint: 8aecf7343d6ed2340f5bf647ff6d185cae2c891e5c614142d7cfbe9dd2834ee9 + dest_sha256: 92c9a599c8f6867ec532880f73568f2736ac05d8973ec524b42fd5dbe6aeda3e + input_fingerprint: 405f4bd213627ad7730d857561b4976ae95c1ed3c98e10d2deab8d765fb52bb6 template_sources: - gemfiles/modular/coverage_local.gemfile.example gemfiles/modular/debug.gemfile: recipe: template_source_application_gemfiles_modular_debug_gemfile action: write dest_sha256: 0a508bfb02e51b75394b43f4f09d98174dac36ead41cba09c1f730671a1f5905 - input_fingerprint: 4c102ab5a797dd01afbb0e85eeb97ff6033d7f5ed6da5534e7a71198dad4584f + input_fingerprint: 815eca76f5b79892ac60598f67853ea78d343041ebe223dac7a6e030adb5b3d5 template_sources: - gemfiles/modular/debug.gemfile.example gemfiles/modular/documentation.gemfile: recipe: template_source_application_gemfiles_modular_documentation_gemfile action: write dest_sha256: 98c905decda2a6a6e3b46e8a5d32565f5169ad1c0d358a43f9827f633378568c - input_fingerprint: d51850d4144045ee60e7f9874c8f9c8ec793a962de39d87469c5e6c2985f7dc9 + input_fingerprint: 1f2edccca4f3bd93d78bfdb83b05274ac0caf7993b9d5f3c8c1918721fbee768 template_sources: - gemfiles/modular/documentation.gemfile.example gemfiles/modular/documentation_local.gemfile: recipe: template_source_application_gemfiles_modular_documentation_local_gemfile action: write dest_sha256: 2058173855b9a4acc6d5efa20520e49734243eef6cf0b5e9063e0e5866a08e9c - input_fingerprint: a7250d4c6e9af6831d3b0078ddb29bcedab08524028e3f147a45e8a559e70191 + input_fingerprint: f9d2b085d78c2c6ad2c847b1efcdf1728937918598d9fcdc1ab980613eea94cd template_sources: - gemfiles/modular/documentation_local.gemfile.example gemfiles/modular/erb/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r2_v3_0_gemfile action: write dest_sha256: 3793e7dc9ef23a7ccd893d48cbba092fd27594c63e65cca011cc658218425670 - input_fingerprint: 805f26718d0471237cefff158b2f6fc7cc66b5c16fc2be21c4d8e2a84fa63599 + input_fingerprint: 7cd70269bc2bcd684c8ff2b383ddec42b85a02fe4f36e84e6b1be5e58e2535fc template_sources: - gemfiles/modular/erb/r2/v3.0.gemfile.example gemfiles/modular/erb/r3/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r3_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: d46a6bf834094217c29b9b6aec0cd877432eb9de9933bce2e167759f6c26321b + input_fingerprint: 4a421611289c61c6cfb8a24f013dc9f7513b32307f492880fc47ad6471524ff9 template_sources: - gemfiles/modular/erb/r3/v5.0.gemfile.example gemfiles/modular/erb/r4/v5.0.gemfile: recipe: template_source_application_gemfiles_modular_erb_r4_v5_0_gemfile action: write dest_sha256: 54309ac6a36e502f4df58ecba08f351b5532ae82759c4364969576f875374b24 - input_fingerprint: c126660c32698936436601aa60f1f6591afb1c326912741926990b166358ae26 + input_fingerprint: 2a346f0a8cb7d415761ca1529efd1d73469593e47f02c0febe6e311428008dc1 template_sources: - gemfiles/modular/erb/r4/v5.0.gemfile.example gemfiles/modular/erb/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_erb_vHEAD_gemfile action: write dest_sha256: ad6f104a49e80e0cf625440e3dc816343fe7e2f037fc4971df75e7bb4305c683 - input_fingerprint: fa0858766e748018b27c4dbf9a07c6b260ce5a985c0836f0061f61f5f98faad1 + input_fingerprint: cbe269b715fabb8ed693f4fd9db39fe3a8e87922b49eb2bef77c35cf86e3e063 template_sources: - gemfiles/modular/erb/vHEAD.gemfile.example gemfiles/modular/json/truffleruby_22_3.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_22_3_gemfile action: write dest_sha256: 249c12eacbe90f9d0d2e81e7a62c4c7e9102e504ededcda4ecf660cb3bb68be4 - input_fingerprint: 4361d7d9231a13feaa7d5204de1741da569f814a06a1a6785a92b2239c2b6104 + input_fingerprint: a0799914be0e5b76bdb5aa0dbb50ccefeec680aee932540a7673b540e46f7d70 template_sources: - gemfiles/modular/json/truffleruby_22_3.gemfile.example gemfiles/modular/json/truffleruby_23_0.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_0_gemfile action: write dest_sha256: 66aa010567f7afa1af8244a74c3c88ecaaf84dc87b6a25180691bb480d02ed28 - input_fingerprint: 15d9a1e34d7815292ed0e8f8f3223efd85ad0280e886decb4770b29050c6ca75 + input_fingerprint: edc29331db02405815ad79b6bf25b8fee7c15c684bc4cae129fa3594133be23f template_sources: - gemfiles/modular/json/truffleruby_23_0.gemfile.example gemfiles/modular/json/truffleruby_23_1.gemfile: recipe: template_source_application_gemfiles_modular_json_truffleruby_23_1_gemfile action: write dest_sha256: '080fcbdaf2bec73cad40832a3d51eebb380af789917b96f493d1460b0dd6361d' - input_fingerprint: 6a4b20e0465e8d5fd4dfa71c746299c23d6cc4de70c65911d764bb13c25eeaea + input_fingerprint: 75972ef348467e07111b57fd7e518cd2fa767460701df11e0405083296c1e613 template_sources: - gemfiles/modular/json/truffleruby_23_1.gemfile.example gemfiles/modular/mutex_m/r2/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r2_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: c4d6c63193b9cabb2bec032e593881b7099f2b2ca6d6cc817cb2802f6e96c2b6 + input_fingerprint: 51aba53313de51867c3713ab3fc3d8e8038f54ccb1b0b3c6314c41d0ad5fac38 template_sources: - gemfiles/modular/mutex_m/r2/v0.3.gemfile.example gemfiles/modular/mutex_m/r3/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r3_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: d3774144d31d10793c7a909dc229f1cebe906410b1b2be5433e58ba955ff9d72 + input_fingerprint: 6f70597e75c16b0333bcb28e5c6493fbde0d7df46b91a7d19729edda639bb9b8 template_sources: - gemfiles/modular/mutex_m/r3/v0.3.gemfile.example gemfiles/modular/mutex_m/r4/v0.3.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_r4_v0_3_gemfile action: write dest_sha256: 887eaaff14e1f1d24087a82ec117450559eab9552260a132caf56f21e4c681e1 - input_fingerprint: da1a6bcef2c132e4b87034a8e1364b812f3d21c964a358d1683137ad2000e4ae + input_fingerprint: 0ae560870a5333031bfe42703e56eac12b2ffc7b87d5485cde44088f83f7870c template_sources: - gemfiles/modular/mutex_m/r4/v0.3.gemfile.example gemfiles/modular/mutex_m/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_mutex_m_vHEAD_gemfile action: write dest_sha256: '08018641c97f894788fa91b462da504ab2237213d18d95404136c393274ae3cb' - input_fingerprint: e6d002de250f0e225fa7091c68e8271ebbf8b33d3852ea84d8e45923958cb9af + input_fingerprint: 4f6bf9575fc1a6161a300edf6ea2c505841cd541c76dba698b8f89d295f5a294 template_sources: - gemfiles/modular/mutex_m/vHEAD.gemfile.example gemfiles/modular/optional.gemfile: recipe: template_source_application_gemfiles_modular_optional_gemfile action: write dest_sha256: f770e6e9a9dd2bd0f1f132e882d88038b2e21127dce3afe270908c7338c28bfd - input_fingerprint: 138e5228c61320eaf44b534f7a7f1d8a3145feac08b05e21da394de8d6ccf7f7 + input_fingerprint: fbc275666eb27a5650c9d547b85281b5251033f6f19bcc648a538a3dd279202a template_sources: - gemfiles/modular/optional.gemfile.example gemfiles/modular/rspec.gemfile: recipe: template_source_application_gemfiles_modular_rspec_gemfile action: write dest_sha256: d043f5c9344f6435edb4607c5adaf42c78e7fb6b8b6726007de2bbedefb376c3 - input_fingerprint: 676ec90381f81f82b34b97c9b368bd59c38985450ec29fa25de260540bcd3075 + input_fingerprint: 598353f7e1c23f509732aa306f1bb83d5c00301dd87a22cfd1f8d95bf5daaeae template_sources: - gemfiles/modular/rspec.gemfile.example gemfiles/modular/runtime_heads.gemfile: recipe: template_source_application_gemfiles_modular_runtime_heads_gemfile action: write dest_sha256: 6ac7158c4a3088190f2a9082f01439eb27eca2172ab3464b15c9cb045aa885e1 - input_fingerprint: 750549d01838bf0a6405299b816641b245eb25a3fb9f4268deda8f8dd674a814 + input_fingerprint: 02b3b1c08fc4ba9b9ff9a86dda8504f2fc5ff9fd05068d8e931792b947d92f8c template_sources: - gemfiles/modular/runtime_heads.gemfile.example gemfiles/modular/stringio/r2/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r2_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: 4535f9ddf5aa1de625f1b13db2206326a4a5879d4d86ce22c2b701901156509d + input_fingerprint: 47eae706d4aa7e454a2639dc56f082269d3de31805574073d59213b4bab40297 template_sources: - gemfiles/modular/stringio/r2/v3.0.gemfile.example gemfiles/modular/stringio/r3/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r3_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: '0855e101e18442a2af4c2d102e600eb506fdb84f221c629aa32fe8ec09cef249' + input_fingerprint: 2ad55c44f84978cbef07ea5244f7452f4a889fb1a9e7d3bc6aece72eb5a22711 template_sources: - gemfiles/modular/stringio/r3/v3.0.gemfile.example gemfiles/modular/stringio/r4/v3.0.gemfile: recipe: template_source_application_gemfiles_modular_stringio_r4_v3_0_gemfile action: write dest_sha256: 6a21546445b166b784f5dc0458d9f9acc506f3b6fcc1931daa5c62821da90d6c - input_fingerprint: abb227bb381439053976630ef2009ab24283fd507cd3902076ad561f125fc80f + input_fingerprint: b61fa2de8c4c85b9e7753ca14e56f581191af6808f484fc01ef62d662e5bc080 template_sources: - gemfiles/modular/stringio/r4/v3.0.gemfile.example gemfiles/modular/stringio/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_stringio_vHEAD_gemfile action: write dest_sha256: e0497ab6dad9667b22725485b781e9d99349a079250eb29cb125d58f01f4a5be - input_fingerprint: 516578f11bc437e08017fad8e4039067ae9401cd48db933bba337a470ef36276 + input_fingerprint: 579e14c4768bf0810216a7632ca85e237fa6cc3a665a4cd061996181d9d4ff59 template_sources: - gemfiles/modular/stringio/vHEAD.gemfile.example gemfiles/modular/style.gemfile: recipe: template_source_application_gemfiles_modular_style_gemfile action: write - dest_sha256: 2a3d46dcb8a9394f595f273f5eb0403d0a552837754ab109afc9ba79a7159083 - input_fingerprint: 6e32133297a7bb8a3ac4b36f13284756ab4eef1e21ef0e8248dd6e0da21103b8 + dest_sha256: 9a24acff0054573c30f5d84d0418cd465ba3794d075bb5a36801410ac40e0787 + input_fingerprint: cd86b6e7db48e738a828861f24951e01cf6c692224bcacf216b32ea96f55a0d0 template_sources: - gemfiles/modular/style.gemfile.example gemfiles/modular/style_local.gemfile: recipe: template_source_application_gemfiles_modular_style_local_gemfile action: write dest_sha256: 55eb9c149cdb2f29c9f31abe2d55a4f334e00fb859681dd17c42149a3f28ca36 - input_fingerprint: 852f6ea2a73548500a0e278fc1c2436341390a710713f6df39c4c3a5f00581f1 + input_fingerprint: 5b9fc7685cefcd0bb16d9aecc0f29f63405dc94f687e9b118a50ad659534bc66 template_sources: - gemfiles/modular/style_local.gemfile.example gemfiles/modular/templating.gemfile: recipe: template_source_application_gemfiles_modular_templating_gemfile action: write dest_sha256: 8fbffde1c48cd71c18795fe8ffdb4ec5b5649909e03e801683fc8dbee9c83672 - input_fingerprint: aba913d20170751d72ce5fc162b9b27b8baa637021439c51defa9c01eeffbbef + input_fingerprint: cb7af8424c07a85c6be48f8e758ae54dd3512b2bb5777f41ccbba2ee38e102e7 template_sources: - gemfiles/modular/templating.gemfile.example gemfiles/modular/templating_local.gemfile: recipe: template_source_application_gemfiles_modular_templating_local_gemfile action: write - dest_sha256: 5d15605c77d457542edcc4ec787b3c9a9842793371007d81862186bda5b132d0 - input_fingerprint: '09e2bad4f5df0afd6bda04b3961531b5f32089e6208d86088362efa90d2628de' + dest_sha256: 6d5fccb3df7b6facb588fec2a3121b4445cb47a8409776165959764985735d15 + input_fingerprint: 2f1f3356c77c6498def978b695f3096f8e2caec9be86ef4f07e762cf0c592322 template_sources: - gemfiles/modular/templating_local.gemfile.example gemfiles/modular/webrick/r4/v1.9.gemfile: recipe: template_source_application_gemfiles_modular_webrick_r4_v1_9_gemfile action: write dest_sha256: 1ee940ff54d5ca3ce7fcff0d82ee9553386979656b9e220d5be5404d0991d5ea - input_fingerprint: 25bd10f6db179d5ed6187044c3380ea94d38acf203a77ed0af2a0dda51656805 + input_fingerprint: d84d63b49ed05b628d9f647a821657f9b30ce992228fb01bce77faf51d82890a template_sources: - gemfiles/modular/webrick/r4/v1.9.gemfile.example gemfiles/modular/webrick/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_webrick_vHEAD_gemfile action: write dest_sha256: da545f591af987648ffbaba181707480a38dfb375db7d289617986ec2c2ca23b - input_fingerprint: 7ee27ee40df6a5cfd0d7151b820a73f8ca693160a03a5d100ea8d5453c56c1b2 + input_fingerprint: a878f3044744a3f096e6403e32cfad9f595844ee1cf98ddc97c72bae9a5971a6 template_sources: - gemfiles/modular/webrick/vHEAD.gemfile.example gemfiles/modular/x_std_libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_gemfile action: write dest_sha256: e3917e90717d7f9f4393d847549a78c53de7f6c8de52a7f590b34b515fd6111a - input_fingerprint: fd1206e5edb8bea4adf6320d1536716a88db6ce544404421e2d5b99cd7dcc305 + input_fingerprint: cc951ff8e789cedd812504ce42511791b94c7a4eba700972b16076f9eb342f80 template_sources: - gemfiles/modular/x_std_libs.gemfile.example gemfiles/modular/x_std_libs/r2/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r2_libs_gemfile action: write dest_sha256: e80ec8ad06cb1b31ac982bc25cf7696987fca131aa1001eaefd0bf5cd379c273 - input_fingerprint: aa4e815ff6ebad3987f0533559d64f1af9ca6027ce8e5c80e53d174909ba65ab + input_fingerprint: 345da2b60c77950fac0a7cfc1ef3f012d9662503da57435baf94ef2c1b2a5d0d template_sources: - gemfiles/modular/x_std_libs/r2/libs.gemfile.example gemfiles/modular/x_std_libs/r3.1/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_1_libs_gemfile action: write dest_sha256: 9f8565c40b09bea1bc4c2e2ad87fe11400c3c51a2b235655bfcd8e491ed88ca8 - input_fingerprint: 2050dbc76ac633a743c5ac8d3aa004dfa0abe7eee889fb59199d290eabb075f1 + input_fingerprint: 58d8359ee073c6bdf13c8eaf285d8d79112b45a723eae0ae105baf597fa4fef5 template_sources: - gemfiles/modular/x_std_libs/r3.1/libs.gemfile.example gemfiles/modular/x_std_libs/r3/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r3_libs_gemfile action: write dest_sha256: 546f8849f4267bb19aa10ff0de40be30957197f229e6887847181ea9127b2650 - input_fingerprint: 5028cd8f31022f2a3f20c9814a3fdf75821a5de5b136b2d152a29fdc32c9521e + input_fingerprint: 9465a0b747c4e193d5a9fce0f6df39ba11fa08118d8e372744afeb0ff85cbaf8 template_sources: - gemfiles/modular/x_std_libs/r3/libs.gemfile.example gemfiles/modular/x_std_libs/r4/libs.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_r4_libs_gemfile action: write dest_sha256: 8c2582eaa218d216b98c86c933465295c8b4e43f3251ea388b9eaf6e471f8da6 - input_fingerprint: 52e9413627a670498a25a3363c628182335d5180392f6c189fea4255612dcf72 + input_fingerprint: 3fb1a28b12e09b01b10f7721f2331a57c2a4cf705615620197c7a2ab593c35db template_sources: - gemfiles/modular/x_std_libs/r4/libs.gemfile.example gemfiles/modular/x_std_libs/vHEAD.gemfile: recipe: template_source_application_gemfiles_modular_x_std_libs_vHEAD_gemfile action: write dest_sha256: d3133ec4c0638363a7fb025d19be7e95a615fd61c35ddb8d17f2280ee74a7486 - input_fingerprint: 7d505bf1f4a12a756acadee29f527f0fa9cedddb63d6693d2318a20a8bf971c6 + input_fingerprint: f14ced010a3fd6c4e8ed8c6e487593c6d0937bbd439e7908cf1d73e7bb7bd870 template_sources: - gemfiles/modular/x_std_libs/vHEAD.gemfile.example lib/smorg/rb/version.rb: recipe: template_source_application_lib_smorg_rb_version_rb action: write - dest_sha256: c862f94ec189e1aeceb2f74478a7c82a7f0fa0de504aa53f56032f8a2646702c - input_fingerprint: 2c501478c5ef99108ab6fab4ac14d541493c2b0d2ca2d70e3aff94917e86eda2 + dest_sha256: b794f899bb2ec2609456b5a26f0312aae68091cfa8387a131d9eb36aa1272ad4 + input_fingerprint: 0aca2f711d1d3b1bd6ccf4c9f4e2bfe1912e8f4409cda9816829a898ea9b634f template_sources: - lib/gem/version.rb.example mise.toml: recipe: template_source_application_mise_toml action: write dest_sha256: 454389d5a3d3362ed90d1ff72a51e50cc45e26b1380e52394ae5402d2ce984d7 - input_fingerprint: 61e86372723a8c0e9c21562955e8c4a5adc7df26b8db429267c5ff1311f220e4 + input_fingerprint: e9a587eba2de83e4e669b5d596aaaa0958702218405133d949e6d7571e90d185 template_sources: - mise.toml.no-osc.example sig/smorg/rb.rbs: recipe: template_source_application_sig_smorg_rb_rbs action: write dest_sha256: 75189b03d382ad1b4bfd83f6fb7228ad8fa7215d0a02cac6b3808c59b878ca78 - input_fingerprint: d015f897db170f1a4349288d7a788efd7e82d3f1bbe0701ec4600c33fe66d5dc + input_fingerprint: b744ed493600dc948fd1d47fa6f050b09b1cd53cec18a1a189ca269d48b103c6 template_sources: - sig/gem.rbs.example smorg-rb.gemspec: recipe: template_source_application_smorg_rb_gemspec action: write - dest_sha256: 07dc87fa373edf9dd893e9987c8cb6fe35e7f20885e8c6e343d817f4879d97d4 - input_fingerprint: fe10bc9381cf97c0feb98d3399d82c65b6f3aa4d0facdaad914ec11766d25010 + dest_sha256: 5980fe71a440fc3f6281a22909858c3eeb910618bc736f9ac4ffbc8677796e9b + input_fingerprint: ab288b0ca316b736bb59a7bf5ec2da3359d121d695bdf9435b7b582dc60c98a6 template_sources: - gem.gemspec.example spec/spec_helper.rb: recipe: template_source_application_spec_spec_helper_rb action: write dest_sha256: 2e4fc820c9f79740e7ff6323c364b0f006bb63f7bee31e7bdb41efd9665f3bb6 - input_fingerprint: b3e474aa7895e1e83b78d090588b95dde6f57857e774b7a4657bd86f96dc9ad1 + input_fingerprint: c5d33a6bc7f3369d6bd4a9382b62fa71d7109cd01bdc2e6836235881a2d95a19 template_sources: - spec/spec_helper.rb.example diff --git a/gems/smorg-rb/Gemfile b/gems/smorg-rb/Gemfile index 8e6c36dfb..33445736c 100644 --- a/gems/smorg-rb/Gemfile +++ b/gems/smorg-rb/Gemfile @@ -19,7 +19,7 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } # Include dependencies from smorg-rb.gemspec gemspec -gem 'kettle-family', '~> 1.2', '>= 1.2.97' +gem 'kettle-family', '~> 1.2', '>= 1.2.100' # Local workspace dependency wiring for *_local.gemfile overrides gem 'nomono', '~> 1.1', '>= 1.1.5', require: false # ruby >= 3.2.0 diff --git a/gems/smorg-rb/Gemfile.lock b/gems/smorg-rb/Gemfile.lock index 036fbe7c5..16c00adee 100644 --- a/gems/smorg-rb/Gemfile.lock +++ b/gems/smorg-rb/Gemfile.lock @@ -10,146 +10,146 @@ GIT PATH remote: . specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) + smorg-rb (7.1.9) + ast-merge (= 7.1.9) + ast-merge-git (= 7.1.9) + bash-merge (= 7.1.9) diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) - kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) + dotenv-merge (= 7.1.9) + go-merge (= 7.1.9) + html-merge (= 7.1.9) + json-merge (= 7.1.9) + kettle-jem (~> 7.1, >= 7.1.26) + markdown-merge (= 7.1.9) + plain-merge (= 7.1.9) + prism-merge (= 7.1.9) + psych-merge (= 7.1.9) + rbs-merge (= 7.1.9) + rust-merge (= 7.1.9) + toml-merge (= 7.1.9) + typescript-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) + ast-crispr-markdown-markly (7.1.9) + ast-crispr (= 7.1.9) + markdown-merge (= 7.1.9) + markly-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism specs: - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) + ast-crispr-ruby-prism (7.1.9) + ast-crispr (= 7.1.9) + prism-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) + ast-crispr (7.1.9) + ast-merge (= 7.1.9) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ast-merge-git (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: - ast-merge (7.1.8) + ast-merge (7.1.9) benchmark token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) + ast-template (7.1.9) + ast-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + bash-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + binary-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) + citrus-toml-merge (7.1.9) + ast-merge (= 7.1.9) + toml-merge (= 7.1.9) toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge specs: - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) commonmarker (~> 2.2) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) + dotenv-merge (7.1.9) + ast-merge (= 7.1.9) + plain-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + go-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + html-merge (7.1.9) + ast-crispr (= 7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + json-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: - kettle-jem (7.1.25) + kettle-jem (7.1.26) addressable (>= 2.8, < 3) ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) @@ -159,8 +159,8 @@ PATH commonmarker-merge (~> 7.1, >= 7.1.8) dotenv-merge (~> 7.1, >= 7.1.8) json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) + kettle-changelog (~> 1.0, >= 1.0.7) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.13) kettle-rb (~> 0.1, >= 0.1.11) @@ -183,99 +183,99 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge specs: - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown (~> 2.5) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + markdown-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) + markly-merge (7.1.9) + markdown-merge (= 7.1.9) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge specs: - parslet-toml-merge (7.1.8) + parslet-toml-merge (7.1.9) toml (~> 0.3) - toml-merge (= 7.1.8) + toml-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + plain-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) + prism-merge (7.1.9) + ast-merge (= 7.1.9) prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + psych-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) + yaml-merge (= 7.1.9) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) + rbs-merge (7.1.9) + ast-merge (= 7.1.9) rbs (>= 3.10) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + rust-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + toml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: - tree_haver (7.1.8) + tree_haver (7.1.9) citrus (~> 3.0) parslet (~> 2.0) tree_sitter_language_pack (>= 1.16.2, < 2.0) @@ -284,25 +284,25 @@ PATH PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + typescript-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + yaml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) + zip-merge (7.1.9) + binary-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) GEM @@ -336,6 +336,8 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) + commonmarker (2.10.0) + rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -465,11 +467,15 @@ GEM lint_roller (1.1.0) logger (1.7.0) markly (0.19.0) + mini_portile2 (2.8.9) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) reline (~> 0.6) mutex_m (0.3.0) + nokogiri (1.19.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-musl) @@ -503,6 +509,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) + rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -696,13 +705,16 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.16.2-aarch64-linux) + tree_sitter_language_pack (1.17.0) + rb_sys (>= 0.9.130, < 0.10) + sorbet-runtime (~> 0.5) + tree_sitter_language_pack (1.17.0-aarch64-linux) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-arm64-darwin) + tree_sitter_language_pack (1.17.0-arm64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-darwin) sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.16.2-x86_64-linux) + tree_sitter_language_pack (1.17.0-x86_64-linux) sorbet-runtime (~> 0.5) tsort (0.2.0) tty-cursor (0.7.1) @@ -785,9 +797,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-changelog (~> 1.0, >= 1.0.7) - kettle-dev (~> 3.0, >= 3.0.31) + kettle-dev (~> 3.0, >= 3.0.34) kettle-drift (~> 1.0, >= 1.0.13) - kettle-family (~> 1.2, >= 1.2.97) + kettle-family (~> 1.2, >= 1.2.100) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) @@ -808,12 +820,12 @@ DEPENDENCIES reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) - rubocop-lts (~> 24.2, >= 24.2.1) - rubocop-lts-rspec (~> 1.0, >= 1.0.5) + rubocop-lts (~> 24.2, >= 24.2.3) + rubocop-lts-rspec (~> 1.0, >= 1.0.6) rubocop-minitest (~> 0.40, >= 0.40.0) rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! - rubocop-ruby3_2 (~> 3.0, >= 3.0.6) + rubocop-ruby3_2 (~> 3.0, >= 3.0.8) ruby-merge! ruby-progressbar (~> 1.13) rust-merge! @@ -844,33 +856,34 @@ CHECKSUMS appraisal2 (3.2.3) sha256=3a6cfaf8a444e02707b9a34154af1c4902fbe99d9d2168d7e81dd83ec77e6db7 appraisal2-rubocop (1.0.2) sha256=1dae97c1be087cf9c098a3a72fd41f873435e9b8b39687e633b36c9ccb22bff4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.8) - ast-crispr-markdown-markly (7.1.8) - ast-crispr-ruby-prism (7.1.8) - ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) + ast-crispr (7.1.9) + ast-crispr-markdown-markly (7.1.9) + ast-crispr-ruby-prism (7.1.9) + ast-merge (7.1.9) + ast-merge-git (7.1.9) + ast-template (7.1.9) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.8) + bash-merge (7.1.9) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) - bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae + binary-merge (7.1.9) + bundler (4.1.0.beta1) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.8) + citrus-toml-merge (7.1.9) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 + commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e commonmarker (2.10.0-x86_64-darwin) sha256=01e0830ed0319825ecdc16411c90acd3f661d1568dfc178731b3f64d0ce2363d commonmarker (2.10.0-x86_64-linux) sha256=945c510c0bfca9022245928e2248468fe3ddad58c939be0c37b20082cc392880 commonmarker (2.10.0-x86_64-linux-musl) sha256=288cd4fb9f17eed2ffa73551ef241dcf594e0f484b2aee2a0999540333c0618e - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) completely (0.8.0) sha256=e493cd5d84805f47917a41f277ecbfe5f35363bed670be5a957d3acaed8c6c5e concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 @@ -879,7 +892,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docopt_ng (0.7.1) sha256=a024148ee4fa3ab1a8a04411aa4370f39cf2b446e63562097d418b7974a15667 - dotenv-merge (7.1.8) + dotenv-merge (7.1.9) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -892,35 +905,37 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) + go-merge (7.1.9) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) + html-merge (7.1.9) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a - json-merge (7.1.8) - kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff - kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 - kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 + json-merge (7.1.9) + kettle-changelog (1.0.7) + kettle-dev (3.0.34) + kettle-drift (1.0.13) kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 - kettle-jem (7.1.25) + kettle-jem (7.1.26) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 - kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd + kettle-soup-cover (3.0.10) kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 - markdown-merge (7.1.8) + markdown-merge (7.1.9) markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca - markly-merge (7.1.8) + markly-merge (7.1.9) + mini_portile2 (2.8.9) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 + nokogiri (1.19.4) nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af nokogiri (1.19.4-arm64-darwin) sha256=a46db9853286e6597b36ebc6953817d15acf3a299583eb3f89fdc6f91dd63527 @@ -934,20 +949,22 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) - plain-merge (7.1.8) + parslet-toml-merge (7.1.9) + plain-merge (7.1.9) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.8) + prism-merge (7.1.9) psych (5.5.0) sha256=4b245bbbd0f3238df8ccee766ebc1a6b062b10e4ee1d3284eb588739ba156a0a - psych-merge (7.1.8) + psych-merge (7.1.9) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 + rake-compiler-dock (1.12.0) + rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 - rbs-merge (7.1.8) + rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -983,11 +1000,11 @@ CHECKSUMS rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.8) + ruby-merge (7.1.9) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) + rust-merge (7.1.9) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -995,7 +1012,7 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) + smorg-rb (7.1.9) sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1011,25 +1028,26 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.8) + toml (0.3.0) + toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb - tree_haver (7.1.8) - tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 - tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 - tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 - tree_sitter_language_pack (1.16.2-x86_64-linux) sha256=d8151e6e44e35ace9de3611c76b730896beab17f427db06d8f76666332a5dc60 + tree_haver (7.1.9) + tree_sitter_language_pack (1.17.0) + tree_sitter_language_pack (1.17.0-aarch64-linux) + tree_sitter_language_pack (1.17.0-arm64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-darwin) + tree_sitter_language_pack (1.17.0-x86_64-linux) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f tty-cursor (0.7.1) sha256=79534185e6a777888d88628b14b6a1fdf5154a603f285f80b1753e1908e0bf48 tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) + typescript-merge (7.1.9) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 yaml-converter (0.2.5) sha256=a5214fe1a6c2df88bd34a35bcded1b1dcd30135548130df2e03b54ca8c0f2423 - yaml-merge (7.1.8) + yaml-merge (7.1.9) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.8) sha256=73d935d43e3479d65ce8aff25c7d3100e8bb83528a2adaa0ed824e5046ac99e7 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -1038,8 +1056,8 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) + zip-merge (7.1.9) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH - 4.0.20 + 4.1.0.beta1 diff --git a/gems/smorg-rb/Rakefile b/gems/smorg-rb/Rakefile index acebda5e9..db7bcdc88 100644 --- a/gems/smorg-rb/Rakefile +++ b/gems/smorg-rb/Rakefile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -# smorg-rb Rakefile v7.1.18 - 2026-09-07 +# smorg-rb Rakefile v7.1.26 - 2026-09-10 # Ruby 2.3 (Safe Navigation) or higher required # # See LICENSE.md for license information. diff --git a/gems/smorg-rb/bin/rubocop-gradual b/gems/smorg-rb/bin/rubocop-gradual new file mode 100755 index 000000000..7c7ff0635 --- /dev/null +++ b/gems/smorg-rb/bin/rubocop-gradual @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'rubocop-gradual' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'rubygems' +require 'bundler/setup' + +load Gem.bin_path('rubocop-gradual', 'rubocop-gradual') diff --git a/gems/smorg-rb/gemfiles/modular/coverage_local.gemfile b/gems/smorg-rb/gemfiles/modular/coverage_local.gemfile index 37917caac..d6c890e46 100644 --- a/gems/smorg-rb/gemfiles/modular/coverage_local.gemfile +++ b/gems/smorg-rb/gemfiles/modular/coverage_local.gemfile @@ -29,11 +29,31 @@ Kernel.send(:gem, 'nomono', *nomono_activation_requirements) require 'nomono/bundler' local_gems = %w[kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -local_gems_to_eval = local_gems - %w[] - declared_gems # export KETTLE_DEV_DEV=/path/to/my platform :mri do + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + local_gems_to_eval = local_gems - %w[] - declared_gems + eval_nomono_gems( gems: local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/smorg-rb/gemfiles/modular/style.gemfile b/gems/smorg-rb/gemfiles/modular/style.gemfile index 59c5dc1a3..41ec99454 100644 --- a/gems/smorg-rb/gemfiles/modular/style.gemfile +++ b/gems/smorg-rb/gemfiles/modular/style.gemfile @@ -24,9 +24,9 @@ platform :mri do if ENV.fetch('RUBOCOP_LTS_DEV', 'false').casecmp('false').zero? declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) - gem 'rubocop-lts', '~> 24.2', '>= 24.2.1' unless declared_gems.include?('rubocop-lts') - gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.5' unless declared_gems.include?('rubocop-lts-rspec') - gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.6' unless declared_gems.include?('rubocop-ruby3_2') + gem 'rubocop-lts', '~> 24.2', '>= 24.2.3' unless declared_gems.include?('rubocop-lts') + gem 'rubocop-lts-rspec', '~> 1.0', '>= 1.0.6' unless declared_gems.include?('rubocop-lts-rspec') + gem 'rubocop-ruby3_2', '~> 3.0', '>= 3.0.8' unless declared_gems.include?('rubocop-ruby3_2') else eval_gemfile('style_local.gemfile') end diff --git a/gems/smorg-rb/gemfiles/modular/templating_local.gemfile b/gems/smorg-rb/gemfiles/modular/templating_local.gemfile index 52210fbf7..59b66e4bb 100644 --- a/gems/smorg-rb/gemfiles/modular/templating_local.gemfile +++ b/gems/smorg-rb/gemfiles/modular/templating_local.gemfile @@ -65,9 +65,7 @@ structuredmerge_local_gems = %w[ kettle_dev_local_gems = %w[ kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog kettle-drift ] -declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[] -kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - (declared_gems - %w[kettle-dev]) if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( @@ -81,6 +79,28 @@ if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 end if ENV.fetch('KETTLE_DEV_DEV', 'false').casecmp('false') != 0 + # Replace the gemspec dependency instead of declaring kettle-dev twice. Bundler + # rejects duplicate declarations with different requirements or sources. + kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find do |dependency| + dependency.name == 'kettle-dev' + end + kettle_dev_local_path = nomono_gems( + gems: %w[kettle-dev], + prefix: 'KETTLE_DEV', + path_env: 'KETTLE_DEV_DEV', + vendored_gems_env: 'VENDORED_GEMS', + vendor_gem_dir_env: 'VENDOR_GEM_DIR', + debug_env: 'KETTLE_DEV_DEBUG', + root: %w[src my kettle-dev] + ).fetch('kettle-dev', nil) + if kettle_dev_dependency && kettle_dev_local_path + instance_variable_get(:@dependencies).delete(kettle_dev_dependency) + gem kettle_dev_dependency.name, *kettle_dev_dependency.requirements_list, path: kettle_dev_local_path + end + + declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) + kettle_dev_local_gems_to_eval = kettle_dev_local_gems - %w[] - declared_gems + eval_nomono_gems( gems: kettle_dev_local_gems_to_eval, prefix: 'KETTLE_DEV', diff --git a/gems/smorg-rb/smorg-rb.gemspec b/gems/smorg-rb/smorg-rb.gemspec index 5ee474c6f..d46c24458 100644 --- a/gems/smorg-rb/smorg-rb.gemspec +++ b/gems/smorg-rb/smorg-rb.gemspec @@ -110,7 +110,7 @@ Gem::Specification.new do |spec| spec.add_dependency 'go-merge', "= #{spec.version}" spec.add_dependency 'html-merge', "= #{spec.version}" spec.add_dependency 'json-merge', "= #{spec.version}" - spec.add_dependency 'kettle-jem', '~> 7.1', '>= 7.1.18' + spec.add_dependency 'kettle-jem', '~> 7.1', '>= 7.1.26' spec.add_dependency 'markdown-merge', "= #{spec.version}" spec.add_dependency 'plain-merge', "= #{spec.version}" spec.add_dependency 'prism-merge', "= #{spec.version}" @@ -135,7 +135,7 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.31') # ruby >= 4.0.0 + spec.add_development_dependency('kettle-dev', '~> 3.0', '>= 3.0.34') # ruby >= 4.0.0 # Security spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 From 573b7e19a2f3959a21c8b6e909ac375609c40d39 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Thu, 10 Sep 2026 00:18:30 -0400 Subject: [PATCH 106/137] =?UTF-8?q?=E2=9C=85=20Fix=20aggregate=20family=20?= =?UTF-8?q?test=20expectations?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appraisals_and_gemfile_template_spec.rb | 14 +++++++++++++- gems/kettle-jem/spec/release_packaging_spec.rb | 2 +- gems/toml-merge/spec/fixtures_integration_spec.rb | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/gems/kettle-jem/spec/integration/appraisals_and_gemfile_template_spec.rb b/gems/kettle-jem/spec/integration/appraisals_and_gemfile_template_spec.rb index 3c08f3f20..b5e647138 100644 --- a/gems/kettle-jem/spec/integration/appraisals_and_gemfile_template_spec.rb +++ b/gems/kettle-jem/spec/integration/appraisals_and_gemfile_template_spec.rb @@ -1476,8 +1476,19 @@ coverage_template = File.read( File.expand_path("../../lib/kettle/jem/templates/gemfiles/modular/coverage_local.gemfile.example", __dir__) ) + nomono_dsl_stub = <<~RUBY + def nomono_gems(gems:, **) + gems.to_h { |name| [name, File.join(ENV.fetch("KETTLE_DEV_DEV"), name)] } + end + + def eval_nomono_gems(gems:, **) + nomono_gems(gems: gems).each do |name, path| + gem name, path: path + end + end + RUBY coverage_local_gemfile = coverage_template - .gsub("{KJ|LOCAL_GEMFILE_NOMONO_BOOTSTRAP}", 'require "nomono/bundler"') + .gsub("{KJ|LOCAL_GEMFILE_NOMONO_BOOTSTRAP}", nomono_dsl_stub) .gsub("{KJ|KETTLE_DEV_LOCAL_GEMS}", "kettle-dev") .gsub("{KJ|PACKAGE_NAME}", "example") @@ -1513,6 +1524,7 @@ allow(ENV).to receive(:[]).and_call_original allow(ENV).to receive(:[]).with("KETTLE_DEV_DEV").and_return(workspace_root) allow(ENV).to receive(:fetch).and_call_original + allow(ENV).to receive(:fetch).with("KETTLE_DEV_DEV").and_return(workspace_root) allow(ENV).to receive(:fetch).with("KETTLE_DEV_DEV", "false").and_return(workspace_root) definition = Bundler::Dsl.evaluate(File.join(root, "Gemfile"), nil, {}) dependency = definition.dependencies.find { |candidate| candidate.name == "kettle-dev" } diff --git a/gems/kettle-jem/spec/release_packaging_spec.rb b/gems/kettle-jem/spec/release_packaging_spec.rb index 08cfe8579..ba0e947dd 100644 --- a/gems/kettle-jem/spec/release_packaging_spec.rb +++ b/gems/kettle-jem/spec/release_packaging_spec.rb @@ -50,7 +50,7 @@ def clean_subprocess_env(overrides = {}) expect(spec.metadata["homepage_uri"]).to eq("https://structuredmerge.org") expect(spec.executables).to eq(["kettle-jem"]) changelog_dependency = spec.runtime_dependencies.find { |dependency| dependency.name == "kettle-changelog" } - expect(changelog_dependency.requirement).to eq(Gem::Requirement.new(["~> 1.0", ">= 1.0.6"])) + expect(changelog_dependency.requirement).to eq(Gem::Requirement.new(["~> 1.0", ">= 1.0.7"])) expect(File.executable?(gem_root.join("exe/kettle-jem"))).to be(true) expect(File.executable?(gem_root.join("bin/kettle-jem-deps-floor"))).to be(true) expect(File.executable?(gem_root.join("bin/kettle-jem-workflow-pins"))).to be(true) diff --git a/gems/toml-merge/spec/fixtures_integration_spec.rb b/gems/toml-merge/spec/fixtures_integration_spec.rb index fc4ba93ea..2ddb6e38b 100644 --- a/gems/toml-merge/spec/fixtures_integration_spec.rb +++ b/gems/toml-merge/spec/fixtures_integration_spec.rb @@ -296,7 +296,7 @@ def json_ready(value) ) expect(table_fragments).to eq( 'env' => "[env]\nproject = \"kettle-jem\"\npath = [\"exe\", \"bin\"]", - 'tools' => "[tools]\nruby = \"4.0.2\"" + 'tools' => "[tools]\nruby = \"4.0.6\"" ) end From 5e6b3b03f5dbd0afaa8f8ceb0c31880bdb34aca9 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Thu, 10 Sep 2026 00:27:51 -0400 Subject: [PATCH 107/137] =?UTF-8?q?=F0=9F=90=9B=20Export=20aggregate=20bun?= =?UTF-8?q?dle=20for=20Git=20driver=20specs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spec/architecture/aggregate_bundle_spec.rb | 9 +++++++++ spec/spec_helper.rb | 4 ++++ 2 files changed, 13 insertions(+) create mode 100644 spec/architecture/aggregate_bundle_spec.rb diff --git a/spec/architecture/aggregate_bundle_spec.rb b/spec/architecture/aggregate_bundle_spec.rb new file mode 100644 index 000000000..0d4482c56 --- /dev/null +++ b/spec/architecture/aggregate_bundle_spec.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +RSpec.describe 'aggregate family bundle context' do + it 'exports the root Gemfile for subprocesses that run outside the monorepo' do + expect(ENV.fetch('KETTLE_FAMILY_BUNDLE_GEMFILE')).to eq( + File.expand_path('../../Gemfile', __dir__) + ) + end +end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 88be4da22..1ea2e938d 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -4,6 +4,10 @@ require_relative "bootstrap/merge_gems" require_relative "support/fixture_repository" +# Git-driver integration specs execute from temporary repositories. Their +# subprocesses must use this aggregate bundle to resolve unreleased siblings. +ENV['KETTLE_FAMILY_BUNDLE_GEMFILE'] = File.expand_path('../Gemfile', __dir__) + warn StructuredMerge::FixtureRepository.report # Register every parser-backed merge gem before ast-merge installs RSpec's From 6a5a6ab93c3d7e35bed3b64f63d24571d0171294 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Thu, 10 Sep 2026 00:36:30 -0400 Subject: [PATCH 108/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Checksums=20for?= =?UTF-8?q?=20v7.1.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/tree_haver/checksums/tree_haver-7.1.9.gem.sha256 | 1 + gems/tree_haver/checksums/tree_haver-7.1.9.gem.sha512 | 1 + 2 files changed, 2 insertions(+) create mode 100644 gems/tree_haver/checksums/tree_haver-7.1.9.gem.sha256 create mode 100644 gems/tree_haver/checksums/tree_haver-7.1.9.gem.sha512 diff --git a/gems/tree_haver/checksums/tree_haver-7.1.9.gem.sha256 b/gems/tree_haver/checksums/tree_haver-7.1.9.gem.sha256 new file mode 100644 index 000000000..34d6f8f58 --- /dev/null +++ b/gems/tree_haver/checksums/tree_haver-7.1.9.gem.sha256 @@ -0,0 +1 @@ +d7420e0f8f21368e1362da63bfe105897e7e56bdf741ba292adef7a6c3ea0a75 \ No newline at end of file diff --git a/gems/tree_haver/checksums/tree_haver-7.1.9.gem.sha512 b/gems/tree_haver/checksums/tree_haver-7.1.9.gem.sha512 new file mode 100644 index 000000000..93ab07525 --- /dev/null +++ b/gems/tree_haver/checksums/tree_haver-7.1.9.gem.sha512 @@ -0,0 +1 @@ +a4786c12e24d9997935d5884bf4632411ebbc71e61259b3153d60a744dad2ee35bca82b26b0da10f3663f61bebd34d1d8ffd0e6dbfbb561cc12f58c6114bff45 \ No newline at end of file From 766be970bd6598ff0feaf8aa42c6153237f46de6 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Thu, 10 Sep 2026 00:37:18 -0400 Subject: [PATCH 109/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Checksums=20for?= =?UTF-8?q?=20v7.1.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge/checksums/ast-merge-7.1.9.gem.sha256 | 1 + gems/ast-merge/checksums/ast-merge-7.1.9.gem.sha512 | 1 + 2 files changed, 2 insertions(+) create mode 100644 gems/ast-merge/checksums/ast-merge-7.1.9.gem.sha256 create mode 100644 gems/ast-merge/checksums/ast-merge-7.1.9.gem.sha512 diff --git a/gems/ast-merge/checksums/ast-merge-7.1.9.gem.sha256 b/gems/ast-merge/checksums/ast-merge-7.1.9.gem.sha256 new file mode 100644 index 000000000..f67251da4 --- /dev/null +++ b/gems/ast-merge/checksums/ast-merge-7.1.9.gem.sha256 @@ -0,0 +1 @@ +d80ff5e17ec34afbfe9ad5ab580a1fa3b8e840e027d0b865bb39ad28eaa79e4d \ No newline at end of file diff --git a/gems/ast-merge/checksums/ast-merge-7.1.9.gem.sha512 b/gems/ast-merge/checksums/ast-merge-7.1.9.gem.sha512 new file mode 100644 index 000000000..fb9405b43 --- /dev/null +++ b/gems/ast-merge/checksums/ast-merge-7.1.9.gem.sha512 @@ -0,0 +1 @@ +8d00962efaf2bc23297026bbf302526fe2ad19e042f510d2bb5ac29a0b2c35bcb57fbbf24df74824af605f7778a16ad9b6419884c85997305a23d256e6f52ea6 \ No newline at end of file From 16253218d6763418ec13e250c50c3cf1772dcc3a Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Thu, 10 Sep 2026 00:42:03 -0400 Subject: [PATCH 110/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Checksums=20for?= =?UTF-8?q?=20v7.1.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr/checksums/ast-crispr-7.1.9.gem.sha256 | 1 + gems/ast-crispr/checksums/ast-crispr-7.1.9.gem.sha512 | 1 + 2 files changed, 2 insertions(+) create mode 100644 gems/ast-crispr/checksums/ast-crispr-7.1.9.gem.sha256 create mode 100644 gems/ast-crispr/checksums/ast-crispr-7.1.9.gem.sha512 diff --git a/gems/ast-crispr/checksums/ast-crispr-7.1.9.gem.sha256 b/gems/ast-crispr/checksums/ast-crispr-7.1.9.gem.sha256 new file mode 100644 index 000000000..5915f2d1c --- /dev/null +++ b/gems/ast-crispr/checksums/ast-crispr-7.1.9.gem.sha256 @@ -0,0 +1 @@ +f764423c473a815d793014636aa939bc0e80148b29dc9ad861f2d516242c1d08 \ No newline at end of file diff --git a/gems/ast-crispr/checksums/ast-crispr-7.1.9.gem.sha512 b/gems/ast-crispr/checksums/ast-crispr-7.1.9.gem.sha512 new file mode 100644 index 000000000..383102c59 --- /dev/null +++ b/gems/ast-crispr/checksums/ast-crispr-7.1.9.gem.sha512 @@ -0,0 +1 @@ +1efb2a932c99d1c5949b3ed31b8e9af80f6316cdc77d0f368c7b14a217061ab7d6f336b8ce8d6d3fa12e674bafcc971efc3d69cab4e68ee0943a4be47a295b9f \ No newline at end of file From e9620fc8aa7ddee35343af7576eedf0602db1840 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Thu, 10 Sep 2026 00:42:04 -0400 Subject: [PATCH 111/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Checksums=20for?= =?UTF-8?q?=20v7.1.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/bash-merge/checksums/bash-merge-7.1.9.gem.sha256 | 1 + gems/bash-merge/checksums/bash-merge-7.1.9.gem.sha512 | 1 + 2 files changed, 2 insertions(+) create mode 100644 gems/bash-merge/checksums/bash-merge-7.1.9.gem.sha256 create mode 100644 gems/bash-merge/checksums/bash-merge-7.1.9.gem.sha512 diff --git a/gems/bash-merge/checksums/bash-merge-7.1.9.gem.sha256 b/gems/bash-merge/checksums/bash-merge-7.1.9.gem.sha256 new file mode 100644 index 000000000..efbc28bc5 --- /dev/null +++ b/gems/bash-merge/checksums/bash-merge-7.1.9.gem.sha256 @@ -0,0 +1 @@ +fde66a0e5eaaa2df0eae456bd5a45be631e61806c356f345d2a43085e4138757 \ No newline at end of file diff --git a/gems/bash-merge/checksums/bash-merge-7.1.9.gem.sha512 b/gems/bash-merge/checksums/bash-merge-7.1.9.gem.sha512 new file mode 100644 index 000000000..c5de8f626 --- /dev/null +++ b/gems/bash-merge/checksums/bash-merge-7.1.9.gem.sha512 @@ -0,0 +1 @@ +b9fac2c7014c5831cb0d0fe21658733a8251e071f022bce39365704489a61722910acd45ae39fe1f0ae3c2e43fe2a68e9775e770605cd3d111a8f994379bc508 \ No newline at end of file From 335a880b967e9dbdcb6a606180cb03c08f3f3aa1 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Thu, 10 Sep 2026 00:42:05 -0400 Subject: [PATCH 112/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Checksums=20for?= =?UTF-8?q?=20v7.1.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/binary-merge/checksums/binary-merge-7.1.9.gem.sha256 | 1 + gems/binary-merge/checksums/binary-merge-7.1.9.gem.sha512 | 1 + 2 files changed, 2 insertions(+) create mode 100644 gems/binary-merge/checksums/binary-merge-7.1.9.gem.sha256 create mode 100644 gems/binary-merge/checksums/binary-merge-7.1.9.gem.sha512 diff --git a/gems/binary-merge/checksums/binary-merge-7.1.9.gem.sha256 b/gems/binary-merge/checksums/binary-merge-7.1.9.gem.sha256 new file mode 100644 index 000000000..84912a111 --- /dev/null +++ b/gems/binary-merge/checksums/binary-merge-7.1.9.gem.sha256 @@ -0,0 +1 @@ +8e77256f6d629516d51e49bfb097476e25b408480707b430475599fb5d5e3f69 \ No newline at end of file diff --git a/gems/binary-merge/checksums/binary-merge-7.1.9.gem.sha512 b/gems/binary-merge/checksums/binary-merge-7.1.9.gem.sha512 new file mode 100644 index 000000000..4602a9dba --- /dev/null +++ b/gems/binary-merge/checksums/binary-merge-7.1.9.gem.sha512 @@ -0,0 +1 @@ +135c373c29f0d5c3a5374b9242adbc49d27d78cf2aaad238f0d9c4b110cf6b6713065a3032caa88fef6f6fd239070bd111ce5794cda507cebb3ea2e7d4d76886 \ No newline at end of file From 90b8fabfb27735ecc70dcc0f665ac3be2cc2df51 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Thu, 10 Sep 2026 00:42:06 -0400 Subject: [PATCH 113/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Checksums=20for?= =?UTF-8?q?=20v7.1.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/go-merge/checksums/go-merge-7.1.9.gem.sha256 | 1 + gems/go-merge/checksums/go-merge-7.1.9.gem.sha512 | 1 + 2 files changed, 2 insertions(+) create mode 100644 gems/go-merge/checksums/go-merge-7.1.9.gem.sha256 create mode 100644 gems/go-merge/checksums/go-merge-7.1.9.gem.sha512 diff --git a/gems/go-merge/checksums/go-merge-7.1.9.gem.sha256 b/gems/go-merge/checksums/go-merge-7.1.9.gem.sha256 new file mode 100644 index 000000000..7d7dba55f --- /dev/null +++ b/gems/go-merge/checksums/go-merge-7.1.9.gem.sha256 @@ -0,0 +1 @@ +e9f7aab620b22e042d1e746a7a627f3b860035207e4dc14fa094a151a879d4ff \ No newline at end of file diff --git a/gems/go-merge/checksums/go-merge-7.1.9.gem.sha512 b/gems/go-merge/checksums/go-merge-7.1.9.gem.sha512 new file mode 100644 index 000000000..ec8775cad --- /dev/null +++ b/gems/go-merge/checksums/go-merge-7.1.9.gem.sha512 @@ -0,0 +1 @@ +d3c17968448f74c4ab8d6e9c0feaa535070265c81594d8ca4d86c210d856e73ce247959c5e532fce1156fee80686889255fffe76763cb38215b2e4704e745ba6 \ No newline at end of file From 955984dd7f037760b11124987858c355bb115765 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Thu, 10 Sep 2026 00:42:08 -0400 Subject: [PATCH 114/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Checksums=20for?= =?UTF-8?q?=20v7.1.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/json-merge/checksums/json-merge-7.1.9.gem.sha256 | 1 + gems/json-merge/checksums/json-merge-7.1.9.gem.sha512 | 1 + 2 files changed, 2 insertions(+) create mode 100644 gems/json-merge/checksums/json-merge-7.1.9.gem.sha256 create mode 100644 gems/json-merge/checksums/json-merge-7.1.9.gem.sha512 diff --git a/gems/json-merge/checksums/json-merge-7.1.9.gem.sha256 b/gems/json-merge/checksums/json-merge-7.1.9.gem.sha256 new file mode 100644 index 000000000..2200d6579 --- /dev/null +++ b/gems/json-merge/checksums/json-merge-7.1.9.gem.sha256 @@ -0,0 +1 @@ +13c979c1398e6e3126ec6c1d4acccd08a138fb06a58152f51ad9079caf03b39e \ No newline at end of file diff --git a/gems/json-merge/checksums/json-merge-7.1.9.gem.sha512 b/gems/json-merge/checksums/json-merge-7.1.9.gem.sha512 new file mode 100644 index 000000000..ae16f0066 --- /dev/null +++ b/gems/json-merge/checksums/json-merge-7.1.9.gem.sha512 @@ -0,0 +1 @@ +cb890a8cc9cdf7a980676550f4c2e4362c76e712314361ed7257779b8e0385a37bff72295370cf3e7a3a2163ee2b7badcb6aa8254cc9399dc2cc4fa35985d4f5 \ No newline at end of file From 06376f344928b9761f98446fa719a91ab087674f Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Thu, 10 Sep 2026 00:42:09 -0400 Subject: [PATCH 115/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Checksums=20for?= =?UTF-8?q?=20v7.1.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/markdown-merge/checksums/markdown-merge-7.1.9.gem.sha256 | 1 + gems/markdown-merge/checksums/markdown-merge-7.1.9.gem.sha512 | 1 + 2 files changed, 2 insertions(+) create mode 100644 gems/markdown-merge/checksums/markdown-merge-7.1.9.gem.sha256 create mode 100644 gems/markdown-merge/checksums/markdown-merge-7.1.9.gem.sha512 diff --git a/gems/markdown-merge/checksums/markdown-merge-7.1.9.gem.sha256 b/gems/markdown-merge/checksums/markdown-merge-7.1.9.gem.sha256 new file mode 100644 index 000000000..eacf75be9 --- /dev/null +++ b/gems/markdown-merge/checksums/markdown-merge-7.1.9.gem.sha256 @@ -0,0 +1 @@ +1b27684e1ca62aee0b7c24b49a0271d5a50a11315312408b0f854eb77054d04f \ No newline at end of file diff --git a/gems/markdown-merge/checksums/markdown-merge-7.1.9.gem.sha512 b/gems/markdown-merge/checksums/markdown-merge-7.1.9.gem.sha512 new file mode 100644 index 000000000..61edca377 --- /dev/null +++ b/gems/markdown-merge/checksums/markdown-merge-7.1.9.gem.sha512 @@ -0,0 +1 @@ +2a73a85e8a2a8e6a9f522d4d598c705ac3c2d0d0e9df1d7149950d98ba6e21ad50b7bafbbf844f5e16f1ec2afe8ae37d12e8ecdb5f883c6e2ac5d7860290deb9 \ No newline at end of file From 5480cf539aabeec7690684a7226f008144b69cac Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Thu, 10 Sep 2026 00:42:10 -0400 Subject: [PATCH 116/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Checksums=20for?= =?UTF-8?q?=20v7.1.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/plain-merge/checksums/plain-merge-7.1.9.gem.sha256 | 1 + gems/plain-merge/checksums/plain-merge-7.1.9.gem.sha512 | 1 + 2 files changed, 2 insertions(+) create mode 100644 gems/plain-merge/checksums/plain-merge-7.1.9.gem.sha256 create mode 100644 gems/plain-merge/checksums/plain-merge-7.1.9.gem.sha512 diff --git a/gems/plain-merge/checksums/plain-merge-7.1.9.gem.sha256 b/gems/plain-merge/checksums/plain-merge-7.1.9.gem.sha256 new file mode 100644 index 000000000..bf3d1fe94 --- /dev/null +++ b/gems/plain-merge/checksums/plain-merge-7.1.9.gem.sha256 @@ -0,0 +1 @@ +0ce835a4377abc085aa7fe2f4ad058d8c3fd36aec845f9e4b0481fb485593b91 \ No newline at end of file diff --git a/gems/plain-merge/checksums/plain-merge-7.1.9.gem.sha512 b/gems/plain-merge/checksums/plain-merge-7.1.9.gem.sha512 new file mode 100644 index 000000000..c45f176f5 --- /dev/null +++ b/gems/plain-merge/checksums/plain-merge-7.1.9.gem.sha512 @@ -0,0 +1 @@ +44c9f0f3558f2064d0fb46c1ffd891039075fdee53896058311089dc986edf2ec5bab0df741d775a0d8f10385c5cc952caf8008d74462a1defe57b757c75d9e9 \ No newline at end of file From 3a4844cdaa02bcce6acac6c01719f10b3d9dcbb0 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Thu, 10 Sep 2026 00:42:11 -0400 Subject: [PATCH 117/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Checksums=20for?= =?UTF-8?q?=20v7.1.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/rbs-merge/checksums/rbs-merge-7.1.9.gem.sha256 | 1 + gems/rbs-merge/checksums/rbs-merge-7.1.9.gem.sha512 | 1 + 2 files changed, 2 insertions(+) create mode 100644 gems/rbs-merge/checksums/rbs-merge-7.1.9.gem.sha256 create mode 100644 gems/rbs-merge/checksums/rbs-merge-7.1.9.gem.sha512 diff --git a/gems/rbs-merge/checksums/rbs-merge-7.1.9.gem.sha256 b/gems/rbs-merge/checksums/rbs-merge-7.1.9.gem.sha256 new file mode 100644 index 000000000..460262bf2 --- /dev/null +++ b/gems/rbs-merge/checksums/rbs-merge-7.1.9.gem.sha256 @@ -0,0 +1 @@ +c5aa537019fc8bad1f8fc8c37deed4ae5d1f5dd2dfb9f61edaef14c5bfb73383 \ No newline at end of file diff --git a/gems/rbs-merge/checksums/rbs-merge-7.1.9.gem.sha512 b/gems/rbs-merge/checksums/rbs-merge-7.1.9.gem.sha512 new file mode 100644 index 000000000..94b779d87 --- /dev/null +++ b/gems/rbs-merge/checksums/rbs-merge-7.1.9.gem.sha512 @@ -0,0 +1 @@ +90c51999c1f60ae132f6fc08eaef1e3a6868525dd719928099fdc6b6f57ee58306c268c4de55f0bf13080c3e698cc9ff0e69ea864e6860228566b46127905992 \ No newline at end of file From ae2bb57ce95908fa26a243edbe893ca83431714b Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Thu, 10 Sep 2026 00:42:13 -0400 Subject: [PATCH 118/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Checksums=20for?= =?UTF-8?q?=20v7.1.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ruby-merge/checksums/ruby-merge-7.1.9.gem.sha256 | 1 + gems/ruby-merge/checksums/ruby-merge-7.1.9.gem.sha512 | 1 + 2 files changed, 2 insertions(+) create mode 100644 gems/ruby-merge/checksums/ruby-merge-7.1.9.gem.sha256 create mode 100644 gems/ruby-merge/checksums/ruby-merge-7.1.9.gem.sha512 diff --git a/gems/ruby-merge/checksums/ruby-merge-7.1.9.gem.sha256 b/gems/ruby-merge/checksums/ruby-merge-7.1.9.gem.sha256 new file mode 100644 index 000000000..3950596da --- /dev/null +++ b/gems/ruby-merge/checksums/ruby-merge-7.1.9.gem.sha256 @@ -0,0 +1 @@ +935774793dcec28614019a7c0802f14f93f805664684e7a29184ad1b4db241fa \ No newline at end of file diff --git a/gems/ruby-merge/checksums/ruby-merge-7.1.9.gem.sha512 b/gems/ruby-merge/checksums/ruby-merge-7.1.9.gem.sha512 new file mode 100644 index 000000000..d0cefe21d --- /dev/null +++ b/gems/ruby-merge/checksums/ruby-merge-7.1.9.gem.sha512 @@ -0,0 +1 @@ +7224704446af27ed1241c2ef8faa81c3c2c9d4980f33e6acb172ff515f5f90710c74a3b8f0806ed914bd57d7dbf40c99b8a984c239033417507b2b4ae10139c0 \ No newline at end of file From e6e1a877b5b2ec89dc629c6515e77ac768bff1f2 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Thu, 10 Sep 2026 00:42:14 -0400 Subject: [PATCH 119/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Checksums=20for?= =?UTF-8?q?=20v7.1.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/rust-merge/checksums/rust-merge-7.1.9.gem.sha256 | 1 + gems/rust-merge/checksums/rust-merge-7.1.9.gem.sha512 | 1 + 2 files changed, 2 insertions(+) create mode 100644 gems/rust-merge/checksums/rust-merge-7.1.9.gem.sha256 create mode 100644 gems/rust-merge/checksums/rust-merge-7.1.9.gem.sha512 diff --git a/gems/rust-merge/checksums/rust-merge-7.1.9.gem.sha256 b/gems/rust-merge/checksums/rust-merge-7.1.9.gem.sha256 new file mode 100644 index 000000000..4aa2a5c65 --- /dev/null +++ b/gems/rust-merge/checksums/rust-merge-7.1.9.gem.sha256 @@ -0,0 +1 @@ +d0d3b1350655366e0923845d40c61df9271f181ae9dcfe2239acd8328da87d58 \ No newline at end of file diff --git a/gems/rust-merge/checksums/rust-merge-7.1.9.gem.sha512 b/gems/rust-merge/checksums/rust-merge-7.1.9.gem.sha512 new file mode 100644 index 000000000..312159588 --- /dev/null +++ b/gems/rust-merge/checksums/rust-merge-7.1.9.gem.sha512 @@ -0,0 +1 @@ +0e5af6b41250ebb3349d969ab0880e55b948ef8634dc38d4a237028484f7ef587626f2f5649b65224ea86d727b22f72ab661b858c472021ce89271340f90207e \ No newline at end of file From 2d8af8f4a02de0380550cdd49fef29af3bf58458 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Thu, 10 Sep 2026 00:42:15 -0400 Subject: [PATCH 120/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Checksums=20for?= =?UTF-8?q?=20v7.1.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/toml-merge/checksums/toml-merge-7.1.9.gem.sha256 | 1 + gems/toml-merge/checksums/toml-merge-7.1.9.gem.sha512 | 1 + 2 files changed, 2 insertions(+) create mode 100644 gems/toml-merge/checksums/toml-merge-7.1.9.gem.sha256 create mode 100644 gems/toml-merge/checksums/toml-merge-7.1.9.gem.sha512 diff --git a/gems/toml-merge/checksums/toml-merge-7.1.9.gem.sha256 b/gems/toml-merge/checksums/toml-merge-7.1.9.gem.sha256 new file mode 100644 index 000000000..fe210607b --- /dev/null +++ b/gems/toml-merge/checksums/toml-merge-7.1.9.gem.sha256 @@ -0,0 +1 @@ +a085b6d3e0f5ceed49ad2711f643c640a65cfbedca590dafdef7ce6e33fec71a \ No newline at end of file diff --git a/gems/toml-merge/checksums/toml-merge-7.1.9.gem.sha512 b/gems/toml-merge/checksums/toml-merge-7.1.9.gem.sha512 new file mode 100644 index 000000000..0e841667a --- /dev/null +++ b/gems/toml-merge/checksums/toml-merge-7.1.9.gem.sha512 @@ -0,0 +1 @@ +198a767981545ce0eeb897a91b28a8166abebe2be82af9393e3ef130f25673e05ce2ca9b5dbb445e5c664abbe2d56d727a692570b3962208499c007161938060 \ No newline at end of file From 30d92c39b4001ed43ee7fbd411ddaaf2d3e7148a Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Thu, 10 Sep 2026 00:42:16 -0400 Subject: [PATCH 121/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Checksums=20for?= =?UTF-8?q?=20v7.1.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../typescript-merge/checksums/typescript-merge-7.1.9.gem.sha256 | 1 + .../typescript-merge/checksums/typescript-merge-7.1.9.gem.sha512 | 1 + 2 files changed, 2 insertions(+) create mode 100644 gems/typescript-merge/checksums/typescript-merge-7.1.9.gem.sha256 create mode 100644 gems/typescript-merge/checksums/typescript-merge-7.1.9.gem.sha512 diff --git a/gems/typescript-merge/checksums/typescript-merge-7.1.9.gem.sha256 b/gems/typescript-merge/checksums/typescript-merge-7.1.9.gem.sha256 new file mode 100644 index 000000000..001d65206 --- /dev/null +++ b/gems/typescript-merge/checksums/typescript-merge-7.1.9.gem.sha256 @@ -0,0 +1 @@ +7d7491fbf964915f6f4a40bf68d9559d8566d78e0984c2208ca01a7df8f332ed \ No newline at end of file diff --git a/gems/typescript-merge/checksums/typescript-merge-7.1.9.gem.sha512 b/gems/typescript-merge/checksums/typescript-merge-7.1.9.gem.sha512 new file mode 100644 index 000000000..a5ee94748 --- /dev/null +++ b/gems/typescript-merge/checksums/typescript-merge-7.1.9.gem.sha512 @@ -0,0 +1 @@ +e71181862f0b194785d6b25f71cabcbb0125e7aaacaeed1876be10e78d7870ddb152607a48cf4ac940767c9a4651efc0f2e0c9b9a34e98ac29a0869c003f16ab \ No newline at end of file From 9e05597e46a390712b4f2cad9d30962d4d36e7c4 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Thu, 10 Sep 2026 00:42:17 -0400 Subject: [PATCH 122/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Checksums=20for?= =?UTF-8?q?=20v7.1.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/yaml-merge/checksums/yaml-merge-7.1.9.gem.sha256 | 1 + gems/yaml-merge/checksums/yaml-merge-7.1.9.gem.sha512 | 1 + 2 files changed, 2 insertions(+) create mode 100644 gems/yaml-merge/checksums/yaml-merge-7.1.9.gem.sha256 create mode 100644 gems/yaml-merge/checksums/yaml-merge-7.1.9.gem.sha512 diff --git a/gems/yaml-merge/checksums/yaml-merge-7.1.9.gem.sha256 b/gems/yaml-merge/checksums/yaml-merge-7.1.9.gem.sha256 new file mode 100644 index 000000000..f5ab51700 --- /dev/null +++ b/gems/yaml-merge/checksums/yaml-merge-7.1.9.gem.sha256 @@ -0,0 +1 @@ +fab35e05ea9905494ff754363ab8173c7528e6b4e0c364ecba11cb1cf974fe25 \ No newline at end of file diff --git a/gems/yaml-merge/checksums/yaml-merge-7.1.9.gem.sha512 b/gems/yaml-merge/checksums/yaml-merge-7.1.9.gem.sha512 new file mode 100644 index 000000000..5d65bf1cb --- /dev/null +++ b/gems/yaml-merge/checksums/yaml-merge-7.1.9.gem.sha512 @@ -0,0 +1 @@ +265b046a1c7053b596b9cc0011dce49b06628381b037a7d55c9f2d68bf5475c3cad3855dabe333b2264bd6bee5d2ed0d06b01d257d64d9a8a0adc2f9d3da4625 \ No newline at end of file From 3bc9f8d9167f397cd5b8cf079070ee71b92b38ef Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Thu, 10 Sep 2026 00:47:42 -0400 Subject: [PATCH 123/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Checksums=20for?= =?UTF-8?q?=20v7.1.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../checksums/citrus-toml-merge-7.1.9.gem.sha256 | 1 + .../checksums/citrus-toml-merge-7.1.9.gem.sha512 | 1 + 2 files changed, 2 insertions(+) create mode 100644 gems/citrus-toml-merge/checksums/citrus-toml-merge-7.1.9.gem.sha256 create mode 100644 gems/citrus-toml-merge/checksums/citrus-toml-merge-7.1.9.gem.sha512 diff --git a/gems/citrus-toml-merge/checksums/citrus-toml-merge-7.1.9.gem.sha256 b/gems/citrus-toml-merge/checksums/citrus-toml-merge-7.1.9.gem.sha256 new file mode 100644 index 000000000..27280e83d --- /dev/null +++ b/gems/citrus-toml-merge/checksums/citrus-toml-merge-7.1.9.gem.sha256 @@ -0,0 +1 @@ +04354a92f0ff53dfcdbddb33824ced56ded8542f0897bb6230da0a55e6bf53f5 \ No newline at end of file diff --git a/gems/citrus-toml-merge/checksums/citrus-toml-merge-7.1.9.gem.sha512 b/gems/citrus-toml-merge/checksums/citrus-toml-merge-7.1.9.gem.sha512 new file mode 100644 index 000000000..6e42b1dba --- /dev/null +++ b/gems/citrus-toml-merge/checksums/citrus-toml-merge-7.1.9.gem.sha512 @@ -0,0 +1 @@ +59c45d284dcc5b032189852c45b0f5a8a504bbdde10ddc72cd90a0d48e5a9aafeb926f67059f9b961b5c35e10a639401e5bbf3561dfe9f23b2154cbca30502f7 \ No newline at end of file From d4620901fb1e74e6d932d6632e5cd15cc26ac534 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Thu, 10 Sep 2026 00:47:44 -0400 Subject: [PATCH 124/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Checksums=20for?= =?UTF-8?q?=20v7.1.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../checksums/commonmarker-merge-7.1.9.gem.sha256 | 1 + .../checksums/commonmarker-merge-7.1.9.gem.sha512 | 1 + 2 files changed, 2 insertions(+) create mode 100644 gems/commonmarker-merge/checksums/commonmarker-merge-7.1.9.gem.sha256 create mode 100644 gems/commonmarker-merge/checksums/commonmarker-merge-7.1.9.gem.sha512 diff --git a/gems/commonmarker-merge/checksums/commonmarker-merge-7.1.9.gem.sha256 b/gems/commonmarker-merge/checksums/commonmarker-merge-7.1.9.gem.sha256 new file mode 100644 index 000000000..15101256c --- /dev/null +++ b/gems/commonmarker-merge/checksums/commonmarker-merge-7.1.9.gem.sha256 @@ -0,0 +1 @@ +ee0b253d7c37e941102941f6354d4fc06158a41e5d4c868ebbfc4ae55d073b8a \ No newline at end of file diff --git a/gems/commonmarker-merge/checksums/commonmarker-merge-7.1.9.gem.sha512 b/gems/commonmarker-merge/checksums/commonmarker-merge-7.1.9.gem.sha512 new file mode 100644 index 000000000..9c787855f --- /dev/null +++ b/gems/commonmarker-merge/checksums/commonmarker-merge-7.1.9.gem.sha512 @@ -0,0 +1 @@ +c708a7da9b40d43db7e622eedcb136584685f54920df926e5fced3db763a3c68323e9059609c1e32d329ae37d6d980517cef9b691319bf4323a88a06bdaa1409 \ No newline at end of file From 9916ad7c5340fe1b93652fb1603f0453cab98baa Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Thu, 10 Sep 2026 00:47:45 -0400 Subject: [PATCH 125/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Checksums=20for?= =?UTF-8?q?=20v7.1.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/dotenv-merge/checksums/dotenv-merge-7.1.9.gem.sha256 | 1 + gems/dotenv-merge/checksums/dotenv-merge-7.1.9.gem.sha512 | 1 + 2 files changed, 2 insertions(+) create mode 100644 gems/dotenv-merge/checksums/dotenv-merge-7.1.9.gem.sha256 create mode 100644 gems/dotenv-merge/checksums/dotenv-merge-7.1.9.gem.sha512 diff --git a/gems/dotenv-merge/checksums/dotenv-merge-7.1.9.gem.sha256 b/gems/dotenv-merge/checksums/dotenv-merge-7.1.9.gem.sha256 new file mode 100644 index 000000000..3b4a3593c --- /dev/null +++ b/gems/dotenv-merge/checksums/dotenv-merge-7.1.9.gem.sha256 @@ -0,0 +1 @@ +6c82edd192ff6cb679e235d2b58f38d268a1d0c95101f8756494a37924359fcc \ No newline at end of file diff --git a/gems/dotenv-merge/checksums/dotenv-merge-7.1.9.gem.sha512 b/gems/dotenv-merge/checksums/dotenv-merge-7.1.9.gem.sha512 new file mode 100644 index 000000000..8cec9aa6b --- /dev/null +++ b/gems/dotenv-merge/checksums/dotenv-merge-7.1.9.gem.sha512 @@ -0,0 +1 @@ +80d5ba3090fce3e2677cf0444b727fd140407f6df91916a4f37408062ccfbf76846fe3e1e10c59ec9ad04395fc32ce4022f47dc9f4d8976e6da6baafa807cea6 \ No newline at end of file From c477930c228a60318724b550896280492ed6cdb7 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Thu, 10 Sep 2026 00:47:46 -0400 Subject: [PATCH 126/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Checksums=20for?= =?UTF-8?q?=20v7.1.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/html-merge/checksums/html-merge-7.1.9.gem.sha256 | 1 + gems/html-merge/checksums/html-merge-7.1.9.gem.sha512 | 1 + 2 files changed, 2 insertions(+) create mode 100644 gems/html-merge/checksums/html-merge-7.1.9.gem.sha256 create mode 100644 gems/html-merge/checksums/html-merge-7.1.9.gem.sha512 diff --git a/gems/html-merge/checksums/html-merge-7.1.9.gem.sha256 b/gems/html-merge/checksums/html-merge-7.1.9.gem.sha256 new file mode 100644 index 000000000..238cd8ead --- /dev/null +++ b/gems/html-merge/checksums/html-merge-7.1.9.gem.sha256 @@ -0,0 +1 @@ +ecce48e284a17ac8d8069cabca68520d073aef6f17c605d44fc6fe01f5b0862d \ No newline at end of file diff --git a/gems/html-merge/checksums/html-merge-7.1.9.gem.sha512 b/gems/html-merge/checksums/html-merge-7.1.9.gem.sha512 new file mode 100644 index 000000000..619070709 --- /dev/null +++ b/gems/html-merge/checksums/html-merge-7.1.9.gem.sha512 @@ -0,0 +1 @@ +8fadb148676787a383d7113b9d63a94197772e6483e749dbff3f15813a73e4f0b80d54d83b2dcdaf488c3a1ce332b69dbb4ccb83bf03e6bd27d5e81e8b31fed2 \ No newline at end of file From 67957332e680c1694b4508d94807c9aaf54a3479 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Thu, 10 Sep 2026 00:47:47 -0400 Subject: [PATCH 127/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Checksums=20for?= =?UTF-8?q?=20v7.1.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kramdown-merge/checksums/kramdown-merge-7.1.9.gem.sha256 | 1 + gems/kramdown-merge/checksums/kramdown-merge-7.1.9.gem.sha512 | 1 + 2 files changed, 2 insertions(+) create mode 100644 gems/kramdown-merge/checksums/kramdown-merge-7.1.9.gem.sha256 create mode 100644 gems/kramdown-merge/checksums/kramdown-merge-7.1.9.gem.sha512 diff --git a/gems/kramdown-merge/checksums/kramdown-merge-7.1.9.gem.sha256 b/gems/kramdown-merge/checksums/kramdown-merge-7.1.9.gem.sha256 new file mode 100644 index 000000000..6e4a9ea05 --- /dev/null +++ b/gems/kramdown-merge/checksums/kramdown-merge-7.1.9.gem.sha256 @@ -0,0 +1 @@ +ce3ab38361aaf43dfd60b5df56a3b799ca69be18cd815495dcce265b8c8f62a3 \ No newline at end of file diff --git a/gems/kramdown-merge/checksums/kramdown-merge-7.1.9.gem.sha512 b/gems/kramdown-merge/checksums/kramdown-merge-7.1.9.gem.sha512 new file mode 100644 index 000000000..b58c9a02a --- /dev/null +++ b/gems/kramdown-merge/checksums/kramdown-merge-7.1.9.gem.sha512 @@ -0,0 +1 @@ +d8b46371dc77280f407da17bd7ab30113f214b93975d4cb3713345a08653a4e0d00c964b850a864a8cab3e2746ceaab3e8ce38531a1edef5e8bdf41248030e08 \ No newline at end of file From f498c61178b585ac458526fa1435173fdd537fad Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Thu, 10 Sep 2026 00:47:49 -0400 Subject: [PATCH 128/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Checksums=20for?= =?UTF-8?q?=20v7.1.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/markly-merge/checksums/markly-merge-7.1.9.gem.sha256 | 1 + gems/markly-merge/checksums/markly-merge-7.1.9.gem.sha512 | 1 + 2 files changed, 2 insertions(+) create mode 100644 gems/markly-merge/checksums/markly-merge-7.1.9.gem.sha256 create mode 100644 gems/markly-merge/checksums/markly-merge-7.1.9.gem.sha512 diff --git a/gems/markly-merge/checksums/markly-merge-7.1.9.gem.sha256 b/gems/markly-merge/checksums/markly-merge-7.1.9.gem.sha256 new file mode 100644 index 000000000..3551b752e --- /dev/null +++ b/gems/markly-merge/checksums/markly-merge-7.1.9.gem.sha256 @@ -0,0 +1 @@ +2ca361e3ae4d9af7cab148727770a1330662e83d940dc59f1d1a1130affa674a \ No newline at end of file diff --git a/gems/markly-merge/checksums/markly-merge-7.1.9.gem.sha512 b/gems/markly-merge/checksums/markly-merge-7.1.9.gem.sha512 new file mode 100644 index 000000000..9d6369728 --- /dev/null +++ b/gems/markly-merge/checksums/markly-merge-7.1.9.gem.sha512 @@ -0,0 +1 @@ +f41c24241fd07e58f85c8a616fc446b7a07e002e814e3c7ce6dd6953c0117836cb9849cd3f9a671d4841033a8d4016ad81b44f1cc56693f6f1b0fcd610d3d11c \ No newline at end of file From e4aed587262471e4bd792af4628858e20cc4da72 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Thu, 10 Sep 2026 00:47:51 -0400 Subject: [PATCH 129/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Checksums=20for?= =?UTF-8?q?=20v7.1.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../checksums/parslet-toml-merge-7.1.9.gem.sha256 | 1 + .../checksums/parslet-toml-merge-7.1.9.gem.sha512 | 1 + 2 files changed, 2 insertions(+) create mode 100644 gems/parslet-toml-merge/checksums/parslet-toml-merge-7.1.9.gem.sha256 create mode 100644 gems/parslet-toml-merge/checksums/parslet-toml-merge-7.1.9.gem.sha512 diff --git a/gems/parslet-toml-merge/checksums/parslet-toml-merge-7.1.9.gem.sha256 b/gems/parslet-toml-merge/checksums/parslet-toml-merge-7.1.9.gem.sha256 new file mode 100644 index 000000000..2311608ff --- /dev/null +++ b/gems/parslet-toml-merge/checksums/parslet-toml-merge-7.1.9.gem.sha256 @@ -0,0 +1 @@ +4056b6ace1ea811d0100f943f7872b82c9b5c6c620f476fcb868347330ec706b \ No newline at end of file diff --git a/gems/parslet-toml-merge/checksums/parslet-toml-merge-7.1.9.gem.sha512 b/gems/parslet-toml-merge/checksums/parslet-toml-merge-7.1.9.gem.sha512 new file mode 100644 index 000000000..e8fe2e439 --- /dev/null +++ b/gems/parslet-toml-merge/checksums/parslet-toml-merge-7.1.9.gem.sha512 @@ -0,0 +1 @@ +53b9eddd66a67606c9748eef09823fb0901135f1708c3ce2299de0f3b2ba53563337c7f950a426289dc30635b9db12c871a7127ece1f97aa9f6030c91c067110 \ No newline at end of file From a29c9cdf468bbea231a4015af41c58c6350d4d9b Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Thu, 10 Sep 2026 00:47:52 -0400 Subject: [PATCH 130/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Checksums=20for?= =?UTF-8?q?=20v7.1.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/prism-merge/checksums/prism-merge-7.1.9.gem.sha256 | 1 + gems/prism-merge/checksums/prism-merge-7.1.9.gem.sha512 | 1 + 2 files changed, 2 insertions(+) create mode 100644 gems/prism-merge/checksums/prism-merge-7.1.9.gem.sha256 create mode 100644 gems/prism-merge/checksums/prism-merge-7.1.9.gem.sha512 diff --git a/gems/prism-merge/checksums/prism-merge-7.1.9.gem.sha256 b/gems/prism-merge/checksums/prism-merge-7.1.9.gem.sha256 new file mode 100644 index 000000000..d27c587ce --- /dev/null +++ b/gems/prism-merge/checksums/prism-merge-7.1.9.gem.sha256 @@ -0,0 +1 @@ +a51f86841dfa399a06dddc16b35f9277845b7ad0d77baad4c1e218987e63ac60 \ No newline at end of file diff --git a/gems/prism-merge/checksums/prism-merge-7.1.9.gem.sha512 b/gems/prism-merge/checksums/prism-merge-7.1.9.gem.sha512 new file mode 100644 index 000000000..72e2631ea --- /dev/null +++ b/gems/prism-merge/checksums/prism-merge-7.1.9.gem.sha512 @@ -0,0 +1 @@ +191be92133bda9b22682157ae48b289635de19259db2509ab3c7d0555176291f088cb00ba2a4f0efc8624292e6d98708a9f7199648f23e1673ace73736d79b52 \ No newline at end of file From e10c776ca0643141c0f1d5fc533e3157f9500ab7 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Thu, 10 Sep 2026 00:47:53 -0400 Subject: [PATCH 131/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Checksums=20for?= =?UTF-8?q?=20v7.1.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/psych-merge/checksums/psych-merge-7.1.9.gem.sha256 | 1 + gems/psych-merge/checksums/psych-merge-7.1.9.gem.sha512 | 1 + 2 files changed, 2 insertions(+) create mode 100644 gems/psych-merge/checksums/psych-merge-7.1.9.gem.sha256 create mode 100644 gems/psych-merge/checksums/psych-merge-7.1.9.gem.sha512 diff --git a/gems/psych-merge/checksums/psych-merge-7.1.9.gem.sha256 b/gems/psych-merge/checksums/psych-merge-7.1.9.gem.sha256 new file mode 100644 index 000000000..0a441b375 --- /dev/null +++ b/gems/psych-merge/checksums/psych-merge-7.1.9.gem.sha256 @@ -0,0 +1 @@ +c3f34f3820b55538c08d3cd59b85e022a81a06bbbab5923d09585b1f012f7eb5 \ No newline at end of file diff --git a/gems/psych-merge/checksums/psych-merge-7.1.9.gem.sha512 b/gems/psych-merge/checksums/psych-merge-7.1.9.gem.sha512 new file mode 100644 index 000000000..b268491a2 --- /dev/null +++ b/gems/psych-merge/checksums/psych-merge-7.1.9.gem.sha512 @@ -0,0 +1 @@ +2de39df8f3d897e774ee17c7848f9526ea0e07a433ae0c498427b7d56b30c4156c4b58aecb32296f89dcb8ee8fa4269b5a982f2550281d597c01818de9afeb03 \ No newline at end of file From a86fd69ea391af40e008ad6cf1d1d6fd43f4971f Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Thu, 10 Sep 2026 00:47:55 -0400 Subject: [PATCH 132/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Checksums=20for?= =?UTF-8?q?=20v7.1.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-template/checksums/ast-template-7.1.9.gem.sha256 | 1 + gems/ast-template/checksums/ast-template-7.1.9.gem.sha512 | 1 + 2 files changed, 2 insertions(+) create mode 100644 gems/ast-template/checksums/ast-template-7.1.9.gem.sha256 create mode 100644 gems/ast-template/checksums/ast-template-7.1.9.gem.sha512 diff --git a/gems/ast-template/checksums/ast-template-7.1.9.gem.sha256 b/gems/ast-template/checksums/ast-template-7.1.9.gem.sha256 new file mode 100644 index 000000000..2d33bc595 --- /dev/null +++ b/gems/ast-template/checksums/ast-template-7.1.9.gem.sha256 @@ -0,0 +1 @@ +406fe4edf8904c6e987c98aabc65a666531f408d986ced678d91a89ca3e24a74 \ No newline at end of file diff --git a/gems/ast-template/checksums/ast-template-7.1.9.gem.sha512 b/gems/ast-template/checksums/ast-template-7.1.9.gem.sha512 new file mode 100644 index 000000000..b2336ee6b --- /dev/null +++ b/gems/ast-template/checksums/ast-template-7.1.9.gem.sha512 @@ -0,0 +1 @@ +ed01d86151f23903b2132883d4d9b976aacc99686dafbfcee75fcce7c652c6a9348c75ba4e5e683613adb5d39d9bdf33eb3438f9b727e43d9223a44bb86e5250 \ No newline at end of file From 4b270d14abb7b0ce415836d1399dcac27aa0aaf5 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Thu, 10 Sep 2026 00:47:56 -0400 Subject: [PATCH 133/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Checksums=20for?= =?UTF-8?q?=20v7.1.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/zip-merge/checksums/zip-merge-7.1.9.gem.sha256 | 1 + gems/zip-merge/checksums/zip-merge-7.1.9.gem.sha512 | 1 + 2 files changed, 2 insertions(+) create mode 100644 gems/zip-merge/checksums/zip-merge-7.1.9.gem.sha256 create mode 100644 gems/zip-merge/checksums/zip-merge-7.1.9.gem.sha512 diff --git a/gems/zip-merge/checksums/zip-merge-7.1.9.gem.sha256 b/gems/zip-merge/checksums/zip-merge-7.1.9.gem.sha256 new file mode 100644 index 000000000..d46ae7c38 --- /dev/null +++ b/gems/zip-merge/checksums/zip-merge-7.1.9.gem.sha256 @@ -0,0 +1 @@ +9d32891856485ceae749e94cc8a24dcdec4455537e301ae795816858bb6c8cdd \ No newline at end of file diff --git a/gems/zip-merge/checksums/zip-merge-7.1.9.gem.sha512 b/gems/zip-merge/checksums/zip-merge-7.1.9.gem.sha512 new file mode 100644 index 000000000..d4791cce9 --- /dev/null +++ b/gems/zip-merge/checksums/zip-merge-7.1.9.gem.sha512 @@ -0,0 +1 @@ +0876d271c3b0195feac1b09c44d02473c384e1a42d29799fd232cebee2f7aab766456ac92e34060ec0e2cd2ad85c85d1e3cb784f8a7597dc162208f6c9d30259 \ No newline at end of file From b10454a56326056a02056771134a40b5c736df33 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Thu, 10 Sep 2026 00:49:02 -0400 Subject: [PATCH 134/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Checksums=20for?= =?UTF-8?q?=20v7.1.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../checksums/ast-crispr-markdown-markly-7.1.9.gem.sha256 | 1 + .../checksums/ast-crispr-markdown-markly-7.1.9.gem.sha512 | 1 + 2 files changed, 2 insertions(+) create mode 100644 gems/ast-crispr-markdown-markly/checksums/ast-crispr-markdown-markly-7.1.9.gem.sha256 create mode 100644 gems/ast-crispr-markdown-markly/checksums/ast-crispr-markdown-markly-7.1.9.gem.sha512 diff --git a/gems/ast-crispr-markdown-markly/checksums/ast-crispr-markdown-markly-7.1.9.gem.sha256 b/gems/ast-crispr-markdown-markly/checksums/ast-crispr-markdown-markly-7.1.9.gem.sha256 new file mode 100644 index 000000000..14a6ec775 --- /dev/null +++ b/gems/ast-crispr-markdown-markly/checksums/ast-crispr-markdown-markly-7.1.9.gem.sha256 @@ -0,0 +1 @@ +b6bb793288830de6d6a1c5ea42064ac5da189e0e6bf566b456049f965408c7dd \ No newline at end of file diff --git a/gems/ast-crispr-markdown-markly/checksums/ast-crispr-markdown-markly-7.1.9.gem.sha512 b/gems/ast-crispr-markdown-markly/checksums/ast-crispr-markdown-markly-7.1.9.gem.sha512 new file mode 100644 index 000000000..46a3f0214 --- /dev/null +++ b/gems/ast-crispr-markdown-markly/checksums/ast-crispr-markdown-markly-7.1.9.gem.sha512 @@ -0,0 +1 @@ +b6c560707c507b4b4c5997301a5771425d7e1e9e69dc370808dcb26977c1ae8ea8cebc48360a35fa6a54c633a08201e01cf3b610c56d3cd5d4bb1cc8b26e29ef \ No newline at end of file From bf2e3b19a4ca68e58dd36d7e98bc026a90447b5f Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Thu, 10 Sep 2026 00:49:03 -0400 Subject: [PATCH 135/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Checksums=20for?= =?UTF-8?q?=20v7.1.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../checksums/ast-crispr-ruby-prism-7.1.9.gem.sha256 | 1 + .../checksums/ast-crispr-ruby-prism-7.1.9.gem.sha512 | 1 + 2 files changed, 2 insertions(+) create mode 100644 gems/ast-crispr-ruby-prism/checksums/ast-crispr-ruby-prism-7.1.9.gem.sha256 create mode 100644 gems/ast-crispr-ruby-prism/checksums/ast-crispr-ruby-prism-7.1.9.gem.sha512 diff --git a/gems/ast-crispr-ruby-prism/checksums/ast-crispr-ruby-prism-7.1.9.gem.sha256 b/gems/ast-crispr-ruby-prism/checksums/ast-crispr-ruby-prism-7.1.9.gem.sha256 new file mode 100644 index 000000000..402d9374c --- /dev/null +++ b/gems/ast-crispr-ruby-prism/checksums/ast-crispr-ruby-prism-7.1.9.gem.sha256 @@ -0,0 +1 @@ +7dfe9796b4b6e2a2b3e87eb2655eff437ddc6a68a3f7a3dbfa14310b831b22c5 \ No newline at end of file diff --git a/gems/ast-crispr-ruby-prism/checksums/ast-crispr-ruby-prism-7.1.9.gem.sha512 b/gems/ast-crispr-ruby-prism/checksums/ast-crispr-ruby-prism-7.1.9.gem.sha512 new file mode 100644 index 000000000..290e2eb04 --- /dev/null +++ b/gems/ast-crispr-ruby-prism/checksums/ast-crispr-ruby-prism-7.1.9.gem.sha512 @@ -0,0 +1 @@ +d527a56fcf281cfdd531974e094431d967f655fa6cf4f682db2d52e5d41b83dc5355e2d68e6b2a93586f26985956be79b0db995b9d0780d045dd06061e0feffa \ No newline at end of file From 9126b8f96e7405c0a833cb4d7fbca5dd5e488c0b Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Thu, 10 Sep 2026 00:49:46 -0400 Subject: [PATCH 136/137] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20Checksums=20for?= =?UTF-8?q?=20v7.1.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge-git/checksums/ast-merge-git-7.1.9.gem.sha256 | 1 + gems/ast-merge-git/checksums/ast-merge-git-7.1.9.gem.sha512 | 1 + 2 files changed, 2 insertions(+) create mode 100644 gems/ast-merge-git/checksums/ast-merge-git-7.1.9.gem.sha256 create mode 100644 gems/ast-merge-git/checksums/ast-merge-git-7.1.9.gem.sha512 diff --git a/gems/ast-merge-git/checksums/ast-merge-git-7.1.9.gem.sha256 b/gems/ast-merge-git/checksums/ast-merge-git-7.1.9.gem.sha256 new file mode 100644 index 000000000..01ebf26be --- /dev/null +++ b/gems/ast-merge-git/checksums/ast-merge-git-7.1.9.gem.sha256 @@ -0,0 +1 @@ +e714c24587549d132bbdfe0822f367c22a877bdd4e44368eb954e09f7e0da2a4 \ No newline at end of file diff --git a/gems/ast-merge-git/checksums/ast-merge-git-7.1.9.gem.sha512 b/gems/ast-merge-git/checksums/ast-merge-git-7.1.9.gem.sha512 new file mode 100644 index 000000000..9b91757bc --- /dev/null +++ b/gems/ast-merge-git/checksums/ast-merge-git-7.1.9.gem.sha512 @@ -0,0 +1 @@ +1ee025f07629e5493f8671e97c9c3c94068a7e56a40abdf5f3892370464194d96a13cd59c75cbb69e11cdd0b8c05bb1bae22316abfc37ba211420b868d8e90ef \ No newline at end of file From a9904a8d7a59915e6344707b2ef9f701c515fe65 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Thu, 10 Sep 2026 00:58:19 -0400 Subject: [PATCH 137/137] =?UTF-8?q?=F0=9F=94=96=20Prepare=20release=20v7.1?= =?UTF-8?q?.26?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 17 +- Gemfile.lock | 270 +- gems/ast-crispr-markdown-markly/Gemfile.lock | 20 +- gems/ast-crispr-ruby-prism/Gemfile.lock | 20 +- gems/ast-crispr/Gemfile.lock | 24 +- gems/ast-merge-git/Gemfile.lock | 20 +- gems/ast-merge/Gemfile.lock | 20 +- gems/ast-template/Gemfile.lock | 473 +- gems/bash-merge/Gemfile.lock | 20 +- gems/binary-merge/Gemfile.lock | 20 +- gems/citrus-toml-merge/Gemfile.lock | 20 +- gems/commonmarker-merge/Gemfile.lock | 20 +- gems/dotenv-merge/Gemfile.lock | 20 +- gems/go-merge/Gemfile.lock | 20 +- gems/html-merge/Gemfile.lock | 20 +- gems/json-merge/Gemfile.lock | 20 +- gems/kettle-jem/CHANGELOG.md | 29 +- gems/kettle-jem/Gemfile.lock | 35 +- gems/kettle-jem/README.md | 2 +- gems/kettle-jem/docs/Kettle.html | 2 +- gems/kettle-jem/docs/Kettle/Jem.html | 31870 ++++++++-------- gems/kettle-jem/docs/Kettle/Jem/CLI.html | 2 +- .../docs/Kettle/Jem/ChecksumMode.html | 2 +- .../docs/Kettle/Jem/DecisionEvaluation.html | 2 +- .../docs/Kettle/Jem/DecisionPolicy.html | 2 +- gems/kettle-jem/docs/Kettle/Jem/Error.html | 2 +- .../docs/Kettle/Jem/FileWorkUnit.html | 2 +- .../docs/Kettle/Jem/GemSpecReader.html | 2 +- .../docs/Kettle/Jem/LicenseTxtMigrator.html | 2 +- .../docs/Kettle/Jem/MaintenanceChangelog.html | 161 +- .../docs/Kettle/Jem/PluginContext.html | 2 +- .../docs/Kettle/Jem/PluginHelpers.html | 2 +- .../docs/Kettle/Jem/PluginLoader.html | 2 +- .../docs/Kettle/Jem/PluginOutput.html | 2 +- .../docs/Kettle/Jem/PluginRegistrar.html | 2 +- .../docs/Kettle/Jem/PluginRegistry.html | 2 +- .../docs/Kettle/Jem/PluginRegistry/Hook.html | 2 +- .../docs/Kettle/Jem/ReadmePostProcessor.html | 2 +- .../docs/Kettle/Jem/RubyGemsResolver.html | 2 +- gems/kettle-jem/docs/Kettle/Jem/SelfTest.html | 2 +- .../docs/Kettle/Jem/SelfTest/Manifest.html | 74 +- .../docs/Kettle/Jem/SelfTest/Reporter.html | 156 +- gems/kettle-jem/docs/Kettle/Jem/Tasks.html | 2 +- .../docs/Kettle/Jem/Tasks/InstallTask.html | 4 +- .../docs/Kettle/Jem/Tasks/PrepareTask.html | 2 +- .../docs/Kettle/Jem/Tasks/SelfTestTask.html | 2 +- .../docs/Kettle/Jem/Tasks/TemplateTask.html | 2 +- .../docs/Kettle/Jem/TemplateChecksums.html | 2 +- .../docs/Kettle/Jem/TemplateLock.html | 262 +- .../docs/Kettle/Jem/TemplatingReport.html | 454 +- .../Jem/TransferChangelogFilterParser.html | 2 +- .../Jem/TransferChangelogLineParser.html | 2 +- gems/kettle-jem/docs/Kettle/Jem/Version.html | 4 +- .../docs/Kettle/Jem/WriteIntent.html | 2 +- gems/kettle-jem/docs/_index.html | 2 +- gems/kettle-jem/docs/file.AGENTS.html | 2 +- gems/kettle-jem/docs/file.AGPL-3.0-only.html | 2 +- gems/kettle-jem/docs/file.CHANGELOG.html | 148 +- .../kettle-jem/docs/file.CODE_OF_CONDUCT.html | 2 +- gems/kettle-jem/docs/file.CONTRIBUTING.html | 2 +- gems/kettle-jem/docs/file.FUNDING.html | 2 +- gems/kettle-jem/docs/file.IRP.html | 2 +- gems/kettle-jem/docs/file.LICENSE.html | 2 +- .../file.PolyForm-Small-Business-1.0.0.html | 2 +- gems/kettle-jem/docs/file.README.html | 12 +- gems/kettle-jem/docs/file.RRRRrb-Matrix.html | 2 +- gems/kettle-jem/docs/file.RUBOCOP.html | 2 +- gems/kettle-jem/docs/file.SECURITY.html | 2 +- gems/kettle-jem/docs/index.html | 12 +- gems/kettle-jem/docs/method_list.html | 180 +- gems/kettle-jem/docs/top-level-namespace.html | 2 +- gems/kramdown-merge/Gemfile.lock | 20 +- gems/markdown-merge/Gemfile.lock | 20 +- gems/markly-merge/Gemfile.lock | 20 +- gems/parslet-toml-merge/Gemfile.lock | 20 +- gems/plain-merge/Gemfile.lock | 20 +- gems/prism-merge/Gemfile.lock | 20 +- gems/psych-merge/Gemfile.lock | 20 +- gems/rbs-merge/Gemfile.lock | 20 +- gems/ruby-merge/Gemfile.lock | 466 +- gems/rust-merge/Gemfile.lock | 469 +- gems/toml-merge/Gemfile.lock | 466 +- gems/tree_haver/Gemfile.lock | 459 +- gems/tree_haver/docs/TreeHaver.html | 2 +- .../docs/TreeHaver/AdapterInfo.html | 2 +- .../AppliedEditProjectionOperation.html | 2 +- .../tree_haver/docs/TreeHaver/BackendAPI.html | 2 +- .../TreeHaver/BackendAvailabilityCheck.html | 2 +- .../TreeHaver/BackendAvailabilityReport.html | 2 +- .../docs/TreeHaver/BackendCapability.html | 2 +- .../docs/TreeHaver/BackendConflict.html | 2 +- .../docs/TreeHaver/BackendReference.html | 2 +- .../docs/TreeHaver/BackendRegistry.html | 2 +- gems/tree_haver/docs/TreeHaver/Backends.html | 2 +- .../docs/TreeHaver/Backends/Citrus.html | 2 +- .../TreeHaver/Backends/Citrus/Language.html | 2 +- .../docs/TreeHaver/Backends/Citrus/Node.html | 2 +- .../TreeHaver/Backends/Citrus/Parser.html | 2 +- .../docs/TreeHaver/Backends/Citrus/Tree.html | 2 +- .../docs/TreeHaver/Backends/FFI.html | 2 +- .../docs/TreeHaver/Backends/FFI/Language.html | 2 +- .../docs/TreeHaver/Backends/FFI/Native.html | 2 +- .../docs/TreeHaver/Backends/FFI/Node.html | 2 +- .../docs/TreeHaver/Backends/FFI/Parser.html | 2 +- .../docs/TreeHaver/Backends/FFI/Tree.html | 2 +- .../docs/TreeHaver/Backends/Java.html | 2 +- .../TreeHaver/Backends/Java/Language.html | 2 +- .../docs/TreeHaver/Backends/Java/Node.html | 2 +- .../docs/TreeHaver/Backends/Java/Parser.html | 2 +- .../docs/TreeHaver/Backends/Java/Tree.html | 2 +- .../docs/TreeHaver/Backends/MRI.html | 2 +- .../docs/TreeHaver/Backends/MRI/Language.html | 2 +- .../docs/TreeHaver/Backends/MRI/Parser.html | 2 +- .../docs/TreeHaver/Backends/Parslet.html | 2 +- .../TreeHaver/Backends/Parslet/Language.html | 2 +- .../docs/TreeHaver/Backends/Parslet/Node.html | 2 +- .../TreeHaver/Backends/Parslet/Parser.html | 2 +- .../docs/TreeHaver/Backends/Parslet/Tree.html | 2 +- .../docs/TreeHaver/Backends/Prism.html | 2 +- .../TreeHaver/Backends/Prism/Comment.html | 2 +- .../TreeHaver/Backends/Prism/Language.html | 2 +- .../docs/TreeHaver/Backends/Prism/Node.html | 2 +- .../docs/TreeHaver/Backends/Prism/Parser.html | 2 +- .../docs/TreeHaver/Backends/Prism/Tree.html | 2 +- .../docs/TreeHaver/Backends/Psych.html | 2 +- .../TreeHaver/Backends/Psych/Language.html | 2 +- .../docs/TreeHaver/Backends/Psych/Node.html | 2 +- .../docs/TreeHaver/Backends/Psych/Parser.html | 2 +- .../docs/TreeHaver/Backends/Psych/Tree.html | 2 +- .../docs/TreeHaver/Backends/Rust.html | 2 +- .../TreeHaver/Backends/Rust/Language.html | 2 +- .../docs/TreeHaver/Backends/Rust/Parser.html | 2 +- .../docs/TreeHaver/Backends/Tslp.html | 2 +- .../TreeHaver/Backends/Tslp/Language.html | 2 +- .../docs/TreeHaver/Backends/Tslp/Node.html | 2 +- .../docs/TreeHaver/Backends/Tslp/Parser.html | 2 +- .../docs/TreeHaver/Backends/Tslp/Tree.html | 2 +- gems/tree_haver/docs/TreeHaver/Base.html | 2 +- .../docs/TreeHaver/Base/Comment.html | 2 +- .../docs/TreeHaver/Base/Language.html | 2 +- gems/tree_haver/docs/TreeHaver/Base/Node.html | 2 +- .../docs/TreeHaver/Base/Parser.html | 2 +- .../tree_haver/docs/TreeHaver/Base/Point.html | 2 +- gems/tree_haver/docs/TreeHaver/Base/Tree.html | 2 +- .../docs/TreeHaver/BinaryDiagnostic.html | 2 +- .../docs/TreeHaver/BinaryMergeReport.html | 2 +- .../docs/TreeHaver/BinaryNestedDispatch.html | 2 +- .../docs/TreeHaver/BinaryPayloadRegion.html | 2 +- .../docs/TreeHaver/BinaryRawPayload.html | 2 +- .../docs/TreeHaver/BinaryRenderPolicy.html | 2 +- .../docs/TreeHaver/BinaryScalarValue.html | 2 +- .../docs/TreeHaver/ByteEditSpan.html | 2 +- gems/tree_haver/docs/TreeHaver/ByteRange.html | 2 +- .../docs/TreeHaver/CitrusGrammarFinder.html | 2 +- .../EditProjectionExecutionRequest.html | 2 +- .../EditProjectionExecutionResult.html | 2 +- .../EditProjectionOperationRequest.html | 2 +- .../EditProjectionProviderMatrix.html | 2 +- .../EditProjectionProviderMatrixEntry.html | 2 +- .../EditProjectionProviderOperation.html | 2 +- .../docs/TreeHaver/EditProjectionSupport.html | 2 +- gems/tree_haver/docs/TreeHaver/Error.html | 2 +- .../docs/TreeHaver/FeatureProfile.html | 2 +- .../docs/TreeHaver/GrammarFinder.html | 2 +- .../docs/TreeHaver/KaitaiByteSpan.html | 2 +- .../docs/TreeHaver/KaitaiTreeAnalysis.html | 2 +- .../docs/TreeHaver/KaitaiTreeNode.html | 2 +- gems/tree_haver/docs/TreeHaver/Language.html | 2 +- .../docs/TreeHaver/LanguageRegistry.html | 2 +- .../docs/TreeHaver/LanguageVersion.html | 2 +- .../docs/TreeHaver/LibraryPathUtils.html | 2 +- .../docs/TreeHaver/LibraryPathValidation.html | 2 +- .../docs/TreeHaver/NativeParserProvider.html | 2 +- .../TreeHaver/NativeProviderMetadata.html | 2 +- gems/tree_haver/docs/TreeHaver/Node.html | 2 +- .../docs/TreeHaver/NormalizedParseResult.html | 2 +- .../docs/TreeHaver/NormalizedTreeNode.html | 2 +- .../docs/TreeHaver/NotAvailable.html | 2 +- .../docs/TreeHaver/OrderedSiblingEdge.html | 2 +- .../docs/TreeHaver/OrderedTreePrimitives.html | 2 +- .../docs/TreeHaver/ParseErrorNode.html | 2 +- .../docs/TreeHaver/ParseErrorTolerance.html | 2 +- gems/tree_haver/docs/TreeHaver/Parser.html | 2 +- .../docs/TreeHaver/ParserDiagnostics.html | 2 +- .../docs/TreeHaver/ParserIdentity.html | 2 +- .../docs/TreeHaver/ParserRequest.html | 2 +- .../docs/TreeHaver/ParsletGrammarFinder.html | 2 +- .../docs/TreeHaver/PathValidator.html | 2 +- .../docs/TreeHaver/ProviderDiagnostic.html | 2 +- .../TreeHaver/ProviderDiagnosticsReport.html | 2 +- gems/tree_haver/docs/TreeHaver/RSpec.html | 2 +- .../docs/TreeHaver/RSpec/DependencyTags.html | 2 +- .../docs/TreeHaver/SourceFragment.html | 2 +- .../docs/TreeHaver/SourcePoint.html | 2 +- .../tree_haver/docs/TreeHaver/SourceSpan.html | 2 +- gems/tree_haver/docs/TreeHaver/Tree.html | 2 +- .../docs/TreeHaver/TreeHaverProfile.html | 2 +- gems/tree_haver/docs/TreeHaver/Version.html | 4 +- .../docs/TreeHaver/ZipArchiveEntry.html | 2 +- .../docs/TreeHaver/ZipArchiveInfo.html | 2 +- .../docs/TreeHaver/ZipFamilyReport.html | 2 +- .../docs/TreeHaver/ZipMemberDecision.html | 2 +- .../docs/TreeHaver/ZipUnsafeEntry.html | 2 +- gems/tree_haver/docs/_index.html | 2 +- gems/tree_haver/docs/file.AGPL-3.0-only.html | 2 +- gems/tree_haver/docs/file.LICENSE.html | 2 +- .../file.PolyForm-Small-Business-1.0.0.html | 2 +- gems/tree_haver/docs/file.README.html | 2 +- gems/tree_haver/docs/index.html | 2 +- gems/tree_haver/docs/top-level-namespace.html | 2 +- gems/typescript-merge/Gemfile.lock | 20 +- gems/yaml-merge/Gemfile.lock | 20 +- gems/zip-merge/Gemfile.lock | 20 +- 213 files changed, 17831 insertions(+), 19012 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 464e08c0f..527e0b749 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,8 +22,6 @@ Please file a bug if you notice a violation of semantic versioning. ### Changed -- Make the family GitHub Actions pin task request major upgrades. - ### Deprecated ### Removed @@ -32,6 +30,17 @@ Please file a bug if you notice a violation of semantic versioning. ### Security +## [7.1.9] - 2026-09-10 + +- TAG: [v7.1.9][7.1.9t] +- COVERAGE: 0.00% -- 0/0 lines in 0 files +- BRANCH COVERAGE: 0.00% -- 0/0 branches in 0 files +- 73.88% documented + +### Changed + +- Make the family GitHub Actions pin task request major upgrades. + ## [7.1.8] - 2026-09-07 - TAG: [v7.1.8][7.1.8t] @@ -708,7 +717,9 @@ Please file a bug if you notice a violation of semantic versioning. - Released the initial StructuredMerge Ruby gem set at version 7.0.0. - Published the parser-backed merge gems and kettle-jem templating tool from this monorepo. -[Unreleased]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.8...HEAD +[Unreleased]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.9...HEAD +[7.1.9]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.8...v7.1.9 +[7.1.9t]: https://github.com/structuredmerge/structuredmerge-ruby/releases/tag/v7.1.9 [7.1.8]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.7...v7.1.8 [7.1.8t]: https://github.com/structuredmerge/structuredmerge-ruby/releases/tag/v7.1.8 [7.1.7]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.6...v7.1.7 diff --git a/Gemfile.lock b/Gemfile.lock index ca8053378..071d36da7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,123 +1,123 @@ PATH remote: gems/ast-crispr-markdown-markly specs: - ast-crispr-markdown-markly (7.1.8) - ast-crispr (= 7.1.8) - markdown-merge (= 7.1.8) - markly-merge (= 7.1.8) + ast-crispr-markdown-markly (7.1.9) + ast-crispr (= 7.1.9) + markdown-merge (= 7.1.9) + markly-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: gems/ast-crispr-ruby-prism specs: - ast-crispr-ruby-prism (7.1.8) - ast-crispr (= 7.1.8) - prism-merge (= 7.1.8) + ast-crispr-ruby-prism (7.1.9) + ast-crispr (= 7.1.9) + prism-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: gems/ast-crispr specs: - ast-crispr (7.1.8) - ast-merge (= 7.1.8) + ast-crispr (7.1.9) + ast-merge (= 7.1.9) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: gems/ast-merge-git specs: - ast-merge-git (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ast-merge-git (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: gems/ast-merge specs: - ast-merge (7.1.8) + ast-merge (7.1.9) benchmark token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: gems/ast-template specs: - ast-template (7.1.8) - ast-merge (= 7.1.8) + ast-template (7.1.9) + ast-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: gems/bash-merge specs: - bash-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + bash-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: gems/binary-merge specs: - binary-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + binary-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: gems/citrus-toml-merge specs: - citrus-toml-merge (7.1.8) - ast-merge (= 7.1.8) - toml-merge (= 7.1.8) + citrus-toml-merge (7.1.9) + ast-merge (= 7.1.9) + toml-merge (= 7.1.9) toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.15) PATH remote: gems/commonmarker-merge specs: - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) commonmarker (~> 2.2) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: gems/dotenv-merge specs: - dotenv-merge (7.1.8) - ast-merge (= 7.1.8) - plain-merge (= 7.1.8) - tree_haver (= 7.1.8) + dotenv-merge (7.1.9) + ast-merge (= 7.1.9) + plain-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: gems/go-merge specs: - go-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + go-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: gems/html-merge specs: - html-merge (7.1.8) - ast-crispr (= 7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + html-merge (7.1.9) + ast-crispr (= 7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: gems/json-merge specs: - json-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + json-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: gems/kettle-jem specs: - kettle-jem (7.1.25) + kettle-jem (7.1.26) addressable (>= 2.8, < 3) ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) @@ -127,8 +127,8 @@ PATH commonmarker-merge (~> 7.1, >= 7.1.8) dotenv-merge (~> 7.1, >= 7.1.8) json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) + kettle-changelog (~> 1.0, >= 1.0.7) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.13) kettle-rb (~> 0.1, >= 0.1.11) @@ -151,122 +151,122 @@ PATH PATH remote: gems/kramdown-merge specs: - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown (~> 2.5) - markdown-merge (= 7.1.8) + markdown-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: gems/markdown-merge specs: - markdown-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + markdown-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: gems/markly-merge specs: - markly-merge (7.1.8) - markdown-merge (= 7.1.8) + markly-merge (7.1.9) + markdown-merge (= 7.1.9) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: gems/parslet-toml-merge specs: - parslet-toml-merge (7.1.8) + parslet-toml-merge (7.1.9) toml (~> 0.3) - toml-merge (= 7.1.8) + toml-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: gems/plain-merge specs: - plain-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + plain-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: gems/prism-merge specs: - prism-merge (7.1.8) - ast-merge (= 7.1.8) + prism-merge (7.1.9) + ast-merge (= 7.1.9) prism (~> 1.6) - ruby-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: gems/psych-merge specs: - psych-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + psych-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.8) + yaml-merge (= 7.1.9) PATH remote: gems/rbs-merge specs: - rbs-merge (7.1.8) - ast-merge (= 7.1.8) + rbs-merge (7.1.9) + ast-merge (= 7.1.9) rbs (>= 3.10) - tree_haver (= 7.1.8) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: gems/ruby-merge specs: - ruby-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + ruby-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: gems/rust-merge specs: - rust-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + rust-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: gems/smorg-rb specs: - smorg-rb (7.1.8) - ast-merge (= 7.1.8) - ast-merge-git (= 7.1.8) - bash-merge (= 7.1.8) + smorg-rb (7.1.9) + ast-merge (= 7.1.9) + ast-merge-git (= 7.1.9) + bash-merge (= 7.1.9) diff-lcs (~> 1.5) - dotenv-merge (= 7.1.8) - go-merge (= 7.1.8) - html-merge (= 7.1.8) - json-merge (= 7.1.8) - kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.8) - plain-merge (= 7.1.8) - prism-merge (= 7.1.8) - psych-merge (= 7.1.8) - rbs-merge (= 7.1.8) - rust-merge (= 7.1.8) - toml-merge (= 7.1.8) - typescript-merge (= 7.1.8) + dotenv-merge (= 7.1.9) + go-merge (= 7.1.9) + html-merge (= 7.1.9) + json-merge (= 7.1.9) + kettle-jem (~> 7.1, >= 7.1.26) + markdown-merge (= 7.1.9) + plain-merge (= 7.1.9) + prism-merge (= 7.1.9) + psych-merge (= 7.1.9) + rbs-merge (= 7.1.9) + rust-merge (= 7.1.9) + toml-merge (= 7.1.9) + typescript-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: gems/toml-merge specs: - toml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + toml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: gems/tree_haver specs: - tree_haver (7.1.8) + tree_haver (7.1.9) citrus (~> 3.0) parslet (~> 2.0) tree_sitter_language_pack (>= 1.16.2, < 2.0) @@ -275,25 +275,25 @@ PATH PATH remote: gems/typescript-merge specs: - typescript-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + typescript-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: gems/yaml-merge specs: - yaml-merge (7.1.8) - ast-merge (= 7.1.8) - tree_haver (= 7.1.8) + yaml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) PATH remote: gems/zip-merge specs: - zip-merge (7.1.8) - binary-merge (= 7.1.8) - tree_haver (= 7.1.8) + zip-merge (7.1.9) + binary-merge (= 7.1.9) + tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) GEM @@ -750,7 +750,7 @@ DEPENDENCIES irb (~> 1.17) json (~> 2.0, >= 2.21.2) json-merge! - kettle-dev (~> 3.0, >= 3.0.31, >= 3.0.0) + kettle-dev (~> 3.0, >= 3.0.34, >= 3.0.0) kettle-drift (~> 1.0, >= 1.0.8) kettle-family (~> 1.2, >= 1.2.97) kettle-jem! @@ -814,28 +814,28 @@ CHECKSUMS appraisal2 (3.2.3) sha256=3a6cfaf8a444e02707b9a34154af1c4902fbe99d9d2168d7e81dd83ec77e6db7 appraisal2-rubocop (1.0.2) sha256=1dae97c1be087cf9c098a3a72fd41f873435e9b8b39687e633b36c9ccb22bff4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.8) - ast-crispr-markdown-markly (7.1.8) - ast-crispr-ruby-prism (7.1.8) - ast-merge (7.1.8) - ast-merge-git (7.1.8) - ast-template (7.1.8) + ast-crispr (7.1.9) + ast-crispr-markdown-markly (7.1.9) + ast-crispr-ruby-prism (7.1.9) + ast-merge (7.1.9) + ast-merge-git (7.1.9) + ast-template (7.1.9) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.8) + bash-merge (7.1.9) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.8) + binary-merge (7.1.9) bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.8) + citrus-toml-merge (7.1.9) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 commonmarker (2.10.0-x86_64-linux) sha256=945c510c0bfca9022245928e2248468fe3ddad58c939be0c37b20082cc392880 - commonmarker-merge (7.1.8) + commonmarker-merge (7.1.9) completely (0.8.0) sha256=e493cd5d84805f47917a41f277ecbfe5f35363bed670be5a957d3acaed8c6c5e concurrent-ruby (1.3.8) sha256=b2f1be836e968ccc78ccfce277ea79c72a88633f22306782c16ff23fb415d1e1 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 @@ -844,7 +844,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docopt_ng (0.7.1) sha256=a024148ee4fa3ab1a8a04411aa4370f39cf2b446e63562097d418b7974a15667 - dotenv-merge (7.1.8) + dotenv-merge (7.1.9) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -857,33 +857,33 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.8) + go-merge (7.1.9) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.8) + html-merge (7.1.9) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a - json-merge (7.1.8) + json-merge (7.1.9) kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 - kettle-jem (7.1.25) + kettle-jem (7.1.26) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.8) + kramdown-merge (7.1.9) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 - markdown-merge (7.1.8) + markdown-merge (7.1.9) markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca - markly-merge (7.1.8) + markly-merge (7.1.9) mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-x86_64-linux-gnu) sha256=379fae440b28915e3f19d752ce2dcf8465ed2b2fbefd2a7ca0dd497bc981a06a @@ -893,20 +893,20 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.8) - plain-merge (7.1.8) + parslet-toml-merge (7.1.9) + plain-merge (7.1.9) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.8) + prism-merge (7.1.9) psych (5.5.0) sha256=4b245bbbd0f3238df8ccee766ebc1a6b062b10e4ee1d3284eb588739ba156a0a - psych-merge (7.1.8) + psych-merge (7.1.9) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 - rbs-merge (7.1.8) + rbs-merge (7.1.9) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -942,11 +942,11 @@ CHECKSUMS rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100 rubocop-ruby3_2 (3.0.8) sha256=ccc76e2f0a4a3751a1e4dd51f59e8a357c8ba11bb39e1ad76cfd9fb8f51e191f rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.8) + ruby-merge (7.1.9) ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.8) + rust-merge (7.1.9) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -954,7 +954,7 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.8) + smorg-rb (7.1.9) sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -971,21 +971,21 @@ CHECKSUMS timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.8) + toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb - tree_haver (7.1.8) + tree_haver (7.1.9) tree_sitter_language_pack (1.16.2-x86_64-linux) sha256=d8151e6e44e35ace9de3611c76b730896beab17f427db06d8f76666332a5dc60 tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f tty-cursor (0.7.1) sha256=79534185e6a777888d88628b14b6a1fdf5154a603f285f80b1753e1908e0bf48 tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.8) + typescript-merge (7.1.9) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 yaml-converter (0.2.5) sha256=a5214fe1a6c2df88bd34a35bcded1b1dcd30135548130df2e03b54ca8c0f2423 - yaml-merge (7.1.8) + yaml-merge (7.1.9) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.8) sha256=73d935d43e3479d65ce8aff25c7d3100e8bb83528a2adaa0ed824e5046ac99e7 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -994,7 +994,7 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.8) + zip-merge (7.1.9) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ast-crispr-markdown-markly/Gemfile.lock b/gems/ast-crispr-markdown-markly/Gemfile.lock index bec784c6d..b43401d7a 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile.lock +++ b/gems/ast-crispr-markdown-markly/Gemfile.lock @@ -136,8 +136,8 @@ PATH commonmarker-merge (~> 7.1, >= 7.1.8) dotenv-merge (~> 7.1, >= 7.1.8) json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) + kettle-changelog (~> 1.0, >= 1.0.7) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.13) kettle-rb (~> 0.1, >= 0.1.11) @@ -253,7 +253,7 @@ PATH go-merge (= 7.1.9) html-merge (= 7.1.9) json-merge (= 7.1.9) - kettle-jem (~> 7.1, >= 7.1.18) + kettle-jem (~> 7.1, >= 7.1.26) markdown-merge (= 7.1.9) plain-merge (= 7.1.9) prism-merge (= 7.1.9) @@ -336,8 +336,6 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) - commonmarker (2.10.0) - rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -509,9 +507,6 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) - rake-compiler-dock (1.12.0) - rb_sys (0.9.130) - rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -705,9 +700,6 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.17.0) - rb_sys (>= 0.9.130, < 0.10) - sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.17.0-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.17.0-arm64-darwin) @@ -866,7 +858,7 @@ CHECKSUMS benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd binary-merge (7.1.9) - bundler (4.1.0.beta1) + bundler (4.1.0.beta1) sha256=8a2dac8ca276ff4eff5efc2c6457b0044080fc1e431534ad7c5cc6187232b800 bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 @@ -875,7 +867,6 @@ CHECKSUMS colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 - commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e @@ -960,8 +951,6 @@ CHECKSUMS racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 - rake-compiler-dock (1.12.0) - rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 @@ -1031,7 +1020,6 @@ CHECKSUMS toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.9) - tree_sitter_language_pack (1.17.0) tree_sitter_language_pack (1.17.0-aarch64-linux) tree_sitter_language_pack (1.17.0-arm64-darwin) tree_sitter_language_pack (1.17.0-x86_64-darwin) diff --git a/gems/ast-crispr-ruby-prism/Gemfile.lock b/gems/ast-crispr-ruby-prism/Gemfile.lock index 6a3868f91..fd267b35a 100644 --- a/gems/ast-crispr-ruby-prism/Gemfile.lock +++ b/gems/ast-crispr-ruby-prism/Gemfile.lock @@ -136,8 +136,8 @@ PATH commonmarker-merge (~> 7.1, >= 7.1.8) dotenv-merge (~> 7.1, >= 7.1.8) json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) + kettle-changelog (~> 1.0, >= 1.0.7) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.13) kettle-rb (~> 0.1, >= 0.1.11) @@ -253,7 +253,7 @@ PATH go-merge (= 7.1.9) html-merge (= 7.1.9) json-merge (= 7.1.9) - kettle-jem (~> 7.1, >= 7.1.18) + kettle-jem (~> 7.1, >= 7.1.26) markdown-merge (= 7.1.9) plain-merge (= 7.1.9) prism-merge (= 7.1.9) @@ -336,8 +336,6 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) - commonmarker (2.10.0) - rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -509,9 +507,6 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) - rake-compiler-dock (1.12.0) - rb_sys (0.9.130) - rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -705,9 +700,6 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.17.0) - rb_sys (>= 0.9.130, < 0.10) - sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.17.0-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.17.0-arm64-darwin) @@ -866,7 +858,7 @@ CHECKSUMS benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd binary-merge (7.1.9) - bundler (4.1.0.beta1) + bundler (4.1.0.beta1) sha256=8a2dac8ca276ff4eff5efc2c6457b0044080fc1e431534ad7c5cc6187232b800 bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 @@ -875,7 +867,6 @@ CHECKSUMS colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 - commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e @@ -960,8 +951,6 @@ CHECKSUMS racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 - rake-compiler-dock (1.12.0) - rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 @@ -1031,7 +1020,6 @@ CHECKSUMS toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.9) - tree_sitter_language_pack (1.17.0) tree_sitter_language_pack (1.17.0-aarch64-linux) tree_sitter_language_pack (1.17.0-arm64-darwin) tree_sitter_language_pack (1.17.0-x86_64-darwin) diff --git a/gems/ast-crispr/Gemfile.lock b/gems/ast-crispr/Gemfile.lock index 0457d6b81..1721aa769 100644 --- a/gems/ast-crispr/Gemfile.lock +++ b/gems/ast-crispr/Gemfile.lock @@ -16,7 +16,7 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + remote: ../ast-crispr-markdown-markly specs: ast-crispr-markdown-markly (7.1.9) ast-crispr (= 7.1.9) @@ -25,7 +25,7 @@ PATH version_gem (~> 1.1, >= 1.1.15) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + remote: ../ast-crispr-ruby-prism specs: ast-crispr-ruby-prism (7.1.9) ast-crispr (= 7.1.9) @@ -136,8 +136,8 @@ PATH commonmarker-merge (~> 7.1, >= 7.1.8) dotenv-merge (~> 7.1, >= 7.1.8) json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) + kettle-changelog (~> 1.0, >= 1.0.7) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.13) kettle-rb (~> 0.1, >= 0.1.11) @@ -253,7 +253,7 @@ PATH go-merge (= 7.1.9) html-merge (= 7.1.9) json-merge (= 7.1.9) - kettle-jem (~> 7.1, >= 7.1.18) + kettle-jem (~> 7.1, >= 7.1.26) markdown-merge (= 7.1.9) plain-merge (= 7.1.9) prism-merge (= 7.1.9) @@ -336,8 +336,6 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) - commonmarker (2.10.0) - rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -509,9 +507,6 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) - rake-compiler-dock (1.12.0) - rb_sys (0.9.130) - rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -705,9 +700,6 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.16.2) - rb_sys (>= 0.9.130, < 0.10) - sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -866,7 +858,7 @@ CHECKSUMS benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd binary-merge (7.1.9) - bundler (4.1.0.beta1) + bundler (4.1.0.beta1) sha256=8a2dac8ca276ff4eff5efc2c6457b0044080fc1e431534ad7c5cc6187232b800 bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 @@ -875,7 +867,6 @@ CHECKSUMS colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 - commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e @@ -960,8 +951,6 @@ CHECKSUMS racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 - rake-compiler-dock (1.12.0) - rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 @@ -1031,7 +1020,6 @@ CHECKSUMS toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.9) - tree_sitter_language_pack (1.16.2) tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 diff --git a/gems/ast-merge-git/Gemfile.lock b/gems/ast-merge-git/Gemfile.lock index 3faf33c93..35192a022 100644 --- a/gems/ast-merge-git/Gemfile.lock +++ b/gems/ast-merge-git/Gemfile.lock @@ -136,8 +136,8 @@ PATH commonmarker-merge (~> 7.1, >= 7.1.8) dotenv-merge (~> 7.1, >= 7.1.8) json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) + kettle-changelog (~> 1.0, >= 1.0.7) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.13) kettle-rb (~> 0.1, >= 0.1.11) @@ -253,7 +253,7 @@ PATH go-merge (= 7.1.9) html-merge (= 7.1.9) json-merge (= 7.1.9) - kettle-jem (~> 7.1, >= 7.1.18) + kettle-jem (~> 7.1, >= 7.1.26) markdown-merge (= 7.1.9) plain-merge (= 7.1.9) prism-merge (= 7.1.9) @@ -336,8 +336,6 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) - commonmarker (2.10.0) - rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -509,9 +507,6 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) - rake-compiler-dock (1.12.0) - rb_sys (0.9.130) - rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -705,9 +700,6 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.16.2) - rb_sys (>= 0.9.130, < 0.10) - sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -866,7 +858,7 @@ CHECKSUMS benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd binary-merge (7.1.9) - bundler (4.1.0.beta1) + bundler (4.1.0.beta1) sha256=8a2dac8ca276ff4eff5efc2c6457b0044080fc1e431534ad7c5cc6187232b800 bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 @@ -875,7 +867,6 @@ CHECKSUMS colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 - commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e @@ -960,8 +951,6 @@ CHECKSUMS racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 - rake-compiler-dock (1.12.0) - rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 @@ -1031,7 +1020,6 @@ CHECKSUMS toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.9) - tree_sitter_language_pack (1.16.2) tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 diff --git a/gems/ast-merge/Gemfile.lock b/gems/ast-merge/Gemfile.lock index 32efb239f..55fc4bd2b 100644 --- a/gems/ast-merge/Gemfile.lock +++ b/gems/ast-merge/Gemfile.lock @@ -136,8 +136,8 @@ PATH commonmarker-merge (~> 7.1, >= 7.1.8) dotenv-merge (~> 7.1, >= 7.1.8) json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) + kettle-changelog (~> 1.0, >= 1.0.7) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.13) kettle-rb (~> 0.1, >= 0.1.11) @@ -253,7 +253,7 @@ PATH go-merge (= 7.1.9) html-merge (= 7.1.9) json-merge (= 7.1.9) - kettle-jem (~> 7.1, >= 7.1.18) + kettle-jem (~> 7.1, >= 7.1.26) markdown-merge (= 7.1.9) plain-merge (= 7.1.9) prism-merge (= 7.1.9) @@ -336,8 +336,6 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) - commonmarker (2.10.0) - rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -509,9 +507,6 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) - rake-compiler-dock (1.12.0) - rb_sys (0.9.130) - rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -705,9 +700,6 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.16.2) - rb_sys (>= 0.9.130, < 0.10) - sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -866,7 +858,7 @@ CHECKSUMS benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd binary-merge (7.1.9) - bundler (4.1.0.beta1) + bundler (4.1.0.beta1) sha256=8a2dac8ca276ff4eff5efc2c6457b0044080fc1e431534ad7c5cc6187232b800 bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 @@ -875,7 +867,6 @@ CHECKSUMS colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 - commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e @@ -960,8 +951,6 @@ CHECKSUMS racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 - rake-compiler-dock (1.12.0) - rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 @@ -1031,7 +1020,6 @@ CHECKSUMS toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.9) - tree_sitter_language_pack (1.16.2) tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 diff --git a/gems/ast-template/Gemfile.lock b/gems/ast-template/Gemfile.lock index 209f7afb3..8bcad0a5c 100644 --- a/gems/ast-template/Gemfile.lock +++ b/gems/ast-template/Gemfile.lock @@ -14,315 +14,46 @@ PATH ast-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly +GEM + remote: https://gem.coop/ specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) + ansi (1.6.0) + appraisal2 (3.2.3) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + appraisal2-rubocop (1.0.2) + appraisal2 (>= 3.2.3) + rubocop (>= 1.0) + version_gem (~> 1.1, >= 1.1.15) + ast (2.4.3) + ast-crispr (7.1.9) + ast-merge (= 7.1.9) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.15) ast-crispr-markdown-markly (7.1.9) ast-crispr (= 7.1.9) markdown-merge (= 7.1.9) markly-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: ast-crispr-ruby-prism (7.1.9) ast-crispr (= 7.1.9) prism-merge (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.9) - ast-merge (= 7.1.9) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.9) - ast-merge (= 7.1.9) - tree_haver (= 7.1.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: ast-merge (7.1.9) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: + backports (3.25.3) bash-merge (7.1.9) ast-merge (= 7.1.9) tree_haver (= 7.1.9) version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.9) - ast-merge (= 7.1.9) - tree_haver (= 7.1.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.9) - ast-merge (= 7.1.9) - toml-merge (= 7.1.9) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.9) - commonmarker (~> 2.2) - markdown-merge (= 7.1.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.9) - ast-merge (= 7.1.9) - plain-merge (= 7.1.9) - tree_haver (= 7.1.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.9) - ast-merge (= 7.1.9) - tree_haver (= 7.1.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge - specs: - html-merge (7.1.9) - ast-crispr (= 7.1.9) - ast-merge (= 7.1.9) - tree_haver (= 7.1.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.9) - ast-merge (= 7.1.9) - tree_haver (= 7.1.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.26) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) - ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) - ast-merge (~> 7.1, >= 7.1.8) - bash-merge (~> 7.1, >= 7.1.8) - citrus-toml-merge (~> 7.1, >= 7.1.8) - commonmarker-merge (~> 7.1, >= 7.1.8) - dotenv-merge (~> 7.1, >= 7.1.8) - json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) - kettle-gha-pins (~> 0.3, >= 0.3.14) - kettle-ndjson (~> 0.1, >= 0.1.13) - kettle-rb (~> 0.1, >= 0.1.11) - kramdown-merge (~> 7.1, >= 7.1.8) - markdown-merge (~> 7.1, >= 7.1.8) - markly-merge (~> 7.1, >= 7.1.8) - parslet (~> 2.0) - prism-merge (~> 7.1, >= 7.1.8) - psych-merge (~> 7.1, >= 7.1.8) - rbs (>= 3.10) - rbs-merge (~> 7.1, >= 7.1.8) - ruby-merge (~> 7.1, >= 7.1.8) - token-resolver (~> 2.0, >= 2.0.10) - toml-merge (~> 7.1, >= 7.1.8) - toml-rb (~> 4.2) - tree_haver (~> 7.1, >= 7.1.8) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (~> 7.1, >= 7.1.8) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.9) - kramdown (~> 2.5) - markdown-merge (= 7.1.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.9) - ast-merge (= 7.1.9) - tree_haver (= 7.1.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.9) - markdown-merge (= 7.1.9) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.9) - toml (~> 0.3) - toml-merge (= 7.1.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.9) - ast-merge (= 7.1.9) - tree_haver (= 7.1.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.9) - ast-merge (= 7.1.9) - prism (~> 1.6) - ruby-merge (= 7.1.9) - tree_haver (= 7.1.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.9) - ast-merge (= 7.1.9) - tree_haver (= 7.1.9) - version_gem (~> 1.1, >= 1.1.15) - yaml-merge (= 7.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.9) - ast-merge (= 7.1.9) - rbs (>= 3.10) - tree_haver (= 7.1.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.9) - ast-merge (= 7.1.9) - tree_haver (= 7.1.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.9) - ast-merge (= 7.1.9) - tree_haver (= 7.1.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.9) - ast-merge (= 7.1.9) - ast-merge-git (= 7.1.9) - bash-merge (= 7.1.9) - diff-lcs (~> 1.5) - dotenv-merge (= 7.1.9) - go-merge (= 7.1.9) - html-merge (= 7.1.9) - json-merge (= 7.1.9) - kettle-jem (~> 7.1, >= 7.1.18) - markdown-merge (= 7.1.9) - plain-merge (= 7.1.9) - prism-merge (= 7.1.9) - psych-merge (= 7.1.9) - rbs-merge (= 7.1.9) - rust-merge (= 7.1.9) - toml-merge (= 7.1.9) - typescript-merge (= 7.1.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.9) - ast-merge (= 7.1.9) - tree_haver (= 7.1.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.9) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.16.2, < 2.0) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.9) - ast-merge (= 7.1.9) - tree_haver (= 7.1.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.9) - ast-merge (= 7.1.9) - tree_haver (= 7.1.9) - version_gem (~> 1.1, >= 1.1.15) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.9) - binary-merge (= 7.1.9) - tree_haver (= 7.1.9) - version_gem (~> 1.1, >= 1.1.15) - -GEM - remote: https://gem.coop/ - specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - anonymous_loader (0.1.3) - version_gem (~> 1.1, >= 1.1.14) - ansi (1.6.0) - appraisal2 (3.2.3) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - appraisal2-rubocop (1.0.2) - appraisal2 (>= 3.2.3) - rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.15) - ast (2.4.3) - backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) @@ -330,20 +61,27 @@ GEM thor (~> 1.0) cgi (0.5.2) citrus (3.0.2) + citrus-toml-merge (7.1.9) + ast-merge (= 7.1.9) + toml-merge (= 7.1.9) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.15) cmdparse (3.0.7) colsole (1.0.1) command_kit (0.6.0) command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) - commonmarker (2.10.0) - rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) commonmarker (2.10.0-x86_64-darwin) commonmarker (2.10.0-x86_64-linux) commonmarker (2.10.0-x86_64-linux-musl) + commonmarker-merge (7.1.9) + commonmarker (~> 2.2) + markdown-merge (= 7.1.9) + version_gem (~> 1.1, >= 1.1.15) completely (0.8.0) colsole (~> 1.0.0) erb @@ -357,6 +95,11 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docopt_ng (0.7.1) + dotenv-merge (7.1.9) + ast-merge (= 7.1.9) + plain-merge (= 7.1.9) + tree_haver (= 7.1.9) + version_gem (~> 1.1, >= 1.1.15) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -406,6 +149,10 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.2) + json-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) + version_gem (~> 1.1, >= 1.1.15) kettle-changelog (1.0.7) ast-crispr-markdown-markly (~> 7.1, >= 7.1.1) kettle-dev (>= 3.0.19, < 4.0.0) @@ -418,8 +165,6 @@ GEM kettle-test (~> 2.0, >= 2.0.21) ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) - kettle-drift (1.0.13) - version_gem (~> 1.1, >= 1.1.15) kettle-family (1.2.100) command_kit (~> 0.6) command_kit-completion (~> 0.1) @@ -436,6 +181,36 @@ GEM ruby-progressbar (~> 1.13) tty-progressbar (~> 0.18) version_gem (~> 1.1, >= 1.1.15) + kettle-jem (7.1.25) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (~> 7.1, >= 7.1.8) + ast-crispr-ruby-prism (~> 7.1, >= 7.1.8) + ast-merge (~> 7.1, >= 7.1.8) + bash-merge (~> 7.1, >= 7.1.8) + citrus-toml-merge (~> 7.1, >= 7.1.8) + commonmarker-merge (~> 7.1, >= 7.1.8) + dotenv-merge (~> 7.1, >= 7.1.8) + json-merge (~> 7.1, >= 7.1.8) + kettle-changelog (~> 1.0, >= 1.0.6) + kettle-dev (>= 3.0.17, < 4.0.0) + kettle-gha-pins (~> 0.3, >= 0.3.14) + kettle-ndjson (~> 0.1, >= 0.1.13) + kettle-rb (~> 0.1, >= 0.1.11) + kramdown-merge (~> 7.1, >= 7.1.8) + markdown-merge (~> 7.1, >= 7.1.8) + markly-merge (~> 7.1, >= 7.1.8) + parslet (~> 2.0) + prism-merge (~> 7.1, >= 7.1.8) + psych-merge (~> 7.1, >= 7.1.8) + rbs (>= 3.10) + rbs-merge (~> 7.1, >= 7.1.8) + ruby-merge (~> 7.1, >= 7.1.8) + token-resolver (~> 2.0, >= 2.0.10) + toml-merge (~> 7.1, >= 7.1.8) + toml-rb (~> 4.2) + tree_haver (~> 7.1, >= 7.1.8) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (~> 7.1, >= 7.1.8) kettle-ndjson (0.1.15) version_gem (~> 1.1, >= 1.1.15) kettle-rb (0.1.12) @@ -461,12 +236,24 @@ GEM version_gem (~> 1.1, >= 1.1.15) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.9) + kramdown (~> 2.5) + markdown-merge (= 7.1.9) + version_gem (~> 1.1, >= 1.1.15) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) + version_gem (~> 1.1, >= 1.1.15) markly (0.19.0) + markly-merge (7.1.9) + markdown-merge (= 7.1.9) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.15) mini_portile2 (2.8.9) mister_bin (0.9.0) colsole (~> 1.0.0) @@ -498,24 +285,41 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) + plain-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) + version_gem (~> 1.1, >= 1.1.15) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.9) + ast-merge (= 7.1.9) + prism (~> 1.6) + ruby-merge (= 7.1.9) + tree_haver (= 7.1.9) + version_gem (~> 1.1, >= 1.1.15) psych (5.5.0) date stringio + psych-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) + version_gem (~> 1.1, >= 1.1.15) + yaml-merge (= 7.1.9) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) rake (13.4.2) - rake-compiler-dock (1.12.0) - rb_sys (0.9.130) - rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) tsort + rbs-merge (7.1.9) + ast-merge (= 7.1.9) + rbs (>= 3.10) + tree_haver (= 7.1.9) + version_gem (~> 1.1, >= 1.1.15) rdoc (7.2.0) erb psych (>= 4.0.0) @@ -640,6 +444,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) + version_gem (~> 1.1, >= 1.1.15) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -700,14 +508,18 @@ GEM token-resolver (2.0.10) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.15) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) + version_gem (~> 1.1, >= 1.1.15) toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.17.0) - rb_sys (>= 0.9.130, < 0.10) - sorbet-runtime (~> 0.5) + tree_haver (7.1.9) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.16.2, < 2.0) + version_gem (~> 1.1, >= 1.1.15) tree_sitter_language_pack (1.17.0-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.17.0-arm64-darwin) @@ -736,6 +548,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.15) + yaml-merge (7.1.9) + ast-merge (= 7.1.9) + tree_haver (= 7.1.9) + version_gem (~> 1.1, >= 1.1.15) yard (0.9.45) yard-fence (0.9.8) rdoc (>= 6.11, < 8) @@ -773,49 +589,28 @@ DEPENDENCIES anonymous_loader (~> 0.1, >= 0.1.3) appraisal2 (~> 3.2, >= 3.2.3) appraisal2-rubocop (~> 1.0, >= 1.0.2) - ast-crispr! - ast-crispr-markdown-markly! - ast-crispr-ruby-prism! - ast-merge! - ast-merge-git! ast-template! - bash-merge! benchmark (~> 0.5, >= 0.5.0) - binary-merge! bundler-audit (~> 0.9.3) cgi (~> 0.5) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.7) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.12) - go-merge! - html-merge! irb (~> 1.17) - json-merge! kettle-changelog (~> 1.0, >= 1.0.7) kettle-dev (~> 3.0, >= 3.0.34) - kettle-drift (~> 1.0, >= 1.0.13) kettle-family (~> 1.2, >= 1.2.100) - kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.10) kettle-test (~> 2.0, >= 2.0.21) kramdown (~> 2.5, >= 2.5.2) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! + markly-merge (~> 7.1, >= 7.1.0) mutex_m (~> 0.2) nomono (~> 1.1, >= 1.1.5) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! + prism-merge (~> 7.1, >= 7.1.0) rake (~> 13.0) rbs (>= 3.0) - rbs-merge! reek (~> 6.5, >= 6.5.0) require_bench (~> 1.0, >= 1.0.4) rubocop-gradual (~> 0.4, >= 0.4.0) @@ -825,20 +620,14 @@ DEPENDENCIES rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging! rubocop-ruby3_2 (~> 3.0, >= 3.0.8) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.8) stringio (>= 3.0) - toml-merge! - tree_haver! + toml-merge (~> 7.1, >= 7.1.0) turbo_tests2 (~> 3.2, >= 3.2.7) - typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.5) - yaml-merge! yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.8) yard-junk (~> 0.1, >= 0.1.0) @@ -846,7 +635,6 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.6) yard-yaml (~> 0.2, >= 0.2.5) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -859,14 +647,12 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.9) ast-crispr-ruby-prism (7.1.9) ast-merge (7.1.9) - ast-merge-git (7.1.9) ast-template (7.1.9) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.9) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.9) - bundler (4.1.0.beta1) + bundler (4.1.0.beta1) sha256=8a2dac8ca276ff4eff5efc2c6457b0044080fc1e431534ad7c5cc6187232b800 bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 @@ -875,7 +661,6 @@ CHECKSUMS colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 - commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e @@ -904,19 +689,16 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d - go-merge (7.1.9) hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2 - html-merge (7.1.9) io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.9) kettle-changelog (1.0.7) kettle-dev (3.0.34) - kettle-drift (1.0.13) kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 - kettle-jem (7.1.26) + kettle-jem (7.1.25) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 kettle-soup-cover (3.0.10) @@ -948,7 +730,6 @@ CHECKSUMS parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 - parslet-toml-merge (7.1.9) plain-merge (7.1.9) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -960,8 +741,6 @@ CHECKSUMS racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 - rake-compiler-dock (1.12.0) - rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 @@ -1003,7 +782,6 @@ CHECKSUMS ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 - rust-merge (7.1.9) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e @@ -1011,7 +789,6 @@ CHECKSUMS simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.9) sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -1027,11 +804,9 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.9) - tree_sitter_language_pack (1.17.0) tree_sitter_language_pack (1.17.0-aarch64-linux) tree_sitter_language_pack (1.17.0-arm64-darwin) tree_sitter_language_pack (1.17.0-x86_64-darwin) @@ -1041,7 +816,6 @@ CHECKSUMS tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6 tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50 turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7 - typescript-merge (7.1.9) unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0 webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131 @@ -1055,7 +829,6 @@ CHECKSUMS yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5 - zip-merge (7.1.9) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/bash-merge/Gemfile.lock b/gems/bash-merge/Gemfile.lock index dac23237e..b25e5623f 100644 --- a/gems/bash-merge/Gemfile.lock +++ b/gems/bash-merge/Gemfile.lock @@ -136,8 +136,8 @@ PATH commonmarker-merge (~> 7.1, >= 7.1.8) dotenv-merge (~> 7.1, >= 7.1.8) json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) + kettle-changelog (~> 1.0, >= 1.0.7) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.13) kettle-rb (~> 0.1, >= 0.1.11) @@ -253,7 +253,7 @@ PATH go-merge (= 7.1.9) html-merge (= 7.1.9) json-merge (= 7.1.9) - kettle-jem (~> 7.1, >= 7.1.18) + kettle-jem (~> 7.1, >= 7.1.26) markdown-merge (= 7.1.9) plain-merge (= 7.1.9) prism-merge (= 7.1.9) @@ -336,8 +336,6 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) - commonmarker (2.10.0) - rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -509,9 +507,6 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) - rake-compiler-dock (1.12.0) - rb_sys (0.9.130) - rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -705,9 +700,6 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.16.2) - rb_sys (>= 0.9.130, < 0.10) - sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -866,7 +858,7 @@ CHECKSUMS benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd binary-merge (7.1.9) - bundler (4.1.0.beta1) + bundler (4.1.0.beta1) sha256=8a2dac8ca276ff4eff5efc2c6457b0044080fc1e431534ad7c5cc6187232b800 bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 @@ -875,7 +867,6 @@ CHECKSUMS colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 - commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e @@ -960,8 +951,6 @@ CHECKSUMS racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 - rake-compiler-dock (1.12.0) - rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 @@ -1031,7 +1020,6 @@ CHECKSUMS toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.9) - tree_sitter_language_pack (1.16.2) tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 diff --git a/gems/binary-merge/Gemfile.lock b/gems/binary-merge/Gemfile.lock index 8d8376f54..e30c3d93e 100644 --- a/gems/binary-merge/Gemfile.lock +++ b/gems/binary-merge/Gemfile.lock @@ -136,8 +136,8 @@ PATH commonmarker-merge (~> 7.1, >= 7.1.8) dotenv-merge (~> 7.1, >= 7.1.8) json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) + kettle-changelog (~> 1.0, >= 1.0.7) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.13) kettle-rb (~> 0.1, >= 0.1.11) @@ -253,7 +253,7 @@ PATH go-merge (= 7.1.9) html-merge (= 7.1.9) json-merge (= 7.1.9) - kettle-jem (~> 7.1, >= 7.1.18) + kettle-jem (~> 7.1, >= 7.1.26) markdown-merge (= 7.1.9) plain-merge (= 7.1.9) prism-merge (= 7.1.9) @@ -336,8 +336,6 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) - commonmarker (2.10.0) - rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -509,9 +507,6 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) - rake-compiler-dock (1.12.0) - rb_sys (0.9.130) - rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -705,9 +700,6 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.17.0) - rb_sys (>= 0.9.130, < 0.10) - sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.17.0-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.17.0-arm64-darwin) @@ -866,7 +858,7 @@ CHECKSUMS benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd binary-merge (7.1.9) - bundler (4.1.0.beta1) + bundler (4.1.0.beta1) sha256=8a2dac8ca276ff4eff5efc2c6457b0044080fc1e431534ad7c5cc6187232b800 bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 @@ -875,7 +867,6 @@ CHECKSUMS colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 - commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e @@ -960,8 +951,6 @@ CHECKSUMS racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 - rake-compiler-dock (1.12.0) - rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 @@ -1031,7 +1020,6 @@ CHECKSUMS toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.9) - tree_sitter_language_pack (1.17.0) tree_sitter_language_pack (1.17.0-aarch64-linux) tree_sitter_language_pack (1.17.0-arm64-darwin) tree_sitter_language_pack (1.17.0-x86_64-darwin) diff --git a/gems/citrus-toml-merge/Gemfile.lock b/gems/citrus-toml-merge/Gemfile.lock index 9ffc2178d..9d6ce59dc 100644 --- a/gems/citrus-toml-merge/Gemfile.lock +++ b/gems/citrus-toml-merge/Gemfile.lock @@ -136,8 +136,8 @@ PATH commonmarker-merge (~> 7.1, >= 7.1.8) dotenv-merge (~> 7.1, >= 7.1.8) json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) + kettle-changelog (~> 1.0, >= 1.0.7) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.13) kettle-rb (~> 0.1, >= 0.1.11) @@ -253,7 +253,7 @@ PATH go-merge (= 7.1.9) html-merge (= 7.1.9) json-merge (= 7.1.9) - kettle-jem (~> 7.1, >= 7.1.18) + kettle-jem (~> 7.1, >= 7.1.26) markdown-merge (= 7.1.9) plain-merge (= 7.1.9) prism-merge (= 7.1.9) @@ -336,8 +336,6 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) - commonmarker (2.10.0) - rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -509,9 +507,6 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) - rake-compiler-dock (1.12.0) - rb_sys (0.9.130) - rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -705,9 +700,6 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.17.0) - rb_sys (>= 0.9.130, < 0.10) - sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.17.0-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.17.0-arm64-darwin) @@ -866,7 +858,7 @@ CHECKSUMS benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd binary-merge (7.1.9) - bundler (4.1.0.beta1) + bundler (4.1.0.beta1) sha256=8a2dac8ca276ff4eff5efc2c6457b0044080fc1e431534ad7c5cc6187232b800 bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 @@ -875,7 +867,6 @@ CHECKSUMS colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 - commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e @@ -960,8 +951,6 @@ CHECKSUMS racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 - rake-compiler-dock (1.12.0) - rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 @@ -1031,7 +1020,6 @@ CHECKSUMS toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.9) - tree_sitter_language_pack (1.17.0) tree_sitter_language_pack (1.17.0-aarch64-linux) tree_sitter_language_pack (1.17.0-arm64-darwin) tree_sitter_language_pack (1.17.0-x86_64-darwin) diff --git a/gems/commonmarker-merge/Gemfile.lock b/gems/commonmarker-merge/Gemfile.lock index 599cff035..150317e98 100644 --- a/gems/commonmarker-merge/Gemfile.lock +++ b/gems/commonmarker-merge/Gemfile.lock @@ -136,8 +136,8 @@ PATH commonmarker-merge (~> 7.1, >= 7.1.8) dotenv-merge (~> 7.1, >= 7.1.8) json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) + kettle-changelog (~> 1.0, >= 1.0.7) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.13) kettle-rb (~> 0.1, >= 0.1.11) @@ -253,7 +253,7 @@ PATH go-merge (= 7.1.9) html-merge (= 7.1.9) json-merge (= 7.1.9) - kettle-jem (~> 7.1, >= 7.1.18) + kettle-jem (~> 7.1, >= 7.1.26) markdown-merge (= 7.1.9) plain-merge (= 7.1.9) prism-merge (= 7.1.9) @@ -336,8 +336,6 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) - commonmarker (2.10.0) - rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -509,9 +507,6 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) - rake-compiler-dock (1.12.0) - rb_sys (0.9.130) - rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -705,9 +700,6 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.17.0) - rb_sys (>= 0.9.130, < 0.10) - sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.17.0-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.17.0-arm64-darwin) @@ -866,7 +858,7 @@ CHECKSUMS benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd binary-merge (7.1.9) - bundler (4.1.0.beta1) + bundler (4.1.0.beta1) sha256=8a2dac8ca276ff4eff5efc2c6457b0044080fc1e431534ad7c5cc6187232b800 bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 @@ -875,7 +867,6 @@ CHECKSUMS colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 - commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e @@ -960,8 +951,6 @@ CHECKSUMS racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 - rake-compiler-dock (1.12.0) - rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 @@ -1031,7 +1020,6 @@ CHECKSUMS toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.9) - tree_sitter_language_pack (1.17.0) tree_sitter_language_pack (1.17.0-aarch64-linux) tree_sitter_language_pack (1.17.0-arm64-darwin) tree_sitter_language_pack (1.17.0-x86_64-darwin) diff --git a/gems/dotenv-merge/Gemfile.lock b/gems/dotenv-merge/Gemfile.lock index 54a601316..dab37be9e 100644 --- a/gems/dotenv-merge/Gemfile.lock +++ b/gems/dotenv-merge/Gemfile.lock @@ -136,8 +136,8 @@ PATH commonmarker-merge (~> 7.1, >= 7.1.8) dotenv-merge (~> 7.1, >= 7.1.8) json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) + kettle-changelog (~> 1.0, >= 1.0.7) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.13) kettle-rb (~> 0.1, >= 0.1.11) @@ -253,7 +253,7 @@ PATH go-merge (= 7.1.9) html-merge (= 7.1.9) json-merge (= 7.1.9) - kettle-jem (~> 7.1, >= 7.1.18) + kettle-jem (~> 7.1, >= 7.1.26) markdown-merge (= 7.1.9) plain-merge (= 7.1.9) prism-merge (= 7.1.9) @@ -336,8 +336,6 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) - commonmarker (2.10.0) - rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -509,9 +507,6 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) - rake-compiler-dock (1.12.0) - rb_sys (0.9.130) - rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -705,9 +700,6 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.17.0) - rb_sys (>= 0.9.130, < 0.10) - sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.17.0-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.17.0-arm64-darwin) @@ -866,7 +858,7 @@ CHECKSUMS benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd binary-merge (7.1.9) - bundler (4.1.0.beta1) + bundler (4.1.0.beta1) sha256=8a2dac8ca276ff4eff5efc2c6457b0044080fc1e431534ad7c5cc6187232b800 bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 @@ -875,7 +867,6 @@ CHECKSUMS colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 - commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e @@ -960,8 +951,6 @@ CHECKSUMS racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 - rake-compiler-dock (1.12.0) - rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 @@ -1031,7 +1020,6 @@ CHECKSUMS toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.9) - tree_sitter_language_pack (1.17.0) tree_sitter_language_pack (1.17.0-aarch64-linux) tree_sitter_language_pack (1.17.0-arm64-darwin) tree_sitter_language_pack (1.17.0-x86_64-darwin) diff --git a/gems/go-merge/Gemfile.lock b/gems/go-merge/Gemfile.lock index 3615ac478..916d186ca 100644 --- a/gems/go-merge/Gemfile.lock +++ b/gems/go-merge/Gemfile.lock @@ -136,8 +136,8 @@ PATH commonmarker-merge (~> 7.1, >= 7.1.8) dotenv-merge (~> 7.1, >= 7.1.8) json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) + kettle-changelog (~> 1.0, >= 1.0.7) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.13) kettle-rb (~> 0.1, >= 0.1.11) @@ -253,7 +253,7 @@ PATH go-merge (= 7.1.9) html-merge (= 7.1.9) json-merge (= 7.1.9) - kettle-jem (~> 7.1, >= 7.1.18) + kettle-jem (~> 7.1, >= 7.1.26) markdown-merge (= 7.1.9) plain-merge (= 7.1.9) prism-merge (= 7.1.9) @@ -336,8 +336,6 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) - commonmarker (2.10.0) - rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -509,9 +507,6 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) - rake-compiler-dock (1.12.0) - rb_sys (0.9.130) - rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -705,9 +700,6 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.16.2) - rb_sys (>= 0.9.130, < 0.10) - sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -866,7 +858,7 @@ CHECKSUMS benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd binary-merge (7.1.9) - bundler (4.1.0.beta1) + bundler (4.1.0.beta1) sha256=8a2dac8ca276ff4eff5efc2c6457b0044080fc1e431534ad7c5cc6187232b800 bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 @@ -875,7 +867,6 @@ CHECKSUMS colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 - commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e @@ -960,8 +951,6 @@ CHECKSUMS racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 - rake-compiler-dock (1.12.0) - rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 @@ -1031,7 +1020,6 @@ CHECKSUMS toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.9) - tree_sitter_language_pack (1.16.2) tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 diff --git a/gems/html-merge/Gemfile.lock b/gems/html-merge/Gemfile.lock index f6f8b7048..1ea379ea6 100644 --- a/gems/html-merge/Gemfile.lock +++ b/gems/html-merge/Gemfile.lock @@ -136,8 +136,8 @@ PATH commonmarker-merge (~> 7.1, >= 7.1.8) dotenv-merge (~> 7.1, >= 7.1.8) json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) + kettle-changelog (~> 1.0, >= 1.0.7) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.13) kettle-rb (~> 0.1, >= 0.1.11) @@ -253,7 +253,7 @@ PATH go-merge (= 7.1.9) html-merge (= 7.1.9) json-merge (= 7.1.9) - kettle-jem (~> 7.1, >= 7.1.18) + kettle-jem (~> 7.1, >= 7.1.26) markdown-merge (= 7.1.9) plain-merge (= 7.1.9) prism-merge (= 7.1.9) @@ -336,8 +336,6 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) - commonmarker (2.10.0) - rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -509,9 +507,6 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) - rake-compiler-dock (1.12.0) - rb_sys (0.9.130) - rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -705,9 +700,6 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.17.0) - rb_sys (>= 0.9.130, < 0.10) - sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.17.0-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.17.0-arm64-darwin) @@ -866,7 +858,7 @@ CHECKSUMS benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd binary-merge (7.1.9) - bundler (4.1.0.beta1) + bundler (4.1.0.beta1) sha256=8a2dac8ca276ff4eff5efc2c6457b0044080fc1e431534ad7c5cc6187232b800 bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 @@ -875,7 +867,6 @@ CHECKSUMS colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 - commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e @@ -960,8 +951,6 @@ CHECKSUMS racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 - rake-compiler-dock (1.12.0) - rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 @@ -1031,7 +1020,6 @@ CHECKSUMS toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.9) - tree_sitter_language_pack (1.17.0) tree_sitter_language_pack (1.17.0-aarch64-linux) tree_sitter_language_pack (1.17.0-arm64-darwin) tree_sitter_language_pack (1.17.0-x86_64-darwin) diff --git a/gems/json-merge/Gemfile.lock b/gems/json-merge/Gemfile.lock index eb0300f7b..10284a666 100644 --- a/gems/json-merge/Gemfile.lock +++ b/gems/json-merge/Gemfile.lock @@ -136,8 +136,8 @@ PATH commonmarker-merge (~> 7.1, >= 7.1.8) dotenv-merge (~> 7.1, >= 7.1.8) json-merge (~> 7.1, >= 7.1.8) - kettle-changelog (~> 1.0, >= 1.0.6) - kettle-dev (>= 3.0.17, < 4.0.0) + kettle-changelog (~> 1.0, >= 1.0.7) + kettle-dev (~> 3.0, >= 3.0.34) kettle-gha-pins (~> 0.3, >= 0.3.14) kettle-ndjson (~> 0.1, >= 0.1.13) kettle-rb (~> 0.1, >= 0.1.11) @@ -253,7 +253,7 @@ PATH go-merge (= 7.1.9) html-merge (= 7.1.9) json-merge (= 7.1.9) - kettle-jem (~> 7.1, >= 7.1.18) + kettle-jem (~> 7.1, >= 7.1.26) markdown-merge (= 7.1.9) plain-merge (= 7.1.9) prism-merge (= 7.1.9) @@ -336,8 +336,6 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) - commonmarker (2.10.0) - rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -509,9 +507,6 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) - rake-compiler-dock (1.12.0) - rb_sys (0.9.130) - rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -705,9 +700,6 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.16.2) - rb_sys (>= 0.9.130, < 0.10) - sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.16.2-arm64-darwin) @@ -866,7 +858,7 @@ CHECKSUMS benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd binary-merge (7.1.9) - bundler (4.1.0.beta1) + bundler (4.1.0.beta1) sha256=8a2dac8ca276ff4eff5efc2c6457b0044080fc1e431534ad7c5cc6187232b800 bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 @@ -875,7 +867,6 @@ CHECKSUMS colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 - commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e @@ -960,8 +951,6 @@ CHECKSUMS racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 - rake-compiler-dock (1.12.0) - rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 @@ -1031,7 +1020,6 @@ CHECKSUMS toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.9) - tree_sitter_language_pack (1.16.2) tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652 tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6 tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6 diff --git a/gems/kettle-jem/CHANGELOG.md b/gems/kettle-jem/CHANGELOG.md index 900b6cbee..49fd6ac82 100644 --- a/gems/kettle-jem/CHANGELOG.md +++ b/gems/kettle-jem/CHANGELOG.md @@ -20,6 +20,25 @@ Please file a bug if you notice a violation of semantic versioning. ### Added +### Changed + +### Deprecated + +### Removed + +### Fixed + +### Security + +## [7.1.26] - 2026-09-10 + +- TAG: [v7.1.26][7.1.26t] +- COVERAGE: 93.67% -- 11268/12030 lines in 16 files +- BRANCH COVERAGE: 77.10% -- 4794/6218 branches in 16 files +- 18.11% documented + +### Added + - Curated Bundler binstub generation now includes `rubocop-gradual`. ### Changed @@ -36,10 +55,6 @@ Please file a bug if you notice a violation of semantic versioning. - dependencies (3) - other (1) -### Deprecated - -### Removed - ### Fixed - [kc] kettle-jem/template-file-tracking: Track distinct changed template files across repeated Unreleased template runs. @@ -52,8 +67,6 @@ Please file a bug if you notice a violation of semantic versioning. - Preserve declared kettle-dev requirements when local coverage and templating Gemfiles replace it with a workspace path. -### Security - ## [7.1.25] - 2026-09-08 - TAG: [v7.1.25][7.1.25t] @@ -2006,7 +2019,9 @@ Please file a bug if you notice a violation of semantic versioning. - Released kettle-jem as part of the initial StructuredMerge Ruby 7.0.0 gem set. - Included packaged templates and parser-backed merge support for Ruby gem templating. -[Unreleased]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.25...HEAD +[Unreleased]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.26...HEAD +[7.1.26]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.25...v7.1.26 +[7.1.26t]: https://github.com/structuredmerge/structuredmerge-ruby/releases/tag/v7.1.26 [7.1.25]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.24...v7.1.25 [7.1.25t]: https://github.com/structuredmerge/structuredmerge-ruby/releases/tag/v7.1.25 [7.1.24]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.23...v7.1.24 diff --git a/gems/kettle-jem/Gemfile.lock b/gems/kettle-jem/Gemfile.lock index b98a3f9eb..8c023203f 100644 --- a/gems/kettle-jem/Gemfile.lock +++ b/gems/kettle-jem/Gemfile.lock @@ -253,7 +253,7 @@ PATH go-merge (= 7.1.9) html-merge (= 7.1.9) json-merge (= 7.1.9) - kettle-jem (~> 7.1, >= 7.1.18) + kettle-jem (~> 7.1, >= 7.1.26) markdown-merge (= 7.1.9) plain-merge (= 7.1.9) prism-merge (= 7.1.9) @@ -336,8 +336,6 @@ GEM command_kit-completion (0.3.0) command_kit (~> 0.1) completely (~> 0.6) - commonmarker (2.10.0) - rb_sys (~> 0.9) commonmarker (2.10.0-aarch64-linux) commonmarker (2.10.0-aarch64-linux-musl) commonmarker (2.10.0-arm64-darwin) @@ -467,15 +465,11 @@ GEM lint_roller (1.1.0) logger (1.7.0) markly (0.19.0) - mini_portile2 (2.8.9) mister_bin (0.9.0) colsole (~> 1.0.0) docopt_ng (~> 0.7.1) reline (~> 0.6) mutex_m (0.3.0) - nokogiri (1.19.4) - mini_portile2 (~> 2.8.2) - racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) nokogiri (1.19.4-aarch64-linux-musl) @@ -509,9 +503,6 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) - rake-compiler-dock (1.12.0) - rb_sys (0.9.130) - rake-compiler-dock (= 1.12.0) rbs (4.2.0) logger prism (>= 1.6.0) @@ -705,9 +696,6 @@ GEM toml-rb (4.2.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.17.0) - rb_sys (>= 0.9.130, < 0.10) - sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.17.0-aarch64-linux) sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.17.0-arm64-darwin) @@ -765,6 +753,7 @@ PLATFORMS aarch64-linux-musl arm64-darwin x86_64-darwin + x86_64-linux x86_64-linux-gnu x86_64-linux-musl @@ -863,7 +852,7 @@ CHECKSUMS benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd binary-merge (7.1.9) - bundler (4.1.0.beta1) sha256=8a2dac8ca276ff4eff5efc2c6457b0044080fc1e431534ad7c5cc6187232b800 + bundler (4.0.17) sha256=214e21431b5665dd2f99df8a5511c6b151d7a72e8015c8b38f8b775b61cbb6c1 bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 @@ -872,7 +861,6 @@ CHECKSUMS colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02 command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90 command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737 - commonmarker (2.10.0) commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478 commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25 commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e @@ -908,15 +896,15 @@ CHECKSUMS irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a json-merge (7.1.9) - kettle-changelog (1.0.7) - kettle-dev (3.0.34) - kettle-drift (1.0.13) + kettle-changelog (1.0.7) sha256=42b9307e46e1e551434e8054ca4f467e8b13b69bd65e5dea4544b279179a50ff + kettle-dev (3.0.34) sha256=3e49c743fea5ed564cd3e7517b6ce2998dac289123747f61090618956c567af5 + kettle-drift (1.0.13) sha256=bb39982c637ecc6cdc56276cbd7679cb071317bb601dcd40c122997543643ed6 kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80 kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21 kettle-jem (7.1.26) kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4 - kettle-soup-cover (3.0.10) + kettle-soup-cover (3.0.10) sha256=579e09d382d5c46b2a4787df492fdf598c774545d4ab1b7bd8cfaf6104424edd kettle-test (2.0.21) sha256=2ab0dd1a1d11568f8fba61084ebef84717cd4dff028a527777c92d4e77f0e9c5 kettle-wash (0.1.6) sha256=934dfb955f41b89540fe5df87614cf718a73ebc1696de7c50e7940a4695753ed kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa @@ -928,10 +916,8 @@ CHECKSUMS markdown-merge (7.1.9) markly (0.19.0) sha256=cd2c0e86eaf3660ed2a3a94104877f8bd41adda78e7c295c017d03de0d4044ca markly-merge (7.1.9) - mini_portile2 (2.8.9) sha256=0cd7c7f824e010c072e33f68bc02d85a00aeb6fce05bb4819c03dfd3c140c289 mister_bin (0.9.0) sha256=624fe401db4faf1978e84c17e0b320827697a13a6cba4fe656001269079be7d3 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 - nokogiri (1.19.4) sha256=50c951611c92bca05c51411aef45f1cbc50f2821c4802758c5c6d34696533ab5 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af nokogiri (1.19.4-arm64-darwin) sha256=a46db9853286e6597b36ebc6953817d15acf3a299583eb3f89fdc6f91dd63527 @@ -957,8 +943,6 @@ CHECKSUMS racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 - rake-compiler-dock (1.12.0) - rb_sys (0.9.130) rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 rbs-merge (7.1.9) rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192 @@ -1024,11 +1008,10 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87 - toml (0.3.0) + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.9) toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb tree_haver (7.1.9) - tree_sitter_language_pack (1.17.0) tree_sitter_language_pack (1.17.0-aarch64-linux) sha256=0f9f10371105573903d277f4239d49798d9e01eb961b009b558399edc0c71c0a tree_sitter_language_pack (1.17.0-arm64-darwin) sha256=25b2d7ba9ab0a53b842263e47ab1b2ab72b1d046a9fc2d60fea66dbf7fcaf875 tree_sitter_language_pack (1.17.0-x86_64-darwin) sha256=8f92864fe368752c9bf99ed34d8edb06bb45f1826fa144f9956f05c6806c56e2 @@ -1056,4 +1039,4 @@ CHECKSUMS zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH - 4.1.0.beta1 + 4.0.17 diff --git a/gems/kettle-jem/README.md b/gems/kettle-jem/README.md index b34a91ff3..35b45c496 100644 --- a/gems/kettle-jem/README.md +++ b/gems/kettle-jem/README.md @@ -907,7 +907,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-12.010-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue +[🧮kloc-img]: https://img.shields.io/badge/KLOC-12.030-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue [🔐security]: https://github.com/structuredmerge/structuredmerge-ruby/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 diff --git a/gems/kettle-jem/docs/Kettle.html b/gems/kettle-jem/docs/Kettle.html index d53919755..210c1b557 100644 --- a/gems/kettle-jem/docs/Kettle.html +++ b/gems/kettle-jem/docs/Kettle.html @@ -110,7 +110,7 @@

Defined Under Namespace

diff --git a/gems/kettle-jem/docs/Kettle/Jem.html b/gems/kettle-jem/docs/Kettle/Jem.html index a562af1d1..cc7341569 100644 --- a/gems/kettle-jem/docs/Kettle/Jem.html +++ b/gems/kettle-jem/docs/Kettle/Jem.html @@ -198,7 +198,7 @@ 

[
   {name: "nomono", requirements: ["~> 1.1", ">= 1.1.5"], bootstrap: true},
-  {name: "kettle-dev", requirements: ["~> 3.0", ">= 3.0.33"], bootstrap: true},
+  {name: "kettle-dev", requirements: ["~> 3.0", ">= 3.0.34"], bootstrap: true},
   {
     name: "kettle-changelog",
     requirements: ["~> 1.0", ">= 1.0.7"],
@@ -30157,15 +30157,15 @@ 

       
 
 
-18829
-18830
-18831
-18832
-18833
-18834

+18862
+18863
+18864
+18865
+18866
+18867
- 
# File 'lib/kettle/jem.rb', line 18829
+      
# File 'lib/kettle/jem.rb', line 18862
 
 def active_license_basenames(config)
   Array(config["resolved_licenses"])
@@ -30193,20 +30193,20 @@ 

       
 
 
-4932
-4933
-4934
-4935
-4936
-4937
-4938
-4939
-4940
-4941
-4942

+4961
+4962
+4963
+4964
+4965
+4966
+4967
+4968
+4969
+4970
+4971

     
     
-      
# File 'lib/kettle/jem.rb', line 4932
+      
# File 'lib/kettle/jem.rb', line 4961
 
 def actual_changed_files_after_apply(project_root, changed_files, before_apply_files)
   changed_files.filter_map do |relative_path|
@@ -30239,12 +30239,12 @@ 

       
 
 
-9317
-9318
-9319

+9348
+9349
+9350

     
     
-      
# File 'lib/kettle/jem.rb', line 9317
+      
# File 'lib/kettle/jem.rb', line 9348
 
 def adapter_failure_template_source_error(file_type, recipe)
   ArgumentError.new("failed to merge #{file_type} template #{recipe.fetch(:target_path)}: provider adapter failure")
@@ -30269,37 +30269,37 @@ 

       
 
 
-9779
-9780
-9781
-9782
-9783
-9784
-9785
-9786
-9787
-9788
-9789
-9790
-9791
-9792
-9793
-9794
-9795
-9796
-9797
-9798
-9799
-9800
-9801
-9802
-9803
-9804
-9805
-9806

+9810
+9811
+9812
+9813
+9814
+9815
+9816
+9817
+9818
+9819
+9820
+9821
+9822
+9823
+9824
+9825
+9826
+9827
+9828
+9829
+9830
+9831
+9832
+9833
+9834
+9835
+9836
+9837

     
     
-      
# File 'lib/kettle/jem.rb', line 9779
+      
# File 'lib/kettle/jem.rb', line 9810
 
 def add_dependency_conflict_review_list(content, conflicts)
   lines = content.to_s.lines
@@ -30349,25 +30349,25 @@ 

       
 
 
-9216
-9217
-9218
-9219
-9220
-9221
-9222
-9223
-9224
-9225
-9226
-9227
-9228
-9229
-9230
-9231

+9247
+9248
+9249
+9250
+9251
+9252
+9253
+9254
+9255
+9256
+9257
+9258
+9259
+9260
+9261
+9262

     
     
-      
# File 'lib/kettle/jem.rb', line 9216
+      
# File 'lib/kettle/jem.rb', line 9247
 
 def add_framework_matrix_job_env(content, keys)
   lines = content.lines
@@ -30405,20 +30405,20 @@ 

       
 
 
-13045
-13046
-13047
-13048
-13049
-13050
-13051
-13052
-13053
-13054
-13055

+13076
+13077
+13078
+13079
+13080
+13081
+13082
+13083
+13084
+13085
+13086

     
     
-      
# File 'lib/kettle/jem.rb', line 13045
+      
# File 'lib/kettle/jem.rb', line 13076
 
 def add_monorepo_root_file_overrides(content)
   override_lines = MONOREPO_ROOT_TEMPLATE_ENTRIES.reject { |entry| entry.to_s.include?("/") }.flat_map do |entry|
@@ -30451,30 +30451,30 @@ 

       
 
 
-13152
-13153
-13154
-13155
-13156
-13157
-13158
-13159
-13160
-13161
-13162
-13163
-13164
-13165
-13166
-13167
-13168
-13169
-13170
-13171
-13172

+13183
+13184
+13185
+13186
+13187
+13188
+13189
+13190
+13191
+13192
+13193
+13194
+13195
+13196
+13197
+13198
+13199
+13200
+13201
+13202
+13203

     
     
-      
# File 'lib/kettle/jem.rb', line 13152
+      
# File 'lib/kettle/jem.rb', line 13183
 
 def add_monorepo_subgem_file_overrides(content, gemspec_path, profile = MONOREPO_SUBGEM_TEMPLATE_PROFILE)
   override_lines = [
@@ -30517,31 +30517,31 @@ 

       
 
 
-12960
-12961
-12962
-12963
-12964
-12965
-12966
-12967
-12968
-12969
-12970
-12971
-12972
-12973
-12974
-12975
-12976
-12977
-12978
-12979
-12980
-12981

+12991
+12992
+12993
+12994
+12995
+12996
+12997
+12998
+12999
+13000
+13001
+13002
+13003
+13004
+13005
+13006
+13007
+13008
+13009
+13010
+13011
+13012

     
     
-      
# File 'lib/kettle/jem.rb', line 12960
+      
# File 'lib/kettle/jem.rb', line 12991
 
 def add_shim_bootstrap_config(content, shim)
   replacement_gem = shim[:replacement_gem].to_s
@@ -30585,23 +30585,23 @@ 

       
 
 
-13192
-13193
-13194
-13195
-13196
-13197
-13198
-13199
-13200
-13201
-13202
-13203
-13204
-13205

+13223
+13224
+13225
+13226
+13227
+13228
+13229
+13230
+13231
+13232
+13233
+13234
+13235
+13236

     
     
-      
# File 'lib/kettle/jem.rb', line 13192
+      
# File 'lib/kettle/jem.rb', line 13223
 
 def add_shim_file_overrides(content, gemspec_path)
   override_lines = shim_template_entries_for_config(gemspec_path, {}).flat_map do |entry|
@@ -30637,16 +30637,16 @@ 

       
 
 
-18312
-18313
-18314
-18315
-18316
-18317
-18318

+18344
+18345
+18346
+18347
+18348
+18349
+18350

     
     
-      
# File 'lib/kettle/jem.rb', line 18312
+      
# File 'lib/kettle/jem.rb', line 18344
 
 def aliased_readme_destination_section(template_base, destination_lookup, preserve_config)
   aliases = preserve_config[:aliases] || README_SECTION_ALIASES
@@ -30675,14 +30675,14 @@ 

       
 
 
-9565
-9566
-9567
-9568
-9569

+9596
+9597
+9598
+9599
+9600

     
     
-      
# File 'lib/kettle/jem.rb', line 9565
+      
# File 'lib/kettle/jem.rb', line 9596
 
 def append_gemfile_comment_block(lines, block)
   first_line = block.first
@@ -30709,23 +30709,23 @@ 

       
 
 
-19901
-19902
-19903
-19904
-19905
-19906
-19907
-19908
-19909
-19910
-19911
-19912
-19913
-19914

+19937
+19938
+19939
+19940
+19941
+19942
+19943
+19944
+19945
+19946
+19947
+19948
+19949
+19950

     
     
-      
# File 'lib/kettle/jem.rb', line 19901
+      
# File 'lib/kettle/jem.rb', line 19937
 
 def append_github_actions_coverage_steps(content, disabled_integrations: [])
   return content if content.include?("Upload coverage to Coveralls") ||
@@ -30761,23 +30761,23 @@ 

 
 
-12148
-12149
-12150
-12151
-12152
-12153
-12154
-12155
-12156
-12157
-12158
-12159
-12160
-12161

+12179
+12180
+12181
+12182
+12183
+12184
+12185
+12186
+12187
+12188
+12189
+12190
+12191
+12192

     
     
-      
# File 'lib/kettle/jem.rb', line 12148
+      
# File 'lib/kettle/jem.rb', line 12179
 
 def append_missing_gemspec_dependency_lines(content, destination_dependencies, receiver:)
   existing_keys = gemspec_dependency_line_index(content, receiver: receiver).keys
@@ -30813,22 +30813,22 @@ 

 
 
-7746
-7747
-7748
-7749
-7750
-7751
-7752
-7753
-7754
-7755
-7756
-7757
-7758

+7777
+7778
+7779
+7780
+7781
+7782
+7783
+7784
+7785
+7786
+7787
+7788
+7789

     
     
-      
# File 'lib/kettle/jem.rb', line 7746
+      
# File 'lib/kettle/jem.rb', line 7777
 
 def append_missing_markdown_link_definitions(content, definitions)
   ensure_runtime_dependencies!
@@ -30863,23 +30863,23 @@ 

       
 
 
-7760
-7761
-7762
-7763
-7764
-7765
-7766
-7767
-7768
-7769
-7770
-7771
-7772
-7773

+7791
+7792
+7793
+7794
+7795
+7796
+7797
+7798
+7799
+7800
+7801
+7802
+7803
+7804

     
     
-      
# File 'lib/kettle/jem.rb', line 7760
+      
# File 'lib/kettle/jem.rb', line 7791
 
 def append_used_markdown_link_definitions(content, definition_source)
   owners = ReadmePostProcessor.markdown_structural_owners(content, :link_definitions, :inline_references)
@@ -30915,16 +30915,16 @@ 

       
 
 
-6570
-6571
-6572
-6573
-6574
-6575
-6576

+6601
+6602
+6603
+6604
+6605
+6606
+6607

     
     
-      
# File 'lib/kettle/jem.rb', line 6570
+      
# File 'lib/kettle/jem.rb', line 6601
 
 def apply_changelog_transfer_entries(content, entries, excluded_keys: [])
   Kettle::Changelog::TransferMerger.apply(
@@ -30953,29 +30953,29 @@ 

       
 
 
-4108
-4109
-4110
-4111
-4112
-4113
-4114
-4115
-4116
-4117
-4118
-4119
-4120
-4121
-4122
-4123
-4124
-4125
-4126
-4127

+4137
+4138
+4139
+4140
+4141
+4142
+4143
+4144
+4145
+4146
+4147
+4148
+4149
+4150
+4151
+4152
+4153
+4154
+4155
+4156

     
     
-      
# File 'lib/kettle/jem.rb', line 4108
+      
# File 'lib/kettle/jem.rb', line 4137
 
 def apply_checksum_skips(project_root, recipe_reports, checksum_mode:, template_lock:)
   return recipe_reports if checksum_mode.off?
@@ -31017,46 +31017,46 @@ 

       
 
 
-9527
-9528
-9529
-9530
-9531
-9532
-9533
-9534
-9535
-9536
-9537
-9538
-9539
-9540
-9541
-9542
-9543
-9544
-9545
-9546
-9547
-9548
-9549
-9550
-9551
-9552
-9553
-9554
-9555
-9556
-9557
 9558
 9559
 9560
 9561
 9562
-9563

+9563
+9564
+9565
+9566
+9567
+9568
+9569
+9570
+9571
+9572
+9573
+9574
+9575
+9576
+9577
+9578
+9579
+9580
+9581
+9582
+9583
+9584
+9585
+9586
+9587
+9588
+9589
+9590
+9591
+9592
+9593
+9594

     
     
-      
# File 'lib/kettle/jem.rb', line 9527
+      
# File 'lib/kettle/jem.rb', line 9558
 
 def apply_commented_gem_dependency_policy(template_content, content)
   commented_blocks = commented_gem_dependency_blocks(template_content)
@@ -31115,22 +31115,22 @@ 

       
 
 
-10954
-10955
-10956
-10957
-10958
-10959
-10960
-10961
-10962
-10963
-10964
-10965
-10966

+10985
+10986
+10987
+10988
+10989
+10990
+10991
+10992
+10993
+10994
+10995
+10996
+10997

     
     
-      
# File 'lib/kettle/jem.rb', line 10954
+      
# File 'lib/kettle/jem.rb', line 10985
 
 def apply_configured_gemspec_licenses(content, facts, receiver:)
   licenses = Array(facts&.dig(:license, :spdx)).map { |license| license.to_s.strip }.reject(&:empty?)
@@ -31165,15 +31165,15 @@ 

       
 
 
-10997
-10998
-10999
-11000
-11001
-11002

+11028
+11029
+11030
+11031
+11032
+11033

     
     
-      
# File 'lib/kettle/jem.rb', line 10997
+      
# File 'lib/kettle/jem.rb', line 11028
 
 def apply_configured_gemspec_metadata(content, facts, receiver:)
   mailing_list_uri = facts.to_h.dig(:rubyforum, :url).to_s
@@ -31201,29 +31201,29 @@ 

 
 
-10968
-10969
-10970
-10971
-10972
-10973
-10974
-10975
-10976
-10977
-10978
-10979
-10980
-10981
-10982
-10983
-10984
-10985
-10986
-10987

+10999
+11000
+11001
+11002
+11003
+11004
+11005
+11006
+11007
+11008
+11009
+11010
+11011
+11012
+11013
+11014
+11015
+11016
+11017
+11018

     
     
-      
# File 'lib/kettle/jem.rb', line 10968
+      
# File 'lib/kettle/jem.rb', line 10999
 
 def apply_configured_gemspec_required_ruby_version(content, facts, receiver:)
   return remove_gemspec_assignment(content, receiver: receiver, field: "required_ruby_version") if explicit_zero_runtime_floor?(facts)
@@ -31265,30 +31265,30 @@ 

 
 
-9135
-9136
-9137
-9138
-9139
-9140
-9141
-9142
-9143
-9144
-9145
-9146
-9147
-9148
-9149
-9150
-9151
-9152
-9153
-9154
-9155

+9166
+9167
+9168
+9169
+9170
+9171
+9172
+9173
+9174
+9175
+9176
+9177
+9178
+9179
+9180
+9181
+9182
+9183
+9184
+9185
+9186

     
     
-      
# File 'lib/kettle/jem.rb', line 9135
+      
# File 'lib/kettle/jem.rb', line 9166
 
 def apply_github_actions_engine_exec_cmd_overrides(content, facts)
   overrides = facts.to_h.dig(:ci, :engine_exec_cmds).to_h
@@ -31331,21 +31331,21 @@ 

       
 
 
-12461
-12462
-12463
-12464
-12465
-12466
-12467
-12468
-12469
-12470
-12471
-12472

+12492
+12493
+12494
+12495
+12496
+12497
+12498
+12499
+12500
+12501
+12502
+12503

     
     
-      
# File 'lib/kettle/jem.rb', line 12461
+      
# File 'lib/kettle/jem.rb', line 12492
 
 def apply_kettle_config_bootstrap(project_root, recipe, env: ENV, template_contents: nil)
   content = recipe_template_content(project_root, recipe, template_contents: template_contents)
@@ -31402,18 +31402,18 @@ 

       
 
 
-12922
-12923
-12924
-12925
-12926
-12927
-12928
-12929
-12930

+12953
+12954
+12955
+12956
+12957
+12958
+12959
+12960
+12961

     
     
-      
# File 'lib/kettle/jem.rb', line 12922
+      
# File 'lib/kettle/jem.rb', line 12953
 
 def apply_kettle_config_bootstrap_profile(content, profile, gemspec_path)
   return content if profile.to_s.empty?
@@ -31444,30 +31444,30 @@ 

       
 
 
-7659
-7660
-7661
-7662
-7663
-7664
-7665
-7666
-7667
-7668
-7669
-7670
-7671
-7672
-7673
-7674
-7675
-7676
-7677
-7678
-7679

+7690
+7691
+7692
+7693
+7694
+7695
+7696
+7697
+7698
+7699
+7700
+7701
+7702
+7703
+7704
+7705
+7706
+7707
+7708
+7709
+7710

     
     
-      
# File 'lib/kettle/jem.rb', line 7659
+      
# File 'lib/kettle/jem.rb', line 7690
 
 def apply_markdown_conditional_block(content, name, keep:)
   ensure_runtime_dependencies!
@@ -31510,29 +31510,29 @@ 

 
 
-9808
-9809
-9810
-9811
-9812
-9813
-9814
-9815
-9816
-9817
-9818
-9819
-9820
-9821
-9822
-9823
-9824
-9825
-9826
-9827

+9839
+9840
+9841
+9842
+9843
+9844
+9845
+9846
+9847
+9848
+9849
+9850
+9851
+9852
+9853
+9854
+9855
+9856
+9857
+9858

     
     
-      
# File 'lib/kettle/jem.rb', line 9808
+      
# File 'lib/kettle/jem.rb', line 9839
 
 def apply_modular_dependency_conflict_resolutions(project_root, decisions)
   decisions.each_with_object([]) do |decision, changed_files|
@@ -31574,33 +31574,33 @@ 

       
 
 
-12983
-12984
-12985
-12986
-12987
-12988
-12989
-12990
-12991
-12992
-12993
-12994
-12995
-12996
-12997
-12998
-12999
-13000
-13001
-13002
-13003
-13004
-13005
-13006

+13014
+13015
+13016
+13017
+13018
+13019
+13020
+13021
+13022
+13023
+13024
+13025
+13026
+13027
+13028
+13029
+13030
+13031
+13032
+13033
+13034
+13035
+13036
+13037

     
     
-      
# File 'lib/kettle/jem.rb', line 12983
+      
# File 'lib/kettle/jem.rb', line 13014
 
 def apply_monorepo_root_template_profile(content)
   entry_lines = MONOREPO_ROOT_TEMPLATE_ENTRIES.map { |entry| "    - #{entry}" }
@@ -31646,20 +31646,20 @@ 

       
 
 
-7681
-7682
-7683
-7684
-7685
-7686
-7687
-7688
-7689
-7690
-7691

+7712
+7713
+7714
+7715
+7716
+7717
+7718
+7719
+7720
+7721
+7722

     
     
-      
# File 'lib/kettle/jem.rb', line 7681
+      
# File 'lib/kettle/jem.rb', line 7712
 
 def apply_monorepo_subgem_readme_recipe(content, facts)
   return content unless monorepo_subgem_template_profile?(facts)
@@ -31692,45 +31692,45 @@ 

       
 
 
-13008
-13009
-13010
-13011
-13012
-13013
-13014
-13015
-13016
-13017
-13018
-13019
-13020
-13021
-13022
-13023
-13024
-13025
-13026
-13027
-13028
-13029
-13030
-13031
-13032
-13033
-13034
-13035
-13036
-13037
-13038
 13039
 13040
 13041
 13042
-13043

+13043
+13044
+13045
+13046
+13047
+13048
+13049
+13050
+13051
+13052
+13053
+13054
+13055
+13056
+13057
+13058
+13059
+13060
+13061
+13062
+13063
+13064
+13065
+13066
+13067
+13068
+13069
+13070
+13071
+13072
+13073
+13074

     
     
-      
# File 'lib/kettle/jem.rb', line 13008
+      
# File 'lib/kettle/jem.rb', line 13039
 
 def apply_monorepo_subgem_template_profile(content, gemspec_path, profile = MONOREPO_SUBGEM_TEMPLATE_PROFILE)
   entries = monorepo_subgem_template_entries(gemspec_path, profile)
@@ -31788,33 +31788,33 @@ 

 
 
-7693
-7694
-7695
-7696
-7697
-7698
-7699
-7700
-7701
-7702
-7703
-7704
-7705
-7706
-7707
-7708
-7709
-7710
-7711
-7712
-7713
-7714
-7715
-7716

+7724
+7725
+7726
+7727
+7728
+7729
+7730
+7731
+7732
+7733
+7734
+7735
+7736
+7737
+7738
+7739
+7740
+7741
+7742
+7743
+7744
+7745
+7746
+7747

     
     
-      
# File 'lib/kettle/jem.rb', line 7693
+      
# File 'lib/kettle/jem.rb', line 7724
 
 def apply_monorepo_subgem_thin_readme_projection(content, facts)
   ensure_runtime_dependencies!
@@ -31860,35 +31860,6 @@ 

       
 
 
-4661
-4662
-4663
-4664
-4665
-4666
-4667
-4668
-4669
-4670
-4671
-4672
-4673
-4674
-4675
-4676
-4677
-4678
-4679
-4680
-4681
-4682
-4683
-4684
-4685
-4686
-4687
-4688
-4689
 4690
 4691
 4692
@@ -31912,10 +31883,39 @@ 

 4710
 4711
 4712
-4713

+4713
+4714
+4715
+4716
+4717
+4718
+4719
+4720
+4721
+4722
+4723
+4724
+4725
+4726
+4727
+4728
+4729
+4730
+4731
+4732
+4733
+4734
+4735
+4736
+4737
+4738
+4739
+4740
+4741
+4742

     
     
-      
# File 'lib/kettle/jem.rb', line 4661
+      
# File 'lib/kettle/jem.rb', line 4690
 
 def apply_project(project_root, env: ENV, run_options: {})
   events = event_stream_from_options(run_options)
@@ -31990,37 +31990,6 @@ 

       
 
 
-7590
-7591
-7592
-7593
-7594
-7595
-7596
-7597
-7598
-7599
-7600
-7601
-7602
-7603
-7604
-7605
-7606
-7607
-7608
-7609
-7610
-7611
-7612
-7613
-7614
-7615
-7616
-7617
-7618
-7619
-7620
 7621
 7622
 7623
@@ -32034,10 +32003,41 @@ 

 7631
 7632
 7633
-7634

+7634
+7635
+7636
+7637
+7638
+7639
+7640
+7641
+7642
+7643
+7644
+7645
+7646
+7647
+7648
+7649
+7650
+7651
+7652
+7653
+7654
+7655
+7656
+7657
+7658
+7659
+7660
+7661
+7662
+7663
+7664
+7665

     
     
-      
# File 'lib/kettle/jem.rb', line 7590
+      
# File 'lib/kettle/jem.rb', line 7621
 
 def apply_readme_badge_policy(content, facts)
   processed = with_readme_timing("badge_policy.codetriage") do
@@ -32104,29 +32104,29 @@ 

       
 
 
-7547
-7548
-7549
-7550
-7551
-7552
-7553
-7554
-7555
-7556
-7557
-7558
-7559
-7560
-7561
-7562
-7563
-7564
-7565
-7566

+7578
+7579
+7580
+7581
+7582
+7583
+7584
+7585
+7586
+7587
+7588
+7589
+7590
+7591
+7592
+7593
+7594
+7595
+7596
+7597

     
     
-      
# File 'lib/kettle/jem.rb', line 7547
+      
# File 'lib/kettle/jem.rb', line 7578
 
 def apply_readme_conditional_blocks(content, facts)
   open_collective_enabled = !facts.dig(:funding, :open_collective_disabled)
@@ -32168,18 +32168,18 @@ 

       
 
 
-7489
-7490
-7491
-7492
-7493
-7494
-7495
-7496
-7497

+7520
+7521
+7522
+7523
+7524
+7525
+7526
+7527
+7528

     
     
-      
# File 'lib/kettle/jem.rb', line 7489
+      
# File 'lib/kettle/jem.rb', line 7520
 
 def apply_readme_kloc_badge(content, facts, project_root, destination_content: nil)
   kloc = readme_kloc_from_changelog(project_root, facts.dig(:project_runtime, :version))
@@ -32210,18 +32210,18 @@ 

       
 
 
-5878
-5879
-5880
-5881
-5882
-5883
-5884
-5885
-5886

+5909
+5910
+5911
+5912
+5913
+5914
+5915
+5916
+5917

     
     
-      
# File 'lib/kettle/jem.rb', line 5878
+      
# File 'lib/kettle/jem.rb', line 5909
 
 def apply_readme_style(project_root, env: ENV)
   report = plan_readme_style(project_root, env: env).merge(mode: "apply")
@@ -32252,13 +32252,13 @@ 

       
 
 
-13966
-13967
-13968
-13969

+13997
+13998
+13999
+14000

     
     
-      
# File 'lib/kettle/jem.rb', line 13966
+      
# File 'lib/kettle/jem.rb', line 13997
 
 def apply_recipe_report(project_root, recipe_report)
   intent = write_intent_from_recipe_report(project_root, recipe_report)
@@ -32307,36 +32307,36 @@ 

       
 
 
-12932
-12933
-12934
-12935
-12936
-12937
-12938
-12939
-12940
-12941
-12942
-12943
-12944
-12945
-12946
-12947
-12948
-12949
-12950
-12951
-12952
-12953
-12954
-12955
-12956
-12957
-12958

+12963
+12964
+12965
+12966
+12967
+12968
+12969
+12970
+12971
+12972
+12973
+12974
+12975
+12976
+12977
+12978
+12979
+12980
+12981
+12982
+12983
+12984
+12985
+12986
+12987
+12988
+12989

     
     
-      
# File 'lib/kettle/jem.rb', line 12932
+      
# File 'lib/kettle/jem.rb', line 12963
 
 def apply_shim_template_profile(content, gemspec_path)
   entry_lines = shim_template_entries_for_config(gemspec_path, {}).flat_map do |entry|
@@ -32385,37 +32385,6 @@ 

       
 
 
-7150
-7151
-7152
-7153
-7154
-7155
-7156
-7157
-7158
-7159
-7160
-7161
-7162
-7163
-7164
-7165
-7166
-7167
-7168
-7169
-7170
-7171
-7172
-7173
-7174
-7175
-7176
-7177
-7178
-7179
-7180
 7181
 7182
 7183
@@ -32477,10 +32446,41 @@ 

 7239
 7240
 7241
-7242

+7242
+7243
+7244
+7245
+7246
+7247
+7248
+7249
+7250
+7251
+7252
+7253
+7254
+7255
+7256
+7257
+7258
+7259
+7260
+7261
+7262
+7263
+7264
+7265
+7266
+7267
+7268
+7269
+7270
+7271
+7272
+7273

     
     
-      
# File 'lib/kettle/jem.rb', line 7150
+      
# File 'lib/kettle/jem.rb', line 7181
 
 def apply_template_source(project_root, recipe, original, facts: nil, env: ENV, template_contents: nil)
   strategy = recipe.dig(:template_preference, :strategy).to_s
@@ -32595,17 +32595,17 @@ 

       
 
 
-3118
-3119
-3120
-3121
-3122
-3123
-3124
-3125

+3147
+3148
+3149
+3150
+3151
+3152
+3153
+3154

     
     
-      
# File 'lib/kettle/jem.rb', line 3118
+      
# File 'lib/kettle/jem.rb', line 3147
 
 def appraisal_all_versions_for(resolver:, gem_name:, mode:, requirements: nil, include_versions: nil, exclude_versions: nil)
   base_versions = if mode.to_s == "patch"
@@ -32635,24 +32635,24 @@ 

       
 
 
-2887
-2888
-2889
-2890
-2891
-2892
-2893
-2894
-2895
-2896
-2897
-2898
-2899
-2900
-2901

+2916
+2917
+2918
+2919
+2920
+2921
+2922
+2923
+2924
+2925
+2926
+2927
+2928
+2929
+2930

     
     
-      
# File 'lib/kettle/jem.rb', line 2887
+      
# File 'lib/kettle/jem.rb', line 2916
 
 def appraisal_assign_version_buckets(selected_versions:, seams:, buckets:, bucket_ranges:, all_versions:)
   return [] if selected_versions.empty? || buckets.empty?
@@ -32712,19 +32712,19 @@ 

 
 
-10323
-10324
-10325
-10326
-10327
-10328
-10329
-10330
-10331
-10332

+10354
+10355
+10356
+10357
+10358
+10359
+10360
+10361
+10362
+10363

     
     
-      
# File 'lib/kettle/jem.rb', line 10323
+      
# File 'lib/kettle/jem.rb', line 10354
 
 def appraisal_block_has_matrix_dependency_gemfile?(block, matrix_dependency_gemfiles)
   ruby_call_records(block, :eval_gemfile).any? do |call|
@@ -32756,25 +32756,25 @@ 

       
 
 
-10578
-10579
-10580
-10581
-10582
-10583
-10584
-10585
-10586
-10587
-10588
-10589
-10590
-10591
-10592
-10593

+10609
+10610
+10611
+10612
+10613
+10614
+10615
+10616
+10617
+10618
+10619
+10620
+10621
+10622
+10623
+10624

     
     
-      
# File 'lib/kettle/jem.rb', line 10578
+      
# File 'lib/kettle/jem.rb', line 10609
 
 def appraisal_blocks(content)
   lines = content.to_s.lines
@@ -32812,17 +32812,17 @@ 

       
 
 
-2982
-2983
-2984
-2985
-2986
-2987
-2988
-2989

+3011
+3012
+3013
+3014
+3015
+3016
+3017
+3018

     
     
-      
# File 'lib/kettle/jem.rb', line 2982
+      
# File 'lib/kettle/jem.rb', line 3011
 
 def appraisal_bucket_below(ruby_floor, buckets, bucket_ranges)
   buckets.filter_map do |bucket|
@@ -32852,13 +32852,13 @@ 

       
 
 
-2942
-2943
-2944
-2945

+2971
+2972
+2973
+2974

     
     
-      
# File 'lib/kettle/jem.rb', line 2942
+      
# File 'lib/kettle/jem.rb', line 2971
 
 def appraisal_bucket_sort_key(bucket)
   match = bucket.to_s.match(/\Ar(\d+)(?:\.(\d+))?\z/)
@@ -32884,23 +32884,23 @@ 

       
 
 
-10612
-10613
-10614
-10615
-10616
-10617
-10618
-10619
-10620
-10621
-10622
-10623
-10624
-10625

+10643
+10644
+10645
+10646
+10647
+10648
+10649
+10650
+10651
+10652
+10653
+10654
+10655
+10656

     
     
-      
# File 'lib/kettle/jem.rb', line 10612
+      
# File 'lib/kettle/jem.rb', line 10643
 
 def appraisal_call_records(content)
   lines = content.to_s.lines
@@ -32959,20 +32959,20 @@ 

 
 
-3135
-3136
-3137
-3138
-3139
-3140
-3141
-3142
-3143
-3144
-3145

+3164
+3165
+3166
+3167
+3168
+3169
+3170
+3171
+3172
+3173
+3174

     
     
-      
# File 'lib/kettle/jem.rb', line 3135
+      
# File 'lib/kettle/jem.rb', line 3164
 
 def appraisal_compatible_version_for_bucket?(resolver:, gem_name:, version:, ruby_series:, bucket_ranges:)
   range = bucket_ranges[ruby_series] || bucket_ranges[ruby_series.to_s]
@@ -33005,12 +33005,12 @@ 

       
 
 
-2689
-2690
-2691

+2718
+2719
+2720

     
     
-      
# File 'lib/kettle/jem.rb', line 2689
+      
# File 'lib/kettle/jem.rb', line 2718
 
 def appraisal_eval_gemfile_path(path)
   path.to_s.delete_prefix("gemfiles/")
@@ -33035,15 +33035,15 @@ 

       
 
 
-3069
-3070
-3071
-3072
-3073
-3074

+3098
+3099
+3100
+3101
+3102
+3103

     
     
-      
# File 'lib/kettle/jem.rb', line 3069
+      
# File 'lib/kettle/jem.rb', line 3098
 
 def appraisal_extract_runtime_dependencies(gemspec_content)
   gemspec_dependency_records(gemspec_content)
@@ -33071,28 +33071,28 @@ 

       
 
 
-2669
-2670
-2671
-2672
-2673
-2674
-2675
-2676
-2677
-2678
-2679
-2680
-2681
-2682
-2683
-2684
-2685
-2686
-2687

+2698
+2699
+2700
+2701
+2702
+2703
+2704
+2705
+2706
+2707
+2708
+2709
+2710
+2711
+2712
+2713
+2714
+2715
+2716

     
     
-      
# File 'lib/kettle/jem.rb', line 2669
+      
# File 'lib/kettle/jem.rb', line 2698
 
 def appraisal_file_content(matrix_entries)
   lines = [
@@ -33133,27 +33133,27 @@ 

       
 
 
-2991
-2992
-2993
-2994
-2995
-2996
-2997
-2998
-2999
-3000
-3001
-3002
-3003
-3004
-3005
-3006
-3007
-3008

+3020
+3021
+3022
+3023
+3024
+3025
+3026
+3027
+3028
+3029
+3030
+3031
+3032
+3033
+3034
+3035
+3036
+3037

     
     
-      
# File 'lib/kettle/jem.rb', line 2991
+      
# File 'lib/kettle/jem.rb', line 3020
 
 def appraisal_fill_bucket_gaps(assignments, buckets, bucket_ranges, version_min_rubies, all_versions)
   covered = assignments.map { |assignment| assignment.fetch(:bucket) }
@@ -33193,20 +33193,20 @@ 

       
 
 
-2833
-2834
-2835
-2836
-2837
-2838
-2839
-2840
-2841
-2842
-2843

+2862
+2863
+2864
+2865
+2866
+2867
+2868
+2869
+2870
+2871
+2872

     
     
-      
# File 'lib/kettle/jem.rb', line 2833
+      
# File 'lib/kettle/jem.rb', line 2862
 
 def appraisal_filtered_versions(version_metadata, requirements:)
   requirement = requirements ? Gem::Requirement.new(Array(requirements)) : nil
@@ -33239,16 +33239,16 @@ 

       
 
 
-3127
-3128
-3129
-3130
-3131
-3132
-3133

+3156
+3157
+3158
+3159
+3160
+3161
+3162

     
     
-      
# File 'lib/kettle/jem.rb', line 3127
+      
# File 'lib/kettle/jem.rb', line 3156
 
 def appraisal_finalize_versions(base_versions, include_versions: nil, exclude_versions: nil)
   merged = appraisal_sort_versions(Array(base_versions) + Array(include_versions))
@@ -33277,23 +33277,23 @@ 

       
 
 
-2861
-2862
-2863
-2864
-2865
-2866
-2867
-2868
-2869
-2870
-2871
-2872
-2873
-2874

+2890
+2891
+2892
+2893
+2894
+2895
+2896
+2897
+2898
+2899
+2900
+2901
+2902
+2903

     
     
-      
# File 'lib/kettle/jem.rb', line 2861
+      
# File 'lib/kettle/jem.rb', line 2890
 
 def appraisal_find_ruby_seams(version_metadata)
   minors = appraisal_latest_patch_by_minor(version_metadata)
@@ -33329,12 +33329,12 @@ 

       
 
 
-2628
-2629
-2630

+2657
+2658
+2659

     
     
-      
# File 'lib/kettle/jem.rb', line 2628
+      
# File 'lib/kettle/jem.rb', line 2657
 
 def appraisal_format_version(version)
   version.to_s.tr(".", "-")
@@ -33359,12 +33359,12 @@ 

       
 
 
-2624
-2625
-2626

+2653
+2654
+2655

     
     
-      
# File 'lib/kettle/jem.rb', line 2624
+      
# File 'lib/kettle/jem.rb', line 2653
 
 def appraisal_gem_abbreviation(gem_name)
   APPRAISAL_GEM_ABBREVIATIONS.fetch(gem_name.to_s, gem_name.to_s)
@@ -33389,21 +33389,21 @@ 

       
 
 
-3147
-3148
-3149
-3150
-3151
-3152
-3153
-3154
-3155
-3156
-3157
-3158

+3176
+3177
+3178
+3179
+3180
+3181
+3182
+3183
+3184
+3185
+3186
+3187

     
     
-      
# File 'lib/kettle/jem.rb', line 3147
+      
# File 'lib/kettle/jem.rb', line 3176
 
 def appraisal_latest_minor_patch(resolver:, gem_name:, version:)
   all_versions = resolver.versions(gem_name)
@@ -33437,20 +33437,20 @@ 

       
 
 
-2903
-2904
-2905
-2906
-2907
-2908
-2909
-2910
-2911
-2912
-2913

+2932
+2933
+2934
+2935
+2936
+2937
+2938
+2939
+2940
+2941
+2942

     
     
-      
# File 'lib/kettle/jem.rb', line 2903
+      
# File 'lib/kettle/jem.rb', line 2932
 
 def appraisal_latest_patch_by_minor(version_metadata)
   version_metadata.each_with_object({}) do |entry, latest|
@@ -33483,16 +33483,16 @@ 

       
 
 
-3034
-3035
-3036
-3037
-3038
-3039
-3040

+3063
+3064
+3065
+3066
+3067
+3068
+3069

     
     
-      
# File 'lib/kettle/jem.rb', line 3034
+      
# File 'lib/kettle/jem.rb', line 3063
 
 def appraisal_latest_version_matching(version_metadata, requested_version)
   prefix = "#{requested_version}."
@@ -33521,41 +33521,41 @@ 

       
 
 
-2784
-2785
-2786
-2787
-2788
-2789
-2790
-2791
-2792
-2793
-2794
-2795
-2796
-2797
-2798
-2799
-2800
-2801
-2802
-2803
-2804
-2805
-2806
-2807
-2808
-2809
-2810
-2811
-2812
 2813
 2814
-2815

+2815
+2816
+2817
+2818
+2819
+2820
+2821
+2822
+2823
+2824
+2825
+2826
+2827
+2828
+2829
+2830
+2831
+2832
+2833
+2834
+2835
+2836
+2837
+2838
+2839
+2840
+2841
+2842
+2843
+2844

     
     
-      
# File 'lib/kettle/jem.rb', line 2784
+      
# File 'lib/kettle/jem.rb', line 2813
 
 def appraisal_matrix_entries(tier1_gems:, tier2_gems: [])
   entries = []
@@ -33609,24 +33609,24 @@ 

       
 
 
-2817
-2818
-2819
-2820
-2821
-2822
-2823
-2824
-2825
-2826
-2827
-2828
-2829
-2830
-2831

+2846
+2847
+2848
+2849
+2850
+2851
+2852
+2853
+2854
+2855
+2856
+2857
+2858
+2859
+2860

     
     
-      
# File 'lib/kettle/jem.rb', line 2817
+      
# File 'lib/kettle/jem.rb', line 2846
 
 def appraisal_matrix_entry(tier1_name:, tier1_version:, ruby_series:, tier2_name: nil, tier2_version: nil)
   {
@@ -33686,16 +33686,16 @@ 

       
 
 
-3100
-3101
-3102
-3103
-3104
-3105
-3106

+3129
+3130
+3131
+3132
+3133
+3134
+3135

     
     
-      
# File 'lib/kettle/jem.rb', line 3100
+      
# File 'lib/kettle/jem.rb', line 3129
 
 def appraisal_matrix_fresh?(matrix, now: Time.now.to_i)
   resolved_at = (matrix || {})[:resolved_at] || (matrix || {})["resolved_at"]
@@ -33747,15 +33747,15 @@ 

       
 
 
-3093
-3094
-3095
-3096
-3097
-3098

+3122
+3123
+3124
+3125
+3126
+3127

     
     
-      
# File 'lib/kettle/jem.rb', line 3093
+      
# File 'lib/kettle/jem.rb', line 3122
 
 def appraisal_matrix_has_versions?(matrix)
   gems = deep_string_key_hash(matrix || {}).fetch("gems", {})
@@ -33783,13 +33783,13 @@ 

       
 
 
-2937
-2938
-2939
-2940

+2966
+2967
+2968
+2969

     
     
-      
# File 'lib/kettle/jem.rb', line 2937
+      
# File 'lib/kettle/jem.rb', line 2966
 
 def appraisal_minor_key(version)
   segments = Gem::Version.new(version.to_s).segments
@@ -33815,24 +33815,24 @@ 

       
 
 
-2845
-2846
-2847
-2848
-2849
-2850
-2851
-2852
-2853
-2854
-2855
-2856
-2857
-2858
-2859

+2874
+2875
+2876
+2877
+2878
+2879
+2880
+2881
+2882
+2883
+2884
+2885
+2886
+2887
+2888

     
     
-      
# File 'lib/kettle/jem.rb', line 2845
+      
# File 'lib/kettle/jem.rb', line 2874
 
 def appraisal_minor_versions_by_major(versions)
   versions.map do |version|
@@ -33869,30 +33869,30 @@ 

       
 
 
-2915
-2916
-2917
-2918
-2919
-2920
-2921
-2922
-2923
-2924
-2925
-2926
-2927
-2928
-2929
-2930
-2931
-2932
-2933
-2934
-2935

+2944
+2945
+2946
+2947
+2948
+2949
+2950
+2951
+2952
+2953
+2954
+2955
+2956
+2957
+2958
+2959
+2960
+2961
+2962
+2963
+2964

     
     
-      
# File 'lib/kettle/jem.rb', line 2915
+      
# File 'lib/kettle/jem.rb', line 2944
 
 def appraisal_minor_versions_to_buckets(minor_versions)
   by_major = minor_versions.group_by { |minor| minor.split(".").first.to_i }
@@ -33935,22 +33935,22 @@ 

       
 
 
-2650
-2651
-2652
-2653
-2654
-2655
-2656
-2657
-2658
-2659
-2660
-2661
-2662

+2679
+2680
+2681
+2682
+2683
+2684
+2685
+2686
+2687
+2688
+2689
+2690
+2691

     
     
-      
# File 'lib/kettle/jem.rb', line 2650
+      
# File 'lib/kettle/jem.rb', line 2679
 
 def appraisal_modular_gemfile_content(gem_name:, version:, sub_dependencies: {})
   lines = [
@@ -33985,12 +33985,12 @@ 

       
 
 
-2646
-2647
-2648

+2675
+2676
+2677

     
     
-      
# File 'lib/kettle/jem.rb', line 2646
+      
# File 'lib/kettle/jem.rb', line 2675
 
 def appraisal_modular_gemfile_path(gem_name:, version:, ruby_series:)
   File.join("gemfiles", "modular", gem_name.to_s, ruby_series.to_s, "v#{version}.gemfile")
@@ -34015,22 +34015,22 @@ 

       
 
 
-2632
-2633
-2634
-2635
-2636
-2637
-2638
-2639
-2640
-2641
-2642
-2643
-2644

+2661
+2662
+2663
+2664
+2665
+2666
+2667
+2668
+2669
+2670
+2671
+2672
+2673

     
     
-      
# File 'lib/kettle/jem.rb', line 2632
+      
# File 'lib/kettle/jem.rb', line 2661
 
 def appraisal_name(tier1_gem:, tier1_version:, ruby_series:, tier2_gem: nil, tier2_version: nil)
   parts = [
@@ -34065,12 +34065,12 @@ 

       
 
 
-7075
-7076
-7077

+7106
+7107
+7108

     
     
-      
# File 'lib/kettle/jem.rb', line 7075
+      
# File 'lib/kettle/jem.rb', line 7106
 
 def appraisal_names(content)
   appraisal_call_records(content).map { |record| record.fetch(:name) }
@@ -34095,20 +34095,20 @@ 

       
 
 
-2970
-2971
-2972
-2973
-2974
-2975
-2976
-2977
-2978
-2979
-2980

+2999
+3000
+3001
+3002
+3003
+3004
+3005
+3006
+3007
+3008
+3009

     
     
-      
# File 'lib/kettle/jem.rb', line 2970
+      
# File 'lib/kettle/jem.rb', line 2999
 
 def appraisal_next_seam_ruby(version, min_ruby, all_versions, version_min_rubies)
   found = false
@@ -34141,17 +34141,17 @@ 

       
 
 
-2947
-2948
-2949
-2950
-2951
-2952
-2953
-2954

+2976
+2977
+2978
+2979
+2980
+2981
+2982
+2983

     
     
-      
# File 'lib/kettle/jem.rb', line 2947
+      
# File 'lib/kettle/jem.rb', line 2976
 
 def appraisal_normalized_bucket_ranges(bucket_ranges)
   bucket_ranges.transform_values do |range|
@@ -34204,15 +34204,15 @@ 

       
 
 
-19257
-19258
-19259
-19260
-19261
-19262

+19290
+19291
+19292
+19293
+19294
+19295

     
     
-      
# File 'lib/kettle/jem.rb', line 19257
+      
# File 'lib/kettle/jem.rb', line 19290
 
 def appraisal_recording_enabled?(config)
   workflows = config["workflows"]
@@ -34240,32 +34240,32 @@ 

       
 
 
-3010
-3011
-3012
-3013
-3014
-3015
-3016
-3017
-3018
-3019
-3020
-3021
-3022
-3023
-3024
-3025
-3026
-3027
-3028
-3029
-3030
-3031
-3032

+3039
+3040
+3041
+3042
+3043
+3044
+3045
+3046
+3047
+3048
+3049
+3050
+3051
+3052
+3053
+3054
+3055
+3056
+3057
+3058
+3059
+3060
+3061

     
     
-      
# File 'lib/kettle/jem.rb', line 3010
+      
# File 'lib/kettle/jem.rb', line 3039
 
 def appraisal_resolve_sub_dependencies(parent_gem:, parent_version:, parent_versions:, dependency_versions:, ruby_min: nil, excluded_gems: [])
   parent = appraisal_latest_version_matching(parent_versions, parent_version)
@@ -34310,19 +34310,19 @@ 

       
 
 
-2876
-2877
-2878
-2879
-2880
-2881
-2882
-2883
-2884
-2885

+2905
+2906
+2907
+2908
+2909
+2910
+2911
+2912
+2913
+2914

     
     
-      
# File 'lib/kettle/jem.rb', line 2876
+      
# File 'lib/kettle/jem.rb', line 2905
 
 def appraisal_ruby_series(version_metadata, project_min_ruby: nil)
   floors = appraisal_find_ruby_seams(version_metadata).map { |seam| seam.fetch(:min_ruby) }
@@ -34354,19 +34354,19 @@ 

       
 
 
-9285
-9286
-9287
-9288
-9289
-9290
-9291
-9292
-9293
-9294

+9316
+9317
+9318
+9319
+9320
+9321
+9322
+9323
+9324
+9325

     
     
-      
# File 'lib/kettle/jem.rb', line 9285
+      
# File 'lib/kettle/jem.rb', line 9316
 
 def appraisal_ruby_version(value)
   parts = value.to_s.split("-")
@@ -34398,25 +34398,25 @@ 

       
 
 
-3076
-3077
-3078
-3079
-3080
-3081
-3082
-3083
-3084
-3085
-3086
-3087
-3088
-3089
-3090
-3091

+3105
+3106
+3107
+3108
+3109
+3110
+3111
+3112
+3113
+3114
+3115
+3116
+3117
+3118
+3119
+3120

     
     
-      
# File 'lib/kettle/jem.rb', line 3076
+      
# File 'lib/kettle/jem.rb', line 3105
 
 def appraisal_scaffold_config(gemspec_content:, existing_config: {}, exclusions: [], default_mode: "semver", freshness_ttl: APPRAISAL_DEFAULT_FRESHNESS_TTL)
   excluded = exclusions.map(&:to_s).to_set
@@ -34454,25 +34454,25 @@ 

       
 
 
-3042
-3043
-3044
-3045
-3046
-3047
-3048
-3049
-3050
-3051
-3052
-3053
-3054
-3055
-3056
-3057

+3071
+3072
+3073
+3074
+3075
+3076
+3077
+3078
+3079
+3080
+3081
+3082
+3083
+3084
+3085
+3086

     
     
-      
# File 'lib/kettle/jem.rb', line 3042
+      
# File 'lib/kettle/jem.rb', line 3071
 
 def appraisal_select_dependency_version(version_metadata, requirement:, ruby_min:)
   compatible = version_metadata.select do |entry|
@@ -34533,36 +34533,36 @@ 

       
 
 
-2756
-2757
-2758
-2759
-2760
-2761
-2762
-2763
-2764
-2765
-2766
-2767
-2768
-2769
-2770
-2771
-2772
-2773
-2774
-2775
-2776
-2777
-2778
-2779
-2780
-2781
-2782

+2785
+2786
+2787
+2788
+2789
+2790
+2791
+2792
+2793
+2794
+2795
+2796
+2797
+2798
+2799
+2800
+2801
+2802
+2803
+2804
+2805
+2806
+2807
+2808
+2809
+2810
+2811

     
     
-      
# File 'lib/kettle/jem.rb', line 2756
+      
# File 'lib/kettle/jem.rb', line 2785
 
 def appraisal_select_versions(version_metadata, mode:, requirements: nil)
   mode = mode.to_s
@@ -34611,12 +34611,12 @@ 

       
 
 
-3160
-3161
-3162

+3189
+3190
+3191

     
     
-      
# File 'lib/kettle/jem.rb', line 3160
+      
# File 'lib/kettle/jem.rb', line 3189
 
 def appraisal_sort_versions(values)
   values.compact.map(&:to_s).reject(&:empty?).uniq.sort_by { |version| Gem::Version.new(version) }
@@ -34641,18 +34641,18 @@ 

       
 
 
-3059
-3060
-3061
-3062
-3063
-3064
-3065
-3066
-3067

+3088
+3089
+3090
+3091
+3092
+3093
+3094
+3095
+3096

     
     
-      
# File 'lib/kettle/jem.rb', line 3059
+      
# File 'lib/kettle/jem.rb', line 3088
 
 def appraisal_stale_gemfile_paths(existing_paths:, current_entries:)
   current_names = current_entries.map { |entry| (entry[:name] || entry["name"]).to_s }.to_set
@@ -34683,18 +34683,18 @@ 

       
 
 
-3108
-3109
-3110
-3111
-3112
-3113
-3114
-3115
-3116

+3137
+3138
+3139
+3140
+3141
+3142
+3143
+3144
+3145

     
     
-      
# File 'lib/kettle/jem.rb', line 3108
+      
# File 'lib/kettle/jem.rb', line 3137
 
 def appraisal_time_ago(timestamp, now: Time.now.to_i)
   return "unknown" unless timestamp
@@ -34725,22 +34725,22 @@ 

       
 
 
-2956
-2957
-2958
-2959
-2960
-2961
-2962
-2963
-2964
-2965
-2966
-2967
-2968

+2985
+2986
+2987
+2988
+2989
+2990
+2991
+2992
+2993
+2994
+2995
+2996
+2997

     
     
-      
# File 'lib/kettle/jem.rb', line 2956
+      
# File 'lib/kettle/jem.rb', line 2985
 
 def appraisal_version_min_ruby_map(all_versions, seams)
   sorted_seams = seams.sort_by { |seam| Gem::Version.new(seam[:version] || seam["version"]) }
@@ -34775,13 +34775,13 @@ 

       
 
 
-2664
-2665
-2666
-2667

+2693
+2694
+2695
+2696

     
     
-      
# File 'lib/kettle/jem.rb', line 2664
+      
# File 'lib/kettle/jem.rb', line 2693
 
 def appraisal_version_requirement(version)
   segments = version.to_s.split(".")
@@ -34807,33 +34807,33 @@ 

       
 
 
-2693
-2694
-2695
-2696
-2697
-2698
-2699
-2700
-2701
-2702
-2703
-2704
-2705
-2706
-2707
-2708
-2709
-2710
-2711
-2712
-2713
-2714
-2715
-2716

+2722
+2723
+2724
+2725
+2726
+2727
+2728
+2729
+2730
+2731
+2732
+2733
+2734
+2735
+2736
+2737
+2738
+2739
+2740
+2741
+2742
+2743
+2744
+2745

     
     
-      
# File 'lib/kettle/jem.rb', line 2693
+      
# File 'lib/kettle/jem.rb', line 2722
 
 def appraisal_workflow_groups(matrix_entries, bucket_ranges:, exec_cmd: "kettle-test")
   grouped = Hash.new { |hash, key| hash[key] = [] }
@@ -34879,15 +34879,15 @@ 

       
 
 
-2732
-2733
-2734
-2735
-2736
-2737

+2761
+2762
+2763
+2764
+2765
+2766

     
     
-      
# File 'lib/kettle/jem.rb', line 2732
+      
# File 'lib/kettle/jem.rb', line 2761
 
 def appraisal_workflow_lifecycle(ruby_floor)
   APPRAISAL_WORKFLOW_LIFECYCLE_RANGES.each do |name, range|
@@ -34915,15 +34915,15 @@ 

       
 
 
-2739
-2740
-2741
-2742
-2743
-2744

+2768
+2769
+2770
+2771
+2772
+2773

     
     
-      
# File 'lib/kettle/jem.rb', line 2739
+      
# File 'lib/kettle/jem.rb', line 2768
 
 def appraisal_workflow_ruby(ruby_floor, lifecycle)
   return "ruby" if lifecycle == "current"
@@ -34951,22 +34951,22 @@ 

       
 
 
-2718
-2719
-2720
-2721
-2722
-2723
-2724
-2725
-2726
-2727
-2728
-2729
-2730

+2747
+2748
+2749
+2750
+2751
+2752
+2753
+2754
+2755
+2756
+2757
+2758
+2759

     
     
-      
# File 'lib/kettle/jem.rb', line 2718
+      
# File 'lib/kettle/jem.rb', line 2747
 
 def appraisal_workflow_yaml_snippets(matrix_entries, bucket_ranges:, exec_cmd: "kettle-test")
   appraisal_workflow_groups(matrix_entries, bucket_ranges: bucket_ranges, exec_cmd: exec_cmd).transform_values do |entries|
@@ -35001,14 +35001,14 @@ 

       
 
 
-10353
-10354
-10355
-10356
-10357

+10384
+10385
+10386
+10387
+10388

     
     
-      
# File 'lib/kettle/jem.rb', line 10353
+      
# File 'lib/kettle/jem.rb', line 10384
 
 def appraisal_x_stdlib_eval_gemfile_call(block)
   ruby_call_records(block, :eval_gemfile).find do |call|
@@ -35035,18 +35035,18 @@ 

       
 
 
-2746
-2747
-2748
-2749
-2750
-2751
-2752
-2753
-2754

+2775
+2776
+2777
+2778
+2779
+2780
+2781
+2782
+2783

     
     
-      
# File 'lib/kettle/jem.rb', line 2746
+      
# File 'lib/kettle/jem.rb', line 2775
 
 def appraisal_x_stdlib_exclusions(template_content)
   gems = ruby_call_records(template_content, :eval_gemfile).filter_map do |call|
@@ -35077,30 +35077,30 @@ 

       
 
 
-6942
-6943
-6944
-6945
-6946
-6947
-6948
-6949
-6950
-6951
-6952
-6953
-6954
-6955
-6956
-6957
-6958
-6959
-6960
-6961
-6962

+6973
+6974
+6975
+6976
+6977
+6978
+6979
+6980
+6981
+6982
+6983
+6984
+6985
+6986
+6987
+6988
+6989
+6990
+6991
+6992
+6993

     
     
-      
# File 'lib/kettle/jem.rb', line 6942
+      
# File 'lib/kettle/jem.rb', line 6973
 
 def appraisals_policy_operations(template_content, original, final, request)
   package_name = runtime_context_value(request, :package, :name).to_s
@@ -35166,16 +35166,16 @@ 

 
 
-17874
-17875
-17876
-17877
-17878
-17879
-17880

+17906
+17907
+17908
+17909
+17910
+17911
+17912

     
     
-      
# File 'lib/kettle/jem.rb', line 17874
+      
# File 'lib/kettle/jem.rb', line 17906
 
 def assert_no_unresolved_template_tokens_in_yaml_values(content, label)
   unresolved = yaml_scalar_value_template_tokens(content)
@@ -35204,24 +35204,24 @@ 

       
 
 
-14821
-14822
-14823
-14824
-14825
-14826
-14827
-14828
-14829
-14830
-14831
-14832
-14833
-14834
-14835

+14853
+14854
+14855
+14856
+14857
+14858
+14859
+14860
+14861
+14862
+14863
+14864
+14865
+14866
+14867

     
     
-      
# File 'lib/kettle/jem.rb', line 14821
+      
# File 'lib/kettle/jem.rb', line 14853
 
 def author_aliases(config)
   return {} unless config.is_a?(Hash)
@@ -35258,33 +35258,33 @@ 

       
 
 
-14771
-14772
-14773
-14774
-14775
-14776
-14777
-14778
-14779
-14780
-14781
-14782
-14783
-14784
-14785
-14786
-14787
-14788
-14789
-14790
-14791
-14792
-14793
-14794

+14803
+14804
+14805
+14806
+14807
+14808
+14809
+14810
+14811
+14812
+14813
+14814
+14815
+14816
+14817
+14818
+14819
+14820
+14821
+14822
+14823
+14824
+14825
+14826

     
     
-      
# File 'lib/kettle/jem.rb', line 14771
+      
# File 'lib/kettle/jem.rb', line 14803
 
 def author_facts(config, env, gemspec_metadata: {}, copyright: {})
   token_config = token_config_values(config)
@@ -35330,15 +35330,15 @@ 

       
 
 
-17855
-17856
-17857
-17858
-17859
-17860

+17887
+17888
+17889
+17890
+17891
+17892

     
     
-      
# File 'lib/kettle/jem.rb', line 17855
+      
# File 'lib/kettle/jem.rb', line 17887
 
 def author_family_names(name)
   parts = name.to_s.strip.split(/\s+/)
@@ -35366,15 +35366,15 @@ 

       
 
 
-17848
-17849
-17850
-17851
-17852
-17853

+17880
+17881
+17882
+17883
+17884
+17885

     
     
-      
# File 'lib/kettle/jem.rb', line 17848
+      
# File 'lib/kettle/jem.rb', line 17880
 
 def author_given_names(name)
   parts = name.to_s.strip.split(/\s+/)
@@ -35402,18 +35402,18 @@ 

       
 
 
-14875
-14876
-14877
-14878
-14879
-14880
-14881
-14882
-14883

+14907
+14908
+14909
+14910
+14911
+14912
+14913
+14914
+14915

     
     
-      
# File 'lib/kettle/jem.rb', line 14875
+      
# File 'lib/kettle/jem.rb', line 14907
 
 def author_names(gemspec_metadata, copyright, primary_name, author_aliases: {})
   names = Array(gemspec_metadata[:authors]).map(&:to_s)
@@ -35444,22 +35444,22 @@ 

       
 
 
-14861
-14862
-14863
-14864
-14865
-14866
-14867
-14868
-14869
-14870
-14871
-14872
-14873

+14893
+14894
+14895
+14896
+14897
+14898
+14899
+14900
+14901
+14902
+14903
+14904
+14905

     
     
-      
# File 'lib/kettle/jem.rb', line 14861
+      
# File 'lib/kettle/jem.rb', line 14893
 
 def author_template_tokens(author)
   names = Array(author[:names]).map(&:to_s).reject(&:empty?)
@@ -35494,21 +35494,21 @@ 

       
 
 
-10526
-10527
-10528
-10529
-10530
-10531
-10532
-10533
-10534
-10535
-10536
-10537

+10557
+10558
+10559
+10560
+10561
+10562
+10563
+10564
+10565
+10566
+10567
+10568

     
     
-      
# File 'lib/kettle/jem.rb', line 10526
+      
# File 'lib/kettle/jem.rb', line 10557
 
 def bash_merge_options(recipe)
   options = {
@@ -35542,20 +35542,20 @@ 

       
 
 
-6658
-6659
-6660
-6661
-6662
-6663
-6664
-6665
-6666
-6667
-6668

+6689
+6690
+6691
+6692
+6693
+6694
+6695
+6696
+6697
+6698
+6699

     
     
-      
# File 'lib/kettle/jem.rb', line 6658
+      
# File 'lib/kettle/jem.rb', line 6689
 
 def build_changelog_section(heading, preamble, items)
   lines = [heading.rstrip, ""]
@@ -35588,22 +35588,22 @@ 

       
 
 
-6223
-6224
-6225
-6226
-6227
-6228
-6229
-6230
-6231
-6232
-6233
-6234
-6235

+6254
+6255
+6256
+6257
+6258
+6259
+6260
+6261
+6262
+6263
+6264
+6265
+6266

     
     
-      
# File 'lib/kettle/jem.rb', line 6223
+      
# File 'lib/kettle/jem.rb', line 6254
 
 def build_changelog_unreleased_section(heading, items)
   lines = [heading]
@@ -35638,24 +35638,24 @@ 

       
 
 
-14837
-14838
-14839
-14840
-14841
-14842
-14843
-14844
-14845
-14846
-14847
-14848
-14849
-14850
-14851

+14869
+14870
+14871
+14872
+14873
+14874
+14875
+14876
+14877
+14878
+14879
+14880
+14881
+14882
+14883

     
     
-      
# File 'lib/kettle/jem.rb', line 14837
+      
# File 'lib/kettle/jem.rb', line 14869
 
 def canonical_author_name(value, aliases)
   current = value.to_s.strip
@@ -35692,16 +35692,16 @@ 

       
 
 
-14853
-14854
-14855
-14856
-14857
-14858
-14859

+14885
+14886
+14887
+14888
+14889
+14890
+14891

     
     
-      
# File 'lib/kettle/jem.rb', line 14853
+      
# File 'lib/kettle/jem.rb', line 14885
 
 def canonical_author_name_for_entry(entry, aliases)
   name = entry[:name].to_s.strip
@@ -35730,22 +35730,22 @@ 

       
 
 
-6088
-6089
-6090
-6091
-6092
-6093
-6094
-6095
-6096
-6097
-6098
-6099
-6100

+6119
+6120
+6121
+6122
+6123
+6124
+6125
+6126
+6127
+6128
+6129
+6130
+6131

     
     
-      
# File 'lib/kettle/jem.rb', line 6088
+      
# File 'lib/kettle/jem.rb', line 6119
 
 def canonical_changelog_release_heading(heading_text)
   text = heading_text.to_s.strip
@@ -35780,17 +35780,17 @@ 

       
 
 
-4045
-4046
-4047
-4048
-4049
-4050
-4051
-4052

+4074
+4075
+4076
+4077
+4078
+4079
+4080
+4081

     
     
-      
# File 'lib/kettle/jem.rb', line 4045
+      
# File 'lib/kettle/jem.rb', line 4074
 
 def changed_files_from_recipe_reports(recipe_reports)
   latest_by_path = {}
@@ -35843,13 +35843,13 @@ 

       
 
 
-6674
-6675
-6676
-6677

+6705
+6706
+6707
+6708

     
     
-      
# File 'lib/kettle/jem.rb', line 6674
+      
# File 'lib/kettle/jem.rb', line 6705
 
 def changelog_bullet_line?(line)
   stripped = line.to_s.lstrip
@@ -35875,17 +35875,17 @@ 

       
 
 
-7538
-7539
-7540
-7541
-7542
-7543
-7544
-7545

+7569
+7570
+7571
+7572
+7573
+7574
+7575
+7576

     
     
-      
# File 'lib/kettle/jem.rb', line 7538
+      
# File 'lib/kettle/jem.rb', line 7569
 
 def changelog_coverage_kloc(section)
   return if section.to_s.empty?
@@ -35915,32 +35915,32 @@ 

 
 
-6597
-6598
-6599
-6600
-6601
-6602
-6603
-6604
-6605
-6606
-6607
-6608
-6609
-6610
-6611
-6612
-6613
-6614
-6615
-6616
-6617
-6618
-6619

+6628
+6629
+6630
+6631
+6632
+6633
+6634
+6635
+6636
+6637
+6638
+6639
+6640
+6641
+6642
+6643
+6644
+6645
+6646
+6647
+6648
+6649
+6650

     
     
-      
# File 'lib/kettle/jem.rb', line 6597
+      
# File 'lib/kettle/jem.rb', line 6628
 
 def changelog_existing_transfer_occurrences(content)
   context = Ast::Crispr::Markdown::Markly.document_context(content: content, source_label: "CHANGELOG.md")
@@ -36008,14 +36008,14 @@ 

       
 
 
-6706
-6707
-6708
-6709
-6710

+6737
+6738
+6739
+6740
+6741

     
     
-      
# File 'lib/kettle/jem.rb', line 6706
+      
# File 'lib/kettle/jem.rb', line 6737
 
 def changelog_heading_line?(line)
   stripped = line.to_s.lstrip
@@ -36042,17 +36042,17 @@ 

       
 
 
-6621
-6622
-6623
-6624
-6625
-6626
-6627
-6628

+6652
+6653
+6654
+6655
+6656
+6657
+6658
+6659

     
     
-      
# File 'lib/kettle/jem.rb', line 6621
+      
# File 'lib/kettle/jem.rb', line 6652
 
 def changelog_release_section_for_item(release_sections, item)
   release_sections.each_with_index.find do |section, index|
@@ -36082,12 +36082,12 @@ 

       
 
 
-6654
-6655
-6656

+6685
+6686
+6687

     
     
-      
# File 'lib/kettle/jem.rb', line 6654
+      
# File 'lib/kettle/jem.rb', line 6685
 
 def changelog_section_preamble(body_lines)
   body_lines.take_while { |line| !line.to_s.start_with?("### ") }.map(&:rstrip)
@@ -36112,14 +36112,14 @@ 

       
 
 
-6164
-6165
-6166
-6167
-6168

+6195
+6196
+6197
+6198
+6199

     
     
-      
# File 'lib/kettle/jem.rb', line 6164
+      
# File 'lib/kettle/jem.rb', line 6195
 
 def changelog_template_header(lines, unreleased_index)
   header = lines[0...unreleased_index].to_a
@@ -36146,15 +36146,15 @@ 

       
 
 
-6308
-6309
-6310
-6311
-6312
-6313

+6339
+6340
+6341
+6342
+6343
+6344

     
     
-      
# File 'lib/kettle/jem.rb', line 6308
+      
# File 'lib/kettle/jem.rb', line 6339
 
 def changelog_transfer_applied_keys(project_root)
   path = File.join(project_root.to_s, "CHANGELOG.md")
@@ -36182,44 +36182,44 @@ 

       
 
 
-6453
-6454
-6455
-6456
-6457
-6458
-6459
-6460
-6461
-6462
-6463
-6464
-6465
-6466
-6467
-6468
-6469
-6470
-6471
-6472
-6473
-6474
-6475
-6476
-6477
-6478
-6479
-6480
-6481
-6482
-6483
 6484
 6485
 6486
-6487

+6487
+6488
+6489
+6490
+6491
+6492
+6493
+6494
+6495
+6496
+6497
+6498
+6499
+6500
+6501
+6502
+6503
+6504
+6505
+6506
+6507
+6508
+6509
+6510
+6511
+6512
+6513
+6514
+6515
+6516
+6517
+6518

     
     
-      
# File 'lib/kettle/jem.rb', line 6453
+      
# File 'lib/kettle/jem.rb', line 6484
 
 def changelog_transfer_entries(template_root)
   path = File.join(template_root, TRANSFER_CHANGELOG_TEMPLATE_PATH)
@@ -36276,16 +36276,16 @@ 

       
 
 
-6437
-6438
-6439
-6440
-6441
-6442
-6443

+6468
+6469
+6470
+6471
+6472
+6473
+6474

     
     
-      
# File 'lib/kettle/jem.rb', line 6437
+      
# File 'lib/kettle/jem.rb', line 6468
 
 def changelog_transfer_entries_after(entries, key)
   all_entries = Array(entries)
@@ -36314,32 +36314,32 @@ 

       
 
 
-6237
-6238
-6239
-6240
-6241
-6242
-6243
-6244
-6245
-6246
-6247
-6248
-6249
-6250
-6251
-6252
-6253
-6254
-6255
-6256
-6257
-6258
-6259

+6268
+6269
+6270
+6271
+6272
+6273
+6274
+6275
+6276
+6277
+6278
+6279
+6280
+6281
+6282
+6283
+6284
+6285
+6286
+6287
+6288
+6289
+6290

     
     
-      
# File 'lib/kettle/jem.rb', line 6237
+      
# File 'lib/kettle/jem.rb', line 6268
 
 def changelog_transfer_facts(project_root, entries)
   all_entries = Array(entries)
@@ -36384,13 +36384,13 @@ 

       
 
 
-6500
-6501
-6502
-6503

+6531
+6532
+6533
+6534

     
     
-      
# File 'lib/kettle/jem.rb', line 6500
+      
# File 'lib/kettle/jem.rb', line 6531
 
 def changelog_transfer_filter_parser
   Thread.current.thread_variable_get(:kettle_jem_transfer_changelog_filter_parser) ||
@@ -36416,15 +36416,15 @@ 

       
 
 
-6563
-6564
-6565
-6566
-6567
-6568

+6594
+6595
+6596
+6597
+6598
+6599

     
     
-      
# File 'lib/kettle/jem.rb', line 6563
+      
# File 'lib/kettle/jem.rb', line 6594
 
 def changelog_transfer_key(line)
   payload = changelog_transfer_list_item_payload(line)
@@ -36452,16 +36452,16 @@ 

       
 
 
-6445
-6446
-6447
-6448
-6449
-6450
-6451

+6476
+6477
+6478
+6479
+6480
+6481
+6482

     
     
-      
# File 'lib/kettle/jem.rb', line 6445
+      
# File 'lib/kettle/jem.rb', line 6476
 
 def changelog_transfer_key_date(key)
   parsed = parse_changelog_transfer_key(key)
@@ -36490,12 +36490,12 @@ 

       
 
 
-6670
-6671
-6672

+6701
+6702
+6703

     
     
-      
# File 'lib/kettle/jem.rb', line 6670
+      
# File 'lib/kettle/jem.rb', line 6701
 
 def changelog_transfer_keys(content)
   content.to_s.scan(CHANGELOG_TRANSFER_KEY_SCAN_PATTERN).to_set
@@ -36520,13 +36520,13 @@ 

       
 
 
-6495
-6496
-6497
-6498

+6526
+6527
+6528
+6529

     
     
-      
# File 'lib/kettle/jem.rb', line 6495
+      
# File 'lib/kettle/jem.rb', line 6526
 
 def changelog_transfer_line_parser
   Thread.current.thread_variable_get(:kettle_jem_transfer_changelog_line_parser) ||
@@ -36552,15 +36552,15 @@ 

       
 
 
-6544
-6545
-6546
-6547
-6548
-6549

+6575
+6576
+6577
+6578
+6579
+6580

     
     
-      
# File 'lib/kettle/jem.rb', line 6544
+      
# File 'lib/kettle/jem.rb', line 6575
 
 def changelog_transfer_list_item_line(source, rendered_payload)
   first_line = source.to_s.lines.first.to_s
@@ -36588,18 +36588,18 @@ 

       
 
 
-6505
-6506
-6507
-6508
-6509
-6510
-6511
-6512
-6513

+6536
+6537
+6538
+6539
+6540
+6541
+6542
+6543
+6544

     
     
-      
# File 'lib/kettle/jem.rb', line 6505
+      
# File 'lib/kettle/jem.rb', line 6536
 
 def changelog_transfer_list_item_payload(source)
   stripped = source.to_s.lines.first.to_s.lstrip.chomp
@@ -36630,14 +36630,14 @@ 

       
 
 
-6489
-6490
-6491
-6492
-6493

+6520
+6521
+6522
+6523
+6524

     
     
-      
# File 'lib/kettle/jem.rb', line 6489
+      
# File 'lib/kettle/jem.rb', line 6520
 
 def changelog_transfer_section_map
   CHANGELOG_STANDARD_HEADINGS.to_h do |heading|
@@ -36664,21 +36664,21 @@ 

       
 
 
-6181
-6182
-6183
-6184
-6185
-6186
-6187
-6188
-6189
-6190
-6191
-6192

+6212
+6213
+6214
+6215
+6216
+6217
+6218
+6219
+6220
+6221
+6222
+6223

     
     
-      
# File 'lib/kettle/jem.rb', line 6181
+      
# File 'lib/kettle/jem.rb', line 6212
 
 def changelog_unreleased_end_index(lines, unreleased_index)
   index = unreleased_index + 1
@@ -36735,14 +36735,14 @@ 

       
 
 
-6712
-6713
-6714
-6715
-6716

+6743
+6744
+6745
+6746
+6747

     
     
-      
# File 'lib/kettle/jem.rb', line 6712
+      
# File 'lib/kettle/jem.rb', line 6743
 
 def changelog_unreleased_heading?(heading_text)
   text = heading_text.to_s.strip
@@ -36792,15 +36792,15 @@ 

       
 
 
-6174
-6175
-6176
-6177
-6178
-6179

+6205
+6206
+6207
+6208
+6209
+6210

     
     
-      
# File 'lib/kettle/jem.rb', line 6174
+      
# File 'lib/kettle/jem.rb', line 6205
 
 def changelog_unreleased_heading_line?(line)
   text = line.to_s.strip
@@ -36828,33 +36828,33 @@ 

       
 
 
-6198
-6199
-6200
-6201
-6202
-6203
-6204
-6205
-6206
-6207
-6208
-6209
-6210
-6211
-6212
-6213
-6214
-6215
-6216
-6217
-6218
-6219
-6220
-6221

+6229
+6230
+6231
+6232
+6233
+6234
+6235
+6236
+6237
+6238
+6239
+6240
+6241
+6242
+6243
+6244
+6245
+6246
+6247
+6248
+6249
+6250
+6251
+6252

     
     
-      
# File 'lib/kettle/jem.rb', line 6198
+      
# File 'lib/kettle/jem.rb', line 6229
 
 def changelog_unreleased_items(body_lines)
   items = {}
@@ -36900,12 +36900,12 @@ 

       
 
 
-6170
-6171
-6172

+6201
+6202
+6203

     
     
-      
# File 'lib/kettle/jem.rb', line 6170
+      
# File 'lib/kettle/jem.rb', line 6201
 
 def changelog_unreleased_line_index(lines)
   lines.index { |line| changelog_unreleased_heading_line?(line) }
@@ -36930,18 +36930,18 @@ 

       
 
 
-6315
-6316
-6317
-6318
-6319
-6320
-6321
-6322
-6323

+6346
+6347
+6348
+6349
+6350
+6351
+6352
+6353
+6354

     
     
-      
# File 'lib/kettle/jem.rb', line 6315
+      
# File 'lib/kettle/jem.rb', line 6346
 
 def changelog_unreleased_transfer_keys(project_root)
   path = File.join(project_root.to_s, "CHANGELOG.md")
@@ -36995,17 +36995,17 @@ 

       
 
 
-7529
-7530
-7531
-7532
-7533
-7534
-7535
-7536

+7560
+7561
+7562
+7563
+7564
+7565
+7566
+7567

     
     
-      
# File 'lib/kettle/jem.rb', line 7529
+      
# File 'lib/kettle/jem.rb', line 7560
 
 def changelog_version_heading_line?(line, version)
   text = line.to_s.strip
@@ -37058,21 +37058,21 @@ 

       
 
 
-4160
-4161
-4162
-4163
-4164
-4165
-4166
-4167
-4168
-4169
-4170
-4171

+4189
+4190
+4191
+4192
+4193
+4194
+4195
+4196
+4197
+4198
+4199
+4200

     
     
-      
# File 'lib/kettle/jem.rb', line 4160
+      
# File 'lib/kettle/jem.rb', line 4189
 
 def checksum_cache_safe_report?(report)
   metadata = report.fetch(:metadata, {})
@@ -37129,14 +37129,14 @@ 

       
 
 
-4091
-4092
-4093
-4094
-4095

+4120
+4121
+4122
+4123
+4124

     
     
-      
# File 'lib/kettle/jem.rb', line 4091
+      
# File 'lib/kettle/jem.rb', line 4120
 
 def checksum_exact_match?(report)
   checksum_match = report.dig(:metadata, :checksum_match) || report.dig(:metadata, "checksum_match") || {}
@@ -37163,47 +37163,47 @@ 

       
 
 
-5252
-5253
-5254
-5255
-5256
-5257
-5258
-5259
-5260
-5261
-5262
-5263
-5264
-5265
-5266
-5267
-5268
-5269
-5270
-5271
-5272
-5273
-5274
-5275
-5276
-5277
-5278
-5279
-5280
-5281
-5282
 5283
 5284
 5285
 5286
 5287
 5288
-5289

+5289
+5290
+5291
+5292
+5293
+5294
+5295
+5296
+5297
+5298
+5299
+5300
+5301
+5302
+5303
+5304
+5305
+5306
+5307
+5308
+5309
+5310
+5311
+5312
+5313
+5314
+5315
+5316
+5317
+5318
+5319
+5320

     
     
-      
# File 'lib/kettle/jem.rb', line 5252
+      
# File 'lib/kettle/jem.rb', line 5283
 
 def checksum_file_records(project_root, report, existing_state)
   existing_records = TemplateLock.files(existing_state).each_with_object({}) do |(relative_path, record), retained|
@@ -37263,33 +37263,33 @@ 

       
 
 
-4135
-4136
-4137
-4138
-4139
-4140
-4141
-4142
-4143
-4144
-4145
-4146
-4147
-4148
-4149
-4150
-4151
-4152
-4153
-4154
-4155
-4156
-4157
-4158

+4164
+4165
+4166
+4167
+4168
+4169
+4170
+4171
+4172
+4173
+4174
+4175
+4176
+4177
+4178
+4179
+4180
+4181
+4182
+4183
+4184
+4185
+4186
+4187

     
     
-      
# File 'lib/kettle/jem.rb', line 4135
+      
# File 'lib/kettle/jem.rb', line 4164
 
 def checksum_match_details(project_root, report, checksum_mode:, template_lock:)
   return unless checksum_cache_safe_report?(report)
@@ -37335,15 +37335,15 @@ 

       
 
 
-4097
-4098
-4099
-4100
-4101
-4102

+4126
+4127
+4128
+4129
+4130
+4131

     
     
-      
# File 'lib/kettle/jem.rb', line 4097
+      
# File 'lib/kettle/jem.rb', line 4126
 
 def checksum_mode_for(env, run_options)
   raw = (run_options || {})[:checksums] ||
@@ -37394,14 +37394,14 @@ 

       
 
 
-4129
-4130
-4131
-4132
-4133

+4158
+4159
+4160
+4161
+4162

     
     
-      
# File 'lib/kettle/jem.rb', line 4129
+      
# File 'lib/kettle/jem.rb', line 4158
 
 def checksum_skip_report?(project_root, report, checksum_mode:, template_lock:)
   return false unless report[:changed]
@@ -37428,12 +37428,12 @@ 

       
 
 
-19307
-19308
-19309

+19340
+19341
+19342

     
     
-      
# File 'lib/kettle/jem.rb', line 19307
+      
# File 'lib/kettle/jem.rb', line 19340
 
 def classify_namespace(name)
   name.to_s.split(/[-_]/).map { |part| part[0].to_s.upcase + part[1..].to_s }.join("::")
@@ -37458,16 +37458,16 @@ 

       
 
 
-15924
-15925
-15926
-15927
-15928
-15929
-15930

+15956
+15957
+15958
+15959
+15960
+15961
+15962

     
     
-      
# File 'lib/kettle/jem.rb', line 15924
+      
# File 'lib/kettle/jem.rb', line 15956
 
 def cleanup_version_gem_entrypoint(project_root, entrypoint_path)
   current = read_project_file(project_root, entrypoint_path)
@@ -37496,15 +37496,15 @@ 

       
 
 
-15917
-15918
-15919
-15920
-15921
-15922

+15949
+15950
+15951
+15952
+15953
+15954

     
     
-      
# File 'lib/kettle/jem.rb', line 15917
+      
# File 'lib/kettle/jem.rb', line 15949
 
 def cleanup_version_gem_version_spec(project_root, version_spec_path)
   current = read_project_file(project_root, version_spec_path)
@@ -37532,18 +37532,18 @@ 

       
 
 
-16887
-16888
-16889
-16890
-16891
-16892
-16893
-16894
-16895

+16919
+16920
+16921
+16922
+16923
+16924
+16925
+16926
+16927

     
     
-      
# File 'lib/kettle/jem.rb', line 16887
+      
# File 'lib/kettle/jem.rb', line 16919
 
 def codeberg_repo_url(repository, repo_slug, suffix)
   resources = repository[:resource_urls] || {}
@@ -37574,21 +37574,21 @@ 

       
 
 
-16336
-16337
-16338
-16339
-16340
-16341
-16342
-16343
-16344
-16345
-16346
-16347

+16368
+16369
+16370
+16371
+16372
+16373
+16374
+16375
+16376
+16377
+16378
+16379

     
     
-      
# File 'lib/kettle/jem.rb', line 16336
+      
# File 'lib/kettle/jem.rb', line 16368
 
 def collapse_excess_blank_lines(content)
   blank_count = 0
@@ -37622,21 +37622,21 @@ 

       
 
 
-8356
-8357
-8358
-8359
-8360
-8361
-8362
-8363
-8364
-8365
-8366
-8367

+8387
+8388
+8389
+8390
+8391
+8392
+8393
+8394
+8395
+8396
+8397
+8398

     
     
-      
# File 'lib/kettle/jem.rb', line 8356
+      
# File 'lib/kettle/jem.rb', line 8387
 
 def collapse_nested_templating_guards(content)
   records = nested_templating_guard_records(content)
@@ -37670,35 +37670,35 @@ 

       
 
 
-6679
-6680
-6681
-6682
-6683
-6684
-6685
-6686
-6687
-6688
-6689
-6690
-6691
-6692
-6693
-6694
-6695
-6696
-6697
-6698
-6699
-6700
-6701
-6702
-6703
-6704

+6710
+6711
+6712
+6713
+6714
+6715
+6716
+6717
+6718
+6719
+6720
+6721
+6722
+6723
+6724
+6725
+6726
+6727
+6728
+6729
+6730
+6731
+6732
+6733
+6734
+6735

     
     
-      
# File 'lib/kettle/jem.rb', line 6679
+      
# File 'lib/kettle/jem.rb', line 6710
 
 def collect_changelog_list_item(lines, start_index)
   line = lines.fetch(start_index).to_s
@@ -37746,35 +37746,35 @@ 

       
 
 
-20189
-20190
-20191
-20192
-20193
-20194
-20195
-20196
-20197
-20198
-20199
-20200
-20201
-20202
-20203
-20204
-20205
-20206
-20207
-20208
-20209
-20210
-20211
-20212
-20213
-20214

+20225
+20226
+20227
+20228
+20229
+20230
+20231
+20232
+20233
+20234
+20235
+20236
+20237
+20238
+20239
+20240
+20241
+20242
+20243
+20244
+20245
+20246
+20247
+20248
+20249
+20250

     
     
-      
# File 'lib/kettle/jem.rb', line 20189
+      
# File 'lib/kettle/jem.rb', line 20225
 
 def collect_yaml_mapping_path_entries(node, path, entries)
   unless node.is_a?(Psych::Nodes::Mapping)
@@ -37822,26 +37822,26 @@ 

       
 
 
-20171
-20172
-20173
-20174
-20175
-20176
-20177
-20178
-20179
-20180
-20181
-20182
-20183
-20184
-20185
-20186
-20187

+20207
+20208
+20209
+20210
+20211
+20212
+20213
+20214
+20215
+20216
+20217
+20218
+20219
+20220
+20221
+20222
+20223

     
     
-      
# File 'lib/kettle/jem.rb', line 20171
+      
# File 'lib/kettle/jem.rb', line 20207
 
 def collect_yaml_scalar_path_entries(node, path, entries)
   unless node.is_a?(Psych::Nodes::Mapping)
@@ -37903,12 +37903,12 @@ 

       
 
 
-12737
-12738
-12739

+12768
+12769
+12770

     
     
-      
# File 'lib/kettle/jem.rb', line 12737
+      
# File 'lib/kettle/jem.rb', line 12768
 
 def comment_only_lines?(lines)
   Array(lines).all? { |line| comment_or_blank_line?(line) }
@@ -37956,13 +37956,13 @@ 

       
 
 
-12732
-12733
-12734
-12735

+12763
+12764
+12765
+12766

     
     
-      
# File 'lib/kettle/jem.rb', line 12732
+      
# File 'lib/kettle/jem.rb', line 12763
 
 def comment_or_blank_line?(line)
   stripped = line.to_s.strip
@@ -37988,18 +37988,18 @@ 

       
 
 
-9892
-9893
-9894
-9895
-9896
-9897
-9898
-9899
-9900

+9923
+9924
+9925
+9926
+9927
+9928
+9929
+9930
+9931

     
     
-      
# File 'lib/kettle/jem.rb', line 9892
+      
# File 'lib/kettle/jem.rb', line 9923
 
 def commented_gem_call(comment_source)
   source = uncomment_ruby_comment_line(comment_source)
@@ -38030,23 +38030,23 @@ 

       
 
 
-9577
-9578
-9579
-9580
-9581
-9582
-9583
-9584
-9585
-9586
-9587
-9588
-9589
-9590

+9608
+9609
+9610
+9611
+9612
+9613
+9614
+9615
+9616
+9617
+9618
+9619
+9620
+9621

     
     
-      
# File 'lib/kettle/jem.rb', line 9577
+      
# File 'lib/kettle/jem.rb', line 9608
 
 def commented_gem_dependency_block_records(content)
   lines = content.to_s.lines
@@ -38082,14 +38082,14 @@ 

       
 
 
-9571
-9572
-9573
-9574
-9575

+9602
+9603
+9604
+9605
+9606

     
     
-      
# File 'lib/kettle/jem.rb', line 9571
+      
# File 'lib/kettle/jem.rb', line 9602
 
 def commented_gem_dependency_blocks(content)
   commented_gem_dependency_block_records(content).to_h do |record|
@@ -38116,25 +38116,25 @@ 

       
 
 
-9875
-9876
-9877
-9878
-9879
-9880
-9881
-9882
-9883
-9884
-9885
-9886
-9887
-9888
-9889
-9890

+9906
+9907
+9908
+9909
+9910
+9911
+9912
+9913
+9914
+9915
+9916
+9917
+9918
+9919
+9920
+9921

     
     
-      
# File 'lib/kettle/jem.rb', line 9875
+      
# File 'lib/kettle/jem.rb', line 9906
 
 def commented_gem_dependency_records(content)
   result = prism_parse_success(content)
@@ -38172,12 +38172,12 @@ 

       
 
 
-14086
-14087
-14088

+14117
+14118
+14119

     
     
-      
# File 'lib/kettle/jem.rb', line 14086
+      
# File 'lib/kettle/jem.rb', line 14117
 
 def commit_file_outcome(file_outcome)
   commit_filesystem_outcome(file_outcome)
@@ -38202,12 +38202,12 @@ 

       
 
 
-14027
-14028
-14029

+14058
+14059
+14060

     
     
-      
# File 'lib/kettle/jem.rb', line 14027
+      
# File 'lib/kettle/jem.rb', line 14058
 
 def commit_file_work_unit(file_work_unit)
   file_work_unit.operations.each { |operation| commit_file_outcome(operation) }
@@ -38232,13 +38232,13 @@ 

       
 
 
-14094
-14095
-14096
-14097

+14125
+14126
+14127
+14128

     
     
-      
# File 'lib/kettle/jem.rb', line 14094
+      
# File 'lib/kettle/jem.rb', line 14125
 
 def commit_file_work_unit_payload(payload)
   Array(payload.fetch(:operations)).each { |operation| commit_filesystem_outcome_payload(operation) }
@@ -38287,21 +38287,21 @@ 

       
 
 
-13971
-13972
-13973
-13974
-13975
-13976
-13977
-13978
-13979
-13980
-13981
-13982

+14002
+14003
+14004
+14005
+14006
+14007
+14008
+14009
+14010
+14011
+14012
+14013

     
     
-      
# File 'lib/kettle/jem.rb', line 13971
+      
# File 'lib/kettle/jem.rb', line 14002
 
 def commit_file_work_units(file_work_units, workers: 0, thread_workers: 0, stats: nil)
   units = Array(file_work_units)
@@ -38335,19 +38335,19 @@ 

       
 
 
-14008
-14009
-14010
-14011
-14012
-14013
-14014
-14015
-14016
-14017

+14039
+14040
+14041
+14042
+14043
+14044
+14045
+14046
+14047
+14048

     
     
-      
# File 'lib/kettle/jem.rb', line 14008
+      
# File 'lib/kettle/jem.rb', line 14039
 
 def commit_file_work_units_ractor(file_work_units, workers:)
   distribute_file_work_units(file_work_units, workers).map do |chunk|
@@ -38379,16 +38379,16 @@ 

       
 
 
-14000
-14001
-14002
-14003
-14004
-14005
-14006

+14031
+14032
+14033
+14034
+14035
+14036
+14037

     
     
-      
# File 'lib/kettle/jem.rb', line 14000
+      
# File 'lib/kettle/jem.rb', line 14031
 
 def commit_file_work_units_thread(file_work_units, workers:)
   distribute_file_work_units(file_work_units, workers).map do |chunk|
@@ -38417,12 +38417,12 @@ 

       
 
 
-14090
-14091
-14092

+14121
+14122
+14123

     
     
-      
# File 'lib/kettle/jem.rb', line 14090
+      
# File 'lib/kettle/jem.rb', line 14121
 
 def commit_filesystem_outcome(file_outcome)
   commit_filesystem_outcome_payload(file_outcome_payload(file_outcome))
@@ -38447,21 +38447,21 @@ 

       
 
 
-14099
-14100
-14101
-14102
-14103
-14104
-14105
-14106
-14107
-14108
-14109
-14110

+14130
+14131
+14132
+14133
+14134
+14135
+14136
+14137
+14138
+14139
+14140
+14141

     
     
-      
# File 'lib/kettle/jem.rb', line 14099
+      
# File 'lib/kettle/jem.rb', line 14130
 
 def commit_filesystem_outcome_payload(payload)
   path = payload.fetch(:absolute_path)
@@ -38495,12 +38495,12 @@ 

       
 
 
-14082
-14083
-14084

+14113
+14114
+14115

     
     
-      
# File 'lib/kettle/jem.rb', line 14082
+      
# File 'lib/kettle/jem.rb', line 14113
 
 def commit_write_intent(write_intent)
   commit_file_outcome(write_intent)
@@ -38525,12 +38525,12 @@ 

       
 
 
-20343
-20344
-20345

+20379
+20380
+20381

     
     
-      
# File 'lib/kettle/jem.rb', line 20343
+      
# File 'lib/kettle/jem.rb', line 20379
 
 def compact_hash(hash)
   hash.reject { |_key, value| value.nil? || (value.respond_to?(:empty?) && value.empty?) }
@@ -38578,28 +38578,28 @@ 

       
 
 
-9759
-9760
-9761
-9762
-9763
-9764
-9765
-9766
-9767
-9768
-9769
-9770
-9771
-9772
-9773
-9774
-9775
-9776
-9777

+9790
+9791
+9792
+9793
+9794
+9795
+9796
+9797
+9798
+9799
+9800
+9801
+9802
+9803
+9804
+9805
+9806
+9807
+9808

     
     
-      
# File 'lib/kettle/jem.rb', line 9759
+      
# File 'lib/kettle/jem.rb', line 9790
 
 def compatible_dependency_requirements?(direct_requirements, modular_requirements)
   direct = Gem::Requirement.new(*Array(direct_requirements).map(&:to_s))
@@ -38640,12 +38640,12 @@ 

       
 
 
-16725
-16726
-16727

+16757
+16758
+16759

     
     
-      
# File 'lib/kettle/jem.rb', line 16725
+      
# File 'lib/kettle/jem.rb', line 16757
 
 def concrete_github_url(url)
   github_org_from_url(url) ? url.to_s : nil
@@ -38670,14 +38670,14 @@ 

       
 
 
-18926
-18927
-18928
-18929
-18930

+18959
+18960
+18961
+18962
+18963

     
     
-      
# File 'lib/kettle/jem.rb', line 18926
+      
# File 'lib/kettle/jem.rb', line 18959
 
 def config_min_ruby(config)
   value = config.dig("rubygems", "min_ruby") || config["min_ruby"]
@@ -38704,25 +38704,25 @@ 

       
 
 
-18932
-18933
-18934
-18935
-18936
-18937
-18938
-18939
-18940
-18941
-18942
-18943
-18944
-18945
-18946
-18947

+18965
+18966
+18967
+18968
+18969
+18970
+18971
+18972
+18973
+18974
+18975
+18976
+18977
+18978
+18979
+18980

     
     
-      
# File 'lib/kettle/jem.rb', line 18932
+      
# File 'lib/kettle/jem.rb', line 18965
 
 def config_test_min_ruby(config, gem_min_ruby = nil)
   config ||= {}
@@ -38760,24 +38760,24 @@ 

       
 
 
-18020
-18021
-18022
-18023
-18024
-18025
-18026
-18027
-18028
-18029
-18030
-18031
-18032
-18033
-18034

+18052
+18053
+18054
+18055
+18056
+18057
+18058
+18059
+18060
+18061
+18062
+18063
+18064
+18065
+18066

     
     
-      
# File 'lib/kettle/jem.rb', line 18020
+      
# File 'lib/kettle/jem.rb', line 18052
 
 def configured_disabled_integrations(config)
   integrations = if config.is_a?(Hash) && config["integrations"].is_a?(Hash)
@@ -38814,22 +38814,22 @@ 

       
 
 
-17180
-17181
-17182
-17183
-17184
-17185
-17186
-17187
-17188
-17189
-17190
-17191
-17192

+17212
+17213
+17214
+17215
+17216
+17217
+17218
+17219
+17220
+17221
+17222
+17223
+17224

     
     
-      
# File 'lib/kettle/jem.rb', line 17180
+      
# File 'lib/kettle/jem.rb', line 17212
 
 def configured_readme_top_logo_entries(config, org:, gem_name:, repository: {})
   readme_config = (config.is_a?(Hash) && config["readme"].is_a?(Hash)) ? config["readme"] : {}
@@ -38864,19 +38864,19 @@ 

       
 
 
-6009
-6010
-6011
-6012
-6013
-6014
-6015
-6016
-6017
-6018

+6040
+6041
+6042
+6043
+6044
+6045
+6046
+6047
+6048
+6049

     
     
-      
# File 'lib/kettle/jem.rb', line 6009
+      
# File 'lib/kettle/jem.rb', line 6040
 
 def content_recipe_execution_report(request:, final_content:, changed:, step_reports:, diagnostics:, metadata: nil)
   compact_hash(
@@ -38908,16 +38908,16 @@ 

 
 
-6020
-6021
-6022
-6023
-6024
-6025
-6026

+6051
+6052
+6053
+6054
+6055
+6056
+6057

     
     
-      
# File 'lib/kettle/jem.rb', line 6020
+      
# File 'lib/kettle/jem.rb', line 6051
 
 def content_recipe_execution_report_envelope(report)
   {
@@ -38946,24 +38946,24 @@ 

       
 
 
-5985
-5986
-5987
-5988
-5989
-5990
-5991
-5992
-5993
-5994
-5995
-5996
-5997
-5998
-5999

+6016
+6017
+6018
+6019
+6020
+6021
+6022
+6023
+6024
+6025
+6026
+6027
+6028
+6029
+6030

     
     
-      
# File 'lib/kettle/jem.rb', line 5985
+      
# File 'lib/kettle/jem.rb', line 6016
 
 def content_recipe_execution_request(recipe_name:, recipe_version:, relative_path:, provider_family:,
   template_content:, destination_content:, steps:, provider_backend: nil, runtime_context: nil, metadata: nil)
@@ -39000,16 +39000,16 @@ 

 
 
-6001
-6002
-6003
-6004
-6005
-6006
-6007

+6032
+6033
+6034
+6035
+6036
+6037
+6038

     
     
-      
# File 'lib/kettle/jem.rb', line 6001
+      
# File 'lib/kettle/jem.rb', line 6032
 
 def content_recipe_execution_request_envelope(request)
   {
@@ -39038,30 +39038,30 @@ 

       
 
 
-6851
-6852
-6853
-6854
-6855
-6856
-6857
-6858
-6859
-6860
-6861
-6862
-6863
-6864
-6865
-6866
-6867
-6868
-6869
-6870
-6871

+6882
+6883
+6884
+6885
+6886
+6887
+6888
+6889
+6890
+6891
+6892
+6893
+6894
+6895
+6896
+6897
+6898
+6899
+6900
+6901
+6902

     
     
-      
# File 'lib/kettle/jem.rb', line 6851
+      
# File 'lib/kettle/jem.rb', line 6882
 
 def content_recipe_step(recipe)
   step = {
@@ -39104,41 +39104,41 @@ 

       
 
 
-6873
-6874
-6875
-6876
-6877
-6878
-6879
-6880
-6881
-6882
-6883
-6884
-6885
-6886
-6887
-6888
-6889
-6890
-6891
-6892
-6893
-6894
-6895
-6896
-6897
-6898
-6899
-6900
-6901
-6902
-6903
-6904

+6904
+6905
+6906
+6907
+6908
+6909
+6910
+6911
+6912
+6913
+6914
+6915
+6916
+6917
+6918
+6919
+6920
+6921
+6922
+6923
+6924
+6925
+6926
+6927
+6928
+6929
+6930
+6931
+6932
+6933
+6934
+6935

     
     
-      
# File 'lib/kettle/jem.rb', line 6873
+      
# File 'lib/kettle/jem.rb', line 6904
 
 def content_recipe_step_report(recipe:, request:, original:, final:, changed:, deletion: nil)
   operation_profile = Ast::Merge.structured_edit_operation_profile(
@@ -39215,12 +39215,12 @@ 

       
 
 
-18514
-18515
-18516

+18546
+18547
+18548

     
     
-      
# File 'lib/kettle/jem.rb', line 18514
+      
# File 'lib/kettle/jem.rb', line 18546
 
 def copy_only_when_missing_template_path?(relative_path)
   COPY_ONLY_WHEN_MISSING_TEMPLATE_PATHS.include?(relative_path.to_s)
@@ -39245,14 +39245,14 @@ 

       
 
 
-14885
-14886
-14887
-14888
-14889

+14917
+14918
+14919
+14920
+14921

     
     
-      
# File 'lib/kettle/jem.rb', line 14885
+      
# File 'lib/kettle/jem.rb', line 14917
 
 def copyright_author_names(copyright)
   Array(copyright[:lines]).filter_map do |line|
@@ -39302,12 +39302,12 @@ 

       
 
 
-15008
-15009
-15010

+15040
+15041
+15042

     
     
-      
# File 'lib/kettle/jem.rb', line 15008
+      
# File 'lib/kettle/jem.rb', line 15040
 
 def copyright_bot_entry?(entry)
   entry[:name].to_s.match?(BOT_IDENTITY_PATTERN) || entry[:email].to_s.match?(BOT_IDENTITY_PATTERN)
@@ -39332,17 +39332,17 @@ 

       
 
 
-14908
-14909
-14910
-14911
-14912
-14913
-14914
-14915

+14940
+14941
+14942
+14943
+14944
+14945
+14946
+14947

     
     
-      
# File 'lib/kettle/jem.rb', line 14908
+      
# File 'lib/kettle/jem.rb', line 14940
 
 def copyright_facts(project_root, config)
   lines = git_copyright_lines(
@@ -39395,19 +39395,19 @@ 

       
 
 
-15012
-15013
-15014
-15015
-15016
-15017
-15018
-15019
-15020
-15021

+15044
+15045
+15046
+15047
+15048
+15049
+15050
+15051
+15052
+15053

     
     
-      
# File 'lib/kettle/jem.rb', line 15012
+      
# File 'lib/kettle/jem.rb', line 15044
 
 def copyright_machine_user_entry?(entry, machine_users, author_aliases: {})
   return false if machine_users.empty?
@@ -39439,14 +39439,14 @@ 

       
 
 
-14917
-14918
-14919
-14920
-14921

+14949
+14950
+14951
+14952
+14953

     
     
-      
# File 'lib/kettle/jem.rb', line 14917
+      
# File 'lib/kettle/jem.rb', line 14949
 
 def copyright_machine_users(config)
   copyright = config["copyright"].is_a?(Hash) ? config["copyright"] : {}
@@ -39473,17 +39473,17 @@ 

       
 
 
-14891
-14892
-14893
-14894
-14895
-14896
-14897
-14898

+14923
+14924
+14925
+14926
+14927
+14928
+14929
+14930

     
     
-      
# File 'lib/kettle/jem.rb', line 14891
+      
# File 'lib/kettle/jem.rb', line 14923
 
 def copyright_name_from_line(line)
   prefix = "Copyright (c) "
@@ -39513,14 +39513,14 @@ 

       
 
 
-17628
-17629
-17630
-17631
-17632

+17660
+17661
+17662
+17663
+17664

     
     
-      
# File 'lib/kettle/jem.rb', line 17628
+      
# File 'lib/kettle/jem.rb', line 17660
 
 def copyright_notice_lines(copyright_lines, copyright_prefix, author)
   lines = Array(copyright_lines)
@@ -39570,12 +39570,12 @@ 

       
 
 
-14900
-14901
-14902

+14932
+14933
+14934

     
     
-      
# File 'lib/kettle/jem.rb', line 14900
+      
# File 'lib/kettle/jem.rb', line 14932
 
 def copyright_year_token?(token)
   token.delete(",-").chars.all? { |char| char.between?("0", "9") }
@@ -39600,15 +39600,15 @@ 

       
 
 
-7297
-7298
-7299
-7300
-7301
-7302

+7328
+7329
+7330
+7331
+7332
+7333

     
     
-      
# File 'lib/kettle/jem.rb', line 7297
+      
# File 'lib/kettle/jem.rb', line 7328
 
 def coverage_thresholds_from_mise(content)
   COVERAGE_THRESHOLD_KEYS.each_with_object({}) do |key, thresholds|
@@ -39636,17 +39636,17 @@ 

       
 
 
-7415
-7416
-7417
-7418
-7419
-7420
-7421
-7422

+7446
+7447
+7448
+7449
+7450
+7451
+7452
+7453

     
     
-      
# File 'lib/kettle/jem.rb', line 7415
+      
# File 'lib/kettle/jem.rb', line 7446
 
 def coverage_thresholds_from_project_mise(project_root)
   return {} if project_root.to_s.empty?
@@ -39676,21 +39676,21 @@ 

       
 
 
-7304
-7305
-7306
-7307
-7308
-7309
-7310
-7311
-7312
-7313
-7314
-7315

+7335
+7336
+7337
+7338
+7339
+7340
+7341
+7342
+7343
+7344
+7345
+7346

     
     
-      
# File 'lib/kettle/jem.rb', line 7304
+      
# File 'lib/kettle/jem.rb', line 7335
 
 def coverage_thresholds_from_workflow(project_root)
   return {} if project_root.to_s.empty?
@@ -39724,15 +39724,15 @@ 

       
 
 
-7424
-7425
-7426
-7427
-7428
-7429

+7455
+7456
+7457
+7458
+7459
+7460

     
     
-      
# File 'lib/kettle/jem.rb', line 7424
+      
# File 'lib/kettle/jem.rb', line 7455
 
 def coverage_thresholds_from_yaml_workflow(content)
   COVERAGE_THRESHOLD_KEYS.each_with_object({}) do |key, thresholds|
@@ -39760,20 +39760,20 @@ 

       
 
 
-7517
-7518
-7519
-7520
-7521
-7522
-7523
-7524
-7525
-7526
-7527

+7548
+7549
+7550
+7551
+7552
+7553
+7554
+7555
+7556
+7557
+7558

     
     
-      
# File 'lib/kettle/jem.rb', line 7517
+      
# File 'lib/kettle/jem.rb', line 7548
 
 def current_changelog_version_section(content, version)
   version_text = version.to_s.strip
@@ -39806,12 +39806,12 @@ 

       
 
 
-13302
-13303
-13304

+13333
+13334
+13335

     
     
-      
# File 'lib/kettle/jem.rb', line 13302
+      
# File 'lib/kettle/jem.rb', line 13333
 
 def decision_policy_for(env, run_options)
   DecisionPolicy.from_env(env || {}, **(run_options || {}))
@@ -39859,16 +39859,16 @@ 

       
 
 
-13269
-13270
-13271
-13272
-13273
-13274
-13275

+13300
+13301
+13302
+13303
+13304
+13305
+13306

     
     
-      
# File 'lib/kettle/jem.rb', line 13269
+      
# File 'lib/kettle/jem.rb', line 13300
 
 def decorative_grapheme?(grapheme)
   value = grapheme.to_s
@@ -39897,22 +39897,22 @@ 

 
 
-8178
-8179
-8180
-8181
-8182
-8183
-8184
-8185
-8186
-8187
-8188
-8189
-8190

+8209
+8210
+8211
+8212
+8213
+8214
+8215
+8216
+8217
+8218
+8219
+8220
+8221

     
     
-      
# File 'lib/kettle/jem.rb', line 8178
+      
# File 'lib/kettle/jem.rb', line 8209
 
 def deduplicate_main_gemfile_direct_sibling_blocks(content)
   records = main_gemfile_direct_sibling_records(content)
@@ -39947,43 +39947,43 @@ 

       
 
 
-8281
-8282
-8283
-8284
-8285
-8286
-8287
-8288
-8289
-8290
-8291
-8292
-8293
-8294
-8295
-8296
-8297
-8298
-8299
-8300
-8301
-8302
-8303
-8304
-8305
-8306
-8307
-8308
-8309
-8310
-8311
 8312
 8313
-8314

+8314
+8315
+8316
+8317
+8318
+8319
+8320
+8321
+8322
+8323
+8324
+8325
+8326
+8327
+8328
+8329
+8330
+8331
+8332
+8333
+8334
+8335
+8336
+8337
+8338
+8339
+8340
+8341
+8342
+8343
+8344
+8345

     
     
-      
# File 'lib/kettle/jem.rb', line 8281
+      
# File 'lib/kettle/jem.rb', line 8312
 
 def deduplicate_main_gemfile_eval_gemfiles(content)
   records = ruby_call_records(content, :eval_gemfile).filter_map do |call|
@@ -40039,15 +40039,15 @@ 

       
 
 
-17047
-17048
-17049
-17050
-17051
-17052

+17079
+17080
+17081
+17082
+17083
+17084

     
     
-      
# File 'lib/kettle/jem.rb', line 17047
+      
# File 'lib/kettle/jem.rb', line 17079
 
 def deduplicate_readme_corporate_sponsors(sponsors)
   sponsors
@@ -40075,14 +40075,14 @@ 

       
 
 
-17194
-17195
-17196
-17197
-17198

+17226
+17227
+17228
+17229
+17230

     
     
-      
# File 'lib/kettle/jem.rb', line 17194
+      
# File 'lib/kettle/jem.rb', line 17226
 
 def deduplicate_readme_top_logo_entries(entries)
   entries.group_by { |entry| entry[:image_url].to_s }.values.map do |group|
@@ -40109,12 +40109,12 @@ 

       
 
 
-20347
-20348
-20349

+20383
+20384
+20385

     
     
-      
# File 'lib/kettle/jem.rb', line 20347
+      
# File 'lib/kettle/jem.rb', line 20383
 
 def deep_dup(value)
   Marshal.load(Marshal.dump(value))
@@ -40139,21 +40139,21 @@ 

       
 
 
-3164
-3165
-3166
-3167
-3168
-3169
-3170
-3171
-3172
-3173
-3174
-3175

+3193
+3194
+3195
+3196
+3197
+3198
+3199
+3200
+3201
+3202
+3203
+3204

     
     
-      
# File 'lib/kettle/jem.rb', line 3164
+      
# File 'lib/kettle/jem.rb', line 3193
 
 def deep_string_key_hash(value)
   case value
@@ -40187,14 +40187,14 @@ 

       
 
 
-19202
-19203
-19204
-19205
-19206

+19235
+19236
+19237
+19238
+19239

     
     
-      
# File 'lib/kettle/jem.rb', line 19202
+      
# File 'lib/kettle/jem.rb', line 19235
 
 def default_framework_matrix_requirement(version)
   normalized = version.to_s
@@ -40244,12 +40244,12 @@ 

       
 
 
-11073
-11074
-11075

+11104
+11105
+11106

     
     
-      
# File 'lib/kettle/jem.rb', line 11073
+      
# File 'lib/kettle/jem.rb', line 11104
 
 def default_gemspec_metadata_assignment?(record)
   DEFAULT_GEMSPEC_METADATA_VALUES[record.fetch(:key)] == record[:value]
@@ -40274,19 +40274,19 @@ 

       
 
 
-17282
-17283
-17284
-17285
-17286
-17287
-17288
-17289
-17290
-17291

+17314
+17315
+17316
+17317
+17318
+17319
+17320
+17321
+17322
+17323

     
     
-      
# File 'lib/kettle/jem.rb', line 17282
+      
# File 'lib/kettle/jem.rb', line 17314
 
 def default_readme_top_logo_credit(type)
   case type
@@ -40318,23 +40318,23 @@ 

       
 
 
-17267
-17268
-17269
-17270
-17271
-17272
-17273
-17274
-17275
-17276
-17277
-17278
-17279
-17280

+17299
+17300
+17301
+17302
+17303
+17304
+17305
+17306
+17307
+17308
+17309
+17310
+17311
+17312

     
     
-      
# File 'lib/kettle/jem.rb', line 17267
+      
# File 'lib/kettle/jem.rb', line 17299
 
 def default_readme_top_logo_href(type, slug:, org:, gem_name:, repository: {})
   case type
@@ -40370,23 +40370,23 @@ 

       
 
 
-17236
-17237
-17238
-17239
-17240
-17241
-17242
-17243
-17244
-17245
-17246
-17247
-17248
-17249

+17268
+17269
+17270
+17271
+17272
+17273
+17274
+17275
+17276
+17277
+17278
+17279
+17280
+17281

     
     
-      
# File 'lib/kettle/jem.rb', line 17236
+      
# File 'lib/kettle/jem.rb', line 17268
 
 def default_readme_top_logo_slug(type, org:, gem_name:, repository: {})
   case type
@@ -40422,15 +40422,15 @@ 

       
 
 
-18798
-18799
-18800
-18801
-18802
-18803

+18831
+18832
+18833
+18834
+18835
+18836

     
     
-      
# File 'lib/kettle/jem.rb', line 18798
+      
# File 'lib/kettle/jem.rb', line 18831
 
 def default_template_config
   {
@@ -40458,21 +40458,21 @@ 

       
 
 
-18518
-18519
-18520
-18521
-18522
-18523
-18524
-18525
-18526
-18527
-18528
-18529

+18550
+18551
+18552
+18553
+18554
+18555
+18556
+18557
+18558
+18559
+18560
+18561

     
     
-      
# File 'lib/kettle/jem.rb', line 18518
+      
# File 'lib/kettle/jem.rb', line 18550
 
 def default_template_strategy_config(template_root, target_path)
   return unless template_root.fetch(:kind) == "packaged"
@@ -40518,35 +40518,35 @@ 

       
 
 
-19125
-19126
-19127
-19128
-19129
-19130
-19131
-19132
-19133
-19134
-19135
-19136
-19137
-19138
-19139
-19140
-19141
-19142
-19143
-19144
-19145
-19146
-19147
-19148
-19149
-19150

+19158
+19159
+19160
+19161
+19162
+19163
+19164
+19165
+19166
+19167
+19168
+19169
+19170
+19171
+19172
+19173
+19174
+19175
+19176
+19177
+19178
+19179
+19180
+19181
+19182
+19183

     
     
-      
# File 'lib/kettle/jem.rb', line 19125
+      
# File 'lib/kettle/jem.rb', line 19158
 
 def default_test_bundle_config(config, framework_matrix)
   raw = config["test_bundle"]
@@ -40594,24 +40594,24 @@ 

       
 
 
-19165
-19166
-19167
-19168
-19169
-19170
-19171
-19172
-19173
-19174
-19175
-19176
-19177
-19178
-19179

+19198
+19199
+19200
+19201
+19202
+19203
+19204
+19205
+19206
+19207
+19208
+19209
+19210
+19211
+19212

     
     
-      
# File 'lib/kettle/jem.rb', line 19165
+      
# File 'lib/kettle/jem.rb', line 19198
 
 def default_test_bundle_gem_entry(raw)
   return unless raw.is_a?(Hash)
@@ -40648,14 +40648,14 @@ 

       
 
 
-9441
-9442
-9443
-9444
-9445

+9472
+9473
+9474
+9475
+9476

     
     
-      
# File 'lib/kettle/jem.rb', line 9441
+      
# File 'lib/kettle/jem.rb', line 9472
 
 def default_test_bundle_gem_source(gem)
   arguments = [gem.fetch(:name).inspect, *gem.fetch(:requirements, []).map(&:inspect)]
@@ -40682,21 +40682,21 @@ 

       
 
 
-19152
-19153
-19154
-19155
-19156
-19157
-19158
-19159
-19160
-19161
-19162
-19163

+19185
+19186
+19187
+19188
+19189
+19190
+19191
+19192
+19193
+19194
+19195
+19196

     
     
-      
# File 'lib/kettle/jem.rb', line 19152
+      
# File 'lib/kettle/jem.rb', line 19185
 
 def default_test_bundle_gemfile_entry(raw)
   if raw.is_a?(Hash)
@@ -40753,12 +40753,12 @@ 

       
 
 
-13791
-13792
-13793

+13822
+13823
+13824

     
     
-      
# File 'lib/kettle/jem.rb', line 13791
+      
# File 'lib/kettle/jem.rb', line 13822
 
 def delete_file_recipe?(recipe)
   FILE_DELETION_PRIMITIVES.include?(recipe.fetch(:primitive))
@@ -40783,18 +40783,18 @@ 

       
 
 
-19527
-19528
-19529
-19530
-19531
-19532
-19533
-19534
-19535

+19560
+19561
+19562
+19563
+19564
+19565
+19566
+19567
+19568

     
     
-      
# File 'lib/kettle/jem.rb', line 19527
+      
# File 'lib/kettle/jem.rb', line 19560
 
 def delete_line_ranges(content, selectors)
   lines = content.lines
@@ -40825,13 +40825,13 @@ 

       
 
 
-7775
-7776
-7777
-7778

+7806
+7807
+7808
+7809

     
     
-      
# File 'lib/kettle/jem.rb', line 7775
+      
# File 'lib/kettle/jem.rb', line 7806
 
 def delete_markdown_with_ast_crispr(content, target)
   ensure_runtime_dependencies!
@@ -40857,16 +40857,16 @@ 

       
 
 
-7780
-7781
-7782
-7783
-7784
-7785
-7786

+7811
+7812
+7813
+7814
+7815
+7816
+7817

     
     
-      
# File 'lib/kettle/jem.rb', line 7780
+      
# File 'lib/kettle/jem.rb', line 7811
 
 def delete_markdown_with_ast_crispr_batch(content, *targets)
   ensure_runtime_dependencies!
@@ -40895,17 +40895,17 @@ 

       
 
 
-16043
-16044
-16045
-16046
-16047
-16048
-16049
-16050

+16075
+16076
+16077
+16078
+16079
+16080
+16081
+16082

     
     
-      
# File 'lib/kettle/jem.rb', line 16043
+      
# File 'lib/kettle/jem.rb', line 16075
 
 def delete_project_file(project_root, relative_path)
   path = File.join(project_root, relative_path)
@@ -40935,18 +40935,18 @@ 

       
 
 
-19389
-19390
-19391
-19392
-19393
-19394
-19395
-19396
-19397

+19422
+19423
+19424
+19425
+19426
+19427
+19428
+19429
+19430

     
     
-      
# File 'lib/kettle/jem.rb', line 19389
+      
# File 'lib/kettle/jem.rb', line 19422
 
 def delete_rakefile_scaffold(content)
   selectors = rakefile_scaffold_delete_selectors(content)
@@ -40977,29 +40977,29 @@ 

       
 
 
-7369
-7370
-7371
-7372
-7373
-7374
-7375
-7376
-7377
-7378
-7379
-7380
-7381
-7382
-7383
-7384
-7385
-7386
-7387
-7388

+7400
+7401
+7402
+7403
+7404
+7405
+7406
+7407
+7408
+7409
+7410
+7411
+7412
+7413
+7414
+7415
+7416
+7417
+7418
+7419

     
     
-      
# File 'lib/kettle/jem.rb', line 7369
+      
# File 'lib/kettle/jem.rb', line 7400
 
 def delete_yaml_top_level_mapping_entries(content, parent_key:, child_keys:)
   document = Psych.parse(content.to_s)
@@ -41041,19 +41041,19 @@ 

       
 
 
-9716
-9717
-9718
-9719
-9720
-9721
-9722
-9723
-9724
-9725

+9747
+9748
+9749
+9750
+9751
+9752
+9753
+9754
+9755
+9756

     
     
-      
# File 'lib/kettle/jem.rb', line 9716
+      
# File 'lib/kettle/jem.rb', line 9747
 
 def dependency_file_contents(project_root, recipe_reports, paths)
   reports = recipe_reports.to_h { |report| [report.fetch(:relative_path, "").to_s, report] }
@@ -41085,16 +41085,16 @@ 

       
 
 
-9708
-9709
-9710
-9711
-9712
-9713
-9714

+9739
+9740
+9741
+9742
+9743
+9744
+9745

     
     
-      
# File 'lib/kettle/jem.rb', line 9708
+      
# File 'lib/kettle/jem.rb', line 9739
 
 def dependency_records_for(path, content)
   if path == "Gemfile" || path.end_with?(".gemfile")
@@ -41123,15 +41123,15 @@ 

       
 
 
-4266
-4267
-4268
-4269
-4270
-4271

+4295
+4296
+4297
+4298
+4299
+4300

     
     
-      
# File 'lib/kettle/jem.rb', line 4266
+      
# File 'lib/kettle/jem.rb', line 4295
 
 def destination_file_sha256(project_root, relative_path)
   path = File.join(project_root.to_s, relative_path.to_s)
@@ -41159,15 +41159,15 @@ 

       
 
 
-5511
-5512
-5513
-5514
-5515
-5516

+5542
+5543
+5544
+5545
+5546
+5547

     
     
-      
# File 'lib/kettle/jem.rb', line 5511
+      
# File 'lib/kettle/jem.rb', line 5542
 
 def detected_license_ids(project_root)
   known_license_template_basenames.filter_map do |basename|
@@ -41218,16 +41218,16 @@ 

       
 
 
-15245
-15246
-15247
-15248
-15249
-15250
-15251

+15277
+15278
+15279
+15280
+15281
+15282
+15283

     
     
-      
# File 'lib/kettle/jem.rb', line 15245
+      
# File 'lib/kettle/jem.rb', line 15277
 
 def direct_sibling_directory_defines_gem?(sibling_path, gem_name)
   return false unless File.directory?(sibling_path)
@@ -41256,22 +41256,22 @@ 

       
 
 
-15334
-15335
-15336
-15337
-15338
-15339
-15340
-15341
-15342
-15343
-15344
-15345
-15346

+15366
+15367
+15368
+15369
+15370
+15371
+15372
+15373
+15374
+15375
+15376
+15377
+15378

     
     
-      
# File 'lib/kettle/jem.rb', line 15334
+      
# File 'lib/kettle/jem.rb', line 15366
 
 def direct_sibling_nomono_root_parts(workspace_slug, repository)
   parts = ["src", "my", workspace_slug].reject(&:empty?)
@@ -41306,31 +41306,31 @@ 

       
 
 
-15169
-15170
-15171
-15172
-15173
-15174
-15175
-15176
-15177
-15178
-15179
-15180
-15181
-15182
-15183
-15184
-15185
-15186
-15187
-15188
-15189
-15190

+15201
+15202
+15203
+15204
+15205
+15206
+15207
+15208
+15209
+15210
+15211
+15212
+15213
+15214
+15215
+15216
+15217
+15218
+15219
+15220
+15221
+15222

     
     
-      
# File 'lib/kettle/jem.rb', line 15169
+      
# File 'lib/kettle/jem.rb', line 15201
 
 def direct_sibling_runtime_gems(project_root, gemspec_metadata, package_name:, local_modular_eval_paths: {})
   return [] unless project_root && gemspec_metadata.is_a?(Hash)
@@ -41374,16 +41374,16 @@ 

       
 
 
-15326
-15327
-15328
-15329
-15330
-15331
-15332

+15358
+15359
+15360
+15361
+15362
+15363
+15364

     
     
-      
# File 'lib/kettle/jem.rb', line 15326
+      
# File 'lib/kettle/jem.rb', line 15358
 
 def direct_sibling_workspace_slug(source_url, project_root)
   slug = github_org_from_url(source_url).to_s
@@ -41412,12 +41412,12 @@ 

       
 
 
-18016
-18017
-18018

+18048
+18049
+18050

     
     
-      
# File 'lib/kettle/jem.rb', line 18016
+      
# File 'lib/kettle/jem.rb', line 18048
 
 def disabled_coverage_integrations(config)
   configured_disabled_integrations(config) & COVERAGE_INTEGRATIONS
@@ -41442,19 +41442,19 @@ 

       
 
 
-18893
-18894
-18895
-18896
-18897
-18898
-18899
-18900
-18901
-18902

+18926
+18927
+18928
+18929
+18930
+18931
+18932
+18933
+18934
+18935

     
     
-      
# File 'lib/kettle/jem.rb', line 18893
+      
# File 'lib/kettle/jem.rb', line 18926
 
 def disabled_integration_config_cleanups(project_root, config)
   disabled_integrations(config).flat_map do |integration|
@@ -41509,16 +41509,16 @@ 

       
 
 
-18904
-18905
-18906
-18907
-18908
-18909
-18910

+18937
+18938
+18939
+18940
+18941
+18942
+18943

     
     
-      
# File 'lib/kettle/jem.rb', line 18904
+      
# File 'lib/kettle/jem.rb', line 18937
 
 def disabled_integration_template_path?(target_path, config)
   disabled = disabled_integrations(config)
@@ -41547,14 +41547,14 @@ 

       
 
 
-18010
-18011
-18012
-18013
-18014

+18042
+18043
+18044
+18045
+18046

     
     
-      
# File 'lib/kettle/jem.rb', line 18010
+      
# File 'lib/kettle/jem.rb', line 18042
 
 def disabled_integrations(config, license: nil)
   disabled = configured_disabled_integrations(config)
@@ -41604,35 +41604,6 @@ 

       
 
 
-3321
-3322
-3323
-3324
-3325
-3326
-3327
-3328
-3329
-3330
-3331
-3332
-3333
-3334
-3335
-3336
-3337
-3338
-3339
-3340
-3341
-3342
-3343
-3344
-3345
-3346
-3347
-3348
-3349
 3350
 3351
 3352
@@ -41922,10 +41893,39 @@ 

 3636
 3637
 3638
-3639

+3639
+3640
+3641
+3642
+3643
+3644
+3645
+3646
+3647
+3648
+3649
+3650
+3651
+3652
+3653
+3654
+3655
+3656
+3657
+3658
+3659
+3660
+3661
+3662
+3663
+3664
+3665
+3666
+3667
+3668

     
     
-      
# File 'lib/kettle/jem.rb', line 3321
+      
# File 'lib/kettle/jem.rb', line 3350
 
 def discover_facts(project_root, env: ENV, run_options: {})
   kettle_config = kettle_jem_config(project_root)
@@ -42266,35 +42266,6 @@ 

       
 
 
-3200
-3201
-3202
-3203
-3204
-3205
-3206
-3207
-3208
-3209
-3210
-3211
-3212
-3213
-3214
-3215
-3216
-3217
-3218
-3219
-3220
-3221
-3222
-3223
-3224
-3225
-3226
-3227
-3228
 3229
 3230
 3231
@@ -42385,10 +42356,39 @@ 

 3316
 3317
 3318
-3319

+3319
+3320
+3321
+3322
+3323
+3324
+3325
+3326
+3327
+3328
+3329
+3330
+3331
+3332
+3333
+3334
+3335
+3336
+3337
+3338
+3339
+3340
+3341
+3342
+3343
+3344
+3345
+3346
+3347
+3348

     
     
-      
# File 'lib/kettle/jem.rb', line 3200
+      
# File 'lib/kettle/jem.rb', line 3229
 
 def discover_monorepo_root_facts(project_root, kettle_config, env, template_selection)
   source_url = git_remote_source_url(project_root)
@@ -42540,14 +42540,14 @@ 

       
 
 
-2585
-2586
-2587
-2588
-2589

+2614
+2615
+2616
+2617
+2618

     
     
-      
# File 'lib/kettle/jem.rb', line 2585
+      
# File 'lib/kettle/jem.rb', line 2614
 
 def display_path(path)
   return path if path.nil?
@@ -42574,14 +42574,14 @@ 

       
 
 
-2591
-2592
-2593
-2594
-2595

+2620
+2621
+2622
+2623
+2624

     
     
-      
# File 'lib/kettle/jem.rb', line 2591
+      
# File 'lib/kettle/jem.rb', line 2620
 
 def display_text(text)
   return text if text.nil?
@@ -42608,16 +42608,16 @@ 

       
 
 
-14019
-14020
-14021
-14022
-14023
-14024
-14025

+14050
+14051
+14052
+14053
+14054
+14055
+14056

     
     
-      
# File 'lib/kettle/jem.rb', line 14019
+      
# File 'lib/kettle/jem.rb', line 14050
 
 def distribute_file_work_units(file_work_units, workers)
   chunks = Array.new([workers, file_work_units.length].min) { [] }
@@ -42646,21 +42646,21 @@ 

       
 
 
-10478
-10479
-10480
-10481
-10482
-10483
-10484
-10485
-10486
-10487
-10488
-10489

+10509
+10510
+10511
+10512
+10513
+10514
+10515
+10516
+10517
+10518
+10519
+10520

     
     
-      
# File 'lib/kettle/jem.rb', line 10478
+      
# File 'lib/kettle/jem.rb', line 10509
 
 def dotenv_merge_options(recipe)
   options = {
@@ -42694,46 +42694,46 @@ 

       
 
 
-5783
-5784
-5785
-5786
-5787
-5788
-5789
-5790
-5791
-5792
-5793
-5794
-5795
-5796
-5797
-5798
-5799
-5800
-5801
-5802
-5803
-5804
-5805
-5806
-5807
-5808
-5809
-5810
-5811
-5812
-5813
 5814
 5815
 5816
 5817
 5818
-5819

+5819
+5820
+5821
+5822
+5823
+5824
+5825
+5826
+5827
+5828
+5829
+5830
+5831
+5832
+5833
+5834
+5835
+5836
+5837
+5838
+5839
+5840
+5841
+5842
+5843
+5844
+5845
+5846
+5847
+5848
+5849
+5850

     
     
-      
# File 'lib/kettle/jem.rb', line 5783
+      
# File 'lib/kettle/jem.rb', line 5814
 
 def duplicate_drift_report(project_root:, template_root:, run_options: {})
   runner = run_options[:duplicate_drift_runner] || run_options["duplicate_drift_runner"]
@@ -42792,12 +42792,12 @@ 

       
 
 
-4803
-4804
-4805

+4832
+4833
+4834

     
     
-      
# File 'lib/kettle/jem.rb', line 4803
+      
# File 'lib/kettle/jem.rb', line 4832
 
 def duration_ms_since(started_at)
   ((monotonic_time - started_at) * 1000).round(3)
@@ -42822,25 +42822,25 @@ 

       
 
 
-4875
-4876
-4877
-4878
-4879
-4880
-4881
-4882
-4883
-4884
-4885
-4886
-4887
-4888
-4889
-4890

+4904
+4905
+4906
+4907
+4908
+4909
+4910
+4911
+4912
+4913
+4914
+4915
+4916
+4917
+4918
+4919

     
     
-      
# File 'lib/kettle/jem.rb', line 4875
+      
# File 'lib/kettle/jem.rb', line 4904
 
 def emit_diagnostic_events(events, diagnostics)
   Array(diagnostics).each_with_index do |diagnostic, index|
@@ -42878,12 +42878,12 @@ 

       
 
 
-4921
-4922
-4923

+4950
+4951
+4952

     
     
-      
# File 'lib/kettle/jem.rb', line 4921
+      
# File 'lib/kettle/jem.rb', line 4950
 
 def emit_event(events, type, payload = {})
   Kettle::Ndjson.emit_event(events, type, payload)
@@ -42908,12 +42908,12 @@ 

       
 
 
-4773
-4774
-4775

+4802
+4803
+4804

     
     
-      
# File 'lib/kettle/jem.rb', line 4773
+      
# File 'lib/kettle/jem.rb', line 4802
 
 def emit_phase_event(events, phase, status:, **payload)
   Kettle::Ndjson.emit_phase_event(events, phase, status: status, **payload)
@@ -42938,24 +42938,24 @@ 

       
 
 
-4777
-4778
-4779
-4780
-4781
-4782
-4783
-4784
-4785
-4786
-4787
-4788
-4789
-4790
-4791

+4806
+4807
+4808
+4809
+4810
+4811
+4812
+4813
+4814
+4815
+4816
+4817
+4818
+4819
+4820

     
     
-      
# File 'lib/kettle/jem.rb', line 4777
+      
# File 'lib/kettle/jem.rb', line 4806
 
 def emit_recipe_event(events, report, index:, total:)
   payload = {
@@ -42992,26 +42992,26 @@ 

       
 
 
-4850
-4851
-4852
-4853
-4854
-4855
-4856
-4857
-4858
-4859
-4860
-4861
-4862
-4863
-4864
-4865
-4866

+4879
+4880
+4881
+4882
+4883
+4884
+4885
+4886
+4887
+4888
+4889
+4890
+4891
+4892
+4893
+4894
+4895

     
     
-      
# File 'lib/kettle/jem.rb', line 4850
+      
# File 'lib/kettle/jem.rb', line 4879
 
 def emit_step_event(events, event_type, step, phase:, index: nil, total: nil)
   emit_event(
@@ -43050,14 +43050,14 @@ 

       
 
 
-4844
-4845
-4846
-4847
-4848

+4873
+4874
+4875
+4876
+4877

     
     
-      
# File 'lib/kettle/jem.rb', line 4844
+      
# File 'lib/kettle/jem.rb', line 4873
 
 def emit_step_events(events, event_type, steps, phase:)
   Array(steps).each_with_index do |step, index|
@@ -43084,27 +43084,27 @@ 

       
 
 
-4902
-4903
-4904
-4905
-4906
-4907
-4908
-4909
-4910
-4911
-4912
-4913
-4914
-4915
-4916
-4917
-4918
-4919

+4931
+4932
+4933
+4934
+4935
+4936
+4937
+4938
+4939
+4940
+4941
+4942
+4943
+4944
+4945
+4946
+4947
+4948

     
     
-      
# File 'lib/kettle/jem.rb', line 4902
+      
# File 'lib/kettle/jem.rb', line 4931
 
 def emit_summary_event(events, report)
   file_outcomes = report.fetch(:file_outcomes, {})
@@ -43144,41 +43144,41 @@ 

 
 
-12115
-12116
-12117
-12118
-12119
-12120
-12121
-12122
-12123
-12124
-12125
-12126
-12127
-12128
-12129
-12130
-12131
-12132
-12133
-12134
-12135
-12136
-12137
-12138
-12139
-12140
-12141
-12142
-12143
-12144
-12145
-12146

+12146
+12147
+12148
+12149
+12150
+12151
+12152
+12153
+12154
+12155
+12156
+12157
+12158
+12159
+12160
+12161
+12162
+12163
+12164
+12165
+12166
+12167
+12168
+12169
+12170
+12171
+12172
+12173
+12174
+12175
+12176
+12177

     
     
-      
# File 'lib/kettle/jem.rb', line 12115
+      
# File 'lib/kettle/jem.rb', line 12146
 
 def empty_gemspec_development_dependency_section_matches(lines, heading_line_indexes:, dependency_line_indexes:)
   matches = []
@@ -43232,47 +43232,47 @@ 

 
 
-12076
-12077
-12078
-12079
-12080
-12081
-12082
-12083
-12084
-12085
-12086
-12087
-12088
-12089
-12090
-12091
-12092
-12093
-12094
-12095
-12096
-12097
-12098
-12099
-12100
-12101
-12102
-12103
-12104
-12105
-12106
 12107
 12108
 12109
 12110
 12111
 12112
-12113

+12113
+12114
+12115
+12116
+12117
+12118
+12119
+12120
+12121
+12122
+12123
+12124
+12125
+12126
+12127
+12128
+12129
+12130
+12131
+12132
+12133
+12134
+12135
+12136
+12137
+12138
+12139
+12140
+12141
+12142
+12143
+12144

     
     
-      
# File 'lib/kettle/jem.rb', line 12076
+      
# File 'lib/kettle/jem.rb', line 12107
 
 def empty_gemspec_development_dependency_sections_target(receiver:)
   Ast::Crispr::OwnerSelector.new(
@@ -43332,13 +43332,13 @@ 

       
 
 
-18921
-18922
-18923
-18924

+18954
+18955
+18956
+18957

     
     
-      
# File 'lib/kettle/jem.rb', line 18921
+      
# File 'lib/kettle/jem.rb', line 18954
 
 def enabled_ruby_engines(config)
   engines = ruby_engines_config(config)
@@ -43364,25 +43364,25 @@ 

 
 
-11917
-11918
-11919
-11920
-11921
-11922
-11923
-11924
-11925
-11926
-11927
-11928
-11929
-11930
-11931
-11932

+11948
+11949
+11950
+11951
+11952
+11953
+11954
+11955
+11956
+11957
+11958
+11959
+11960
+11961
+11962
+11963

     
     
-      
# File 'lib/kettle/jem.rb', line 11917
+      
# File 'lib/kettle/jem.rb', line 11948
 
 def enforce_gemspec_dependency_minimum_requirements(source, receiver:)
   replacements = ruby_call_records(source, nil).filter_map do |call|
@@ -43443,15 +43443,15 @@ 

       
 
 
-13741
-13742
-13743
-13744
-13745
-13746

+13772
+13773
+13774
+13775
+13776
+13777

     
     
-      
# File 'lib/kettle/jem.rb', line 13741
+      
# File 'lib/kettle/jem.rb', line 13772
 
 def enforce_git_preflight!(git_preflight, decision_policy:, template_selection:)
   return unless decision_policy.require_clean
@@ -43479,36 +43479,36 @@ 

 
 
-16162
-16163
-16164
-16165
-16166
-16167
-16168
-16169
-16170
-16171
-16172
-16173
-16174
-16175
-16176
-16177
-16178
-16179
-16180
-16181
-16182
-16183
-16184
-16185
-16186
-16187
-16188

+16194
+16195
+16196
+16197
+16198
+16199
+16200
+16201
+16202
+16203
+16204
+16205
+16206
+16207
+16208
+16209
+16210
+16211
+16212
+16213
+16214
+16215
+16216
+16217
+16218
+16219
+16220

     
     
-      
# File 'lib/kettle/jem.rb', line 16162
+      
# File 'lib/kettle/jem.rb', line 16194
 
 def ensure_entrypoint_namespace_superclass_declarations(content, namespace:, namespace_superclasses: {})
   # A version file must only reopen a namesake class.  When legacy source
@@ -43557,19 +43557,19 @@ 

 
 
-10923
-10924
-10925
-10926
-10927
-10928
-10929
-10930
-10931
-10932

+10954
+10955
+10956
+10957
+10958
+10959
+10960
+10961
+10962
+10963

     
     
-      
# File 'lib/kettle/jem.rb', line 10923
+      
# File 'lib/kettle/jem.rb', line 10954
 
 def ensure_gemspec_legacy_version_loader_preamble(content, entrypoint_require:, namespace:, min_ruby:, superclass_sensitive: false, fallback_version: nil)
   block = "#{gemspec_legacy_version_loader_block(entrypoint_require: entrypoint_require, namespace: namespace, min_ruby: min_ruby, superclass_sensitive: superclass_sensitive, fallback_version: fallback_version)}\n"
@@ -43601,24 +43601,24 @@ 

       
 
 
-11004
-11005
-11006
-11007
-11008
-11009
-11010
-11011
-11012
-11013
-11014
-11015
-11016
-11017
-11018

+11035
+11036
+11037
+11038
+11039
+11040
+11041
+11042
+11043
+11044
+11045
+11046
+11047
+11048
+11049

     
     
-      
# File 'lib/kettle/jem.rb', line 11004
+      
# File 'lib/kettle/jem.rb', line 11035
 
 def ensure_gemspec_metadata_assignment(content, receiver:, key:, value:)
   replacement = %(#{receiver}.metadata[#{key.to_s.dump}] = #{value.to_s.dump})
@@ -43655,23 +43655,23 @@ 

       
 
 
-8238
-8239
-8240
-8241
-8242
-8243
-8244
-8245
-8246
-8247
-8248
-8249
-8250
-8251

+8269
+8270
+8271
+8272
+8273
+8274
+8275
+8276
+8277
+8278
+8279
+8280
+8281
+8282

     
     
-      
# File 'lib/kettle/jem.rb', line 8238
+      
# File 'lib/kettle/jem.rb', line 8269
 
 def ensure_main_gemfile_nomono_bootstrap(content, template_content)
   return content if gemfile_declares_gem?(content, "nomono")
@@ -43707,22 +43707,22 @@ 

 
 
-5450
-5451
-5452
-5453
-5454
-5455
-5456
-5457
-5458
-5459
-5460
-5461
-5462

+5481
+5482
+5483
+5484
+5485
+5486
+5487
+5488
+5489
+5490
+5491
+5492
+5493

     
     
-      
# File 'lib/kettle/jem.rb', line 5450
+      
# File 'lib/kettle/jem.rb', line 5481
 
 def ensure_monorepo_root_gemfile_dependencies(content)
   updated = reconcile_template_managed_dependencies(
@@ -43767,24 +43767,24 @@ 

       
 
 
-2568
-2569
-2570
-2571
-2572
-2573
-2574
-2575
-2576
-2577
-2578
-2579
-2580
-2581
-2582

+2597
+2598
+2599
+2600
+2601
+2602
+2603
+2604
+2605
+2606
+2607
+2608
+2609
+2610
+2611

     
     
-      
# File 'lib/kettle/jem.rb', line 2568
+      
# File 'lib/kettle/jem.rb', line 2597
 
 def ensure_runtime_dependencies!
   return if defined?(@runtime_dependencies_loaded) && @runtime_dependencies_loaded
@@ -43821,21 +43821,21 @@ 

 
 
-8758
-8759
-8760
-8761
-8762
-8763
-8764
-8765
-8766
-8767
-8768
-8769

+8789
+8790
+8791
+8792
+8793
+8794
+8795
+8796
+8797
+8798
+8799
+8800

     
     
-      
# File 'lib/kettle/jem.rb', line 8758
+      
# File 'lib/kettle/jem.rb', line 8789
 
 def ensure_spec_helper_simplecov_config_require(content)
   return content if simplecov_config_require_call_nodes(content).any?
@@ -43869,21 +43869,21 @@ 

 
 
-8663
-8664
-8665
-8666
-8667
-8668
-8669
-8670
-8671
-8672
-8673
-8674

+8694
+8695
+8696
+8697
+8698
+8699
+8700
+8701
+8702
+8703
+8704
+8705

     
     
-      
# File 'lib/kettle/jem.rb', line 8663
+      
# File 'lib/kettle/jem.rb', line 8694
 
 def ensure_spec_helper_simplecov_do_cov_bootstrap(content)
   record = simplecov_do_cov_bootstrap_records(content).first
@@ -43917,21 +43917,21 @@ 

       
 
 
-8771
-8772
-8773
-8774
-8775
-8776
-8777
-8778
-8779
-8780
-8781
-8782

+8802
+8803
+8804
+8805
+8806
+8807
+8808
+8809
+8810
+8811
+8812
+8813

     
     
-      
# File 'lib/kettle/jem.rb', line 8771
+      
# File 'lib/kettle/jem.rb', line 8802
 
 def ensure_spec_helper_simplecov_start(content)
   return content if simplecov_start_call_nodes(content).any?
@@ -43965,14 +43965,14 @@ 

       
 
 
-20337
-20338
-20339
-20340
-20341

+20373
+20374
+20375
+20376
+20377

     
     
-      
# File 'lib/kettle/jem.rb', line 20337
+      
# File 'lib/kettle/jem.rb', line 20373
 
 def ensure_trailing_newline(text)
   return "" if text.to_s.empty?
@@ -43999,24 +43999,24 @@ 

       
 
 
-19989
-19990
-19991
-19992
-19993
-19994
-19995
-19996
-19997
-19998
-19999
-20000
-20001
-20002
-20003

+20025
+20026
+20027
+20028
+20029
+20030
+20031
+20032
+20033
+20034
+20035
+20036
+20037
+20038
+20039

     
     
-      
# File 'lib/kettle/jem.rb', line 19989
+      
# File 'lib/kettle/jem.rb', line 20025
 
 def ensure_workflow_top_level_section(content, key, section, before:)
   top_level_keys = yaml_top_level_key_lines(content)
@@ -44053,41 +44053,41 @@ 

       
 
 
-12816
-12817
-12818
-12819
-12820
-12821
-12822
-12823
-12824
-12825
-12826
-12827
-12828
-12829
-12830
-12831
-12832
-12833
-12834
-12835
-12836
-12837
-12838
-12839
-12840
-12841
-12842
-12843
-12844
-12845
-12846
-12847

+12847
+12848
+12849
+12850
+12851
+12852
+12853
+12854
+12855
+12856
+12857
+12858
+12859
+12860
+12861
+12862
+12863
+12864
+12865
+12866
+12867
+12868
+12869
+12870
+12871
+12872
+12873
+12874
+12875
+12876
+12877
+12878

     
     
-      
# File 'lib/kettle/jem.rb', line 12816
+      
# File 'lib/kettle/jem.rb', line 12847
 
 def ensure_yaml_top_level_sequence_items(content, key, items)
   document = Psych.parse_stream(content.to_s).children.first
@@ -44164,27 +44164,27 @@ 

       
 
 
-15750
-15751
-15752
-15753
-15754
-15755
-15756
-15757
-15758
-15759
-15760
-15761
-15762
-15763
-15764
-15765
-15766
-15767

+15782
+15783
+15784
+15785
+15786
+15787
+15788
+15789
+15790
+15791
+15792
+15793
+15794
+15795
+15796
+15797
+15798
+15799

     
     
-      
# File 'lib/kettle/jem.rb', line 15750
+      
# File 'lib/kettle/jem.rb', line 15782
 
 def entrypoint_loads_version_file?(content, project_root:, entrypoint_path:, version_path:)
   return false if content.to_s.empty?
@@ -44224,18 +44224,18 @@ 

 
 
-16420
-16421
-16422
-16423
-16424
-16425
-16426
-16427
-16428

+16452
+16453
+16454
+16455
+16456
+16457
+16458
+16459
+16460

     
     
-      
# File 'lib/kettle/jem.rb', line 16420
+      
# File 'lib/kettle/jem.rb', line 16452
 
 def entrypoint_namespace_superclasses_from_facts(facts)
   raw = facts.dig(:rubygems, :entrypoint_namespace_superclasses)
@@ -44266,15 +44266,15 @@ 

       
 
 
-11786
-11787
-11788
-11789
-11790
-11791

+11817
+11818
+11819
+11820
+11821
+11822

     
     
-      
# File 'lib/kettle/jem.rb', line 11786
+      
# File 'lib/kettle/jem.rb', line 11817
 
 def env_overridden_gemspec_fields(env)
   fields = []
@@ -44302,16 +44302,16 @@ 

       
 
 
-12572
-12573
-12574
-12575
-12576
-12577
-12578

+12603
+12604
+12605
+12606
+12607
+12608
+12609

     
     
-      
# File 'lib/kettle/jem.rb', line 12572
+      
# File 'lib/kettle/jem.rb', line 12603
 
 def env_sync_value(env, env_key)
   Array(env_key).each do |candidate|
@@ -44363,18 +44363,18 @@ 

       
 
 
-16487
-16488
-16489
-16490
-16491
-16492
-16493
-16494
-16495

+16519
+16520
+16521
+16522
+16523
+16524
+16525
+16526
+16527

     
     
-      
# File 'lib/kettle/jem.rb', line 16487
+      
# File 'lib/kettle/jem.rb', line 16519
 
 def error_class_namespace?(content, namespace)
   return false unless namespace.to_s.split("::").last == "Error"
@@ -44405,12 +44405,12 @@ 

       
 
 
-4892
-4893
-4894

+4921
+4922
+4923

     
     
-      
# File 'lib/kettle/jem.rb', line 4892
+      
# File 'lib/kettle/jem.rb', line 4921
 
 def event_payload_value(payload, key)
   payload.fetch(key, payload.fetch(key.to_s, nil))
@@ -44435,17 +44435,17 @@ 

       
 
 
-4715
-4716
-4717
-4718
-4719
-4720
-4721
-4722

+4744
+4745
+4746
+4747
+4748
+4749
+4750
+4751

     
     
-      
# File 'lib/kettle/jem.rb', line 4715
+      
# File 'lib/kettle/jem.rb', line 4744
 
 def event_stream(io, types: nil)
   Kettle::Ndjson.event_stream(
@@ -44475,20 +44475,20 @@ 

       
 
 
-4734
-4735
-4736
-4737
-4738
-4739
-4740
-4741
-4742
-4743
-4744

+4763
+4764
+4765
+4766
+4767
+4768
+4769
+4770
+4771
+4772
+4773

     
     
-      
# File 'lib/kettle/jem.rb', line 4734
+      
# File 'lib/kettle/jem.rb', line 4763
 
 def event_stream_from_options(run_options)
   options = run_options || {}
@@ -44544,15 +44544,15 @@ 

       
 
 
-12231
-12232
-12233
-12234
-12235
-12236

+12262
+12263
+12264
+12265
+12266
+12267

     
     
-      
# File 'lib/kettle/jem.rb', line 12231
+      
# File 'lib/kettle/jem.rb', line 12262
 
 def excluded_gemspec_dependency_key?(key)
   return true if PROHIBITED_GEMSPEC_DEPENDENCIES.include?(key.last)
@@ -44580,21 +44580,21 @@ 

       
 
 
-5109
-5110
-5111
-5112
-5113
-5114
-5115
-5116
-5117
-5118
-5119
-5120

+5138
+5139
+5140
+5141
+5142
+5143
+5144
+5145
+5146
+5147
+5148
+5149

     
     
-      
# File 'lib/kettle/jem.rb', line 5109
+      
# File 'lib/kettle/jem.rb', line 5138
 
 def executable_version_constant_nodes(node, namespaces)
   constants = []
@@ -44641,35 +44641,6 @@ 

 
 
-4992
-4993
-4994
-4995
-4996
-4997
-4998
-4999
-5000
-5001
-5002
-5003
-5004
-5005
-5006
-5007
-5008
-5009
-5010
-5011
-5012
-5013
-5014
-5015
-5016
-5017
-5018
-5019
-5020
 5021
 5022
 5023
@@ -44679,10 +44650,39 @@ 

+5030
+5031
+5032
+5033
+5034
+5035
+5036
+5037
+5038
+5039
+5040
+5041
+5042
+5043
+5044
+5045
+5046
+5047
+5048
+5049
+5050
+5051
+5052
+5053
+5054
+5055
+5056
+5057
+5058
+5059

     
     
-      
# File 'lib/kettle/jem.rb', line 4992
+      
# File 'lib/kettle/jem.rb', line 5021
 
 def executable_version_entrypoint_sync_step(project_root, report)
   facts = report.fetch(:facts)
@@ -44743,25 +44743,25 @@ 

       
 
 
-4504
-4505
-4506
-4507
-4508
-4509
-4510
-4511
-4512
-4513
-4514
-4515
-4516
-4517
-4518
-4519

+4533
+4534
+4535
+4536
+4537
+4538
+4539
+4540
+4541
+4542
+4543
+4544
+4545
+4546
+4547
+4548

     
     
-      
# File 'lib/kettle/jem.rb', line 4504
+      
# File 'lib/kettle/jem.rb', line 4533
 
 def execute_indexed_recipe_reports(project_root:, indexed_recipes:, facts:, files:, template_contents:, decision_policy:, env:)
   indexed_recipes.to_h do |recipe, index|
@@ -44799,38 +44799,38 @@ 

       
 
 
-4535
-4536
-4537
-4538
-4539
-4540
-4541
-4542
-4543
-4544
-4545
-4546
-4547
-4548
-4549
-4550
-4551
-4552
-4553
-4554
-4555
-4556
-4557
-4558
-4559
-4560
-4561
-4562
-4563

+4564
+4565
+4566
+4567
+4568
+4569
+4570
+4571
+4572
+4573
+4574
+4575
+4576
+4577
+4578
+4579
+4580
+4581
+4582
+4583
+4584
+4585
+4586
+4587
+4588
+4589
+4590
+4591
+4592

     
     
-      
# File 'lib/kettle/jem.rb', line 4535
+      
# File 'lib/kettle/jem.rb', line 4564
 
 def execute_indexed_recipe_reports_thread(project_root:, indexed_recipes:, facts:, files:, template_contents:, decision_policy:, env:, workers:)
   chunks = Array.new(workers) { [] }
@@ -44881,37 +44881,6 @@ 

       
 
 
-6729
-6730
-6731
-6732
-6733
-6734
-6735
-6736
-6737
-6738
-6739
-6740
-6741
-6742
-6743
-6744
-6745
-6746
-6747
-6748
-6749
-6750
-6751
-6752
-6753
-6754
-6755
-6756
-6757
-6758
-6759
 6760
 6761
 6762
@@ -44991,10 +44960,41 @@ 

 6836
 6837
 6838
-6839

+6839
+6840
+6841
+6842
+6843
+6844
+6845
+6846
+6847
+6848
+6849
+6850
+6851
+6852
+6853
+6854
+6855
+6856
+6857
+6858
+6859
+6860
+6861
+6862
+6863
+6864
+6865
+6866
+6867
+6868
+6869
+6870

     
     
-      
# File 'lib/kettle/jem.rb', line 6729
+      
# File 'lib/kettle/jem.rb', line 6760
 
 def execute_recipe(project_root:, recipe:, facts:, files:, decision_policy:, env: ENV, template_contents: nil)
   relative_path = recipe.fetch(:target_path)
@@ -45127,35 +45127,6 @@ 

       
 
 
-4365
-4366
-4367
-4368
-4369
-4370
-4371
-4372
-4373
-4374
-4375
-4376
-4377
-4378
-4379
-4380
-4381
-4382
-4383
-4384
-4385
-4386
-4387
-4388
-4389
-4390
-4391
-4392
-4393
 4394
 4395
 4396
@@ -45169,10 +45140,39 @@ 

 4404
 4405
 4406
-4407

+4407
+4408
+4409
+4410
+4411
+4412
+4413
+4414
+4415
+4416
+4417
+4418
+4419
+4420
+4421
+4422
+4423
+4424
+4425
+4426
+4427
+4428
+4429
+4430
+4431
+4432
+4433
+4434
+4435
+4436

     
     
-      
# File 'lib/kettle/jem.rb', line 4365
+      
# File 'lib/kettle/jem.rb', line 4394
 
 def execute_recipe_reports(project_root:, recipes:, facts:, files:, template_contents:, decision_policy:, env:, events:, strategy:, workers: 0, thread_workers: 0, stats: nil)
   case strategy.to_s
@@ -45260,35 +45260,6 @@ 

       
 
 
-4425
-4426
-4427
-4428
-4429
-4430
-4431
-4432
-4433
-4434
-4435
-4436
-4437
-4438
-4439
-4440
-4441
-4442
-4443
-4444
-4445
-4446
-4447
-4448
-4449
-4450
-4451
-4452
-4453
 4454
 4455
 4456
@@ -45337,10 +45308,39 @@ 

 4499
 4500
 4501
-4502

+4502
+4503
+4504
+4505
+4506
+4507
+4508
+4509
+4510
+4511
+4512
+4513
+4514
+4515
+4516
+4517
+4518
+4519
+4520
+4521
+4522
+4523
+4524
+4525
+4526
+4527
+4528
+4529
+4530
+4531

     
     
-      
# File 'lib/kettle/jem.rb', line 4425
+      
# File 'lib/kettle/jem.rb', line 4454
 
 def execute_recipe_reports_classified(project_root:, recipes:, facts:, files:, template_contents:, decision_policy:, env:, events:, workers: 0, thread_workers: 0, stats: nil)
   indexed_recipes = recipes.each_with_index.to_a
@@ -45440,24 +45440,24 @@ 

       
 
 
-4409
-4410
-4411
-4412
-4413
-4414
-4415
-4416
-4417
-4418
-4419
-4420
-4421
-4422
-4423

+4438
+4439
+4440
+4441
+4442
+4443
+4444
+4445
+4446
+4447
+4448
+4449
+4450
+4451
+4452

     
     
-      
# File 'lib/kettle/jem.rb', line 4409
+      
# File 'lib/kettle/jem.rb', line 4438
 
 def execute_recipe_reports_sequential(project_root:, recipes:, facts:, files:, template_contents:, decision_policy:, env:, events:)
   recipes.each_with_index.map do |recipe, index|
@@ -45494,22 +45494,22 @@ 

       
 
 
-4627
-4628
-4629
-4630
-4631
-4632
-4633
-4634
-4635
-4636
-4637
-4638
-4639

+4656
+4657
+4658
+4659
+4660
+4661
+4662
+4663
+4664
+4665
+4666
+4667
+4668

     
     
-      
# File 'lib/kettle/jem.rb', line 4627
+      
# File 'lib/kettle/jem.rb', line 4656
 
 def execute_timed_recipe(project_root:, recipe:, facts:, files:, template_contents:, decision_policy:, env:)
   timed_recipe_report do
@@ -45544,35 +45544,6 @@ 

 
 
-4565
-4566
-4567
-4568
-4569
-4570
-4571
-4572
-4573
-4574
-4575
-4576
-4577
-4578
-4579
-4580
-4581
-4582
-4583
-4584
-4585
-4586
-4587
-4588
-4589
-4590
-4591
-4592
-4593
 4594
 4595
 4596
@@ -45590,10 +45561,39 @@ 
# File 'lib/kettle/jem.rb', line 4565
+      
# File 'lib/kettle/jem.rb', line 4594
 
 def execute_worker_safe_recipe_reports_ractor(project_root:, indexed_recipes:, facts:, files:, template_contents:, decision_policy:, env:, workers:)
   context = Ractor.make_shareable({
@@ -45662,18 +45662,18 @@ 

       
 
 
-16654
-16655
-16656
-16657
-16658
-16659
-16660
-16661
-16662

+16686
+16687
+16688
+16689
+16690
+16691
+16692
+16693
+16694

     
     
-      
# File 'lib/kettle/jem.rb', line 16654
+      
# File 'lib/kettle/jem.rb', line 16686
 
 def existing_entrypoint_version_namespace(project_root, relative_path, expected_depth: nil)
   content = read_project_file(project_root, relative_path)
@@ -45704,20 +45704,20 @@ 

       
 
 
-16543
-16544
-16545
-16546
-16547
-16548
-16549
-16550
-16551
-16552
-16553

+16575
+16576
+16577
+16578
+16579
+16580
+16581
+16582
+16583
+16584
+16585

     
     
-      
# File 'lib/kettle/jem.rb', line 16543
+      
# File 'lib/kettle/jem.rb', line 16575
 
 def existing_namespace_superclass_details(project_root, namespace, preferred_path: nil)
   library_paths = [preferred_path, *ruby_library_source_paths(project_root)].compact.uniq
@@ -45750,41 +45750,41 @@ 

 
 
-18370
-18371
-18372
-18373
-18374
-18375
-18376
-18377
-18378
-18379
-18380
-18381
-18382
-18383
-18384
-18385
-18386
-18387
-18388
-18389
-18390
-18391
-18392
-18393
-18394
-18395
-18396
-18397
-18398
-18399
-18400
-18401

+18402
+18403
+18404
+18405
+18406
+18407
+18408
+18409
+18410
+18411
+18412
+18413
+18414
+18415
+18416
+18417
+18418
+18419
+18420
+18421
+18422
+18423
+18424
+18425
+18426
+18427
+18428
+18429
+18430
+18431
+18432
+18433

     
     
-      
# File 'lib/kettle/jem.rb', line 18370
+      
# File 'lib/kettle/jem.rb', line 18402
 
 def existing_simplecov_bootstrap_template_preferences(project_root, config, preferences)
   templates = template_activation_config(config)
@@ -45861,12 +45861,12 @@ 

 
 
-16497
-16498
-16499

+16529
+16530
+16531

     
     
-      
# File 'lib/kettle/jem.rb', line 16497
+      
# File 'lib/kettle/jem.rb', line 16529
 
 def existing_version_file_includes_version_module?(project_root, relative_path)
   version_file_includes_version_module?(read_project_file(project_root, relative_path))
@@ -45891,12 +45891,12 @@ 

       
 
 
-16442
-16443
-16444

+16474
+16475
+16476

     
     
-      
# File 'lib/kettle/jem.rb', line 16442
+      
# File 'lib/kettle/jem.rb', line 16474
 
 def existing_version_file_value(project_root, relative_path)
   ruby_version_constant_value(read_project_file(project_root, relative_path)).to_s
@@ -45921,12 +45921,12 @@ 

       
 
 
-16458
-16459
-16460

+16490
+16491
+16492

     
     
-      
# File 'lib/kettle/jem.rb', line 16458
+      
# File 'lib/kettle/jem.rb', line 16490
 
 def existing_version_namespace(project_root, relative_path)
   ruby_version_module_namespace(read_project_file(project_root, relative_path))
@@ -45951,23 +45951,23 @@ 

       
 
 
-16510
-16511
-16512
-16513
-16514
-16515
-16516
-16517
-16518
-16519
-16520
-16521
-16522
-16523

+16542
+16543
+16544
+16545
+16546
+16547
+16548
+16549
+16550
+16551
+16552
+16553
+16554
+16555

     
     
-      
# File 'lib/kettle/jem.rb', line 16510
+      
# File 'lib/kettle/jem.rb', line 16542
 
 def existing_version_namespace_kinds(project_root, relative_path, namespace, entrypoint_path: nil)
   contents = [read_project_file(project_root, relative_path)]
@@ -46003,26 +46003,26 @@ 

 
 
-16525
-16526
-16527
-16528
-16529
-16530
-16531
-16532
-16533
-16534
-16535
-16536
-16537
-16538
-16539
-16540
-16541

+16557
+16558
+16559
+16560
+16561
+16562
+16563
+16564
+16565
+16566
+16567
+16568
+16569
+16570
+16571
+16572
+16573

     
     
-      
# File 'lib/kettle/jem.rb', line 16525
+      
# File 'lib/kettle/jem.rb', line 16557
 
 def existing_version_namespace_superclasses(project_root, relative_path, namespace, entrypoint_path: nil)
   contents = [read_project_file(project_root, relative_path)]
@@ -46061,17 +46061,17 @@ 

       
 
 
-19294
-19295
-19296
-19297
-19298
-19299
-19300
-19301

+19327
+19328
+19329
+19330
+19331
+19332
+19333
+19334

     
     
-      
# File 'lib/kettle/jem.rb', line 19294
+      
# File 'lib/kettle/jem.rb', line 19327
 
 def expand_framework_gemfile_pattern(pattern, version)
   replacement = if pattern.include?("_{version}") || pattern.include?("{version}_")
@@ -46101,15 +46101,15 @@ 

 
 
-10947
-10948
-10949
-10950
-10951
-10952

+10978
+10979
+10980
+10981
+10982
+10983

     
     
-      
# File 'lib/kettle/jem.rb', line 10947
+      
# File 'lib/kettle/jem.rb', line 10978
 
 def expand_line_range_through_following_blanks(content, end_line)
   lines = content.to_s.lines
@@ -46160,16 +46160,16 @@ 

       
 
 
-18058
-18059
-18060
-18061
-18062
-18063
-18064

+18090
+18091
+18092
+18093
+18094
+18095
+18096

     
     
-      
# File 'lib/kettle/jem.rb', line 18058
+      
# File 'lib/kettle/jem.rb', line 18090
 
 def explicit_integration_enabled?(config, integration)
   return false unless config.is_a?(Hash) && config["integrations"].is_a?(Hash)
@@ -46221,12 +46221,12 @@ 

       
 
 
-11150
-11151
-11152

+11181
+11182
+11183

     
     
-      
# File 'lib/kettle/jem.rb', line 11150
+      
# File 'lib/kettle/jem.rb', line 11181
 
 def explicit_zero_runtime_floor?(facts)
   facts.to_h.dig(:rubygems, :min_ruby).to_s.strip == "0"
@@ -46251,26 +46251,26 @@ 

 
 
-3905
-3906
-3907
-3908
-3909
-3910
-3911
-3912
-3913
-3914
-3915
-3916
-3917
-3918
-3919
-3920
-3921

+3934
+3935
+3936
+3937
+3938
+3939
+3940
+3941
+3942
+3943
+3944
+3945
+3946
+3947
+3948
+3949
+3950

     
     
-      
# File 'lib/kettle/jem.rb', line 3905
+      
# File 'lib/kettle/jem.rb', line 3934
 
 def extract_gemspec_development_dependencies(gemspec)
   if gemspec.is_a?(Hash)
@@ -46309,12 +46309,12 @@ 

       
 
 
-14297
-14298
-14299

+14328
+14329
+14330

     
     
-      
# File 'lib/kettle/jem.rb', line 14297
+      
# File 'lib/kettle/jem.rb', line 14328
 
 def fallback_opencollective_org
   {org: DEFAULT_OPENCOLLECTIVE_ORG, source: "fallback.default"}
@@ -46362,12 +46362,12 @@ 

       
 
 
-18120
-18121
-18122

+18152
+18153
+18154

     
     
-      
# File 'lib/kettle/jem.rb', line 18120
+      
# File 'lib/kettle/jem.rb', line 18152
 
 def falsey_config?(value)
   %w[false no 0].include?(value.to_s.strip.downcase)
@@ -46392,17 +46392,17 @@ 

       
 
 
-14057
-14058
-14059
-14060
-14061
-14062
-14063
-14064

+14088
+14089
+14090
+14091
+14092
+14093
+14094
+14095

     
     
-      
# File 'lib/kettle/jem.rb', line 14057
+      
# File 'lib/kettle/jem.rb', line 14088
 
 def file_outcome_payload(file_outcome)
   {
@@ -46432,22 +46432,22 @@ 

       
 
 
-13952
-13953
-13954
-13955
-13956
-13957
-13958
-13959
-13960
-13961
-13962
-13963
-13964

+13983
+13984
+13985
+13986
+13987
+13988
+13989
+13990
+13991
+13992
+13993
+13994
+13995

     
     
-      
# File 'lib/kettle/jem.rb', line 13952
+      
# File 'lib/kettle/jem.rb', line 13983
 
 def file_work_execution_stats(file_workers, file_thread_workers = 0)
   {
@@ -46482,24 +46482,24 @@ 

       
 
 
-4349
-4350
-4351
-4352
-4353
-4354
-4355
-4356
-4357
-4358
-4359
-4360
-4361
-4362
-4363

+4378
+4379
+4380
+4381
+4382
+4383
+4384
+4385
+4386
+4387
+4388
+4389
+4390
+4391
+4392

     
     
-      
# File 'lib/kettle/jem.rb', line 4349
+      
# File 'lib/kettle/jem.rb', line 4378
 
 def file_work_thread_workers_for(env, run_options)
   value = (run_options || {})[:thread_file_workers] ||
@@ -46536,15 +46536,15 @@ 

       
 
 
-14050
-14051
-14052
-14053
-14054
-14055

+14081
+14082
+14083
+14084
+14085
+14086

     
     
-      
# File 'lib/kettle/jem.rb', line 14050
+      
# File 'lib/kettle/jem.rb', line 14081
 
 def file_work_unit_payload(file_work_unit)
   {
@@ -46572,12 +46572,12 @@ 

       
 
 
-14031
-14032
-14033

+14062
+14063
+14064

     
     
-      
# File 'lib/kettle/jem.rb', line 14031
+      
# File 'lib/kettle/jem.rb', line 14062
 
 def file_work_units_for_phase(project_root, recipe_reports)
   file_work_units_from_write_intents(write_intents_for_phase(project_root, recipe_reports))
@@ -46602,19 +46602,19 @@ 

       
 
 
-14039
-14040
-14041
-14042
-14043
-14044
-14045
-14046
-14047
-14048

+14070
+14071
+14072
+14073
+14074
+14075
+14076
+14077
+14078
+14079

     
     
-      
# File 'lib/kettle/jem.rb', line 14039
+      
# File 'lib/kettle/jem.rb', line 14070
 
 def file_work_units_from_write_intents(write_intents)
   grouped_operations = {}
@@ -46646,24 +46646,24 @@ 

       
 
 
-4333
-4334
-4335
-4336
-4337
-4338
-4339
-4340
-4341
-4342
-4343
-4344
-4345
-4346
-4347

+4362
+4363
+4364
+4365
+4366
+4367
+4368
+4369
+4370
+4371
+4372
+4373
+4374
+4375
+4376

     
     
-      
# File 'lib/kettle/jem.rb', line 4333
+      
# File 'lib/kettle/jem.rb', line 4362
 
 def file_work_workers_for(env, run_options)
   value = (run_options || {})[:ractor_file_workers] ||
@@ -46700,17 +46700,17 @@ 

       
 
 
-13366
-13367
-13368
-13369
-13370
-13371
-13372
-13373

+13397
+13398
+13399
+13400
+13401
+13402
+13403
+13404

     
     
-      
# File 'lib/kettle/jem.rb', line 13366
+      
# File 'lib/kettle/jem.rb', line 13397
 
 def filter_recipe_pack(pack, template_selection)
   patterns = recipe_filter_patterns(template_selection)
@@ -46740,26 +46740,26 @@ 

       
 
 
-7264
-7265
-7266
-7267
-7268
-7269
-7270
-7271
-7272
-7273
-7274
-7275
-7276
-7277
-7278
-7279
-7280

+7295
+7296
+7297
+7298
+7299
+7300
+7301
+7302
+7303
+7304
+7305
+7306
+7307
+7308
+7309
+7310
+7311

     
     
-      
# File 'lib/kettle/jem.rb', line 7264
+      
# File 'lib/kettle/jem.rb', line 7295
 
 def finalize_accepted_template_source(recipe, content, destination_content, facts:, project_root: nil)
   case template_file_type(recipe)
@@ -46798,37 +46798,6 @@ 

       
 
 
-8014
-8015
-8016
-8017
-8018
-8019
-8020
-8021
-8022
-8023
-8024
-8025
-8026
-8027
-8028
-8029
-8030
-8031
-8032
-8033
-8034
-8035
-8036
-8037
-8038
-8039
-8040
-8041
-8042
-8043
-8044
 8045
 8046
 8047
@@ -46856,10 +46825,41 @@ 

 8069
 8070
 8071
-8072

+8072
+8073
+8074
+8075
+8076
+8077
+8078
+8079
+8080
+8081
+8082
+8083
+8084
+8085
+8086
+8087
+8088
+8089
+8090
+8091
+8092
+8093
+8094
+8095
+8096
+8097
+8098
+8099
+8100
+8101
+8102
+8103

     
     
-      
# File 'lib/kettle/jem.rb', line 8014
+      
# File 'lib/kettle/jem.rb', line 8045
 
 def finalize_gemfile_template_source(recipe, content, destination_content, facts:, template_content:)
   modular_gemfile = modular_gemfile_template_recipe?(recipe)
@@ -46940,13 +46940,13 @@ 

       
 
 
-9130
-9131
-9132
-9133

+9161
+9162
+9163
+9164

     
     
-      
# File 'lib/kettle/jem.rb', line 9130
+      
# File 'lib/kettle/jem.rb', line 9161
 
 def finalize_github_workflow_template(content, facts = nil)
   output = apply_github_actions_engine_exec_cmd_overrides(content, facts)
@@ -46972,14 +46972,14 @@ 

       
 
 
-7253
-7254
-7255
-7256
-7257

+7284
+7285
+7286
+7287
+7288

     
     
-      
# File 'lib/kettle/jem.rb', line 7253
+      
# File 'lib/kettle/jem.rb', line 7284
 
 def finalize_kettle_config_template_source(recipe, content)
   tokens = stringify_template_tokens(recipe.fetch(:template_tokens, {}))
@@ -47006,13 +47006,13 @@ 

       
 
 
-7259
-7260
-7261
-7262

+7290
+7291
+7292
+7293

     
     
-      
# File 'lib/kettle/jem.rb', line 7259
+      
# File 'lib/kettle/jem.rb', line 7290
 
 def finalize_rubocop_config(content)
   finalized = remove_yaml_scalar_path(content, %w[AllCops TargetRubyVersion])
@@ -47038,17 +47038,17 @@ 

       
 
 
-7244
-7245
-7246
-7247
-7248
-7249
-7250
-7251

+7275
+7276
+7277
+7278
+7279
+7280
+7281
+7282

     
     
-      
# File 'lib/kettle/jem.rb', line 7244
+      
# File 'lib/kettle/jem.rb', line 7275
 
 def finalize_template_source_content(recipe, content)
   return finalize_rubocop_config(content) if recipe.fetch(:target_path).to_s == ".rubocop.yml"
@@ -47078,12 +47078,12 @@ 

       
 
 
-13265
-13266
-13267

+13296
+13297
+13298

     
     
-      
# File 'lib/kettle/jem.rb', line 13265
+      
# File 'lib/kettle/jem.rb', line 13296
 
 def first_grapheme(text)
   text.to_s.strip[/\A\X/u].to_s
@@ -47108,19 +47108,19 @@ 

       
 
 
-15042
-15043
-15044
-15045
-15046
-15047
-15048
-15049
-15050
-15051

+15074
+15075
+15076
+15077
+15078
+15079
+15080
+15081
+15082
+15083

     
     
-      
# File 'lib/kettle/jem.rb', line 15042
+      
# File 'lib/kettle/jem.rb', line 15074
 
 def forge_facts(config, env, derived_github_user: nil)
   token_config = token_config_values(config)
@@ -47152,17 +47152,17 @@ 

       
 
 
-15057
-15058
-15059
-15060
-15061
-15062
-15063
-15064

+15089
+15090
+15091
+15092
+15093
+15094
+15095
+15096

     
     
-      
# File 'lib/kettle/jem.rb', line 15057
+      
# File 'lib/kettle/jem.rb', line 15089
 
 def forge_template_tokens(forge)
   {
@@ -47192,12 +47192,12 @@ 

       
 
 
-15053
-15054
-15055

+15085
+15086
+15087

     
     
-      
# File 'lib/kettle/jem.rb', line 15053
+      
# File 'lib/kettle/jem.rb', line 15085
 
 def forge_user_value(forge_config, env, key, derived_value: nil)
   preferred_template_token_value(derived_value, forge_config[key.to_s], env, FORGE_USER_ENV_KEYS.fetch(key))
@@ -47222,27 +47222,27 @@ 

       
 
 
-15023
-15024
-15025
-15026
-15027
-15028
-15029
-15030
-15031
-15032
-15033
-15034
-15035
-15036
-15037
-15038
-15039
-15040

+15055
+15056
+15057
+15058
+15059
+15060
+15061
+15062
+15063
+15064
+15065
+15066
+15067
+15068
+15069
+15070
+15071
+15072

     
     
-      
# File 'lib/kettle/jem.rb', line 15023
+      
# File 'lib/kettle/jem.rb', line 15055
 
 def format_copyright_years(years)
   sorted = Array(years).map(&:to_i).reject(&:zero?).sort.uniq
@@ -47282,12 +47282,12 @@ 

       
 
 
-19303
-19304
-19305

+19336
+19337
+19338

     
     
-      
# File 'lib/kettle/jem.rb', line 19303
+      
# File 'lib/kettle/jem.rb', line 19336
 
 def framework_gemfile_path(gemfile)
   gemfile.include?("/") ? gemfile : "gemfiles/#{gemfile}"
@@ -47312,19 +47312,19 @@ 

       
 
 
-10425
-10426
-10427
-10428
-10429
-10430
-10431
-10432
-10433
-10434

+10456
+10457
+10458
+10459
+10460
+10461
+10462
+10463
+10464
+10465

     
     
-      
# File 'lib/kettle/jem.rb', line 10425
+      
# File 'lib/kettle/jem.rb', line 10456
 
 def framework_matrix_appraisal_block(entry)
   lines = [
@@ -47356,16 +47356,16 @@ 

 
 
-10315
-10316
-10317
-10318
-10319
-10320
-10321

+10346
+10347
+10348
+10349
+10350
+10351
+10352

     
     
-      
# File 'lib/kettle/jem.rb', line 10315
+      
# File 'lib/kettle/jem.rb', line 10346
 
 def framework_matrix_appraisal_dependency_gemfiles(facts)
   framework_matrix = facts.to_h.dig(:ci, :framework_matrix).to_h
@@ -47394,16 +47394,16 @@ 

       
 
 
-9188
-9189
-9190
-9191
-9192
-9193
-9194

+9219
+9220
+9221
+9222
+9223
+9224
+9225

     
     
-      
# File 'lib/kettle/jem.rb', line 9188
+      
# File 'lib/kettle/jem.rb', line 9219
 
 def framework_matrix_appraisal_env_by_name(facts)
   entries = facts.to_h.dig(:ci, :framework_matrix, :appraisals).to_a
@@ -47432,12 +47432,12 @@ 

 
 
-19081
-19082
-19083

+19114
+19115
+19116

     
     
-      
# File 'lib/kettle/jem.rb', line 19081
+      
# File 'lib/kettle/jem.rb', line 19114
 
 def framework_matrix_appraisal_gemfile_path(path)
   path.to_s.sub(%r{\Agemfiles/}, "")
@@ -47462,15 +47462,15 @@ 

       
 
 
-19074
-19075
-19076
-19077
-19078
-19079

+19107
+19108
+19109
+19110
+19111
+19112

     
     
-      
# File 'lib/kettle/jem.rb', line 19074
+      
# File 'lib/kettle/jem.rb', line 19107
 
 def framework_matrix_appraisal_gemfiles(raw)
   Array(raw["appraisal_gemfiles"] || raw["appraisal_eval_gemfiles"]).filter_map do |path|
@@ -47498,12 +47498,12 @@ 

       
 
 
-19085
-19086
-19087

+19118
+19119
+19120

     
     
-      
# File 'lib/kettle/jem.rb', line 19085
+      
# File 'lib/kettle/jem.rb', line 19118
 
 def framework_matrix_appraisal_name(dimension, slug)
   [dimension, slug].join("-").downcase.gsub(/[^a-z0-9]+/, "-").gsub(/\A-|-+\z/, "")
@@ -47528,19 +47528,19 @@ 

       
 
 
-19186
-19187
-19188
-19189
-19190
-19191
-19192
-19193
-19194
-19195

+19219
+19220
+19221
+19222
+19223
+19224
+19225
+19226
+19227
+19228

     
     
-      
# File 'lib/kettle/jem.rb', line 19186
+      
# File 'lib/kettle/jem.rb', line 19219
 
 def framework_matrix_env(raw)
   return {} unless raw.is_a?(Hash)
@@ -47572,15 +47572,15 @@ 

 
 
-19058
-19059
-19060
-19061
-19062
-19063

+19091
+19092
+19093
+19094
+19095
+19096

     
     
-      
# File 'lib/kettle/jem.rb', line 19058
+      
# File 'lib/kettle/jem.rb', line 19091
 
 def framework_matrix_replaced_appraisal_names(dimension, entry, name)
   default_name = framework_matrix_appraisal_name(dimension, entry.fetch(:slug))
@@ -47608,41 +47608,41 @@ 

       
 
 
-19089
-19090
-19091
-19092
-19093
-19094
-19095
-19096
-19097
-19098
-19099
-19100
-19101
-19102
-19103
-19104
-19105
-19106
-19107
-19108
-19109
-19110
-19111
-19112
-19113
-19114
-19115
-19116
-19117
-19118
-19119
-19120

+19122
+19123
+19124
+19125
+19126
+19127
+19128
+19129
+19130
+19131
+19132
+19133
+19134
+19135
+19136
+19137
+19138
+19139
+19140
+19141
+19142
+19143
+19144
+19145
+19146
+19147
+19148
+19149
+19150
+19151
+19152
+19153

     
     
-      
# File 'lib/kettle/jem.rb', line 19089
+      
# File 'lib/kettle/jem.rb', line 19122
 
 def framework_matrix_version_entry(raw)
   if raw.is_a?(Hash)
@@ -47719,17 +47719,17 @@ 

       
 
 
-19065
-19066
-19067
-19068
-19069
-19070
-19071
-19072

+19098
+19099
+19100
+19101
+19102
+19103
+19104
+19105

     
     
-      
# File 'lib/kettle/jem.rb', line 19065
+      
# File 'lib/kettle/jem.rb', line 19098
 
 def framework_matrix_workflow_enabled?(raw)
   configured = raw["workflow"]
@@ -47759,29 +47759,29 @@ 

       
 
 
-11870
-11871
-11872
-11873
-11874
-11875
-11876
-11877
-11878
-11879
-11880
-11881
-11882
-11883
-11884
-11885
-11886
-11887
-11888
-11889

+11901
+11902
+11903
+11904
+11905
+11906
+11907
+11908
+11909
+11910
+11911
+11912
+11913
+11914
+11915
+11916
+11917
+11918
+11919
+11920

     
     
-      
# File 'lib/kettle/jem.rb', line 11870
+      
# File 'lib/kettle/jem.rb', line 11901
 
 def freeze_marker_blocks(content, freeze_token: nil)
   marker = freeze_token.to_s.empty? ? "kettle-jem" : freeze_token.to_s
@@ -47846,14 +47846,14 @@ 

       
 
 
-14246
-14247
-14248
-14249
-14250

+14277
+14278
+14279
+14280
+14281

     
     
-      
# File 'lib/kettle/jem.rb', line 14246
+      
# File 'lib/kettle/jem.rb', line 14277
 
 def funding_platform_enabled?(enabled_platforms, platform)
   return true unless enabled_platforms.is_a?(Hash)
@@ -47880,23 +47880,23 @@ 

       
 
 
-14231
-14232
-14233
-14234
-14235
-14236
-14237
-14238
-14239
-14240
-14241
-14242
-14243
-14244

+14262
+14263
+14264
+14265
+14266
+14267
+14268
+14269
+14270
+14271
+14272
+14273
+14274
+14275

     
     
-      
# File 'lib/kettle/jem.rb', line 14231
+      
# File 'lib/kettle/jem.rb', line 14262
 
 def funding_platform_policies(config, env)
   funding = config["funding"]
@@ -47932,19 +47932,19 @@ 

       
 
 
-15066
-15067
-15068
-15069
-15070
-15071
-15072
-15073
-15074
-15075

+15098
+15099
+15100
+15101
+15102
+15103
+15104
+15105
+15106
+15107

     
     
-      
# File 'lib/kettle/jem.rb', line 15066
+      
# File 'lib/kettle/jem.rb', line 15098
 
 def funding_platform_token_facts(config, env)
   token_config = token_config_values(config)
@@ -47976,12 +47976,12 @@ 

       
 
 
-15077
-15078
-15079

+15109
+15110
+15111

     
     
-      
# File 'lib/kettle/jem.rb', line 15077
+      
# File 'lib/kettle/jem.rb', line 15109
 
 def funding_platform_token_value(funding_config, env, key)
   preferred_template_token_value(nil, funding_config[key.to_s], env, FUNDING_TOKEN_ENV_KEYS.fetch(key))
@@ -48006,18 +48006,18 @@ 

       
 
 
-15081
-15082
-15083
-15084
-15085
-15086
-15087
-15088
-15089

+15113
+15114
+15115
+15116
+15117
+15118
+15119
+15120
+15121

     
     
-      
# File 'lib/kettle/jem.rb', line 15081
+      
# File 'lib/kettle/jem.rb', line 15113
 
 def funding_template_tokens(funding)
   platform_tokens = funding.fetch(:platform_tokens, {})
@@ -48048,30 +48048,30 @@ 

       
 
 
-13573
-13574
-13575
-13576
-13577
-13578
-13579
-13580
-13581
-13582
-13583
-13584
-13585
-13586
-13587
-13588
-13589
-13590
-13591
-13592
-13593

+13604
+13605
+13606
+13607
+13608
+13609
+13610
+13611
+13612
+13613
+13614
+13615
+13616
+13617
+13618
+13619
+13620
+13621
+13622
+13623
+13624

     
     
-      
# File 'lib/kettle/jem.rb', line 13573
+      
# File 'lib/kettle/jem.rb', line 13604
 
 def funding_urls(project_root, package_name, funding_uri: nil, opencollective_disabled: false, open_collective_org: nil, enabled_platforms: nil)
   urls = [funding_uri]
@@ -48114,14 +48114,14 @@ 

       
 
 
-14744
-14745
-14746
-14747
-14748

+14776
+14777
+14778
+14779
+14780

     
     
-      
# File 'lib/kettle/jem.rb', line 14744
+      
# File 'lib/kettle/jem.rb', line 14776
 
 def gem_major_token(version)
   Gem::Version.new(version.to_s).segments.first.to_s
@@ -48171,12 +48171,12 @@ 

       
 
 
-10051
-10052
-10053

+10082
+10083
+10084

     
     
-      
# File 'lib/kettle/jem.rb', line 10051
+      
# File 'lib/kettle/jem.rb', line 10082
 
 def gemfile_comment_line?(line)
   line.to_s.lstrip.start_with?("#")
@@ -48224,12 +48224,12 @@ 

       
 
 
-8903
-8904
-8905

+8934
+8935
+8936

     
     
-      
# File 'lib/kettle/jem.rb', line 8903
+      
# File 'lib/kettle/jem.rb', line 8934
 
 def gemfile_conditional_node?(node)
   node.is_a?(::Prism::IfNode) || node.is_a?(::Prism::UnlessNode)
@@ -48277,14 +48277,14 @@ 

       
 
 
-8141
-8142
-8143
-8144
-8145

+8172
+8173
+8174
+8175
+8176

     
     
-      
# File 'lib/kettle/jem.rb', line 8141
+      
# File 'lib/kettle/jem.rb', line 8172
 
 def gemfile_declares_direct_gem?(content, gem_name)
   ruby_call_records(content, :gem).any? do |call|
@@ -48334,23 +48334,23 @@ 

       
 
 
-5480
-5481
-5482
-5483
-5484
-5485
-5486
-5487
-5488
-5489
-5490
-5491
-5492
-5493

+5511
+5512
+5513
+5514
+5515
+5516
+5517
+5518
+5519
+5520
+5521
+5522
+5523
+5524

     
     
-      
# File 'lib/kettle/jem.rb', line 5480
+      
# File 'lib/kettle/jem.rb', line 5511
 
 def gemfile_declares_gem?(content, gem_name)
   ruby_call_records(content, nil).any? do |call|
@@ -48386,18 +48386,18 @@ 

       
 
 
-9506
-9507
-9508
-9509
-9510
-9511
-9512
-9513
-9514

+9537
+9538
+9539
+9540
+9541
+9542
+9543
+9544
+9545

     
     
-      
# File 'lib/kettle/jem.rb', line 9506
+      
# File 'lib/kettle/jem.rb', line 9537
 
 def gemfile_dependency_insertion_line(content)
   body = prism_parse_success(content)&.value&.statements&.body || []
@@ -48428,12 +48428,12 @@ 

       
 
 
-7032
-7033
-7034

+7063
+7064
+7065

     
     
-      
# File 'lib/kettle/jem.rb', line 7032
+      
# File 'lib/kettle/jem.rb', line 7063
 
 def gemfile_dependency_names(content)
   gemfile_gem_call_records(content).map { |record| record.fetch(:name) } + gemfile_nomono_dependency_names(content)
@@ -48481,19 +48481,19 @@ 

       
 
 
-9516
-9517
-9518
-9519
-9520
-9521
-9522
-9523
-9524
-9525

+9547
+9548
+9549
+9550
+9551
+9552
+9553
+9554
+9555
+9556

     
     
-      
# File 'lib/kettle/jem.rb', line 9516
+      
# File 'lib/kettle/jem.rb', line 9547
 
 def gemfile_dependency_statement?(node)
   case node
@@ -48525,31 +48525,31 @@ 

       
 
 
-10182
-10183
-10184
-10185
-10186
-10187
-10188
-10189
-10190
-10191
-10192
-10193
-10194
-10195
-10196
-10197
-10198
-10199
-10200
-10201
-10202
-10203

+10213
+10214
+10215
+10216
+10217
+10218
+10219
+10220
+10221
+10222
+10223
+10224
+10225
+10226
+10227
+10228
+10229
+10230
+10231
+10232
+10233
+10234

     
     
-      
# File 'lib/kettle/jem.rb', line 10182
+      
# File 'lib/kettle/jem.rb', line 10213
 
 def gemfile_eval_bucket_entries(content)
   lines = content.to_s.lines
@@ -48593,16 +48593,16 @@ 

       
 
 
-10205
-10206
-10207
-10208
-10209
-10210
-10211

+10236
+10237
+10238
+10239
+10240
+10241
+10242

     
     
-      
# File 'lib/kettle/jem.rb', line 10205
+      
# File 'lib/kettle/jem.rb', line 10236
 
 def gemfile_eval_comment_start_line(lines, start_line)
   index = start_line.to_i - 2
@@ -48631,12 +48631,12 @@ 

       
 
 
-9467
-9468
-9469

+9498
+9499
+9500

     
     
-      
# File 'lib/kettle/jem.rb', line 9467
+      
# File 'lib/kettle/jem.rb', line 9498
 
 def gemfile_eval_paths(content)
   ruby_call_records(content, :eval_gemfile).filter_map { |call| ruby_string_argument(call) }
@@ -48661,22 +48661,22 @@ 

       
 
 
-9624
-9625
-9626
-9627
-9628
-9629
-9630
-9631
-9632
-9633
-9634
-9635
-9636

+9655
+9656
+9657
+9658
+9659
+9660
+9661
+9662
+9663
+9664
+9665
+9666
+9667

     
     
-      
# File 'lib/kettle/jem.rb', line 9624
+      
# File 'lib/kettle/jem.rb', line 9655
 
 def gemfile_gem_call_records(content)
   ruby_call_records(content, :gem).filter_map do |call|
@@ -48711,18 +48711,18 @@ 

       
 
 
-7036
-7037
-7038
-7039
-7040
-7041
-7042
-7043
-7044

+7067
+7068
+7069
+7070
+7071
+7072
+7073
+7074
+7075

     
     
-      
# File 'lib/kettle/jem.rb', line 7036
+      
# File 'lib/kettle/jem.rb', line 7067
 
 def gemfile_nomono_dependency_names(content)
   result = prism_parse_success(content)
@@ -48753,12 +48753,12 @@ 

       
 
 
-9487
-9488
-9489

+9518
+9519
+9520

     
     
-      
# File 'lib/kettle/jem.rb', line 9487
+      
# File 'lib/kettle/jem.rb', line 9518
 
 def gemfile_paragraphs(content)
   content.to_s.split(/\n{2,}/).map { |paragraph| ensure_trailing_newline(paragraph.strip) }.reject { |paragraph| paragraph.strip.empty? }
@@ -48783,12 +48783,12 @@ 

       
 
 
-9491
-9492
-9493

+9522
+9523
+9524

     
     
-      
# File 'lib/kettle/jem.rb', line 9491
+      
# File 'lib/kettle/jem.rb', line 9522
 
 def gemfile_percent_w_names(content)
   ruby_word_array_records(content).flat_map { |record| record.fetch(:names) }.reject(&:empty?)
@@ -48813,21 +48813,21 @@ 

       
 
 
-6929
-6930
-6931
-6932
-6933
-6934
-6935
-6936
-6937
-6938
-6939
-6940

+6960
+6961
+6962
+6963
+6964
+6965
+6966
+6967
+6968
+6969
+6970
+6971

     
     
-      
# File 'lib/kettle/jem.rb', line 6929
+      
# File 'lib/kettle/jem.rb', line 6960
 
 def gemfile_policy_operations(template_content, original, final, request)
   package_name = runtime_context_value(request, :package, :name).to_s
@@ -48884,15 +48884,15 @@ 

       
 
 
-8896
-8897
-8898
-8899
-8900
-8901

+8927
+8928
+8929
+8930
+8931
+8932

     
     
-      
# File 'lib/kettle/jem.rb', line 8896
+      
# File 'lib/kettle/jem.rb', line 8927
 
 def gemfile_workspace_override_node?(node)
   return false unless gemfile_conditional_node?(node)
@@ -48920,16 +48920,16 @@ 

       
 
 
-12275
-12276
-12277
-12278
-12279
-12280
-12281

+12306
+12307
+12308
+12309
+12310
+12311
+12312

     
     
-      
# File 'lib/kettle/jem.rb', line 12275
+      
# File 'lib/kettle/jem.rb', line 12306
 
 def gemspec_assignment_field(call)
   name = call.name.to_s
@@ -48958,28 +48958,28 @@ 

       
 
 
-12255
-12256
-12257
-12258
-12259
-12260
-12261
-12262
-12263
-12264
-12265
-12266
-12267
-12268
-12269
-12270
-12271
-12272
-12273

+12286
+12287
+12288
+12289
+12290
+12291
+12292
+12293
+12294
+12295
+12296
+12297
+12298
+12299
+12300
+12301
+12302
+12303
+12304

     
     
-      
# File 'lib/kettle/jem.rb', line 12255
+      
# File 'lib/kettle/jem.rb', line 12286
 
 def gemspec_assignment_records(source, receiver: nil)
   lines = source.to_s.lines
@@ -49020,20 +49020,20 @@ 

       
 
 
-12283
-12284
-12285
-12286
-12287
-12288
-12289
-12290
-12291
-12292
-12293

+12314
+12315
+12316
+12317
+12318
+12319
+12320
+12321
+12322
+12323
+12324

     
     
-      
# File 'lib/kettle/jem.rb', line 12283
+      
# File 'lib/kettle/jem.rb', line 12314
 
 def gemspec_assignment_value(call)
   argument = call.arguments&.arguments&.first
@@ -49066,14 +49066,14 @@ 

       
 
 
-11178
-11179
-11180
-11181
-11182

+11209
+11210
+11211
+11212
+11213

     
     
-      
# File 'lib/kettle/jem.rb', line 11178
+      
# File 'lib/kettle/jem.rb', line 11209
 
 def gemspec_block_param(source)
   call = gemspec_new_call(source)
@@ -49100,15 +49100,15 @@ 

       
 
 
-12384
-12385
-12386
-12387
-12388
-12389

+12415
+12416
+12417
+12418
+12419
+12420

     
     
-      
# File 'lib/kettle/jem.rb', line 12384
+      
# File 'lib/kettle/jem.rb', line 12415
 
 def gemspec_dependency_call_kind(call)
   case call.name
@@ -49136,12 +49136,12 @@ 

       
 
 
-15409
-15410
-15411

+15441
+15442
+15443

     
     
-      
# File 'lib/kettle/jem.rb', line 15409
+      
# File 'lib/kettle/jem.rb', line 15441
 
 def gemspec_dependency_from_record(record)
   Gem::Dependency.new(record.fetch(:name), *record.fetch(:requirements), (record.fetch(:kind) == "add_development_dependency") ? :development : :runtime)
@@ -49166,15 +49166,15 @@ 

       
 
 
-12190
-12191
-12192
-12193
-12194
-12195

+12221
+12222
+12223
+12224
+12225
+12226

     
     
-      
# File 'lib/kettle/jem.rb', line 12190
+      
# File 'lib/kettle/jem.rb', line 12221
 
 def gemspec_dependency_line_index(source, receiver:)
   gemspec_dependency_records(source, receiver: receiver).each_with_object({}) do |record, dependencies|
@@ -49202,13 +49202,13 @@ 

       
 
 
-12222
-12223
-12224
-12225

+12253
+12254
+12255
+12256

     
     
-      
# File 'lib/kettle/jem.rb', line 12222
+      
# File 'lib/kettle/jem.rb', line 12253
 
 def gemspec_dependency_line_key(line, receiver:)
   record = gemspec_dependency_records(line, receiver: receiver).first
@@ -49234,36 +49234,36 @@ 

 
 
-11946
-11947
-11948
-11949
-11950
-11951
-11952
-11953
-11954
-11955
-11956
-11957
-11958
-11959
-11960
-11961
-11962
-11963
-11964
-11965
-11966
-11967
-11968
-11969
-11970
-11971
-11972

+11977
+11978
+11979
+11980
+11981
+11982
+11983
+11984
+11985
+11986
+11987
+11988
+11989
+11990
+11991
+11992
+11993
+11994
+11995
+11996
+11997
+11998
+11999
+12000
+12001
+12002
+12003

     
     
-      
# File 'lib/kettle/jem.rb', line 11946
+      
# File 'lib/kettle/jem.rb', line 11977
 
 def gemspec_dependency_minimum_requirement_replacement(call, requirement)
   arguments = Array(call.arguments&.arguments)
@@ -49312,12 +49312,12 @@ 

       
 
 
-12197
-12198
-12199

+12228
+12229
+12230

     
     
-      
# File 'lib/kettle/jem.rb', line 12197
+      
# File 'lib/kettle/jem.rb', line 12228
 
 def gemspec_dependency_names(source)
   gemspec_dependency_records(source).map { |record| record.fetch(:name) }
@@ -49342,12 +49342,12 @@ 

       
 
 
-12227
-12228
-12229

+12258
+12259
+12260

     
     
-      
# File 'lib/kettle/jem.rb', line 12227
+      
# File 'lib/kettle/jem.rb', line 12258
 
 def gemspec_dependency_record_key(record)
   [record.fetch(:kind), record.fetch(:name)]
@@ -49372,17 +49372,17 @@ 

       
 
 
-12246
-12247
-12248
-12249
-12250
-12251
-12252
-12253

+12277
+12278
+12279
+12280
+12281
+12282
+12283
+12284

     
     
-      
# File 'lib/kettle/jem.rb', line 12246
+      
# File 'lib/kettle/jem.rb', line 12277
 
 def gemspec_dependency_record_version(record)
   versions = record.fetch(:requirements, []).filter_map do |requirement|
@@ -49412,31 +49412,31 @@ 

       
 
 
-12361
-12362
-12363
-12364
-12365
-12366
-12367
-12368
-12369
-12370
-12371
-12372
-12373
-12374
-12375
-12376
-12377
-12378
-12379
-12380
-12381
-12382

+12392
+12393
+12394
+12395
+12396
+12397
+12398
+12399
+12400
+12401
+12402
+12403
+12404
+12405
+12406
+12407
+12408
+12409
+12410
+12411
+12412
+12413

     
     
-      
# File 'lib/kettle/jem.rb', line 12361
+      
# File 'lib/kettle/jem.rb', line 12392
 
 def gemspec_dependency_records(source, receiver: nil)
   lines = source.to_s.lines
@@ -49503,20 +49503,20 @@ 

 
 
-11934
-11935
-11936
-11937
-11938
-11939
-11940
-11941
-11942
-11943
-11944

+11965
+11966
+11967
+11968
+11969
+11970
+11971
+11972
+11973
+11974
+11975

     
     
-      
# File 'lib/kettle/jem.rb', line 11934
+      
# File 'lib/kettle/jem.rb', line 11965
 
 def gemspec_dependency_requirements_satisfy_floor?(requirements, floor_requirement)
   floor = Gem::Requirement.new(floor_requirement).requirements.first.last
@@ -49573,14 +49573,14 @@ 

 
 
-12070
-12071
-12072
-12073
-12074

+12101
+12102
+12103
+12104
+12105

     
     
-      
# File 'lib/kettle/jem.rb', line 12070
+      
# File 'lib/kettle/jem.rb', line 12101
 
 def gemspec_dependency_section_heading_comment?(stripped_line)
   stripped_line.start_with?("# ") &&
@@ -49607,12 +49607,12 @@ 

       
 
 
-12021
-12022
-12023

+12052
+12053
+12054

     
     
-      
# File 'lib/kettle/jem.rb', line 12021
+      
# File 'lib/kettle/jem.rb', line 12052
 
 def gemspec_dependency_sort_key(name)
   name.to_s.tr("_", "-")
@@ -49660,16 +49660,16 @@ 

       
 
 
-12238
-12239
-12240
-12241
-12242
-12243
-12244

+12269
+12270
+12271
+12272
+12273
+12274
+12275

     
     
-      
# File 'lib/kettle/jem.rb', line 12238
+      
# File 'lib/kettle/jem.rb', line 12269
 
 def gemspec_dependency_source_newer?(candidate_source, current_source, receiver:)
   candidate = gemspec_dependency_records(candidate_source, receiver: receiver).first
@@ -49698,12 +49698,12 @@ 

       
 
 
-12395
-12396
-12397

+12426
+12427
+12428

     
     
-      
# File 'lib/kettle/jem.rb', line 12395
+      
# File 'lib/kettle/jem.rb', line 12426
 
 def gemspec_end_line(source)
   gemspec_new_call(source)&.location&.end_line || source.to_s.lines.length + 1
@@ -49728,30 +49728,30 @@ 

       
 
 
-17438
-17439
-17440
-17441
-17442
-17443
-17444
-17445
-17446
-17447
-17448
-17449
-17450
-17451
-17452
-17453
-17454
-17455
-17456
-17457
-17458

+17470
+17471
+17472
+17473
+17474
+17475
+17476
+17477
+17478
+17479
+17480
+17481
+17482
+17483
+17484
+17485
+17486
+17487
+17488
+17489
+17490

     
     
-      
# File 'lib/kettle/jem.rb', line 17438
+      
# File 'lib/kettle/jem.rb', line 17470
 
 def gemspec_enumerate_package_glob_body(min_ruby)
   if gemspec_modern_package_helper?(min_ruby)
@@ -49794,15 +49794,15 @@ 

       
 
 
-12315
-12316
-12317
-12318
-12319
-12320

+12346
+12347
+12348
+12349
+12350
+12351

     
     
-      
# File 'lib/kettle/jem.rb', line 12315
+      
# File 'lib/kettle/jem.rb', line 12346
 
 def gemspec_field_receiver_and_name(field)
   parts = field.to_s.split(".")
@@ -49830,16 +49830,16 @@ 

       
 
 
-11351
-11352
-11353
-11354
-11355
-11356
-11357

+11382
+11383
+11384
+11385
+11386
+11387
+11388

     
     
-      
# File 'lib/kettle/jem.rb', line 11351
+      
# File 'lib/kettle/jem.rb', line 11382
 
 def gemspec_files_array_collection_source(target_parts, groups)
   [
@@ -49868,24 +49868,24 @@ 

       
 
 
-11513
-11514
-11515
-11516
-11517
-11518
-11519
-11520
-11521
-11522
-11523
-11524
-11525
-11526
-11527

+11544
+11545
+11546
+11547
+11548
+11549
+11550
+11551
+11552
+11553
+11554
+11555
+11556
+11557
+11558

     
     
-      
# File 'lib/kettle/jem.rb', line 11513
+      
# File 'lib/kettle/jem.rb', line 11544
 
 def gemspec_files_child_collection_record(record, value_node)
   source_start_line = record.fetch(:start_line)
@@ -49922,14 +49922,14 @@ 

       
 
 
-11359
-11360
-11361
-11362
-11363

+11390
+11391
+11392
+11393
+11394

     
     
-      
# File 'lib/kettle/jem.rb', line 11359
+      
# File 'lib/kettle/jem.rb', line 11390
 
 def gemspec_files_collection_body_source(groups)
   groups.each_with_index.map do |group, index|
@@ -49956,17 +49956,17 @@ 

       
 
 
-11536
-11537
-11538
-11539
-11540
-11541
-11542
-11543

+11567
+11568
+11569
+11570
+11571
+11572
+11573
+11574

     
     
-      
# File 'lib/kettle/jem.rb', line 11536
+      
# File 'lib/kettle/jem.rb', line 11567
 
 def gemspec_files_collection_element_nodes(value_node)
   if gemspec_files_dir_call_node?(value_node)
@@ -49996,15 +49996,15 @@ 

       
 
 
-11606
-11607
-11608
-11609
-11610
-11611

+11637
+11638
+11639
+11640
+11641
+11642

     
     
-      
# File 'lib/kettle/jem.rb', line 11606
+      
# File 'lib/kettle/jem.rb', line 11637
 
 def gemspec_files_collection_entry_key(node)
   return [:string, node.unescaped] if node.is_a?(::Prism::StringNode)
@@ -50055,13 +50055,13 @@ 

       
 
 
-11601
-11602
-11603
-11604

+11632
+11633
+11634
+11635

     
     
-      
# File 'lib/kettle/jem.rb', line 11601
+      
# File 'lib/kettle/jem.rb', line 11632
 
 def gemspec_files_collection_entry_node?(node)
   node.location.start_line == node.location.end_line &&
@@ -50087,23 +50087,23 @@ 

       
 
 
-11365
-11366
-11367
-11368
-11369
-11370
-11371
-11372
-11373
-11374
-11375
-11376
-11377
-11378

+11396
+11397
+11398
+11399
+11400
+11401
+11402
+11403
+11404
+11405
+11406
+11407
+11408
+11409

     
     
-      
# File 'lib/kettle/jem.rb', line 11365
+      
# File 'lib/kettle/jem.rb', line 11396
 
 def gemspec_files_collection_group_source(group, trailing_comma:)
   lines = group.fetch(:lines).dup
@@ -50139,45 +50139,45 @@ 

       
 
 
-11564
-11565
-11566
-11567
-11568
-11569
-11570
-11571
-11572
-11573
-11574
-11575
-11576
-11577
-11578
-11579
-11580
-11581
-11582
-11583
-11584
-11585
-11586
-11587
-11588
-11589
-11590
-11591
-11592
-11593
-11594
 11595
 11596
 11597
 11598
-11599

+11599
+11600
+11601
+11602
+11603
+11604
+11605
+11606
+11607
+11608
+11609
+11610
+11611
+11612
+11613
+11614
+11615
+11616
+11617
+11618
+11619
+11620
+11621
+11622
+11623
+11624
+11625
+11626
+11627
+11628
+11629
+11630

     
     
-      
# File 'lib/kettle/jem.rb', line 11564
+      
# File 'lib/kettle/jem.rb', line 11595
 
 def gemspec_files_collection_groups(record:, element_nodes:, lines:)
   pending = []
@@ -50258,15 +50258,15 @@ 

 
 
-11737
-11738
-11739
-11740
-11741
-11742

+11768
+11769
+11770
+11771
+11772
+11773

     
     
-      
# File 'lib/kettle/jem.rb', line 11737
+      
# File 'lib/kettle/jem.rb', line 11768
 
 def gemspec_files_collection_has_nonliteral_entries?(parts)
   parts.fetch(:groups).any? do |group|
@@ -50317,17 +50317,17 @@ 

 
 
-11728
-11729
-11730
-11731
-11732
-11733
-11734
-11735

+11759
+11760
+11761
+11762
+11763
+11764
+11765
+11766

     
     
-      
# File 'lib/kettle/jem.rb', line 11728
+      
# File 'lib/kettle/jem.rb', line 11759
 
 def gemspec_files_collection_has_package_metadata_splat?(parts)
   parts.fetch(:groups).any? do |group|
@@ -50357,15 +50357,15 @@ 

       
 
 
-11529
-11530
-11531
-11532
-11533
-11534

+11560
+11561
+11562
+11563
+11564
+11565

     
     
-      
# File 'lib/kettle/jem.rb', line 11529
+      
# File 'lib/kettle/jem.rb', line 11560
 
 def gemspec_files_collection_kind(value_node)
   return :dir if gemspec_files_dir_call_node?(value_node)
@@ -50416,16 +50416,16 @@ 

       
 
 
-11319
-11320
-11321
-11322
-11323
-11324
-11325

+11350
+11351
+11352
+11353
+11354
+11355
+11356

     
     
-      
# File 'lib/kettle/jem.rb', line 11319
+      
# File 'lib/kettle/jem.rb', line 11350
 
 def gemspec_files_collection_needs_concat?(target_parts, groups)
   target_parts.fetch(:collection_kind) == :array &&
@@ -50454,17 +50454,17 @@ 

       
 
 
-11453
-11454
-11455
-11456
-11457
-11458
-11459
-11460

+11484
+11485
+11486
+11487
+11488
+11489
+11490
+11491

     
     
-      
# File 'lib/kettle/jem.rb', line 11453
+      
# File 'lib/kettle/jem.rb', line 11484
 
 def gemspec_files_collection_parts(record)
   value_node = record.fetch(:value_node)
@@ -50517,16 +50517,16 @@ 

       
 
 
-11549
-11550
-11551
-11552
-11553
-11554
-11555

+11580
+11581
+11582
+11583
+11584
+11585
+11586

     
     
-      
# File 'lib/kettle/jem.rb', line 11549
+      
# File 'lib/kettle/jem.rb', line 11580
 
 def gemspec_files_concat_call_node?(node)
   node.is_a?(::Prism::CallNode) &&
@@ -50555,41 +50555,41 @@ 

       
 
 
-11480
-11481
-11482
-11483
-11484
-11485
-11486
-11487
-11488
-11489
-11490
-11491
-11492
-11493
-11494
-11495
-11496
-11497
-11498
-11499
-11500
-11501
-11502
-11503
-11504
-11505
-11506
-11507
-11508
-11509
-11510
-11511

+11511
+11512
+11513
+11514
+11515
+11516
+11517
+11518
+11519
+11520
+11521
+11522
+11523
+11524
+11525
+11526
+11527
+11528
+11529
+11530
+11531
+11532
+11533
+11534
+11535
+11536
+11537
+11538
+11539
+11540
+11541
+11542

     
     
-      
# File 'lib/kettle/jem.rb', line 11480
+      
# File 'lib/kettle/jem.rb', line 11511
 
 def gemspec_files_concat_collection_parts(record, value_node)
   arguments = Array(value_node.arguments&.arguments)
@@ -50643,23 +50643,23 @@ 

       
 
 
-11327
-11328
-11329
-11330
-11331
-11332
-11333
-11334
-11335
-11336
-11337
-11338
-11339
-11340

+11358
+11359
+11360
+11361
+11362
+11363
+11364
+11365
+11366
+11367
+11368
+11369
+11370
+11371

     
     
-      
# File 'lib/kettle/jem.rb', line 11327
+      
# File 'lib/kettle/jem.rb', line 11358
 
 def gemspec_files_concat_collection_source(target_parts, groups)
   dir_groups, array_groups = groups.partition do |group|
@@ -50718,15 +50718,15 @@ 

       
 
 
-11557
-11558
-11559
-11560
-11561
-11562

+11588
+11589
+11590
+11591
+11592
+11593

     
     
-      
# File 'lib/kettle/jem.rb', line 11557
+      
# File 'lib/kettle/jem.rb', line 11588
 
 def gemspec_files_dir_call_node?(node)
   node.is_a?(::Prism::CallNode) &&
@@ -50754,17 +50754,17 @@ 

       
 
 
-11342
-11343
-11344
-11345
-11346
-11347
-11348
-11349

+11373
+11374
+11375
+11376
+11377
+11378
+11379
+11380

     
     
-      
# File 'lib/kettle/jem.rb', line 11342
+      
# File 'lib/kettle/jem.rb', line 11373
 
 def gemspec_files_dir_collection_source(target_parts, groups, closing: nil)
   opening = target_parts.fetch(:opening).sub("= [", "= Dir[")
@@ -50794,12 +50794,12 @@ 

       
 
 
-11545
-11546
-11547

+11576
+11577
+11578

     
     
-      
# File 'lib/kettle/jem.rb', line 11545
+      
# File 'lib/kettle/jem.rb', line 11576
 
 def gemspec_files_group_collection_kind(group, parts)
   group.fetch(:source_collection_kind, parts.fetch(:collection_kind))
@@ -50818,72 +50818,6 @@ 

-  
-    
-      
-
-
-11431
-11432
-11433
-11434
-11435
-11436
-11437
-11438
-11439
-11440
-11441
-11442
-11443
-11444
-11445
-11446
-11447
-11448
-11449
-11450
-11451

-    
-    
-      
# File 'lib/kettle/jem.rb', line 11431
-
-def gemspec_files_normalize_dir_globs_for_array(groups, target_parts)
-  return groups unless target_parts.fetch(:collection_kind) == :array
-
-  groups.map do |group|
-    next group unless group.fetch(:source_collection_kind, nil) == :dir
-
-    node = group.fetch(:node)
-    next group unless node.is_a?(::Prism::StringNode)
-
-    pattern = node.unescaped.to_s
-    lines = group.fetch(:lines)
-    entry_line = lines.reverse.find { |line| !line.strip.empty? && !line.lstrip.start_with?("#") }.to_s
-    indent = entry_line[/\A\s*/].to_s
-    comments = lines.take_while { |line| line.strip.empty? || line.lstrip.start_with?("#") }
-    group.merge(
-      key: [:package_glob, pattern],
-      source_collection_kind: :array,
-      lines: comments + [%(#{indent}*enumerate_package_glob.call(File.join(gemspec_root, #{pattern.dump}))\n)]
-    )
-  end
-end

-    
-  
-
-
-    
-      

-  

-  
-    .gemspec_files_single_collection_parts(record, value_node)  ⇒ Object 
-  
-
-  
-
-  
 

+  
+

   

     
@@ -50906,11 +50840,77 @@ 

 11475
 11476
 11477
-11478
+11478
+11479
+11480
+11481
+11482
     

     
       
# File 'lib/kettle/jem.rb', line 11462
 
+def gemspec_files_normalize_dir_globs_for_array(groups, target_parts)
+  return groups unless target_parts.fetch(:collection_kind) == :array
+
+  groups.map do |group|
+    next group unless group.fetch(:source_collection_kind, nil) == :dir
+
+    node = group.fetch(:node)
+    next group unless node.is_a?(::Prism::StringNode)
+
+    pattern = node.unescaped.to_s
+    lines = group.fetch(:lines)
+    entry_line = lines.reverse.find { |line| !line.strip.empty? && !line.lstrip.start_with?("#") }.to_s
+    indent = entry_line[/\A\s*/].to_s
+    comments = lines.take_while { |line| line.strip.empty? || line.lstrip.start_with?("#") }
+    group.merge(
+      key: [:package_glob, pattern],
+      source_collection_kind: :array,
+      lines: comments + [%(#{indent}*enumerate_package_glob.call(File.join(gemspec_root, #{pattern.dump}))\n)]
+    )
+  end
+end

+    

+

+    
+      

+  

+  
+    .gemspec_files_single_collection_parts(record, value_node)  ⇒ Object 
+  
+
+  
+
+  
+

+  
+    
+    
@@ -59547,17 +59559,17 @@ 

       
 
 
-15501
-15502
-15503
-15504
-15505
-15506
-15507
-15508

+15533
+15534
+15535
+15536
+15537
+15538
+15539
+15540
     
     

-    
-  
-

+      
+
+
+11493
+11494
+11495
+11496
+11497
+11498
+11499
+11500
+11501
+11502
+11503
+11504
+11505
+11506
+11507
+11508
+11509

+    		
+      
# File 'lib/kettle/jem.rb', line 11493
+
 def gemspec_files_single_collection_parts(record, value_node)
   element_nodes = gemspec_files_collection_element_nodes(value_node)
   return unless element_nodes
@@ -50948,21 +50948,21 @@ 

       
 
 
-11613
-11614
-11615
-11616
-11617
-11618
-11619
-11620
-11621
-11622
-11623
-11624

+11644
+11645
+11646
+11647
+11648
+11649
+11650
+11651
+11652
+11653
+11654
+11655

     		
     
-      
# File 'lib/kettle/jem.rb', line 11613
+      
# File 'lib/kettle/jem.rb', line 11644
 
 def gemspec_files_splat_expression_key(node)
   if node.is_a?(::Prism::CallNode)
@@ -51019,14 +51019,14 @@ 

 
 
-11864
-11865
-11866
-11867
-11868

+11895
+11896
+11897
+11898
+11899

     		
     
-      
# File 'lib/kettle/jem.rb', line 11864
+      
# File 'lib/kettle/jem.rb', line 11895
 
 def gemspec_freeze_block_structurally_managed?(block, receiver:)
   gemspec_assignment_records(block.join, receiver: receiver).any? { |record| record.fetch(:field) == "files" }
@@ -51053,37 +51053,6 @@ 

       
 
 
-10814
-10815
-10816
-10817
-10818
-10819
-10820
-10821
-10822
-10823
-10824
-10825
-10826
-10827
-10828
-10829
-10830
-10831
-10832
-10833
-10834
-10835
-10836
-10837
-10838
-10839
-10840
-10841
-10842
-10843
-10844
 10845
 10846
 10847
@@ -51092,10 +51061,41 @@ 

 10850
 10851
 10852
-10853

+10853
+10854
+10855
+10856
+10857
+10858
+10859
+10860
+10861
+10862
+10863
+10864
+10865
+10866
+10867
+10868
+10869
+10870
+10871
+10872
+10873
+10874
+10875
+10876
+10877
+10878
+10879
+10880
+10881
+10882
+10883
+10884

     

     
-      
# File 'lib/kettle/jem.rb', line 10814
+      
# File 'lib/kettle/jem.rb', line 10845
 
 def gemspec_legacy_version_loader_block(entrypoint_require:, namespace:, min_ruby:, superclass_sensitive: false, fallback_version: nil)
   unless superclass_sensitive
@@ -51157,28 +51157,28 @@ 

 
 
-10903
-10904
-10905
-10906
-10907
-10908
-10909
-10910
-10911
-10912
-10913
-10914
-10915
-10916
-10917
-10918
-10919
-10920
-10921

+10934
+10935
+10936
+10937
+10938
+10939
+10940
+10941
+10942
+10943
+10944
+10945
+10946
+10947
+10948
+10949
+10950
+10951
+10952

     		
     
-      
# File 'lib/kettle/jem.rb', line 10903
+      
# File 'lib/kettle/jem.rb', line 10934
 
 def gemspec_legacy_version_loader_preamble_line_range(content)
   lines = content.to_s.lines
@@ -51219,31 +51219,31 @@ 

       
 
 
-11050
-11051
-11052
-11053
-11054
-11055
-11056
-11057
-11058
-11059
-11060
-11061
-11062
-11063
-11064
-11065
-11066
-11067
-11068
-11069
-11070
-11071

+11081
+11082
+11083
+11084
+11085
+11086
+11087
+11088
+11089
+11090
+11091
+11092
+11093
+11094
+11095
+11096
+11097
+11098
+11099
+11100
+11101
+11102

     

     
-      
# File 'lib/kettle/jem.rb', line 11050
+      
# File 'lib/kettle/jem.rb', line 11081
 
 def gemspec_metadata_assignment_records(content, receiver:)
   lines = content.to_s.lines
@@ -51310,17 +51310,17 @@ 

       
 
 
-17460
-17461
-17462
-17463
-17464
-17465
-17466
-17467

+17492
+17493
+17494
+17495
+17496
+17497
+17498
+17499

     

     
-      
# File 'lib/kettle/jem.rb', line 17460
+      
# File 'lib/kettle/jem.rb', line 17492
 
 def gemspec_modern_package_helper?(min_ruby)
   token = minimum_ruby_token(min_ruby)
@@ -51350,12 +51350,12 @@ 

 
 
-10810
-10811
-10812

+10841
+10842
+10843

     		
     
-      
# File 'lib/kettle/jem.rb', line 10810
+      
# File 'lib/kettle/jem.rb', line 10841
 
 def gemspec_modern_version_loader_expression(entrypoint_require:, namespace:)
   %(Module.new.tap { |mod| Kernel.load("\#{__dir__}/lib/#{entrypoint_require}/version.rb", mod) }::#{namespace}::Version::VERSION)
@@ -51380,12 +51380,12 @@ 

       
 
 
-12391
-12392
-12393

+12422
+12423
+12424

     

     
-      
# File 'lib/kettle/jem.rb', line 12391
+      
# File 'lib/kettle/jem.rb', line 12422
 
 def gemspec_new_call(source)
   ruby_call_records(source, :new).find { |call| call.receiver&.slice == "Gem::Specification" }
@@ -51410,27 +51410,27 @@ 

       
 
 
-17469
-17470
-17471
-17472
-17473
-17474
-17475
-17476
-17477
-17478
-17479
-17480
-17481
-17482
-17483
-17484
-17485
-17486

+17501
+17502
+17503
+17504
+17505
+17506
+17507
+17508
+17509
+17510
+17511
+17512
+17513
+17514
+17515
+17516
+17517
+17518

     

     
-      
# File 'lib/kettle/jem.rb', line 17469
+      
# File 'lib/kettle/jem.rb', line 17501
 
 def gemspec_package_file_includes_token(gemspec)
   includes = Array(gemspec[:package_file_includes] || gemspec["package_file_includes"])
@@ -51470,33 +51470,33 @@ 

 
 
-10729
-10730
-10731
-10732
-10733
-10734
-10735
-10736
-10737
-10738
-10739
-10740
-10741
-10742
-10743
-10744
-10745
-10746
-10747
-10748
-10749
-10750
-10751
-10752

+10760
+10761
+10762
+10763
+10764
+10765
+10766
+10767
+10768
+10769
+10770
+10771
+10772
+10773
+10774
+10775
+10776
+10777
+10778
+10779
+10780
+10781
+10782
+10783

     		
     
-      
# File 'lib/kettle/jem.rb', line 10729
+      
# File 'lib/kettle/jem.rb', line 10760
 
 def gemspec_package_helper_assignment_records(content)
   result = prism_parse_success(content)
@@ -51565,13 +51565,13 @@ 

       
 
 
-5506
-5507
-5508
-5509

+5537
+5538
+5539
+5540

     

     
-      
# File 'lib/kettle/jem.rb', line 5506
+      
# File 'lib/kettle/jem.rb', line 5537
 
 def gemspec_path_declares_gem?(path, gem_name)
   normalized_path = path.to_s.delete_suffix("/")
@@ -51597,47 +51597,47 @@ 

       
 
 
-6964
-6965
-6966
-6967
-6968
-6969
-6970
-6971
-6972
-6973
-6974
-6975
-6976
-6977
-6978
-6979
-6980
-6981
-6982
-6983
-6984
-6985
-6986
-6987
-6988
-6989
-6990
-6991
-6992
-6993
-6994
 6995
 6996
 6997
 6998
 6999
 7000
-7001

+7001
+7002
+7003
+7004
+7005
+7006
+7007
+7008
+7009
+7010
+7011
+7012
+7013
+7014
+7015
+7016
+7017
+7018
+7019
+7020
+7021
+7022
+7023
+7024
+7025
+7026
+7027
+7028
+7029
+7030
+7031
+7032

     

     
-      
# File 'lib/kettle/jem.rb', line 6964
+      
# File 'lib/kettle/jem.rb', line 6995
 
 def gemspec_policy_operations(template_content, original, final, request)
   template_receiver = gemspec_block_param(template_content) || "spec"
@@ -51697,22 +51697,22 @@ 

       
 
 
-11218
-11219
-11220
-11221
-11222
-11223
-11224
-11225
-11226
-11227
-11228
-11229
-11230

+11249
+11250
+11251
+11252
+11253
+11254
+11255
+11256
+11257
+11258
+11259
+11260
+11261

     

     
-      
# File 'lib/kettle/jem.rb', line 11218
+      
# File 'lib/kettle/jem.rb', line 11249
 
 def gemspec_preserved_assignment_fields
   %w[
@@ -51747,19 +51747,19 @@ 

       
 
 
-11207
-11208
-11209
-11210
-11211
-11212
-11213
-11214
-11215
-11216

+11238
+11239
+11240
+11241
+11242
+11243
+11244
+11245
+11246
+11247

     

     
-      
# File 'lib/kettle/jem.rb', line 11207
+      
# File 'lib/kettle/jem.rb', line 11238
 
 def gemspec_preserved_assignments(source, receiver:)
   gemspec_assignment_records(source, receiver: receiver).each_with_object({}) do |record, assignments|
@@ -51791,19 +51791,19 @@ 

       
 
 
-13254
-13255
-13256
-13257
-13258
-13259
-13260
-13261
-13262
-13263

+13285
+13286
+13287
+13288
+13289
+13290
+13291
+13292
+13293
+13294

     

     
-      
# File 'lib/kettle/jem.rb', line 13254
+      
# File 'lib/kettle/jem.rb', line 13285
 
 def gemspec_project_emoji(gemspec_metadata)
   [
@@ -51835,19 +51835,19 @@ 

       
 
 
-17427
-17428
-17429
-17430
-17431
-17432
-17433
-17434
-17435
-17436

+17459
+17460
+17461
+17462
+17463
+17464
+17465
+17466
+17467
+17468

     

     
-      
# File 'lib/kettle/jem.rb', line 17427
+      
# File 'lib/kettle/jem.rb', line 17459
 
 def gemspec_relative_package_path_body(min_ruby)
   if gemspec_modern_package_helper?(min_ruby)
@@ -51879,12 +51879,12 @@ 

       
 
 
-17605
-17606
-17607

+17637
+17638
+17639

     

     
-      
# File 'lib/kettle/jem.rb', line 17605
+      
# File 'lib/kettle/jem.rb', line 17637
 
 def gemspec_root_license_files_token(_license)
   "    \"LICENSE.md\",\n"
@@ -51932,18 +51932,18 @@ 

       
 
 
-11662
-11663
-11664
-11665
-11666
-11667
-11668
-11669
-11670

+11693
+11694
+11695
+11696
+11697
+11698
+11699
+11700
+11701

     

     
-      
# File 'lib/kettle/jem.rb', line 11662
+      
# File 'lib/kettle/jem.rb', line 11693
 
 def gemspec_root_reference_node?(node)
   return node.name == :gemspec_root if node.is_a?(::Prism::LocalVariableReadNode)
@@ -51974,20 +51974,20 @@ 

       
 
 
-15253
-15254
-15255
-15256
-15257
-15258
-15259
-15260
-15261
-15262
-15263

+15285
+15286
+15287
+15288
+15289
+15290
+15291
+15292
+15293
+15294
+15295

     

     
-      
# File 'lib/kettle/jem.rb', line 15253
+      
# File 'lib/kettle/jem.rb', line 15285
 
 def gemspec_runtime_dependency_names(gemspec_metadata)
   dependencies = Array(
@@ -52020,16 +52020,16 @@ 

       
 
 
-11142
-11143
-11144
-11145
-11146
-11147
-11148

+11173
+11174
+11175
+11176
+11177
+11178
+11179

     

     
-      
# File 'lib/kettle/jem.rb', line 11142
+      
# File 'lib/kettle/jem.rb', line 11173
 
 def gemspec_runtime_floor_token(facts)
   raw = facts.to_h.dig(:rubygems, :min_ruby).to_s.strip
@@ -52058,15 +52058,15 @@ 

       
 
 
-12201
-12202
-12203
-12204
-12205
-12206

+12232
+12233
+12234
+12235
+12236
+12237

     

     
-      
# File 'lib/kettle/jem.rb', line 12201
+      
# File 'lib/kettle/jem.rb', line 12232
 
 def gemspec_self_dependency_names(request, package_name)
   names = [package_name.to_s]
@@ -52094,36 +52094,36 @@ 

 
 
-10855
-10856
-10857
-10858
-10859
-10860
-10861
-10862
-10863
-10864
-10865
-10866
-10867
-10868
-10869
-10870
-10871
-10872
-10873
-10874
-10875
-10876
-10877
-10878
-10879
-10880
-10881

+10886
+10887
+10888
+10889
+10890
+10891
+10892
+10893
+10894
+10895
+10896
+10897
+10898
+10899
+10900
+10901
+10902
+10903
+10904
+10905
+10906
+10907
+10908
+10909
+10910
+10911
+10912

     		
     
-      
# File 'lib/kettle/jem.rb', line 10855
+      
# File 'lib/kettle/jem.rb', line 10886
 
 def gemspec_standard_legacy_version_loader_block(entrypoint_require:, namespace:, min_ruby:)
   legacy_require =
@@ -52172,16 +52172,16 @@ 

       
 
 
-17411
-17412
-17413
-17414
-17415
-17416
-17417

+17443
+17444
+17445
+17446
+17447
+17448
+17449

     

     
-      
# File 'lib/kettle/jem.rb', line 17411
+      
# File 'lib/kettle/jem.rb', line 17443
 
 def gemspec_template_facts(config)
   includes = Array(config.dig("gemspec", "package_files", "include"))
@@ -52210,16 +52210,16 @@ 

       
 
 
-17419
-17420
-17421
-17422
-17423
-17424
-17425

+17451
+17452
+17453
+17454
+17455
+17456
+17457

     

     
-      
# File 'lib/kettle/jem.rb', line 17419
+      
# File 'lib/kettle/jem.rb', line 17451
 
 def gemspec_template_tokens(gemspec, min_ruby: nil)
   {
@@ -52248,21 +52248,21 @@ 

       
 
 
-10934
-10935
-10936
-10937
-10938
-10939
-10940
-10941
-10942
-10943
-10944
-10945

+10965
+10966
+10967
+10968
+10969
+10970
+10971
+10972
+10973
+10974
+10975
+10976

     

     
-      
# File 'lib/kettle/jem.rb', line 10934
+      
# File 'lib/kettle/jem.rb', line 10965
 
 def gemspec_top_level_gem_version_node(content)
   ensure_runtime_dependencies!
@@ -52296,28 +52296,28 @@ 

 
 
-7003
-7004
-7005
-7006
-7007
-7008
-7009
-7010
-7011
-7012
-7013
-7014
-7015
-7016
-7017
-7018
-7019
-7020
-7021

+7034
+7035
+7036
+7037
+7038
+7039
+7040
+7041
+7042
+7043
+7044
+7045
+7046
+7047
+7048
+7049
+7050
+7051
+7052

     		
     
-      
# File 'lib/kettle/jem.rb', line 7003
+      
# File 'lib/kettle/jem.rb', line 7034
 
 def gemspec_version_loader_policy_operation(original, final, request)
   min_ruby = minimum_ruby_token(runtime_context_value(request, :rubygems, :min_ruby))
@@ -52381,16 +52381,16 @@ 

 
 
-10883
-10884
-10885
-10886
-10887
-10888
-10889

+10914
+10915
+10916
+10917
+10918
+10919
+10920

     		
     
-      
# File 'lib/kettle/jem.rb', line 10883
+      
# File 'lib/kettle/jem.rb', line 10914
 
 def gemspec_version_loader_superclass_sensitive?(facts)
   rubygems = facts.to_h[:rubygems]
@@ -52419,15 +52419,15 @@ 

       
 
 
-3805
-3806
-3807
-3808
-3809
-3810

+3834
+3835
+3836
+3837
+3838
+3839

     

     
-      
# File 'lib/kettle/jem.rb', line 3805
+      
# File 'lib/kettle/jem.rb', line 3834
 
 def generated_blocks_facts(gemspec, facts, run_options)
   return {} if shim_template_profile?(facts)
@@ -52478,17 +52478,17 @@ 

       
 
 
-11719
-11720
-11721
-11722
-11723
-11724
-11725
-11726

+11750
+11751
+11752
+11753
+11754
+11755
+11756
+11757

     

     
-      
# File 'lib/kettle/jem.rb', line 11719
+      
# File 'lib/kettle/jem.rb', line 11750
 
 def generated_gemspec_metadata_file_group?(group, target_parts)
   return false unless gemspec_files_collection_has_package_metadata_splat?(target_parts)
@@ -52541,22 +52541,22 @@ 

       
 
 
-11648
-11649
-11650
-11651
-11652
-11653
-11654
-11655
-11656
-11657
-11658
-11659
-11660

+11679
+11680
+11681
+11682
+11683
+11684
+11685
+11686
+11687
+11688
+11689
+11690
+11691

     

     
-      
# File 'lib/kettle/jem.rb', line 11648
+      
# File 'lib/kettle/jem.rb', line 11679
 
 def generated_gemspec_package_glob_call?(node)
   arguments = Array(node.arguments&.arguments)
@@ -52614,14 +52614,14 @@ 

 
 
-18440
-18441
-18442
-18443
-18444

+18472
+18473
+18474
+18475
+18476

     		
     
-      
# File 'lib/kettle/jem.rb', line 18440
+      
# File 'lib/kettle/jem.rb', line 18472
 
 def generated_kettle_config_without_templates?(config)
   return false unless config.is_a?(Hash)
@@ -52671,16 +52671,16 @@ 

       
 
 
-13692
-13693
-13694
-13695
-13696
-13697
-13698

+13723
+13724
+13725
+13726
+13727
+13728
+13729

     

     
-      
# File 'lib/kettle/jem.rb', line 13692
+      
# File 'lib/kettle/jem.rb', line 13723
 
 def generated_or_obsolete_github_workflow?(relative_path)
   return true if preferred_template_source(PACKAGED_TEMPLATE_ROOT, relative_path)
@@ -52732,18 +52732,18 @@ 

       
 
 
-15437
-15438
-15439
-15440
-15441
-15442
-15443
-15444
-15445

+15469
+15470
+15471
+15472
+15473
+15474
+15475
+15476
+15477

     

     
-      
# File 'lib/kettle/jem.rb', line 15437
+      
# File 'lib/kettle/jem.rb', line 15469
 
 def generated_version_tree_source_url?(source_url, version)
   return false unless present_template_token_value?(source_url) && present_template_token_value?(version)
@@ -52797,13 +52797,13 @@ 

 
 
-11744
-11745
-11746
-11747

+11775
+11776
+11777
+11778

     		
     
-      
# File 'lib/kettle/jem.rb', line 11744
+      
# File 'lib/kettle/jem.rb', line 11775
 
 def generic_bundler_gemspec_files_assignment?(record)
   node = record.fetch(:value_node)
@@ -52852,13 +52852,13 @@ 

       
 
 
-11781
-11782
-11783
-11784

+11812
+11813
+11814
+11815

     

     
-      
# File 'lib/kettle/jem.rb', line 11781
+      
# File 'lib/kettle/jem.rb', line 11812
 
 def generic_bundler_gemspec_files_command?(node)
   node.is_a?(::Prism::ArrayNode) &&
@@ -52907,15 +52907,15 @@ 

       
 
 
-14956
-14957
-14958
-14959
-14960
-14961

+14988
+14989
+14990
+14991
+14992
+14993

     

     
-      
# File 'lib/kettle/jem.rb', line 14956
+      
# File 'lib/kettle/jem.rb', line 14988
 
 def git_capture(project_root, *args)
   output, status = Open3.capture2("git", "-C", project_root.to_s, *args, err: File::NULL)
@@ -52943,41 +52943,41 @@ 

       
 
 
-14923
-14924
-14925
-14926
-14927
-14928
-14929
-14930
-14931
-14932
-14933
-14934
-14935
-14936
-14937
-14938
-14939
-14940
-14941
-14942
-14943
-14944
-14945
-14946
-14947
-14948
-14949
-14950
-14951
-14952
-14953
-14954

+14955
+14956
+14957
+14958
+14959
+14960
+14961
+14962
+14963
+14964
+14965
+14966
+14967
+14968
+14969
+14970
+14971
+14972
+14973
+14974
+14975
+14976
+14977
+14978
+14979
+14980
+14981
+14982
+14983
+14984
+14985
+14986

     

     
-      
# File 'lib/kettle/jem.rb', line 14923
+      
# File 'lib/kettle/jem.rb', line 14955
 
 def git_copyright_lines(project_root, machine_users, author_aliases: {})
   files = git_capture(project_root, "ls-files", "-z")
@@ -53031,30 +53031,30 @@ 

       
 
 
-5133
-5134
-5135
-5136
-5137
-5138
-5139
-5140
-5141
-5142
-5143
-5144
-5145
-5146
-5147
-5148
-5149
-5150
-5151
-5152
-5153

+5162
+5163
+5164
+5165
+5166
+5167
+5168
+5169
+5170
+5171
+5172
+5173
+5174
+5175
+5176
+5177
+5178
+5179
+5180
+5181
+5182

     

     
-      
# File 'lib/kettle/jem.rb', line 5133
+      
# File 'lib/kettle/jem.rb', line 5162
 
 def git_hooks_executable_step(project_root)
   existing_paths = EXECUTABLE_GIT_HOOK_PATHS.select do |relative_path|
@@ -53097,16 +53097,16 @@ 

       
 
 
-13771
-13772
-13773
-13774
-13775
-13776
-13777

+13802
+13803
+13804
+13805
+13806
+13807
+13808

     

     
-      
# File 'lib/kettle/jem.rb', line 13771
+      
# File 'lib/kettle/jem.rb', line 13802
 
 def git_operation_lock_path(env)
   %w[KETTLE_JEM_GIT_LOCK KETTLE_JEM_GIT_COMMIT_LOCK].each do |key|
@@ -53135,13 +53135,13 @@ 

       
 
 
-13753
-13754
-13755
-13756

+13784
+13785
+13786
+13787

     

     
-      
# File 'lib/kettle/jem.rb', line 13753
+      
# File 'lib/kettle/jem.rb', line 13784
 
 def git_output(project_root, *args)
   stdout, _stderr, status = Open3.capture3("git", "-C", project_root.to_s, *args)
@@ -53167,22 +53167,22 @@ 

       
 
 
-13727
-13728
-13729
-13730
-13731
-13732
-13733
-13734
-13735
-13736
-13737
-13738
-13739

+13758
+13759
+13760
+13761
+13762
+13763
+13764
+13765
+13766
+13767
+13768
+13769
+13770

     

     
-      
# File 'lib/kettle/jem.rb', line 13727
+      
# File 'lib/kettle/jem.rb', line 13758
 
 def git_preflight_report(project_root, template_selection:, env: ENV)
   with_git_operation_lock(env) do
@@ -53217,14 +53217,14 @@ 

       
 
 
-16897
-16898
-16899
-16900
-16901

+16929
+16930
+16931
+16932
+16933

     

     
-      
# File 'lib/kettle/jem.rb', line 16897
+      
# File 'lib/kettle/jem.rb', line 16929
 
 def git_remote_source_url(project_root)
   normalize_git_source_url(git_capture(project_root, "config", "--get", "remote.origin.url").strip)
@@ -53274,13 +53274,13 @@ 

       
 
 
-13748
-13749
-13750
-13751

+13779
+13780
+13781
+13782

     

     
-      
# File 'lib/kettle/jem.rb', line 13748
+      
# File 'lib/kettle/jem.rb', line 13779
 
 def git_success?(project_root, *args)
   _stdout, _stderr, status = Open3.capture3("git", "-C", project_root.to_s, *args)
@@ -53306,20 +53306,20 @@ 

       
 
 
-16446
-16447
-16448
-16449
-16450
-16451
-16452
-16453
-16454
-16455
-16456

+16478
+16479
+16480
+16481
+16482
+16483
+16484
+16485
+16486
+16487
+16488

     

     
-      
# File 'lib/kettle/jem.rb', line 16446
+      
# File 'lib/kettle/jem.rb', line 16478
 
 def git_version_file_value(project_root, relative_path)
   [
@@ -53352,14 +53352,14 @@ 

       
 
 
-16869
-16870
-16871
-16872
-16873

+16901
+16902
+16903
+16904
+16905

     

     
-      
# File 'lib/kettle/jem.rb', line 16869
+      
# File 'lib/kettle/jem.rb', line 16901
 
 def git_worktree_prefix(project_root)
   git_capture(project_root, "rev-parse", "--show-prefix").strip
@@ -53386,15 +53386,15 @@ 

       
 
 
-16862
-16863
-16864
-16865
-16866
-16867

+16894
+16895
+16896
+16897
+16898
+16899

     

     
-      
# File 'lib/kettle/jem.rb', line 16862
+      
# File 'lib/kettle/jem.rb', line 16894
 
 def git_worktree_root(project_root)
   root = git_capture(project_root, "rev-parse", "--show-toplevel").strip
@@ -53422,24 +53422,24 @@ 

       
 
 
-19208
-19209
-19210
-19211
-19212
-19213
-19214
-19215
-19216
-19217
-19218
-19219
-19220
-19221
-19222

+19241
+19242
+19243
+19244
+19245
+19246
+19247
+19248
+19249
+19250
+19251
+19252
+19253
+19254
+19255

     

     
-      
# File 'lib/kettle/jem.rb', line 19208
+      
# File 'lib/kettle/jem.rb', line 19241
 
 def github_actions_coverage_config(config, env = ENV)
   workflows = config["workflows"]
@@ -53499,14 +53499,14 @@ 

       
 
 
-19874
-19875
-19876
-19877
-19878

+19910
+19911
+19912
+19913
+19914

     

     
-      
# File 'lib/kettle/jem.rb', line 19874
+      
# File 'lib/kettle/jem.rb', line 19910
 
 def github_actions_coverage_enabled?(content)
   yaml_contains_key_value?(YAML.safe_load(content.to_s, aliases: true), "K_SOUP_COV_DO", "true")
@@ -53533,42 +53533,6 @@ 

       
 
 
-19916
-19917
-19918
-19919
-19920
-19921
-19922
-19923
-19924
-19925
-19926
-19927
-19928
-19929
-19930
-19931
-19932
-19933
-19934
-19935
-19936
-19937
-19938
-19939
-19940
-19941
-19942
-19943
-19944
-19945
-19946
-19947
-19948
-19949
-19950
-19951
 19952
 19953
 19954
@@ -53604,10 +53568,46 @@ 

 19984
 19985
 19986
-19987

+19987
+19988
+19989
+19990
+19991
+19992
+19993
+19994
+19995
+19996
+19997
+19998
+19999
+20000
+20001
+20002
+20003
+20004
+20005
+20006
+20007
+20008
+20009
+20010
+20011
+20012
+20013
+20014
+20015
+20016
+20017
+20018
+20019
+20020
+20021
+20022
+20023

     

     
-      
# File 'lib/kettle/jem.rb', line 19916
+      
# File 'lib/kettle/jem.rb', line 19952
 
 def github_actions_coverage_steps(disabled_integrations: [])
   disabled = Array(disabled_integrations).map { |name| normalize_integration_name(name) }.to_set
@@ -53701,23 +53701,23 @@ 

       
 
 
-13641
-13642
-13643
-13644
-13645
-13646
-13647
-13648
-13649
-13650
-13651
-13652
-13653
-13654

+13672
+13673
+13674
+13675
+13676
+13677
+13678
+13679
+13680
+13681
+13682
+13683
+13684
+13685

     

     
-      
# File 'lib/kettle/jem.rb', line 13641
+      
# File 'lib/kettle/jem.rb', line 13672
 
 def github_actions_custom_workflows(project_root, config = {}, opencollective_disabled: false)
   workflow_root = File.join(project_root, ".github", "workflows")
@@ -53765,22 +53765,22 @@ 

       
 
 
-19236
-19237
-19238
-19239
-19240
-19241
-19242
-19243
-19244
-19245
-19246
-19247
-19248

+19269
+19270
+19271
+19272
+19273
+19274
+19275
+19276
+19277
+19278
+19279
+19280
+19281

     

     
-      
# File 'lib/kettle/jem.rb', line 19236
+      
# File 'lib/kettle/jem.rb', line 19269
 
 def github_actions_engine_exec_cmds(config)
   workflows = config["workflows"]
@@ -53815,17 +53815,17 @@ 

       
 
 
-19224
-19225
-19226
-19227
-19228
-19229
-19230
-19231

+19257
+19258
+19259
+19260
+19261
+19262
+19263
+19264

     

     
-      
# File 'lib/kettle/jem.rb', line 19224
+      
# File 'lib/kettle/jem.rb', line 19257
 
 def github_actions_exec_cmd(config, env)
   workflows = config["workflows"]
@@ -53855,39 +53855,6 @@ 

       
 
 
-18994
-18995
-18996
-18997
-18998
-18999
-19000
-19001
-19002
-19003
-19004
-19005
-19006
-19007
-19008
-19009
-19010
-19011
-19012
-19013
-19014
-19015
-19016
-19017
-19018
-19019
-19020
-19021
-19022
-19023
-19024
-19025
-19026
 19027
 19028
 19029
@@ -53917,10 +53884,43 @@ 

 19053
 19054
 19055
-19056

+19056
+19057
+19058
+19059
+19060
+19061
+19062
+19063
+19064
+19065
+19066
+19067
+19068
+19069
+19070
+19071
+19072
+19073
+19074
+19075
+19076
+19077
+19078
+19079
+19080
+19081
+19082
+19083
+19084
+19085
+19086
+19087
+19088
+19089

     

     
-      
# File 'lib/kettle/jem.rb', line 18994
+      
# File 'lib/kettle/jem.rb', line 19027
 
 def github_actions_framework_matrix(config)
   workflows = config["workflows"]
@@ -54005,17 +54005,17 @@ 

       
 
 
-13675
-13676
-13677
-13678
-13679
-13680
-13681
-13682

+13706
+13707
+13708
+13709
+13710
+13711
+13712
+13713

     

     
-      
# File 'lib/kettle/jem.rb', line 13675
+      
# File 'lib/kettle/jem.rb', line 13706
 
 def github_actions_obsolete_workflows(project_root)
   workflow_root = File.join(project_root, ".github", "workflows")
@@ -54045,27 +54045,27 @@ 

       
 
 
-5155
-5156
-5157
-5158
-5159
-5160
-5161
-5162
-5163
-5164
-5165
-5166
-5167
-5168
-5169
-5170
-5171
-5172

+5184
+5185
+5186
+5187
+5188
+5189
+5190
+5191
+5192
+5193
+5194
+5195
+5196
+5197
+5198
+5199
+5200
+5201

     

     
-      
# File 'lib/kettle/jem.rb', line 5155
+      
# File 'lib/kettle/jem.rb', line 5184
 
 def github_actions_pin_sync_step(project_root)
   workflow_root = File.join(project_root.to_s, ".github", "workflows")
@@ -54105,17 +54105,23 @@ 

       
 
 
-19849
-19850
-19851
-19852
-19853

+19882
+19883
+19884
+19885
+19886
+19887
+19888
+19889

     

     
-      
# File 'lib/kettle/jem.rb', line 19849
+      
# File 'lib/kettle/jem.rb', line 19882
 
 def github_actions_push_branches(content, default_branch:)
-  managed = [default_branch.to_s, "*-stable"]
+  # Branch-stack releases use names such as r3_2-even-v24. They must run
+  # the same push workflows as stable branches because kettle-release
+  # monitors those runs before publishing the branch release.
+  managed = [default_branch.to_s, "*-stable", "r*_*-*-v*"]
   existing = yaml_scalar_sequence_at_path(content, %w[on push branches])
   (managed + existing).uniq
 end

@@ -54139,14 +54145,14 @@ 

       
 
 
-19843
-19844
-19845
-19846
-19847

+19876
+19877
+19878
+19879
+19880

     		
     
-      
# File 'lib/kettle/jem.rb', line 19843
+      
# File 'lib/kettle/jem.rb', line 19876
 
 def github_actions_push_branches_yaml(content, default_branch:, indent: "              ")
   github_actions_push_branches(content, default_branch: default_branch).map do |branch|
@@ -54173,24 +54179,24 @@ 

       
 
 
-19696
-19697
-19698
-19699
-19700
-19701
-19702
-19703
-19704
-19705
-19706
-19707
-19708
-19709
-19710

+19729
+19730
+19731
+19732
+19733
+19734
+19735
+19736
+19737
+19738
+19739
+19740
+19741
+19742
+19743

     

     
-      
# File 'lib/kettle/jem.rb', line 19696
+      
# File 'lib/kettle/jem.rb', line 19729
 
 def github_actions_rspec_status_cache_step(cache_scope:, key_parts:, indent:, if_condition: "${{!env.ACT}}")
   cache_prefix = ["rspec-status", cache_scope, *key_parts].join("-")
@@ -54227,15 +54233,15 @@ 

       
 
 
-13634
-13635
-13636
-13637
-13638
-13639

+13665
+13666
+13667
+13668
+13669
+13670

     

     
-      
# File 'lib/kettle/jem.rb', line 13634
+      
# File 'lib/kettle/jem.rb', line 13665
 
 def github_actions_ruby_versions(min_ruby)
   floor = min_ruby.to_s[/\d+\.\d+/] || "3.1"
@@ -54263,28 +54269,28 @@ 

       
 
 
-19676
-19677
-19678
-19679
-19680
-19681
-19682
-19683
-19684
-19685
-19686
-19687
-19688
-19689
-19690
-19691
-19692
-19693
-19694

+19709
+19710
+19711
+19712
+19713
+19714
+19715
+19716
+19717
+19718
+19719
+19720
+19721
+19722
+19723
+19724
+19725
+19726
+19727

     

     
-      
# File 'lib/kettle/jem.rb', line 19676
+      
# File 'lib/kettle/jem.rb', line 19709
 
 def github_actions_setup_ruby_steps(indent:)
   yaml = <<~YAML
@@ -54325,25 +54331,25 @@ 

 
 
-19277
-19278
-19279
-19280
-19281
-19282
-19283
-19284
-19285
-19286
-19287
-19288
-19289
-19290
-19291
-19292

+19310
+19311
+19312
+19313
+19314
+19315
+19316
+19317
+19318
+19319
+19320
+19321
+19322
+19323
+19324
+19325

     		
     
-      
# File 'lib/kettle/jem.rb', line 19277
+      
# File 'lib/kettle/jem.rb', line 19310
 
 def github_actions_standard_appraisal_gemfiles(config)
   workflows = config["workflows"]
@@ -54381,31 +54387,31 @@ 

       
 
 
-20227
-20228
-20229
-20230
-20231
-20232
-20233
-20234
-20235
-20236
-20237
-20238
-20239
-20240
-20241
-20242
-20243
-20244
-20245
-20246
-20247
-20248

+20263
+20264
+20265
+20266
+20267
+20268
+20269
+20270
+20271
+20272
+20273
+20274
+20275
+20276
+20277
+20278
+20279
+20280
+20281
+20282
+20283
+20284

     

     
-      
# File 'lib/kettle/jem.rb', line 20227
+      
# File 'lib/kettle/jem.rb', line 20263
 
 def github_actions_step_pins
   {
@@ -54449,34 +54455,34 @@ 

       
 
 
-13608
-13609
-13610
-13611
-13612
-13613
-13614
-13615
-13616
-13617
-13618
-13619
-13620
-13621
-13622
-13623
-13624
-13625
-13626
-13627
-13628
-13629
-13630
-13631
-13632

+13639
+13640
+13641
+13642
+13643
+13644
+13645
+13646
+13647
+13648
+13649
+13650
+13651
+13652
+13653
+13654
+13655
+13656
+13657
+13658
+13659
+13660
+13661
+13662
+13663

     

     
-      
# File 'lib/kettle/jem.rb', line 13608
+      
# File 'lib/kettle/jem.rb', line 13639
 
 def github_funding_platform_urls(platform, values)
   values.filter_map do |value|
@@ -54523,21 +54529,21 @@ 

       
 
 
-13595
-13596
-13597
-13598
-13599
-13600
-13601
-13602
-13603
-13604
-13605
-13606

+13626
+13627
+13628
+13629
+13630
+13631
+13632
+13633
+13634
+13635
+13636
+13637

     

     
-      
# File 'lib/kettle/jem.rb', line 13595
+      
# File 'lib/kettle/jem.rb', line 13626
 
 def github_funding_urls(path, opencollective_disabled: false, enabled_platforms: nil)
   funding = YAML.safe_load_file(path, permitted_classes: [], aliases: false) || {}
@@ -54571,13 +54577,13 @@ 

       
 
 
-16720
-16721
-16722
-16723

+16752
+16753
+16754
+16755

     

     
-      
# File 'lib/kettle/jem.rb', line 16720
+      
# File 'lib/kettle/jem.rb', line 16752
 
 def github_org_from_url(url)
   match = url.to_s.match(%r{\Ahttps?://github\.com/([^/]+)/})
@@ -54603,19 +54609,19 @@ 

       
 
 
-16924
-16925
-16926
-16927
-16928
-16929
-16930
-16931
-16932
-16933

+16956
+16957
+16958
+16959
+16960
+16961
+16962
+16963
+16964
+16965

     

     
-      
# File 'lib/kettle/jem.rb', line 16924
+      
# File 'lib/kettle/jem.rb', line 16956
 
 def github_repository_slug(url)
   normalized = normalize_git_source_url(url)
@@ -54647,24 +54653,24 @@ 

       
 
 
-16935
-16936
-16937
-16938
-16939
-16940
-16941
-16942
-16943
-16944
-16945
-16946
-16947
-16948
-16949

+16967
+16968
+16969
+16970
+16971
+16972
+16973
+16974
+16975
+16976
+16977
+16978
+16979
+16980
+16981

     

     
-      
# File 'lib/kettle/jem.rb', line 16935
+      
# File 'lib/kettle/jem.rb', line 16967
 
 def github_repository_star_count(project_root, repository_slug)
   stdout, _stderr, status = Open3.capture3(
@@ -54701,12 +54707,12 @@ 

       
 
 
-20117
-20118
-20119

+20153
+20154
+20155

     

     
-      
# File 'lib/kettle/jem.rb', line 20117
+      
# File 'lib/kettle/jem.rb', line 20153
 
 def github_workflow_action_pin_key(record)
   [record.fetch(:action), record.fetch(:version)]
@@ -54731,28 +54737,28 @@ 

       
 
 
-20121
-20122
-20123
-20124
-20125
-20126
-20127
-20128
-20129
-20130
-20131
-20132
-20133
-20134
-20135
-20136
-20137
-20138
-20139

+20157
+20158
+20159
+20160
+20161
+20162
+20163
+20164
+20165
+20166
+20167
+20168
+20169
+20170
+20171
+20172
+20173
+20174
+20175

     

     
-      
# File 'lib/kettle/jem.rb', line 20121
+      
# File 'lib/kettle/jem.rb', line 20157
 
 def github_workflow_action_pin_line_record(line, line_index)
   # Psych intentionally drops comments, but the managed pin contract uses
@@ -54793,20 +54799,20 @@ 

       
 
 
-20105
-20106
-20107
-20108
-20109
-20110
-20111
-20112
-20113
-20114
-20115

+20141
+20142
+20143
+20144
+20145
+20146
+20147
+20148
+20149
+20150
+20151

     

     
-      
# File 'lib/kettle/jem.rb', line 20105
+      
# File 'lib/kettle/jem.rb', line 20141
 
 def github_workflow_action_pin_records(content)
   lines = content.to_s.lines
@@ -54839,22 +54845,22 @@ 

 
 
-4222
-4223
-4224
-4225
-4226
-4227
-4228
-4229
-4230
-4231
-4232
-4233
-4234

+4251
+4252
+4253
+4254
+4255
+4256
+4257
+4258
+4259
+4260
+4261
+4262
+4263

     		
     
-      
# File 'lib/kettle/jem.rb', line 4222
+      
# File 'lib/kettle/jem.rb', line 4251
 
 def github_workflow_engine_exec_cmds_for_template(source_path, overrides)
   return {} unless source_path && File.file?(source_path)
@@ -54889,25 +54895,25 @@ 

       
 
 
-20088
-20089
-20090
-20091
-20092
-20093
-20094
-20095
-20096
-20097
-20098
-20099
-20100
-20101
-20102
-20103

+20124
+20125
+20126
+20127
+20128
+20129
+20130
+20131
+20132
+20133
+20134
+20135
+20136
+20137
+20138
+20139

     

     
-      
# File 'lib/kettle/jem.rb', line 20088
+      
# File 'lib/kettle/jem.rb', line 20124
 
 def github_workflow_template_pin_warnings(recipe_reports)
   records = recipe_reports.flat_map do |report|
@@ -54968,12 +54974,12 @@ 

       
 
 
-9301
-9302
-9303

+9332
+9333
+9334

     

     
-      
# File 'lib/kettle/jem.rb', line 9301
+      
# File 'lib/kettle/jem.rb', line 9332
 
 def github_workflow_template_recipe?(recipe)
   recipe.fetch(:target_path).to_s.start_with?(".github/workflows/")
@@ -55021,16 +55027,16 @@ 

       
 
 
-18101
-18102
-18103
-18104
-18105
-18106
-18107

+18133
+18134
+18135
+18136
+18137
+18138
+18139

     

     
-      
# File 'lib/kettle/jem.rb', line 18101
+      
# File 'lib/kettle/jem.rb', line 18133
 
 def github_workflows_include?(project_root, needle)
   Dir.glob(File.join(project_root, ".github/workflows/*.{yml,yaml}")).any? do |path|
@@ -55059,20 +55065,20 @@ 

       
 
 
-16875
-16876
-16877
-16878
-16879
-16880
-16881
-16882
-16883
-16884
-16885

+16907
+16908
+16909
+16910
+16911
+16912
+16913
+16914
+16915
+16916
+16917

     

     
-      
# File 'lib/kettle/jem.rb', line 16875
+      
# File 'lib/kettle/jem.rb', line 16907
 
 def gitlab_repo_url(repository, repo_slug, suffix)
   resources = repository[:resource_urls] || {}
@@ -55105,28 +55111,28 @@ 

 
 
-8218
-8219
-8220
-8221
-8222
-8223
-8224
-8225
-8226
-8227
-8228
-8229
-8230
-8231
-8232
-8233
-8234
-8235
-8236

+8249
+8250
+8251
+8252
+8253
+8254
+8255
+8256
+8257
+8258
+8259
+8260
+8261
+8262
+8263
+8264
+8265
+8266
+8267

     		
     
-      
# File 'lib/kettle/jem.rb', line 8218
+      
# File 'lib/kettle/jem.rb', line 8249
 
 def guard_main_gemfile_runtime_workspace_overrides(content)
   content = collapse_nested_templating_guards(content)
@@ -55167,12 +55173,12 @@ 

       
 
 
-8578
-8579
-8580

+8609
+8610
+8611

     

     
-      
# File 'lib/kettle/jem.rb', line 8578
+      
# File 'lib/kettle/jem.rb', line 8609
 
 def guarded_debug_require
   'require "debug" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.7") && ENV["CI"].nil? && ENV.fetch("DEBUG", "false").casecmp("true").zero?'
@@ -55197,12 +55203,12 @@ 

       
 
 
-17355
-17356
-17357

+17387
+17388
+17389

     

     
-      
# File 'lib/kettle/jem.rb', line 17355
+      
# File 'lib/kettle/jem.rb', line 17387
 
 def html_attribute_escape(value)
   value.to_s.gsub("&", "&amp;").gsub("\"", "&quot;").gsub("<", "&lt;").gsub(">", "&gt;")
@@ -55250,15 +55256,15 @@ 

       
 
 
-19894
-19895
-19896
-19897
-19898
-19899

+19930
+19931
+19932
+19933
+19934
+19935

     

     
-      
# File 'lib/kettle/jem.rb', line 19894
+      
# File 'lib/kettle/jem.rb', line 19930
 
 def http_url?(value)
   uri = URI.parse(value.to_s)
@@ -55286,18 +55292,18 @@ 

 
 
-18536
-18537
-18538
-18539
-18540
-18541
-18542
-18543
-18544

+18568
+18569
+18570
+18571
+18572
+18573
+18574
+18575
+18576

     		
     
-      
# File 'lib/kettle/jem.rb', line 18536
+      
# File 'lib/kettle/jem.rb', line 18568
 
 def inactive_packaged_template_cleanup_files(project_root, config = {})
   gemfile_cleanups = Dir.glob(File.join(project_root, "gemfiles/**/*.gemfile")).filter_map do |path|
@@ -55351,15 +55357,15 @@ 

       
 
 
-13668
-13669
-13670
-13671
-13672
-13673

+13699
+13700
+13701
+13702
+13703
+13704

     

     
-      
# File 'lib/kettle/jem.rb', line 13668
+      
# File 'lib/kettle/jem.rb', line 13699
 
 def inactive_packaged_workflow?(relative_path, config = {}, include_patterns: nil)
   return true if stale_versioned_engine_workflow?(relative_path)
@@ -55387,20 +55393,20 @@ 

 
 
-13656
-13657
-13658
-13659
-13660
-13661
-13662
-13663
-13664
-13665
-13666

+13687
+13688
+13689
+13690
+13691
+13692
+13693
+13694
+13695
+13696
+13697

     		
     
-      
# File 'lib/kettle/jem.rb', line 13656
+      
# File 'lib/kettle/jem.rb', line 13687
 
 def inactive_packaged_workflow_cleanup_files(project_root, config = {}, include_patterns: nil)
   workflow_root = File.join(project_root, ".github", "workflows")
@@ -55433,13 +55439,13 @@ 

       
 
 
-8927
-8928
-8929
-8930

+8958
+8959
+8960
+8961

     

     
-      
# File 'lib/kettle/jem.rb', line 8927
+      
# File 'lib/kettle/jem.rb', line 8958
 
 def indent_source(source, spaces)
   prefix = " " * spaces
@@ -55465,27 +55471,27 @@ 

       
 
 
-10334
-10335
-10336
-10337
-10338
-10339
-10340
-10341
-10342
-10343
-10344
-10345
-10346
-10347
-10348
-10349
-10350
-10351

+10365
+10366
+10367
+10368
+10369
+10370
+10371
+10372
+10373
+10374
+10375
+10376
+10377
+10378
+10379
+10380
+10381
+10382

     

     
-      
# File 'lib/kettle/jem.rb', line 10334
+      
# File 'lib/kettle/jem.rb', line 10365
 
 def inject_appraisal_gemfiles(block, gemfiles)
   lines = block.to_s.lines
@@ -55525,39 +55531,39 @@ 

       
 
 
-9157
-9158
-9159
-9160
-9161
-9162
-9163
-9164
-9165
-9166
-9167
-9168
-9169
-9170
-9171
-9172
-9173
-9174
-9175
-9176
-9177
-9178
-9179
-9180
-9181
-9182
-9183
-9184
-9185
-9186

+9188
+9189
+9190
+9191
+9192
+9193
+9194
+9195
+9196
+9197
+9198
+9199
+9200
+9201
+9202
+9203
+9204
+9205
+9206
+9207
+9208
+9209
+9210
+9211
+9212
+9213
+9214
+9215
+9216
+9217

     

     
-      
# File 'lib/kettle/jem.rb', line 9157
+      
# File 'lib/kettle/jem.rb', line 9188
 
 def inject_framework_matrix_workflow_env(content, facts)
   env_by_appraisal = framework_matrix_appraisal_env_by_name(facts)
@@ -55621,30 +55627,30 @@ 

 
 
-9419
-9420
-9421
-9422
-9423
-9424
-9425
-9426
-9427
-9428
-9429
-9430
-9431
-9432
-9433
-9434
-9435
-9436
-9437
-9438
-9439

+9450
+9451
+9452
+9453
+9454
+9455
+9456
+9457
+9458
+9459
+9460
+9461
+9462
+9463
+9464
+9465
+9466
+9467
+9468
+9469
+9470

     		
     
-      
# File 'lib/kettle/jem.rb', line 9419
+      
# File 'lib/kettle/jem.rb', line 9450
 
 def inject_main_gemfile_default_test_bundle(content, facts)
   bundle = facts.to_h.dig(:ci, :default_test_bundle).to_h
@@ -55687,18 +55693,18 @@ 

       
 
 
-9406
-9407
-9408
-9409
-9410
-9411
-9412
-9413
-9414

+9437
+9438
+9439
+9440
+9441
+9442
+9443
+9444
+9445

     

     
-      
# File 'lib/kettle/jem.rb', line 9406
+      
# File 'lib/kettle/jem.rb', line 9437
 
 def inject_main_gemfile_recording_eval(content, facts)
   return content unless facts.to_h.dig(:ci, :recording)
@@ -55729,28 +55735,28 @@ 

       
 
 
-10285
-10286
-10287
-10288
-10289
-10290
-10291
-10292
-10293
-10294
-10295
-10296
-10297
-10298
-10299
-10300
-10301
-10302
-10303

+10316
+10317
+10318
+10319
+10320
+10321
+10322
+10323
+10324
+10325
+10326
+10327
+10328
+10329
+10330
+10331
+10332
+10333
+10334

     

     
-      
# File 'lib/kettle/jem.rb', line 10285
+      
# File 'lib/kettle/jem.rb', line 10316
 
 def inject_standard_appraisal_gemfiles(content, facts)
   gemfiles = facts.to_h.dig(:ci, :standard_appraisal_gemfiles).to_a
@@ -55814,22 +55820,22 @@ 

       
 
 
-13207
-13208
-13209
-13210
-13211
-13212
-13213
-13214
-13215
-13216
-13217
-13218
-13219

+13238
+13239
+13240
+13241
+13242
+13243
+13244
+13245
+13246
+13247
+13248
+13249
+13250

     

     
-      
# File 'lib/kettle/jem.rb', line 13207
+      
# File 'lib/kettle/jem.rb', line 13238
 
 def insert_after_line_sequence(content, sequence, insertion, error_message)
   lines = content.to_s.lines(chomp: true)
@@ -55864,32 +55870,32 @@ 

 
 
-6630
-6631
-6632
-6633
-6634
-6635
-6636
-6637
-6638
-6639
-6640
-6641
-6642
-6643
-6644
-6645
-6646
-6647
-6648
-6649
-6650
-6651
-6652

+6661
+6662
+6663
+6664
+6665
+6666
+6667
+6668
+6669
+6670
+6671
+6672
+6673
+6674
+6675
+6676
+6677
+6678
+6679
+6680
+6681
+6682
+6683

     		
     
-      
# File 'lib/kettle/jem.rb', line 6630
+      
# File 'lib/kettle/jem.rb', line 6661
 
 def insert_changelog_transfer_entries_in_release(lines, heading, entries)
   heading_index = lines.index { |line| line.to_s == heading.to_s }
@@ -55934,19 +55940,19 @@ 

       
 
 
-9495
-9496
-9497
-9498
-9499
-9500
-9501
-9502
-9503
-9504

+9526
+9527
+9528
+9529
+9530
+9531
+9532
+9533
+9534
+9535

     

     
-      
# File 'lib/kettle/jem.rb', line 9495
+      
# File 'lib/kettle/jem.rb', line 9526
 
 def insert_gemfile_dependency_blocks(content, blocks)
   lines = content.to_s.lines
@@ -55978,14 +55984,14 @@ 

       
 
 
-12350
-12351
-12352
-12353
-12354

+12381
+12382
+12383
+12384
+12385

     

     
-      
# File 'lib/kettle/jem.rb', line 12350
+      
# File 'lib/kettle/jem.rb', line 12381
 
 def insert_lines_after(content, line_number, insertion)
   lines = content.to_s.lines
@@ -56012,14 +56018,14 @@ 

       
 
 
-12344
-12345
-12346
-12347
-12348

+12375
+12376
+12377
+12378
+12379

     

     
-      
# File 'lib/kettle/jem.rb', line 12344
+      
# File 'lib/kettle/jem.rb', line 12375
 
 def insert_lines_before(content, line_number, insertion)
   lines = content.to_s.lines
@@ -56046,14 +56052,14 @@ 

 
 
-12172
-12173
-12174
-12175
-12176

+12203
+12204
+12205
+12206
+12207

     		
     
-      
# File 'lib/kettle/jem.rb', line 12172
+      
# File 'lib/kettle/jem.rb', line 12203
 
 def insert_missing_development_gemspec_dependency_lines(content, missing_lines)
   return content if missing_lines.empty?
@@ -56080,24 +56086,24 @@ 

 
 
-11805
-11806
-11807
-11808
-11809
-11810
-11811
-11812
-11813
-11814
-11815
-11816
-11817
-11818
-11819

+11836
+11837
+11838
+11839
+11840
+11841
+11842
+11843
+11844
+11845
+11846
+11847
+11848
+11849
+11850

     		
     
-      
# File 'lib/kettle/jem.rb', line 11805
+      
# File 'lib/kettle/jem.rb', line 11836
 
 def insert_missing_gemspec_assignment_sources(content, replacements, receiver:)
   return content if replacements.empty?
@@ -56134,26 +56140,26 @@ 

 
 
-11255
-11256
-11257
-11258
-11259
-11260
-11261
-11262
-11263
-11264
-11265
-11266
-11267
-11268
-11269
-11270
-11271

+11286
+11287
+11288
+11289
+11290
+11291
+11292
+11293
+11294
+11295
+11296
+11297
+11298
+11299
+11300
+11301
+11302

     		
     
-      
# File 'lib/kettle/jem.rb', line 11255
+      
# File 'lib/kettle/jem.rb', line 11286
 
 def insert_missing_gemspec_files_assignment(content, template_content:, template_receiver:)
   return content if gemspec_assignment_records(content, receiver: template_receiver).any? { |record| record.fetch(:field) == "files" }
@@ -56192,17 +56198,17 @@ 

 
 
-12163
-12164
-12165
-12166
-12167
-12168
-12169
-12170

+12194
+12195
+12196
+12197
+12198
+12199
+12200
+12201

     		
     
-      
# File 'lib/kettle/jem.rb', line 12163
+      
# File 'lib/kettle/jem.rb', line 12194
 
 def insert_missing_runtime_gemspec_dependency_lines(content, missing_lines, receiver:)
   return content if missing_lines.empty?
@@ -56232,26 +56238,26 @@ 

       
 
 
-12770
-12771
-12772
-12773
-12774
-12775
-12776
-12777
-12778
-12779
-12780
-12781
-12782
-12783
-12784
-12785
-12786

+12801
+12802
+12803
+12804
+12805
+12806
+12807
+12808
+12809
+12810
+12811
+12812
+12813
+12814
+12815
+12816
+12817

     

     
-      
# File 'lib/kettle/jem.rb', line 12770
+      
# File 'lib/kettle/jem.rb', line 12801
 
 def insert_yaml_scalar_after_path(content, path, key, value)
   lines = content.to_s.lines
@@ -56290,14 +56296,14 @@ 

       
 
 
-2618
-2619
-2620
-2621
-2622

+2647
+2648
+2649
+2650
+2651

     

     
-      
# File 'lib/kettle/jem.rb', line 2618
+      
# File 'lib/kettle/jem.rb', line 2647
 
 def install_tasks
   # Rake task files must be reloaded for each active Rake.application.
@@ -56324,18 +56330,18 @@ 

       
 
 
-18044
-18045
-18046
-18047
-18048
-18049
-18050
-18051
-18052

+18076
+18077
+18078
+18079
+18080
+18081
+18082
+18083
+18084

     

     
-      
# File 'lib/kettle/jem.rb', line 18044
+      
# File 'lib/kettle/jem.rb', line 18076
 
 def integration_license_spdx(config, license)
   configured = if license.is_a?(Hash)
@@ -56389,15 +56395,15 @@ 

       
 
 
-11749
-11750
-11751
-11752
-11753
-11754

+11780
+11781
+11782
+11783
+11784
+11785

     

     
-      
# File 'lib/kettle/jem.rb', line 11749
+      
# File 'lib/kettle/jem.rb', line 11780
 
 def io_popen_gemspec_files_assignment?(node)
   node.is_a?(::Prism::CallNode) &&
@@ -56425,21 +56431,21 @@ 

       
 
 
-10453
-10454
-10455
-10456
-10457
-10458
-10459
-10460
-10461
-10462
-10463
-10464

+10484
+10485
+10486
+10487
+10488
+10489
+10490
+10491
+10492
+10493
+10494
+10495

     

     
-      
# File 'lib/kettle/jem.rb', line 10453
+      
# File 'lib/kettle/jem.rb', line 10484
 
 def json_merge_options(recipe)
   options = {
@@ -56473,34 +56479,34 @@ 

 
 
-14427
-14428
-14429
-14430
-14431
-14432
-14433
-14434
-14435
-14436
-14437
-14438
-14439
-14440
-14441
-14442
-14443
-14444
-14445
-14446
-14447
-14448
-14449
-14450
-14451

+14459
+14460
+14461
+14462
+14463
+14464
+14465
+14466
+14467
+14468
+14469
+14470
+14471
+14472
+14473
+14474
+14475
+14476
+14477
+14478
+14479
+14480
+14481
+14482
+14483

     		
     
-      
# File 'lib/kettle/jem.rb', line 14427
+      
# File 'lib/kettle/jem.rb', line 14459
 
 def kettle_changelog_gemfile_dependency_token(package_name)
   return "" if package_name == "kettle-changelog"
@@ -56547,31 +56553,31 @@ 

       
 
 
-18565
-18566
-18567
-18568
-18569
-18570
-18571
-18572
-18573
-18574
-18575
-18576
-18577
-18578
-18579
-18580
-18581
-18582
-18583
-18584
-18585
-18586

+18597
+18598
+18599
+18600
+18601
+18602
+18603
+18604
+18605
+18606
+18607
+18608
+18609
+18610
+18611
+18612
+18613
+18614
+18615
+18616
+18617
+18618

     

     
-      
# File 'lib/kettle/jem.rb', line 18565
+      
# File 'lib/kettle/jem.rb', line 18597
 
 def kettle_config_bootstrap_facts(project_root, env, template_selection: {})
   return if File.exist?(File.join(project_root, KETTLE_CONFIG_PATH))
@@ -56615,35 +56621,36 @@ 

       
 
 
-18588
-18589
-18590
-18591
-18592
-18593
-18594
-18595
-18596
-18597
-18598
-18599
-18600
-18601
-18602
-18603
-18604
-18605
-18606
-18607
-18608
-18609
-18610
-18611
-18612
-18613

+18620
+18621
+18622
+18623
+18624
+18625
+18626
+18627
+18628
+18629
+18630
+18631
+18632
+18633
+18634
+18635
+18636
+18637
+18638
+18639
+18640
+18641
+18642
+18643
+18644
+18645
+18646

     

     
-      
# File 'lib/kettle/jem.rb', line 18588
+      
# File 'lib/kettle/jem.rb', line 18620
 
 def kettle_config_bootstrap_recipe(bootstrap)
   recipe = recipe_entry(
@@ -56655,6 +56662,7 @@ 

   )
   recipe[:template_preference] = bootstrap.fetch(:template_preference)
   recipe[:template_tokens] = {
+    "KJ|GEMSPEC_PATH" => bootstrap[:gemspec_path].to_s,
     "KJ|MIN_DIVERGENCE_THRESHOLD" => bootstrap.fetch(:min_divergence_threshold).to_s,
     "KJ|MIN_RUBY" => bootstrap[:min_ruby].to_s,
     "KJ|MIN_TEST_RUBY" => bootstrap[:test_min_ruby].to_s,
@@ -56691,14 +56699,14 @@ 

       
 
 
-5409
-5410
-5411
-5412
-5413

+5440
+5441
+5442
+5443
+5444

     

     
-      
# File 'lib/kettle/jem.rb', line 5409
+      
# File 'lib/kettle/jem.rb', line 5440
 
 def kettle_config_file_override_block_end(lines, start_index)
   index = start_index + 1
@@ -56725,20 +56733,20 @@ 

       
 
 
-13065
-13066
-13067
-13068
-13069
-13070
-13071
-13072
-13073
-13074
-13075

+13096
+13097
+13098
+13099
+13100
+13101
+13102
+13103
+13104
+13105
+13106

     

     
-      
# File 'lib/kettle/jem.rb', line 13065
+      
# File 'lib/kettle/jem.rb', line 13096
 
 def kettle_config_file_override_lines(path, strategy)
   parts = path.to_s.split("/")
@@ -56771,17 +56779,17 @@ 

 
 
-5400
-5401
-5402
-5403
-5404
-5405
-5406
-5407

+5431
+5432
+5433
+5434
+5435
+5436
+5437
+5438

     		
     
-      
# File 'lib/kettle/jem.rb', line 5400
+      
# File 'lib/kettle/jem.rb', line 5431
 
 def kettle_config_gemspec_override_insertion_index(lines, files_index)
   readme_index = lines.index("  README.md:")
@@ -56811,17 +56819,17 @@ 

       
 
 
-12586
-12587
-12588
-12589
-12590
-12591
-12592
-12593

+12617
+12618
+12619
+12620
+12621
+12622
+12623
+12624

     

     
-      
# File 'lib/kettle/jem.rb', line 12586
+      
# File 'lib/kettle/jem.rb', line 12617
 
 def kettle_config_internal_value(value_provider)
   case value_provider
@@ -56851,21 +56859,21 @@ 

       
 
 
-5421
-5422
-5423
-5424
-5425
-5426
-5427
-5428
-5429
-5430
-5431
-5432

+5452
+5453
+5454
+5455
+5456
+5457
+5458
+5459
+5460
+5461
+5462
+5463

     

     
-      
# File 'lib/kettle/jem.rb', line 5421
+      
# File 'lib/kettle/jem.rb', line 5452
 
 def kettle_config_template_entries_lines(entries)
   ["  entries:", *entries.flat_map do |entry|
@@ -56899,15 +56907,15 @@ 

       
 
 
-15488
-15489
-15490
-15491
-15492
-15493

+15520
+15521
+15522
+15523
+15524
+15525

     

     
-      
# File 'lib/kettle/jem.rb', line 15488
+      
# File 'lib/kettle/jem.rb', line 15520
 
 def kettle_dev_local_gems(config)
   gems = %w[kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog]
@@ -56935,20 +56943,20 @@ 

       
 
 
-13799
-13800
-13801
-13802
-13803
-13804
-13805
-13806
-13807
-13808
-13809

+13830
+13831
+13832
+13833
+13834
+13835
+13836
+13837
+13838
+13839
+13840

     

     
-      
# File 'lib/kettle/jem.rb', line 13799
+      
# File 'lib/kettle/jem.rb', line 13830
 
 def kettle_jem_config(project_root)
   path = kettle_jem_config_path(project_root)
@@ -56981,15 +56989,15 @@ 

       
 
 
-13827
-13828
-13829
-13830
-13831
-13832

+13858
+13859
+13860
+13861
+13862
+13863

     

     
-      
# File 'lib/kettle/jem.rb', line 13827
+      
# File 'lib/kettle/jem.rb', line 13858
 
 def kettle_jem_config_path(project_root)
   canonical = File.join(project_root, KETTLE_CONFIG_PATH)
@@ -57017,13 +57025,13 @@ 

       
 
 
-13834
-13835
-13836
-13837

+13865
+13866
+13867
+13868

     

     
-      
# File 'lib/kettle/jem.rb', line 13834
+      
# File 'lib/kettle/jem.rb', line 13865
 
 def kettle_jem_config_relative_path(project_root)
   path = kettle_jem_config_path(project_root)
@@ -57049,14 +57057,14 @@ 

       
 
 
-5495
-5496
-5497
-5498
-5499

+5526
+5527
+5528
+5529
+5530

     

     
-      
# File 'lib/kettle/jem.rb', line 5495
+      
# File 'lib/kettle/jem.rb', line 5526
 
 def kettle_jem_dependency_requirements(version_module: Version)
   require_relative "jem/version_gem" unless version_module.respond_to?(:major)
@@ -57083,13 +57091,13 @@ 

       
 
 
-5501
-5502
-5503
-5504

+5532
+5533
+5534
+5535

     

     
-      
# File 'lib/kettle/jem.rb', line 5501
+      
# File 'lib/kettle/jem.rb', line 5532
 
 def kettle_jem_dependency_source(version_module: Version)
   requirements = kettle_jem_dependency_requirements(version_module: version_module)
@@ -57115,35 +57123,6 @@ 

       
 
 
-5194
-5195
-5196
-5197
-5198
-5199
-5200
-5201
-5202
-5203
-5204
-5205
-5206
-5207
-5208
-5209
-5210
-5211
-5212
-5213
-5214
-5215
-5216
-5217
-5218
-5219
-5220
-5221
-5222
 5223
 5224
 5225
@@ -57171,10 +57150,41 @@ 

 5247
 5248
 5249
-5250

+5250
+5251
+5252
+5253
+5254
+5255
+5256
+5257
+5258
+5259
+5260
+5261
+5262
+5263
+5264
+5265
+5266
+5267
+5268
+5269
+5270
+5271
+5272
+5273
+5274
+5275
+5276
+5277
+5278
+5279
+5280
+5281

     

     
-      
# File 'lib/kettle/jem.rb', line 5194
+      
# File 'lib/kettle/jem.rb', line 5223
 
 def kettle_jem_state_sync_step(project_root, report)
   config_path = kettle_jem_config_path(project_root)
@@ -57191,6 +57201,7 @@ 

   latest_replay = report.dig(:facts, :changelog, :latest_transfer_entry)
   existing_state = TemplateLock.load(project_root: project_root, config_path: config_path)
   existing_replay = existing_state.dig(TemplateLock::TEMPLATE_STATE_KEY, TemplateChecksums::CHANGELOG_REPLAY_SUBKEY)
+  maintenance_changelog = TemplateLock.maintenance_changelog(existing_state)
   changelog_replay = if latest_replay
     {
       TemplateChecksums::LAST_ENTRY_KEY_SUBKEY => latest_replay.fetch(:key),
@@ -57203,6 +57214,7 @@ 

     "version" => VERSION,
     "applied_at" => Time.now.utc.strftime("%Y-%m-%d"),
     TemplateChecksums::CHANGELOG_REPLAY_SUBKEY => changelog_replay,
+    TemplateLock::MAINTENANCE_CHANGELOG_SUBKEY => maintenance_changelog,
     TemplateChecksums::CHECKSUMS_SUBKEY => TemplateChecksums.compute(
       template_root: template_root_path(project_root, config: kettle_jem_config(project_root))
     )
@@ -57253,12 +57265,12 @@ 

       
 
 
-18825
-18826
-18827

+18858
+18859
+18860

     

     
-      
# File 'lib/kettle/jem.rb', line 18825
+      
# File 'lib/kettle/jem.rb', line 18858
 
 def known_license_template_basenames
   KNOWN_LICENSE_TEMPLATE_BASENAMES
@@ -57283,17 +57295,17 @@ 

       
 
 
-17828
-17829
-17830
-17831
-17832
-17833
-17834
-17835

+17860
+17861
+17862
+17863
+17864
+17865
+17866
+17867

     

     
-      
# File 'lib/kettle/jem.rb', line 17828
+      
# File 'lib/kettle/jem.rb', line 17860
 
 def large_business_license_cell(author_email, license_source_url: nil)
   cell = license_link("LicenseRef-Big-Time-Public-License", license_source_url: license_source_url)
@@ -57323,12 +57335,12 @@ 

       
 
 
-6304
-6305
-6306

+6335
+6336
+6337

     

     
-      
# File 'lib/kettle/jem.rb', line 6304
+      
# File 'lib/kettle/jem.rb', line 6335
 
 def latest_changelog_transfer_entry(entries)
   Array(entries).last
@@ -57353,12 +57365,12 @@ 

       
 
 
-8837
-8838
-8839

+8868
+8869
+8870

     

     
-      
# File 'lib/kettle/jem.rb', line 8837
+      
# File 'lib/kettle/jem.rb', line 8868
 
 def leading_space_count(line)
   line.to_s.each_char.take_while { |char| char == " " }.count
@@ -57383,13 +57395,13 @@ 

       
 
 
-12356
-12357
-12358
-12359

+12387
+12388
+12389
+12390

     

     
-      
# File 'lib/kettle/jem.rb', line 12356
+      
# File 'lib/kettle/jem.rb', line 12387
 
 def leading_whitespace(source)
   text = source.to_s
@@ -57440,18 +57452,18 @@ 

       
 
 
-11759
-11760
-11761
-11762
-11763
-11764
-11765
-11766
-11767

+11790
+11791
+11792
+11793
+11794
+11795
+11796
+11797
+11798

     

     
-      
# File 'lib/kettle/jem.rb', line 11759
+      
# File 'lib/kettle/jem.rb', line 11790
 
 def legacy_git_ls_files_assignment?(node)
   return legacy_git_ls_files_chdir_assignment?(node) if node.is_a?(::Prism::CallNode) && node.name == :chdir
@@ -57508,16 +57520,16 @@ 

       
 
 
-11773
-11774
-11775
-11776
-11777
-11778
-11779

+11804
+11805
+11806
+11807
+11808
+11809
+11810

     

     
-      
# File 'lib/kettle/jem.rb', line 11773
+      
# File 'lib/kettle/jem.rb', line 11804
 
 def legacy_git_ls_files_chdir_assignment?(node)
   return false unless node.receiver&.slice == "Dir"
@@ -57546,28 +57558,28 @@ 

       
 
 
-5703
-5704
-5705
-5706
-5707
-5708
-5709
-5710
-5711
-5712
-5713
-5714
-5715
-5716
-5717
-5718
-5719
-5720
-5721

+5734
+5735
+5736
+5737
+5738
+5739
+5740
+5741
+5742
+5743
+5744
+5745
+5746
+5747
+5748
+5749
+5750
+5751
+5752

     

     
-      
# File 'lib/kettle/jem.rb', line 5703
+      
# File 'lib/kettle/jem.rb', line 5734
 
 def legacy_rbs_consolidation_step(project_root, facts, entrypoint_require:)
   legacy_signature_paths = legacy_rbs_signature_paths(project_root, entrypoint_require)
@@ -57608,17 +57620,17 @@ 

       
 
 
-16002
-16003
-16004
-16005
-16006
-16007
-16008
-16009

+16034
+16035
+16036
+16037
+16038
+16039
+16040
+16041

     

     
-      
# File 'lib/kettle/jem.rb', line 16002
+      
# File 'lib/kettle/jem.rb', line 16034
 
 def legacy_rbs_signature_paths(project_root, entrypoint_require)
   legacy_root = File.join(project_root, "sig", entrypoint_require.to_s)
@@ -57648,22 +57660,22 @@ 

       
 
 
-12647
-12648
-12649
-12650
-12651
-12652
-12653
-12654
-12655
-12656
-12657
-12658
-12659

+12678
+12679
+12680
+12681
+12682
+12683
+12684
+12685
+12686
+12687
+12688
+12689
+12690

     

     
-      
# File 'lib/kettle/jem.rb', line 12647
+      
# File 'lib/kettle/jem.rb', line 12678
 
 def legacy_readme_top_logo_mode_options(value)
   raw = value.to_s.strip
@@ -57698,13 +57710,13 @@ 

       
 
 
-17702
-17703
-17704
-17705

+17734
+17735
+17736
+17737

     

     
-      
# File 'lib/kettle/jem.rb', line 17702
+      
# File 'lib/kettle/jem.rb', line 17734
 
 def license_badge(spdx_id, ref: :license_ref)
   base = spdx_basename(spdx_id)
@@ -57730,13 +57742,13 @@ 

       
 
 
-17717
-17718
-17719
-17720

+17749
+17750
+17751
+17752

     

     
-      
# File 'lib/kettle/jem.rb', line 17717
+      
# File 'lib/kettle/jem.rb', line 17749
 
 def license_badge_img(spdx_id)
   base = spdx_basename(spdx_id).gsub("-", "--").gsub("_", "__").tr(" ", "_")
@@ -57762,13 +57774,13 @@ 

       
 
 
-17707
-17708
-17709
-17710

+17739
+17740
+17741
+17742

     

     
-      
# File 'lib/kettle/jem.rb', line 17707
+      
# File 'lib/kettle/jem.rb', line 17739
 
 def license_badge_ref(spdx_id, license_source_url: nil)
   base = spdx_basename(spdx_id)
@@ -57794,13 +57806,13 @@ 

       
 
 
-17731
-17732
-17733
-17734

+17763
+17764
+17765
+17766

     

     
-      
# File 'lib/kettle/jem.rb', line 17731
+      
# File 'lib/kettle/jem.rb', line 17763
 
 def license_compat_badge(category)
   data = APACHE_LICENSE_COMPAT_BADGE_DATA.fetch(category)
@@ -57826,17 +57838,17 @@ 

       
 
 
-17722
-17723
-17724
-17725
-17726
-17727
-17728
-17729

+17754
+17755
+17756
+17757
+17758
+17759
+17760
+17761

     

     
-      
# File 'lib/kettle/jem.rb', line 17722
+      
# File 'lib/kettle/jem.rb', line 17754
 
 def license_compat_category(licenses)
   categories = Array(licenses).filter_map { |license| APACHE_LICENSE_COMPAT_CATEGORIES[license.to_s] }.uniq
@@ -57866,15 +57878,15 @@ 

       
 
 
-17784
-17785
-17786
-17787
-17788
-17789

+17816
+17817
+17818
+17819
+17820
+17821

     

     
-      
# File 'lib/kettle/jem.rb', line 17784
+      
# File 'lib/kettle/jem.rb', line 17816
 
 def license_compat_img(category)
   data = APACHE_LICENSE_COMPAT_BADGE_DATA.fetch(category)
@@ -57902,12 +57914,12 @@ 

       
 
 
-17780
-17781
-17782

+17812
+17813
+17814

     

     
-      
# File 'lib/kettle/jem.rb', line 17780
+      
# File 'lib/kettle/jem.rb', line 17812
 
 def license_compat_ref(category)
   APACHE_LICENSE_COMPAT_BADGE_DATA.fetch(category).fetch(:ref)
@@ -57932,20 +57944,20 @@ 

       
 
 
-17670
-17671
-17672
-17673
-17674
-17675
-17676
-17677
-17678
-17679
-17680

+17702
+17703
+17704
+17705
+17706
+17707
+17708
+17709
+17710
+17711
+17712

     

     
-      
# File 'lib/kettle/jem.rb', line 17670
+      
# File 'lib/kettle/jem.rb', line 17702
 
 def license_contact_line(author_email, context:)
   if author_email.to_s.empty?
@@ -57978,13 +57990,13 @@ 

       
 
 
-17609
-17610
-17611
-17612

+17641
+17642
+17643
+17644

     

     
-      
# File 'lib/kettle/jem.rb', line 17609
+      
# File 'lib/kettle/jem.rb', line 17641
 
 def license_copyright_notice(copyright_lines, copyright_prefix, author)
   lines = copyright_notice_lines(copyright_lines, copyright_prefix, author).map { |line| "- #{line}" }
@@ -58010,13 +58022,13 @@ 

       
 
 
-17712
-17713
-17714
-17715

+17744
+17745
+17746
+17747

     

     
-      
# File 'lib/kettle/jem.rb', line 17712
+      
# File 'lib/kettle/jem.rb', line 17744
 
 def license_detail_ref(base, license_source_url: nil)
   file = "#{base}.md"
@@ -58065,12 +58077,12 @@ 

       
 
 
-18054
-18055
-18056

+18086
+18087
+18088

     

     
-      
# File 'lib/kettle/jem.rb', line 18054
+      
# File 'lib/kettle/jem.rb', line 18086
 
 def license_eye_compatible_licenses?(licenses)
   Array(licenses).map(&:to_s).any? { |license_id| LICENSE_EYE_COMPATIBILITY_LICENSES.include?(license_id) }
@@ -58095,27 +58107,27 @@ 

       
 
 
-17761
-17762
-17763
-17764
-17765
-17766
-17767
-17768
-17769
-17770
-17771
-17772
-17773
-17774
-17775
-17776
-17777
-17778

+17793
+17794
+17795
+17796
+17797
+17798
+17799
+17800
+17801
+17802
+17803
+17804
+17805
+17806
+17807
+17808
+17809
+17810

     

     
-      
# File 'lib/kettle/jem.rb', line 17761
+      
# File 'lib/kettle/jem.rb', line 17793
 
 def license_eye_dependency_license_entry(entry)
   data = if entry.is_a?(Hash)
@@ -58155,17 +58167,17 @@ 

       
 
 
-17752
-17753
-17754
-17755
-17756
-17757
-17758
-17759

+17784
+17785
+17786
+17787
+17788
+17789
+17790
+17791

     

     
-      
# File 'lib/kettle/jem.rb', line 17752
+      
# File 'lib/kettle/jem.rb', line 17784
 
 def license_eye_dependency_licenses(config)
   entries = Array(config.dig("license_eye", "dependency_licenses")).filter_map do |entry|
@@ -58195,12 +58207,12 @@ 

       
 
 
-17748
-17749
-17750

+17780
+17781
+17782

     

     
-      
# File 'lib/kettle/jem.rb', line 17748
+      
# File 'lib/kettle/jem.rb', line 17780
 
 def license_eye_flags(licenses)
   (license_eye_mode(licenses) == "check") ? "--weak-compatible" : ""
@@ -58225,12 +58237,12 @@ 

       
 
 
-17744
-17745
-17746

+17776
+17777
+17778

     

     
-      
# File 'lib/kettle/jem.rb', line 17744
+      
# File 'lib/kettle/jem.rb', line 17776
 
 def license_eye_mode(licenses)
   (Array(licenses).map(&:to_s).any? { |license| LICENSE_EYE_COMPATIBILITY_LICENSES.include?(license) }) ? "check" : "resolve"
@@ -58255,12 +58267,12 @@ 

       
 
 
-17740
-17741
-17742

+17772
+17773
+17774

     

     
-      
# File 'lib/kettle/jem.rb', line 17740
+      
# File 'lib/kettle/jem.rb', line 17772
 
 def license_eye_primary_spdx(licenses, fallback)
   Array(licenses).map(&:to_s).find { |license| LICENSE_EYE_COMPATIBILITY_LICENSES.include?(license) } || fallback
@@ -58285,12 +58297,12 @@ 

       
 
 
-17736
-17737
-17738

+17768
+17769
+17770

     

     
-      
# File 'lib/kettle/jem.rb', line 17736
+      
# File 'lib/kettle/jem.rb', line 17768
 
 def license_eye_workflow_badge(licenses, config = {})
   disabled_integrations(config, license: {spdx: licenses}).include?(SKYWALKING_EYES_INTEGRATION) ? "" : README_LICENSE_EYE_WORKFLOW_BADGE
@@ -58315,38 +58327,6 @@ 

       
 
 
-17511
-17512
-17513
-17514
-17515
-17516
-17517
-17518
-17519
-17520
-17521
-17522
-17523
-17524
-17525
-17526
-17527
-17528
-17529
-17530
-17531
-17532
-17533
-17534
-17535
-17536
-17537
-17538
-17539
-17540
-17541
-17542
 17543
 17544
 17545
@@ -58355,10 +58335,42 @@ 

 17548
 17549
 17550
-17551

+17551
+17552
+17553
+17554
+17555
+17556
+17557
+17558
+17559
+17560
+17561
+17562
+17563
+17564
+17565
+17566
+17567
+17568
+17569
+17570
+17571
+17572
+17573
+17574
+17575
+17576
+17577
+17578
+17579
+17580
+17581
+17582
+17583

     

     
-      
# File 'lib/kettle/jem.rb', line 17511
+      
# File 'lib/kettle/jem.rb', line 17543
 
 def license_facts(config, gemspec_licenses, author: {}, author_email: nil, copyright: {}, source_url: nil, license_txt: {})
   configured_licenses = Array(config["licenses"]).map { |license| license.to_s.strip }.reject(&:empty?)
@@ -58421,13 +58433,13 @@ 

       
 
 
-17697
-17698
-17699
-17700

+17729
+17730
+17731
+17732

     

     
-      
# File 'lib/kettle/jem.rb', line 17697
+      
# File 'lib/kettle/jem.rb', line 17729
 
 def license_link(spdx_id, license_source_url: nil)
   base = spdx_basename(spdx_id)
@@ -58453,25 +58465,25 @@ 

       
 
 
-17634
-17635
-17636
-17637
-17638
-17639
-17640
-17641
-17642
-17643
-17644
-17645
-17646
-17647
-17648
-17649

+17666
+17667
+17668
+17669
+17670
+17671
+17672
+17673
+17674
+17675
+17676
+17677
+17678
+17679
+17680
+17681

     

     
-      
# File 'lib/kettle/jem.rb', line 17634
+      
# File 'lib/kettle/jem.rb', line 17666
 
 def license_md_content(licenses, author_email: nil, license_source_url: nil, custom_license: false)
   return "# License\n\nThe licensing terms for this project are provided in [LICENSE.txt](LICENSE.txt)." if custom_license
@@ -58509,16 +58521,16 @@ 

       
 
 
-17568
-17569
-17570
-17571
-17572
-17573
-17574

+17600
+17601
+17602
+17603
+17604
+17605
+17606

     

     
-      
# File 'lib/kettle/jem.rb', line 17568
+      
# File 'lib/kettle/jem.rb', line 17600
 
 def license_source_blob_url(source_url)
   repo_url = concrete_github_url(source_url)
@@ -58547,28 +58559,28 @@ 

       
 
 
-17585
-17586
-17587
-17588
-17589
-17590
-17591
-17592
-17593
-17594
-17595
-17596
-17597
-17598
-17599
-17600
-17601
-17602
-17603

+17617
+17618
+17619
+17620
+17621
+17622
+17623
+17624
+17625
+17626
+17627
+17628
+17629
+17630
+17631
+17632
+17633
+17634
+17635

     

     
-      
# File 'lib/kettle/jem.rb', line 17585
+      
# File 'lib/kettle/jem.rb', line 17617
 
 def license_template_tokens(license)
   {
@@ -58609,23 +58621,23 @@ 

       
 
 
-17553
-17554
-17555
-17556
-17557
-17558
-17559
-17560
-17561
-17562
-17563
-17564
-17565
-17566

+17585
+17586
+17587
+17588
+17589
+17590
+17591
+17592
+17593
+17594
+17595
+17596
+17597
+17598

     

     
-      
# File 'lib/kettle/jem.rb', line 17553
+      
# File 'lib/kettle/jem.rb', line 17585
 
 def license_txt_facts(project_root)
   path = File.join(project_root.to_s, "LICENSE.txt")
@@ -58661,21 +58673,21 @@ 

       
 
 
-17799
-17800
-17801
-17802
-17803
-17804
-17805
-17806
-17807
-17808
-17809
-17810

+17831
+17832
+17833
+17834
+17835
+17836
+17837
+17838
+17839
+17840
+17841
+17842

     

     
-      
# File 'lib/kettle/jem.rb', line 17799
+      
# File 'lib/kettle/jem.rb', line 17831
 
 def license_use_case_guide_table(licenses, author_email: nil, license_source_url: nil)
   has_floss_oss = licenses.include?("MIT") || licenses.include?("AGPL-3.0-only")
@@ -58709,24 +58721,24 @@ 

       
 
 
-17812
-17813
-17814
-17815
-17816
-17817
-17818
-17819
-17820
-17821
-17822
-17823
-17824
-17825
-17826

+17844
+17845
+17846
+17847
+17848
+17849
+17850
+17851
+17852
+17853
+17854
+17855
+17856
+17857
+17858

     

     
-      
# File 'lib/kettle/jem.rb', line 17812
+      
# File 'lib/kettle/jem.rb', line 17844
 
 def license_use_case_rows(licenses, author_email: nil, license_source_url: nil)
   rows = []
@@ -58763,14 +58775,14 @@ 

       
 
 
-15455
-15456
-15457
-15458
-15459

+15487
+15488
+15489
+15490
+15491

     

     
-      
# File 'lib/kettle/jem.rb', line 15455
+      
# File 'lib/kettle/jem.rb', line 15487
 
 def load_project_gemspec(gemspec_path)
   Gem::Specification.load(gemspec_path)
@@ -58797,37 +58809,37 @@ 

       
 
 
-15514
-15515
-15516
-15517
-15518
-15519
-15520
-15521
-15522
-15523
-15524
-15525
-15526
-15527
-15528
-15529
-15530
-15531
-15532
-15533
-15534
-15535
-15536
-15537
-15538
-15539
-15540
-15541

+15546
+15547
+15548
+15549
+15550
+15551
+15552
+15553
+15554
+15555
+15556
+15557
+15558
+15559
+15560
+15561
+15562
+15563
+15564
+15565
+15566
+15567
+15568
+15569
+15570
+15571
+15572
+15573

     

     
-      
# File 'lib/kettle/jem.rb', line 15514
+      
# File 'lib/kettle/jem.rb', line 15546
 
 def local_gemfile_nomono_bootstrap(_package_name)
   <<~RUBY.rstrip
@@ -58900,16 +58912,16 @@ 

 
 
-9008
-9009
-9010
-9011
-9012
-9013
-9014

+9039
+9040
+9041
+9042
+9043
+9044
+9045

     		
     
-      
# File 'lib/kettle/jem.rb', line 9008
+      
# File 'lib/kettle/jem.rb', line 9039
 
 def local_gemfile_nomono_kernel_activation_call?(node)
   node.is_a?(::Prism::CallNode) &&
@@ -58961,12 +58973,12 @@ 

       
 
 
-8937
-8938
-8939

+8968
+8969
+8970

     

     
-      
# File 'lib/kettle/jem.rb', line 8937
+      
# File 'lib/kettle/jem.rb', line 8968
 
 def local_gemfile_template_recipe?(recipe)
   recipe.fetch(:target_path).to_s.end_with?("_local.gemfile")
@@ -58991,12 +59003,12 @@ 

       
 
 
-9066
-9067
-9068

+9097
+9098
+9099

     

     
-      
# File 'lib/kettle/jem.rb', line 9066
+      
# File 'lib/kettle/jem.rb', line 9097
 
 def local_gems_assignment(content)
   word_array_assignment(content, :local_gems)
@@ -59021,12 +59033,12 @@ 

       
 
 
-9074
-9075
-9076

+9105
+9106
+9107

     

     
-      
# File 'lib/kettle/jem.rb', line 9074
+      
# File 'lib/kettle/jem.rb', line 9105
 
 def local_gems_assignment_record(content)
   word_array_assignment_record(content, :local_gems)
@@ -59051,25 +59063,25 @@ 

       
 
 
-15211
-15212
-15213
-15214
-15215
-15216
-15217
-15218
-15219
-15220
-15221
-15222
-15223
-15224
-15225
-15226

+15243
+15244
+15245
+15246
+15247
+15248
+15249
+15250
+15251
+15252
+15253
+15254
+15255
+15256
+15257
+15258

     

     
-      
# File 'lib/kettle/jem.rb', line 15211
+      
# File 'lib/kettle/jem.rb', line 15243
 
 def local_modular_eval_paths_for_gem(project_root, gem_name)
   Dir.glob(File.join(project_root.to_s, "gemfiles", "modular", "**", "*_local.gemfile")).filter_map do |path|
@@ -59107,20 +59119,20 @@ 

       
 
 
-15199
-15200
-15201
-15202
-15203
-15204
-15205
-15206
-15207
-15208
-15209

+15231
+15232
+15233
+15234
+15235
+15236
+15237
+15238
+15239
+15240
+15241

     

     
-      
# File 'lib/kettle/jem.rb', line 15199
+      
# File 'lib/kettle/jem.rb', line 15231
 
 def local_modular_runtime_eval_paths(project_root, gemspec_metadata, package_name:)
   return {} unless project_root && gemspec_metadata.is_a?(Hash)
@@ -59153,12 +59165,12 @@ 

       
 
 
-8277
-8278
-8279

+8308
+8309
+8310

     

     
-      
# File 'lib/kettle/jem.rb', line 8277
+      
# File 'lib/kettle/jem.rb', line 8308
 
 def main_gemfile_after_gemspec_line(content)
   ruby_call_records(content, :gemspec).map { |call| ruby_node_source_end_line(call) + 1 }.min
@@ -59183,14 +59195,14 @@ 

 
 
-9447
-9448
-9449
-9450
-9451

+9478
+9479
+9480
+9481
+9482

     		
     
-      
# File 'lib/kettle/jem.rb', line 9447
+      
# File 'lib/kettle/jem.rb', line 9478
 
 def main_gemfile_default_test_bundle_insertion_index(content)
   main_gemfile_templating_eval_line(content) ||
@@ -59217,21 +59229,21 @@ 

       
 
 
-8147
-8148
-8149
-8150
-8151
-8152
-8153
-8154
-8155
-8156
-8157
-8158

+8178
+8179
+8180
+8181
+8182
+8183
+8184
+8185
+8186
+8187
+8188
+8189

     

     
-      
# File 'lib/kettle/jem.rb', line 8147
+      
# File 'lib/kettle/jem.rb', line 8178
 
 def main_gemfile_direct_gem_records(content, gem_name)
   lines = content.to_s.lines
@@ -59265,38 +59277,6 @@ 

       
 
 
-15265
-15266
-15267
-15268
-15269
-15270
-15271
-15272
-15273
-15274
-15275
-15276
-15277
-15278
-15279
-15280
-15281
-15282
-15283
-15284
-15285
-15286
-15287
-15288
-15289
-15290
-15291
-15292
-15293
-15294
-15295
-15296
 15297
 15298
 15299
@@ -59324,10 +59304,42 @@ 

 15321
 15322
 15323
-15324

+15324
+15325
+15326
+15327
+15328
+15329
+15330
+15331
+15332
+15333
+15334
+15335
+15336
+15337
+15338
+15339
+15340
+15341
+15342
+15343
+15344
+15345
+15346
+15347
+15348
+15349
+15350
+15351
+15352
+15353
+15354
+15355
+15356

     

     
-      
# File 'lib/kettle/jem.rb', line 15265
+      
# File 'lib/kettle/jem.rb', line 15297
 
 def main_gemfile_direct_sibling_block(gems, package_name:, source_url:, project_root:, repository: {}, local_modular_eval_paths: [])
   names = Array(gems).map(&:to_s).reject(&:empty?).uniq
@@ -59409,34 +59421,34 @@ 

       
 
 
-8192
-8193
-8194
-8195
-8196
-8197
-8198
-8199
-8200
-8201
-8202
-8203
-8204
-8205
-8206
-8207
-8208
-8209
-8210
-8211
-8212
-8213
-8214
-8215
-8216

+8223
+8224
+8225
+8226
+8227
+8228
+8229
+8230
+8231
+8232
+8233
+8234
+8235
+8236
+8237
+8238
+8239
+8240
+8241
+8242
+8243
+8244
+8245
+8246
+8247

     

     
-      
# File 'lib/kettle/jem.rb', line 8192
+      
# File 'lib/kettle/jem.rb', line 8223
 
 def main_gemfile_direct_sibling_records(content)
   body = prism_parse_success(content)&.value&.statements&.body || []
@@ -59483,12 +59495,12 @@ 

       
 
 
-8273
-8274
-8275

+8304
+8305
+8306

     

     
-      
# File 'lib/kettle/jem.rb', line 8273
+      
# File 'lib/kettle/jem.rb', line 8304
 
 def main_gemfile_first_eval_gemfile_line(content)
   ruby_call_records(content, :eval_gemfile).map { |call| call.location.start_line }.min
@@ -59513,19 +59525,19 @@ 

       
 
 
-15495
-15496
-15497
-15498
-15499

+15527
+15528
+15529
+15530
+15531

     

     
-      
# File 'lib/kettle/jem.rb', line 15495
+      
# File 'lib/kettle/jem.rb', line 15527
 
 def main_gemfile_kettle_family_gem(package_name)
   return "" if package_name.to_s == "kettle-family"
 
-  %(gem "kettle-family", "~> 1.2", ">= 1.2.97"\n)
+  %(gem "kettle-family", "~> 1.2", ">= 1.2.100"\n)
 end

     

   

-      
# File 'lib/kettle/jem.rb', line 15501
+      
# File 'lib/kettle/jem.rb', line 15533
 
 def main_gemfile_nomono_bootstrap(package_name)
   return "" if package_name.to_s == "nomono"
@@ -59587,20 +59599,20 @@ 

       
 
 
-8253
-8254
-8255
-8256
-8257
-8258
-8259
-8260
-8261
-8262
-8263

+8284
+8285
+8286
+8287
+8288
+8289
+8290
+8291
+8292
+8293
+8294

     

     
-      
# File 'lib/kettle/jem.rb', line 8253
+      
# File 'lib/kettle/jem.rb', line 8284
 
 def main_gemfile_nomono_bootstrap_source(template_content)
   records = main_gemfile_nomono_requirement_records(template_content)
@@ -59633,31 +59645,31 @@ 

 
 
-8333
-8334
-8335
-8336
-8337
-8338
-8339
-8340
-8341
-8342
-8343
-8344
-8345
-8346
-8347
-8348
-8349
-8350
-8351
-8352
-8353
-8354

+8364
+8365
+8366
+8367
+8368
+8369
+8370
+8371
+8372
+8373
+8374
+8375
+8376
+8377
+8378
+8379
+8380
+8381
+8382
+8383
+8384
+8385

     		
     
-      
# File 'lib/kettle/jem.rb', line 8333
+      
# File 'lib/kettle/jem.rb', line 8364
 
 def main_gemfile_nomono_requirement_records(content)
   body = prism_parse_success(content)&.value&.statements&.body || []
@@ -59701,12 +59713,12 @@ 

       
 
 
-9463
-9464
-9465

+9494
+9495
+9496

     

     
-      
# File 'lib/kettle/jem.rb', line 9463
+      
# File 'lib/kettle/jem.rb', line 9494
 
 def main_gemfile_recording_eval_path
   "gemfiles/modular/recording/r4/recording.gemfile"
@@ -59731,18 +59743,18 @@ 

       
 
 
-9453
-9454
-9455
-9456
-9457
-9458
-9459
-9460
-9461

+9484
+9485
+9486
+9487
+9488
+9489
+9490
+9491
+9492

     

     
-      
# File 'lib/kettle/jem.rb', line 9453
+      
# File 'lib/kettle/jem.rb', line 9484
 
 def main_gemfile_recording_insertion_index(content)
   lines = content.to_s.lines
@@ -59773,16 +59785,16 @@ 

       
 
 
-8265
-8266
-8267
-8268
-8269
-8270
-8271

+8296
+8297
+8298
+8299
+8300
+8301
+8302

     

     
-      
# File 'lib/kettle/jem.rb', line 8265
+      
# File 'lib/kettle/jem.rb', line 8296
 
 def main_gemfile_templating_eval_line(content)
   ruby_call_records(content, :eval_gemfile).filter_map do |call|
@@ -59811,18 +59823,18 @@ 

       
 
 
-18815
-18816
-18817
-18818
-18819
-18820
-18821
-18822
-18823

+18848
+18849
+18850
+18851
+18852
+18853
+18854
+18855
+18856

     

     
-      
# File 'lib/kettle/jem.rb', line 18815
+      
# File 'lib/kettle/jem.rb', line 18848
 
 def managed_license_template_basename(target_path)
   path = target_path.to_s
@@ -59876,13 +59888,13 @@ 

       
 
 
-15932
-15933
-15934
-15935

+15964
+15965
+15966
+15967

     

     
-      
# File 'lib/kettle/jem.rb', line 15932
+      
# File 'lib/kettle/jem.rb', line 15964
 
 def managed_version_gem_version_spec?(content)
   content.to_s.include?('it_behaves_like "a Version module"') ||
@@ -59931,21 +59943,21 @@ 

 
 
-7718
-7719
-7720
-7721
-7722
-7723
-7724
-7725
-7726
-7727
-7728
-7729

+7749
+7750
+7751
+7752
+7753
+7754
+7755
+7756
+7757
+7758
+7759
+7760

     		
     
-      
# File 'lib/kettle/jem.rb', line 7718
+      
# File 'lib/kettle/jem.rb', line 7749
 
 def markdown_heading_has_preserved_readme_ancestor?(heading_sections, index)
   owner = heading_sections.fetch(index)
@@ -59979,16 +59991,16 @@ 

       
 
 
-7848
-7849
-7850
-7851
-7852
-7853
-7854

+7879
+7880
+7881
+7882
+7883
+7884
+7885

     

     
-      
# File 'lib/kettle/jem.rb', line 7848
+      
# File 'lib/kettle/jem.rb', line 7879
 
 def markdown_heading_owners(content, source_label: "README.md")
   ensure_runtime_dependencies!
@@ -60017,14 +60029,14 @@ 

       
 
 
-7798
-7799
-7800
-7801
-7802

+7829
+7830
+7831
+7832
+7833

     

     
-      
# File 'lib/kettle/jem.rb', line 7798
+      
# File 'lib/kettle/jem.rb', line 7829
 
 def markdown_link_definition_source(owner, url)
   source = "[#{owner.label}]: #{url}"
@@ -60074,12 +60086,12 @@ 

 
 
-6194
-6195
-6196

+6225
+6226
+6227

     		
     
-      
# File 'lib/kettle/jem.rb', line 6194
+      
# File 'lib/kettle/jem.rb', line 6225
 
 def markdown_link_reference_definition_line?(line)
   line.to_s.lstrip.start_with?("[") && line.to_s.include?("]:")
@@ -60104,22 +60116,22 @@ 

       
 
 
-18257
-18258
-18259
-18260
-18261
-18262
-18263
-18264
-18265
-18266
-18267
-18268
-18269

+18289
+18290
+18291
+18292
+18293
+18294
+18295
+18296
+18297
+18298
+18299
+18300
+18301

     

     
-      
# File 'lib/kettle/jem.rb', line 18257
+      
# File 'lib/kettle/jem.rb', line 18289
 
 def markdown_managed_block(content, marker)
   ensure_runtime_dependencies!
@@ -60154,26 +60166,26 @@ 

       
 
 
-18271
-18272
-18273
-18274
-18275
-18276
-18277
-18278
-18279
-18280
-18281
-18282
-18283
-18284
-18285
-18286
-18287

+18303
+18304
+18305
+18306
+18307
+18308
+18309
+18310
+18311
+18312
+18313
+18314
+18315
+18316
+18317
+18318
+18319

     

     
-      
# File 'lib/kettle/jem.rb', line 18271
+      
# File 'lib/kettle/jem.rb', line 18303
 
 def markdown_sections(content)
   lines = content.to_s.split("\n", -1)
@@ -60212,12 +60224,12 @@ 

       
 
 
-6160
-6161
-6162

+6191
+6192
+6193

     

     
-      
# File 'lib/kettle/jem.rb', line 6160
+      
# File 'lib/kettle/jem.rb', line 6191
 
 def markdown_source_lines(content)
   content.to_s.split("\n")
@@ -60242,23 +60254,23 @@ 

       
 
 
-10563
-10564
-10565
-10566
-10567
-10568
-10569
-10570
-10571
-10572
-10573
-10574
-10575
-10576

+10594
+10595
+10596
+10597
+10598
+10599
+10600
+10601
+10602
+10603
+10604
+10605
+10606
+10607

     

     
-      
# File 'lib/kettle/jem.rb', line 10563
+      
# File 'lib/kettle/jem.rb', line 10594
 
 def merge_appraisal_blocks_with_prism(template_block, destination_block)
   result = Prism::Merge.merge_ruby(
@@ -60294,21 +60306,21 @@ 

       
 
 
-10231
-10232
-10233
-10234
-10235
-10236
-10237
-10238
-10239
-10240
-10241
-10242

+10262
+10263
+10264
+10265
+10266
+10267
+10268
+10269
+10270
+10271
+10272
+10273

     

     
-      
# File 'lib/kettle/jem.rb', line 10231
+      
# File 'lib/kettle/jem.rb', line 10262
 
 def merge_appraisals_template_policy(content, facts:)
   package_name = facts.dig(:package, :name).to_s if facts
@@ -60342,32 +60354,32 @@ 

       
 
 
-10539
-10540
-10541
-10542
-10543
-10544
-10545
-10546
-10547
-10548
-10549
-10550
-10551
-10552
-10553
-10554
-10555
-10556
-10557
-10558
-10559
-10560
-10561

+10570
+10571
+10572
+10573
+10574
+10575
+10576
+10577
+10578
+10579
+10580
+10581
+10582
+10583
+10584
+10585
+10586
+10587
+10588
+10589
+10590
+10591
+10592

     

     
-      
# File 'lib/kettle/jem.rb', line 10539
+      
# File 'lib/kettle/jem.rb', line 10570
 
 def merge_bash_template_source(template_content, destination_content, recipe)
   availability = Bash::Merge.availability(source: template_content.to_s)
@@ -60412,37 +60424,6 @@ 

       
 
 
-6111
-6112
-6113
-6114
-6115
-6116
-6117
-6118
-6119
-6120
-6121
-6122
-6123
-6124
-6125
-6126
-6127
-6128
-6129
-6130
-6131
-6132
-6133
-6134
-6135
-6136
-6137
-6138
-6139
-6140
-6141
 6142
 6143
 6144
@@ -60459,10 +60440,41 @@ 

 6155
 6156
 6157
-6158

+6158
+6159
+6160
+6161
+6162
+6163
+6164
+6165
+6166
+6167
+6168
+6169
+6170
+6171
+6172
+6173
+6174
+6175
+6176
+6177
+6178
+6179
+6180
+6181
+6182
+6183
+6184
+6185
+6186
+6187
+6188
+6189

     

     
-      
# File 'lib/kettle/jem.rb', line 6111
+      
# File 'lib/kettle/jem.rb', line 6142
 
 def merge_changelog_template_source(template_content, destination_content, facts: nil)
   destination = normalize_legacy_changelog_release_headings(destination_content.to_s)
@@ -60555,37 +60567,6 @@ 

       
 
 
-7935
-7936
-7937
-7938
-7939
-7940
-7941
-7942
-7943
-7944
-7945
-7946
-7947
-7948
-7949
-7950
-7951
-7952
-7953
-7954
-7955
-7956
-7957
-7958
-7959
-7960
-7961
-7962
-7963
-7964
-7965
 7966
 7967
 7968
@@ -60632,10 +60613,41 @@ 

 8009
 8010
 8011
-8012

+8012
+8013
+8014
+8015
+8016
+8017
+8018
+8019
+8020
+8021
+8022
+8023
+8024
+8025
+8026
+8027
+8028
+8029
+8030
+8031
+8032
+8033
+8034
+8035
+8036
+8037
+8038
+8039
+8040
+8041
+8042
+8043

     

     
-      
# File 'lib/kettle/jem.rb', line 7935
+      
# File 'lib/kettle/jem.rb', line 7966
 
 def merge_config_template_source(recipe, template_content, destination_content, facts: nil, env: ENV)
   file_type = template_file_type(recipe)
@@ -60735,19 +60747,19 @@ 

       
 
 
-10491
-10492
-10493
-10494
-10495
-10496
-10497
-10498
-10499
-10500

+10522
+10523
+10524
+10525
+10526
+10527
+10528
+10529
+10530
+10531

     

     
-      
# File 'lib/kettle/jem.rb', line 10491
+      
# File 'lib/kettle/jem.rb', line 10522
 
 def merge_dotenv_template_source(template_content, destination_content, recipe)
   output = Dotenv::Merge::SmartMerger.new(
@@ -60779,43 +60791,43 @@ 

       
 
 
-10390
-10391
-10392
-10393
-10394
-10395
-10396
-10397
-10398
-10399
-10400
-10401
-10402
-10403
-10404
-10405
-10406
-10407
-10408
-10409
-10410
-10411
-10412
-10413
-10414
-10415
-10416
-10417
-10418
-10419
-10420
 10421
 10422
-10423

+10423
+10424
+10425
+10426
+10427
+10428
+10429
+10430
+10431
+10432
+10433
+10434
+10435
+10436
+10437
+10438
+10439
+10440
+10441
+10442
+10443
+10444
+10445
+10446
+10447
+10448
+10449
+10450
+10451
+10452
+10453
+10454

     

     
-      
# File 'lib/kettle/jem.rb', line 10390
+      
# File 'lib/kettle/jem.rb', line 10421
 
 def merge_framework_matrix_appraisals(content, facts)
   entries = facts.to_h.dig(:ci, :framework_matrix, :appraisals).to_a
@@ -60871,37 +60883,6 @@ 

       
 
 
-10137
-10138
-10139
-10140
-10141
-10142
-10143
-10144
-10145
-10146
-10147
-10148
-10149
-10150
-10151
-10152
-10153
-10154
-10155
-10156
-10157
-10158
-10159
-10160
-10161
-10162
-10163
-10164
-10165
-10166
-10167
 10168
 10169
 10170
@@ -60914,10 +60895,41 @@ 

 10177
 10178
 10179
-10180

+10180
+10181
+10182
+10183
+10184
+10185
+10186
+10187
+10188
+10189
+10190
+10191
+10192
+10193
+10194
+10195
+10196
+10197
+10198
+10199
+10200
+10201
+10202
+10203
+10204
+10205
+10206
+10207
+10208
+10209
+10210
+10211

     

     
-      
# File 'lib/kettle/jem.rb', line 10137
+      
# File 'lib/kettle/jem.rb', line 10168
 
 def merge_gemfile_eval_bucket_entries(template_content, merged_content, destination_content: nil)
   template_entries = gemfile_eval_bucket_entries(template_content)
@@ -60983,25 +60995,25 @@ 

       
 
 
-9384
-9385
-9386
-9387
-9388
-9389
-9390
-9391
-9392
-9393
-9394
-9395
-9396
-9397
-9398
-9399

+9415
+9416
+9417
+9418
+9419
+9420
+9421
+9422
+9423
+9424
+9425
+9426
+9427
+9428
+9429
+9430

     

     
-      
# File 'lib/kettle/jem.rb', line 9384
+      
# File 'lib/kettle/jem.rb', line 9415
 
 def merge_gemfile_template_policy(content, facts:, template_content: nil, preserve_self_word_entries: false)
   package_name = facts.dig(:package, :name).to_s if facts
@@ -61039,31 +61051,31 @@ 

       
 
 
-11232
-11233
-11234
-11235
-11236
-11237
-11238
-11239
-11240
-11241
-11242
-11243
-11244
-11245
-11246
-11247
-11248
-11249
-11250
-11251
-11252
-11253

+11263
+11264
+11265
+11266
+11267
+11268
+11269
+11270
+11271
+11272
+11273
+11274
+11275
+11276
+11277
+11278
+11279
+11280
+11281
+11282
+11283
+11284

     

     
-      
# File 'lib/kettle/jem.rb', line 11232
+      
# File 'lib/kettle/jem.rb', line 11263
 
 def merge_gemspec_files_assignment(content, template_content:, destination_content:, template_receiver:, destination_receiver:)
   merged_record = gemspec_assignment_records(content, receiver: template_receiver).find { |record| record.fetch(:field) == "files" }
@@ -61107,37 +61119,6 @@ 

       
 
 
-11273
-11274
-11275
-11276
-11277
-11278
-11279
-11280
-11281
-11282
-11283
-11284
-11285
-11286
-11287
-11288
-11289
-11290
-11291
-11292
-11293
-11294
-11295
-11296
-11297
-11298
-11299
-11300
-11301
-11302
-11303
 11304
 11305
 11306
@@ -61151,10 +61132,41 @@ 

 11314
 11315
 11316
-11317

+11317
+11318
+11319
+11320
+11321
+11322
+11323
+11324
+11325
+11326
+11327
+11328
+11329
+11330
+11331
+11332
+11333
+11334
+11335
+11336
+11337
+11338
+11339
+11340
+11341
+11342
+11343
+11344
+11345
+11346
+11347
+11348

     

     
-      
# File 'lib/kettle/jem.rb', line 11273
+      
# File 'lib/kettle/jem.rb', line 11304
 
 def merge_gemspec_files_assignment_source(merged_record:, template_record:, destination_record:)
   merged_parts = gemspec_files_collection_parts(merged_record)
@@ -61221,37 +61233,6 @@ 

 
 
-11390
-11391
-11392
-11393
-11394
-11395
-11396
-11397
-11398
-11399
-11400
-11401
-11402
-11403
-11404
-11405
-11406
-11407
-11408
-11409
-11410
-11411
-11412
-11413
-11414
-11415
-11416
-11417
-11418
-11419
-11420
 11421
 11422
 11423
@@ -61260,10 +61241,41 @@ 
# File 'lib/kettle/jem.rb', line 11390
+      
# File 'lib/kettle/jem.rb', line 11421
 
 def merge_gemspec_files_assignment_with_destination_splats(merged_parts:, destination_parts:)
   return unless %i[array concat].include?(destination_parts.fetch(:collection_kind))
@@ -61325,37 +61337,6 @@ 

       
 
 
-10638
-10639
-10640
-10641
-10642
-10643
-10644
-10645
-10646
-10647
-10648
-10649
-10650
-10651
-10652
-10653
-10654
-10655
-10656
-10657
-10658
-10659
-10660
-10661
-10662
-10663
-10664
-10665
-10666
-10667
-10668
 10669
 10670
 10671
@@ -61397,10 +61378,41 @@ 

 10707
 10708
 10709
-10710

+10710
+10711
+10712
+10713
+10714
+10715
+10716
+10717
+10718
+10719
+10720
+10721
+10722
+10723
+10724
+10725
+10726
+10727
+10728
+10729
+10730
+10731
+10732
+10733
+10734
+10735
+10736
+10737
+10738
+10739
+10740
+10741

     

     
-      
# File 'lib/kettle/jem.rb', line 10638
+      
# File 'lib/kettle/jem.rb', line 10669
 
 def merge_gemspec_template_source(template_content, destination_content, facts: nil, env: ENV)
   template_receiver = gemspec_block_param(template_content) || "spec"
@@ -61495,42 +61507,42 @@ 

       
 
 
-12427
-12428
-12429
-12430
-12431
-12432
-12433
-12434
-12435
-12436
-12437
-12438
-12439
-12440
-12441
-12442
-12443
-12444
-12445
-12446
-12447
-12448
-12449
-12450
-12451
-12452
-12453
-12454
-12455
-12456
-12457
 12458
-12459

+12459
+12460
+12461
+12462
+12463
+12464
+12465
+12466
+12467
+12468
+12469
+12470
+12471
+12472
+12473
+12474
+12475
+12476
+12477
+12478
+12479
+12480
+12481
+12482
+12483
+12484
+12485
+12486
+12487
+12488
+12489
+12490

     

     
-      
# File 'lib/kettle/jem.rb', line 12427
+      
# File 'lib/kettle/jem.rb', line 12458
 
 def merge_gitignore_template_source(template_content, destination_content)
   # Git ignore files have no parser-backed AST. Treat each non-comment line
@@ -61585,20 +61597,20 @@ 

       
 
 
-10466
-10467
-10468
-10469
-10470
-10471
-10472
-10473
-10474
-10475
-10476

+10497
+10498
+10499
+10500
+10501
+10502
+10503
+10504
+10505
+10506
+10507

     

     
-      
# File 'lib/kettle/jem.rb', line 10466
+      
# File 'lib/kettle/jem.rb', line 10497
 
 def merge_json_template_source(template_content, destination_content, recipe, file_type)
   output = Json::Merge::SmartMerger.new(
@@ -61631,21 +61643,21 @@ 

       
 
 
-9022
-9023
-9024
-9025
-9026
-9027
-9028
-9029
-9030
-9031
-9032
-9033

+9053
+9054
+9055
+9056
+9057
+9058
+9059
+9060
+9061
+9062
+9063
+9064

     

     
-      
# File 'lib/kettle/jem.rb', line 9022
+      
# File 'lib/kettle/jem.rb', line 9053
 
 def merge_local_gem_overrides(content, destination_content, facts:, template_content: nil)
   template_gems = local_gems_assignment(content)
@@ -61679,19 +61691,19 @@ 

       
 
 
-9352
-9353
-9354
-9355
-9356
-9357
-9358
-9359
-9360
-9361

+9383
+9384
+9385
+9386
+9387
+9388
+9389
+9390
+9391
+9392

     

     
-      
# File 'lib/kettle/jem.rb', line 9352
+      
# File 'lib/kettle/jem.rb', line 9383
 
 def merge_prism_gemfile_template_source(template_content, destination_content)
   Prism::Merge.merge_ruby(
@@ -61723,19 +61735,19 @@ 

       
 
 
-16032
-16033
-16034
-16035
-16036
-16037
-16038
-16039
-16040
-16041

+16064
+16065
+16066
+16067
+16068
+16069
+16070
+16071
+16072
+16073

     

     
-      
# File 'lib/kettle/jem.rb', line 16032
+      
# File 'lib/kettle/jem.rb', line 16064
 
 def merge_rbs_signature_sources(template_content, destination_content)
   return ensure_trailing_newline(template_content) if destination_content.to_s.strip.empty?
@@ -61767,19 +61779,19 @@ 

       
 
 
-10515
-10516
-10517
-10518
-10519
-10520
-10521
-10522
-10523
-10524

+10546
+10547
+10548
+10549
+10550
+10551
+10552
+10553
+10554
+10555

     

     
-      
# File 'lib/kettle/jem.rb', line 10515
+      
# File 'lib/kettle/jem.rb', line 10546
 
 def merge_rbs_template_source(template_content, destination_content, recipe)
   output = Rbs::Merge::SmartMerger.new(
@@ -61811,17 +61823,17 @@ 

       
 
 
-18128
-18129
-18130
-18131
-18132
-18133
-18134
-18135

+18160
+18161
+18162
+18163
+18164
+18165
+18166
+18167

     

     
-      
# File 'lib/kettle/jem.rb', line 18128
+      
# File 'lib/kettle/jem.rb', line 18160
 
 def merge_readme_template(template_content:, destination_content:, preserve_config: {})
   return template_content if destination_content.to_s.strip.empty?
@@ -61851,30 +61863,30 @@ 

       
 
 
-9330
-9331
-9332
-9333
-9334
-9335
-9336
-9337
-9338
-9339
-9340
-9341
-9342
-9343
-9344
-9345
-9346
-9347
-9348
-9349
-9350

+9361
+9362
+9363
+9364
+9365
+9366
+9367
+9368
+9369
+9370
+9371
+9372
+9373
+9374
+9375
+9376
+9377
+9378
+9379
+9380
+9381

     

     
-      
# File 'lib/kettle/jem.rb', line 9330
+      
# File 'lib/kettle/jem.rb', line 9361
 
 def merge_ruby_template_source(file_type, recipe, template_content, destination_content, facts: nil)
   return merge_prism_gemfile_template_source(template_content, destination_content) if file_type == :gemfile
@@ -61917,24 +61929,24 @@ 

 
 
-9471
-9472
-9473
-9474
-9475
-9476
-9477
-9478
-9479
-9480
-9481
-9482
-9483
-9484
-9485

+9502
+9503
+9504
+9505
+9506
+9507
+9508
+9509
+9510
+9511
+9512
+9513
+9514
+9515
+9516

     		
     
-      
# File 'lib/kettle/jem.rb', line 9471
+      
# File 'lib/kettle/jem.rb', line 9502
 
 def merge_template_gemfile_dependency_blocks(template_content, content, removable_gems, preserve_self_word_entries: false)
   template = remove_gemfile_dependency_blocks(template_content, removable_gems)
@@ -61971,16 +61983,16 @@ 

       
 
 
-15447
-15448
-15449
-15450
-15451
-15452
-15453

+15479
+15480
+15481
+15482
+15483
+15484
+15485

     

     
-      
# File 'lib/kettle/jem.rb', line 15447
+      
# File 'lib/kettle/jem.rb', line 15479
 
 def metadata_value(metadata, key)
   value = metadata[key]
@@ -62021,16 +62033,16 @@ 

 
 
-10247
-10248
-10249
-10250
-10251
-10252
-10253

+10278
+10279
+10280
+10281
+10282
+10283
+10284

     		
     
-      
# File 'lib/kettle/jem.rb', line 10247
+      
# File 'lib/kettle/jem.rb', line 10278
 
 def migrate_legacy_byebug_appraisal_dependencies(content)
   parsed = appraisal_blocks(content)
@@ -62059,22 +62071,22 @@ 

       
 
 
-8095
-8096
-8097
-8098
-8099
-8100
-8101
-8102
-8103
-8104
-8105
-8106
-8107

+8126
+8127
+8128
+8129
+8130
+8131
+8132
+8133
+8134
+8135
+8136
+8137
+8138

     

     
-      
# File 'lib/kettle/jem.rb', line 8095
+      
# File 'lib/kettle/jem.rb', line 8126
 
 def migrate_legacy_byebug_pair(content)
   records = gemfile_gem_call_records(content)
@@ -62122,37 +62134,6 @@ 

       
 
 
-8527
-8528
-8529
-8530
-8531
-8532
-8533
-8534
-8535
-8536
-8537
-8538
-8539
-8540
-8541
-8542
-8543
-8544
-8545
-8546
-8547
-8548
-8549
-8550
-8551
-8552
-8553
-8554
-8555
-8556
-8557
 8558
 8559
 8560
@@ -62161,10 +62142,41 @@ 

 8563
 8564
 8565
-8566

+8566
+8567
+8568
+8569
+8570
+8571
+8572
+8573
+8574
+8575
+8576
+8577
+8578
+8579
+8580
+8581
+8582
+8583
+8584
+8585
+8586
+8587
+8588
+8589
+8590
+8591
+8592
+8593
+8594
+8595
+8596
+8597

     

     
-      
# File 'lib/kettle/jem.rb', line 8527
+      
# File 'lib/kettle/jem.rb', line 8558
 
 def migrate_legacy_byebug_requires(content)
   debug_records = ruby_call_records(content, :require).filter_map do |call|
@@ -62226,44 +62238,44 @@ 

       
 
 
-12611
-12612
-12613
-12614
-12615
-12616
-12617
-12618
-12619
-12620
-12621
-12622
-12623
-12624
-12625
-12626
-12627
-12628
-12629
-12630
-12631
-12632
-12633
-12634
-12635
-12636
-12637
-12638
-12639
-12640
-12641
 12642
 12643
 12644
-12645

+12645
+12646
+12647
+12648
+12649
+12650
+12651
+12652
+12653
+12654
+12655
+12656
+12657
+12658
+12659
+12660
+12661
+12662
+12663
+12664
+12665
+12666
+12667
+12668
+12669
+12670
+12671
+12672
+12673
+12674
+12675
+12676

     

     
-      
# File 'lib/kettle/jem.rb', line 12611
+      
# File 'lib/kettle/jem.rb', line 12642
 
 def migrate_readme_logo_config(content)
   config = YAML.safe_load(content.to_s, permitted_classes: [], aliases: true) || {}
@@ -62332,25 +62344,25 @@ 

       
 
 
-8451
-8452
-8453
-8454
-8455
-8456
-8457
-8458
-8459
-8460
-8461
-8462
-8463
-8464
-8465
-8466

+8482
+8483
+8484
+8485
+8486
+8487
+8488
+8489
+8490
+8491
+8492
+8493
+8494
+8495
+8496
+8497

     

     
-      
# File 'lib/kettle/jem.rb', line 8451
+      
# File 'lib/kettle/jem.rb', line 8482
 
 def migrate_simplecov_start_configuration(content)
   result = prism_parse_success(content)
@@ -62388,17 +62400,17 @@ 

       
 
 
-17502
-17503
-17504
-17505
-17506
-17507
-17508
-17509

+17534
+17535
+17536
+17537
+17538
+17539
+17540
+17541

     

     
-      
# File 'lib/kettle/jem.rb', line 17502
+      
# File 'lib/kettle/jem.rb', line 17534
 
 def min_ruby_version(requirement)
   token = minimum_ruby_token(requirement)
@@ -62428,15 +62440,15 @@ 

       
 
 
-14737
-14738
-14739
-14740
-14741
-14742

+14769
+14770
+14771
+14772
+14773
+14774

     

     
-      
# File 'lib/kettle/jem.rb', line 14737
+      
# File 'lib/kettle/jem.rb', line 14769
 
 def minimum_ruby_token(requirement)
   text = requirement.to_s.strip
@@ -62464,13 +62476,13 @@ 

       
 
 
-17665
-17666
-17667
-17668

+17697
+17698
+17699
+17700

     

     
-      
# File 'lib/kettle/jem.rb', line 17665
+      
# File 'lib/kettle/jem.rb', line 17697
 
 def mit_readme_license_intro(license_source_url: nil)
   "The gem is available as open source under the terms of\n" \
@@ -62496,27 +62508,27 @@ 

       
 
 
-14112
-14113
-14114
-14115
-14116
-14117
-14118
-14119
-14120
-14121
-14122
-14123
-14124
-14125
-14126
-14127
-14128
-14129

+14143
+14144
+14145
+14146
+14147
+14148
+14149
+14150
+14151
+14152
+14153
+14154
+14155
+14156
+14157
+14158
+14159
+14160

     

     
-      
# File 'lib/kettle/jem.rb', line 14112
+      
# File 'lib/kettle/jem.rb', line 14143
 
 def mkdir_p_core(path)
   dir = path.to_s
@@ -62579,24 +62591,24 @@ 

       
 
 
-9743
-9744
-9745
-9746
-9747
-9748
-9749
-9750
-9751
-9752
-9753
-9754
-9755
-9756
-9757

+9774
+9775
+9776
+9777
+9778
+9779
+9780
+9781
+9782
+9783
+9784
+9785
+9786
+9787
+9788

     

     
-      
# File 'lib/kettle/jem.rb', line 9743
+      
# File 'lib/kettle/jem.rb', line 9774
 
 def modular_dependency_conflict_decided?(decisions, conflict)
   decisions.any? do |decision|
@@ -62633,20 +62645,20 @@ 

       
 
 
-9727
-9728
-9729
-9730
-9731
-9732
-9733
-9734
-9735
-9736
-9737

+9758
+9759
+9760
+9761
+9762
+9763
+9764
+9765
+9766
+9767
+9768

     

     
-      
# File 'lib/kettle/jem.rb', line 9727
+      
# File 'lib/kettle/jem.rb', line 9758
 
 def modular_dependency_conflict_decisions(config)
   Array(config.dig("dependency_conflicts", "resolve")).filter_map do |entry|
@@ -62679,21 +62691,21 @@ 

 
 
-4975
-4976
-4977
-4978
-4979
-4980
-4981
-4982
-4983
-4984
-4985
-4986

+5004
+5005
+5006
+5007
+5008
+5009
+5010
+5011
+5012
+5013
+5014
+5015

     		
     
-      
# File 'lib/kettle/jem.rb', line 4975
+      
# File 'lib/kettle/jem.rb', line 5004
 
 def modular_dependency_conflict_resolution_step(project_root)
   decisions = modular_dependency_conflict_decisions(kettle_jem_config(project_root))
@@ -62727,37 +62739,6 @@ 

       
 
 
-9668
-9669
-9670
-9671
-9672
-9673
-9674
-9675
-9676
-9677
-9678
-9679
-9680
-9681
-9682
-9683
-9684
-9685
-9686
-9687
-9688
-9689
-9690
-9691
-9692
-9693
-9694
-9695
-9696
-9697
-9698
 9699
 9700
 9701
@@ -62765,10 +62746,41 @@ 

 9703
 9704
 9705
-9706

+9706
+9707
+9708
+9709
+9710
+9711
+9712
+9713
+9714
+9715
+9716
+9717
+9718
+9719
+9720
+9721
+9722
+9723
+9724
+9725
+9726
+9727
+9728
+9729
+9730
+9731
+9732
+9733
+9734
+9735
+9736
+9737

     

     
-      
# File 'lib/kettle/jem.rb', line 9668
+      
# File 'lib/kettle/jem.rb', line 9699
 
 def modular_dependency_conflicts(project_root, recipe_reports)
   report_paths = recipe_reports.map { |report| report.fetch(:relative_path, "").to_s }
@@ -62852,12 +62864,12 @@ 

       
 
 
-9739
-9740
-9741

+9770
+9771
+9772

     

     
-      
# File 'lib/kettle/jem.rb', line 9739
+      
# File 'lib/kettle/jem.rb', line 9770
 
 def modular_dependency_conflicts_reviewed?(config)
   config.dig("dependency_conflicts", "reviewed") == true
@@ -62905,12 +62917,12 @@ 

       
 
 
-8941
-8942
-8943

+8972
+8973
+8974

     

     
-      
# File 'lib/kettle/jem.rb', line 8941
+      
# File 'lib/kettle/jem.rb', line 8972
 
 def modular_gemfile_template_recipe?(recipe)
   recipe.fetch(:target_path).to_s.start_with?("gemfiles/modular/")
@@ -62935,16 +62947,16 @@ 

       
 
 
-13057
-13058
-13059
-13060
-13061
-13062
-13063

+13088
+13089
+13090
+13091
+13092
+13093
+13094

     

     
-      
# File 'lib/kettle/jem.rb', line 13057
+      
# File 'lib/kettle/jem.rb', line 13088
 
 def monorepo_root_file_strategy(entry)
   if entry.to_s == "CHANGELOG.md"
@@ -62973,32 +62985,32 @@ 

       
 
 
-5464
-5465
-5466
-5467
-5468
-5469
-5470
-5471
-5472
-5473
-5474
-5475
-5476
-5477
-5478

+5495
+5496
+5497
+5498
+5499
+5500
+5501
+5502
+5503
+5504
+5505
+5506
+5507
+5508
+5509

     

     
-      
# File 'lib/kettle/jem.rb', line 5464
+      
# File 'lib/kettle/jem.rb', line 5495
 
 def monorepo_root_gemfile_dependency_lines
   [
     {name: "appraisal2", source: %(gem "appraisal2", "~> 3.2", ">= 3.2.3"\n)},
     {name: "bundler-audit", source: %(gem "bundler-audit", "~> 0.9.3"\n)},
-    {name: "kettle-dev", source: %(gem "kettle-dev", "~> 3.0", ">= 3.0.33"\n)},
+    {name: "kettle-dev", source: %(gem "kettle-dev", "~> 3.0", ">= 3.0.34"\n)},
     {name: "kettle-drift", source: %(gem "kettle-drift", "~> 1.0", ">= 1.0.13"\n)},
-    {name: "kettle-family", source: %(gem "kettle-family", "~> 1.2", ">= 1.2.97"\n)},
+    {name: "kettle-family", source: %(gem "kettle-family", "~> 1.2", ">= 1.2.100"\n)},
     {name: PACKAGE_NAME, source: kettle_jem_dependency_source},
     {name: "kettle-test", source: %(gem "kettle-test", "~> 2.0", ">= 2.0.21"\n)},
     {name: "rake", source: %(gem "rake", "~> 13.0"\n)},
@@ -63027,24 +63039,24 @@ 

 
 
-5434
-5435
-5436
-5437
-5438
-5439
-5440
-5441
-5442
-5443
-5444
-5445
-5446
-5447
-5448

+5465
+5466
+5467
+5468
+5469
+5470
+5471
+5472
+5473
+5474
+5475
+5476
+5477
+5478
+5479

     		
     
-      
# File 'lib/kettle/jem.rb', line 5434
+      
# File 'lib/kettle/jem.rb', line 5465
 
 def monorepo_root_gemfile_dependency_sync_step(project_root, report)
   facts = report.fetch(:facts)
@@ -63104,12 +63116,12 @@ 

       
 
 
-13225
-13226
-13227

+13256
+13257
+13258

     

     
-      
# File 'lib/kettle/jem.rb', line 13225
+      
# File 'lib/kettle/jem.rb', line 13256
 
 def monorepo_root_template_profile?(facts)
   facts[:template_profile].to_s == MONOREPO_ROOT_TEMPLATE_PROFILE
@@ -63134,28 +63146,28 @@ 

 
 
-5174
-5175
-5176
-5177
-5178
-5179
-5180
-5181
-5182
-5183
-5184
-5185
-5186
-5187
-5188
-5189
-5190
-5191
-5192

+5203
+5204
+5205
+5206
+5207
+5208
+5209
+5210
+5211
+5212
+5213
+5214
+5215
+5216
+5217
+5218
+5219
+5220
+5221

     		
     
-      
# File 'lib/kettle/jem.rb', line 5174
+      
# File 'lib/kettle/jem.rb', line 5203
 
 def monorepo_subgem_kettle_config_profile_sync_step(project_root, report)
   facts = report.fetch(:facts)
@@ -63196,18 +63208,18 @@ 

       
 
 
-13077
-13078
-13079
-13080
-13081
-13082
-13083
-13084
-13085

+13108
+13109
+13110
+13111
+13112
+13113
+13114
+13115
+13116

     

     
-      
# File 'lib/kettle/jem.rb', line 13077
+      
# File 'lib/kettle/jem.rb', line 13108
 
 def monorepo_subgem_template_entries(gemspec_path, profile = MONOREPO_SUBGEM_TEMPLATE_PROFILE)
   entries = monorepo_subgem_template_entries_for_profile(gemspec_path, profile)
@@ -63238,20 +63250,20 @@ 

 
 
-13087
-13088
-13089
-13090
-13091
-13092
-13093
-13094
-13095
-13096
-13097

+13118
+13119
+13120
+13121
+13122
+13123
+13124
+13125
+13126
+13127
+13128

     		
     
-      
# File 'lib/kettle/jem.rb', line 13087
+      
# File 'lib/kettle/jem.rb', line 13118
 
 def monorepo_subgem_template_entries_for_profile(gemspec_path, profile)
   case normalize_template_profile(profile)
@@ -63307,12 +63319,12 @@ 

       
 
 
-13221
-13222
-13223

+13252
+13253
+13254

     

     
-      
# File 'lib/kettle/jem.rb', line 13221
+      
# File 'lib/kettle/jem.rb', line 13252
 
 def monorepo_subgem_template_profile?(facts)
   monorepo_subgem_template_profile_value?(facts[:template_profile])
@@ -63360,16 +63372,16 @@ 

 
 
-13237
-13238
-13239
-13240
-13241
-13242
-13243

+13268
+13269
+13270
+13271
+13272
+13273
+13274

     		
     
-      
# File 'lib/kettle/jem.rb', line 13237
+      
# File 'lib/kettle/jem.rb', line 13268
 
 def monorepo_subgem_template_profile_value?(profile)
   [
@@ -63421,12 +63433,12 @@ 

       
 
 
-13229
-13230
-13231

+13260
+13261
+13262

     

     
-      
# File 'lib/kettle/jem.rb', line 13229
+      
# File 'lib/kettle/jem.rb', line 13260
 
 def monorepo_template_profile?(facts)
   monorepo_root_template_profile?(facts) || monorepo_subgem_template_profile?(facts)
@@ -63451,12 +63463,12 @@ 

       
 
 
-4799
-4800
-4801

+4828
+4829
+4830

     

     
-      
# File 'lib/kettle/jem.rb', line 4799
+      
# File 'lib/kettle/jem.rb', line 4828
 
 def monotonic_time
   Process.clock_gettime(Process::CLOCK_MONOTONIC)
@@ -63504,16 +63516,16 @@ 

       
 
 
-15828
-15829
-15830
-15831
-15832
-15833
-15834

+15860
+15861
+15862
+15863
+15864
+15865
+15866

     

     
-      
# File 'lib/kettle/jem.rb', line 15828
+      
# File 'lib/kettle/jem.rb', line 15860
 
 def namespace_descendant?(namespace, parent)
   namespace = namespace.to_s
@@ -63542,25 +63554,25 @@ 

       
 
 
-8847
-8848
-8849
-8850
-8851
-8852
-8853
-8854
-8855
-8856
-8857
-8858
-8859
-8860
-8861
-8862

+8878
+8879
+8880
+8881
+8882
+8883
+8884
+8885
+8886
+8887
+8888
+8889
+8890
+8891
+8892
+8893

     

     
-      
# File 'lib/kettle/jem.rb', line 8847
+      
# File 'lib/kettle/jem.rb', line 8878
 
 def nested_templating_guard_records(content)
   result = prism_parse_success(content)
@@ -63621,16 +63633,16 @@ 

       
 
 
-8907
-8908
-8909
-8910
-8911
-8912
-8913

+8938
+8939
+8940
+8941
+8942
+8943
+8944

     

     
-      
# File 'lib/kettle/jem.rb', line 8907
+      
# File 'lib/kettle/jem.rb', line 8938
 
 def node_enclosed_by_ranges?(node, ranges)
   start_line = node.location.start_line
@@ -63659,12 +63671,12 @@ 

       
 
 
-15510
-15511
-15512

+15542
+15543
+15544

     

     
-      
# File 'lib/kettle/jem.rb', line 15510
+      
# File 'lib/kettle/jem.rb', line 15542
 
 def nomono_gemfile_declaration
   %(gem "nomono", "~> 1.1", ">= 1.1.5", require: false # ruby >= 3.2.0)
@@ -63712,13 +63724,13 @@ 

       
 
 
-15769
-15770
-15771
-15772

+15801
+15802
+15803
+15804

     

     
-      
# File 'lib/kettle/jem.rb', line 15769
+      
# File 'lib/kettle/jem.rb', line 15801
 
 def non_default_version_gem_entrypoint?(project_root, entrypoint_require)
   version_gem_path = File.join("lib", entrypoint_require.to_s, "version_gem.rb")
@@ -63767,12 +63779,12 @@ 

       
 
 
-17795
-17796
-17797

+17827
+17828
+17829

     

     
-      
# File 'lib/kettle/jem.rb', line 17795
+      
# File 'lib/kettle/jem.rb', line 17827
 
 def non_mit_licenses?(licenses)
   licenses.any? { |license| license != "MIT" }
@@ -63797,13 +63809,13 @@ 

       
 
 
-19181
-19182
-19183
-19184

+19214
+19215
+19216
+19217

     

     
-      
# File 'lib/kettle/jem.rb', line 19181
+      
# File 'lib/kettle/jem.rb', line 19214
 
 def nonempty_string(value)
   normalized = value.to_s.strip
@@ -63829,40 +63841,40 @@ 

       
 
 
-6043
-6044
-6045
-6046
-6047
-6048
-6049
-6050
-6051
-6052
-6053
-6054
-6055
-6056
-6057
-6058
-6059
-6060
-6061
-6062
-6063
-6064
-6065
-6066
-6067
-6068
-6069
-6070
-6071
-6072
-6073

+6074
+6075
+6076
+6077
+6078
+6079
+6080
+6081
+6082
+6083
+6084
+6085
+6086
+6087
+6088
+6089
+6090
+6091
+6092
+6093
+6094
+6095
+6096
+6097
+6098
+6099
+6100
+6101
+6102
+6103
+6104

     

     
-      
# File 'lib/kettle/jem.rb', line 6043
+      
# File 'lib/kettle/jem.rb', line 6074
 
 def normalize_changelog(content, facts)
   text = normalize_legacy_changelog_release_headings(content.to_s)
@@ -63915,22 +63927,22 @@ 

       
 
 
-8395
-8396
-8397
-8398
-8399
-8400
-8401
-8402
-8403
-8404
-8405
-8406
-8407

+8426
+8427
+8428
+8429
+8430
+8431
+8432
+8433
+8434
+8435
+8436
+8437
+8438

     

     
-      
# File 'lib/kettle/jem.rb', line 8395
+      
# File 'lib/kettle/jem.rb', line 8426
 
 def normalize_conditional_body_indentation(source)
   lines = source.to_s.lines
@@ -63965,18 +63977,18 @@ 

       
 
 
-8568
-8569
-8570
-8571
-8572
-8573
-8574
-8575
-8576

+8599
+8600
+8601
+8602
+8603
+8604
+8605
+8606
+8607

     

     
-      
# File 'lib/kettle/jem.rb', line 8568
+      
# File 'lib/kettle/jem.rb', line 8599
 
 def normalize_debug_require_records(content, records)
   return content if records.empty?
@@ -64007,25 +64019,25 @@ 

       
 
 
-16210
-16211
-16212
-16213
-16214
-16215
-16216
-16217
-16218
-16219
-16220
-16221
-16222
-16223
-16224
-16225

+16242
+16243
+16244
+16245
+16246
+16247
+16248
+16249
+16250
+16251
+16252
+16253
+16254
+16255
+16256
+16257

     

     
-      
# File 'lib/kettle/jem.rb', line 16210
+      
# File 'lib/kettle/jem.rb', line 16242
 
 def normalize_entrypoint_version_require(content, entrypoint_require:, version_require_path: nil, after_declarations: false)
   relative_path = version_require_path.to_s.empty? ? File.join(File.basename(entrypoint_require), "version") : version_require_path.to_s
@@ -64063,17 +64075,17 @@ 

       
 
 
-10213
-10214
-10215
-10216
-10217
-10218
-10219
-10220

+10244
+10245
+10246
+10247
+10248
+10249
+10250
+10251

     

     
-      
# File 'lib/kettle/jem.rb', line 10213
+      
# File 'lib/kettle/jem.rb', line 10244
 
 def normalize_eval_gemfile_ruby_bucket(path)
   segments = path.to_s.split("/", -1)
@@ -64103,35 +64115,6 @@ 

 
 
-5032
-5033
-5034
-5035
-5036
-5037
-5038
-5039
-5040
-5041
-5042
-5043
-5044
-5045
-5046
-5047
-5048
-5049
-5050
-5051
-5052
-5053
-5054
-5055
-5056
-5057
-5058
-5059
-5060
 5061
 5062
 5063
@@ -64150,10 +64133,39 @@ 

+5079
+5080
+5081
+5082
+5083
+5084
+5085
+5086
+5087
+5088
+5089
+5090
+5091
+5092
+5093
+5094
+5095
+5096
+5097
+5098
+5099
+5100
+5101
+5102
+5103
+5104
+5105
+5106
+5107
+5108

     

     
-      
# File 'lib/kettle/jem.rb', line 5032
+      
# File 'lib/kettle/jem.rb', line 5061
 
 def normalize_executable_version_entrypoint(content, legacy_version_path:, canonical_version_path:, legacy_namespace:, namespace:)
   parsed = prism_parse_success(content)
@@ -64223,26 +64235,26 @@ 

 
 
-11899
-11900
-11901
-11902
-11903
-11904
-11905
-11906
-11907
-11908
-11909
-11910
-11911
-11912
-11913
-11914
-11915

+11930
+11931
+11932
+11933
+11934
+11935
+11936
+11937
+11938
+11939
+11940
+11941
+11942
+11943
+11944
+11945
+11946

     		
     
-      
# File 'lib/kettle/jem.rb', line 11899
+      
# File 'lib/kettle/jem.rb', line 11930
 
 def normalize_gemspec_dependency_version_requirements(source, receiver:, namespace:)
   return source if namespace.to_s.empty?
@@ -64281,25 +64293,25 @@ 

 
 
-10712
-10713
-10714
-10715
-10716
-10717
-10718
-10719
-10720
-10721
-10722
-10723
-10724
-10725
-10726
-10727

+10743
+10744
+10745
+10746
+10747
+10748
+10749
+10750
+10751
+10752
+10753
+10754
+10755
+10756
+10757
+10758

     		
     
-      
# File 'lib/kettle/jem.rb', line 10712
+      
# File 'lib/kettle/jem.rb', line 10743
 
 def normalize_gemspec_package_helper_assignments(content, template_content)
   template_records = gemspec_package_helper_assignment_records(template_content).to_h do |record|
@@ -64337,25 +64349,25 @@ 

       
 
 
-11190
-11191
-11192
-11193
-11194
-11195
-11196
-11197
-11198
-11199
-11200
-11201
-11202
-11203
-11204
-11205

+11221
+11222
+11223
+11224
+11225
+11226
+11227
+11228
+11229
+11230
+11231
+11232
+11233
+11234
+11235
+11236

     

     
-      
# File 'lib/kettle/jem.rb', line 11190
+      
# File 'lib/kettle/jem.rb', line 11221
 
 def normalize_gemspec_project_emoji(line, facts, field:)
   return line unless %w[summary description].include?(field.to_s)
@@ -64393,14 +64405,14 @@ 

       
 
 
-11184
-11185
-11186
-11187
-11188

+11215
+11216
+11217
+11218
+11219

     

     
-      
# File 'lib/kettle/jem.rb', line 11184
+      
# File 'lib/kettle/jem.rb', line 11215
 
 def normalize_gemspec_receiver(line, from:, to:)
   return line if from.to_s.empty? || to.to_s.empty? || from == to
@@ -64427,12 +64439,12 @@ 

       
 
 
-16716
-16717
-16718

+16748
+16749
+16750

     

     
-      
# File 'lib/kettle/jem.rb', line 16716
+      
# File 'lib/kettle/jem.rb', line 16748
 
 def normalize_generated_image_url(url)
   Addressable::URI.parse(url.to_s).normalize.to_s
@@ -64457,16 +64469,16 @@ 

       
 
 
-7123
-7124
-7125
-7126
-7127
-7128
-7129

+7154
+7155
+7156
+7157
+7158
+7159
+7160

     

     
-      
# File 'lib/kettle/jem.rb', line 7123
+      
# File 'lib/kettle/jem.rb', line 7154
 
 def normalize_generated_rakefile(content)
   return "" if content.to_s.empty?
@@ -64495,33 +64507,33 @@ 

       
 
 
-16951
-16952
-16953
-16954
-16955
-16956
-16957
-16958
-16959
-16960
-16961
-16962
-16963
-16964
-16965
-16966
-16967
-16968
-16969
-16970
-16971
-16972
-16973
-16974

+16983
+16984
+16985
+16986
+16987
+16988
+16989
+16990
+16991
+16992
+16993
+16994
+16995
+16996
+16997
+16998
+16999
+17000
+17001
+17002
+17003
+17004
+17005
+17006

     

     
-      
# File 'lib/kettle/jem.rb', line 16951
+      
# File 'lib/kettle/jem.rb', line 16983
 
 def normalize_git_source_url(url)
   value = url.to_s.strip
@@ -64567,15 +64579,15 @@ 

       
 
 
-19250
-19251
-19252
-19253
-19254
-19255

+19283
+19284
+19285
+19286
+19287
+19288

     

     
-      
# File 'lib/kettle/jem.rb', line 19250
+      
# File 'lib/kettle/jem.rb', line 19283
 
 def normalize_github_actions_exec_cmd(command)
   normalized = command.to_s.strip
@@ -64603,17 +64615,17 @@ 

       
 
 
-18066
-18067
-18068
-18069
-18070
-18071
-18072
-18073

+18098
+18099
+18100
+18101
+18102
+18103
+18104
+18105

     

     
-      
# File 'lib/kettle/jem.rb', line 18066
+      
# File 'lib/kettle/jem.rb', line 18098
 
 def normalize_integration_name(name)
   normalized = name.to_s.tr("_", "-").downcase
@@ -64643,21 +64655,21 @@ 

 
 
-12543
-12544
-12545
-12546
-12547
-12548
-12549
-12550
-12551
-12552
-12553
-12554

+12574
+12575
+12576
+12577
+12578
+12579
+12580
+12581
+12582
+12583
+12584
+12585

     		
     
-      
# File 'lib/kettle/jem.rb', line 12543
+      
# File 'lib/kettle/jem.rb', line 12574
 
 def normalize_kettle_config_optional_scalars(content)
   config = YAML.safe_load(content.to_s, permitted_classes: [], aliases: true) || {}
@@ -64691,24 +64703,24 @@ 

       
 
 
-13811
-13812
-13813
-13814
-13815
-13816
-13817
-13818
-13819
-13820
-13821
-13822
-13823
-13824
-13825

+13842
+13843
+13844
+13845
+13846
+13847
+13848
+13849
+13850
+13851
+13852
+13853
+13854
+13855
+13856

     

     
-      
# File 'lib/kettle/jem.rb', line 13811
+      
# File 'lib/kettle/jem.rb', line 13842
 
 def normalize_kettle_jem_config(config)
   return config unless config.is_a?(Hash)
@@ -64745,21 +64757,21 @@ 

 
 
-6075
-6076
-6077
-6078
-6079
-6080
-6081
-6082
-6083
-6084
-6085
-6086

+6106
+6107
+6108
+6109
+6110
+6111
+6112
+6113
+6114
+6115
+6116
+6117

     		
     
-      
# File 'lib/kettle/jem.rb', line 6075
+      
# File 'lib/kettle/jem.rb', line 6106
 
 def normalize_legacy_changelog_release_headings(content)
   lines = markdown_source_lines(content)
@@ -64793,13 +64805,13 @@ 

       
 
 
-13330
-13331
-13332
-13333

+13361
+13362
+13363
+13364

     

     
-      
# File 'lib/kettle/jem.rb', line 13330
+      
# File 'lib/kettle/jem.rb', line 13361
 
 def normalize_list_option(value)
   values = Array(value).flat_map { |entry| entry.to_s.split(",") }.map(&:strip).reject(&:empty?)
@@ -64825,34 +64837,34 @@ 

 
 
-8945
-8946
-8947
-8948
-8949
-8950
-8951
-8952
-8953
-8954
-8955
-8956
-8957
-8958
-8959
-8960
-8961
-8962
-8963
-8964
-8965
-8966
-8967
-8968
-8969

+8976
+8977
+8978
+8979
+8980
+8981
+8982
+8983
+8984
+8985
+8986
+8987
+8988
+8989
+8990
+8991
+8992
+8993
+8994
+8995
+8996
+8997
+8998
+8999
+9000

     		
     
-      
# File 'lib/kettle/jem.rb', line 8945
+      
# File 'lib/kettle/jem.rb', line 8976
 
 def normalize_local_gemfile_nomono_bootstrap(content)
   output = remove_obsolete_local_gemfile_nomono_activation(content)
@@ -64899,25 +64911,25 @@ 

 
 
-8316
-8317
-8318
-8319
-8320
-8321
-8322
-8323
-8324
-8325
-8326
-8327
-8328
-8329
-8330
-8331

+8347
+8348
+8349
+8350
+8351
+8352
+8353
+8354
+8355
+8356
+8357
+8358
+8359
+8360
+8361
+8362

     		
     
-      
# File 'lib/kettle/jem.rb', line 8316
+      
# File 'lib/kettle/jem.rb', line 8347
 
 def normalize_main_gemfile_nomono_declaration(content)
   records = main_gemfile_nomono_requirement_records(content)
@@ -64955,18 +64967,18 @@ 

       
 
 
-15558
-15559
-15560
-15561
-15562
-15563
-15564
-15565
-15566

+15590
+15591
+15592
+15593
+15594
+15595
+15596
+15597
+15598

     

     
-      
# File 'lib/kettle/jem.rb', line 15558
+      
# File 'lib/kettle/jem.rb', line 15590
 
 def normalize_project_homepage_uri(value)
   uri = URI.parse(value.to_s)
@@ -64997,12 +65009,12 @@ 

       
 
 
-15554
-15555
-15556

+15586
+15587
+15588

     

     
-      
# File 'lib/kettle/jem.rb', line 15554
+      
# File 'lib/kettle/jem.rb', line 15586
 
 def normalize_project_hostname(value)
   value.to_s.tr("_", "-")
@@ -65027,17 +65039,17 @@ 

       
 
 
-7131
-7132
-7133
-7134
-7135
-7136
-7137
-7138

+7162
+7163
+7164
+7165
+7166
+7167
+7168
+7169

     

     
-      
# File 'lib/kettle/jem.rb', line 7131
+      
# File 'lib/kettle/jem.rb', line 7162
 
 def normalize_rakefile_section_spacing(content)
   content.to_s.lines.each_with_object([]) do |line, normalized|
@@ -65067,14 +65079,14 @@ 

       
 
 
-7471
-7472
-7473
-7474
-7475

+7502
+7503
+7504
+7505
+7506

     

     
-      
# File 'lib/kettle/jem.rb', line 7471
+      
# File 'lib/kettle/jem.rb', line 7502
 
 def normalize_readme_blank_line_runs(content)
   return Ast::Merge.normalize_blank_line_runs(content) if Ast::Merge.respond_to?(:normalize_blank_line_runs)
@@ -65101,24 +65113,24 @@ 

       
 
 
-7636
-7637
-7638
-7639
-7640
-7641
-7642
-7643
-7644
-7645
-7646
-7647
-7648
-7649
-7650

+7667
+7668
+7669
+7670
+7671
+7672
+7673
+7674
+7675
+7676
+7677
+7678
+7679
+7680
+7681

     

     
-      
# File 'lib/kettle/jem.rb', line 7636
+      
# File 'lib/kettle/jem.rb', line 7667
 
 def normalize_readme_compatibility_summary(content, engines, min_ruby = "")
   enabled = Array(engines).map { |engine| engine.to_s.strip.downcase }.reject(&:empty?).uniq
@@ -65155,29 +65167,29 @@ 

       
 
 
-17026
-17027
-17028
-17029
-17030
-17031
-17032
-17033
-17034
-17035
-17036
-17037
-17038
-17039
-17040
-17041
-17042
-17043
-17044
-17045

+17058
+17059
+17060
+17061
+17062
+17063
+17064
+17065
+17066
+17067
+17068
+17069
+17070
+17071
+17072
+17073
+17074
+17075
+17076
+17077

     

     
-      
# File 'lib/kettle/jem.rb', line 17026
+      
# File 'lib/kettle/jem.rb', line 17058
 
 def normalize_readme_corporate_sponsors(value)
   Array(value).filter_map do |entry|
@@ -65219,18 +65231,18 @@ 

 
 
-17016
-17017
-17018
-17019
-17020
-17021
-17022
-17023
-17024

+17048
+17049
+17050
+17051
+17052
+17053
+17054
+17055
+17056

     		
     
-      
# File 'lib/kettle/jem.rb', line 17016
+      
# File 'lib/kettle/jem.rb', line 17048
 
 def normalize_readme_corporate_sponsors_json(value)
   clean = value.to_s.strip
@@ -65261,12 +65273,12 @@ 

       
 
 
-18336
-18337
-18338

+18368
+18369
+18370

     

     
-      
# File 'lib/kettle/jem.rb', line 18336
+      
# File 'lib/kettle/jem.rb', line 18368
 
 def normalize_readme_heading(text)
   strip_readme_heading_adornment(text).strip.downcase
@@ -65291,24 +65303,24 @@ 

       
 
 
-7817
-7818
-7819
-7820
-7821
-7822
-7823
-7824
-7825
-7826
-7827
-7828
-7829
-7830
-7831

+7848
+7849
+7850
+7851
+7852
+7853
+7854
+7855
+7856
+7857
+7858
+7859
+7860
+7861
+7862

     

     
-      
# File 'lib/kettle/jem.rb', line 7817
+      
# File 'lib/kettle/jem.rb', line 7848
 
 def normalize_readme_project_heading(content, facts)
   package = facts.fetch(:package, {})
@@ -65345,12 +65357,12 @@ 

 
 
-7467
-7468
-7469

+7498
+7499
+7500

     		
     
-      
# File 'lib/kettle/jem.rb', line 7467
+      
# File 'lib/kettle/jem.rb', line 7498
 
 def normalize_readme_rubygems_download_badges(content)
   content.gsub("https://img.shields.io/gem/rd/", "https://img.shields.io/gem/dt/")
@@ -65375,12 +65387,12 @@ 

       
 
 
-17987
-17988
-17989

+18019
+18020
+18021

     

     
-      
# File 'lib/kettle/jem.rb', line 17987
+      
# File 'lib/kettle/jem.rb', line 18019
 
 def normalize_readme_section_key(section)
   normalize_readme_heading(section.to_s.tr("_-", " "))
@@ -65405,23 +65417,23 @@ 

       
 
 
-7833
-7834
-7835
-7836
-7837
-7838
-7839
-7840
-7841
-7842
-7843
-7844
-7845
-7846

+7864
+7865
+7866
+7867
+7868
+7869
+7870
+7871
+7872
+7873
+7874
+7875
+7876
+7877

     

     
-      
# File 'lib/kettle/jem.rb', line 7833
+      
# File 'lib/kettle/jem.rb', line 7864
 
 def normalize_readme_synopsis_heading(content, facts)
   logo_row = facts.dig(:readme_logo, :h2_synopsis_logo_row).to_s
@@ -65457,17 +65469,17 @@ 

       
 
 
-13357
-13358
-13359
-13360
-13361
-13362
-13363
-13364

+13388
+13389
+13390
+13391
+13392
+13393
+13394
+13395

     

     
-      
# File 'lib/kettle/jem.rb', line 13357
+      
# File 'lib/kettle/jem.rb', line 13388
 
 def normalize_repository_topology(value)
   topology = value.to_s.strip.downcase.tr("_", "-")
@@ -65497,12 +65509,12 @@ 

       
 
 
-14533
-14534
-14535

+14565
+14566
+14567

     

     
-      
# File 'lib/kettle/jem.rb', line 14533
+      
# File 'lib/kettle/jem.rb', line 14565
 
 def normalize_rubyforum_tag(value)
   value.to_s.strip.delete_prefix("#").delete_suffix("/").split("/").last.to_s
@@ -65539,34 +65551,34 @@ 

       
 
 
-8422
-8423
-8424
-8425
-8426
-8427
-8428
-8429
-8430
-8431
-8432
-8433
-8434
-8435
-8436
-8437
-8438
-8439
-8440
-8441
-8442
-8443
-8444
-8445
-8446

+8453
+8454
+8455
+8456
+8457
+8458
+8459
+8460
+8461
+8462
+8463
+8464
+8465
+8466
+8467
+8468
+8469
+8470
+8471
+8472
+8473
+8474
+8475
+8476
+8477

     

     
-      
# File 'lib/kettle/jem.rb', line 8422
+      
# File 'lib/kettle/jem.rb', line 8453
 
 def normalize_simplecov_cover_predicates(content)
   result = prism_parse_success(content)
@@ -65613,18 +65625,18 @@ 

       
 
 
-8409
-8410
-8411
-8412
-8413
-8414
-8415
-8416
-8417

+8440
+8441
+8442
+8443
+8444
+8445
+8446
+8447
+8448

     

     
-      
# File 'lib/kettle/jem.rb', line 8409
+      
# File 'lib/kettle/jem.rb', line 8440
 
 def normalize_simplecov_template_source(content)
   output = normalize_simplecov_cover_predicates(content)
@@ -65667,21 +65679,21 @@ 

       
 
 
-8471
-8472
-8473
-8474
-8475
-8476
-8477
-8478
-8479
-8480
-8481
-8482

+8502
+8503
+8504
+8505
+8506
+8507
+8508
+8509
+8510
+8511
+8512
+8513

     

     
-      
# File 'lib/kettle/jem.rb', line 8471
+      
# File 'lib/kettle/jem.rb', line 8502
 
 def normalize_simplecov_usage_guidance(content)
   lines = content.to_s.lines
@@ -65715,27 +65727,27 @@ 

       
 
 
-8582
-8583
-8584
-8585
-8586
-8587
-8588
-8589
-8590
-8591
-8592
-8593
-8594
-8595
-8596
-8597
-8598
-8599

+8613
+8614
+8615
+8616
+8617
+8618
+8619
+8620
+8621
+8622
+8623
+8624
+8625
+8626
+8627
+8628
+8629
+8630

     

     
-      
# File 'lib/kettle/jem.rb', line 8582
+      
# File 'lib/kettle/jem.rb', line 8613
 
 def normalize_spec_helper_block_bindings(content, template_content)
   output = content
@@ -65775,18 +65787,18 @@ 

 
 
-8513
-8514
-8515
-8516
-8517
-8518
-8519
-8520
-8521

+8544
+8545
+8546
+8547
+8548
+8549
+8550
+8551
+8552

     		
     
-      
# File 'lib/kettle/jem.rb', line 8513
+      
# File 'lib/kettle/jem.rb', line 8544
 
 def normalize_spec_helper_simplecov_template_source(content)
   output = remove_duplicate_simplecov_do_cov_bootstrap_blocks(content)
@@ -65829,16 +65841,16 @@ 

       
 
 
-9038
-9039
-9040
-9041
-9042
-9043
-9044

+9069
+9070
+9071
+9072
+9073
+9074
+9075

     

     
-      
# File 'lib/kettle/jem.rb', line 9038
+      
# File 'lib/kettle/jem.rb', line 9069
 
 def normalize_structuredmerge_local_gems(content, template_content)
   template_gems = word_array_assignment(template_content, :structuredmerge_local_gems)
@@ -65867,21 +65879,21 @@ 

       
 
 
-13335
-13336
-13337
-13338
-13339
-13340
-13341
-13342
-13343
-13344
-13345
-13346

+13366
+13367
+13368
+13369
+13370
+13371
+13372
+13373
+13374
+13375
+13376
+13377

     

     
-      
# File 'lib/kettle/jem.rb', line 13335
+      
# File 'lib/kettle/jem.rb', line 13366
 
 def normalize_template_profile(value)
   profile = value.to_s.strip.downcase.tr("_", "-")
@@ -65915,23 +65927,23 @@ 

       
 
 
-8369
-8370
-8371
-8372
-8373
-8374
-8375
-8376
-8377
-8378
-8379
-8380
-8381
-8382

+8400
+8401
+8402
+8403
+8404
+8405
+8406
+8407
+8408
+8409
+8410
+8411
+8412
+8413

     

     
-      
# File 'lib/kettle/jem.rb', line 8369
+      
# File 'lib/kettle/jem.rb', line 8400
 
 def normalize_templating_guard_indentation(content)
   records = templating_guard_records(content)
@@ -65967,18 +65979,18 @@ 

       
 
 
-15804
-15805
-15806
-15807
-15808
-15809
-15810
-15811
-15812

+15836
+15837
+15838
+15839
+15840
+15841
+15842
+15843
+15844

     

     
-      
# File 'lib/kettle/jem.rb', line 15804
+      
# File 'lib/kettle/jem.rb', line 15836
 
 def normalize_version_gem_entrypoint_mode(value)
   mode = value.to_s.strip.downcase.tr("_", "-")
@@ -66009,38 +66021,6 @@ 

       
 
 
-15836
-15837
-15838
-15839
-15840
-15841
-15842
-15843
-15844
-15845
-15846
-15847
-15848
-15849
-15850
-15851
-15852
-15853
-15854
-15855
-15856
-15857
-15858
-15859
-15860
-15861
-15862
-15863
-15864
-15865
-15866
-15867
 15868
 15869
 15870
@@ -66053,10 +66033,42 @@ 

 15877
 15878
 15879
-15880

+15880
+15881
+15882
+15883
+15884
+15885
+15886
+15887
+15888
+15889
+15890
+15891
+15892
+15893
+15894
+15895
+15896
+15897
+15898
+15899
+15900
+15901
+15902
+15903
+15904
+15905
+15906
+15907
+15908
+15909
+15910
+15911
+15912

     

     
-      
# File 'lib/kettle/jem.rb', line 15836
+      
# File 'lib/kettle/jem.rb', line 15868
 
 def normalize_version_gem_version_spec(project_root, version_spec_path, entrypoint_require, namespace, ensure_version_gem_require:, package_name: nil, include_version_gem_path: true, ensure_package_entrypoint_require: false)
   current = read_project_file(project_root, version_spec_path)
@@ -66123,38 +66135,6 @@ 

 
 
-15937
-15938
-15939
-15940
-15941
-15942
-15943
-15944
-15945
-15946
-15947
-15948
-15949
-15950
-15951
-15952
-15953
-15954
-15955
-15956
-15957
-15958
-15959
-15960
-15961
-15962
-15963
-15964
-15965
-15966
-15967
-15968
 15969
 15970
 15971
@@ -66166,10 +66146,42 @@ 
# File 'lib/kettle/jem.rb', line 15937
+      
# File 'lib/kettle/jem.rb', line 15969
 
 def normalize_version_spec_anonymous_loader_example(content, version_spec_path:, entrypoint_require:, namespace:, include_version_gem_path: true)
   version_path = version_spec_relative_version_path(version_spec_path, entrypoint_require)
@@ -66235,26 +66247,26 @@ 

       
 
 
-17129
-17130
-17131
-17132
-17133
-17134
-17135
-17136
-17137
-17138
-17139
-17140
-17141
-17142
-17143
-17144
-17145

+17161
+17162
+17163
+17164
+17165
+17166
+17167
+17168
+17169
+17170
+17171
+17172
+17173
+17174
+17175
+17176
+17177

     

     
-      
# File 'lib/kettle/jem.rb', line 17129
+      
# File 'lib/kettle/jem.rb', line 17161
 
 def normalized_readme_logo_specs(value)
   raw_values = case value
@@ -66293,15 +66305,15 @@ 

       
 
 
-17147
-17148
-17149
-17150
-17151
-17152

+17179
+17180
+17181
+17182
+17183
+17184

     

     
-      
# File 'lib/kettle/jem.rb', line 17147
+      
# File 'lib/kettle/jem.rb', line 17179
 
 def normalized_readme_logo_width(value)
   clean = value.to_s.strip
@@ -66329,12 +66341,12 @@ 

       
 
 
-17125
-17126
-17127

+17157
+17158
+17159

     

     
-      
# File 'lib/kettle/jem.rb', line 17125
+      
# File 'lib/kettle/jem.rb', line 17157
 
 def normalized_readme_top_logo_options(value)
   normalized_readme_logo_specs(value).map { |spec| spec.fetch(:type) }
@@ -66359,31 +66371,31 @@ 

 
 
-8985
-8986
-8987
-8988
-8989
-8990
-8991
-8992
-8993
-8994
-8995
-8996
-8997
-8998
-8999
-9000
-9001
-9002
-9003
-9004
-9005
-9006

+9016
+9017
+9018
+9019
+9020
+9021
+9022
+9023
+9024
+9025
+9026
+9027
+9028
+9029
+9030
+9031
+9032
+9033
+9034
+9035
+9036
+9037

     		
     
-      
# File 'lib/kettle/jem.rb', line 8985
+      
# File 'lib/kettle/jem.rb', line 9016
 
 def obsolete_local_gemfile_nomono_activation_records(content)
   result = prism_parse_success(content)
@@ -66450,22 +66462,22 @@ 

 
 
-8625
-8626
-8627
-8628
-8629
-8630
-8631
-8632
-8633
-8634
-8635
-8636
-8637

+8656
+8657
+8658
+8659
+8660
+8661
+8662
+8663
+8664
+8665
+8666
+8667
+8668

     		
     
-      
# File 'lib/kettle/jem.rb', line 8625
+      
# File 'lib/kettle/jem.rb', line 8656
 
 def obsolete_simplecov_rescue_bootstrap_node?(node, complete_bootstrap_present:)
   return false unless node.is_a?(::Prism::BeginNode)
@@ -66500,23 +66512,23 @@ 

 
 
-8610
-8611
-8612
-8613
-8614
-8615
-8616
-8617
-8618
-8619
-8620
-8621
-8622
-8623

+8641
+8642
+8643
+8644
+8645
+8646
+8647
+8648
+8649
+8650
+8651
+8652
+8653
+8654

     		
     
-      
# File 'lib/kettle/jem.rb', line 8610
+      
# File 'lib/kettle/jem.rb', line 8641
 
 def obsolete_simplecov_rescue_bootstrap_records(content)
   result = prism_parse_success(content)
@@ -66552,37 +66564,6 @@ 

       
 
 
-5614
-5615
-5616
-5617
-5618
-5619
-5620
-5621
-5622
-5623
-5624
-5625
-5626
-5627
-5628
-5629
-5630
-5631
-5632
-5633
-5634
-5635
-5636
-5637
-5638
-5639
-5640
-5641
-5642
-5643
-5644
 5645
 5646
 5647
@@ -66639,10 +66620,41 @@ 

 5698
 5699
 5700
-5701

+5701
+5702
+5703
+5704
+5705
+5706
+5707
+5708
+5709
+5710
+5711
+5712
+5713
+5714
+5715
+5716
+5717
+5718
+5719
+5720
+5721
+5722
+5723
+5724
+5725
+5726
+5727
+5728
+5729
+5730
+5731
+5732

     

     
-      
# File 'lib/kettle/jem.rb', line 5614
+      
# File 'lib/kettle/jem.rb', line 5645
 
 def old_ruby_version_bootstrap_step(project_root, report, entrypoint_require:, preserve_version_module_include: nil)
   facts = report.fetch(:facts)
@@ -66775,12 +66787,12 @@ 

       
 
 
-14227
-14228
-14229

+14258
+14259
+14260

     

     
-      
# File 'lib/kettle/jem.rb', line 14227
+      
# File 'lib/kettle/jem.rb', line 14258
 
 def opencollective_disabled?(config, env: ENV)
   opencollective_policy(config, env).fetch(:disabled)
@@ -66828,12 +66840,12 @@ 

       
 
 
-13716
-13717
-13718

+13747
+13748
+13749

     

     
-      
# File 'lib/kettle/jem.rb', line 13716
+      
# File 'lib/kettle/jem.rb', line 13747
 
 def opencollective_disabled_file?(relative_path)
   OPENCOLLECTIVE_DISABLED_FILES.include?(relative_path.to_s)
@@ -66858,14 +66870,14 @@ 

       
 
 
-13710
-13711
-13712
-13713
-13714

+13741
+13742
+13743
+13744
+13745

     

     
-      
# File 'lib/kettle/jem.rb', line 13710
+      
# File 'lib/kettle/jem.rb', line 13741
 
 def opencollective_disabled_files(project_root)
   OPENCOLLECTIVE_DISABLED_FILES.select do |relative_path|
@@ -66892,19 +66904,19 @@ 

       
 
 
-14301
-14302
-14303
-14304
-14305
-14306
-14307
-14308
-14309
-14310

+14332
+14333
+14334
+14335
+14336
+14337
+14338
+14339
+14340
+14341

     

     
-      
# File 'lib/kettle/jem.rb', line 14301
+      
# File 'lib/kettle/jem.rb', line 14332
 
 def opencollective_fallback_warnings(funding, github_org)
   return [] unless funding[:open_collective_org_source].to_s == "fallback.default"
@@ -66936,16 +66948,16 @@ 

       
 
 
-14274
-14275
-14276
-14277
-14278
-14279
-14280

+14305
+14306
+14307
+14308
+14309
+14310
+14311

     

     
-      
# File 'lib/kettle/jem.rb', line 14274
+      
# File 'lib/kettle/jem.rb', line 14305
 
 def opencollective_falsey_env(env)
   %w[OPENCOLLECTIVE_HANDLE FUNDING_ORG].each do |key|
@@ -66974,23 +66986,23 @@ 

       
 
 
-14282
-14283
-14284
-14285
-14286
-14287
-14288
-14289
-14290
-14291
-14292
-14293
-14294
-14295

+14313
+14314
+14315
+14316
+14317
+14318
+14319
+14320
+14321
+14322
+14323
+14324
+14325
+14326

     

     
-      
# File 'lib/kettle/jem.rb', line 14282
+      
# File 'lib/kettle/jem.rb', line 14313
 
 def opencollective_org(project_root, config, env, opencollective_disabled: false)
   return if opencollective_disabled
@@ -67026,21 +67038,21 @@ 

       
 
 
-14312
-14313
-14314
-14315
-14316
-14317
-14318
-14319
-14320
-14321
-14322
-14323

+14343
+14344
+14345
+14346
+14347
+14348
+14349
+14350
+14351
+14352
+14353
+14354

     

     
-      
# File 'lib/kettle/jem.rb', line 14312
+      
# File 'lib/kettle/jem.rb', line 14343
 
 def opencollective_org_config(config)
   funding = config["funding"]
@@ -67074,18 +67086,18 @@ 

       
 
 
-14325
-14326
-14327
-14328
-14329
-14330
-14331
-14332
-14333

+14356
+14357
+14358
+14359
+14360
+14361
+14362
+14363
+14364

     

     
-      
# File 'lib/kettle/jem.rb', line 14325
+      
# File 'lib/kettle/jem.rb', line 14356
 
 def opencollective_org_env(env)
   %w[OPENCOLLECTIVE_HANDLE FUNDING_ORG].each do |key|
@@ -67116,21 +67128,21 @@ 

       
 
 
-14335
-14336
-14337
-14338
-14339
-14340
-14341
-14342
-14343
-14344
-14345
-14346

+14366
+14367
+14368
+14369
+14370
+14371
+14372
+14373
+14374
+14375
+14376
+14377

     

     
-      
# File 'lib/kettle/jem.rb', line 14335
+      
# File 'lib/kettle/jem.rb', line 14366
 
 def opencollective_org_file(project_root)
   path = File.join(project_root, ".opencollective.yml")
@@ -67164,21 +67176,21 @@ 

       
 
 
-14348
-14349
-14350
-14351
-14352
-14353
-14354
-14355
-14356
-14357
-14358
-14359

+14379
+14380
+14381
+14382
+14383
+14384
+14385
+14386
+14387
+14388
+14389
+14390

     

     
-      
# File 'lib/kettle/jem.rb', line 14348
+      
# File 'lib/kettle/jem.rb', line 14379
 
 def opencollective_org_github_funding_file(project_root)
   path = File.join(project_root, ".github", "FUNDING.yml")
@@ -67212,30 +67224,30 @@ 

       
 
 
-14252
-14253
-14254
-14255
-14256
-14257
-14258
-14259
-14260
-14261
-14262
-14263
-14264
-14265
-14266
-14267
-14268
-14269
-14270
-14271
-14272

+14283
+14284
+14285
+14286
+14287
+14288
+14289
+14290
+14291
+14292
+14293
+14294
+14295
+14296
+14297
+14298
+14299
+14300
+14301
+14302
+14303

     

     
-      
# File 'lib/kettle/jem.rb', line 14252
+      
# File 'lib/kettle/jem.rb', line 14283
 
 def opencollective_policy(config, env)
   funding = config["funding"]
@@ -67278,16 +67290,16 @@ 

       
 
 
-13684
-13685
-13686
-13687
-13688
-13689
-13690

+13715
+13716
+13717
+13718
+13719
+13720
+13721

     

     
-      
# File 'lib/kettle/jem.rb', line 13684
+      
# File 'lib/kettle/jem.rb', line 13715
 
 def opt_in_workflow_cleanup_files(project_root, template_selection)
   include_patterns = Array(template_selection[:include])
@@ -67316,14 +67328,14 @@ 

       
 
 
-8841
-8842
-8843
-8844
-8845

+8872
+8873
+8874
+8875
+8876

     

     
-      
# File 'lib/kettle/jem.rb', line 8841
+      
# File 'lib/kettle/jem.rb', line 8872
 
 def outdent_line(line, spaces)
   return line if line.strip.empty?
@@ -67350,13 +67362,13 @@ 

       
 
 
-8932
-8933
-8934
-8935

+8963
+8964
+8965
+8966

     

     
-      
# File 'lib/kettle/jem.rb', line 8932
+      
# File 'lib/kettle/jem.rb', line 8963
 
 def outdent_source(source, spaces)
   prefix = " " * spaces
@@ -67382,13 +67394,13 @@ 

       
 
 
-9401
-9402
-9403
-9404

+9432
+9433
+9434
+9435

     

     
-      
# File 'lib/kettle/jem.rb', line 9401
+      
# File 'lib/kettle/jem.rb', line 9432
 
 def package_runtime_dependency_names(facts)
   dependencies = facts.to_h.dig(:package, :runtime_dependencies)
@@ -67437,23 +67449,23 @@ 

 
 
-18874
-18875
-18876
-18877
-18878
-18879
-18880
-18881
-18882
-18883
-18884
-18885
-18886
-18887

+18907
+18908
+18909
+18910
+18911
+18912
+18913
+18914
+18915
+18916
+18917
+18918
+18919
+18920

     		
     
-      
# File 'lib/kettle/jem.rb', line 18874
+      
# File 'lib/kettle/jem.rb', line 18907
 
 def packaged_gemfile_referenced_by_x_std_libs?(target_path, project_root:, template_root_path:)
   relative_path = target_path.to_s.delete_prefix("gemfiles/modular/")
@@ -67489,17 +67501,17 @@ 

       
 
 
-18912
-18913
-18914
-18915
-18916
-18917
-18918
-18919

+18945
+18946
+18947
+18948
+18949
+18950
+18951
+18952

     

     
-      
# File 'lib/kettle/jem.rb', line 18912
+      
# File 'lib/kettle/jem.rb', line 18945
 
 def packaged_gemfile_template_ruby_floor(target_path)
   path = target_path.to_s
@@ -67529,12 +67541,12 @@ 

       
 
 
-2597
-2598
-2599

+2626
+2627
+2628

     

     
-      
# File 'lib/kettle/jem.rb', line 2597
+      
# File 'lib/kettle/jem.rb', line 2626
 
 def packaged_template_root
   PACKAGED_TEMPLATE_ROOT
@@ -67559,16 +67571,16 @@ 

       
 
 
-15228
-15229
-15230
-15231
-15232
-15233
-15234

+15260
+15261
+15262
+15263
+15264
+15265
+15266

     

     
-      
# File 'lib/kettle/jem.rb', line 15228
+      
# File 'lib/kettle/jem.rb', line 15260
 
 def paired_modular_gemfile_path(local_relative_path)
   suffix = "_local.gemfile"
@@ -67597,19 +67609,19 @@ 

       
 
 
-17837
-17838
-17839
-17840
-17841
-17842
-17843
-17844
-17845
-17846

+17869
+17870
+17871
+17872
+17873
+17874
+17875
+17876
+17877
+17878

     

     
-      
# File 'lib/kettle/jem.rb', line 17837
+      
# File 'lib/kettle/jem.rb', line 17869
 
 def paperclip_ref(name)
   {
@@ -67641,39 +67653,39 @@ 

       
 
 
-14963
-14964
-14965
-14966
-14967
-14968
-14969
-14970
-14971
-14972
-14973
-14974
-14975
-14976
-14977
-14978
-14979
-14980
-14981
-14982
-14983
-14984
-14985
-14986
-14987
-14988
-14989
-14990
-14991
-14992

+14995
+14996
+14997
+14998
+14999
+15000
+15001
+15002
+15003
+15004
+15005
+15006
+15007
+15008
+15009
+15010
+15011
+15012
+15013
+15014
+15015
+15016
+15017
+15018
+15019
+15020
+15021
+15022
+15023
+15024

     

     
-      
# File 'lib/kettle/jem.rb', line 14963
+      
# File 'lib/kettle/jem.rb', line 14995
 
 def parse_blame_porcelain(output, author_map)
   commit_meta = {}
@@ -67725,21 +67737,21 @@ 

       
 
 
-6531
-6532
-6533
-6534
-6535
-6536
-6537
-6538
-6539
-6540
-6541
-6542

+6562
+6563
+6564
+6565
+6566
+6567
+6568
+6569
+6570
+6571
+6572
+6573

     

     
-      
# File 'lib/kettle/jem.rb', line 6531
+      
# File 'lib/kettle/jem.rb', line 6562
 
 def parse_changelog_transfer_filter(payload)
   parsed = changelog_transfer_filter_parser.parse(payload.to_s)
@@ -67773,14 +67785,14 @@ 

       
 
 
-6551
-6552
-6553
-6554
-6555

+6582
+6583
+6584
+6585
+6586

     

     
-      
# File 'lib/kettle/jem.rb', line 6551
+      
# File 'lib/kettle/jem.rb', line 6582
 
 def parse_changelog_transfer_key(key)
   parse_changelog_transfer_line("#{key} - placeholder")
@@ -67807,24 +67819,24 @@ 

       
 
 
-6515
-6516
-6517
-6518
-6519
-6520
-6521
-6522
-6523
-6524
-6525
-6526
-6527
-6528
-6529

+6546
+6547
+6548
+6549
+6550
+6551
+6552
+6553
+6554
+6555
+6556
+6557
+6558
+6559
+6560

     

     
-      
# File 'lib/kettle/jem.rb', line 6515
+      
# File 'lib/kettle/jem.rb', line 6546
 
 def parse_changelog_transfer_line(payload)
   parsed = changelog_transfer_line_parser.parse(payload.to_s)
@@ -67861,18 +67873,18 @@ 

       
 
 
-4724
-4725
-4726
-4727
-4728
-4729
-4730
-4731
-4732

+4753
+4754
+4755
+4756
+4757
+4758
+4759
+4760
+4761

     

     
-      
# File 'lib/kettle/jem.rb', line 4724
+      
# File 'lib/kettle/jem.rb', line 4753
 
 def parse_event_types(types)
   Kettle::Ndjson.normalize_event_types(
@@ -67903,25 +67915,25 @@ 

       
 
 
-14152
-14153
-14154
-14155
-14156
-14157
-14158
-14159
-14160
-14161
-14162
-14163
-14164
-14165
-14166
-14167

+14183
+14184
+14185
+14186
+14187
+14188
+14189
+14190
+14191
+14192
+14193
+14194
+14195
+14196
+14197
+14198

     

     
-      
# File 'lib/kettle/jem.rb', line 14152
+      
# File 'lib/kettle/jem.rb', line 14183
 
 def phase_for_recipe(recipe_name, relative_path)
   path = relative_path.to_s
@@ -67959,25 +67971,25 @@ 

       
 
 
-14131
-14132
-14133
-14134
-14135
-14136
-14137
-14138
-14139
-14140
-14141
-14142
-14143
-14144
-14145
-14146

+14162
+14163
+14164
+14165
+14166
+14167
+14168
+14169
+14170
+14171
+14172
+14173
+14174
+14175
+14176
+14177

     

     
-      
# File 'lib/kettle/jem.rb', line 14131
+      
# File 'lib/kettle/jem.rb', line 14162
 
 def phase_reports_for(recipe_reports)
   reports_by_phase = recipe_reports.group_by { |recipe_report| recipe_report_phase(recipe_report) }
@@ -68015,35 +68027,6 @@ 

       
 
 
-3948
-3949
-3950
-3951
-3952
-3953
-3954
-3955
-3956
-3957
-3958
-3959
-3960
-3961
-3962
-3963
-3964
-3965
-3966
-3967
-3968
-3969
-3970
-3971
-3972
-3973
-3974
-3975
-3976
 3977
 3978
 3979
@@ -68110,10 +68093,39 @@ 

 4040
 4041
 4042
-4043

+4043
+4044
+4045
+4046
+4047
+4048
+4049
+4050
+4051
+4052
+4053
+4054
+4055
+4056
+4057
+4058
+4059
+4060
+4061
+4062
+4063
+4064
+4065
+4066
+4067
+4068
+4069
+4070
+4071
+4072

     

     
-      
# File 'lib/kettle/jem.rb', line 3948
+      
# File 'lib/kettle/jem.rb', line 3977
 
 def plan_project(project_root, env: ENV, run_options: {})
   events = event_stream_from_options(run_options)
@@ -68231,33 +68243,33 @@ 

       
 
 
-5853
-5854
-5855
-5856
-5857
-5858
-5859
-5860
-5861
-5862
-5863
-5864
-5865
-5866
-5867
-5868
-5869
-5870
-5871
-5872
-5873
-5874
-5875
-5876

+5884
+5885
+5886
+5887
+5888
+5889
+5890
+5891
+5892
+5893
+5894
+5895
+5896
+5897
+5898
+5899
+5900
+5901
+5902
+5903
+5904
+5905
+5906
+5907

     

     
-      
# File 'lib/kettle/jem.rb', line 5853
+      
# File 'lib/kettle/jem.rb', line 5884
 
 def plan_readme_style(project_root, env: ENV)
   facts = discover_facts(project_root, env: env)
@@ -68303,26 +68315,26 @@ 

       
 
 
-13879
-13880
-13881
-13882
-13883
-13884
-13885
-13886
-13887
-13888
-13889
-13890
-13891
-13892
-13893
-13894
-13895

+13910
+13911
+13912
+13913
+13914
+13915
+13916
+13917
+13918
+13919
+13920
+13921
+13922
+13923
+13924
+13925
+13926

     

     
-      
# File 'lib/kettle/jem.rb', line 13879
+      
# File 'lib/kettle/jem.rb', line 13910
 
 def plugin_lifecycle_diagnostic(plugin_registry, callbacks_run:, active_runner_phases:)
   {
@@ -68361,20 +68373,20 @@ 

       
 
 
-13867
-13868
-13869
-13870
-13871
-13872
-13873
-13874
-13875
-13876
-13877

+13898
+13899
+13900
+13901
+13902
+13903
+13904
+13905
+13906
+13907
+13908

     

     
-      
# File 'lib/kettle/jem.rb', line 13867
+      
# File 'lib/kettle/jem.rb', line 13898
 
 def plugin_names_from_config(config)
   raw = config.is_a?(Hash) ? config["plugins"] : nil
@@ -68407,23 +68419,23 @@ 

       
 
 
-13852
-13853
-13854
-13855
-13856
-13857
-13858
-13859
-13860
-13861
-13862
-13863
-13864
-13865

+13883
+13884
+13885
+13886
+13887
+13888
+13889
+13890
+13891
+13892
+13893
+13894
+13895
+13896

     

     
-      
# File 'lib/kettle/jem.rb', line 13852
+      
# File 'lib/kettle/jem.rb', line 13883
 
 def plugin_registry_for_project(project_root)
   plugin_names = PluginLoader.normalize_plugin_names(plugin_names_from_config(kettle_jem_config(project_root)))
@@ -68482,12 +68494,12 @@ 

       
 
 
-17791
-17792
-17793

+17823
+17824
+17825

     

     
-      
# File 'lib/kettle/jem.rb', line 17791
+      
# File 'lib/kettle/jem.rb', line 17823
 
 def polyform_licenses?(licenses)
   licenses.any? { |license| license.to_s.start_with?("PolyForm-") }
@@ -68512,25 +68524,25 @@ 

       
 
 
-4944
-4945
-4946
-4947
-4948
-4949
-4950
-4951
-4952
-4953
-4954
-4955
-4956
-4957
-4958
-4959

+4973
+4974
+4975
+4976
+4977
+4978
+4979
+4980
+4981
+4982
+4983
+4984
+4985
+4986
+4987
+4988

     

     
-      
# File 'lib/kettle/jem.rb', line 4944
+      
# File 'lib/kettle/jem.rb', line 4973
 
 def post_apply_steps(project_root, report)
   selection = report.fetch(:template_selection, {})
@@ -68568,30 +68580,30 @@ 

       
 
 
-7568
-7569
-7570
-7571
-7572
-7573
-7574
-7575
-7576
-7577
-7578
-7579
-7580
-7581
-7582
-7583
-7584
-7585
-7586
-7587
-7588

+7599
+7600
+7601
+7602
+7603
+7604
+7605
+7606
+7607
+7608
+7609
+7610
+7611
+7612
+7613
+7614
+7615
+7616
+7617
+7618
+7619

     

     
-      
# File 'lib/kettle/jem.rb', line 7568
+      
# File 'lib/kettle/jem.rb', line 7599
 
 def postprocess_funding_markdown_content(content, facts)
   open_collective_enabled = !facts.dig(:funding, :open_collective_disabled)
@@ -68634,44 +68646,44 @@ 

       
 
 
-7431
-7432
-7433
-7434
-7435
-7436
-7437
-7438
-7439
-7440
-7441
-7442
-7443
-7444
-7445
-7446
-7447
-7448
-7449
-7450
-7451
-7452
-7453
-7454
-7455
-7456
-7457
-7458
-7459
-7460
-7461
 7462
 7463
 7464
-7465

+7465
+7466
+7467
+7468
+7469
+7470
+7471
+7472
+7473
+7474
+7475
+7476
+7477
+7478
+7479
+7480
+7481
+7482
+7483
+7484
+7485
+7486
+7487
+7488
+7489
+7490
+7491
+7492
+7493
+7494
+7495
+7496

     

     
-      
# File 'lib/kettle/jem.rb', line 7431
+      
# File 'lib/kettle/jem.rb', line 7462
 
 def postprocess_readme_content(content, facts, project_root: nil, destination_content: nil)
   return content unless facts
@@ -68728,14 +68740,14 @@ 

       
 
 
-9016
-9017
-9018
-9019
-9020

+9047
+9048
+9049
+9050
+9051

     

     
-      
# File 'lib/kettle/jem.rb', line 9016
+      
# File 'lib/kettle/jem.rb', line 9047
 
 def preceding_comment_block_start_line(lines, line_number)
   line = line_number
@@ -68762,17 +68774,17 @@ 

       
 
 
-18973
-18974
-18975
-18976
-18977
-18978
-18979
-18980

+19006
+19007
+19008
+19009
+19010
+19011
+19012
+19013

     

     
-      
# File 'lib/kettle/jem.rb', line 18973
+      
# File 'lib/kettle/jem.rb', line 19006
 
 def preferred_template_source(template_root, configured_source, opencollective_disabled: false)
   base = configured_source.sub(/\.example\z/, "")
@@ -68802,19 +68814,19 @@ 

       
 
 
-14801
-14802
-14803
-14804
-14805
-14806
-14807
-14808
-14809
-14810

+14833
+14834
+14835
+14836
+14837
+14838
+14839
+14840
+14841
+14842

     

     
-      
# File 'lib/kettle/jem.rb', line 14801
+      
# File 'lib/kettle/jem.rb', line 14833
 
 def preferred_template_token_value(derived_value, config_value, env, env_key)
   env_clean = env[env_key].to_s.strip
@@ -68846,15 +68858,15 @@ 

       
 
 
-13720
-13721
-13722
-13723
-13724
-13725

+13751
+13752
+13753
+13754
+13755
+13756

     

     
-      
# File 'lib/kettle/jem.rb', line 13720
+      
# File 'lib/kettle/jem.rb', line 13751
 
 def preflight_project!(project_root)
   paths = Dir.glob(File.join(project_root, "*.gemspec")).sort
@@ -68882,20 +68894,20 @@ 

       
 
 
-13779
-13780
-13781
-13782
-13783
-13784
-13785
-13786
-13787
-13788
-13789

+13810
+13811
+13812
+13813
+13814
+13815
+13816
+13817
+13818
+13819
+13820

     

     
-      
# File 'lib/kettle/jem.rb', line 13779
+      
# File 'lib/kettle/jem.rb', line 13810
 
 def preflight_ruby_syntax!(project_root, path)
   if defined?(RubyVM::InstructionSequence)
@@ -68928,16 +68940,16 @@ 

       
 
 
-7342
-7343
-7344
-7345
-7346
-7347
-7348

+7373
+7374
+7375
+7376
+7377
+7378
+7379

     

     
-      
# File 'lib/kettle/jem.rb', line 7342
+      
# File 'lib/kettle/jem.rb', line 7373
 
 def prepare_github_workflow_template(content, recipe, facts)
   processed = prune_disabled_github_workflow_engine_jobs(content, facts)
@@ -68966,36 +68978,36 @@ 

       
 
 
-7856
-7857
-7858
-7859
-7860
-7861
-7862
-7863
-7864
-7865
-7866
-7867
-7868
-7869
-7870
-7871
-7872
-7873
-7874
-7875
-7876
-7877
-7878
-7879
-7880
-7881
-7882

+7887
+7888
+7889
+7890
+7891
+7892
+7893
+7894
+7895
+7896
+7897
+7898
+7899
+7900
+7901
+7902
+7903
+7904
+7905
+7906
+7907
+7908
+7909
+7910
+7911
+7912
+7913

     

     
-      
# File 'lib/kettle/jem.rb', line 7856
+      
# File 'lib/kettle/jem.rb', line 7887
 
 def prepare_readme_template(content, readme_style)
   style = readme_style || {}
@@ -69067,13 +69079,13 @@ 

       
 
 
-14812
-14813
-14814
-14815

+14844
+14845
+14846
+14847

     

     
-      
# File 'lib/kettle/jem.rb', line 14812
+      
# File 'lib/kettle/jem.rb', line 14844
 
 def present_template_token_value?(value)
   clean = value.to_s.strip
@@ -69099,29 +69111,29 @@ 

       
 
 
-8074
-8075
-8076
-8077
-8078
-8079
-8080
-8081
-8082
-8083
-8084
-8085
-8086
-8087
-8088
-8089
-8090
-8091
-8092
-8093

+8105
+8106
+8107
+8108
+8109
+8110
+8111
+8112
+8113
+8114
+8115
+8116
+8117
+8118
+8119
+8120
+8121
+8122
+8123
+8124

     

     
-      
# File 'lib/kettle/jem.rb', line 8074
+      
# File 'lib/kettle/jem.rb', line 8105
 
 def preserve_destination_gemfile_source(content, destination_content)
   destination_source = ruby_call_records(destination_content, :source).find do |call|
@@ -69163,38 +69175,38 @@ 

 
 
-11020
-11021
-11022
-11023
-11024
-11025
-11026
-11027
-11028
-11029
-11030
-11031
-11032
-11033
-11034
-11035
-11036
-11037
-11038
-11039
-11040
-11041
-11042
-11043
-11044
-11045
-11046
-11047
-11048

+11051
+11052
+11053
+11054
+11055
+11056
+11057
+11058
+11059
+11060
+11061
+11062
+11063
+11064
+11065
+11066
+11067
+11068
+11069
+11070
+11071
+11072
+11073
+11074
+11075
+11076
+11077
+11078
+11079

     		
     
-      
# File 'lib/kettle/jem.rb', line 11020
+      
# File 'lib/kettle/jem.rb', line 11051
 
 def preserve_destination_only_gemspec_metadata(
   content,
@@ -69245,17 +69257,17 @@ 

       
 
 
-7499
-7500
-7501
-7502
-7503
-7504
-7505
-7506

+7530
+7531
+7532
+7533
+7534
+7535
+7536
+7537

     

     
-      
# File 'lib/kettle/jem.rb', line 7499
+      
# File 'lib/kettle/jem.rb', line 7530
 
 def preserve_destination_readme_kloc_badge(content, destination_content)
   destination_match = destination_content.to_s.match(README_KLOC_BADGE_PATTERN)
@@ -69285,31 +69297,31 @@ 

       
 
 
-11821
-11822
-11823
-11824
-11825
-11826
-11827
-11828
-11829
-11830
-11831
-11832
-11833
-11834
-11835
-11836
-11837
-11838
-11839
-11840
-11841
-11842

+11852
+11853
+11854
+11855
+11856
+11857
+11858
+11859
+11860
+11861
+11862
+11863
+11864
+11865
+11866
+11867
+11868
+11869
+11870
+11871
+11872
+11873

     

     
-      
# File 'lib/kettle/jem.rb', line 11821
+      
# File 'lib/kettle/jem.rb', line 11852
 
 def preserve_gemspec_dependency_lines(template_content, destination_content, template_receiver:, destination_receiver:, facts: nil)
   namespace = facts.to_h.dig(:rubygems, :namespace).to_s
@@ -69353,28 +69365,28 @@ 

       
 
 
-11844
-11845
-11846
-11847
-11848
-11849
-11850
-11851
-11852
-11853
-11854
-11855
-11856
-11857
-11858
-11859
-11860
-11861
-11862

+11875
+11876
+11877
+11878
+11879
+11880
+11881
+11882
+11883
+11884
+11885
+11886
+11887
+11888
+11889
+11890
+11891
+11892
+11893

     

     
-      
# File 'lib/kettle/jem.rb', line 11844
+      
# File 'lib/kettle/jem.rb', line 11875
 
 def preserve_gemspec_freeze_blocks(content, destination_content, facts:, receiver:)
   blocks = freeze_marker_blocks(destination_content, freeze_token: facts.to_h.dig(:project_runtime, :freeze_token))
@@ -69415,20 +69427,20 @@ 

 
 
-7403
-7404
-7405
-7406
-7407
-7408
-7409
-7410
-7411
-7412
-7413

+7434
+7435
+7436
+7437
+7438
+7439
+7440
+7441
+7442
+7443
+7444

     		
     
-      
# File 'lib/kettle/jem.rb', line 7403
+      
# File 'lib/kettle/jem.rb', line 7434
 
 def preserve_github_workflow_project_settings(recipe, content, destination_content, project_root:)
   return content unless recipe.fetch(:target_path).to_s == ".github/workflows/coverage.yml"
@@ -69461,23 +69473,23 @@ 

       
 
 
-7282
-7283
-7284
-7285
-7286
-7287
-7288
-7289
-7290
-7291
-7292
-7293
-7294
-7295

+7313
+7314
+7315
+7316
+7317
+7318
+7319
+7320
+7321
+7322
+7323
+7324
+7325
+7326

     

     
-      
# File 'lib/kettle/jem.rb', line 7282
+      
# File 'lib/kettle/jem.rb', line 7313
 
 def preserve_mise_project_settings(recipe, content, destination_content, project_root:, facts:)
   return content unless recipe.fetch(:target_path).to_s == "mise.toml"
@@ -69513,27 +69525,27 @@ 

 
 
-20041
-20042
-20043
-20044
-20045
-20046
-20047
-20048
-20049
-20050
-20051
-20052
-20053
-20054
-20055
-20056
-20057
-20058

+20077
+20078
+20079
+20080
+20081
+20082
+20083
+20084
+20085
+20086
+20087
+20088
+20089
+20090
+20091
+20092
+20093
+20094

     		
     
-      
# File 'lib/kettle/jem.rb', line 20041
+      
# File 'lib/kettle/jem.rb', line 20077
 
 def preserve_newer_github_workflow_action_pins(content, destination_content)
   destination_records = github_workflow_action_pin_records(destination_content)
@@ -69573,25 +69585,25 @@ 

       
 
 
-18137
-18138
-18139
-18140
-18141
-18142
-18143
-18144
-18145
-18146
-18147
-18148
-18149
-18150
-18151
-18152

+18169
+18170
+18171
+18172
+18173
+18174
+18175
+18176
+18177
+18178
+18179
+18180
+18181
+18182
+18183
+18184

     

     
-      
# File 'lib/kettle/jem.rb', line 18137
+      
# File 'lib/kettle/jem.rb', line 18169
 
 def preserve_readme_front_sections(template_content, destination_content)
   front_sections = readme_destination_front_sections(destination_content)
@@ -69629,20 +69641,20 @@ 

       
 
 
-18238
-18239
-18240
-18241
-18242
-18243
-18244
-18245
-18246
-18247
-18248

+18270
+18271
+18272
+18273
+18274
+18275
+18276
+18277
+18278
+18279
+18280

     

     
-      
# File 'lib/kettle/jem.rb', line 18238
+      
# File 'lib/kettle/jem.rb', line 18270
 
 def preserve_readme_h1(merged_content, destination_content, preserve_config)
   return merged_content if preserve_config.empty?
@@ -69675,15 +69687,15 @@ 

       
 
 
-18250
-18251
-18252
-18253
-18254
-18255

+18282
+18283
+18284
+18285
+18286
+18287

     

     
-      
# File 'lib/kettle/jem.rb', line 18250
+      
# File 'lib/kettle/jem.rb', line 18282
 
 def preserve_readme_managed_block(merged_content, destination_content, marker)
   destination_block = markdown_managed_block(destination_content, marker)
@@ -69711,42 +69723,42 @@ 

       
 
 
-18176
-18177
-18178
-18179
-18180
-18181
-18182
-18183
-18184
-18185
-18186
-18187
-18188
-18189
-18190
-18191
-18192
-18193
-18194
-18195
-18196
-18197
-18198
-18199
-18200
-18201
-18202
-18203
-18204
-18205
-18206
-18207
-18208

+18208
+18209
+18210
+18211
+18212
+18213
+18214
+18215
+18216
+18217
+18218
+18219
+18220
+18221
+18222
+18223
+18224
+18225
+18226
+18227
+18228
+18229
+18230
+18231
+18232
+18233
+18234
+18235
+18236
+18237
+18238
+18239
+18240

     

     
-      
# File 'lib/kettle/jem.rb', line 18176
+      
# File 'lib/kettle/jem.rb', line 18208
 
 def preserve_readme_sections(template_content, destination_content, preserve_config)
   template_sections = markdown_sections(template_content)
@@ -69801,15 +69813,15 @@ 

       
 
 
-19510
-19511
-19512
-19513
-19514
-19515

+19543
+19544
+19545
+19546
+19547
+19548

     

     
-      
# File 'lib/kettle/jem.rb', line 19510
+      
# File 'lib/kettle/jem.rb', line 19543
 
 def previous_nonblank_line_number(content, line_number)
   lines = content.to_s.lines
@@ -69837,21 +69849,21 @@ 

       
 
 
-8736
-8737
-8738
-8739
-8740
-8741
-8742
-8743
-8744
-8745
-8746
-8747

+8767
+8768
+8769
+8770
+8771
+8772
+8773
+8774
+8775
+8776
+8777
+8778

     

     
-      
# File 'lib/kettle/jem.rb', line 8736
+      
# File 'lib/kettle/jem.rb', line 8767
 
 def prism_call_nodes(node)
   return [] unless node
@@ -69885,14 +69897,14 @@ 

       
 
 
-10045
-10046
-10047
-10048
-10049

+10076
+10077
+10078
+10079
+10080

     

     
-      
# File 'lib/kettle/jem.rb', line 10045
+      
# File 'lib/kettle/jem.rb', line 10076
 
 def prism_parse_success(content)
   ensure_runtime_dependencies!
@@ -69919,16 +69931,16 @@ 

       
 
 
-9363
-9364
-9365
-9366
-9367
-9368
-9369

+9394
+9395
+9396
+9397
+9398
+9399
+9400

     

     
-      
# File 'lib/kettle/jem.rb', line 9363
+      
# File 'lib/kettle/jem.rb', line 9394
 
 def prism_ruby_merge_options(recipe)
   {
@@ -69980,14 +69992,14 @@ 

       
 
 
-8915
-8916
-8917
-8918
-8919

+8946
+8947
+8948
+8949
+8950

     

     
-      
# File 'lib/kettle/jem.rb', line 8915
+      
# File 'lib/kettle/jem.rb', line 8946
 
 def prism_subtree_contains_call?(node, call_name)
   node.breadth_first_search_all do |child|
@@ -70037,14 +70049,14 @@ 

 
 
-8712
-8713
-8714
-8715
-8716

+8743
+8744
+8745
+8746
+8747

     		
     
-      
# File 'lib/kettle/jem.rb', line 8712
+      
# File 'lib/kettle/jem.rb', line 8743
 
 def prism_subtree_contains_simplecov_require?(node)
   node.compact_child_nodes.any? do |child|
@@ -70094,14 +70106,14 @@ 

       
 
 
-8921
-8922
-8923
-8924
-8925

+8952
+8953
+8954
+8955
+8956

     

     
-      
# File 'lib/kettle/jem.rb', line 8921
+      
# File 'lib/kettle/jem.rb', line 8952
 
 def prism_subtree_contains_string?(node, string)
   node.breadth_first_search_all do |child|
@@ -70151,16 +70163,16 @@ 

       
 
 
-9309
-9310
-9311
-9312
-9313
-9314
-9315

+9340
+9341
+9342
+9343
+9344
+9345
+9346

     

     
-      
# File 'lib/kettle/jem.rb', line 9309
+      
# File 'lib/kettle/jem.rb', line 9340
 
 def process_result_adapter_failure?(merge_result)
   diagnostics = merge_result.respond_to?(:fetch) ? merge_result.fetch(:diagnostics, []) : []
@@ -70212,15 +70224,15 @@ 

       
 
 
-19270
-19271
-19272
-19273
-19274
-19275

+19303
+19304
+19305
+19306
+19307
+19308

     

     
-      
# File 'lib/kettle/jem.rb', line 19270
+      
# File 'lib/kettle/jem.rb', line 19303
 
 def project_appraisals_recording_enabled?(project_root)
   appraisals_path = File.join(project_root.to_s, "Appraisals")
@@ -70248,18 +70260,18 @@ 

       
 
 
-13142
-13143
-13144
-13145
-13146
-13147
-13148
-13149
-13150

+13173
+13174
+13175
+13176
+13177
+13178
+13179
+13180
+13181

     

     
-      
# File 'lib/kettle/jem.rb', line 13142
+      
# File 'lib/kettle/jem.rb', line 13173
 
 def project_entrypoint_require(project_root, package_name, config: nil)
   configured = (config || kettle_jem_config(project_root)).dig("rubygems", "entrypoint_require").to_s.strip
@@ -70313,21 +70325,21 @@ 

       
 
 
-5764
-5765
-5766
-5767
-5768
-5769
-5770
-5771
-5772
-5773
-5774
-5775

+5795
+5796
+5797
+5798
+5799
+5800
+5801
+5802
+5803
+5804
+5805
+5806

     

     
-      
# File 'lib/kettle/jem.rb', line 5764
+      
# File 'lib/kettle/jem.rb', line 5795
 
 def project_gemspec_declares_version_gem?(project_root)
   path = Dir.glob(File.join(project_root, "*.gemspec")).min
@@ -70361,41 +70373,41 @@ 

       
 
 
-15348
-15349
-15350
-15351
-15352
-15353
-15354
-15355
-15356
-15357
-15358
-15359
-15360
-15361
-15362
-15363
-15364
-15365
-15366
-15367
-15368
-15369
-15370
-15371
-15372
-15373
-15374
-15375
-15376
-15377
-15378
-15379

+15380
+15381
+15382
+15383
+15384
+15385
+15386
+15387
+15388
+15389
+15390
+15391
+15392
+15393
+15394
+15395
+15396
+15397
+15398
+15399
+15400
+15401
+15402
+15403
+15404
+15405
+15406
+15407
+15408
+15409
+15410
+15411

     

     
-      
# File 'lib/kettle/jem.rb', line 15348
+      
# File 'lib/kettle/jem.rb', line 15380
 
 def project_gemspec_metadata(project_root, gemspec_path, spec: nil)
   metadata = GemSpecReader.load(project_root)
@@ -70449,15 +70461,15 @@ 

       
 
 
-5757
-5758
-5759
-5760
-5761
-5762

+5788
+5789
+5790
+5791
+5792
+5793

     

     
-      
# File 'lib/kettle/jem.rb', line 5757
+      
# File 'lib/kettle/jem.rb', line 5788
 
 def project_gemspec_version(project_root)
   path = Dir.glob(File.join(project_root, "*.gemspec")).min
@@ -70485,19 +70497,19 @@ 

       
 
 
-15543
-15544
-15545
-15546
-15547
-15548
-15549
-15550
-15551
-15552

+15575
+15576
+15577
+15578
+15579
+15580
+15581
+15582
+15583
+15584

     

     
-      
# File 'lib/kettle/jem.rb', line 15543
+      
# File 'lib/kettle/jem.rb', line 15575
 
 def project_homepage_uri(config, env, yard_host:, gemspec_homepage_uri: nil)
   derived = if present_template_token_value?(gemspec_homepage_uri)
@@ -70529,22 +70541,22 @@ 

       
 
 
-15814
-15815
-15816
-15817
-15818
-15819
-15820
-15821
-15822
-15823
-15824
-15825
-15826

+15846
+15847
+15848
+15849
+15850
+15851
+15852
+15853
+15854
+15855
+15856
+15857
+15858

     

     
-      
# File 'lib/kettle/jem.rb', line 15814
+      
# File 'lib/kettle/jem.rb', line 15846
 
 def project_namespace(entrypoint_namespace:, version_namespace:, metadata_namespace:, default_namespace:)
   if namespace_descendant?(entrypoint_namespace, version_namespace)
@@ -70602,14 +70614,14 @@ 

       
 
 
-19264
-19265
-19266
-19267
-19268

+19297
+19298
+19299
+19300
+19301

     

     
-      
# File 'lib/kettle/jem.rb', line 19264
+      
# File 'lib/kettle/jem.rb', line 19297
 
 def project_recording_enabled?(project_root, config)
   return true if appraisal_recording_enabled?(config)
@@ -70636,17 +70648,17 @@ 

       
 
 
-15236
-15237
-15238
-15239
-15240
-15241
-15242
-15243

+15268
+15269
+15270
+15271
+15272
+15273
+15274
+15275

     

     
-      
# File 'lib/kettle/jem.rb', line 15236
+      
# File 'lib/kettle/jem.rb', line 15268
 
 def project_relative_path(path, project_root)
   expanded_root = File.expand_path(project_root.to_s)
@@ -70676,17 +70688,17 @@ 

       
 
 
-15568
-15569
-15570
-15571
-15572
-15573
-15574
-15575

+15600
+15601
+15602
+15603
+15604
+15605
+15606
+15607

     

     
-      
# File 'lib/kettle/jem.rb', line 15568
+      
# File 'lib/kettle/jem.rb', line 15600
 
 def project_runtime_config_value(config, key)
   token_config = token_config_values(config)
@@ -70716,38 +70728,6 @@ 

       
 
 
-15115
-15116
-15117
-15118
-15119
-15120
-15121
-15122
-15123
-15124
-15125
-15126
-15127
-15128
-15129
-15130
-15131
-15132
-15133
-15134
-15135
-15136
-15137
-15138
-15139
-15140
-15141
-15142
-15143
-15144
-15145
-15146
 15147
 15148
 15149
@@ -70768,10 +70748,42 @@ 

 15164
 15165
 15166
-15167

+15167
+15168
+15169
+15170
+15171
+15172
+15173
+15174
+15175
+15176
+15177
+15178
+15179
+15180
+15181
+15182
+15183
+15184
+15185
+15186
+15187
+15188
+15189
+15190
+15191
+15192
+15193
+15194
+15195
+15196
+15197
+15198
+15199

     

     
-      
# File 'lib/kettle/jem.rb', line 15115
+      
# File 'lib/kettle/jem.rb', line 15147
 
 def project_runtime_facts(
   config,
@@ -70846,28 +70858,28 @@ 

       
 
 
-15461
-15462
-15463
-15464
-15465
-15466
-15467
-15468
-15469
-15470
-15471
-15472
-15473
-15474
-15475
-15476
-15477
-15478
-15479

+15493
+15494
+15495
+15496
+15497
+15498
+15499
+15500
+15501
+15502
+15503
+15504
+15505
+15506
+15507
+15508
+15509
+15510
+15511

     

     
-      
# File 'lib/kettle/jem.rb', line 15461
+      
# File 'lib/kettle/jem.rb', line 15493
 
 def project_runtime_template_tokens(project_runtime)
   {
@@ -70931,14 +70943,14 @@ 

       
 
 
-5777
-5778
-5779
-5780
-5781

+5808
+5809
+5810
+5811
+5812

     

     
-      
# File 'lib/kettle/jem.rb', line 5777
+      
# File 'lib/kettle/jem.rb', line 5808
 
 def project_uses_version_gem?(project_root, _entrypoint_require, facts = nil)
   return false if version_gem_explicitly_disabled?(facts)
@@ -70965,15 +70977,15 @@ 

       
 
 
-15481
-15482
-15483
-15484
-15485
-15486

+15513
+15514
+15515
+15516
+15517
+15518

     

     
-      
# File 'lib/kettle/jem.rb', line 15481
+      
# File 'lib/kettle/jem.rb', line 15513
 
 def project_yard_host(config, env, package_name:, author_domain:)
   derived = "#{package_name.to_s.tr("_", "-")}.#{author_domain.to_s.empty? ? "example.com" : author_domain}"
@@ -71001,25 +71013,25 @@ 

       
 
 
-10595
-10596
-10597
-10598
-10599
-10600
-10601
-10602
-10603
-10604
-10605
-10606
-10607
-10608
-10609
-10610

+10626
+10627
+10628
+10629
+10630
+10631
+10632
+10633
+10634
+10635
+10636
+10637
+10638
+10639
+10640
+10641

     

     
-      
# File 'lib/kettle/jem.rb', line 10595
+      
# File 'lib/kettle/jem.rb', line 10626
 
 def prune_appraisals_below_min_ruby(content, min_ruby)
   return content if min_ruby.to_s.empty?
@@ -71057,39 +71069,39 @@ 

       
 
 
-10359
-10360
-10361
-10362
-10363
-10364
-10365
-10366
-10367
-10368
-10369
-10370
-10371
-10372
-10373
-10374
-10375
-10376
-10377
-10378
-10379
-10380
-10381
-10382
-10383
-10384
-10385
-10386
-10387
-10388

+10390
+10391
+10392
+10393
+10394
+10395
+10396
+10397
+10398
+10399
+10400
+10401
+10402
+10403
+10404
+10405
+10406
+10407
+10408
+10409
+10410
+10411
+10412
+10413
+10414
+10415
+10416
+10417
+10418
+10419

     

     
-      
# File 'lib/kettle/jem.rb', line 10359
+      
# File 'lib/kettle/jem.rb', line 10390
 
 def prune_appraisals_recording_entries(content, facts)
   remove_indexes = Set.new
@@ -71141,27 +71153,27 @@ 

 
 
-7350
-7351
-7352
-7353
-7354
-7355
-7356
-7357
-7358
-7359
-7360
-7361
-7362
-7363
-7364
-7365
-7366
-7367

+7381
+7382
+7383
+7384
+7385
+7386
+7387
+7388
+7389
+7390
+7391
+7392
+7393
+7394
+7395
+7396
+7397
+7398

     		
     
-      
# File 'lib/kettle/jem.rb', line 7350
+      
# File 'lib/kettle/jem.rb', line 7381
 
 def prune_disabled_github_workflow_engine_jobs(content, facts)
   engines = facts.to_h.dig(:rubygems, :engines)
@@ -71201,21 +71213,21 @@ 

       
 
 
-16052
-16053
-16054
-16055
-16056
-16057
-16058
-16059
-16060
-16061
-16062
-16063

+16084
+16085
+16086
+16087
+16088
+16089
+16090
+16091
+16092
+16093
+16094
+16095

     

     
-      
# File 'lib/kettle/jem.rb', line 16052
+      
# File 'lib/kettle/jem.rb', line 16084
 
 def prune_empty_parent_directories(project_root, relative_path)
   current = relative_path.to_s
@@ -71249,28 +71261,28 @@ 

 
 
-9110
-9111
-9112
-9113
-9114
-9115
-9116
-9117
-9118
-9119
-9120
-9121
-9122
-9123
-9124
-9125
-9126
-9127
-9128

+9141
+9142
+9143
+9144
+9145
+9146
+9147
+9148
+9149
+9150
+9151
+9152
+9153
+9154
+9155
+9156
+9157
+9158
+9159

     		
     
-      
# File 'lib/kettle/jem.rb', line 9110
+      
# File 'lib/kettle/jem.rb', line 9141
 
 def prune_github_workflow_matrix_by_min_ruby(content, facts)
   min_ruby = minimum_ruby_token(facts.to_h.dig(:ci, :test_min_ruby) || facts.to_h.dig(:rubygems, :min_ruby))
@@ -71311,15 +71323,15 @@ 

       
 
 
-12595
-12596
-12597
-12598
-12599
-12600

+12626
+12627
+12628
+12629
+12630
+12631

     

     
-      
# File 'lib/kettle/jem.rb', line 12595
+      
# File 'lib/kettle/jem.rb', line 12626
 
 def prune_legacy_kettle_config_keys(content)
   pruned = KETTLE_CONFIG_LEGACY_KEY_PATHS.reduce(content.to_s) do |updated, legacy_key|
@@ -71347,20 +71359,20 @@ 

 
 
-7897
-7898
-7899
-7900
-7901
-7902
-7903
-7904
-7905
-7906
-7907

+7928
+7929
+7930
+7931
+7932
+7933
+7934
+7935
+7936
+7937
+7938

     		
     
-      
# File 'lib/kettle/jem.rb', line 7897
+      
# File 'lib/kettle/jem.rb', line 7928
 
 def prune_missing_workflow_link_definitions(content, workflow_paths)
   ensure_runtime_dependencies!
@@ -71393,21 +71405,21 @@ 

       
 
 
-7884
-7885
-7886
-7887
-7888
-7889
-7890
-7891
-7892
-7893
-7894
-7895

+7915
+7916
+7917
+7918
+7919
+7920
+7921
+7922
+7923
+7924
+7925
+7926

     

     
-      
# File 'lib/kettle/jem.rb', line 7884
+      
# File 'lib/kettle/jem.rb', line 7915
 
 def prune_readme_integration_badges(content, readme_style)
   ensure_runtime_dependencies!
@@ -71441,20 +71453,20 @@ 

 
 
-7477
-7478
-7479
-7480
-7481
-7482
-7483
-7484
-7485
-7486
-7487

+7508
+7509
+7510
+7511
+7512
+7513
+7514
+7515
+7516
+7517
+7518

     		
     
-      
# File 'lib/kettle/jem.rb', line 7477
+      
# File 'lib/kettle/jem.rb', line 7508
 
 def prune_unused_readme_logo_link_definitions(content)
   owners = ReadmePostProcessor.markdown_structural_owners(content, :inline_references, :link_definitions)
@@ -71510,18 +71522,18 @@ 

       
 
 
-9261
-9262
-9263
-9264
-9265
-9266
-9267
-9268
-9269

+9292
+9293
+9294
+9295
+9296
+9297
+9298
+9299
+9300

     

     
-      
# File 'lib/kettle/jem.rb', line 9261
+      
# File 'lib/kettle/jem.rb', line 9292
 
 def prune_workflow_matrix_item?(mapping, minimum)
   ruby = yaml_mapping_scalar_value(mapping, "ruby").to_s.strip
@@ -71575,20 +71587,20 @@ 

       
 
 
-14169
-14170
-14171
-14172
-14173
-14174
-14175
-14176
-14177
-14178
-14179

+14200
+14201
+14202
+14203
+14204
+14205
+14206
+14207
+14208
+14209
+14210

     

     
-      
# File 'lib/kettle/jem.rb', line 14169
+      
# File 'lib/kettle/jem.rb', line 14200
 
 def quality_config_path?(path)
   %w[
@@ -71644,20 +71656,20 @@ 

       
 
 
-19482
-19483
-19484
-19485
-19486
-19487
-19488
-19489
-19490
-19491
-19492

+19515
+19516
+19517
+19518
+19519
+19520
+19521
+19522
+19523
+19524
+19525

     

     
-      
# File 'lib/kettle/jem.rb', line 19482
+      
# File 'lib/kettle/jem.rb', line 19515
 
 def rakefile_default_task_call?(call)
   argument = call.arguments&.arguments&.first
@@ -71690,19 +71702,19 @@ 

       
 
 
-19471
-19472
-19473
-19474
-19475
-19476
-19477
-19478
-19479
-19480

+19504
+19505
+19506
+19507
+19508
+19509
+19510
+19511
+19512
+19513

     

     
-      
# File 'lib/kettle/jem.rb', line 19471
+      
# File 'lib/kettle/jem.rb', line 19504
 
 def rakefile_default_task_records(content)
   top_level_ruby_call_records(content, :task).filter_map do |call|
@@ -71734,21 +71746,21 @@ 

       
 
 
-19432
-19433
-19434
-19435
-19436
-19437
-19438
-19439
-19440
-19441
-19442
-19443

+19465
+19466
+19467
+19468
+19469
+19470
+19471
+19472
+19473
+19474
+19475
+19476

     

     
-      
# File 'lib/kettle/jem.rb', line 19432
+      
# File 'lib/kettle/jem.rb', line 19465
 
 def rakefile_require_records(content)
   top_level_ruby_call_records(content, :require).filter_map do |call|
@@ -71782,14 +71794,14 @@ 

       
 
 
-6845
-6846
-6847
-6848
-6849

+6876
+6877
+6878
+6879
+6880

     

     
-      
# File 'lib/kettle/jem.rb', line 6845
+      
# File 'lib/kettle/jem.rb', line 6876
 
 def rakefile_scaffold_cleanup(content, facts)
   return {content: content.to_s, delete_selectors: []} if facts[:template_profile].to_s == MONOREPO_ROOT_TEMPLATE_PROFILE
@@ -71839,12 +71851,12 @@ 

       
 
 
-6841
-6842
-6843

+6872
+6873
+6874

     

     
-      
# File 'lib/kettle/jem.rb', line 6841
+      
# File 'lib/kettle/jem.rb', line 6872
 
 def rakefile_scaffold_cleanup_recipe?(recipe)
   recipe.fetch(:name) == "rakefile_scaffold_cleanup"
@@ -71869,41 +71881,41 @@ 

       
 
 
-19399
-19400
-19401
-19402
-19403
-19404
-19405
-19406
-19407
-19408
-19409
-19410
-19411
-19412
-19413
-19414
-19415
-19416
-19417
-19418
-19419
-19420
-19421
-19422
-19423
-19424
-19425
-19426
-19427
-19428
-19429
-19430

+19432
+19433
+19434
+19435
+19436
+19437
+19438
+19439
+19440
+19441
+19442
+19443
+19444
+19445
+19446
+19447
+19448
+19449
+19450
+19451
+19452
+19453
+19454
+19455
+19456
+19457
+19458
+19459
+19460
+19461
+19462
+19463

     

     
-      
# File 'lib/kettle/jem.rb', line 19399
+      
# File 'lib/kettle/jem.rb', line 19432
 
 def rakefile_scaffold_delete_selectors(content)
   selectors = []
@@ -71957,18 +71969,18 @@ 

       
 
 
-19517
-19518
-19519
-19520
-19521
-19522
-19523
-19524
-19525

+19550
+19551
+19552
+19553
+19554
+19555
+19556
+19557
+19558

     

     
-      
# File 'lib/kettle/jem.rb', line 19517
+      
# File 'lib/kettle/jem.rb', line 19550
 
 def rakefile_selector(selector_id, start_line, end_line, reason)
   {
@@ -71999,21 +72011,21 @@ 

       
 
 
-19458
-19459
-19460
-19461
-19462
-19463
-19464
-19465
-19466
-19467
-19468
-19469

+19491
+19492
+19493
+19494
+19495
+19496
+19497
+19498
+19499
+19500
+19501
+19502

     

     
-      
# File 'lib/kettle/jem.rb', line 19458
+      
# File 'lib/kettle/jem.rb', line 19491
 
 def rakefile_task_block_selectors(content)
   rakefile_default_task_records(content).filter_map do |record|
@@ -72047,21 +72059,21 @@ 

       
 
 
-19445
-19446
-19447
-19448
-19449
-19450
-19451
-19452
-19453
-19454
-19455
-19456

+19478
+19479
+19480
+19481
+19482
+19483
+19484
+19485
+19486
+19487
+19488
+19489

     

     
-      
# File 'lib/kettle/jem.rb', line 19445
+      
# File 'lib/kettle/jem.rb', line 19478
 
 def rakefile_task_class_records(content)
   top_level_ruby_call_records(content, :new).filter_map do |call|
@@ -72118,17 +72130,17 @@ 

       
 
 
-19494
-19495
-19496
-19497
-19498
-19499
-19500
-19501

+19527
+19528
+19529
+19530
+19531
+19532
+19533
+19534

     

     
-      
# File 'lib/kettle/jem.rb', line 19494
+      
# File 'lib/kettle/jem.rb', line 19527
 
 def rakefile_template_default_task?(content, record)
   desc_lines = top_level_ruby_call_records(content, :desc).filter_map do |call|
@@ -72158,21 +72170,21 @@ 

       
 
 
-10502
-10503
-10504
-10505
-10506
-10507
-10508
-10509
-10510
-10511
-10512
-10513

+10533
+10534
+10535
+10536
+10537
+10538
+10539
+10540
+10541
+10542
+10543
+10544

     

     
-      
# File 'lib/kettle/jem.rb', line 10502
+      
# File 'lib/kettle/jem.rb', line 10533
 
 def rbs_merge_options(recipe)
   options = {
@@ -72206,13 +72218,13 @@ 

       
 
 
-16697
-16698
-16699
-16700

+16729
+16730
+16731
+16732

     

     
-      
# File 'lib/kettle/jem.rb', line 16697
+      
# File 'lib/kettle/jem.rb', line 16729
 
 def read_project_file(project_root, relative_path)
   path = File.join(project_root, relative_path)
@@ -72238,15 +72250,15 @@ 

       
 
 
-7091
-7092
-7093
-7094
-7095
-7096

+7122
+7123
+7124
+7125
+7126
+7127

     

     
-      
# File 'lib/kettle/jem.rb', line 7091
+      
# File 'lib/kettle/jem.rb', line 7122
 
 def read_project_files(project_root, pack)
   pack.fetch(:recipes).map { |recipe| recipe.fetch(:target_path) }.uniq.to_h do |relative_path|
@@ -72274,14 +72286,14 @@ 

       
 
 
-7098
-7099
-7100
-7101
-7102

+7129
+7130
+7131
+7132
+7133

     

     
-      
# File 'lib/kettle/jem.rb', line 7098
+      
# File 'lib/kettle/jem.rb', line 7129
 
 def read_template_source_files(project_root, pack)
   pack.fetch(:recipes).filter_map { |recipe| recipe_template_content_path(project_root, recipe) }.uniq.to_h do |path|
@@ -72308,13 +72320,13 @@ 

       
 
 
-17120
-17121
-17122
-17123

+17152
+17153
+17154
+17155

     

     
-      
# File 'lib/kettle/jem.rb', line 17120
+      
# File 'lib/kettle/jem.rb', line 17152
 
 def readme_config_hash(config)
   raw_config = config.is_a?(Hash) ? config["readme"] : nil
@@ -72340,22 +72352,22 @@ 

       
 
 
-17614
-17615
-17616
-17617
-17618
-17619
-17620
-17621
-17622
-17623
-17624
-17625
-17626

+17646
+17647
+17648
+17649
+17650
+17651
+17652
+17653
+17654
+17655
+17656
+17657
+17658

     

     
-      
# File 'lib/kettle/jem.rb', line 17614
+      
# File 'lib/kettle/jem.rb', line 17646
 
 def readme_copyright_notice(copyright_lines, copyright_prefix, author)
   lines = copyright_notice_lines(copyright_lines, copyright_prefix, author).map { |line| "- #{line}" }
@@ -72390,14 +72402,14 @@ 

 
 
-17367
-17368
-17369
-17370
-17371

+17399
+17400
+17401
+17402
+17403

     		
     
-      
# File 'lib/kettle/jem.rb', line 17367
+      
# File 'lib/kettle/jem.rb', line 17399
 
 def readme_corporate_sponsor_template_tokens(readme_sponsors)
   {
@@ -72424,17 +72436,17 @@ 

       
 
 
-17007
-17008
-17009
-17010
-17011
-17012
-17013
-17014

+17039
+17040
+17041
+17042
+17043
+17044
+17045
+17046

     

     
-      
# File 'lib/kettle/jem.rb', line 17007
+      
# File 'lib/kettle/jem.rb', line 17039
 
 def readme_corporate_sponsors(config, env)
   readme_config = readme_config_hash(config)
@@ -72464,16 +72476,16 @@ 

       
 
 
-16999
-17000
-17001
-17002
-17003
-17004
-17005

+17031
+17032
+17033
+17034
+17035
+17036
+17037

     

     
-      
# File 'lib/kettle/jem.rb', line 16999
+      
# File 'lib/kettle/jem.rb', line 17031
 
 def readme_corporate_sponsors_facts(config, env)
   sponsors = readme_corporate_sponsors(config, env)
@@ -72502,23 +72514,23 @@ 

       
 
 
-17054
-17055
-17056
-17057
-17058
-17059
-17060
-17061
-17062
-17063
-17064
-17065
-17066
-17067

+17086
+17087
+17088
+17089
+17090
+17091
+17092
+17093
+17094
+17095
+17096
+17097
+17098
+17099

     

     
-      
# File 'lib/kettle/jem.rb', line 17054
+      
# File 'lib/kettle/jem.rb', line 17086
 
 def readme_corporate_sponsors_row(sponsors)
   return "" if sponsors.empty?
@@ -72554,17 +72566,17 @@ 

       
 
 
-17332
-17333
-17334
-17335
-17336
-17337
-17338
-17339

+17364
+17365
+17366
+17367
+17368
+17369
+17370
+17371

     

     
-      
# File 'lib/kettle/jem.rb', line 17332
+      
# File 'lib/kettle/jem.rb', line 17364
 
 def readme_default_logo_width(entries, one:, two:)
   case entries.length
@@ -72594,22 +72606,22 @@ 

       
 
 
-18154
-18155
-18156
-18157
-18158
-18159
-18160
-18161
-18162
-18163
-18164
-18165
-18166

+18186
+18187
+18188
+18189
+18190
+18191
+18192
+18193
+18194
+18195
+18196
+18197
+18198

     

     
-      
# File 'lib/kettle/jem.rb', line 18154
+      
# File 'lib/kettle/jem.rb', line 18186
 
 def readme_destination_front_sections(destination_content)
   sections = markdown_sections(destination_content)
@@ -72644,33 +72656,33 @@ 

       
 
 
-14463
-14464
-14465
-14466
-14467
-14468
-14469
-14470
-14471
-14472
-14473
-14474
-14475
-14476
-14477
-14478
-14479
-14480
-14481
-14482
-14483
-14484
-14485
-14486

+14495
+14496
+14497
+14498
+14499
+14500
+14501
+14502
+14503
+14504
+14505
+14506
+14507
+14508
+14509
+14510
+14511
+14512
+14513
+14514
+14515
+14516
+14517
+14518

     

     
-      
# File 'lib/kettle/jem.rb', line 14463
+      
# File 'lib/kettle/jem.rb', line 14495
 
 def readme_dev_test_stack_table(package_name)
   rows = README_DEV_TEST_STACK_GEMS.reject { |gem| gem.fetch(:name) == package_name.to_s }.map do |gem|
@@ -72716,20 +72728,20 @@ 

       
 
 
-17998
-17999
-18000
-18001
-18002
-18003
-18004
-18005
-18006
-18007
-18008

+18030
+18031
+18032
+18033
+18034
+18035
+18036
+18037
+18038
+18039
+18040

     

     
-      
# File 'lib/kettle/jem.rb', line 17998
+      
# File 'lib/kettle/jem.rb', line 18030
 
 def readme_disabled_integrations(readme, integration_disabled: [])
   disabled = []
@@ -72762,25 +72774,25 @@ 

 
 
-18210
-18211
-18212
-18213
-18214
-18215
-18216
-18217
-18218
-18219
-18220
-18221
-18222
-18223
-18224
-18225

+18242
+18243
+18244
+18245
+18246
+18247
+18248
+18249
+18250
+18251
+18252
+18253
+18254
+18255
+18256
+18257

     		
     
-      
# File 'lib/kettle/jem.rb', line 18210
+      
# File 'lib/kettle/jem.rb', line 18242
 
 def readme_extra_preserved_sections_by_anchor(destination_sections, template_bases, preserve_targets)
   destination_sections.each_with_index.each_with_object({}) do |(section, index), result|
@@ -72818,30 +72830,30 @@ 

       
 
 
-14715
-14716
-14717
-14718
-14719
-14720
-14721
-14722
-14723
-14724
-14725
-14726
-14727
-14728
-14729
-14730
-14731
-14732
-14733
-14734
-14735

+14747
+14748
+14749
+14750
+14751
+14752
+14753
+14754
+14755
+14756
+14757
+14758
+14759
+14760
+14761
+14762
+14763
+14764
+14765
+14766
+14767

     

     
-      
# File 'lib/kettle/jem.rb', line 14715
+      
# File 'lib/kettle/jem.rb', line 14747
 
 def readme_family_intro_and_backend_matrix(readme_style = {})
   return "" unless readme_style.is_a?(Hash) && readme_style[:package_family].to_s == "structuredmerge"
@@ -72907,15 +72919,15 @@ 

       
 
 
-17991
-17992
-17993
-17994
-17995
-17996

+18023
+18024
+18025
+18026
+18027
+18028

     

     
-      
# File 'lib/kettle/jem.rb', line 17991
+      
# File 'lib/kettle/jem.rb', line 18023
 
 def readme_floss_funding_enabled?(license, config_value)
   return false if falsey_config?(config_value)
@@ -72943,30 +72955,30 @@ 

       
 
 
-17920
-17921
-17922
-17923
-17924
-17925
-17926
-17927
-17928
-17929
-17930
-17931
-17932
-17933
-17934
-17935
-17936
-17937
-17938
-17939
-17940

+17952
+17953
+17954
+17955
+17956
+17957
+17958
+17959
+17960
+17961
+17962
+17963
+17964
+17965
+17966
+17967
+17968
+17969
+17970
+17971
+17972

     

     
-      
# File 'lib/kettle/jem.rb', line 17920
+      
# File 'lib/kettle/jem.rb', line 17952
 
 def readme_fossa_project(readme, repository)
   badges = readme["badges"].is_a?(Hash) ? readme["badges"] : {}
@@ -73009,22 +73021,22 @@ 

       
 
 
-14498
-14499
-14500
-14501
-14502
-14503
-14504
-14505
-14506
-14507
-14508
-14509
-14510

+14530
+14531
+14532
+14533
+14534
+14535
+14536
+14537
+14538
+14539
+14540
+14541
+14542

     

     
-      
# File 'lib/kettle/jem.rb', line 14498
+      
# File 'lib/kettle/jem.rb', line 14530
 
 def readme_fossa_template_tokens(readme_style)
   project = readme_style.fetch(:fossa_project, "").to_s
@@ -73082,12 +73094,12 @@ 

       
 
 
-18168
-18169
-18170

+18200
+18201
+18202

     

     
-      
# File 'lib/kettle/jem.rb', line 18168
+      
# File 'lib/kettle/jem.rb', line 18200
 
 def readme_front_section_preserved?(section)
   section.fetch(:base) == "important" || readme_section_contains_badge_cloud?(section)
@@ -73112,16 +73124,16 @@ 

       
 
 
-17165
-17166
-17167
-17168
-17169
-17170
-17171

+17197
+17198
+17199
+17200
+17201
+17202
+17203

     

     
-      
# File 'lib/kettle/jem.rb', line 17165
+      
# File 'lib/kettle/jem.rb', line 17197
 
 def readme_h2_synopsis_logo_entries(config, org:, gem_name:, repository: {})
   entries = readme_h2_synopsis_logo_specs(config).filter_map do |spec|
@@ -73150,12 +73162,12 @@ 

       
 
 
-17073
-17074
-17075

+17105
+17106
+17107

     

     
-      
# File 'lib/kettle/jem.rb', line 17073
+      
# File 'lib/kettle/jem.rb', line 17105
 
 def readme_h2_synopsis_logo_options(config)
   readme_h2_synopsis_logo_specs(config).map { |spec| spec.fetch(:type) }
@@ -73180,15 +73192,15 @@ 

       
 
 
-17325
-17326
-17327
-17328
-17329
-17330

+17357
+17358
+17359
+17360
+17361
+17362

     

     
-      
# File 'lib/kettle/jem.rb', line 17325
+      
# File 'lib/kettle/jem.rb', line 17357
 
 def readme_h2_synopsis_logo_row(entries)
   default_width = readme_default_logo_width(entries, one: "10%", two: "8%")
@@ -73216,29 +73228,29 @@ 

       
 
 
-17077
-17078
-17079
-17080
-17081
-17082
-17083
-17084
-17085
-17086
-17087
-17088
-17089
-17090
-17091
-17092
-17093
-17094
-17095
-17096

+17109
+17110
+17111
+17112
+17113
+17114
+17115
+17116
+17117
+17118
+17119
+17120
+17121
+17122
+17123
+17124
+17125
+17126
+17127
+17128

     

     
-      
# File 'lib/kettle/jem.rb', line 17077
+      
# File 'lib/kettle/jem.rb', line 17109
 
 def readme_h2_synopsis_logo_specs(config)
   readme_config = readme_config_hash(config)
@@ -73303,34 +73315,34 @@ 

       
 
 
-18075
-18076
-18077
-18078
-18079
-18080
-18081
-18082
-18083
-18084
-18085
-18086
-18087
-18088
-18089
-18090
-18091
-18092
-18093
-18094
-18095
-18096
-18097
-18098
-18099

+18107
+18108
+18109
+18110
+18111
+18112
+18113
+18114
+18115
+18116
+18117
+18118
+18119
+18120
+18121
+18122
+18123
+18124
+18125
+18126
+18127
+18128
+18129
+18130
+18131

     

     
-      
# File 'lib/kettle/jem.rb', line 18075
+      
# File 'lib/kettle/jem.rb', line 18107
 
 def readme_integration_configured?(project_root, integration)
   case integration
@@ -73377,14 +73389,14 @@ 

       
 
 
-17942
-17943
-17944
-17945
-17946

+17974
+17975
+17976
+17977
+17978

     

     
-      
# File 'lib/kettle/jem.rb', line 17942
+      
# File 'lib/kettle/jem.rb', line 17974
 
 def readme_integration_project_root(project_root, template_profile, repository)
   return project_root unless repository_monorepo_subproject?(repository)
@@ -73411,17 +73423,17 @@ 

       
 
 
-7508
-7509
-7510
-7511
-7512
-7513
-7514
-7515

+7539
+7540
+7541
+7542
+7543
+7544
+7545
+7546

     

     
-      
# File 'lib/kettle/jem.rb', line 7508
+      
# File 'lib/kettle/jem.rb', line 7539
 
 def readme_kloc_from_changelog(project_root, version)
   return if project_root.to_s.empty? || version.to_s.empty?
@@ -73451,22 +73463,22 @@ 

       
 
 
-17651
-17652
-17653
-17654
-17655
-17656
-17657
-17658
-17659
-17660
-17661
-17662
-17663

+17683
+17684
+17685
+17686
+17687
+17688
+17689
+17690
+17691
+17692
+17693
+17694
+17695

     

     
-      
# File 'lib/kettle/jem.rb', line 17651
+      
# File 'lib/kettle/jem.rb', line 17683
 
 def readme_license_intro(licenses, author_email: nil, license_source_url: nil, custom_license: false)
   return "The licensing terms for this project are provided in [LICENSE.txt](LICENSE.txt). See [LICENSE.md](LICENSE.md) for details." if custom_license
@@ -73501,19 +73513,19 @@ 

       
 
 
-17682
-17683
-17684
-17685
-17686
-17687
-17688
-17689
-17690
-17691

+17714
+17715
+17716
+17717
+17718
+17719
+17720
+17721
+17722
+17723

     

     
-      
# File 'lib/kettle/jem.rb', line 17682
+      
# File 'lib/kettle/jem.rb', line 17714
 
 def readme_license_refs(expression, compat_category, license_source_url: nil)
   [
@@ -73545,13 +73557,13 @@ 

       
 
 
-12661
-12662
-12663
-12664

+12692
+12693
+12694
+12695

     

     
-      
# File 'lib/kettle/jem.rb', line 12661
+      
# File 'lib/kettle/jem.rb', line 12692
 
 def readme_logo_config_value(spec)
   width = spec[:width].to_s
@@ -73577,31 +73589,31 @@ 

       
 
 
-16976
-16977
-16978
-16979
-16980
-16981
-16982
-16983
-16984
-16985
-16986
-16987
-16988
-16989
-16990
-16991
-16992
-16993
-16994
-16995
-16996
-16997

+17008
+17009
+17010
+17011
+17012
+17013
+17014
+17015
+17016
+17017
+17018
+17019
+17020
+17021
+17022
+17023
+17024
+17025
+17026
+17027
+17028
+17029

     

     
-      
# File 'lib/kettle/jem.rb', line 16976
+      
# File 'lib/kettle/jem.rb', line 17008
 
 def readme_logo_facts(config, package_name:, github_org:, repository: {})
   top_entries = readme_top_logo_entries(
@@ -73645,18 +73657,18 @@ 

       
 
 
-17345
-17346
-17347
-17348
-17349
-17350
-17351
-17352
-17353

+17377
+17378
+17379
+17380
+17381
+17382
+17383
+17384
+17385

     

     
-      
# File 'lib/kettle/jem.rb', line 17345
+      
# File 'lib/kettle/jem.rb', line 17377
 
 def readme_logo_html(entry, align:, width: nil)
   attributes = [
@@ -73687,12 +73699,12 @@ 

       
 
 
-17098
-17099
-17100

+17130
+17131
+17132

     

     
-      
# File 'lib/kettle/jem.rb', line 17098
+      
# File 'lib/kettle/jem.rb', line 17130
 
 def readme_logo_options_from_config(config, primary_key, secondary_key, defaults)
   readme_logo_specs_from_config(config, primary_key, secondary_key, defaults).map { |spec| spec.fetch(:type) }
@@ -73717,26 +73729,26 @@ 

       
 
 
-17102
-17103
-17104
-17105
-17106
-17107
-17108
-17109
-17110
-17111
-17112
-17113
-17114
-17115
-17116
-17117
-17118

+17134
+17135
+17136
+17137
+17138
+17139
+17140
+17141
+17142
+17143
+17144
+17145
+17146
+17147
+17148
+17149
+17150

     

     
-      
# File 'lib/kettle/jem.rb', line 17102
+      
# File 'lib/kettle/jem.rb', line 17134
 
 def readme_logo_specs_from_config(config, primary_key, secondary_key, defaults)
   readme_config = readme_config_hash(config)
@@ -73775,16 +73787,16 @@ 

       
 
 
-17359
-17360
-17361
-17362
-17363
-17364
-17365

+17391
+17392
+17393
+17394
+17395
+17396
+17397

     

     
-      
# File 'lib/kettle/jem.rb', line 17359
+      
# File 'lib/kettle/jem.rb', line 17391
 
 def readme_logo_template_tokens()
   {
@@ -73813,31 +73825,31 @@ 

       
 
 
-19311
-19312
-19313
-19314
-19315
-19316
-19317
-19318
-19319
-19320
-19321
-19322
-19323
-19324
-19325
-19326
-19327
-19328
-19329
-19330
-19331
-19332

+19344
+19345
+19346
+19347
+19348
+19349
+19350
+19351
+19352
+19353
+19354
+19355
+19356
+19357
+19358
+19359
+19360
+19361
+19362
+19363
+19364
+19365

     

     
-      
# File 'lib/kettle/jem.rb', line 19311
+      
# File 'lib/kettle/jem.rb', line 19344
 
 def readme_metadata_block(facts)
   package = facts.fetch(:package)
@@ -73881,19 +73893,19 @@ 

       
 
 
-19338
-19339
-19340
-19341
-19342
-19343
-19344
-19345
-19346
-19347

+19371
+19372
+19373
+19374
+19375
+19376
+19377
+19378
+19379
+19380

     

     
-      
# File 'lib/kettle/jem.rb', line 19338
+      
# File 'lib/kettle/jem.rb', line 19371
 
 def readme_metadata_license_expression(facts)
   package = facts.fetch(:package)
@@ -73925,12 +73937,12 @@ 

       
 
 
-19334
-19335
-19336

+19367
+19368
+19369

     

     
-      
# File 'lib/kettle/jem.rb', line 19334
+      
# File 'lib/kettle/jem.rb', line 19367
 
 def readme_metadata_table_cell(value)
   value.to_s.split(/\r\n?|\n/).map(&:strip).join("<br>").gsub("|", "\\|")
@@ -73955,24 +73967,24 @@ 

       
 
 
-18320
-18321
-18322
-18323
-18324
-18325
-18326
-18327
-18328
-18329
-18330
-18331
-18332
-18333
-18334

+18352
+18353
+18354
+18355
+18356
+18357
+18358
+18359
+18360
+18361
+18362
+18363
+18364
+18365
+18366

     

     
-      
# File 'lib/kettle/jem.rb', line 18320
+      
# File 'lib/kettle/jem.rb', line 18352
 
 def readme_preserve_config(config)
   readme = config["readme"]
@@ -74009,22 +74021,22 @@ 

 
 
-5940
-5941
-5942
-5943
-5944
-5945
-5946
-5947
-5948
-5949
-5950
-5951
-5952

+5971
+5972
+5973
+5974
+5975
+5976
+5977
+5978
+5979
+5980
+5981
+5982
+5983

     		
     
-      
# File 'lib/kettle/jem.rb', line 5940
+      
# File 'lib/kettle/jem.rb', line 5971
 
 def readme_preserve_config_without_partial_sections(preserve_config, partial_sections)
   normalized_partials = partial_sections.map { |section| normalize_readme_section_key(section) }
@@ -74059,31 +74071,31 @@ 

       
 
 
-18289
-18290
-18291
-18292
-18293
-18294
-18295
-18296
-18297
-18298
-18299
-18300
-18301
-18302
-18303
-18304
-18305
-18306
-18307
-18308
-18309
-18310

+18321
+18322
+18323
+18324
+18325
+18326
+18327
+18328
+18329
+18330
+18331
+18332
+18333
+18334
+18335
+18336
+18337
+18338
+18339
+18340
+18341
+18342

     

     
-      
# File 'lib/kettle/jem.rb', line 18289
+      
# File 'lib/kettle/jem.rb', line 18321
 
 def readme_preserve_targets(template_sections, destination_lookup, preserve_config)
   sections = if preserve_config.key?(:sections)
@@ -74127,17 +74139,17 @@ 

       
 
 
-13245
-13246
-13247
-13248
-13249
-13250
-13251
-13252

+13276
+13277
+13278
+13279
+13280
+13281
+13282
+13283

     

     
-      
# File 'lib/kettle/jem.rb', line 13245
+      
# File 'lib/kettle/jem.rb', line 13276
 
 def readme_project_emoji(project_root)
   readme_path = File.join(project_root, "README.md")
@@ -74190,12 +74202,12 @@ 

       
 
 
-18172
-18173
-18174

+18204
+18205
+18206

     

     
-      
# File 'lib/kettle/jem.rb', line 18172
+      
# File 'lib/kettle/jem.rb', line 18204
 
 def readme_section_contains_badge_cloud?(section)
   section.fetch(:body).to_s.lines.any? { |line| line.include?("[![") }
@@ -74243,19 +74255,19 @@ 

       
 
 
-18227
-18228
-18229
-18230
-18231
-18232
-18233
-18234
-18235
-18236

+18259
+18260
+18261
+18262
+18263
+18264
+18265
+18266
+18267
+18268

     

     
-      
# File 'lib/kettle/jem.rb', line 18227
+      
# File 'lib/kettle/jem.rb', line 18259
 
 def readme_section_has_preserved_ancestor?(sections, index, preserve_targets)
   section = sections.fetch(index)
@@ -74287,33 +74299,33 @@ 

       
 
 
-17962
-17963
-17964
-17965
-17966
-17967
-17968
-17969
-17970
-17971
-17972
-17973
-17974
-17975
-17976
-17977
-17978
-17979
-17980
-17981
-17982
-17983
-17984
-17985

+17994
+17995
+17996
+17997
+17998
+17999
+18000
+18001
+18002
+18003
+18004
+18005
+18006
+18007
+18008
+18009
+18010
+18011
+18012
+18013
+18014
+18015
+18016
+18017

     

     
-      
# File 'lib/kettle/jem.rb', line 17962
+      
# File 'lib/kettle/jem.rb', line 17994
 
 def readme_section_partials(project_root, config, readme)
   configured = readme["section_partials"]
@@ -74359,21 +74371,21 @@ 

       
 
 
-5927
-5928
-5929
-5930
-5931
-5932
-5933
-5934
-5935
-5936
-5937
-5938

+5958
+5959
+5960
+5961
+5962
+5963
+5964
+5965
+5966
+5967
+5968
+5969

     

     
-      
# File 'lib/kettle/jem.rb', line 5927
+      
# File 'lib/kettle/jem.rb', line 5958
 
 def readme_section_partials_for_render(readme_style, facts)
   partials = readme_style[:section_partials]
@@ -74407,29 +74419,29 @@ 

       
 
 
-16903
-16904
-16905
-16906
-16907
-16908
-16909
-16910
-16911
-16912
-16913
-16914
-16915
-16916
-16917
-16918
-16919
-16920
-16921
-16922

+16935
+16936
+16937
+16938
+16939
+16940
+16941
+16942
+16943
+16944
+16945
+16946
+16947
+16948
+16949
+16950
+16951
+16952
+16953
+16954

     

     
-      
# File 'lib/kettle/jem.rb', line 16903
+      
# File 'lib/kettle/jem.rb', line 16935
 
 def readme_star_history_facts(project_root, git_source_url)
   repository_slug = github_repository_slug(git_source_url)
@@ -74471,40 +74483,40 @@ 

       
 
 
-17888
-17889
-17890
-17891
-17892
-17893
-17894
-17895
-17896
-17897
-17898
-17899
-17900
-17901
-17902
-17903
-17904
-17905
-17906
-17907
-17908
-17909
-17910
-17911
-17912
-17913
-17914
-17915
-17916
-17917
-17918

+17920
+17921
+17922
+17923
+17924
+17925
+17926
+17927
+17928
+17929
+17930
+17931
+17932
+17933
+17934
+17935
+17936
+17937
+17938
+17939
+17940
+17941
+17942
+17943
+17944
+17945
+17946
+17947
+17948
+17949
+17950

     

     
-      
# File 'lib/kettle/jem.rb', line 17888
+      
# File 'lib/kettle/jem.rb', line 17920
 
 def readme_style_facts(project_root, config, license, template_profile: nil, repository: nil)
   readme = config["readme"].is_a?(Hash) ? config["readme"] : {}
@@ -74557,39 +74569,39 @@ 

       
 
 
-5954
-5955
-5956
-5957
-5958
-5959
-5960
-5961
-5962
-5963
-5964
-5965
-5966
-5967
-5968
-5969
-5970
-5971
-5972
-5973
-5974
-5975
-5976
-5977
-5978
-5979
-5980
-5981
-5982
-5983

+5985
+5986
+5987
+5988
+5989
+5990
+5991
+5992
+5993
+5994
+5995
+5996
+5997
+5998
+5999
+6000
+6001
+6002
+6003
+6004
+6005
+6006
+6007
+6008
+6009
+6010
+6011
+6012
+6013
+6014

     

     
-      
# File 'lib/kettle/jem.rb', line 5954
+      
# File 'lib/kettle/jem.rb', line 5985
 
 def readme_template_tokens(facts)
   {
@@ -74641,18 +74653,18 @@ 

       
 
 
-14453
-14454
-14455
-14456
-14457
-14458
-14459
-14460
-14461

+14485
+14486
+14487
+14488
+14489
+14490
+14491
+14492
+14493

     

     
-      
# File 'lib/kettle/jem.rb', line 14453
+      
# File 'lib/kettle/jem.rb', line 14485
 
 def readme_title_token(package, rubygems)
   package_name = package.fetch(:name).to_s.strip
@@ -74683,12 +74695,12 @@ 

       
 
 
-17293
-17294
-17295

+17325
+17326
+17327

     

     
-      
# File 'lib/kettle/jem.rb', line 17293
+      
# File 'lib/kettle/jem.rb', line 17325
 
 def readme_top_logo_credit_separator(type)
   (type == "ruby") ? ", " : " by "
@@ -74713,24 +74725,24 @@ 

       
 
 
-17251
-17252
-17253
-17254
-17255
-17256
-17257
-17258
-17259
-17260
-17261
-17262
-17263
-17264
-17265

+17283
+17284
+17285
+17286
+17287
+17288
+17289
+17290
+17291
+17292
+17293
+17294
+17295
+17296
+17297

     

     
-      
# File 'lib/kettle/jem.rb', line 17251
+      
# File 'lib/kettle/jem.rb', line 17283
 
 def readme_top_logo_default_alt(type, slug)
   label = slug.split("/").last.to_s
@@ -74767,19 +74779,19 @@ 

       
 
 
-17154
-17155
-17156
-17157
-17158
-17159
-17160
-17161
-17162
-17163

+17186
+17187
+17188
+17189
+17190
+17191
+17192
+17193
+17194
+17195

     

     
-      
# File 'lib/kettle/jem.rb', line 17154
+      
# File 'lib/kettle/jem.rb', line 17186
 
 def readme_top_logo_entries(config, org:, gem_name:, repository: {})
   configured = configured_readme_top_logo_entries(config, org: org, gem_name: gem_name, repository: repository)
@@ -74811,15 +74823,15 @@ 

 
 
-17173
-17174
-17175
-17176
-17177
-17178

+17205
+17206
+17207
+17208
+17209
+17210

     		
     
-      
# File 'lib/kettle/jem.rb', line 17173
+      
# File 'lib/kettle/jem.rb', line 17205
 
 def readme_top_logo_entries_with_asset_size(entries)
   entries.map do |entry|
@@ -74847,38 +74859,38 @@ 

       
 
 
-17200
-17201
-17202
-17203
-17204
-17205
-17206
-17207
-17208
-17209
-17210
-17211
-17212
-17213
-17214
-17215
-17216
-17217
-17218
-17219
-17220
-17221
-17222
-17223
-17224
-17225
-17226
-17227
-17228

+17232
+17233
+17234
+17235
+17236
+17237
+17238
+17239
+17240
+17241
+17242
+17243
+17244
+17245
+17246
+17247
+17248
+17249
+17250
+17251
+17252
+17253
+17254
+17255
+17256
+17257
+17258
+17259
+17260

     

     
-      
# File 'lib/kettle/jem.rb', line 17200
+      
# File 'lib/kettle/jem.rb', line 17232
 
 def readme_top_logo_entry_from_config(, org:, gem_name:, repository: {})
   return unless .is_a?(Hash)
@@ -74929,15 +74941,15 @@ 

       
 
 
-17311
-17312
-17313
-17314
-17315
-17316

+17343
+17344
+17345
+17346
+17347
+17348

     

     
-      
# File 'lib/kettle/jem.rb', line 17311
+      
# File 'lib/kettle/jem.rb', line 17343
 
 def readme_top_logo_entry_from_option(option, org:, gem_name:, repository: {})
   return if option == "org" && org.to_s.empty?
@@ -74965,14 +74977,14 @@ 

       
 
 
-17230
-17231
-17232
-17233
-17234

+17262
+17263
+17264
+17265
+17266

     

     
-      
# File 'lib/kettle/jem.rb', line 17230
+      
# File 'lib/kettle/jem.rb', line 17262
 
 def readme_top_logo_image_url(type, slug)
   return "https://github.com/#{slug}.png?size=192" if type == "org"
@@ -74999,12 +75011,12 @@ 

       
 
 
-17069
-17070
-17071

+17101
+17102
+17103

     

     
-      
# File 'lib/kettle/jem.rb', line 17069
+      
# File 'lib/kettle/jem.rb', line 17101
 
 def readme_top_logo_options(config)
   readme_logo_options_from_config(config, "top_logos", "top_logo_options", README_TOP_LOGO_DEFAULTS)
@@ -75029,12 +75041,12 @@ 

       
 
 
-17341
-17342
-17343

+17373
+17374
+17375

     

     
-      
# File 'lib/kettle/jem.rb', line 17341
+      
# File 'lib/kettle/jem.rb', line 17373
 
 def readme_top_logo_refs(entries)
   ""
@@ -75059,15 +75071,15 @@ 

       
 
 
-17318
-17319
-17320
-17321
-17322
-17323

+17350
+17351
+17352
+17353
+17354
+17355

     

     
-      
# File 'lib/kettle/jem.rb', line 17318
+      
# File 'lib/kettle/jem.rb', line 17350
 
 def readme_top_logo_row(entries)
   default_width = readme_default_logo_width(entries, one: "14%", two: "12%")
@@ -75095,38 +75107,6 @@ 

       
 
 
-14559
-14560
-14561
-14562
-14563
-14564
-14565
-14566
-14567
-14568
-14569
-14570
-14571
-14572
-14573
-14574
-14575
-14576
-14577
-14578
-14579
-14580
-14581
-14582
-14583
-14584
-14585
-14586
-14587
-14588
-14589
-14590
 14591
 14592
 14593
@@ -75175,10 +75155,42 @@ 

 14636
 14637
 14638
-14639

+14639
+14640
+14641
+14642
+14643
+14644
+14645
+14646
+14647
+14648
+14649
+14650
+14651
+14652
+14653
+14654
+14655
+14656
+14657
+14658
+14659
+14660
+14661
+14662
+14663
+14664
+14665
+14666
+14667
+14668
+14669
+14670
+14671

     

     
-      
# File 'lib/kettle/jem.rb', line 14559
+      
# File 'lib/kettle/jem.rb', line 14591
 
 def readme_url_template_tokens(repository, package_name, github_org)
   repo_url = repository[:url].to_s
@@ -75281,20 +75293,20 @@ 

       
 
 
-7909
-7910
-7911
-7912
-7913
-7914
-7915
-7916
-7917
-7918
-7919

+7940
+7941
+7942
+7943
+7944
+7945
+7946
+7947
+7948
+7949
+7950

     

     
-      
# File 'lib/kettle/jem.rb', line 7909
+      
# File 'lib/kettle/jem.rb', line 7940
 
 def readme_workflow_path_from_url(url)
   marker = "/actions/workflows/"
@@ -75327,14 +75339,14 @@ 

       
 
 
-17956
-17957
-17958
-17959
-17960

+17988
+17989
+17990
+17991
+17992

     

     
-      
# File 'lib/kettle/jem.rb', line 17956
+      
# File 'lib/kettle/jem.rb', line 17988
 
 def readme_workflow_paths(project_root)
   Dir.glob(File.join(project_root.to_s, ".github/workflows/*.{yml,yaml}")).map do |path|
@@ -75361,17 +75373,17 @@ 

       
 
 
-13402
-13403
-13404
-13405
-13406
-13407
-13408
-13409

+13433
+13434
+13435
+13436
+13437
+13438
+13439
+13440

     

     
-      
# File 'lib/kettle/jem.rb', line 13402
+      
# File 'lib/kettle/jem.rb', line 13433
 
 def recipe_decision_category(recipe)
   return "delete_file" if delete_file_recipe?(recipe)
@@ -75401,19 +75413,19 @@ 

       
 
 
-13420
-13421
-13422
-13423
-13424
-13425
-13426
-13427
-13428
-13429

+13451
+13452
+13453
+13454
+13455
+13456
+13457
+13458
+13459
+13460

     

     
-      
# File 'lib/kettle/jem.rb', line 13420
+      
# File 'lib/kettle/jem.rb', line 13451
 
 def recipe_decision_diagnostics(recipe)
   diagnostics = []
@@ -75445,19 +75457,19 @@ 

       
 
 
-13391
-13392
-13393
-13394
-13395
-13396
-13397
-13398
-13399
-13400

+13422
+13423
+13424
+13425
+13426
+13427
+13428
+13429
+13430
+13431

     

     
-      
# File 'lib/kettle/jem.rb', line 13391
+      
# File 'lib/kettle/jem.rb', line 13422
 
 def recipe_decision_evaluation(decision_policy:, recipe:, changed:, destination_existed:)
   decision_policy.resolve(
@@ -75489,17 +75501,17 @@ 

       
 
 
-13411
-13412
-13413
-13414
-13415
-13416
-13417
-13418

+13442
+13443
+13444
+13445
+13446
+13447
+13448
+13449

     

     
-      
# File 'lib/kettle/jem.rb', line 13411
+      
# File 'lib/kettle/jem.rb', line 13442
 
 def recipe_default_action(recipe, changed:, destination_existed:)
   return "delete" if delete_file_recipe?(recipe)
@@ -75529,20 +75541,20 @@ 

       
 
 
-13453
-13454
-13455
-13456
-13457
-13458
-13459
-13460
-13461
-13462
-13463

+13484
+13485
+13486
+13487
+13488
+13489
+13490
+13491
+13492
+13493
+13494

     

     
-      
# File 'lib/kettle/jem.rb', line 13453
+      
# File 'lib/kettle/jem.rb', line 13484
 
 def recipe_entry(name, target_path, provider_family, primitive, facts:, provider_backend: nil, selectors: [])
   {
@@ -75575,14 +75587,14 @@ 

       
 
 
-13375
-13376
-13377
-13378
-13379

+13406
+13407
+13408
+13409
+13410

     

     
-      
# File 'lib/kettle/jem.rb', line 13375
+      
# File 'lib/kettle/jem.rb', line 13406
 
 def recipe_filter_patterns(template_selection)
   only = Array(template_selection[:only]).compact
@@ -75609,35 +75621,6 @@ 

       
 
 
-3641
-3642
-3643
-3644
-3645
-3646
-3647
-3648
-3649
-3650
-3651
-3652
-3653
-3654
-3655
-3656
-3657
-3658
-3659
-3660
-3661
-3662
-3663
-3664
-3665
-3666
-3667
-3668
-3669
 3670
 3671
 3672
@@ -75771,10 +75754,39 @@ 

 3800
 3801
 3802
-3803

+3803
+3804
+3805
+3806
+3807
+3808
+3809
+3810
+3811
+3812
+3813
+3814
+3815
+3816
+3817
+3818
+3819
+3820
+3821
+3822
+3823
+3824
+3825
+3826
+3827
+3828
+3829
+3830
+3831
+3832

     

     
-      
# File 'lib/kettle/jem.rb', line 3641
+      
# File 'lib/kettle/jem.rb', line 3670
 
 def recipe_pack(facts)
   recipes = if monorepo_template_profile?(facts) || shim_template_profile?(facts)
@@ -75982,22 +75994,22 @@ 

       
 
 
-4287
-4288
-4289
-4290
-4291
-4292
-4293
-4294
-4295
-4296
-4297
-4298
-4299

+4316
+4317
+4318
+4319
+4320
+4321
+4322
+4323
+4324
+4325
+4326
+4327
+4328

     

     
-      
# File 'lib/kettle/jem.rb', line 4287
+      
# File 'lib/kettle/jem.rb', line 4316
 
 def recipe_planning_strategy_for(env, run_options)
   value = (run_options || {})[:recipe_planning_strategy] ||
@@ -76032,24 +76044,24 @@ 

       
 
 
-4317
-4318
-4319
-4320
-4321
-4322
-4323
-4324
-4325
-4326
-4327
-4328
-4329
-4330
-4331

+4346
+4347
+4348
+4349
+4350
+4351
+4352
+4353
+4354
+4355
+4356
+4357
+4358
+4359
+4360

     

     
-      
# File 'lib/kettle/jem.rb', line 4317
+      
# File 'lib/kettle/jem.rb', line 4346
 
 def recipe_planning_thread_workers_for(env, run_options)
   value = (run_options || {})[:thread_workers] ||
@@ -76086,24 +76098,24 @@ 

       
 
 
-4301
-4302
-4303
-4304
-4305
-4306
-4307
-4308
-4309
-4310
-4311
-4312
-4313
-4314
-4315

+4330
+4331
+4332
+4333
+4334
+4335
+4336
+4337
+4338
+4339
+4340
+4341
+4342
+4343
+4344

     

     
-      
# File 'lib/kettle/jem.rb', line 4301
+      
# File 'lib/kettle/jem.rb', line 4330
 
 def recipe_planning_workers_for(env, run_options)
   value = (run_options || {})[:ractor_workers] ||
@@ -76140,18 +76152,18 @@ 

       
 
 
-13292
-13293
-13294
-13295
-13296
-13297
-13298
-13299
-13300

+13323
+13324
+13325
+13326
+13327
+13328
+13329
+13330
+13331

     

     
-      
# File 'lib/kettle/jem.rb', line 13292
+      
# File 'lib/kettle/jem.rb', line 13323
 
 def recipe_report_metadata(recipe)
   metadata = {packaging_recipe: recipe.fetch(:name)}
@@ -76182,12 +76194,12 @@ 

       
 
 
-14148
-14149
-14150

+14179
+14180
+14181

     

     
-      
# File 'lib/kettle/jem.rb', line 14148
+      
# File 'lib/kettle/jem.rb', line 14179
 
 def recipe_report_phase(recipe_report)
   phase_for_recipe(recipe_report[:recipe_name], recipe_report[:relative_path])
@@ -76212,42 +76224,42 @@ 

       
 
 
-14181
-14182
-14183
-14184
-14185
-14186
-14187
-14188
-14189
-14190
-14191
-14192
-14193
-14194
-14195
-14196
-14197
-14198
-14199
-14200
-14201
-14202
-14203
-14204
-14205
-14206
-14207
-14208
-14209
-14210
-14211
 14212
-14213

+14213
+14214
+14215
+14216
+14217
+14218
+14219
+14220
+14221
+14222
+14223
+14224
+14225
+14226
+14227
+14228
+14229
+14230
+14231
+14232
+14233
+14234
+14235
+14236
+14237
+14238
+14239
+14240
+14241
+14242
+14243
+14244

     

     
-      
# File 'lib/kettle/jem.rb', line 14181
+      
# File 'lib/kettle/jem.rb', line 14212
 
 def recipe_run_stats(recipe_reports, diagnostics: [])
   stats = {
@@ -76302,20 +76314,20 @@ 

       
 
 
-14215
-14216
-14217
-14218
-14219
-14220
-14221
-14222
-14223
-14224
-14225

+14246
+14247
+14248
+14249
+14250
+14251
+14252
+14253
+14254
+14255
+14256

     

     
-      
# File 'lib/kettle/jem.rb', line 14215
+      
# File 'lib/kettle/jem.rb', line 14246
 
 def recipe_run_stats_summary(stats)
   [
@@ -76348,19 +76360,19 @@ 

       
 
 
-13465
-13466
-13467
-13468
-13469
-13470
-13471
-13472
-13473
-13474

+13496
+13497
+13498
+13499
+13500
+13501
+13502
+13503
+13504
+13505

     

     
-      
# File 'lib/kettle/jem.rb', line 13465
+      
# File 'lib/kettle/jem.rb', line 13496
 
 def recipe_runtime_context(recipe, facts, deletion)
   context = deep_dup(facts)
@@ -76392,17 +76404,17 @@ 

       
 
 
-7104
-7105
-7106
-7107
-7108
-7109
-7110
-7111

+7135
+7136
+7137
+7138
+7139
+7140
+7141
+7142

     

     
-      
# File 'lib/kettle/jem.rb', line 7104
+      
# File 'lib/kettle/jem.rb', line 7135
 
 def recipe_template_content(project_root, recipe, template_contents: nil)
   path = recipe_template_content_path(project_root, recipe)
@@ -76432,18 +76444,18 @@ 

       
 
 
-7113
-7114
-7115
-7116
-7117
-7118
-7119
-7120
-7121

+7144
+7145
+7146
+7147
+7148
+7149
+7150
+7151
+7152

     

     
-      
# File 'lib/kettle/jem.rb', line 7113
+      
# File 'lib/kettle/jem.rb', line 7144
 
 def recipe_template_content_path(project_root, recipe)
   return unless TEMPLATE_CONTENT_PRIMITIVES.include?(recipe.fetch(:primitive))
@@ -76474,33 +76486,33 @@ 

       
 
 
-16462
-16463
-16464
-16465
-16466
-16467
-16468
-16469
-16470
-16471
-16472
-16473
-16474
-16475
-16476
-16477
-16478
-16479
-16480
-16481
-16482
-16483
-16484
-16485

+16494
+16495
+16496
+16497
+16498
+16499
+16500
+16501
+16502
+16503
+16504
+16505
+16506
+16507
+16508
+16509
+16510
+16511
+16512
+16513
+16514
+16515
+16516
+16517

     

     
-      
# File 'lib/kettle/jem.rb', line 16462
+      
# File 'lib/kettle/jem.rb', line 16494
 
 def reconcile_existing_version_namespace(project_root, entrypoint_path, version_path, namespace)
   namespace = namespace.to_s
@@ -76546,42 +76558,42 @@ 

 
 
-9956
-9957
-9958
-9959
-9960
-9961
-9962
-9963
-9964
-9965
-9966
-9967
-9968
-9969
-9970
-9971
-9972
-9973
-9974
-9975
-9976
-9977
-9978
-9979
-9980
-9981
-9982
-9983
-9984
-9985
-9986
 9987
-9988

+9988
+9989
+9990
+9991
+9992
+9993
+9994
+9995
+9996
+9997
+9998
+9999
+10000
+10001
+10002
+10003
+10004
+10005
+10006
+10007
+10008
+10009
+10010
+10011
+10012
+10013
+10014
+10015
+10016
+10017
+10018
+10019

     		
     
-      
# File 'lib/kettle/jem.rb', line 9956
+      
# File 'lib/kettle/jem.rb', line 9987
 
 def reconcile_template_managed_dependencies(source)
   replacements = ruby_call_records(source, nil).filter_map do |call|
@@ -76636,24 +76648,24 @@ 

       
 
 
-13984
-13985
-13986
-13987
-13988
-13989
-13990
-13991
-13992
-13993
-13994
-13995
-13996
-13997
-13998

+14015
+14016
+14017
+14018
+14019
+14020
+14021
+14022
+14023
+14024
+14025
+14026
+14027
+14028
+14029

     

     
-      
# File 'lib/kettle/jem.rb', line 13984
+      
# File 'lib/kettle/jem.rb', line 14015
 
 def record_file_work_execution_stats(stats, units:, workers:, thread_workers:)
   return unless stats
@@ -76690,12 +76702,12 @@ 

       
 
 
-4769
-4770
-4771

+4798
+4799
+4800

     

     
-      
# File 'lib/kettle/jem.rb', line 4769
+      
# File 'lib/kettle/jem.rb', line 4798
 
 def record_phase_timing(events, phase, status:, duration_ms:, payload:)
   Kettle::Ndjson.record_phase_timing(events, phase, status: status, duration_ms: duration_ms, payload: payload)
@@ -76720,22 +76732,22 @@ 

       
 
 
-4521
-4522
-4523
-4524
-4525
-4526
-4527
-4528
-4529
-4530
-4531
-4532
-4533

+4550
+4551
+4552
+4553
+4554
+4555
+4556
+4557
+4558
+4559
+4560
+4561
+4562

     

     
-      
# File 'lib/kettle/jem.rb', line 4521
+      
# File 'lib/kettle/jem.rb', line 4550
 
 def record_recipe_planning_execution_stats(stats, worker_safe:, main_only:, worker_count:, spawned:, ractor_recipes:, thread_worker_count:, thread_spawns:, thread_recipes:, main_recipes:)
   return unless stats
@@ -76793,20 +76805,20 @@ 

 
 
-8864
-8865
-8866
-8867
-8868
-8869
-8870
-8871
-8872
-8873
-8874

+8895
+8896
+8897
+8898
+8899
+8900
+8901
+8902
+8903
+8904
+8905

     		
     
-      
# File 'lib/kettle/jem.rb', line 8864
+      
# File 'lib/kettle/jem.rb', line 8895
 
 def redundant_templating_guard_wrapper_node?(node)
   return false unless gemfile_conditional_node?(node)
@@ -76839,22 +76851,22 @@ 

 
 
-12718
-12719
-12720
-12721
-12722
-12723
-12724
-12725
-12726
-12727
-12728
-12729
-12730

+12749
+12750
+12751
+12752
+12753
+12754
+12755
+12756
+12757
+12758
+12759
+12760
+12761

     		
     
-      
# File 'lib/kettle/jem.rb', line 12718
+      
# File 'lib/kettle/jem.rb', line 12749
 
 def remove_duplicate_comment_span_before_marker(content, start_marker:, end_marker:)
   lines = content.to_s.lines
@@ -76901,16 +76913,16 @@ 

 
 
-12696
-12697
-12698
-12699
-12700
-12701
-12702

+12727
+12728
+12729
+12730
+12731
+12732
+12733

     		
     
-      
# File 'lib/kettle/jem.rb', line 12696
+      
# File 'lib/kettle/jem.rb', line 12727
 
 def remove_duplicate_framework_matrix_documentation(content)
   remove_duplicate_comment_span_before_marker(
@@ -76939,32 +76951,32 @@ 

       
 
 
-11154
-11155
-11156
-11157
-11158
-11159
-11160
-11161
-11162
-11163
-11164
-11165
-11166
-11167
-11168
-11169
-11170
-11171
-11172
-11173
-11174
-11175
-11176

+11185
+11186
+11187
+11188
+11189
+11190
+11191
+11192
+11193
+11194
+11195
+11196
+11197
+11198
+11199
+11200
+11201
+11202
+11203
+11204
+11205
+11206
+11207

     

     
-      
# File 'lib/kettle/jem.rb', line 11154
+      
# File 'lib/kettle/jem.rb', line 11185
 
 def remove_duplicate_gemspec_assignments(content, receiver:, fields:)
   wanted = fields.map(&:to_s).to_set
@@ -77021,21 +77033,21 @@ 

 
 
-12048
-12049
-12050
-12051
-12052
-12053
-12054
-12055
-12056
-12057
-12058
-12059

+12079
+12080
+12081
+12082
+12083
+12084
+12085
+12086
+12087
+12088
+12089
+12090

     		
     
-      
# File 'lib/kettle/jem.rb', line 12048
+      
# File 'lib/kettle/jem.rb', line 12079
 
 def remove_duplicate_gemspec_dependency_lines(content, receiver:)
   seen = Set.new
@@ -77069,22 +77081,22 @@ 

 
 
-12704
-12705
-12706
-12707
-12708
-12709
-12710
-12711
-12712
-12713
-12714
-12715
-12716

+12735
+12736
+12737
+12738
+12739
+12740
+12741
+12742
+12743
+12744
+12745
+12746
+12747

     		
     
-      
# File 'lib/kettle/jem.rb', line 12704
+      
# File 'lib/kettle/jem.rb', line 12735
 
 def remove_duplicate_readme_preservation_documentation(content)
   lines = content.to_s.lines
@@ -77119,17 +77131,17 @@ 

 
 
-8654
-8655
-8656
-8657
-8658
-8659
-8660
-8661

+8685
+8686
+8687
+8688
+8689
+8690
+8691
+8692

     		
     
-      
# File 'lib/kettle/jem.rb', line 8654
+      
# File 'lib/kettle/jem.rb', line 8685
 
 def remove_duplicate_simplecov_do_cov_bootstrap_blocks(content)
   records = simplecov_do_cov_bootstrap_records(content)
@@ -77159,17 +77171,17 @@ 

       
 
 
-8749
-8750
-8751
-8752
-8753
-8754
-8755
-8756

+8780
+8781
+8782
+8783
+8784
+8785
+8786
+8787

     

     
-      
# File 'lib/kettle/jem.rb', line 8749
+      
# File 'lib/kettle/jem.rb', line 8780
 
 def remove_duplicate_simplecov_requires(content)
   records = simplecov_require_call_records(content)
@@ -77199,15 +77211,15 @@ 

 
 
-12061
-12062
-12063
-12064
-12065
-12066

+12092
+12093
+12094
+12095
+12096
+12097

     		
     
-      
# File 'lib/kettle/jem.rb', line 12061
+      
# File 'lib/kettle/jem.rb', line 12092
 
 def remove_empty_gemspec_development_dependency_section_headings(content, receiver:)
   ensure_runtime_dependencies!
@@ -77235,25 +77247,25 @@ 

       
 
 
-16227
-16228
-16229
-16230
-16231
-16232
-16233
-16234
-16235
-16236
-16237
-16238
-16239
-16240
-16241
-16242

+16259
+16260
+16261
+16262
+16263
+16264
+16265
+16266
+16267
+16268
+16269
+16270
+16271
+16272
+16273
+16274

     

     
-      
# File 'lib/kettle/jem.rb', line 16227
+      
# File 'lib/kettle/jem.rb', line 16259
 
 def remove_entrypoint_version_requires(content, relative_path:, absolute_path:)
   selectors = [
@@ -77291,27 +77303,27 @@ 

 
 
-6578
-6579
-6580
-6581
-6582
-6583
-6584
-6585
-6586
-6587
-6588
-6589
-6590
-6591
-6592
-6593
-6594
-6595

+6609
+6610
+6611
+6612
+6613
+6614
+6615
+6616
+6617
+6618
+6619
+6620
+6621
+6622
+6623
+6624
+6625
+6626

     		
     
-      
# File 'lib/kettle/jem.rb', line 6578
+      
# File 'lib/kettle/jem.rb', line 6609
 
 def remove_excluded_changelog_transfer_entries(content, excluded_keys)
   excluded = Array(excluded_keys).map(&:to_s).reject(&:empty?).to_set
@@ -77351,26 +77363,26 @@ 

       
 
 
-9606
-9607
-9608
-9609
-9610
-9611
-9612
-9613
-9614
-9615
-9616
-9617
-9618
-9619
-9620
-9621
-9622

+9637
+9638
+9639
+9640
+9641
+9642
+9643
+9644
+9645
+9646
+9647
+9648
+9649
+9650
+9651
+9652
+9653

     

     
-      
# File 'lib/kettle/jem.rb', line 9606
+      
# File 'lib/kettle/jem.rb', line 9637
 
 def remove_gemfile_dependency_blocks(content, gem_names)
   names = gem_names.map(&:to_s).reject(&:empty?).uniq
@@ -77409,22 +77421,22 @@ 

       
 
 
-9592
-9593
-9594
-9595
-9596
-9597
-9598
-9599
-9600
-9601
-9602
-9603
-9604

+9623
+9624
+9625
+9626
+9627
+9628
+9629
+9630
+9631
+9632
+9633
+9634
+9635

     

     
-      
# File 'lib/kettle/jem.rb', line 9592
+      
# File 'lib/kettle/jem.rb', line 9623
 
 def remove_gemfile_dependency_lines(content, gem_names)
   names = gem_names.map(&:to_s).reject(&:empty?).uniq
@@ -77459,29 +77471,29 @@ 

       
 
 
-10055
-10056
-10057
-10058
-10059
-10060
-10061
-10062
-10063
-10064
-10065
-10066
-10067
-10068
-10069
-10070
-10071
-10072
-10073
-10074

+10086
+10087
+10088
+10089
+10090
+10091
+10092
+10093
+10094
+10095
+10096
+10097
+10098
+10099
+10100
+10101
+10102
+10103
+10104
+10105

     

     
-      
# File 'lib/kettle/jem.rb', line 10055
+      
# File 'lib/kettle/jem.rb', line 10086
 
 def remove_gemfile_percent_w_entries(content, gem_names)
   names = gem_names.map(&:to_s).reject(&:empty?).uniq
@@ -77523,17 +77535,17 @@ 

       
 
 
-11089
-11090
-11091
-11092
-11093
-11094
-11095
-11096

+11120
+11121
+11122
+11123
+11124
+11125
+11126
+11127

     

     
-      
# File 'lib/kettle/jem.rb', line 11089
+      
# File 'lib/kettle/jem.rb', line 11120
 
 def remove_gemspec_assignment(content, receiver:, field:)
   records_by_line = gemspec_assignment_records(content, receiver: receiver)
@@ -77563,20 +77575,20 @@ 

       
 
 
-11098
-11099
-11100
-11101
-11102
-11103
-11104
-11105
-11106
-11107
-11108

+11129
+11130
+11131
+11132
+11133
+11134
+11135
+11136
+11137
+11138
+11139

     

     
-      
# File 'lib/kettle/jem.rb', line 11098
+      
# File 'lib/kettle/jem.rb', line 11129
 
 def remove_gemspec_dependency_lines(content, receiver:, names:, runtime_only: false, development_only: false)
   wanted = names.map(&:to_s).to_set
@@ -77609,28 +77621,28 @@ 

 
 
-12025
-12026
-12027
-12028
-12029
-12030
-12031
-12032
-12033
-12034
-12035
-12036
-12037
-12038
-12039
-12040
-12041
-12042
-12043

+12056
+12057
+12058
+12059
+12060
+12061
+12062
+12063
+12064
+12065
+12066
+12067
+12068
+12069
+12070
+12071
+12072
+12073
+12074

     		
     
-      
# File 'lib/kettle/jem.rb', line 12025
+      
# File 'lib/kettle/jem.rb', line 12056
 
 def remove_gemspec_development_dependencies_already_runtime(content, receiver:)
   records = gemspec_dependency_records(content, receiver: receiver)
@@ -77671,20 +77683,20 @@ 

 
 
-10891
-10892
-10893
-10894
-10895
-10896
-10897
-10898
-10899
-10900
-10901

+10922
+10923
+10924
+10925
+10926
+10927
+10928
+10929
+10930
+10931
+10932

     		
     
-      
# File 'lib/kettle/jem.rb', line 10891
+      
# File 'lib/kettle/jem.rb', line 10922
 
 def remove_gemspec_legacy_version_loader_preamble(content)
   node = gemspec_top_level_gem_version_node(content)
@@ -77717,22 +77729,22 @@ 

       
 
 
-12208
-12209
-12210
-12211
-12212
-12213
-12214
-12215
-12216
-12217
-12218
-12219
-12220

+12239
+12240
+12241
+12242
+12243
+12244
+12245
+12246
+12247
+12248
+12249
+12250
+12251

     

     
-      
# File 'lib/kettle/jem.rb', line 12208
+      
# File 'lib/kettle/jem.rb', line 12239
 
 def remove_gemspec_self_dependency_lines(content, package_name, receiver:)
   name = package_name.to_s
@@ -77767,16 +77779,16 @@ 

 
 
-11077
-11078
-11079
-11080
-11081
-11082
-11083

+11108
+11109
+11110
+11111
+11112
+11113
+11114

     		
     
-      
# File 'lib/kettle/jem.rb', line 11077
+      
# File 'lib/kettle/jem.rb', line 11108
 
 def remove_gemspec_version_gem_dependency_when_disabled(content, facts, receiver:, template_declares_version_gem: false)
   return content if version_gem_enabled?(facts)
@@ -77805,13 +77817,13 @@ 

       
 
 
-7398
-7399
-7400
-7401

+7429
+7430
+7431
+7432

     

     
-      
# File 'lib/kettle/jem.rb', line 7398
+      
# File 'lib/kettle/jem.rb', line 7429
 
 def remove_line_ranges(content, ranges)
   delete_lines = ranges.flat_map(&:to_a).to_set
@@ -77837,16 +77849,16 @@ 

       
 
 
-10260
-10261
-10262
-10263
-10264
-10265
-10266

+10291
+10292
+10293
+10294
+10295
+10296
+10297

     

     
-      
# File 'lib/kettle/jem.rb', line 10260
+      
# File 'lib/kettle/jem.rb', line 10291
 
 def remove_managed_stdlib_appraisal_gems(content)
   parsed = appraisal_blocks(content)
@@ -77875,25 +77887,25 @@ 

 
 
-10268
-10269
-10270
-10271
-10272
-10273
-10274
-10275
-10276
-10277
-10278
-10279
-10280
-10281
-10282
-10283

+10299
+10300
+10301
+10302
+10303
+10304
+10305
+10306
+10307
+10308
+10309
+10310
+10311
+10312
+10313
+10314

     		
     
-      
# File 'lib/kettle/jem.rb', line 10268
+      
# File 'lib/kettle/jem.rb', line 10299
 
 def remove_managed_stdlib_gems_from_appraisal_block(block)
   return block unless appraisal_x_stdlib_eval_gemfile_call(block)
@@ -77931,22 +77943,22 @@ 

 
 
-8971
-8972
-8973
-8974
-8975
-8976
-8977
-8978
-8979
-8980
-8981
-8982
-8983

+9002
+9003
+9004
+9005
+9006
+9007
+9008
+9009
+9010
+9011
+9012
+9013
+9014

     		
     
-      
# File 'lib/kettle/jem.rb', line 8971
+      
# File 'lib/kettle/jem.rb', line 9002
 
 def remove_obsolete_local_gemfile_nomono_activation(content)
   records = obsolete_local_gemfile_nomono_activation_records(content)
@@ -77981,17 +77993,17 @@ 

 
 
-12602
-12603
-12604
-12605
-12606
-12607
-12608
-12609

+12633
+12634
+12635
+12636
+12637
+12638
+12639
+12640

     		
     
-      
# File 'lib/kettle/jem.rb', line 12602
+      
# File 'lib/kettle/jem.rb', line 12633
 
 def remove_obsolete_simplecov_keep_destination_config(content)
   config = YAML.safe_load(content.to_s, permitted_classes: [], aliases: true) || {}
@@ -78021,17 +78033,17 @@ 

 
 
-8601
-8602
-8603
-8604
-8605
-8606
-8607
-8608

+8632
+8633
+8634
+8635
+8636
+8637
+8638
+8639

     		
     
-      
# File 'lib/kettle/jem.rb', line 8601
+      
# File 'lib/kettle/jem.rb', line 8632
 
 def remove_obsolete_simplecov_rescue_bootstrap_blocks(content)
   records = obsolete_simplecov_rescue_bootstrap_records(content)
@@ -78061,15 +78073,15 @@ 

       
 
 
-7652
-7653
-7654
-7655
-7656
-7657

+7683
+7684
+7685
+7686
+7687
+7688

     

     
-      
# File 'lib/kettle/jem.rb', line 7652
+      
# File 'lib/kettle/jem.rb', line 7683
 
 def remove_readme_badge_and_refs(content, badge_source, link_labels)
   ensure_runtime_dependencies!
@@ -78097,22 +78109,22 @@ 

       
 
 
-7921
-7922
-7923
-7924
-7925
-7926
-7927
-7928
-7929
-7930
-7931
-7932
-7933

+7952
+7953
+7954
+7955
+7956
+7957
+7958
+7959
+7960
+7961
+7962
+7963
+7964

     

     
-      
# File 'lib/kettle/jem.rb', line 7921
+      
# File 'lib/kettle/jem.rb', line 7952
 
 def remove_readme_sections(content, section_bases)
   bases = section_bases.map { |section| normalize_readme_heading(section) }.uniq
@@ -78147,22 +78159,22 @@ 

       
 
 
-11110
-11111
-11112
-11113
-11114
-11115
-11116
-11117
-11118
-11119
-11120
-11121
-11122

+11141
+11142
+11143
+11144
+11145
+11146
+11147
+11148
+11149
+11150
+11151
+11152
+11153

     

     
-      
# File 'lib/kettle/jem.rb', line 11110
+      
# File 'lib/kettle/jem.rb', line 11141
 
 def remove_ruby_comment_lines_containing(content, text)
   result = prism_parse_success(content)
@@ -78197,19 +78209,19 @@ 

       
 
 
-5122
-5123
-5124
-5125
-5126
-5127
-5128
-5129
-5130
-5131

+5151
+5152
+5153
+5154
+5155
+5156
+5157
+5158
+5159
+5160

     

     
-      
# File 'lib/kettle/jem.rb', line 5122
+      
# File 'lib/kettle/jem.rb', line 5151
 
 def remove_stale_executable_startup_header(content, header)
   replacements = header.values.map do |node|
@@ -78241,27 +78253,27 @@ 

 
 
-5381
-5382
-5383
-5384
-5385
-5386
-5387
-5388
-5389
-5390
-5391
-5392
-5393
-5394
-5395
-5396
-5397
-5398

+5412
+5413
+5414
+5415
+5416
+5417
+5418
+5419
+5420
+5421
+5422
+5423
+5424
+5425
+5426
+5427
+5428
+5429

     		
     
-      
# File 'lib/kettle/jem.rb', line 5381
+      
# File 'lib/kettle/jem.rb', line 5412
 
 def remove_stale_gemspec_file_override_blocks!(lines, files_index, gemspec)
   index = files_index + 1
@@ -78301,21 +78313,21 @@ 

 
 
-10754
-10755
-10756
-10757
-10758
-10759
-10760
-10761
-10762
-10763
-10764
-10765

+10785
+10786
+10787
+10788
+10789
+10790
+10791
+10792
+10793
+10794
+10795
+10796

     		
     
-      
# File 'lib/kettle/jem.rb', line 10754
+      
# File 'lib/kettle/jem.rb', line 10785
 
 def remove_stale_generated_gemspec_homepage_replacement(replacements, destination_content, facts, receiver:)
   desired_homepage = facts.to_h.dig(:package, :homepage_url).to_s
@@ -78349,24 +78361,24 @@ 

 
 
-8125
-8126
-8127
-8128
-8129
-8130
-8131
-8132
-8133
-8134
-8135
-8136
-8137
-8138
-8139

+8156
+8157
+8158
+8159
+8160
+8161
+8162
+8163
+8164
+8165
+8166
+8167
+8168
+8169
+8170

     		
     
-      
# File 'lib/kettle/jem.rb', line 8125
+      
# File 'lib/kettle/jem.rb', line 8156
 
 def remove_stale_main_gemfile_direct_sibling_block(content, template_content)
   return content if template_content.to_s.include?("direct_sibling_gems = %w[")
@@ -78403,24 +78415,24 @@ 

 
 
-8109
-8110
-8111
-8112
-8113
-8114
-8115
-8116
-8117
-8118
-8119
-8120
-8121
-8122
-8123

+8140
+8141
+8142
+8143
+8144
+8145
+8146
+8147
+8148
+8149
+8150
+8151
+8152
+8153
+8154

     		
     
-      
# File 'lib/kettle/jem.rb', line 8109
+      
# File 'lib/kettle/jem.rb', line 8140
 
 def remove_stale_main_gemfile_tree_sitter_language_pack(content, template_content)
   return content if gemfile_declares_direct_gem?(template_content, "tree_sitter_language_pack")
@@ -78457,19 +78469,19 @@ 

       
 
 
-16244
-16245
-16246
-16247
-16248
-16249
-16250
-16251
-16252
-16253

+16276
+16277
+16278
+16279
+16280
+16281
+16282
+16283
+16284
+16285

     

     
-      
# File 'lib/kettle/jem.rb', line 16244
+      
# File 'lib/kettle/jem.rb', line 16276
 
 def remove_top_level_ruby_require(content, argument)
   selectors = top_level_ruby_call_records(content, :require).filter_map do |call|
@@ -78501,29 +78513,29 @@ 

       
 
 
-19368
-19369
-19370
-19371
-19372
-19373
-19374
-19375
-19376
-19377
-19378
-19379
-19380
-19381
-19382
-19383
-19384
-19385
-19386
-19387

+19401
+19402
+19403
+19404
+19405
+19406
+19407
+19408
+19409
+19410
+19411
+19412
+19413
+19414
+19415
+19416
+19417
+19418
+19419
+19420

     

     
-      
# File 'lib/kettle/jem.rb', line 19368
+      
# File 'lib/kettle/jem.rb', line 19401
 
 def remove_top_level_yaml_key_lines(content, key)
   lines = content.to_s.lines
@@ -78565,15 +78577,15 @@ 

 
 
-16268
-16269
-16270
-16271
-16272
-16273

+16300
+16301
+16302
+16303
+16304
+16305

     		
     
-      
# File 'lib/kettle/jem.rb', line 16268
+      
# File 'lib/kettle/jem.rb', line 16300
 
 def remove_version_gem_class_eval_references(content)
   selectors = version_gem_class_eval_selectors(content)
@@ -78601,21 +78613,21 @@ 

 
 
-16255
-16256
-16257
-16258
-16259
-16260
-16261
-16262
-16263
-16264
-16265
-16266

+16287
+16288
+16289
+16290
+16291
+16292
+16293
+16294
+16295
+16296
+16297
+16298

     		
     
-      
# File 'lib/kettle/jem.rb', line 16255
+      
# File 'lib/kettle/jem.rb', line 16287
 
 def remove_version_gem_entrypoint_references(content)
   selectors = []
@@ -78649,14 +78661,14 @@ 

       
 
 
-15900
-15901
-15902
-15903
-15904

+15932
+15933
+15934
+15935
+15936

     

     
-      
# File 'lib/kettle/jem.rb', line 15900
+      
# File 'lib/kettle/jem.rb', line 15932
 
 def remove_version_gem_shared_example(content)
   content.to_s.lines.reject do |line|
@@ -78683,18 +78695,18 @@ 

       
 
 
-9829
-9830
-9831
-9832
-9833
-9834
-9835
-9836
-9837

+9860
+9861
+9862
+9863
+9864
+9865
+9866
+9867
+9868

     

     
-      
# File 'lib/kettle/jem.rb', line 9829
+      
# File 'lib/kettle/jem.rb', line 9860
 
 def remove_x_std_lib_eval_for_gem(content, gem_name)
   records = ruby_call_records(content, :eval_gemfile).filter_map do |call|
@@ -78725,20 +78737,20 @@ 

       
 
 
-12849
-12850
-12851
-12852
-12853
-12854
-12855
-12856
-12857
-12858
-12859

+12880
+12881
+12882
+12883
+12884
+12885
+12886
+12887
+12888
+12889
+12890

     

     
-      
# File 'lib/kettle/jem.rb', line 12849
+      
# File 'lib/kettle/jem.rb', line 12880
 
 def remove_yaml_mapping_path(content, path)
   lines = content.to_s.lines
@@ -78771,19 +78783,19 @@ 

       
 
 
-12805
-12806
-12807
-12808
-12809
-12810
-12811
-12812
-12813
-12814

+12836
+12837
+12838
+12839
+12840
+12841
+12842
+12843
+12844
+12845

     

     
-      
# File 'lib/kettle/jem.rb', line 12805
+      
# File 'lib/kettle/jem.rb', line 12836
 
 def remove_yaml_scalar_path(content, path)
   lines = content.to_s.lines
@@ -78815,47 +78827,47 @@ 

       
 
 
-5888
-5889
-5890
-5891
-5892
-5893
-5894
-5895
-5896
-5897
-5898
-5899
-5900
-5901
-5902
-5903
-5904
-5905
-5906
-5907
-5908
-5909
-5910
-5911
-5912
-5913
-5914
-5915
-5916
-5917
-5918
 5919
 5920
 5921
 5922
 5923
 5924
-5925

+5925
+5926
+5927
+5928
+5929
+5930
+5931
+5932
+5933
+5934
+5935
+5936
+5937
+5938
+5939
+5940
+5941
+5942
+5943
+5944
+5945
+5946
+5947
+5948
+5949
+5950
+5951
+5952
+5953
+5954
+5955
+5956

     

     
-      
# File 'lib/kettle/jem.rb', line 5888
+      
# File 'lib/kettle/jem.rb', line 5919
 
 def render_thin_readme(facts, readme_style, original, preserve_config)
   package = facts.fetch(:package)
@@ -78915,16 +78927,16 @@ 

 
 
-20258
-20259
-20260
-20261
-20262
-20263
-20264

+20294
+20295
+20296
+20297
+20298
+20299
+20300

     		
     
-      
# File 'lib/kettle/jem.rb', line 20258
+      
# File 'lib/kettle/jem.rb', line 20294
 
 def replace_existing_markdown_managed_block(content, marker, replacement)
   open = "<!-- #{marker}:start -->"
@@ -78953,20 +78965,20 @@ 

       
 
 
-11793
-11794
-11795
-11796
-11797
-11798
-11799
-11800
-11801
-11802
-11803

+11824
+11825
+11826
+11827
+11828
+11829
+11830
+11831
+11832
+11833
+11834

     

     
-      
# File 'lib/kettle/jem.rb', line 11793
+      
# File 'lib/kettle/jem.rb', line 11824
 
 def replace_gemspec_assignment_sources(content, replacements, receiver:)
   return content if replacements.empty?
@@ -78999,19 +79011,19 @@ 

       
 
 
-10799
-10800
-10801
-10802
-10803
-10804
-10805
-10806
-10807
-10808

+10830
+10831
+10832
+10833
+10834
+10835
+10836
+10837
+10838
+10839

     

     
-      
# File 'lib/kettle/jem.rb', line 10799
+      
# File 'lib/kettle/jem.rb', line 10830
 
 def replace_gemspec_version_assignment(content, receiver:, rhs:)
   replacement = "#{receiver}.version = #{rhs}"
@@ -79043,12 +79055,12 @@ 

       
 
 
-20141
-20142
-20143

+20177
+20178
+20179

     

     
-      
# File 'lib/kettle/jem.rb', line 20141
+      
# File 'lib/kettle/jem.rb', line 20177
 
 def replace_github_workflow_action_pin_sha(line, sha)
   line.to_s.sub(/@[a-f0-9]{40}/, "@#{sha}")
@@ -79096,16 +79108,16 @@ 

 
 
-12481
-12482
-12483
-12484
-12485
-12486
-12487

+12512
+12513
+12514
+12515
+12516
+12517
+12518

     		
     
-      
# File 'lib/kettle/jem.rb', line 12481
+      
# File 'lib/kettle/jem.rb', line 12512
 
 def replace_kettle_config_bootstrap_licenses(content, licenses)
   license_block = ["licenses:", *licenses.map { |license_id| "  - #{license_id}" }].join("\n")
@@ -79157,15 +79169,15 @@ 

 
 
-12474
-12475
-12476
-12477
-12478
-12479

+12505
+12506
+12507
+12508
+12509
+12510

     		
     
-      
# File 'lib/kettle/jem.rb', line 12474
+      
# File 'lib/kettle/jem.rb', line 12505
 
 def replace_kettle_config_bootstrap_project_emoji(content, emoji)
   updated = replace_yaml_scalar_line(content, "project_emoji", emoji.to_s)
@@ -79193,19 +79205,19 @@ 

 
 
-12489
-12490
-12491
-12492
-12493
-12494
-12495
-12496
-12497
-12498

+12520
+12521
+12522
+12523
+12524
+12525
+12526
+12527
+12528
+12529

     		
     
-      
# File 'lib/kettle/jem.rb', line 12489
+      
# File 'lib/kettle/jem.rb', line 12520
 
 def replace_kettle_config_bootstrap_rubyforum(content, rubyforum)
   updated = content
@@ -79237,12 +79249,12 @@ 

       
 
 
-9070
-9071
-9072

+9101
+9102
+9103

     

     
-      
# File 'lib/kettle/jem.rb', line 9070
+      
# File 'lib/kettle/jem.rb', line 9101
 
 def replace_local_gems_assignment(content, gems)
   replace_word_array_assignment(content, :local_gems, gems)
@@ -79267,16 +79279,16 @@ 

       
 
 
-20250
-20251
-20252
-20253
-20254
-20255
-20256

+20286
+20287
+20288
+20289
+20290
+20291
+20292

     

     
-      
# File 'lib/kettle/jem.rb', line 20250
+      
# File 'lib/kettle/jem.rb', line 20286
 
 def replace_markdown_managed_block(content, marker, replacement)
   open = "<!-- #{marker}:start -->"
@@ -79305,28 +79317,28 @@ 

 
 
-20278
-20279
-20280
-20281
-20282
-20283
-20284
-20285
-20286
-20287
-20288
-20289
-20290
-20291
-20292
-20293
-20294
-20295
-20296

+20314
+20315
+20316
+20317
+20318
+20319
+20320
+20321
+20322
+20323
+20324
+20325
+20326
+20327
+20328
+20329
+20330
+20331
+20332

     		
     
-      
# File 'lib/kettle/jem.rb', line 20278
+      
# File 'lib/kettle/jem.rb', line 20314
 
 def replace_markdown_managed_block_with_crispr(content, open_marker, close_marker, replacement)
   ensure_runtime_dependencies!
@@ -79367,18 +79379,18 @@ 

       
 
 
-7788
-7789
-7790
-7791
-7792
-7793
-7794
-7795
-7796

+7819
+7820
+7821
+7822
+7823
+7824
+7825
+7826
+7827

     

     
-      
# File 'lib/kettle/jem.rb', line 7788
+      
# File 'lib/kettle/jem.rb', line 7819
 
 def replace_markdown_with_ast_crispr(content, target, replacement)
   ensure_runtime_dependencies!
@@ -79409,16 +79421,16 @@ 

 
 
-11891
-11892
-11893
-11894
-11895
-11896
-11897

+11922
+11923
+11924
+11925
+11926
+11927
+11928

     		
     
-      
# File 'lib/kettle/jem.rb', line 11891
+      
# File 'lib/kettle/jem.rb', line 11922
 
 def replace_matching_gemspec_dependency_lines(content, destination_dependencies, receiver:)
   records_by_line = gemspec_dependency_records(content, receiver: receiver).each_with_object({}) do |record, index|
@@ -79447,26 +79459,26 @@ 

       
 
 
-12322
-12323
-12324
-12325
-12326
-12327
-12328
-12329
-12330
-12331
-12332
-12333
-12334
-12335
-12336
-12337
-12338

+12353
+12354
+12355
+12356
+12357
+12358
+12359
+12360
+12361
+12362
+12363
+12364
+12365
+12366
+12367
+12368
+12369

     

     
-      
# File 'lib/kettle/jem.rb', line 12322
+      
# File 'lib/kettle/jem.rb', line 12353
 
 def replace_record_ranges(content, records_by_line)
   return content if records_by_line.empty?
@@ -79505,14 +79517,14 @@ 

       
 
 
-20272
-20273
-20274
-20275
-20276

+20308
+20309
+20310
+20311
+20312

     

     
-      
# File 'lib/kettle/jem.rb', line 20272
+      
# File 'lib/kettle/jem.rb', line 20308
 
 def replace_ruby_managed_block(content, replacement)
   replace_ruby_managed_block_with_crispr(content, MANAGED_BLOCK_OPEN, MANAGED_BLOCK_CLOSE, replacement) do
@@ -79539,28 +79551,28 @@ 

       
 
 
-20317
-20318
-20319
-20320
-20321
-20322
-20323
-20324
-20325
-20326
-20327
-20328
-20329
-20330
-20331
-20332
-20333
-20334
-20335

+20353
+20354
+20355
+20356
+20357
+20358
+20359
+20360
+20361
+20362
+20363
+20364
+20365
+20366
+20367
+20368
+20369
+20370
+20371

     

     
-      
# File 'lib/kettle/jem.rb', line 20317
+      
# File 'lib/kettle/jem.rb', line 20353
 
 def replace_ruby_managed_block_with_crispr(content, open_marker, close_marker, replacement)
   ensure_runtime_dependencies!
@@ -79601,15 +79613,15 @@ 

       
 
 
-10130
-10131
-10132
-10133
-10134
-10135

+10161
+10162
+10163
+10164
+10165
+10166

     

     
-      
# File 'lib/kettle/jem.rb', line 10130
+      
# File 'lib/kettle/jem.rb', line 10161
 
 def replace_source_byte_range(content, start_offset, end_offset, replacement)
   source = content.to_s
@@ -79637,21 +79649,21 @@ 

       
 
 
-10117
-10118
-10119
-10120
-10121
-10122
-10123
-10124
-10125
-10126
-10127
-10128

+10148
+10149
+10150
+10151
+10152
+10153
+10154
+10155
+10156
+10157
+10158
+10159

     

     
-      
# File 'lib/kettle/jem.rb', line 10117
+      
# File 'lib/kettle/jem.rb', line 10148
 
 def replace_source_offsets(content, replacements)
   output = content.to_s.dup
@@ -79685,12 +79697,12 @@ 

       
 
 
-12340
-12341
-12342

+12371
+12372
+12373

     

     
-      
# File 'lib/kettle/jem.rb', line 12340
+      
# File 'lib/kettle/jem.rb', line 12371
 
 def replace_source_range_lines(content, start_line, end_line, replacement)
   replace_record_ranges(content, {start_line => {end_line: end_line, replacement: replacement}})
@@ -79715,14 +79727,14 @@ 

       
 
 
-20266
-20267
-20268
-20269
-20270

+20302
+20303
+20304
+20305
+20306

     

     
-      
# File 'lib/kettle/jem.rb', line 20266
+      
# File 'lib/kettle/jem.rb', line 20302
 
 def replace_text_managed_block(content, replacement)
   replace_text_managed_block_with_crispr(content, MANAGED_BLOCK_OPEN, MANAGED_BLOCK_CLOSE, replacement) do
@@ -79749,27 +79761,27 @@ 

       
 
 
-20298
-20299
-20300
-20301
-20302
-20303
-20304
-20305
-20306
-20307
-20308
-20309
-20310
-20311
-20312
-20313
-20314
-20315

+20334
+20335
+20336
+20337
+20338
+20339
+20340
+20341
+20342
+20343
+20344
+20345
+20346
+20347
+20348
+20349
+20350
+20351

     

     
-      
# File 'lib/kettle/jem.rb', line 20298
+      
# File 'lib/kettle/jem.rb', line 20334
 
 def replace_text_managed_block_with_crispr(content, open_marker, close_marker, replacement)
   ensure_runtime_dependencies!
@@ -79809,20 +79821,20 @@ 

       
 
 
-7330
-7331
-7332
-7333
-7334
-7335
-7336
-7337
-7338
-7339
-7340

+7361
+7362
+7363
+7364
+7365
+7366
+7367
+7368
+7369
+7370
+7371

     

     
-      
# File 'lib/kettle/jem.rb', line 7330
+      
# File 'lib/kettle/jem.rb', line 7361
 
 def replace_toml_string_scalar_line(content, key, value)
   lines = content.to_s.lines
@@ -79855,19 +79867,19 @@ 

       
 
 
-9082
-9083
-9084
-9085
-9086
-9087
-9088
-9089
-9090
-9091

+9113
+9114
+9115
+9116
+9117
+9118
+9119
+9120
+9121
+9122

     

     
-      
# File 'lib/kettle/jem.rb', line 9082
+      
# File 'lib/kettle/jem.rb', line 9113
 
 def replace_word_array_assignment(content, name, gems)
   replacement = ["#{name} = %w["]
@@ -79899,22 +79911,22 @@ 

       
 
 
-12908
-12909
-12910
-12911
-12912
-12913
-12914
-12915
-12916
-12917
-12918
-12919
-12920

+12939
+12940
+12941
+12942
+12943
+12944
+12945
+12946
+12947
+12948
+12949
+12950
+12951

     

     
-      
# File 'lib/kettle/jem.rb', line 12908
+      
# File 'lib/kettle/jem.rb', line 12939
 
 def replace_yaml_node_lines(content, key, replacement)
   lines = content.to_s.lines
@@ -79949,24 +79961,24 @@ 

       
 
 
-12500
-12501
-12502
-12503
-12504
-12505
-12506
-12507
-12508
-12509
-12510
-12511
-12512
-12513
-12514

+12531
+12532
+12533
+12534
+12535
+12536
+12537
+12538
+12539
+12540
+12541
+12542
+12543
+12544
+12545

     

     
-      
# File 'lib/kettle/jem.rb', line 12500
+      
# File 'lib/kettle/jem.rb', line 12531
 
 def replace_yaml_scalar_line(content, key, value)
   lines = content.to_s.lines
@@ -80003,25 +80015,25 @@ 

       
 
 
-12788
-12789
-12790
-12791
-12792
-12793
-12794
-12795
-12796
-12797
-12798
-12799
-12800
-12801
-12802
-12803

+12819
+12820
+12821
+12822
+12823
+12824
+12825
+12826
+12827
+12828
+12829
+12830
+12831
+12832
+12833
+12834

     

     
-      
# File 'lib/kettle/jem.rb', line 12788
+      
# File 'lib/kettle/jem.rb', line 12819
 
 def replace_yaml_scalar_path(content, path, value)
   lines = content.to_s.lines
@@ -80059,18 +80071,18 @@ 

 
 
-11380
-11381
-11382
-11383
-11384
-11385
-11386
-11387
-11388

+11411
+11412
+11413
+11414
+11415
+11416
+11417
+11418
+11419

     		
     
-      
# File 'lib/kettle/jem.rb', line 11380
+      
# File 'lib/kettle/jem.rb', line 11411
 
 def replacement_for_supported_gemspec_files_assignment(template_record:, destination_record:, template_receiver:)
   if generic_bundler_gemspec_files_assignment?(destination_record)
@@ -80101,14 +80113,14 @@ 

       
 
 
-4838
-4839
-4840
-4841
-4842

+4867
+4868
+4869
+4870
+4871

     

     
-      
# File 'lib/kettle/jem.rb', line 4838
+      
# File 'lib/kettle/jem.rb', line 4867
 
 def report_with_duration(report, duration_ms)
   report[:metadata] = report.fetch(:metadata, {}).merge(duration_ms: duration_ms)
@@ -80135,14 +80147,14 @@ 

       
 
 
-4896
-4897
-4898
-4899
-4900

+4925
+4926
+4927
+4928
+4929

     

     
-      
# File 'lib/kettle/jem.rb', line 4896
+      
# File 'lib/kettle/jem.rb', line 4925
 
 def reported_post_apply_changed_files(step)
   return [] if event_payload_value(step, :metadata_only)
@@ -80169,46 +80181,46 @@ 

       
 
 
-16736
-16737
-16738
-16739
-16740
-16741
-16742
-16743
-16744
-16745
-16746
-16747
-16748
-16749
-16750
-16751
-16752
-16753
-16754
-16755
-16756
-16757
-16758
-16759
-16760
-16761
-16762
-16763
-16764
-16765
-16766
-16767
 16768
 16769
 16770
 16771
-16772

+16772
+16773
+16774
+16775
+16776
+16777
+16778
+16779
+16780
+16781
+16782
+16783
+16784
+16785
+16786
+16787
+16788
+16789
+16790
+16791
+16792
+16793
+16794
+16795
+16796
+16797
+16798
+16799
+16800
+16801
+16802
+16803
+16804

     

     
-      
# File 'lib/kettle/jem.rb', line 16736
+      
# File 'lib/kettle/jem.rb', line 16768
 
 def repository_facts(project_root, source_url, package_name:, repository_topology:)
   topology = normalize_repository_topology(repository_topology)
@@ -80290,16 +80302,16 @@ 

       
 
 
-17948
-17949
-17950
-17951
-17952
-17953
-17954

+17980
+17981
+17982
+17983
+17984
+17985
+17986

     

     
-      
# File 'lib/kettle/jem.rb', line 17948
+      
# File 'lib/kettle/jem.rb', line 17980
 
 def repository_monorepo_subproject?(repository)
   return false unless repository.is_a?(Hash)
@@ -80328,15 +80340,15 @@ 

       
 
 
-16729
-16730
-16731
-16732
-16733
-16734

+16761
+16762
+16763
+16764
+16765
+16766

     

     
-      
# File 'lib/kettle/jem.rb', line 16729
+      
# File 'lib/kettle/jem.rb', line 16761
 
 def repository_name_from_source_url(source_url)
   base = source_url.to_s.split("?", 2).first.to_s.split("#", 2).first.to_s
@@ -80364,15 +80376,15 @@ 

       
 
 
-17304
-17305
-17306
-17307
-17308
-17309

+17336
+17337
+17338
+17339
+17340
+17341

     

     
-      
# File 'lib/kettle/jem.rb', line 17304
+      
# File 'lib/kettle/jem.rb', line 17336
 
 def repository_project_logo_href(repository, slug:, org:, gem_name:)
   package_source_url = repository.is_a?(Hash) ? repository[:package_source_url].to_s : ""
@@ -80400,15 +80412,15 @@ 

       
 
 
-17297
-17298
-17299
-17300
-17301
-17302

+17329
+17330
+17331
+17332
+17333
+17334

     

     
-      
# File 'lib/kettle/jem.rb', line 17297
+      
# File 'lib/kettle/jem.rb', line 17329
 
 def repository_project_logo_slug(repository, org:, gem_name:)
   package_path = repository.is_a?(Hash) ? repository[:package_path].to_s : ""
@@ -80436,38 +80448,6 @@ 

       
 
 
-16774
-16775
-16776
-16777
-16778
-16779
-16780
-16781
-16782
-16783
-16784
-16785
-16786
-16787
-16788
-16789
-16790
-16791
-16792
-16793
-16794
-16795
-16796
-16797
-16798
-16799
-16800
-16801
-16802
-16803
-16804
-16805
 16806
 16807
 16808
@@ -80497,10 +80477,42 @@ 

 16832
 16833
 16834
-16835

+16835
+16836
+16837
+16838
+16839
+16840
+16841
+16842
+16843
+16844
+16845
+16846
+16847
+16848
+16849
+16850
+16851
+16852
+16853
+16854
+16855
+16856
+16857
+16858
+16859
+16860
+16861
+16862
+16863
+16864
+16865
+16866
+16867

     

     
-      
# File 'lib/kettle/jem.rb', line 16774
+      
# File 'lib/kettle/jem.rb', line 16806
 
 def repository_resource_urls(repository)
   repo_url = repository[:url].to_s
@@ -80584,20 +80596,20 @@ 

       
 
 
-16837
-16838
-16839
-16840
-16841
-16842
-16843
-16844
-16845
-16846
-16847

+16869
+16870
+16871
+16872
+16873
+16874
+16875
+16876
+16877
+16878
+16879

     

     
-      
# File 'lib/kettle/jem.rb', line 16837
+      
# File 'lib/kettle/jem.rb', line 16869
 
 def repository_root_url(source_url)
   uri = URI.parse(source_url.to_s)
@@ -80630,17 +80642,17 @@ 

       
 
 
-13348
-13349
-13350
-13351
-13352
-13353
-13354
-13355

+13379
+13380
+13381
+13382
+13383
+13384
+13385
+13386

     

     
-      
# File 'lib/kettle/jem.rb', line 13348
+      
# File 'lib/kettle/jem.rb', line 13379
 
 def repository_topology_for(config, env, template_selection)
   repository_config = config["repository"].is_a?(Hash) ? config["repository"] : {}
@@ -80670,16 +80682,16 @@ 

       
 
 
-10989
-10990
-10991
-10992
-10993
-10994
-10995

+11020
+11021
+11022
+11023
+11024
+11025
+11026

     

     
-      
# File 'lib/kettle/jem.rb', line 10989
+      
# File 'lib/kettle/jem.rb', line 11020
 
 def required_ruby_version_rubocop_disable(min_ruby)
   return "" unless Gem::Version.new(min_ruby) < Gem::Version.new("2.0")
@@ -80731,20 +80743,20 @@ 

       
 
 
-17862
-17863
-17864
-17865
-17866
-17867
-17868
-17869
-17870
-17871
-17872

+17894
+17895
+17896
+17897
+17898
+17899
+17900
+17901
+17902
+17903
+17904

     

     
-      
# File 'lib/kettle/jem.rb', line 17862
+      
# File 'lib/kettle/jem.rb', line 17894
 
 def resolve_template_tokens(content, tokens, scan_unresolved: true)
   resolver = Token::Resolver::Resolve.new(on_missing: :keep)
@@ -80777,22 +80789,22 @@ 

       
 
 
-14994
-14995
-14996
-14997
-14998
-14999
-15000
-15001
-15002
-15003
-15004
-15005
-15006

+15026
+15027
+15028
+15029
+15030
+15031
+15032
+15033
+15034
+15035
+15036
+15037
+15038

     

     
-      
# File 'lib/kettle/jem.rb', line 14994
+      
# File 'lib/kettle/jem.rb', line 15026
 
 def resolve_uncommitted_author!(project_root, author_map)
   uncommitted = author_map.delete(NOT_COMMITTED_EMAIL)
@@ -80827,17 +80839,17 @@ 

       
 
 
-17576
-17577
-17578
-17579
-17580
-17581
-17582
-17583

+17608
+17609
+17610
+17611
+17612
+17613
+17614
+17615

     

     
-      
# File 'lib/kettle/jem.rb', line 17576
+      
# File 'lib/kettle/jem.rb', line 17608
 
 def resolved_licenses(config, gemspec_licenses)
   config_licenses = config.is_a?(Hash) ? config["licenses"] : nil
@@ -80867,40 +80879,40 @@ 

       
 
 
-10767
-10768
-10769
-10770
-10771
-10772
-10773
-10774
-10775
-10776
-10777
-10778
-10779
-10780
-10781
-10782
-10783
-10784
-10785
-10786
-10787
-10788
-10789
-10790
-10791
-10792
-10793
-10794
-10795
-10796
-10797

+10798
+10799
+10800
+10801
+10802
+10803
+10804
+10805
+10806
+10807
+10808
+10809
+10810
+10811
+10812
+10813
+10814
+10815
+10816
+10817
+10818
+10819
+10820
+10821
+10822
+10823
+10824
+10825
+10826
+10827
+10828

     

     
-      
# File 'lib/kettle/jem.rb', line 10767
+      
# File 'lib/kettle/jem.rb', line 10798
 
 def rewrite_gemspec_version_loader(content, facts:)
   return content if shim_template_profile?(facts)
@@ -80953,23 +80965,23 @@ 

       
 
 
-7731
-7732
-7733
-7734
-7735
-7736
-7737
-7738
-7739
-7740
-7741
-7742
-7743
-7744

+7762
+7763
+7764
+7765
+7766
+7767
+7768
+7769
+7770
+7771
+7772
+7773
+7774
+7775

     

     
-      
# File 'lib/kettle/jem.rb', line 7731
+      
# File 'lib/kettle/jem.rb', line 7762
 
 def rewrite_markdown_reference_links(content, links)
   ensure_runtime_dependencies!
@@ -81005,18 +81017,18 @@ 

       
 
 
-17488
-17489
-17490
-17491
-17492
-17493
-17494
-17495
-17496

+17520
+17521
+17522
+17523
+17524
+17525
+17526
+17527
+17528

     

     
-      
# File 'lib/kettle/jem.rb', line 17488
+      
# File 'lib/kettle/jem.rb', line 17520
 
 def rubocop_target_ruby_token(min_ruby)
   token = minimum_ruby_token(min_ruby)
@@ -81047,20 +81059,20 @@ 

       
 
 
-17373
-17374
-17375
-17376
-17377
-17378
-17379
-17380
-17381
-17382
-17383

+17405
+17406
+17407
+17408
+17409
+17410
+17411
+17412
+17413
+17414
+17415

     

     
-      
# File 'lib/kettle/jem.rb', line 17373
+      
# File 'lib/kettle/jem.rb', line 17405
 
 def rubocop_template_tokens(min_ruby, ruby_style: {})
   constraint, gem_name, gem_constraint = rubocop_tokens_for(min_ruby_version(min_ruby))
@@ -81093,12 +81105,12 @@ 

       
 
 
-17498
-17499
-17500

+17530
+17531
+17532

     

     
-      
# File 'lib/kettle/jem.rb', line 17498
+      
# File 'lib/kettle/jem.rb', line 17530
 
 def rubocop_tokens_for(min_ruby)
   Kettle::Rb::CompatMatrix.rubocop_template_tokens(min_ruby)
@@ -81123,19 +81135,19 @@ 

       
 
 
-10627
-10628
-10629
-10630
-10631
-10632
-10633
-10634
-10635
-10636

+10658
+10659
+10660
+10661
+10662
+10663
+10664
+10665
+10666
+10667

     

     
-      
# File 'lib/kettle/jem.rb', line 10627
+      
# File 'lib/kettle/jem.rb', line 10658
 
 def ruby_appraisal_name_version(name)
   text = name.to_s
@@ -81167,20 +81179,20 @@ 

       
 
 
-7079
-7080
-7081
-7082
-7083
-7084
-7085
-7086
-7087
-7088
-7089

+7110
+7111
+7112
+7113
+7114
+7115
+7116
+7117
+7118
+7119
+7120

     

     
-      
# File 'lib/kettle/jem.rb', line 7079
+      
# File 'lib/kettle/jem.rb', line 7110
 
 def ruby_appraisal_names_below(content, min_ruby)
   return [] if min_ruby.to_s.empty?
@@ -81213,12 +81225,12 @@ 

       
 
 
-14904
-14905
-14906

+14936
+14937
+14938

     

     
-      
# File 'lib/kettle/jem.rb', line 14904
+      
# File 'lib/kettle/jem.rb', line 14936
 
 def ruby_array_literal(values)
   "[#{Array(values).map { |value| %("#{ruby_double_quoted_string_body(value.to_s)}") }.join(", ")}]"
@@ -81266,17 +81278,17 @@ 

       
 
 
-10222
-10223
-10224
-10225
-10226
-10227
-10228
-10229

+10253
+10254
+10255
+10256
+10257
+10258
+10259
+10260

     

     
-      
# File 'lib/kettle/jem.rb', line 10222
+      
# File 'lib/kettle/jem.rb', line 10253
 
 def ruby_bucket_path_segment?(segment)
   return false unless segment.to_s.start_with?("r")
@@ -81306,17 +81318,17 @@ 

       
 
 
-9855
-9856
-9857
-9858
-9859
-9860
-9861
-9862

+9886
+9887
+9888
+9889
+9890
+9891
+9892
+9893

     

     
-      
# File 'lib/kettle/jem.rb', line 9855
+      
# File 'lib/kettle/jem.rb', line 9886
 
 def ruby_call_records(content, call_name)
   result = prism_parse_success(content)
@@ -81346,12 +81358,12 @@ 

       
 
 
-16650
-16651
-16652

+16682
+16683
+16684

     

     
-      
# File 'lib/kettle/jem.rb', line 16650
+      
# File 'lib/kettle/jem.rb', line 16682
 
 def ruby_constant_path_segments(node)
   node&.slice.to_s.split("::").reject(&:empty?)
@@ -81376,12 +81388,12 @@ 

       
 
 
-13288
-13289
-13290

+13319
+13320
+13321

     

     
-      
# File 'lib/kettle/jem.rb', line 13288
+      
# File 'lib/kettle/jem.rb', line 13319
 
 def ruby_double_quoted_string_body(value)
   value.to_s.gsub("\\", "\\\\\\").gsub('"', '\"')
@@ -81406,15 +81418,15 @@ 

       
 
 
-13566
-13567
-13568
-13569
-13570
-13571

+13597
+13598
+13599
+13600
+13601
+13602

     

     
-      
# File 'lib/kettle/jem.rb', line 13566
+      
# File 'lib/kettle/jem.rb', line 13597
 
 def ruby_engines_config(config)
   engines = config["engines"]
@@ -81442,17 +81454,17 @@ 

       
 
 
-16674
-16675
-16676
-16677
-16678
-16679
-16680
-16681

+16706
+16707
+16708
+16709
+16710
+16711
+16712
+16713

     

     
-      
# File 'lib/kettle/jem.rb', line 16674
+      
# File 'lib/kettle/jem.rb', line 16706
 
 def ruby_entrypoint_module_namespace(content, expected_depth: nil)
   body = prism_parse_success(content)&.value&.statements&.body || []
@@ -81482,22 +81494,22 @@ 

       
 
 
-16683
-16684
-16685
-16686
-16687
-16688
-16689
-16690
-16691
-16692
-16693
-16694
-16695

+16715
+16716
+16717
+16718
+16719
+16720
+16721
+16722
+16723
+16724
+16725
+16726
+16727

     

     
-      
# File 'lib/kettle/jem.rb', line 16683
+      
# File 'lib/kettle/jem.rb', line 16715
 
 def ruby_entrypoint_module_namespace_for(node, namespace, expected_depth: nil)
   return unless node.is_a?(::Prism::ModuleNode) || node.is_a?(::Prism::ClassNode)
@@ -81532,20 +81544,20 @@ 

       
 
 
-16430
-16431
-16432
-16433
-16434
-16435
-16436
-16437
-16438
-16439
-16440

+16462
+16463
+16464
+16465
+16466
+16467
+16468
+16469
+16470
+16471
+16472

     

     
-      
# File 'lib/kettle/jem.rb', line 16430
+      
# File 'lib/kettle/jem.rb', line 16462
 
 def ruby_entrypoint_outer_namespace_kind(content, namespace)
   first_segment = namespace.to_s.split("::").reject(&:empty?).first
@@ -81578,23 +81590,23 @@ 

       
 
 
-12295
-12296
-12297
-12298
-12299
-12300
-12301
-12302
-12303
-12304
-12305
-12306
-12307
-12308

+12326
+12327
+12328
+12329
+12330
+12331
+12332
+12333
+12334
+12335
+12336
+12337
+12338
+12339

     

     
-      
# File 'lib/kettle/jem.rb', line 12295
+      
# File 'lib/kettle/jem.rb', line 12326
 
 def ruby_first_simple_quoted_string_node(node)
   case node
@@ -81630,13 +81642,13 @@ 

       
 
 
-16331
-16332
-16333
-16334

+16363
+16364
+16365
+16366

     

     
-      
# File 'lib/kettle/jem.rb', line 16331
+      
# File 'lib/kettle/jem.rb', line 16363
 
 def ruby_first_string_argument(owner)
   argument = owner.arguments&.arguments&.first
@@ -81662,16 +81674,16 @@ 

       
 
 
-7067
-7068
-7069
-7070
-7071
-7072
-7073

+7098
+7099
+7100
+7101
+7102
+7103
+7104

     

     
-      
# File 'lib/kettle/jem.rb', line 7067
+      
# File 'lib/kettle/jem.rb', line 7098
 
 def ruby_keyword_argument_node(call, key)
   keyword_hash = Array(call&.arguments&.arguments).find { |argument| argument.is_a?(::Prism::KeywordHashNode) }
@@ -81700,17 +81712,17 @@ 

       
 
 
-9996
-9997
-9998
-9999
-10000
-10001
-10002
-10003

+10027
+10028
+10029
+10030
+10031
+10032
+10033
+10034

     

     
-      
# File 'lib/kettle/jem.rb', line 9996
+      
# File 'lib/kettle/jem.rb', line 10027
 
 def ruby_keyword_string_argument(call, key)
   keyword_hash = Array(call&.arguments&.arguments).find { |argument| argument.is_a?(::Prism::KeywordHashNode) }
@@ -81740,17 +81752,17 @@ 

       
 
 
-16555
-16556
-16557
-16558
-16559
-16560
-16561
-16562

+16587
+16588
+16589
+16590
+16591
+16592
+16593
+16594

     

     
-      
# File 'lib/kettle/jem.rb', line 16555
+      
# File 'lib/kettle/jem.rb', line 16587
 
 def ruby_library_source_paths(project_root)
   Dir.glob(File.join(project_root, "lib", "**", "*.rb")).sort.filter_map do |path|
@@ -81780,16 +81792,16 @@ 

       
 
 
-7046
-7047
-7048
-7049
-7050
-7051
-7052

+7077
+7078
+7079
+7080
+7081
+7082
+7083

     

     
-      
# File 'lib/kettle/jem.rb', line 7046
+      
# File 'lib/kettle/jem.rb', line 7077
 
 def ruby_local_word_array_assignments(root)
   root.breadth_first_search_all do |node|
@@ -81818,17 +81830,17 @@ 

       
 
 
-9321
-9322
-9323
-9324
-9325
-9326
-9327
-9328

+9352
+9353
+9354
+9355
+9356
+9357
+9358
+9359

     

     
-      
# File 'lib/kettle/jem.rb', line 9321
+      
# File 'lib/kettle/jem.rb', line 9352
 
 def ruby_merge_options(recipe, merge_template_requires:)
   options = {merge_template_requires: merge_template_requires}
@@ -81858,13 +81870,13 @@ 

       
 
 
-9296
-9297
-9298
-9299

+9327
+9328
+9329
+9330

     

     
-      
# File 'lib/kettle/jem.rb', line 9296
+      
# File 'lib/kettle/jem.rb', line 9327
 
 def ruby_method_move_policy(recipe)
   recipe.dig(:template_preference, :method_move_policy) ||
@@ -81890,14 +81902,14 @@ 

       
 
 
-10111
-10112
-10113
-10114
-10115

+10142
+10143
+10144
+10145
+10146

     

     
-      
# File 'lib/kettle/jem.rb', line 10111
+      
# File 'lib/kettle/jem.rb', line 10142
 
 def ruby_multiline_word_array_source(names, indent:)
   element_prefix = " " * (indent.to_i + 2)
@@ -81924,18 +81936,18 @@ 

       
 
 
-16564
-16565
-16566
-16567
-16568
-16569
-16570
-16571
-16572

+16596
+16597
+16598
+16599
+16600
+16601
+16602
+16603
+16604

     

     
-      
# File 'lib/kettle/jem.rb', line 16564
+      
# File 'lib/kettle/jem.rb', line 16596
 
 def ruby_namespace_declaration_kind(content, namespace)
   target = namespace.to_s.split("::").reject(&:empty?)
@@ -81966,21 +81978,21 @@ 

       
 
 
-16574
-16575
-16576
-16577
-16578
-16579
-16580
-16581
-16582
-16583
-16584
-16585

+16606
+16607
+16608
+16609
+16610
+16611
+16612
+16613
+16614
+16615
+16616
+16617

     

     
-      
# File 'lib/kettle/jem.rb', line 16574
+      
# File 'lib/kettle/jem.rb', line 16606
 
 def ruby_namespace_declaration_kind_for(node, namespace, target)
   return unless node.is_a?(::Prism::ModuleNode) || node.is_a?(::Prism::ClassNode)
@@ -82014,18 +82026,18 @@ 

       
 
 
-16587
-16588
-16589
-16590
-16591
-16592
-16593
-16594
-16595

+16619
+16620
+16621
+16622
+16623
+16624
+16625
+16626
+16627

     

     
-      
# File 'lib/kettle/jem.rb', line 16587
+      
# File 'lib/kettle/jem.rb', line 16619
 
 def ruby_namespace_declaration_node(content, namespace)
   target = namespace.to_s.split("::").reject(&:empty?)
@@ -82056,21 +82068,21 @@ 

       
 
 
-16597
-16598
-16599
-16600
-16601
-16602
-16603
-16604
-16605
-16606
-16607
-16608

+16629
+16630
+16631
+16632
+16633
+16634
+16635
+16636
+16637
+16638
+16639
+16640

     

     
-      
# File 'lib/kettle/jem.rb', line 16597
+      
# File 'lib/kettle/jem.rb', line 16629
 
 def ruby_namespace_declaration_node_for(node, namespace, target)
   return unless node.is_a?(::Prism::ModuleNode) || node.is_a?(::Prism::ClassNode)
@@ -82104,19 +82116,19 @@ 

       
 
 
-9864
-9865
-9866
-9867
-9868
-9869
-9870
-9871
-9872
-9873

+9895
+9896
+9897
+9898
+9899
+9900
+9901
+9902
+9903
+9904

     

     
-      
# File 'lib/kettle/jem.rb', line 9864
+      
# File 'lib/kettle/jem.rb', line 9895
 
 def ruby_node_source_end_line(node)
   return 0 unless node
@@ -82148,15 +82160,15 @@ 

       
 
 
-16310
-16311
-16312
-16313
-16314
-16315

+16342
+16343
+16344
+16345
+16346
+16347

     

     
-      
# File 'lib/kettle/jem.rb', line 16310
+      
# File 'lib/kettle/jem.rb', line 16342
 
 def ruby_parse_comments(analysis)
   return analysis.comments if analysis.respond_to?(:comments)
@@ -82207,17 +82219,17 @@ 

       
 
 
-11999
-12000
-12001
-12002
-12003
-12004
-12005
-12006

+12030
+12031
+12032
+12033
+12034
+12035
+12036
+12037

     

     
-      
# File 'lib/kettle/jem.rb', line 11999
+      
# File 'lib/kettle/jem.rb', line 12030
 
 def ruby_project_version_constant_path?(node, namespace:)
   return false unless node.is_a?(::Prism::ConstantPathNode)
@@ -82270,15 +82282,15 @@ 

 
 
-11992
-11993
-11994
-11995
-11996
-11997

+12023
+12024
+12025
+12026
+12027
+12028

     		
     
-      
# File 'lib/kettle/jem.rb', line 11992
+      
# File 'lib/kettle/jem.rb', line 12023
 
 def ruby_project_version_embedded_statements?(node, namespace:)
   body = node.statements&.body.to_a
@@ -82306,26 +82318,26 @@ 

 
 
-11974
-11975
-11976
-11977
-11978
-11979
-11980
-11981
-11982
-11983
-11984
-11985
-11986
-11987
-11988
-11989
-11990

+12005
+12006
+12007
+12008
+12009
+12010
+12011
+12012
+12013
+12014
+12015
+12016
+12017
+12018
+12019
+12020
+12021

     		
     
-      
# File 'lib/kettle/jem.rb', line 11974
+      
# File 'lib/kettle/jem.rb', line 12005
 
 def ruby_project_version_interpolated_string_source(node, receiver:, namespace:)
   return unless node.is_a?(::Prism::InterpolatedStringNode)
@@ -82364,21 +82376,21 @@ 

       
 
 
-9371
-9372
-9373
-9374
-9375
-9376
-9377
-9378
-9379
-9380
-9381
-9382

+9402
+9403
+9404
+9405
+9406
+9407
+9408
+9409
+9410
+9411
+9412
+9413

     

     
-      
# File 'lib/kettle/jem.rb', line 9371
+      
# File 'lib/kettle/jem.rb', line 9402
 
 def ruby_require_aliases(recipe, facts = nil)
   facts ||= recipe[:facts] || recipe["facts"]
@@ -82435,14 +82447,14 @@ 

       
 
 
-16325
-16326
-16327
-16328
-16329

+16357
+16358
+16359
+16360
+16361

     

     
-      
# File 'lib/kettle/jem.rb', line 16325
+      
# File 'lib/kettle/jem.rb', line 16357
 
 def ruby_require_call?(owner, method_name, argument)
   owner.is_a?(::Prism::CallNode) &&
@@ -82492,13 +82504,13 @@ 

       
 
 
-12310
-12311
-12312
-12313

+12341
+12342
+12343
+12344

     

     
-      
# File 'lib/kettle/jem.rb', line 12310
+      
# File 'lib/kettle/jem.rb', line 12341
 
 def ruby_simple_quoted_string_node?(node)
   opening = node.opening_loc&.slice
@@ -82524,15 +82536,15 @@ 

       
 
 
-10016
-10017
-10018
-10019
-10020
-10021

+10047
+10048
+10049
+10050
+10051
+10052

     

     
-      
# File 'lib/kettle/jem.rb', line 10016
+      
# File 'lib/kettle/jem.rb', line 10047
 
 def ruby_static_interpolated_string_value(node)
   parts = node.compact_child_nodes.map { |child| ruby_static_string_value(child) }
@@ -82560,21 +82572,21 @@ 

       
 
 
-7054
-7055
-7056
-7057
-7058
-7059
-7060
-7061
-7062
-7063
-7064
-7065

+7085
+7086
+7087
+7088
+7089
+7090
+7091
+7092
+7093
+7094
+7095
+7096

     

     
-      
# File 'lib/kettle/jem.rb', line 7054
+      
# File 'lib/kettle/jem.rb', line 7085
 
 def ruby_static_string_array_value(node, local_word_arrays = {})
   case node
@@ -82608,30 +82620,30 @@ 

       
 
 
-10023
-10024
-10025
-10026
-10027
-10028
-10029
-10030
-10031
-10032
-10033
-10034
-10035
-10036
-10037
-10038
-10039
-10040
-10041
-10042
-10043

+10054
+10055
+10056
+10057
+10058
+10059
+10060
+10061
+10062
+10063
+10064
+10065
+10066
+10067
+10068
+10069
+10070
+10071
+10072
+10073
+10074

     

     
-      
# File 'lib/kettle/jem.rb', line 10023
+      
# File 'lib/kettle/jem.rb', line 10054
 
 def ruby_static_string_call_value(node)
   return unless node.receiver && node.arguments.nil?
@@ -82674,19 +82686,19 @@ 

       
 
 
-10005
-10006
-10007
-10008
-10009
-10010
-10011
-10012
-10013
-10014

+10036
+10037
+10038
+10039
+10040
+10041
+10042
+10043
+10044
+10045

     

     
-      
# File 'lib/kettle/jem.rb', line 10005
+      
# File 'lib/kettle/jem.rb', line 10036
 
 def ruby_static_string_value(node)
   case node
@@ -82718,12 +82730,12 @@ 

       
 
 
-9911
-9912
-9913

+9942
+9943
+9944

     

     
-      
# File 'lib/kettle/jem.rb', line 9911
+      
# File 'lib/kettle/jem.rb', line 9942
 
 def ruby_string_argument(call)
   ruby_string_argument_at(call, 0)
@@ -82748,13 +82760,13 @@ 

       
 
 
-9915
-9916
-9917
-9918

+9946
+9947
+9948
+9949

     

     
-      
# File 'lib/kettle/jem.rb', line 9915
+      
# File 'lib/kettle/jem.rb', line 9946
 
 def ruby_string_argument_at(call, index)
   argument = call&.arguments&.arguments&.[](index)
@@ -82780,14 +82792,14 @@ 

       
 
 
-9920
-9921
-9922
-9923
-9924

+9951
+9952
+9953
+9954
+9955

     

     
-      
# File 'lib/kettle/jem.rb', line 9920
+      
# File 'lib/kettle/jem.rb', line 9951
 
 def ruby_string_arguments(call)
   Array(call&.arguments&.arguments).filter_map do |argument|
@@ -82814,31 +82826,31 @@ 

       
 
 
-3177
-3178
-3179
-3180
-3181
-3182
-3183
-3184
-3185
-3186
-3187
-3188
-3189
-3190
-3191
-3192
-3193
-3194
-3195
-3196
-3197
-3198

+3206
+3207
+3208
+3209
+3210
+3211
+3212
+3213
+3214
+3215
+3216
+3217
+3218
+3219
+3220
+3221
+3222
+3223
+3224
+3225
+3226
+3227

     

     
-      
# File 'lib/kettle/jem.rb', line 3177
+      
# File 'lib/kettle/jem.rb', line 3206
 
 def ruby_style_facts(project_root)
   config_path = File.join(project_root.to_s, ".rubocop.yml")
@@ -82882,34 +82894,34 @@ 

       
 
 
-17385
-17386
-17387
-17388
-17389
-17390
-17391
-17392
-17393
-17394
-17395
-17396
-17397
-17398
-17399
-17400
-17401
-17402
-17403
-17404
-17405
-17406
-17407
-17408
-17409

+17417
+17418
+17419
+17420
+17421
+17422
+17423
+17424
+17425
+17426
+17427
+17428
+17429
+17430
+17431
+17432
+17433
+17434
+17435
+17436
+17437
+17438
+17439
+17440
+17441

     

     
-      
# File 'lib/kettle/jem.rb', line 17385
+      
# File 'lib/kettle/jem.rb', line 17417
 
 def ruby_style_template_tokens(ruby_style)
   style = ruby_style.is_a?(Hash) ? ruby_style : {}
@@ -82956,31 +82968,31 @@ 

       
 
 
-6906
-6907
-6908
-6909
-6910
-6911
-6912
-6913
-6914
-6915
-6916
-6917
-6918
-6919
-6920
-6921
-6922
-6923
-6924
-6925
-6926
-6927

+6937
+6938
+6939
+6940
+6941
+6942
+6943
+6944
+6945
+6946
+6947
+6948
+6949
+6950
+6951
+6952
+6953
+6954
+6955
+6956
+6957
+6958

     

     
-      
# File 'lib/kettle/jem.rb', line 6906
+      
# File 'lib/kettle/jem.rb', line 6937
 
 def ruby_template_policy_report(recipe:, request:, original:, final:)
   return {} unless recipe.fetch(:primitive) == "supplied_template_source_application"
@@ -83047,16 +83059,16 @@ 

       
 
 
-16317
-16318
-16319
-16320
-16321
-16322
-16323

+16349
+16350
+16351
+16352
+16353
+16354
+16355

     

     
-      
# File 'lib/kettle/jem.rb', line 16317
+      
# File 'lib/kettle/jem.rb', line 16349
 
 def ruby_top_level_require?(content, method_name, argument)
   ensure_runtime_dependencies!
@@ -83085,24 +83097,24 @@ 

       
 
 
-9839
-9840
-9841
-9842
-9843
-9844
-9845
-9846
-9847
-9848
-9849
-9850
-9851
-9852
-9853

+9870
+9871
+9872
+9873
+9874
+9875
+9876
+9877
+9878
+9879
+9880
+9881
+9882
+9883
+9884

     

     
-      
# File 'lib/kettle/jem.rb', line 9839
+      
# File 'lib/kettle/jem.rb', line 9870
 
 def ruby_top_level_require_records(content)
   body = prism_parse_success(content)&.value&.statements&.body || []
@@ -83139,18 +83151,18 @@ 

       
 
 
-16664
-16665
-16666
-16667
-16668
-16669
-16670
-16671
-16672

+16696
+16697
+16698
+16699
+16700
+16701
+16702
+16703
+16704

     

     
-      
# File 'lib/kettle/jem.rb', line 16664
+      
# File 'lib/kettle/jem.rb', line 16696
 
 def ruby_version_class_eval_namespaces(content)
   ruby_call_records(content, :class_eval).filter_map do |call|
@@ -83181,20 +83193,20 @@ 

       
 
 
-16610
-16611
-16612
-16613
-16614
-16615
-16616
-16617
-16618
-16619
-16620

+16642
+16643
+16644
+16645
+16646
+16647
+16648
+16649
+16650
+16651
+16652

     

     
-      
# File 'lib/kettle/jem.rb', line 16610
+      
# File 'lib/kettle/jem.rb', line 16642
 
 def ruby_version_constant_value(content)
   result = prism_parse_success(content)
@@ -83227,17 +83239,17 @@ 

       
 
 
-16622
-16623
-16624
-16625
-16626
-16627
-16628
-16629

+16654
+16655
+16656
+16657
+16658
+16659
+16660
+16661

     

     
-      
# File 'lib/kettle/jem.rb', line 16622
+      
# File 'lib/kettle/jem.rb', line 16654
 
 def ruby_version_module_namespace(content)
   body = prism_parse_success(content)&.value&.statements&.body || []
@@ -83267,27 +83279,27 @@ 

       
 
 
-16631
-16632
-16633
-16634
-16635
-16636
-16637
-16638
-16639
-16640
-16641
-16642
-16643
-16644
-16645
-16646
-16647
-16648

+16663
+16664
+16665
+16666
+16667
+16668
+16669
+16670
+16671
+16672
+16673
+16674
+16675
+16676
+16677
+16678
+16679
+16680

     

     
-      
# File 'lib/kettle/jem.rb', line 16631
+      
# File 'lib/kettle/jem.rb', line 16663
 
 def ruby_version_module_namespace_for(node, namespace)
   return unless node.is_a?(::Prism::ModuleNode) || node.is_a?(::Prism::ClassNode)
@@ -83327,14 +83339,14 @@ 

       
 
 
-10105
-10106
-10107
-10108
-10109

+10136
+10137
+10138
+10139
+10140

     

     
-      
# File 'lib/kettle/jem.rb', line 10105
+      
# File 'lib/kettle/jem.rb', line 10136
 
 def ruby_word_array_names(node)
   node.elements.filter_map do |element|
@@ -83384,12 +83396,12 @@ 

       
 
 
-10101
-10102
-10103

+10132
+10133
+10134

     

     
-      
# File 'lib/kettle/jem.rb', line 10101
+      
# File 'lib/kettle/jem.rb', line 10132
 
 def ruby_word_array_node?(node)
   node.is_a?(::Prism::ArrayNode) && node.opening_loc&.slice.to_s.start_with?("%w[")
@@ -83414,17 +83426,17 @@ 

       
 
 
-10092
-10093
-10094
-10095
-10096
-10097
-10098
-10099

+10123
+10124
+10125
+10126
+10127
+10128
+10129
+10130

     

     
-      
# File 'lib/kettle/jem.rb', line 10092
+      
# File 'lib/kettle/jem.rb', line 10123
 
 def ruby_word_array_nodes(content)
   result = prism_parse_success(content)
@@ -83454,24 +83466,24 @@ 

       
 
 
-10076
-10077
-10078
-10079
-10080
-10081
-10082
-10083
-10084
-10085
-10086
-10087
-10088
-10089
-10090

+10107
+10108
+10109
+10110
+10111
+10112
+10113
+10114
+10115
+10116
+10117
+10118
+10119
+10120
+10121

     

     
-      
# File 'lib/kettle/jem.rb', line 10076
+      
# File 'lib/kettle/jem.rb', line 10107
 
 def ruby_word_array_records(content)
   lines = content.to_s.lines
@@ -83508,12 +83520,12 @@ 

       
 
 
-14541
-14542
-14543

+14573
+14574
+14575

     

     
-      
# File 'lib/kettle/jem.rb', line 14541
+      
# File 'lib/kettle/jem.rb', line 14573
 
 def rubyforum_badge_image_url(style: "flat")
   "https://img.shields.io/discourse/topics?server=https%3A%2F%2Fwww.rubyforum.org&style=#{style}&logo=discourse&label=Ruby%20Users%20Forum"
@@ -83538,29 +83550,29 @@ 

       
 
 
-14512
-14513
-14514
-14515
-14516
-14517
-14518
-14519
-14520
-14521
-14522
-14523
-14524
-14525
-14526
-14527
-14528
-14529
-14530
-14531

+14544
+14545
+14546
+14547
+14548
+14549
+14550
+14551
+14552
+14553
+14554
+14555
+14556
+14557
+14558
+14559
+14560
+14561
+14562
+14563

     

     
-      
# File 'lib/kettle/jem.rb', line 14512
+      
# File 'lib/kettle/jem.rb', line 14544
 
 def rubyforum_facts(config, env, package_name:)
   rubyforum_config = config["rubyforum"].is_a?(Hash) ? config["rubyforum"] : {}
@@ -83602,12 +83614,12 @@ 

       
 
 
-14537
-14538
-14539

+14569
+14570
+14571

     

     
-      
# File 'lib/kettle/jem.rb', line 14537
+      
# File 'lib/kettle/jem.rb', line 14569
 
 def rubyforum_tag_url(tag)
   "https://www.rubyforum.org/tag/#{URI.encode_www_form_component(tag.to_s)}"
@@ -83632,22 +83644,22 @@ 

       
 
 
-14545
-14546
-14547
-14548
-14549
-14550
-14551
-14552
-14553
-14554
-14555
-14556
-14557

+14577
+14578
+14579
+14580
+14581
+14582
+14583
+14584
+14585
+14586
+14587
+14588
+14589

     

     
-      
# File 'lib/kettle/jem.rb', line 14545
+      
# File 'lib/kettle/jem.rb', line 14577
 
 def rubyforum_template_tokens(rubyforum)
   url = rubyforum[:url].to_s
@@ -83682,15 +83694,15 @@ 

       
 
 
-15797
-15798
-15799
-15800
-15801
-15802

+15829
+15830
+15831
+15832
+15833
+15834

     

     
-      
# File 'lib/kettle/jem.rb', line 15797
+      
# File 'lib/kettle/jem.rb', line 15829
 
 def rubygems_version_gem_entrypoint_mode(rubygems_config)
   raw = rubygems_config["version_gem_entrypoint"]
@@ -83718,37 +83730,6 @@ 

       
 
 
-13897
-13898
-13899
-13900
-13901
-13902
-13903
-13904
-13905
-13906
-13907
-13908
-13909
-13910
-13911
-13912
-13913
-13914
-13915
-13916
-13917
-13918
-13919
-13920
-13921
-13922
-13923
-13924
-13925
-13926
-13927
 13928
 13929
 13930
@@ -83771,10 +83752,41 @@ 

 13947
 13948
 13949
-13950

+13950
+13951
+13952
+13953
+13954
+13955
+13956
+13957
+13958
+13959
+13960
+13961
+13962
+13963
+13964
+13965
+13966
+13967
+13968
+13969
+13970
+13971
+13972
+13973
+13974
+13975
+13976
+13977
+13978
+13979
+13980
+13981

     

     
-      
# File 'lib/kettle/jem.rb', line 13897
+      
# File 'lib/kettle/jem.rb', line 13928
 
 def run_apply_phases(project_root, report, file_workers: 0, file_thread_workers: 0, file_stats: nil)
   plugin_registry = plugin_registry_for_project(project_root)
@@ -83850,17 +83862,17 @@ 

       
 
 
-7023
-7024
-7025
-7026
-7027
-7028
-7029
-7030

+7054
+7055
+7056
+7057
+7058
+7059
+7060
+7061

     

     
-      
# File 'lib/kettle/jem.rb', line 7023
+      
# File 'lib/kettle/jem.rb', line 7054
 
 def runtime_context_value(request, *path)
   context = request[:runtime_context] || request["runtime_context"] || {}
@@ -83890,20 +83902,20 @@ 

 
 
-12178
-12179
-12180
-12181
-12182
-12183
-12184
-12185
-12186
-12187
-12188

+12209
+12210
+12211
+12212
+12213
+12214
+12215
+12216
+12217
+12218
+12219

     		
     
-      
# File 'lib/kettle/jem.rb', line 12178
+      
# File 'lib/kettle/jem.rb', line 12209
 
 def runtime_gemspec_dependency_insertion_index(lines, receiver:)
   note_index = lines.find_index { |line| line.lstrip.start_with?("# NOTE: It is preferable to list development dependencies") }
@@ -83936,28 +83948,28 @@ 

       
 
 
-8876
-8877
-8878
-8879
-8880
-8881
-8882
-8883
-8884
-8885
-8886
-8887
-8888
-8889
-8890
-8891
-8892
-8893
-8894

+8907
+8908
+8909
+8910
+8911
+8912
+8913
+8914
+8915
+8916
+8917
+8918
+8919
+8920
+8921
+8922
+8923
+8924
+8925

     

     
-      
# File 'lib/kettle/jem.rb', line 8876
+      
# File 'lib/kettle/jem.rb', line 8907
 
 def runtime_workspace_override_records(content)
   result = prism_parse_success(content)
@@ -83998,19 +84010,19 @@ 

       
 
 
-14750
-14751
-14752
-14753
-14754
-14755
-14756
-14757
-14758
-14759

+14782
+14783
+14784
+14785
+14786
+14787
+14788
+14789
+14790
+14791

     

     
-      
# File 'lib/kettle/jem.rb', line 14750
+      
# File 'lib/kettle/jem.rb', line 14782
 
 def security_supported_version_token(version)
   parsed = Gem::Version.new(version.to_s)
@@ -84065,18 +84077,18 @@ 

       
 
 
-13381
-13382
-13383
-13384
-13385
-13386
-13387
-13388
-13389

+13412
+13413
+13414
+13415
+13416
+13417
+13418
+13419
+13420

     

     
-      
# File 'lib/kettle/jem.rb', line 13381
+      
# File 'lib/kettle/jem.rb', line 13412
 
 def selected_template_path?(relative_path, patterns)
   path = relative_path.to_s.delete_prefix("./")
@@ -84107,12 +84119,12 @@ 

       
 
 
-18340
-18341
-18342

+18372
+18373
+18374

     

     
-      
# File 'lib/kettle/jem.rb', line 18340
+      
# File 'lib/kettle/jem.rb', line 18372
 
 def semantic_readme_heading(text)
   normalize_readme_heading(text)
@@ -84137,18 +84149,18 @@ 

       
 
 
-18423
-18424
-18425
-18426
-18427
-18428
-18429
-18430
-18431

+18455
+18456
+18457
+18458
+18459
+18460
+18461
+18462
+18463

     

     
-      
# File 'lib/kettle/jem.rb', line 18423
+      
# File 'lib/kettle/jem.rb', line 18455
 
 def set_template_file_strategy!(config, target_path, strategy)
   config["files"] = {} unless config["files"].is_a?(Hash)
@@ -84179,19 +84191,19 @@ 

       
 
 
-13442
-13443
-13444
-13445
-13446
-13447
-13448
-13449
-13450
-13451

+13473
+13474
+13475
+13476
+13477
+13478
+13479
+13480
+13481
+13482

     

     
-      
# File 'lib/kettle/jem.rb', line 13442
+      
# File 'lib/kettle/jem.rb', line 13473
 
 def setup_execution_context(env, run_options)
   return {bundled: false, source: "bootstrap_mode", bundle_gemfile: nil} if DecisionPolicy.value_to_boolean((run_options || {})[:bootstrap_mode])
@@ -84223,19 +84235,19 @@ 

       
 
 
-13431
-13432
-13433
-13434
-13435
-13436
-13437
-13438
-13439
-13440

+13462
+13463
+13464
+13465
+13466
+13467
+13468
+13469
+13470
+13471

     

     
-      
# File 'lib/kettle/jem.rb', line 13431
+      
# File 'lib/kettle/jem.rb', line 13462
 
 def setup_guidance_diagnostic(config_existed:)
   {
@@ -84267,40 +84279,40 @@ 

       
 
 
-5821
-5822
-5823
-5824
-5825
-5826
-5827
-5828
-5829
-5830
-5831
-5832
-5833
-5834
-5835
-5836
-5837
-5838
-5839
-5840
-5841
-5842
-5843
-5844
-5845
-5846
-5847
-5848
-5849
-5850
-5851

+5852
+5853
+5854
+5855
+5856
+5857
+5858
+5859
+5860
+5861
+5862
+5863
+5864
+5865
+5866
+5867
+5868
+5869
+5870
+5871
+5872
+5873
+5874
+5875
+5876
+5877
+5878
+5879
+5880
+5881
+5882

     

     
-      
# File 'lib/kettle/jem.rb', line 5821
+      
# File 'lib/kettle/jem.rb', line 5852
 
 def setup_project(project_root, env: ENV, run_options: {}, command_runner: nil)
   root = File.expand_path(project_root.to_s)
@@ -84353,12 +84365,12 @@ 

       
 
 
-16712
-16713
-16714

+16744
+16745
+16746

     

     
-      
# File 'lib/kettle/jem.rb', line 16712
+      
# File 'lib/kettle/jem.rb', line 16744
 
 def shield_token(value)
   value.to_s.gsub("-", "--").gsub("_", "__").tr(" ", "_")
@@ -84383,35 +84395,6 @@ 

       
 
 
-3812
-3813
-3814
-3815
-3816
-3817
-3818
-3819
-3820
-3821
-3822
-3823
-3824
-3825
-3826
-3827
-3828
-3829
-3830
-3831
-3832
-3833
-3834
-3835
-3836
-3837
-3838
-3839
-3840
 3841
 3842
 3843
@@ -84420,10 +84403,39 @@ 

 3846
 3847
 3848
-3849

+3849
+3850
+3851
+3852
+3853
+3854
+3855
+3856
+3857
+3858
+3859
+3860
+3861
+3862
+3863
+3864
+3865
+3866
+3867
+3868
+3869
+3870
+3871
+3872
+3873
+3874
+3875
+3876
+3877
+3878

     

     
-      
# File 'lib/kettle/jem.rb', line 3812
+      
# File 'lib/kettle/jem.rb', line 3841
 
 def shim_facts(config, env, run_options, package_name:, entrypoint_require:, template_profile:)
   shim_config = config["shim"].is_a?(Hash) ? config["shim"] : {}
@@ -84483,27 +84495,27 @@ 

       
 
 
-18546
-18547
-18548
-18549
-18550
-18551
-18552
-18553
-18554
-18555
-18556
-18557
-18558
-18559
-18560
-18561
-18562
-18563

+18578
+18579
+18580
+18581
+18582
+18583
+18584
+18585
+18586
+18587
+18588
+18589
+18590
+18591
+18592
+18593
+18594
+18595

     

     
-      
# File 'lib/kettle/jem.rb', line 18546
+      
# File 'lib/kettle/jem.rb', line 18578
 
 def shim_profile_cleanups(project_root, facts, preferences, template_selection: {})
   return [] unless facts[:template_profile].to_s == SHIM_TEMPLATE_PROFILE
@@ -84543,16 +84555,16 @@ 

       
 
 
-14690
-14691
-14692
-14693
-14694
-14695
-14696

+14722
+14723
+14724
+14725
+14726
+14727
+14728

     

     
-      
# File 'lib/kettle/jem.rb', line 14690
+      
# File 'lib/kettle/jem.rb', line 14722
 
 def shim_replacement_namespace(replacement_require)
   replacement_require.to_s.tr("-", "/").split("/").reject(&:empty?).map do |segment|
@@ -84581,25 +84593,25 @@ 

       
 
 
-18453
-18454
-18455
-18456
-18457
-18458
-18459
-18460
-18461
-18462
-18463
-18464
-18465
-18466
-18467
-18468

+18485
+18486
+18487
+18488
+18489
+18490
+18491
+18492
+18493
+18494
+18495
+18496
+18497
+18498
+18499
+18500

     

     
-      
# File 'lib/kettle/jem.rb', line 18453
+      
# File 'lib/kettle/jem.rb', line 18485
 
 def shim_template_entries(facts, config)
   package_name = facts.dig(:package, :name).to_s
@@ -84637,26 +84649,26 @@ 

       
 
 
-13174
-13175
-13176
-13177
-13178
-13179
-13180
-13181
-13182
-13183
-13184
-13185
-13186
-13187
-13188
-13189
-13190

+13205
+13206
+13207
+13208
+13209
+13210
+13211
+13212
+13213
+13214
+13215
+13216
+13217
+13218
+13219
+13220
+13221

     

     
-      
# File 'lib/kettle/jem.rb', line 13174
+      
# File 'lib/kettle/jem.rb', line 13205
 
 def shim_template_entries_for_config(gemspec_path, config)
   package_name = config.dig("rubygems", "name").to_s.strip
@@ -84718,12 +84730,12 @@ 

       
 
 
-13233
-13234
-13235

+13264
+13265
+13266

     

     
-      
# File 'lib/kettle/jem.rb', line 13233
+      
# File 'lib/kettle/jem.rb', line 13264
 
 def shim_template_profile?(facts)
   facts[:template_profile].to_s == SHIM_TEMPLATE_PROFILE
@@ -84748,18 +84760,18 @@ 

       
 
 
-14488
-14489
-14490
-14491
-14492
-14493
-14494
-14495
-14496

+14520
+14521
+14522
+14523
+14524
+14525
+14526
+14527
+14528

     

     
-      
# File 'lib/kettle/jem.rb', line 14488
+      
# File 'lib/kettle/jem.rb', line 14520
 
 def shim_template_tokens(shim)
   return {} unless shim.is_a?(Hash) && !shim.empty?
@@ -84790,25 +84802,25 @@ 

       
 
 
-14698
-14699
-14700
-14701
-14702
-14703
-14704
-14705
-14706
-14707
-14708
-14709
-14710
-14711
-14712
-14713

+14730
+14731
+14732
+14733
+14734
+14735
+14736
+14737
+14738
+14739
+14740
+14741
+14742
+14743
+14744
+14745

     

     
-      
# File 'lib/kettle/jem.rb', line 14698
+      
# File 'lib/kettle/jem.rb', line 14730
 
 def shim_version_file_content(namespace:, replacement_namespace:, replacement_require:)
   body = [
@@ -84869,21 +84881,21 @@ 

 
 
-3892
-3893
-3894
-3895
-3896
-3897
-3898
-3899
-3900
-3901
-3902
-3903

+3921
+3922
+3923
+3924
+3925
+3926
+3927
+3928
+3929
+3930
+3931
+3932

     		
     
-      
# File 'lib/kettle/jem.rb', line 3892
+      
# File 'lib/kettle/jem.rb', line 3921
 
 def shunted_dependency_has_floor_compatible_version?(resolver, dependency, versions, floor)
   versions.any? do |entry|
@@ -84940,18 +84952,18 @@ 

 
 
-3882
-3883
-3884
-3885
-3886
-3887
-3888
-3889
-3890

+3911
+3912
+3913
+3914
+3915
+3916
+3917
+3918
+3919

     		
     
-      
# File 'lib/kettle/jem.rb', line 3882
+      
# File 'lib/kettle/jem.rb', line 3911
 
 def shunted_dependency_has_modular_override?(project_root, dependency)
   root = project_root.to_s
@@ -84982,17 +84994,17 @@ 

       
 
 
-3923
-3924
-3925
-3926
-3927
-3928
-3929
-3930

+3952
+3953
+3954
+3955
+3956
+3957
+3958
+3959

     

     
-      
# File 'lib/kettle/jem.rb', line 3923
+      
# File 'lib/kettle/jem.rb', line 3952
 
 def shunted_effective_floor(min_ruby)
   floor = minimum_ruby_token(min_ruby)
@@ -85022,39 +85034,39 @@ 

       
 
 
-3851
-3852
-3853
-3854
-3855
-3856
-3857
-3858
-3859
-3860
-3861
-3862
-3863
-3864
-3865
-3866
-3867
-3868
-3869
-3870
-3871
-3872
-3873
-3874
-3875
-3876
-3877
-3878
-3879
-3880

+3880
+3881
+3882
+3883
+3884
+3885
+3886
+3887
+3888
+3889
+3890
+3891
+3892
+3893
+3894
+3895
+3896
+3897
+3898
+3899
+3900
+3901
+3902
+3903
+3904
+3905
+3906
+3907
+3908
+3909

     

     
-      
# File 'lib/kettle/jem.rb', line 3851
+      
# File 'lib/kettle/jem.rb', line 3880
 
 def shunted_gemfile_block(gemspec, facts, run_options)
   resolver = run_options[:rubygems_resolver] || run_options["rubygems_resolver"] || RubyGemsResolver.new
@@ -85106,24 +85118,24 @@ 

       
 
 
-3932
-3933
-3934
-3935
-3936
-3937
-3938
-3939
-3940
-3941
-3942
-3943
-3944
-3945
-3946

+3961
+3962
+3963
+3964
+3965
+3966
+3967
+3968
+3969
+3970
+3971
+3972
+3973
+3974
+3975

     

     
-      
# File 'lib/kettle/jem.rb', line 3932
+      
# File 'lib/kettle/jem.rb', line 3961
 
 def shunted_gemfile_managed_block(dependencies)
   lines = [
@@ -85160,15 +85172,15 @@ 

       
 
 
-15192
-15193
-15194
-15195
-15196
-15197

+15224
+15225
+15226
+15227
+15228
+15229

     

     
-      
# File 'lib/kettle/jem.rb', line 15192
+      
# File 'lib/kettle/jem.rb', line 15224
 
 def sibling_gemspec_metadata(sibling_path, gem_name)
   gemspec_path = Dir.glob(File.join(sibling_path, "*.gemspec")).find do |path|
@@ -85219,15 +85231,15 @@ 

       
 
 
-8639
-8640
-8641
-8642
-8643
-8644

+8670
+8671
+8672
+8673
+8674
+8675

     

     
-      
# File 'lib/kettle/jem.rb', line 8639
+      
# File 'lib/kettle/jem.rb', line 8670
 
 def simplecov_bootstrap_call_node?(node)
   simplecov_require_call_node?(node) ||
@@ -85278,15 +85290,15 @@ 

       
 
 
-8499
-8500
-8501
-8502
-8503
-8504

+8530
+8531
+8532
+8533
+8534
+8535

     

     
-      
# File 'lib/kettle/jem.rb', line 8499
+      
# File 'lib/kettle/jem.rb', line 8530
 
 def simplecov_config_require_call_node?(node)
   node.is_a?(::Prism::CallNode) &&
@@ -85314,17 +85326,17 @@ 

       
 
 
-8819
-8820
-8821
-8822
-8823
-8824
-8825
-8826

+8850
+8851
+8852
+8853
+8854
+8855
+8856
+8857

     

     
-      
# File 'lib/kettle/jem.rb', line 8819
+      
# File 'lib/kettle/jem.rb', line 8850
 
 def simplecov_config_require_call_nodes(content)
   result = prism_parse_success(content)
@@ -85354,22 +85366,22 @@ 

       
 
 
-8805
-8806
-8807
-8808
-8809
-8810
-8811
-8812
-8813
-8814
-8815
-8816
-8817

+8836
+8837
+8838
+8839
+8840
+8841
+8842
+8843
+8844
+8845
+8846
+8847
+8848

     

     
-      
# File 'lib/kettle/jem.rb', line 8805
+      
# File 'lib/kettle/jem.rb', line 8836
 
 def simplecov_config_require_call_records(content)
   lines = content.to_s.lines
@@ -85427,15 +85439,15 @@ 

 
 
-8718
-8719
-8720
-8721
-8722
-8723

+8749
+8750
+8751
+8752
+8753
+8754

     		
     
-      
# File 'lib/kettle/jem.rb', line 8718
+      
# File 'lib/kettle/jem.rb', line 8749
 
 def simplecov_do_cov_bootstrap_complete_node?(node)
   subtree = prism_call_nodes(node)
@@ -85486,19 +85498,19 @@ 

       
 
 
-8725
-8726
-8727
-8728
-8729
-8730
-8731
-8732
-8733
-8734

+8756
+8757
+8758
+8759
+8760
+8761
+8762
+8763
+8764
+8765

     

     
-      
# File 'lib/kettle/jem.rb', line 8725
+      
# File 'lib/kettle/jem.rb', line 8756
 
 def simplecov_do_cov_bootstrap_only_node?(node)
   calls = prism_call_nodes(node)
@@ -85530,30 +85542,30 @@ 

       
 
 
-8686
-8687
-8688
-8689
-8690
-8691
-8692
-8693
-8694
-8695
-8696
-8697
-8698
-8699
-8700
-8701
-8702
-8703
-8704
-8705
-8706

+8717
+8718
+8719
+8720
+8721
+8722
+8723
+8724
+8725
+8726
+8727
+8728
+8729
+8730
+8731
+8732
+8733
+8734
+8735
+8736
+8737

     

     
-      
# File 'lib/kettle/jem.rb', line 8686
+      
# File 'lib/kettle/jem.rb', line 8717
 
 def simplecov_do_cov_bootstrap_records(content)
   result = prism_parse_success(content)
@@ -85619,12 +85631,12 @@ 

       
 
 
-8708
-8709
-8710

+8739
+8740
+8741

     

     
-      
# File 'lib/kettle/jem.rb', line 8708
+      
# File 'lib/kettle/jem.rb', line 8739
 
 def simplecov_do_cov_predicate_node?(node)
   node&.location&.slice.to_s == "Kettle::Soup::Cover::DO_COV"
@@ -85672,15 +85684,15 @@ 

 
 
-8506
-8507
-8508
-8509
-8510
-8511

+8537
+8538
+8539
+8540
+8541
+8542

     		
     
-      
# File 'lib/kettle/jem.rb', line 8506
+      
# File 'lib/kettle/jem.rb', line 8537
 
 def simplecov_kettle_soup_cover_require_call_node?(node)
   node.is_a?(::Prism::CallNode) &&
@@ -85731,16 +85743,16 @@ 

       
 
 
-8646
-8647
-8648
-8649
-8650
-8651
-8652

+8677
+8678
+8679
+8680
+8681
+8682
+8683

     

     
-      
# File 'lib/kettle/jem.rb', line 8646
+      
# File 'lib/kettle/jem.rb', line 8677
 
 def simplecov_load_error_guard_call_node?(node)
   return true if node.name == :raise
@@ -85769,17 +85781,17 @@ 

       
 
 
-8484
-8485
-8486
-8487
-8488
-8489
-8490
-8491

+8515
+8516
+8517
+8518
+8519
+8520
+8521
+8522

     

     
-      
# File 'lib/kettle/jem.rb', line 8484
+      
# File 'lib/kettle/jem.rb', line 8515
 
 def simplecov_obsolete_call_nodes(content)
   result = prism_parse_success(content)
@@ -85832,15 +85844,15 @@ 

       
 
 
-8784
-8785
-8786
-8787
-8788
-8789

+8815
+8816
+8817
+8818
+8819
+8820

     

     
-      
# File 'lib/kettle/jem.rb', line 8784
+      
# File 'lib/kettle/jem.rb', line 8815
 
 def simplecov_require_call_node?(node)
   node.is_a?(::Prism::CallNode) &&
@@ -85868,22 +85880,22 @@ 

       
 
 
-8791
-8792
-8793
-8794
-8795
-8796
-8797
-8798
-8799
-8800
-8801
-8802
-8803

+8822
+8823
+8824
+8825
+8826
+8827
+8828
+8829
+8830
+8831
+8832
+8833
+8834

     

     
-      
# File 'lib/kettle/jem.rb', line 8791
+      
# File 'lib/kettle/jem.rb', line 8822
 
 def simplecov_require_call_records(content)
   lines = content.to_s.lines
@@ -85941,14 +85953,14 @@ 

       
 
 
-8493
-8494
-8495
-8496
-8497

+8524
+8525
+8526
+8527
+8528

     

     
-      
# File 'lib/kettle/jem.rb', line 8493
+      
# File 'lib/kettle/jem.rb', line 8524
 
 def simplecov_start_call_node?(node)
   node.is_a?(::Prism::CallNode) &&
@@ -85975,17 +85987,17 @@ 

       
 
 
-8828
-8829
-8830
-8831
-8832
-8833
-8834
-8835

+8859
+8860
+8861
+8862
+8863
+8864
+8865
+8866

     

     
-      
# File 'lib/kettle/jem.rb', line 8828
+      
# File 'lib/kettle/jem.rb', line 8859
 
 def simplecov_start_call_nodes(content)
   result = prism_parse_success(content)
@@ -86038,12 +86050,12 @@ 

       
 
 
-18889
-18890
-18891

+18922
+18923
+18924

     

     
-      
# File 'lib/kettle/jem.rb', line 18889
+      
# File 'lib/kettle/jem.rb', line 18922
 
 def skip_disabled_integration_template?(target_path, config)
   disabled_integration_template_path?(target_path, config)
@@ -86091,22 +86103,22 @@ 

       
 
 
-18860
-18861
-18862
-18863
-18864
-18865
-18866
-18867
-18868
-18869
-18870
-18871
-18872

+18893
+18894
+18895
+18896
+18897
+18898
+18899
+18900
+18901
+18902
+18903
+18904
+18905

     

     
-      
# File 'lib/kettle/jem.rb', line 18860
+      
# File 'lib/kettle/jem.rb', line 18893
 
 def skip_packaged_gemfile_template?(target_path, config, project_root: nil, template_root_path: PACKAGED_TEMPLATE_ROOT)
   return true if target_path.to_s.include?("gemfiles/modular/recording/") && !appraisal_recording_enabled?(config)
@@ -86164,18 +86176,18 @@ 

       
 
 
-18805
-18806
-18807
-18808
-18809
-18810
-18811
-18812
-18813

+18838
+18839
+18840
+18841
+18842
+18843
+18844
+18845
+18846

     

     
-      
# File 'lib/kettle/jem.rb', line 18805
+      
# File 'lib/kettle/jem.rb', line 18838
 
 def skip_packaged_license_template?(target_path, config)
   basename = managed_license_template_basename(target_path)
@@ -86229,19 +86241,19 @@ 

 
 
-18667
-18668
-18669
-18670
-18671
-18672
-18673
-18674
-18675
-18676

+18700
+18701
+18702
+18703
+18704
+18705
+18706
+18707
+18708
+18709

     		
     
-      
# File 'lib/kettle/jem.rb', line 18667
+      
# File 'lib/kettle/jem.rb', line 18700
 
 def skip_packaged_version_gem_entrypoint_template?(project_root, source_path, target_path, config)
   return false unless source_path == "lib/gem/version_gem.rb"
@@ -86296,32 +86308,32 @@ 

       
 
 
-18836
-18837
-18838
-18839
-18840
-18841
-18842
-18843
-18844
-18845
-18846
-18847
-18848
-18849
-18850
-18851
-18852
-18853
-18854
-18855
-18856
-18857
-18858

+18869
+18870
+18871
+18872
+18873
+18874
+18875
+18876
+18877
+18878
+18879
+18880
+18881
+18882
+18883
+18884
+18885
+18886
+18887
+18888
+18889
+18890
+18891

     

     
-      
# File 'lib/kettle/jem.rb', line 18836
+      
# File 'lib/kettle/jem.rb', line 18869
 
 def skip_packaged_workflow_template?(target_path, config, include_patterns: nil)
   path = target_path.to_s
@@ -86389,16 +86401,16 @@ 

       
 
 
-18036
-18037
-18038
-18039
-18040
-18041
-18042

+18068
+18069
+18070
+18071
+18072
+18073
+18074

     

     
-      
# File 'lib/kettle/jem.rb', line 18036
+      
# File 'lib/kettle/jem.rb', line 18068
 
 def skywalking_eyes_disabled_by_default?(config, license, disabled)
   return false if disabled.include?(SKYWALKING_EYES_INTEGRATION)
@@ -86427,15 +86439,15 @@ 

       
 
 
-4925
-4926
-4927
-4928
-4929
-4930

+4954
+4955
+4956
+4957
+4958
+4959

     

     
-      
# File 'lib/kettle/jem.rb', line 4925
+      
# File 'lib/kettle/jem.rb', line 4954
 
 def snapshot_changed_files(project_root, changed_files)
   changed_files.to_h do |relative_path|
@@ -86463,19 +86475,19 @@ 

       
 
 
-15091
-15092
-15093
-15094
-15095
-15096
-15097
-15098
-15099
-15100

+15123
+15124
+15125
+15126
+15127
+15128
+15129
+15130
+15131
+15132

     

     
-      
# File 'lib/kettle/jem.rb', line 15091
+      
# File 'lib/kettle/jem.rb', line 15123
 
 def social_facts(config, env)
   token_config = token_config_values(config)
@@ -86507,17 +86519,17 @@ 

       
 
 
-15106
-15107
-15108
-15109
-15110
-15111
-15112
-15113

+15138
+15139
+15140
+15141
+15142
+15143
+15144
+15145

     

     
-      
# File 'lib/kettle/jem.rb', line 15106
+      
# File 'lib/kettle/jem.rb', line 15138
 
 def social_template_tokens(social)
   {
@@ -86547,12 +86559,12 @@ 

       
 
 
-15102
-15103
-15104

+15134
+15135
+15136

     

     
-      
# File 'lib/kettle/jem.rb', line 15102
+      
# File 'lib/kettle/jem.rb', line 15134
 
 def social_token_value(social_config, env, key)
   preferred_template_token_value(nil, social_config[key.to_s], env, SOCIAL_TOKEN_ENV_KEYS.fetch(key))
@@ -86577,21 +86589,21 @@ 

       
 
 
-12008
-12009
-12010
-12011
-12012
-12013
-12014
-12015
-12016
-12017
-12018
-12019

+12039
+12040
+12041
+12042
+12043
+12044
+12045
+12046
+12047
+12048
+12049
+12050

     

     
-      
# File 'lib/kettle/jem.rb', line 12008
+      
# File 'lib/kettle/jem.rb', line 12039
 
 def sort_runtime_gemspec_dependency_lines(content, receiver:)
   records = gemspec_dependency_records(content, receiver: receiver).select do |record|
@@ -86625,21 +86637,21 @@ 

       
 
 
-7804
-7805
-7806
-7807
-7808
-7809
-7810
-7811
-7812
-7813
-7814
-7815

+7835
+7836
+7837
+7838
+7839
+7840
+7841
+7842
+7843
+7844
+7845
+7846

     

     
-      
# File 'lib/kettle/jem.rb', line 7804
+      
# File 'lib/kettle/jem.rb', line 7835
 
 def source_blob_url(source_url, path)
   base = source_url.to_s.dup
@@ -86673,21 +86685,21 @@ 

       
 
 
-16849
-16850
-16851
-16852
-16853
-16854
-16855
-16856
-16857
-16858
-16859
-16860

+16881
+16882
+16883
+16884
+16885
+16886
+16887
+16888
+16889
+16890
+16891
+16892

     

     
-      
# File 'lib/kettle/jem.rb', line 16849
+      
# File 'lib/kettle/jem.rb', line 16881
 
 def source_tree_url(source_url, path)
   base = source_url.to_s.dup
@@ -86721,12 +86733,12 @@ 

       
 
 
-17693
-17694
-17695

+17725
+17726
+17727

     

     
-      
# File 'lib/kettle/jem.rb', line 17693
+      
# File 'lib/kettle/jem.rb', line 17725
 
 def spdx_basename(spdx_id)
   spdx_id.to_s.sub(/\ALicenseRef-/, "")
@@ -86751,14 +86763,14 @@ 

       
 
 
-5518
-5519
-5520
-5521
-5522

+5549
+5550
+5551
+5552
+5553

     

     
-      
# File 'lib/kettle/jem.rb', line 5518
+      
# File 'lib/kettle/jem.rb', line 5549
 
 def spdx_from_basename(basename)
   return "LicenseRef-Big-Time-Public-License" if basename.to_s == "Big-Time-Public-License"
@@ -86785,18 +86797,18 @@ 

 
 
-8676
-8677
-8678
-8679
-8680
-8681
-8682
-8683
-8684

+8707
+8708
+8709
+8710
+8711
+8712
+8713
+8714
+8715

     		
     
-      
# File 'lib/kettle/jem.rb', line 8676
+      
# File 'lib/kettle/jem.rb', line 8707
 
 def spec_helper_simplecov_do_cov_bootstrap_source(indent)
   [
@@ -86827,36 +86839,36 @@ 

       
 
 
-5081
-5082
-5083
-5084
-5085
-5086
-5087
-5088
-5089
-5090
-5091
-5092
-5093
-5094
-5095
-5096
-5097
-5098
-5099
-5100
-5101
-5102
-5103
-5104
-5105
-5106
-5107

+5110
+5111
+5112
+5113
+5114
+5115
+5116
+5117
+5118
+5119
+5120
+5121
+5122
+5123
+5124
+5125
+5126
+5127
+5128
+5129
+5130
+5131
+5132
+5133
+5134
+5135
+5136

     

     
-      
# File 'lib/kettle/jem.rb', line 5081
+      
# File 'lib/kettle/jem.rb', line 5110
 
 def stale_executable_startup_header(ast, require_call:, namespaces:)
   owners = ast.statements&.body.to_a
@@ -86928,34 +86940,34 @@ 

       
 
 
-11672
-11673
-11674
-11675
-11676
-11677
-11678
-11679
-11680
-11681
-11682
-11683
-11684
-11685
-11686
-11687
-11688
-11689
-11690
-11691
-11692
-11693
-11694
-11695
-11696

+11703
+11704
+11705
+11706
+11707
+11708
+11709
+11710
+11711
+11712
+11713
+11714
+11715
+11716
+11717
+11718
+11719
+11720
+11721
+11722
+11723
+11724
+11725
+11726
+11727

     

     
-      
# File 'lib/kettle/jem.rb', line 11672
+      
# File 'lib/kettle/jem.rb', line 11703
 
 def stale_generated_gemspec_files_group?(group)
   node = group.fetch(:node)
@@ -87025,19 +87037,19 @@ 

       
 
 
-11708
-11709
-11710
-11711
-11712
-11713
-11714
-11715
-11716
-11717

+11739
+11740
+11741
+11742
+11743
+11744
+11745
+11746
+11747
+11748

     

     
-      
# File 'lib/kettle/jem.rb', line 11708
+      
# File 'lib/kettle/jem.rb', line 11739
 
 def stale_generated_gemspec_package_glob?(path)
   %w[
@@ -87092,18 +87104,18 @@ 

       
 
 
-11698
-11699
-11700
-11701
-11702
-11703
-11704
-11705
-11706

+11729
+11730
+11731
+11732
+11733
+11734
+11735
+11736
+11737

     

     
-      
# File 'lib/kettle/jem.rb', line 11698
+      
# File 'lib/kettle/jem.rb', line 11729
 
 def stale_generated_gemspec_splat_key?(key)
   return false unless key.is_a?(Array) && key.first == :call
@@ -87134,36 +87146,36 @@ 

 
 
-20060
-20061
-20062
-20063
-20064
-20065
-20066
-20067
-20068
-20069
-20070
-20071
-20072
-20073
-20074
-20075
-20076
-20077
-20078
-20079
-20080
-20081
-20082
-20083
-20084
-20085
-20086

+20096
+20097
+20098
+20099
+20100
+20101
+20102
+20103
+20104
+20105
+20106
+20107
+20108
+20109
+20110
+20111
+20112
+20113
+20114
+20115
+20116
+20117
+20118
+20119
+20120
+20121
+20122

     		
     
-      
# File 'lib/kettle/jem.rb', line 20060
+      
# File 'lib/kettle/jem.rb', line 20096
 
 def stale_github_workflow_template_pin_records(relative_path, final_content, destination_content)
   destination_records = github_workflow_action_pin_records(destination_content)
@@ -87235,16 +87247,16 @@ 

       
 
 
-8170
-8171
-8172
-8173
-8174
-8175
-8176

+8201
+8202
+8203
+8204
+8205
+8206
+8207

     

     
-      
# File 'lib/kettle/jem.rb', line 8170
+      
# File 'lib/kettle/jem.rb', line 8201
 
 def stale_main_gemfile_gem_comment?(line, gem_name)
   stripped = line.to_s.strip
@@ -87273,18 +87285,18 @@ 

 
 
-8160
-8161
-8162
-8163
-8164
-8165
-8166
-8167
-8168

+8191
+8192
+8193
+8194
+8195
+8196
+8197
+8198
+8199

     		
     
-      
# File 'lib/kettle/jem.rb', line 8160
+      
# File 'lib/kettle/jem.rb', line 8191
 
 def stale_main_gemfile_gem_comment_start_line(lines, start_line, gem_name)
   index = start_line.to_i - 2
@@ -87338,18 +87350,18 @@ 

       
 
 
-13700
-13701
-13702
-13703
-13704
-13705
-13706
-13707
-13708

+13731
+13732
+13733
+13734
+13735
+13736
+13737
+13738
+13739

     

     
-      
# File 'lib/kettle/jem.rb', line 13700
+      
# File 'lib/kettle/jem.rb', line 13731
 
 def stale_versioned_engine_workflow?(relative_path)
   return false if preferred_template_source(PACKAGED_TEMPLATE_ROOT, relative_path)
@@ -87380,18 +87392,18 @@ 

       
 
 
-10305
-10306
-10307
-10308
-10309
-10310
-10311
-10312
-10313

+10336
+10337
+10338
+10339
+10340
+10341
+10342
+10343
+10344

     

     
-      
# File 'lib/kettle/jem.rb', line 10305
+      
# File 'lib/kettle/jem.rb', line 10336
 
 def standard_test_appraisal_names(content)
   appraisal_call_records(content).filter_map do |record|
@@ -87422,21 +87434,21 @@ 

       
 
 
-15413
-15414
-15415
-15416
-15417
-15418
-15419
-15420
-15421
-15422
-15423
-15424

+15445
+15446
+15447
+15448
+15449
+15450
+15451
+15452
+15453
+15454
+15455
+15456

     

     
-      
# File 'lib/kettle/jem.rb', line 15413
+      
# File 'lib/kettle/jem.rb', line 15445
 
 def static_gemspec_metadata_assignment(content, key)
   ruby_call_records(content, :[]=).each do |call|
@@ -87493,19 +87505,19 @@ 

       
 
 
-15426
-15427
-15428
-15429
-15430
-15431
-15432
-15433
-15434
-15435

+15458
+15459
+15460
+15461
+15462
+15463
+15464
+15465
+15466
+15467

     

     
-      
# File 'lib/kettle/jem.rb', line 15426
+      
# File 'lib/kettle/jem.rb', line 15458
 
 def static_gemspec_metadata_key_assigned?(content, key)
   ruby_call_records(content, :[]=).any? do |call|
@@ -87537,36 +87549,36 @@ 

       
 
 
-15381
-15382
-15383
-15384
-15385
-15386
-15387
-15388
-15389
-15390
-15391
-15392
-15393
-15394
-15395
-15396
-15397
-15398
-15399
-15400
-15401
-15402
-15403
-15404
-15405
-15406
-15407

+15413
+15414
+15415
+15416
+15417
+15418
+15419
+15420
+15421
+15422
+15423
+15424
+15425
+15426
+15427
+15428
+15429
+15430
+15431
+15432
+15433
+15434
+15435
+15436
+15437
+15438
+15439

     

     
-      
# File 'lib/kettle/jem.rb', line 15381
+      
# File 'lib/kettle/jem.rb', line 15413
 
 def static_project_gemspec_metadata(gemspec_path)
   return {} unless gemspec_path && File.file?(gemspec_path)
@@ -87615,15 +87627,15 @@ 

       
 
 
-4868
-4869
-4870
-4871
-4872
-4873

+4897
+4898
+4899
+4900
+4901
+4902

     

     
-      
# File 'lib/kettle/jem.rb', line 4868
+      
# File 'lib/kettle/jem.rb', line 4897
 
 def step_event_mark(step)
   return ">" if event_payload_value(step, :status).to_s == "started"
@@ -87651,37 +87663,6 @@ 

       
 
 
-13476
-13477
-13478
-13479
-13480
-13481
-13482
-13483
-13484
-13485
-13486
-13487
-13488
-13489
-13490
-13491
-13492
-13493
-13494
-13495
-13496
-13497
-13498
-13499
-13500
-13501
-13502
-13503
-13504
-13505
-13506
 13507
 13508
 13509
@@ -87739,10 +87720,41 @@ 

 13561
 13562
 13563
-13564

+13564
+13565
+13566
+13567
+13568
+13569
+13570
+13571
+13572
+13573
+13574
+13575
+13576
+13577
+13578
+13579
+13580
+13581
+13582
+13583
+13584
+13585
+13586
+13587
+13588
+13589
+13590
+13591
+13592
+13593
+13594
+13595

     

     
-      
# File 'lib/kettle/jem.rb', line 13476
+      
# File 'lib/kettle/jem.rb', line 13507
 
 def step_report_metadata(recipe, deletion)
   metadata = {
@@ -87853,22 +87865,22 @@ 

       
 
 
-4273
-4274
-4275
-4276
-4277
-4278
-4279
-4280
-4281
-4282
-4283
-4284
-4285

+4302
+4303
+4304
+4305
+4306
+4307
+4308
+4309
+4310
+4311
+4312
+4313
+4314

     

     
-      
# File 'lib/kettle/jem.rb', line 4273
+      
# File 'lib/kettle/jem.rb', line 4302
 
 def stringify_keys_for_json(value)
   case value
@@ -87903,12 +87915,12 @@ 

       
 
 
-18116
-18117
-18118

+18148
+18149
+18150

     

     
-      
# File 'lib/kettle/jem.rb', line 18116
+      
# File 'lib/kettle/jem.rb', line 18148
 
 def stringify_template_tokens(tokens)
   tokens.to_h.transform_keys(&:to_s).transform_values(&:to_s)
@@ -87933,19 +87945,19 @@ 

       
 
 
-13277
-13278
-13279
-13280
-13281
-13282
-13283
-13284
-13285
-13286

+13308
+13309
+13310
+13311
+13312
+13313
+13314
+13315
+13316
+13317

     

     
-      
# File 'lib/kettle/jem.rb', line 13277
+      
# File 'lib/kettle/jem.rb', line 13308
 
 def strip_leading_decorative_graphemes(text)
   remaining = text.to_s.sub(/\A\s+/, "")
@@ -87977,18 +87989,18 @@ 

       
 
 
-7140
-7141
-7142
-7143
-7144
-7145
-7146
-7147
-7148

+7171
+7172
+7173
+7174
+7175
+7176
+7177
+7178
+7179

     

     
-      
# File 'lib/kettle/jem.rb', line 7140
+      
# File 'lib/kettle/jem.rb', line 7171
 
 def strip_orphaned_rake_task_requires(content)
   remove_indexes = Set.new
@@ -88019,12 +88031,12 @@ 

       
 
 
-18344
-18345
-18346

+18376
+18377
+18378

     

     
-      
# File 'lib/kettle/jem.rb', line 18344
+      
# File 'lib/kettle/jem.rb', line 18376
 
 def strip_readme_heading_adornment(text)
   text.to_s.sub(/\A(?:\d\uFE0F?\u20E3|[^[:alnum:][:space:]])+[ \t]*/u, "")
@@ -88074,27 +88086,27 @@ 

 
 
-11629
-11630
-11631
-11632
-11633
-11634
-11635
-11636
-11637
-11638
-11639
-11640
-11641
-11642
-11643
-11644
-11645
-11646

+11660
+11661
+11662
+11663
+11664
+11665
+11666
+11667
+11668
+11669
+11670
+11671
+11672
+11673
+11674
+11675
+11676
+11677

     		
     
-      
# File 'lib/kettle/jem.rb', line 11629
+      
# File 'lib/kettle/jem.rb', line 11660
 
 def supported_gemspec_files_nonliteral_group?(group)
   node = group.fetch(:node)
@@ -88134,28 +88146,28 @@ 

 
 
-12673
-12674
-12675
-12676
-12677
-12678
-12679
-12680
-12681
-12682
-12683
-12684
-12685
-12686
-12687
-12688
-12689
-12690
-12691

+12704
+12705
+12706
+12707
+12708
+12709
+12710
+12711
+12712
+12713
+12714
+12715
+12716
+12717
+12718
+12719
+12720
+12721
+12722

     		
     
-      
# File 'lib/kettle/jem.rb', line 12673
+      
# File 'lib/kettle/jem.rb', line 12704
 
 def sync_author_names_documentation_comment(content)
   legacy = "#   AUTHOR:NAMES        <- all authors from the gemspec, or copyright holders if no gemspec authors exist"
@@ -88196,15 +88208,15 @@ 

 
 
-12666
-12667
-12668
-12669
-12670
-12671

+12697
+12698
+12699
+12700
+12701
+12702

     		
     
-      
# File 'lib/kettle/jem.rb', line 12666
+      
# File 'lib/kettle/jem.rb', line 12697
 
 def sync_kettle_config_documentation_comments(content)
   synced = sync_readme_top_logos_documentation_comment(content)
@@ -88232,23 +88244,23 @@ 

       
 
 
-12528
-12529
-12530
-12531
-12532
-12533
-12534
-12535
-12536
-12537
-12538
-12539
-12540
-12541

+12559
+12560
+12561
+12562
+12563
+12564
+12565
+12566
+12567
+12568
+12569
+12570
+12571
+12572

     

     
-      
# File 'lib/kettle/jem.rb', line 12528
+      
# File 'lib/kettle/jem.rb', line 12559
 
 def sync_kettle_config_env_overrides(content, env)
   synced = KETTLE_CONFIG_ENV_SYNC_PATHS.reduce(content.to_s) do |updated, (path, env_key)|
@@ -88284,35 +88296,35 @@ 

 
 
-5327
-5328
-5329
-5330
-5331
-5332
-5333
-5334
-5335
-5336
-5337
-5338
-5339
-5340
-5341
-5342
-5343
-5344
-5345
-5346
-5347
-5348
-5349
-5350
-5351
-5352

+5358
+5359
+5360
+5361
+5362
+5363
+5364
+5365
+5366
+5367
+5368
+5369
+5370
+5371
+5372
+5373
+5374
+5375
+5376
+5377
+5378
+5379
+5380
+5381
+5382
+5383

     		
     
-      
# File 'lib/kettle/jem.rb', line 5327
+      
# File 'lib/kettle/jem.rb', line 5358
 
 def sync_kettle_config_gemspec_strategy_lines!(lines, gemspec_path)
   gemspec = gemspec_path.to_s
@@ -88360,14 +88372,14 @@ 

       
 
 
-12580
-12581
-12582
-12583
-12584

+12611
+12612
+12613
+12614
+12615

     

     
-      
# File 'lib/kettle/jem.rb', line 12580
+      
# File 'lib/kettle/jem.rb', line 12611
 
 def sync_kettle_config_internal_values(content)
   KETTLE_CONFIG_INTERNAL_SYNC_PATHS.reduce(content.to_s) do |updated, (path, value_provider)|
@@ -88394,44 +88406,44 @@ 

 
 
-5291
-5292
-5293
-5294
-5295
-5296
-5297
-5298
-5299
-5300
-5301
-5302
-5303
-5304
-5305
-5306
-5307
-5308
-5309
-5310
-5311
-5312
-5313
-5314
-5315
-5316
-5317
-5318
-5319
-5320
-5321
 5322
 5323
 5324
-5325

+5325
+5326
+5327
+5328
+5329
+5330
+5331
+5332
+5333
+5334
+5335
+5336
+5337
+5338
+5339
+5340
+5341
+5342
+5343
+5344
+5345
+5346
+5347
+5348
+5349
+5350
+5351
+5352
+5353
+5354
+5355
+5356

     		
     
-      
# File 'lib/kettle/jem.rb', line 5291
+      
# File 'lib/kettle/jem.rb', line 5322
 
 def sync_kettle_config_monorepo_subgem_profile(content, gemspec_path, profile)
   normalized_profile = normalize_template_profile(profile)
@@ -88488,24 +88500,24 @@ 

       
 
 
-12556
-12557
-12558
-12559
-12560
-12561
-12562
-12563
-12564
-12565
-12566
-12567
-12568
-12569
-12570

+12587
+12588
+12589
+12590
+12591
+12592
+12593
+12594
+12595
+12596
+12597
+12598
+12599
+12600
+12601

     

     
-      
# File 'lib/kettle/jem.rb', line 12556
+      
# File 'lib/kettle/jem.rb', line 12587
 
 def sync_kettle_config_project_hostnames(content)
   config = YAML.safe_load(content.to_s, permitted_classes: [], aliases: true) || {}
@@ -88542,35 +88554,35 @@ 

 
 
-5354
-5355
-5356
-5357
-5358
-5359
-5360
-5361
-5362
-5363
-5364
-5365
-5366
-5367
-5368
-5369
-5370
-5371
-5372
-5373
-5374
-5375
-5376
-5377
-5378
-5379

+5385
+5386
+5387
+5388
+5389
+5390
+5391
+5392
+5393
+5394
+5395
+5396
+5397
+5398
+5399
+5400
+5401
+5402
+5403
+5404
+5405
+5406
+5407
+5408
+5409
+5410

     		
     
-      
# File 'lib/kettle/jem.rb', line 5354
+      
# File 'lib/kettle/jem.rb', line 5385
 
 def sync_kettle_config_rakefile_strategy_lines!(lines)
   files_index = lines.index("files:")
@@ -88618,37 +88630,37 @@ 

 
 
-12741
-12742
-12743
-12744
-12745
-12746
-12747
-12748
-12749
-12750
-12751
-12752
-12753
-12754
-12755
-12756
-12757
-12758
-12759
-12760
-12761
-12762
-12763
-12764
-12765
-12766
-12767
-12768

+12772
+12773
+12774
+12775
+12776
+12777
+12778
+12779
+12780
+12781
+12782
+12783
+12784
+12785
+12786
+12787
+12788
+12789
+12790
+12791
+12792
+12793
+12794
+12795
+12796
+12797
+12798
+12799

     		
     
-      
# File 'lib/kettle/jem.rb', line 12741
+      
# File 'lib/kettle/jem.rb', line 12772
 
 def sync_readme_top_logos_documentation_comment(content)
   lines = content.to_s.lines
@@ -88698,39 +88710,6 @@ 

       
 
 
-19537
-19538
-19539
-19540
-19541
-19542
-19543
-19544
-19545
-19546
-19547
-19548
-19549
-19550
-19551
-19552
-19553
-19554
-19555
-19556
-19557
-19558
-19559
-19560
-19561
-19562
-19563
-19564
-19565
-19566
-19567
-19568
-19569
 19570
 19571
 19572
@@ -88755,10 +88734,43 @@ 

 19591
 19592
 19593
-19594

+19594
+19595
+19596
+19597
+19598
+19599
+19600
+19601
+19602
+19603
+19604
+19605
+19606
+19607
+19608
+19609
+19610
+19611
+19612
+19613
+19614
+19615
+19616
+19617
+19618
+19619
+19620
+19621
+19622
+19623
+19624
+19625
+19626
+19627

     

     
-      
# File 'lib/kettle/jem.rb', line 19537
+      
# File 'lib/kettle/jem.rb', line 19570
 
 def synchronize_github_actions_ci(content, facts)
   package = facts.fetch(:package)
@@ -88838,39 +88850,6 @@ 

       
 
 
-19732
-19733
-19734
-19735
-19736
-19737
-19738
-19739
-19740
-19741
-19742
-19743
-19744
-19745
-19746
-19747
-19748
-19749
-19750
-19751
-19752
-19753
-19754
-19755
-19756
-19757
-19758
-19759
-19760
-19761
-19762
-19763
-19764
 19765
 19766
 19767
@@ -88930,10 +88909,43 @@ 

 19821
 19822
 19823
-19824

+19824
+19825
+19826
+19827
+19828
+19829
+19830
+19831
+19832
+19833
+19834
+19835
+19836
+19837
+19838
+19839
+19840
+19841
+19842
+19843
+19844
+19845
+19846
+19847
+19848
+19849
+19850
+19851
+19852
+19853
+19854
+19855
+19856
+19857

     

     
-      
# File 'lib/kettle/jem.rb', line 19732
+      
# File 'lib/kettle/jem.rb', line 19765
 
 def synchronize_github_actions_coverage_ci(content, facts)
   ci = facts.fetch(:ci)
@@ -89048,39 +89060,6 @@ 

 
 
-19596
-19597
-19598
-19599
-19600
-19601
-19602
-19603
-19604
-19605
-19606
-19607
-19608
-19609
-19610
-19611
-19612
-19613
-19614
-19615
-19616
-19617
-19618
-19619
-19620
-19621
-19622
-19623
-19624
-19625
-19626
-19627
-19628
 19629
 19630
 19631
@@ -89126,10 +89105,43 @@ 

+19674
+19675
+19676
+19677
+19678
+19679
+19680
+19681
+19682
+19683
+19684
+19685
+19686
+19687
+19688
+19689
+19690
+19691
+19692
+19693
+19694
+19695
+19696
+19697
+19698
+19699
+19700
+19701
+19702
+19703
+19704
+19705
+19706
+19707

     

     
-      
# File 'lib/kettle/jem.rb', line 19596
+      
# File 'lib/kettle/jem.rb', line 19629
 
 def synchronize_github_actions_framework_ci(content, facts)
   ci = facts.fetch(:ci)
@@ -89253,28 +89265,28 @@ 

 
 
-19712
-19713
-19714
-19715
-19716
-19717
-19718
-19719
-19720
-19721
-19722
-19723
-19724
-19725
-19726
-19727
-19728
-19729
-19730

+19745
+19746
+19747
+19748
+19749
+19750
+19751
+19752
+19753
+19754
+19755
+19756
+19757
+19758
+19759
+19760
+19761
+19762
+19763

     		
     
-      
# File 'lib/kettle/jem.rb', line 19712
+      
# File 'lib/kettle/jem.rb', line 19745
 
 def synchronize_github_actions_framework_gemfile(target_path, facts)
   gemfile = facts.dig(:ci, :framework_matrix, :gemfiles).to_a.find do |entry|
@@ -89315,25 +89327,25 @@ 

 
 
-19826
-19827
-19828
-19829
-19830
-19831
-19832
-19833
-19834
-19835
-19836
-19837
-19838
-19839
-19840
-19841

+19859
+19860
+19861
+19862
+19863
+19864
+19865
+19866
+19867
+19868
+19869
+19870
+19871
+19872
+19873
+19874

     		
     
-      
# File 'lib/kettle/jem.rb', line 19826
+      
# File 'lib/kettle/jem.rb', line 19859
 
 def synchronize_github_actions_workflow_snippets(content, facts: {})
   updated = ensure_workflow_top_level_section(
@@ -89371,27 +89383,27 @@ 

       
 
 
-19349
-19350
-19351
-19352
-19353
-19354
-19355
-19356
-19357
-19358
-19359
-19360
-19361
-19362
-19363
-19364
-19365
-19366

+19382
+19383
+19384
+19385
+19386
+19387
+19388
+19389
+19390
+19391
+19392
+19393
+19394
+19395
+19396
+19397
+19398
+19399

     

     
-      
# File 'lib/kettle/jem.rb', line 19349
+      
# File 'lib/kettle/jem.rb', line 19382
 
 def synchronize_github_funding_yml(content, facts)
   output = content.to_s
@@ -89431,19 +89443,19 @@ 

       
 
 
-6718
-6719
-6720
-6721
-6722
-6723
-6724
-6725
-6726
-6727

+6749
+6750
+6751
+6752
+6753
+6754
+6755
+6756
+6757
+6758

     

     
-      
# File 'lib/kettle/jem.rb', line 6718
+      
# File 'lib/kettle/jem.rb', line 6749
 
 def synchronize_managed_block(content, facts)
   replacement = facts.dig(:generated_blocks, :shunted_gemfile) || [
@@ -89475,23 +89487,23 @@ 

       
 
 
-6028
-6029
-6030
-6031
-6032
-6033
-6034
-6035
-6036
-6037
-6038
-6039
-6040
-6041

+6059
+6060
+6061
+6062
+6063
+6064
+6065
+6066
+6067
+6068
+6069
+6070
+6071
+6072

     

     
-      
# File 'lib/kettle/jem.rb', line 6028
+      
# File 'lib/kettle/jem.rb', line 6059
 
 def synchronize_readme(content, facts, project_root: nil)
   package = facts.fetch(:package)
@@ -89527,15 +89539,15 @@ 

       
 
 
-18433
-18434
-18435
-18436
-18437
-18438

+18465
+18466
+18467
+18468
+18469
+18470

     

     
-      
# File 'lib/kettle/jem.rb', line 18433
+      
# File 'lib/kettle/jem.rb', line 18465
 
 def template_activation_config(config)
   return config["templates"] if config["templates"].is_a?(Hash)
@@ -89563,12 +89575,12 @@ 

       
 
 
-9945
-9946
-9947

+9976
+9977
+9978

     

     
-      
# File 'lib/kettle/jem.rb', line 9945
+      
# File 'lib/kettle/jem.rb', line 9976
 
 def template_bootstrap_dependency_names(ruby_version: RUBY_VERSION)
   ([PACKAGE_NAME] + template_managed_dependency_names(bootstrap: true, ruby_version: ruby_version)).uniq
@@ -89593,15 +89605,15 @@ 

       
 
 
-18446
-18447
-18448
-18449
-18450
-18451

+18478
+18479
+18480
+18481
+18482
+18483

     

     
-      
# File 'lib/kettle/jem.rb', line 18446
+      
# File 'lib/kettle/jem.rb', line 18478
 
 def template_entries(project_root, root, templates)
   return templates["entries"] if templates["entries"].is_a?(Array)
@@ -89652,14 +89664,14 @@ 

       
 
 
-18967
-18968
-18969
-18970
-18971

+19000
+19001
+19002
+19003
+19004

     

     
-      
# File 'lib/kettle/jem.rb', line 18967
+      
# File 'lib/kettle/jem.rb', line 19000
 
 def template_entry_apply?(entry, apply_templates)
   return entry["apply"] == true if entry.is_a?(Hash) && entry.key?("apply")
@@ -89686,19 +89698,19 @@ 

       
 
 
-18956
-18957
-18958
-18959
-18960
-18961
-18962
-18963
-18964
-18965

+18989
+18990
+18991
+18992
+18993
+18994
+18995
+18996
+18997
+18998

     

     
-      
# File 'lib/kettle/jem.rb', line 18956
+      
# File 'lib/kettle/jem.rb', line 18989
 
 def template_entry_paths(entry)
   if entry.is_a?(Hash)
@@ -89741,43 +89753,43 @@ 

       
 
 
-4056
-4057
-4058
-4059
-4060
-4061
-4062
-4063
-4064
-4065
-4066
-4067
-4068
-4069
-4070
-4071
-4072
-4073
-4074
-4075
-4076
-4077
-4078
-4079
-4080
-4081
-4082
-4083
-4084
 4085
 4086
 4087
 4088
-4089

+4089
+4090
+4091
+4092
+4093
+4094
+4095
+4096
+4097
+4098
+4099
+4100
+4101
+4102
+4103
+4104
+4105
+4106
+4107
+4108
+4109
+4110
+4111
+4112
+4113
+4114
+4115
+4116
+4117
+4118

     

     
-      
# File 'lib/kettle/jem.rb', line 4056
+      
# File 'lib/kettle/jem.rb', line 4085
 
 def template_file_outcomes(recipe_reports)
   latest_by_path = {}
@@ -89833,25 +89845,25 @@ 

       
 
 
-18716
-18717
-18718
-18719
-18720
-18721
-18722
-18723
-18724
-18725
-18726
-18727
-18728
-18729
-18730
-18731

+18749
+18750
+18751
+18752
+18753
+18754
+18755
+18756
+18757
+18758
+18759
+18760
+18761
+18762
+18763
+18764

     

     
-      
# File 'lib/kettle/jem.rb', line 18716
+      
# File 'lib/kettle/jem.rb', line 18749
 
 def template_file_strategy_config(config, target_path)
   files = config["files"]
@@ -89889,36 +89901,36 @@ 

       
 
 
-12399
-12400
-12401
-12402
-12403
-12404
-12405
-12406
-12407
-12408
-12409
-12410
-12411
-12412
-12413
-12414
-12415
-12416
-12417
-12418
-12419
-12420
-12421
-12422
-12423
-12424
-12425

+12430
+12431
+12432
+12433
+12434
+12435
+12436
+12437
+12438
+12439
+12440
+12441
+12442
+12443
+12444
+12445
+12446
+12447
+12448
+12449
+12450
+12451
+12452
+12453
+12454
+12455
+12456

     

     
-      
# File 'lib/kettle/jem.rb', line 12399
+      
# File 'lib/kettle/jem.rb', line 12430
 
 def template_file_type(recipe)
   configured = recipe.dig(:template_preference, :file_type).to_s
@@ -89967,15 +89979,15 @@ 

       
 
 
-4241
-4242
-4243
-4244
-4245
-4246

+4270
+4271
+4272
+4273
+4274
+4275

     

     
-      
# File 'lib/kettle/jem.rb', line 4241
+      
# File 'lib/kettle/jem.rb', line 4270
 
 def template_file_type_for_relative_path(relative_path)
   basename = File.basename(relative_path.to_s)
@@ -90003,12 +90015,12 @@ 

       
 
 
-4173
-4174
-4175

+4202
+4203
+4204

     

     
-      
# File 'lib/kettle/jem.rb', line 4173
+      
# File 'lib/kettle/jem.rb', line 4202
 
 def template_input_fingerprint(project_root, report)
   Digest::SHA256.hexdigest(JSON.generate(template_input_fingerprint_payload(project_root, report)))
@@ -90033,35 +90045,6 @@ 

       
 
 
-4177
-4178
-4179
-4180
-4181
-4182
-4183
-4184
-4185
-4186
-4187
-4188
-4189
-4190
-4191
-4192
-4193
-4194
-4195
-4196
-4197
-4198
-4199
-4200
-4201
-4202
-4203
-4204
-4205
 4206
 4207
 4208
@@ -90076,10 +90059,39 @@ 

 4217
 4218
 4219
-4220

+4220
+4221
+4222
+4223
+4224
+4225
+4226
+4227
+4228
+4229
+4230
+4231
+4232
+4233
+4234
+4235
+4236
+4237
+4238
+4239
+4240
+4241
+4242
+4243
+4244
+4245
+4246
+4247
+4248
+4249

     

     
-      
# File 'lib/kettle/jem.rb', line 4177
+      
# File 'lib/kettle/jem.rb', line 4206
 
 def template_input_fingerprint_payload(project_root, report)
   metadata = report.fetch(:metadata, {})
@@ -90145,36 +90157,36 @@ 

       
 
 
-18470
-18471
-18472
-18473
-18474
-18475
-18476
-18477
-18478
-18479
-18480
-18481
-18482
-18483
-18484
-18485
-18486
-18487
-18488
-18489
-18490
-18491
-18492
-18493
-18494
-18495
-18496

+18502
+18503
+18504
+18505
+18506
+18507
+18508
+18509
+18510
+18511
+18512
+18513
+18514
+18515
+18516
+18517
+18518
+18519
+18520
+18521
+18522
+18523
+18524
+18525
+18526
+18527
+18528

     

     
-      
# File 'lib/kettle/jem.rb', line 18470
+      
# File 'lib/kettle/jem.rb', line 18502
 
 def template_inventory_entries(project_root, template_root_path, templates: {})
   logical_paths = []
@@ -90223,24 +90235,24 @@ 

       
 
 
-18498
-18499
-18500
-18501
-18502
-18503
-18504
-18505
-18506
-18507
-18508
-18509
-18510
-18511
-18512

+18530
+18531
+18532
+18533
+18534
+18535
+18536
+18537
+18538
+18539
+18540
+18541
+18542
+18543
+18544

     

     
-      
# File 'lib/kettle/jem.rb', line 18498
+      
# File 'lib/kettle/jem.rb', line 18530
 
 def template_inventory_target_path(project_root, logical_path)
   return ".env.local.example" if logical_path == ".env.local"
@@ -90300,13 +90312,13 @@ 

       
 
 
-19197
-19198
-19199
-19200

+19230
+19231
+19232
+19233

     

     
-      
# File 'lib/kettle/jem.rb', line 19197
+      
# File 'lib/kettle/jem.rb', line 19230
 
 def template_keep_destination_path?(config, target_path)
   strategy = template_file_strategy_config(config, target_path) || template_pattern_strategy_config(config, target_path)
@@ -90332,23 +90344,23 @@ 

       
 
 
-18678
-18679
-18680
-18681
-18682
-18683
-18684
-18685
-18686
-18687
-18688
-18689
-18690
-18691

+18711
+18712
+18713
+18714
+18715
+18716
+18717
+18718
+18719
+18720
+18721
+18722
+18723
+18724

     

     
-      
# File 'lib/kettle/jem.rb', line 18678
+      
# File 'lib/kettle/jem.rb', line 18711
 
 def template_legacy_destination_cleanups(project_root, preferences)
   preferences.filter_map do |preference|
@@ -90384,12 +90396,12 @@ 

       
 
 
-4104
-4105
-4106

+4133
+4134
+4135

     

     
-      
# File 'lib/kettle/jem.rb', line 4104
+      
# File 'lib/kettle/jem.rb', line 4133
 
 def template_lock_state(project_root)
   TemplateLock.load(project_root: project_root, config_path: kettle_jem_config_path(project_root))
@@ -90414,12 +90426,12 @@ 

       
 
 
-9926
-9927
-9928

+9957
+9958
+9959

     

     
-      
# File 'lib/kettle/jem.rb', line 9926
+      
# File 'lib/kettle/jem.rb', line 9957
 
 def template_managed_dependency(name)
   TEMPLATE_MANAGED_DEPENDENCIES.find { |dependency| dependency.fetch(:name) == name.to_s }
@@ -90467,15 +90479,15 @@ 

       
 
 
-9949
-9950
-9951
-9952
-9953
-9954

+9980
+9981
+9982
+9983
+9984
+9985

     

     
-      
# File 'lib/kettle/jem.rb', line 9949
+      
# File 'lib/kettle/jem.rb', line 9980
 
 def template_managed_dependency_active?(dependency, ruby_version = RUBY_VERSION)
   requirement = dependency[:ruby_requirement]
@@ -90526,14 +90538,14 @@ 

       
 
 
-9990
-9991
-9992
-9993
-9994

+10021
+10022
+10023
+10024
+10025

     

     
-      
# File 'lib/kettle/jem.rb', line 9990
+      
# File 'lib/kettle/jem.rb', line 10021
 
 def template_managed_dependency_call?(call)
   return call.receiver.nil? && call.name == :gem if call.name == :gem
@@ -90560,17 +90572,17 @@ 

       
 
 
-9936
-9937
-9938
-9939
-9940
-9941
-9942
-9943

+9967
+9968
+9969
+9970
+9971
+9972
+9973
+9974

     

     
-      
# File 'lib/kettle/jem.rb', line 9936
+      
# File 'lib/kettle/jem.rb', line 9967
 
 def template_managed_dependency_names(bootstrap: nil, ruby_version: RUBY_VERSION)
   TEMPLATE_MANAGED_DEPENDENCIES.filter_map do |dependency|
@@ -90600,14 +90612,14 @@ 

 
 
-9930
-9931
-9932
-9933
-9934

+9961
+9962
+9963
+9964
+9965

     		
     
-      
# File 'lib/kettle/jem.rb', line 9930
+      
# File 'lib/kettle/jem.rb', line 9961
 
 def template_managed_dependency_requirements(name, version_module: Version)
   return kettle_jem_dependency_requirements(version_module: version_module) if name.to_s == PACKAGE_NAME
@@ -90634,18 +90646,18 @@ 

       
 
 
-2608
-2609
-2610
-2611
-2612
-2613
-2614
-2615
-2616

+2637
+2638
+2639
+2640
+2641
+2642
+2643
+2644
+2645

     

     
-      
# File 'lib/kettle/jem.rb', line 2608
+      
# File 'lib/kettle/jem.rb', line 2637
 
 def template_manifest(project_root: Dir.pwd, template_root: nil, config: nil)
   root = template_root || template_root_path(project_root, config: config)
@@ -90676,27 +90688,27 @@ 

       
 
 
-18693
-18694
-18695
-18696
-18697
-18698
-18699
-18700
-18701
-18702
-18703
-18704
-18705
-18706
-18707
-18708
-18709
-18710

+18726
+18727
+18728
+18729
+18730
+18731
+18732
+18733
+18734
+18735
+18736
+18737
+18738
+18739
+18740
+18741
+18742
+18743

     

     
-      
# File 'lib/kettle/jem.rb', line 18693
+      
# File 'lib/kettle/jem.rb', line 18726
 
 def template_obsolete_license_cleanups(project_root, config, preferences, license_txt: {})
   active_basenames = active_license_basenames(config)
@@ -90736,21 +90748,21 @@ 

       
 
 
-18733
-18734
-18735
-18736
-18737
-18738
-18739
-18740
-18741
-18742
-18743
-18744

+18766
+18767
+18768
+18769
+18770
+18771
+18772
+18773
+18774
+18775
+18776
+18777

     

     
-      
# File 'lib/kettle/jem.rb', line 18733
+      
# File 'lib/kettle/jem.rb', line 18766
 
 def template_pattern_strategy_config(config, target_path)
   patterns = config["patterns"]
@@ -90784,23 +90796,23 @@ 

       
 
 
-18783
-18784
-18785
-18786
-18787
-18788
-18789
-18790
-18791
-18792
-18793
-18794
-18795
-18796

+18816
+18817
+18818
+18819
+18820
+18821
+18822
+18823
+18824
+18825
+18826
+18827
+18828
+18829

     

     
-      
# File 'lib/kettle/jem.rb', line 18783
+      
# File 'lib/kettle/jem.rb', line 18816
 
 def template_root(project_root, templates)
   configured_root = templates["root"].to_s
@@ -90836,15 +90848,15 @@ 

       
 
 
-2601
-2602
-2603
-2604
-2605
-2606

+2630
+2631
+2632
+2633
+2634
+2635

     

     
-      
# File 'lib/kettle/jem.rb', line 2601
+      
# File 'lib/kettle/jem.rb', line 2630
 
 def template_root_path(project_root = Dir.pwd, config: nil)
   root = File.expand_path(project_root.to_s)
@@ -90872,28 +90884,28 @@ 

       
 
 
-18403
-18404
-18405
-18406
-18407
-18408
-18409
-18410
-18411
-18412
-18413
-18414
-18415
-18416
-18417
-18418
-18419
-18420
-18421

+18435
+18436
+18437
+18438
+18439
+18440
+18441
+18442
+18443
+18444
+18445
+18446
+18447
+18448
+18449
+18450
+18451
+18452
+18453

     

     
-      
# File 'lib/kettle/jem.rb', line 18403
+      
# File 'lib/kettle/jem.rb', line 18435
 
 def template_runtime_config(config, facts, license: {})
   result = deep_dup(config)
@@ -90934,32 +90946,32 @@ 

       
 
 
-13306
-13307
-13308
-13309
-13310
-13311
-13312
-13313
-13314
-13315
-13316
-13317
-13318
-13319
-13320
-13321
-13322
-13323
-13324
-13325
-13326
-13327
-13328

+13337
+13338
+13339
+13340
+13341
+13342
+13343
+13344
+13345
+13346
+13347
+13348
+13349
+13350
+13351
+13352
+13353
+13354
+13355
+13356
+13357
+13358
+13359

     

     
-      
# File 'lib/kettle/jem.rb', line 13306
+      
# File 'lib/kettle/jem.rb', line 13337
 
 def template_selection_for(env, run_options)
   env_hash = env || {}
@@ -91004,19 +91016,19 @@ 

       
 
 
-4248
-4249
-4250
-4251
-4252
-4253
-4254
-4255
-4256
-4257

+4277
+4278
+4279
+4280
+4281
+4282
+4283
+4284
+4285
+4286

     

     
-      
# File 'lib/kettle/jem.rb', line 4248
+      
# File 'lib/kettle/jem.rb', line 4277
 
 def template_source_absolute_path(project_root, preference)
   return unless preference.is_a?(Hash)
@@ -91071,21 +91083,21 @@ 

 
 
-4648
-4649
-4650
-4651
-4652
-4653
-4654
-4655
-4656
-4657
-4658
-4659

+4677
+4678
+4679
+4680
+4681
+4682
+4683
+4684
+4685
+4686
+4687
+4688

     		
     
-      
# File 'lib/kettle/jem.rb', line 4648
+      
# File 'lib/kettle/jem.rb', line 4677
 
 def template_source_application_worker_safe?(recipe)
   return false unless recipe.fetch(:primitive).to_s == "supplied_template_source_application"
@@ -91119,15 +91131,15 @@ 

       
 
 
-18949
-18950
-18951
-18952
-18953
-18954

+18982
+18983
+18984
+18985
+18986
+18987

     

     
-      
# File 'lib/kettle/jem.rb', line 18949
+      
# File 'lib/kettle/jem.rb', line 18982
 
 def template_source_display_path(template_root, selected_source)
   prefix = template_root[:display_prefix].to_s
@@ -91155,15 +91167,15 @@ 

       
 
 
-4259
-4260
-4261
-4262
-4263
-4264

+4288
+4289
+4290
+4291
+4292
+4293

     

     
-      
# File 'lib/kettle/jem.rb', line 4259
+      
# File 'lib/kettle/jem.rb', line 4288
 
 def template_source_lock_path(preference)
   return "" unless preference.is_a?(Hash)
@@ -91191,39 +91203,6 @@ 

       
 
 
-18615
-18616
-18617
-18618
-18619
-18620
-18621
-18622
-18623
-18624
-18625
-18626
-18627
-18628
-18629
-18630
-18631
-18632
-18633
-18634
-18635
-18636
-18637
-18638
-18639
-18640
-18641
-18642
-18643
-18644
-18645
-18646
-18647
 18648
 18649
 18650
@@ -91241,10 +91220,43 @@ 

 18662
 18663
 18664
-18665

+18665
+18666
+18667
+18668
+18669
+18670
+18671
+18672
+18673
+18674
+18675
+18676
+18677
+18678
+18679
+18680
+18681
+18682
+18683
+18684
+18685
+18686
+18687
+18688
+18689
+18690
+18691
+18692
+18693
+18694
+18695
+18696
+18697
+18698

     

     
-      
# File 'lib/kettle/jem.rb', line 18615
+      
# File 'lib/kettle/jem.rb', line 18648
 
 def template_source_preference(project_root, template_root, entry, config, opencollective_disabled: false, include_patterns: nil, apply_templates: false)
   source_path, target_path = template_entry_paths(entry)
@@ -91317,30 +91329,30 @@ 

       
 
 
-18348
-18349
-18350
-18351
-18352
-18353
-18354
-18355
-18356
-18357
-18358
-18359
-18360
-18361
-18362
-18363
-18364
-18365
-18366
-18367
-18368

+18380
+18381
+18382
+18383
+18384
+18385
+18386
+18387
+18388
+18389
+18390
+18391
+18392
+18393
+18394
+18395
+18396
+18397
+18398
+18399
+18400

     

     
-      
# File 'lib/kettle/jem.rb', line 18348
+      
# File 'lib/kettle/jem.rb', line 18380
 
 def template_source_preferences(project_root, config, opencollective_disabled: false, include_patterns: nil)
   templates = template_activation_config(config)
@@ -91383,20 +91395,20 @@ 

       
 
 
-18982
-18983
-18984
-18985
-18986
-18987
-18988
-18989
-18990
-18991
-18992

+19015
+19016
+19017
+19018
+19019
+19020
+19021
+19022
+19023
+19024
+19025

     

     
-      
# File 'lib/kettle/jem.rb', line 18982
+      
# File 'lib/kettle/jem.rb', line 19015
 
 def template_source_selection_reason(configured_source, selected_source)
   if selected_source.end_with?(".no-osc.example")
@@ -91429,12 +91441,12 @@ 

       
 
 
-18712
-18713
-18714

+18745
+18746
+18747

     

     
-      
# File 'lib/kettle/jem.rb', line 18712
+      
# File 'lib/kettle/jem.rb', line 18745
 
 def template_strategy_config(config, target_path)
   template_file_strategy_config(config, target_path) || template_pattern_strategy_config(config, target_path)
@@ -91482,45 +91494,45 @@ 

       
 
 
-18746
-18747
-18748
-18749
-18750
-18751
-18752
-18753
-18754
-18755
-18756
-18757
-18758
-18759
-18760
-18761
-18762
-18763
-18764
-18765
-18766
-18767
-18768
-18769
-18770
-18771
-18772
-18773
-18774
-18775
-18776
-18777
-18778
 18779
 18780
-18781

+18781
+18782
+18783
+18784
+18785
+18786
+18787
+18788
+18789
+18790
+18791
+18792
+18793
+18794
+18795
+18796
+18797
+18798
+18799
+18800
+18801
+18802
+18803
+18804
+18805
+18806
+18807
+18808
+18809
+18810
+18811
+18812
+18813
+18814

     

     
-      
# File 'lib/kettle/jem.rb', line 18746
+      
# File 'lib/kettle/jem.rb', line 18779
 
 def template_strategy_entry(config, path, entry)
   strategy = entry["strategy"].to_s.strip.downcase.to_sym
@@ -91578,37 +91590,6 @@ 

       
 
 
-14361
-14362
-14363
-14364
-14365
-14366
-14367
-14368
-14369
-14370
-14371
-14372
-14373
-14374
-14375
-14376
-14377
-14378
-14379
-14380
-14381
-14382
-14383
-14384
-14385
-14386
-14387
-14388
-14389
-14390
-14391
 14392
 14393
 14394
@@ -91642,10 +91623,42 @@ 

 14422
 14423
 14424
-14425

+14425
+14426
+14427
+14428
+14429
+14430
+14431
+14432
+14433
+14434
+14435
+14436
+14437
+14438
+14439
+14440
+14441
+14442
+14443
+14444
+14445
+14446
+14447
+14448
+14449
+14450
+14451
+14452
+14453
+14454
+14455
+14456
+14457

     

     
-      
# File 'lib/kettle/jem.rb', line 14361
+      
# File 'lib/kettle/jem.rb', line 14392
 
 def template_tokens(facts, funding)
   package = facts.fetch(:package)
@@ -91655,6 +91668,7 @@ 

   github_org = facts.fetch(:repository, {})[:slug].to_s.split("/", 2).first.to_s if github_org.empty?
   tokens = {
     "KJ|GEM_NAME" => package.fetch(:name).to_s,
+    "KJ|GEMSPEC_PATH" => rubygems.fetch(:gemspec_path, "").to_s,
     "KJ|PACKAGE_SUMMARY" => package.fetch(:summary, package.fetch(:description, "")).to_s,
     "KJ|PACKAGE_DESCRIPTION" => package.fetch(:description, package.fetch(:summary, "")).to_s,
     "KJ|GEMSPEC_PACKAGE_SUMMARY" => ruby_double_quoted_string_body(strip_leading_decorative_graphemes(package.fetch(:summary, package.fetch(:description, "")).to_s)),
@@ -91732,37 +91746,6 @@ 

       
 
 
-5524
-5525
-5526
-5527
-5528
-5529
-5530
-5531
-5532
-5533
-5534
-5535
-5536
-5537
-5538
-5539
-5540
-5541
-5542
-5543
-5544
-5545
-5546
-5547
-5548
-5549
-5550
-5551
-5552
-5553
-5554
 5555
 5556
 5557
@@ -91801,10 +91784,41 @@ 

 5590
 5591
 5592
-5593

+5593
+5594
+5595
+5596
+5597
+5598
+5599
+5600
+5601
+5602
+5603
+5604
+5605
+5606
+5607
+5608
+5609
+5610
+5611
+5612
+5613
+5614
+5615
+5616
+5617
+5618
+5619
+5620
+5621
+5622
+5623
+5624

     

     
-      
# File 'lib/kettle/jem.rb', line 5524
+      
# File 'lib/kettle/jem.rb', line 5555
 
 def template_version_gem_bootstrap_step(project_root, report)
   facts = report.fetch(:facts)
@@ -91896,19 +91910,19 @@ 

       
 
 
-8384
-8385
-8386
-8387
-8388
-8389
-8390
-8391
-8392
-8393

+8415
+8416
+8417
+8418
+8419
+8420
+8421
+8422
+8423
+8424

     

     
-      
# File 'lib/kettle/jem.rb', line 8384
+      
# File 'lib/kettle/jem.rb', line 8415
 
 def templating_guard_records(content)
   result = prism_parse_success(content)
@@ -91940,14 +91954,14 @@ 

       
 
 
-4793
-4794
-4795
-4796
-4797

+4822
+4823
+4824
+4825
+4826

     

     
-      
# File 'lib/kettle/jem.rb', line 4793
+      
# File 'lib/kettle/jem.rb', line 4822
 
 def timed_recipe_report
   started_at = monotonic_time
@@ -91974,13 +91988,13 @@ 

       
 
 
-14796
-14797
-14798
-14799

+14828
+14829
+14830
+14831

     

     
-      
# File 'lib/kettle/jem.rb', line 14796
+      
# File 'lib/kettle/jem.rb', line 14828
 
 def token_config_values(config)
   raw = config.is_a?(Hash) ? config["tokens"] : nil
@@ -92029,12 +92043,12 @@ 

       
 
 
-14817
-14818
-14819

+14849
+14850
+14851

     

     
-      
# File 'lib/kettle/jem.rb', line 14817
+      
# File 'lib/kettle/jem.rb', line 14849
 
 def token_placeholder?(value)
   value.to_s.strip.match?(%r{\A\{KJ\|[A-Z][A-Z0-9_:]*\}\z})
@@ -92059,21 +92073,21 @@ 

       
 
 
-7317
-7318
-7319
-7320
-7321
-7322
-7323
-7324
-7325
-7326
-7327
-7328

+7348
+7349
+7350
+7351
+7352
+7353
+7354
+7355
+7356
+7357
+7358
+7359

     

     
-      
# File 'lib/kettle/jem.rb', line 7317
+      
# File 'lib/kettle/jem.rb', line 7348
 
 def toml_string_scalar_line_value(content, key)
   content.to_s.lines.each do |line|
@@ -92107,15 +92121,15 @@ 

       
 
 
-19503
-19504
-19505
-19506
-19507
-19508

+19536
+19537
+19538
+19539
+19540
+19541

     

     
-      
# File 'lib/kettle/jem.rb', line 19503
+      
# File 'lib/kettle/jem.rb', line 19536
 
 def top_level_ruby_call_records(content, call_name)
   result = prism_parse_success(content)
@@ -92166,14 +92180,14 @@ 

       
 
 
-5415
-5416
-5417
-5418
-5419

+5446
+5447
+5448
+5449
+5450

     

     
-      
# File 'lib/kettle/jem.rb', line 5415
+      
# File 'lib/kettle/jem.rb', line 5446
 
 def top_level_yaml_key_line?(line)
   return false if line.to_s.empty? || line.start_with?("#") || line.start_with?(" ")
@@ -92200,41 +92214,41 @@ 

       
 
 
-6325
-6326
-6327
-6328
-6329
-6330
-6331
-6332
-6333
-6334
-6335
-6336
-6337
-6338
-6339
-6340
-6341
-6342
-6343
-6344
-6345
-6346
-6347
-6348
-6349
-6350
-6351
-6352
-6353
-6354
-6355
-6356

+6356
+6357
+6358
+6359
+6360
+6361
+6362
+6363
+6364
+6365
+6366
+6367
+6368
+6369
+6370
+6371
+6372
+6373
+6374
+6375
+6376
+6377
+6378
+6379
+6380
+6381
+6382
+6383
+6384
+6385
+6386
+6387

     

     
-      
# File 'lib/kettle/jem.rb', line 6325
+      
# File 'lib/kettle/jem.rb', line 6356
 
 def transfer_changelog_context(project_root, env: ENV)
   config = kettle_jem_config(project_root)
@@ -92288,12 +92302,12 @@ 

       
 
 
-6300
-6301
-6302

+6331
+6332
+6333

     

     
-      
# File 'lib/kettle/jem.rb', line 6300
+      
# File 'lib/kettle/jem.rb', line 6331
 
 def transfer_changelog_entries
   changelog_transfer_entries(PACKAGED_TEMPLATE_ROOT)
@@ -92341,15 +92355,15 @@ 

       
 
 
-6389
-6390
-6391
-6392
-6393
-6394

+6420
+6421
+6422
+6423
+6424
+6425

     

     
-      
# File 'lib/kettle/jem.rb', line 6389
+      
# File 'lib/kettle/jem.rb', line 6420
 
 def transfer_changelog_entry_applies?(entry, context)
   filter = entry[:filter]
@@ -92377,15 +92391,15 @@ 

       
 
 
-6367
-6368
-6369
-6370
-6371
-6372

+6398
+6399
+6400
+6401
+6402
+6403

     

     
-      
# File 'lib/kettle/jem.rb', line 6367
+      
# File 'lib/kettle/jem.rb', line 6398
 
 def transfer_changelog_entrypoint_require(project_root, rubygems)
   configured = rubygems["entrypoint_require"].to_s.strip
@@ -92436,121 +92450,6 @@ 

       
 
 
-6396
-6397
-6398
-6399
-6400
-6401
-6402
-6403
-6404
-6405
-6406
-6407

-    

-      
# File 'lib/kettle/jem.rb', line 6396
-
-def transfer_changelog_filter_applies?(filter, context)
-  Array(filter.fetch(:predicates)).all? do |predicate|
-    field = predicate.fetch(:field)
-    type = transfer_changelog_filter_field_types.fetch(field) do
-      raise Error, "Unknown transfer changelog filter field #{field.inspect}"
-    end
-    actual = context.fetch(field) do
-      raise Error, "Transfer changelog context omitted #{field.inspect}"
-    end
-    transfer_changelog_filter_predicate_applies?(type, actual, predicate.fetch(:operator), predicate.fetch(:value))
-  end
-end

-    

-

-    
-      

-  

-  
-    .transfer_changelog_filter_field_types  ⇒ Object 
-  
-
-  
-
-  
-

-  
-    
-    
-  
-

-      
-
-
-6409
-6410
-6411

-    		
-      
# File 'lib/kettle/jem.rb', line 6409
-
-def transfer_changelog_filter_field_types
-  TRANSFER_CHANGELOG_FILTER_FIELD_TYPES
-end

-    

-

-    
-      

-  

-  
-    .transfer_changelog_filter_predicate_applies?(type, actual, operator, expected)  ⇒ Boolean 
-  
-
-  
-
-  
-

-  

-    
-
-
-  

-

-

-  
-
Returns:

-
    
-  
-    
  • 
-      
-      
-        (Boolean)
-      
-      
-      
-    
    • 
-  
-

-
-

-  
-    
+  
+

-      
-
-
-6413
-6414
-6415
-6416
-6417
-6418
-6419
-6420
-6421
-6422
-6423
-6424
-6425
-6426
 6427
 6428
 6429
@@ -92559,10 +92458,125 @@ 
# File 'lib/kettle/jem.rb', line 6427
+
+def transfer_changelog_filter_applies?(filter, context)
+  Array(filter.fetch(:predicates)).all? do |predicate|
+    field = predicate.fetch(:field)
+    type = transfer_changelog_filter_field_types.fetch(field) do
+      raise Error, "Unknown transfer changelog filter field #{field.inspect}"
+    end
+    actual = context.fetch(field) do
+      raise Error, "Transfer changelog context omitted #{field.inspect}"
+    end
+    transfer_changelog_filter_predicate_applies?(type, actual, predicate.fetch(:operator), predicate.fetch(:value))
+  end
+end

+    

+

+    
+      

+  

+  
+    .transfer_changelog_filter_field_types  ⇒ Object 
+  
+
+  
+
+  
+

+  
+    
+    
+  
+

+      
+
+
+6440
+6441
+6442

+    		
+      
# File 'lib/kettle/jem.rb', line 6440
+
+def transfer_changelog_filter_field_types
+  TRANSFER_CHANGELOG_FILTER_FIELD_TYPES
+end

+    

+

+    
+      

+  

+  
+    .transfer_changelog_filter_predicate_applies?(type, actual, operator, expected)  ⇒ Boolean 
+  
+
+  
+
+  
+

+  

+    
+
+
+  

+

+

+  
+
Returns:

+
    
+  
+    
  • 
+      
+      
+        (Boolean)
+      
+      
+      
+    
    • 
+  
+

+
+

+  
+    
@@ -636,15 +635,15 @@ 

       
 
 
+147
+148
 149
 150
 151
-152
-153
-154

+152
     
     

-    
-  
-

+      
+
+
+6444
+6445
+6446
+6447
+6448
+6449
+6450
+6451
+6452
+6453
+6454
+6455
+6456
+6457
+6458
+6459
+6460
+6461
+6462
+6463
+6464
+6465
+6466

     		
     
-      
# File 'lib/kettle/jem.rb', line 6413
+      
# File 'lib/kettle/jem.rb', line 6444
 
 def transfer_changelog_filter_predicate_applies?(type, actual, operator, expected)
   case type
@@ -92607,17 +92621,17 @@ 

       
 
 
-6380
-6381
-6382
-6383
-6384
-6385
-6386
-6387

+6411
+6412
+6413
+6414
+6415
+6416
+6417
+6418

     

     
-      
# File 'lib/kettle/jem.rb', line 6380
+      
# File 'lib/kettle/jem.rb', line 6411
 
 def transfer_changelog_gemspec_assignment(project_root, field)
   path = Dir.glob(File.join(project_root, "*.gemspec")).min
@@ -92658,25 +92672,25 @@ 

       
 
 
-6283
-6284
-6285
-6286
-6287
-6288
-6289
-6290
-6291
-6292
-6293
-6294
-6295
-6296
-6297
-6298

+6314
+6315
+6316
+6317
+6318
+6319
+6320
+6321
+6322
+6323
+6324
+6325
+6326
+6327
+6328
+6329

     

     
-      
# File 'lib/kettle/jem.rb', line 6283
+      
# File 'lib/kettle/jem.rb', line 6314
 
 def transfer_changelog_lag(last_entry_key = nil, verbose: false)
   all_entries = changelog_transfer_entries(PACKAGED_TEMPLATE_ROOT)
@@ -92725,15 +92739,15 @@ 

       
 
 
-6360
-6361
-6362
-6363
-6364
-6365

+6391
+6392
+6393
+6394
+6395
+6396

     

     
-      
# File 'lib/kettle/jem.rb', line 6360
+      
# File 'lib/kettle/jem.rb', line 6391
 
 def transfer_changelog_min_ruby(project_root, rubygems)
   configured = minimum_ruby_token(rubygems["min_ruby"])
@@ -92761,14 +92775,14 @@ 

       
 
 
-6374
-6375
-6376
-6377
-6378

+6405
+6406
+6407
+6408
+6409

     

     
-      
# File 'lib/kettle/jem.rb', line 6374
+      
# File 'lib/kettle/jem.rb', line 6405
 
 def transfer_changelog_package_name(project_root)
   transfer_changelog_gemspec_assignment(project_root, "name").to_s.strip.then do |name|
@@ -92795,28 +92809,28 @@ 

       
 
 
-6261
-6262
-6263
-6264
-6265
-6266
-6267
-6268
-6269
-6270
-6271
-6272
-6273
-6274
-6275
-6276
-6277
-6278
-6279

+6292
+6293
+6294
+6295
+6296
+6297
+6298
+6299
+6300
+6301
+6302
+6303
+6304
+6305
+6306
+6307
+6308
+6309
+6310

     

     
-      
# File 'lib/kettle/jem.rb', line 6261
+      
# File 'lib/kettle/jem.rb', line 6292
 
 def transfer_changelog_status(project_root, env: ENV, verbose: false)
   all_entries = changelog_transfer_entries(PACKAGED_TEMPLATE_ROOT)
@@ -92857,14 +92871,14 @@ 

       
 
 
-16349
-16350
-16351
-16352
-16353

+16381
+16382
+16383
+16384
+16385

     

     
-      
# File 'lib/kettle/jem.rb', line 16349
+      
# File 'lib/kettle/jem.rb', line 16381
 
 def trim_trailing_blank_lines(content)
   lines = content.to_s.lines
@@ -92914,12 +92928,12 @@ 

       
 
 
-18124
-18125
-18126

+18156
+18157
+18158

     

     
-      
# File 'lib/kettle/jem.rb', line 18124
+      
# File 'lib/kettle/jem.rb', line 18156
 
 def truthy_config?(value)
   %w[true yes 1 on enabled].include?(value.to_s.strip.downcase)
@@ -92944,17 +92958,17 @@ 

       
 
 
-9902
-9903
-9904
-9905
-9906
-9907
-9908
-9909

+9933
+9934
+9935
+9936
+9937
+9938
+9939
+9940

     

     
-      
# File 'lib/kettle/jem.rb', line 9902
+      
# File 'lib/kettle/jem.rb', line 9933
 
 def uncomment_ruby_comment_line(comment_source)
   text = comment_source.to_s
@@ -93007,15 +93021,15 @@ 

       
 
 
-18109
-18110
-18111
-18112
-18113
-18114

+18141
+18142
+18143
+18144
+18145
+18146

     

     
-      
# File 'lib/kettle/jem.rb', line 18109
+      
# File 'lib/kettle/jem.rb', line 18141
 
 def unresolved_template_scan?(recipe)
   return false if recipe.fetch(:target_path).to_s == KETTLE_CONFIG_PATH
@@ -93043,30 +93057,30 @@ 

       
 
 
-20019
-20020
-20021
-20022
-20023
-20024
-20025
-20026
-20027
-20028
-20029
-20030
-20031
-20032
-20033
-20034
-20035
-20036
-20037
-20038
-20039

+20055
+20056
+20057
+20058
+20059
+20060
+20061
+20062
+20063
+20064
+20065
+20066
+20067
+20068
+20069
+20070
+20071
+20072
+20073
+20074
+20075

     

     
-      
# File 'lib/kettle/jem.rb', line 20019
+      
# File 'lib/kettle/jem.rb', line 20055
 
 def update_github_actions_pins(content)
   lines = content.to_s.lines
@@ -93132,18 +93146,18 @@ 

       
 
 
-14761
-14762
-14763
-14764
-14765
-14766
-14767
-14768
-14769

+14793
+14794
+14795
+14796
+14797
+14798
+14799
+14800
+14801

     

     
-      
# File 'lib/kettle/jem.rb', line 14761
+      
# File 'lib/kettle/jem.rb', line 14793
 
 def valid_gem_version?(version)
   text = version.to_s
@@ -93197,14 +93211,14 @@ 

       
 
 
-6557
-6558
-6559
-6560
-6561

+6588
+6589
+6590
+6591
+6592

     

     
-      
# File 'lib/kettle/jem.rb', line 6557
+      
# File 'lib/kettle/jem.rb', line 6588
 
 def validate_changelog_transfer_entries!(entries, path)
   keys = entries.map { |entry| entry.fetch(:key).to_s }
@@ -93254,21 +93268,21 @@ 

       
 
 
-13839
-13840
-13841
-13842
-13843
-13844
-13845
-13846
-13847
-13848
-13849
-13850

+13870
+13871
+13872
+13873
+13874
+13875
+13876
+13877
+13878
+13879
+13880
+13881

     

     
-      
# File 'lib/kettle/jem.rb', line 13839
+      
# File 'lib/kettle/jem.rb', line 13870
 
 def validate_kettle_jem_config!(config)
   raise Error, "Invalid kettle-jem config: root must be a mapping" unless config.is_a?(Hash)
@@ -93327,35 +93341,35 @@ 

       
 
 
-9641
-9642
-9643
-9644
-9645
-9646
-9647
-9648
-9649
-9650
-9651
-9652
-9653
-9654
-9655
-9656
-9657
-9658
-9659
-9660
-9661
-9662
-9663
-9664
-9665
-9666

+9672
+9673
+9674
+9675
+9676
+9677
+9678
+9679
+9680
+9681
+9682
+9683
+9684
+9685
+9686
+9687
+9688
+9689
+9690
+9691
+9692
+9693
+9694
+9695
+9696
+9697

     

     
-      
# File 'lib/kettle/jem.rb', line 9641
+      
# File 'lib/kettle/jem.rb', line 9672
 
 def validate_modular_dependency_conflicts!(project_root, recipe_reports)
   conflicts = modular_dependency_conflicts(project_root, recipe_reports)
@@ -93403,22 +93417,22 @@ 

       
 
 
-4961
-4962
-4963
-4964
-4965
-4966
-4967
-4968
-4969
-4970
-4971
-4972
-4973

+4990
+4991
+4992
+4993
+4994
+4995
+4996
+4997
+4998
+4999
+5000
+5001
+5002

     

     
-      
# File 'lib/kettle/jem.rb', line 4961
+      
# File 'lib/kettle/jem.rb', line 4990
 
 def version_bootstrap_source_state(report, before_apply_files)
   facts = report.fetch(:facts, {})
@@ -93476,17 +93490,17 @@ 

       
 
 
-16501
-16502
-16503
-16504
-16505
-16506
-16507
-16508

+16533
+16534
+16535
+16536
+16537
+16538
+16539
+16540

     

     
-      
# File 'lib/kettle/jem.rb', line 16501
+      
# File 'lib/kettle/jem.rb', line 16533
 
 def version_file_includes_version_module?(content)
   ruby_call_records(content.to_s, :include).any? do |call|
@@ -93516,38 +93530,6 @@ 

 
 
-16118
-16119
-16120
-16121
-16122
-16123
-16124
-16125
-16126
-16127
-16128
-16129
-16130
-16131
-16132
-16133
-16134
-16135
-16136
-16137
-16138
-16139
-16140
-16141
-16142
-16143
-16144
-16145
-16146
-16147
-16148
-16149
 16150
 16151
 16152
@@ -93558,10 +93540,42 @@ 
# File 'lib/kettle/jem.rb', line 16118
+      
# File 'lib/kettle/jem.rb', line 16150
 
 def version_gem_bootstrap_entrypoint_content(content, namespace:, entrypoint_require:, namespace_superclasses: {}, version_require_path: nil)
   current = if namespace_superclasses.empty?
@@ -93626,18 +93640,18 @@ 

       
 
 
-15736
-15737
-15738
-15739
-15740
-15741
-15742
-15743
-15744

+15768
+15769
+15770
+15771
+15772
+15773
+15774
+15775
+15776

     

     
-      
# File 'lib/kettle/jem.rb', line 15736
+      
# File 'lib/kettle/jem.rb', line 15768
 
 def version_gem_bootstrap_entrypoint_path(project_root, package_name, entrypoint_require,
   package_entrypoint_preexisting: true)
@@ -93668,12 +93682,12 @@ 

       
 
 
-15577
-15578
-15579

+15609
+15610
+15611

     

     
-      
# File 'lib/kettle/jem.rb', line 15577
+      
# File 'lib/kettle/jem.rb', line 15609
 
 def version_gem_bootstrap_step(project_root, facts)
   version_gem_bootstrap_step_for_paths(project_root, facts)
@@ -93698,38 +93712,6 @@ 

       
 
 
-15581
-15582
-15583
-15584
-15585
-15586
-15587
-15588
-15589
-15590
-15591
-15592
-15593
-15594
-15595
-15596
-15597
-15598
-15599
-15600
-15601
-15602
-15603
-15604
-15605
-15606
-15607
-15608
-15609
-15610
-15611
-15612
 15613
 15614
 15615
@@ -93851,10 +93833,42 @@ 

 15731
 15732
 15733
-15734

+15734
+15735
+15736
+15737
+15738
+15739
+15740
+15741
+15742
+15743
+15744
+15745
+15746
+15747
+15748
+15749
+15750
+15751
+15752
+15753
+15754
+15755
+15756
+15757
+15758
+15759
+15760
+15761
+15762
+15763
+15764
+15765
+15766

     

     
-      
# File 'lib/kettle/jem.rb', line 15581
+      
# File 'lib/kettle/jem.rb', line 15613
 
 def version_gem_bootstrap_step_for_paths(project_root, facts, manage_version_file: true, manage_signature_file: true,
   package_entrypoint_preexisting: true, preserve_version_module_include: nil, namespace_kinds_override: {})
@@ -94030,16 +94044,16 @@ 

       
 
 
-16355
-16356
-16357
-16358
-16359
-16360
-16361

+16387
+16388
+16389
+16390
+16391
+16392
+16393

     

     
-      
# File 'lib/kettle/jem.rb', line 16355
+      
# File 'lib/kettle/jem.rb', line 16387
 
 def version_gem_class_eval_block(namespace)
   <<~RUBY
@@ -94091,17 +94105,17 @@ 

       
 
 
-16283
-16284
-16285
-16286
-16287
-16288
-16289
-16290

+16315
+16316
+16317
+16318
+16319
+16320
+16321
+16322

     

     
-      
# File 'lib/kettle/jem.rb', line 16283
+      
# File 'lib/kettle/jem.rb', line 16315
 
 def version_gem_class_eval_call?(call)
   call.receiver && call.block&.body&.body.to_a.any? do |child|
@@ -94131,16 +94145,16 @@ 

       
 
 
-16275
-16276
-16277
-16278
-16279
-16280
-16281

+16307
+16308
+16309
+16310
+16311
+16312
+16313

     

     
-      
# File 'lib/kettle/jem.rb', line 16275
+      
# File 'lib/kettle/jem.rb', line 16307
 
 def version_gem_class_eval_selectors(content)
   top_level_ruby_call_records(content, :class_eval).filter_map do |call|
@@ -94169,42 +94183,42 @@ 

       
 
 
-5723
-5724
-5725
-5726
-5727
-5728
-5729
-5730
-5731
-5732
-5733
-5734
-5735
-5736
-5737
-5738
-5739
-5740
-5741
-5742
-5743
-5744
-5745
-5746
-5747
-5748
-5749
-5750
-5751
-5752
-5753
 5754
-5755

+5755
+5756
+5757
+5758
+5759
+5760
+5761
+5762
+5763
+5764
+5765
+5766
+5767
+5768
+5769
+5770
+5771
+5772
+5773
+5774
+5775
+5776
+5777
+5778
+5779
+5780
+5781
+5782
+5783
+5784
+5785
+5786

     

     
-      
# File 'lib/kettle/jem.rb', line 5723
+      
# File 'lib/kettle/jem.rb', line 5754
 
 def version_gem_cleanup_step(project_root, facts, cleanup_entrypoint: true, after_declarations: false, entrypoint_path: nil)
   package_name = facts.dig(:package, :name).to_s
@@ -94282,19 +94296,19 @@ 

 
 
-15786
-15787
-15788
-15789
-15790
-15791
-15792
-15793
-15794
-15795

+15818
+15819
+15820
+15821
+15822
+15823
+15824
+15825
+15826
+15827

     		
     
-      
# File 'lib/kettle/jem.rb', line 15786
+      
# File 'lib/kettle/jem.rb', line 15818
 
 def version_gem_default_enabled_for_project?(rubygems_config, gemspec_metadata)
   configured_floor = rubygems_config.fetch("min_ruby", "").to_s.strip
@@ -94349,17 +94363,17 @@ 

       
 
 
-11133
-11134
-11135
-11136
-11137
-11138
-11139
-11140

+11164
+11165
+11166
+11167
+11168
+11169
+11170
+11171

     

     
-      
# File 'lib/kettle/jem.rb', line 11133
+      
# File 'lib/kettle/jem.rb', line 11164
 
 def version_gem_enabled?(facts)
   configured = facts.to_h.dig(:version_gem, :enabled)
@@ -94389,20 +94403,20 @@ 

       
 
 
-16095
-16096
-16097
-16098
-16099
-16100
-16101
-16102
-16103
-16104
-16105

+16127
+16128
+16129
+16130
+16131
+16132
+16133
+16134
+16135
+16136
+16137

     

     
-      
# File 'lib/kettle/jem.rb', line 16095
+      
# File 'lib/kettle/jem.rb', line 16127
 
 def version_gem_entrypoint_file_content(namespace:, entrypoint_require:, dedicated: false)
   sections = ["# frozen_string_literal: true"]
@@ -94458,12 +94472,12 @@ 

       
 
 
-11085
-11086
-11087

+11116
+11117
+11118

     

     
-      
# File 'lib/kettle/jem.rb', line 11085
+      
# File 'lib/kettle/jem.rb', line 11116
 
 def version_gem_explicitly_disabled?(facts)
   facts.to_h.dig(:version_gem, :enabled) == false
@@ -94488,20 +94502,20 @@ 

       
 
 
-15774
-15775
-15776
-15777
-15778
-15779
-15780
-15781
-15782
-15783
-15784

+15806
+15807
+15808
+15809
+15810
+15811
+15812
+15813
+15814
+15815
+15816

     

     
-      
# File 'lib/kettle/jem.rb', line 15774
+      
# File 'lib/kettle/jem.rb', line 15806
 
 def version_gem_facts_for_project(project_root, entrypoint_require, mode: "")
   version_gem_path = File.join("lib", entrypoint_require.to_s, "version_gem.rb")
@@ -94534,28 +94548,28 @@ 

       
 
 
-16190
-16191
-16192
-16193
-16194
-16195
-16196
-16197
-16198
-16199
-16200
-16201
-16202
-16203
-16204
-16205
-16206
-16207
-16208

+16222
+16223
+16224
+16225
+16226
+16227
+16228
+16229
+16230
+16231
+16232
+16233
+16234
+16235
+16236
+16237
+16238
+16239
+16240

     

     
-      
# File 'lib/kettle/jem.rb', line 16190
+      
# File 'lib/kettle/jem.rb', line 16222
 
 def version_gem_free_entrypoint_content(content, entrypoint_require:, ensure_version_require: true, after_declarations: false, version_require_path: nil)
   current = remove_version_gem_entrypoint_references(content)
@@ -94619,27 +94633,27 @@ 

       
 
 
-5595
-5596
-5597
-5598
-5599
-5600
-5601
-5602
-5603
-5604
-5605
-5606
-5607
-5608
-5609
-5610
-5611
-5612

+5626
+5627
+5628
+5629
+5630
+5631
+5632
+5633
+5634
+5635
+5636
+5637
+5638
+5639
+5640
+5641
+5642
+5643

     

     
-      
# File 'lib/kettle/jem.rb', line 5595
+      
# File 'lib/kettle/jem.rb', line 5626
 
 def version_gem_post_apply_selected?(report, entrypoint_require)
   selected = Array(report.dig(:template_selection, :only)).map(&:to_s)
@@ -94679,26 +94693,26 @@ 

       
 
 
-16292
-16293
-16294
-16295
-16296
-16297
-16298
-16299
-16300
-16301
-16302
-16303
-16304
-16305
-16306
-16307
-16308

+16324
+16325
+16326
+16327
+16328
+16329
+16330
+16331
+16332
+16333
+16334
+16335
+16336
+16337
+16338
+16339
+16340

     

     
-      
# File 'lib/kettle/jem.rb', line 16292
+      
# File 'lib/kettle/jem.rb', line 16324
 
 def version_gem_require_insertion_index(content, before_relative_path: nil)
   ensure_runtime_dependencies!
@@ -94760,17 +94774,17 @@ 

       
 
 
-11124
-11125
-11126
-11127
-11128
-11129
-11130
-11131

+11155
+11156
+11157
+11158
+11159
+11160
+11161
+11162

     

     
-      
# File 'lib/kettle/jem.rb', line 11124
+      
# File 'lib/kettle/jem.rb', line 11155
 
 def version_gem_runtime_compatible?(facts)
   min_ruby = gemspec_runtime_floor_token(facts)
@@ -94800,19 +94814,19 @@ 

       
 
 
-16107
-16108
-16109
-16110
-16111
-16112
-16113
-16114
-16115
-16116

+16139
+16140
+16141
+16142
+16143
+16144
+16145
+16146
+16147
+16148

     

     
-      
# File 'lib/kettle/jem.rb', line 16107
+      
# File 'lib/kettle/jem.rb', line 16139
 
 def version_gem_signature_file_content(namespace:, outer_namespace_kind: :module, namespace_kinds: {})
   body = [
@@ -94844,14 +94858,14 @@ 

       
 
 
-13099
-13100
-13101
-13102
-13103

+13130
+13131
+13132
+13133
+13134

     

     
-      
# File 'lib/kettle/jem.rb', line 13099
+      
# File 'lib/kettle/jem.rb', line 13130
 
 def version_gem_template_entries(gemspec_path)
   VERSION_GEM_TEMPLATE_SOURCES.map do |source|
@@ -94878,29 +94892,29 @@ 

       
 
 
-13105
-13106
-13107
-13108
-13109
-13110
-13111
-13112
-13113
-13114
-13115
-13116
-13117
-13118
-13119
-13120
-13121
-13122
-13123
-13124

+13136
+13137
+13138
+13139
+13140
+13141
+13142
+13143
+13144
+13145
+13146
+13147
+13148
+13149
+13150
+13151
+13152
+13153
+13154
+13155

     

     
-      
# File 'lib/kettle/jem.rb', line 13105
+      
# File 'lib/kettle/jem.rb', line 13136
 
 def version_gem_template_target_path(gemspec_path, source)
   gemspec_reference = gemspec_path.to_s
@@ -94965,13 +94979,13 @@ 

       
 
 
-18531
-18532
-18533
-18534

+18563
+18564
+18565
+18566

     

     
-      
# File 'lib/kettle/jem.rb', line 18531
+      
# File 'lib/kettle/jem.rb', line 18563
 
 def version_gem_template_target_path?(target_path)
   target = target_path.to_s
@@ -94997,24 +95011,24 @@ 

 
 
-13126
-13127
-13128
-13129
-13130
-13131
-13132
-13133
-13134
-13135
-13136
-13137
-13138
-13139
-13140

+13157
+13158
+13159
+13160
+13161
+13162
+13163
+13164
+13165
+13166
+13167
+13168
+13169
+13170
+13171

     		
     
-      
# File 'lib/kettle/jem.rb', line 13126
+      
# File 'lib/kettle/jem.rb', line 13157
 
 def version_gem_template_target_path_for_project(project_root, gemspec_path, source)
   config = kettle_jem_config(project_root)
@@ -95051,38 +95065,6 @@ 

       
 
 
-14641
-14642
-14643
-14644
-14645
-14646
-14647
-14648
-14649
-14650
-14651
-14652
-14653
-14654
-14655
-14656
-14657
-14658
-14659
-14660
-14661
-14662
-14663
-14664
-14665
-14666
-14667
-14668
-14669
-14670
-14671
-14672
 14673
 14674
 14675
@@ -95090,10 +95072,42 @@ 

 14677
 14678
 14679
-14680

+14680
+14681
+14682
+14683
+14684
+14685
+14686
+14687
+14688
+14689
+14690
+14691
+14692
+14693
+14694
+14695
+14696
+14697
+14698
+14699
+14700
+14701
+14702
+14703
+14704
+14705
+14706
+14707
+14708
+14709
+14710
+14711
+14712

     

     
-      
# File 'lib/kettle/jem.rb', line 14641
+      
# File 'lib/kettle/jem.rb', line 14673
 
 def version_gem_template_tokens(facts)
   namespace = facts.dig(:rubygems, :namespace).to_s
@@ -95155,28 +95169,28 @@ 

       
 
 
-16075
-16076
-16077
-16078
-16079
-16080
-16081
-16082
-16083
-16084
-16085
-16086
-16087
-16088
-16089
-16090
-16091
-16092
-16093

+16107
+16108
+16109
+16110
+16111
+16112
+16113
+16114
+16115
+16116
+16117
+16118
+16119
+16120
+16121
+16122
+16123
+16124
+16125

     

     
-      
# File 'lib/kettle/jem.rb', line 16075
+      
# File 'lib/kettle/jem.rb', line 16107
 
 def version_gem_version_file_content(existing_version:, namespace:, version:, outer_namespace_kind: :module, namespace_kinds: {}, preserve_version_module_include: false)
   resolved_version = existing_version.to_s.empty? ? version.to_s : existing_version.to_s
@@ -95217,19 +95231,19 @@ 

       
 
 
-15906
-15907
-15908
-15909
-15910
-15911
-15912
-15913
-15914
-15915

+15938
+15939
+15940
+15941
+15942
+15943
+15944
+15945
+15946
+15947

     

     
-      
# File 'lib/kettle/jem.rb', line 15906
+      
# File 'lib/kettle/jem.rb', line 15938
 
 def version_gem_version_spec_content(namespace:)
   clean_namespace = namespace.to_s.start_with?("::") ? namespace.to_s[2..] : namespace.to_s
@@ -95261,18 +95275,18 @@ 

       
 
 
-16400
-16401
-16402
-16403
-16404
-16405
-16406
-16407
-16408

+16432
+16433
+16434
+16435
+16436
+16437
+16438
+16439
+16440

     

     
-      
# File 'lib/kettle/jem.rb', line 16400
+      
# File 'lib/kettle/jem.rb', line 16432
 
 def version_namespace_kinds_from_facts(facts)
   raw = facts.dig(:rubygems, :version_namespace_kinds)
@@ -95303,12 +95317,12 @@ 

       
 
 
-16381
-16382
-16383

+16413
+16414
+16415

     

     
-      
# File 'lib/kettle/jem.rb', line 16381
+      
# File 'lib/kettle/jem.rb', line 16413
 
 def version_namespace_outer_kind(project_root, entrypoint_path, namespace)
   ruby_entrypoint_outer_namespace_kind(read_project_file(project_root, entrypoint_path), namespace)
@@ -95333,23 +95347,23 @@ 

 
 
-16385
-16386
-16387
-16388
-16389
-16390
-16391
-16392
-16393
-16394
-16395
-16396
-16397
-16398

+16417
+16418
+16419
+16420
+16421
+16422
+16423
+16424
+16425
+16426
+16427
+16428
+16429
+16430

     		
     
-      
# File 'lib/kettle/jem.rb', line 16385
+      
# File 'lib/kettle/jem.rb', line 16417
 
 def version_namespace_outer_kind_for_template(project_root, facts, entrypoint_path, version_path, namespace)
   kind = version_namespace_outer_kind(project_root, entrypoint_path, namespace)
@@ -95385,18 +95399,18 @@ 

 
 
-16410
-16411
-16412
-16413
-16414
-16415
-16416
-16417
-16418

+16442
+16443
+16444
+16445
+16446
+16447
+16448
+16449
+16450

     		
     
-      
# File 'lib/kettle/jem.rb', line 16410
+      
# File 'lib/kettle/jem.rb', line 16442
 
 def version_namespace_superclasses_from_facts(facts)
   raw = facts.dig(:rubygems, :version_namespace_superclasses)
@@ -95450,13 +95464,13 @@ 

       
 
 
-4236
-4237
-4238
-4239

+4265
+4266
+4267
+4268

     

     
-      
# File 'lib/kettle/jem.rb', line 4236
+      
# File 'lib/kettle/jem.rb', line 4265
 
 def version_namespace_template_file?(relative_path)
   basename = File.basename(relative_path.to_s)
@@ -95482,12 +95496,12 @@ 

       
 
 
-15746
-15747
-15748

+15778
+15779
+15780

     

     
-      
# File 'lib/kettle/jem.rb', line 15746
+      
# File 'lib/kettle/jem.rb', line 15778
 
 def version_require_path_for_entrypoint(entrypoint_path, version_path)
   Pathname(version_path).relative_path_from(Pathname(File.dirname(entrypoint_path))).to_s.delete_suffix(".rb")
@@ -95535,12 +95549,12 @@ 

       
 
 
-15982
-15983
-15984

+16014
+16015
+16016

     

     
-      
# File 'lib/kettle/jem.rb', line 15982
+      
# File 'lib/kettle/jem.rb', line 16014
 
 def version_spec_anonymous_loader_call?(content)
   ruby_call_records(content, :load).any? { |call| call.receiver&.slice == "AnonymousLoader" }
@@ -95565,26 +95579,26 @@ 

 
 
-15882
-15883
-15884
-15885
-15886
-15887
-15888
-15889
-15890
-15891
-15892
-15893
-15894
-15895
-15896
-15897
-15898

+15914
+15915
+15916
+15917
+15918
+15919
+15920
+15921
+15922
+15923
+15924
+15925
+15926
+15927
+15928
+15929
+15930

     		
     
-      
# File 'lib/kettle/jem.rb', line 15882
+      
# File 'lib/kettle/jem.rb', line 15914
 
 def version_spec_package_entrypoint_require(project_root, package_name, entrypoint_require)
   package_name = package_name.to_s.strip
@@ -95623,13 +95637,13 @@ 

       
 
 
-15997
-15998
-15999
-16000

+16029
+16030
+16031
+16032

     

     
-      
# File 'lib/kettle/jem.rb', line 15997
+      
# File 'lib/kettle/jem.rb', line 16029
 
 def version_spec_relative_version_gem_path(version_spec_path, entrypoint_require)
   spec_depth = File.dirname(version_spec_path.to_s).split(File::SEPARATOR).count { |part| !part.empty? }
@@ -95655,13 +95669,13 @@ 

       
 
 
-15992
-15993
-15994
-15995

+16024
+16025
+16026
+16027

     

     
-      
# File 'lib/kettle/jem.rb', line 15992
+      
# File 'lib/kettle/jem.rb', line 16024
 
 def version_spec_relative_version_path(version_spec_path, entrypoint_require)
   spec_depth = File.dirname(version_spec_path.to_s).split(File::SEPARATOR).count { |part| !part.empty? }
@@ -95687,18 +95701,18 @@ 

       
 
 
-16065
-16066
-16067
-16068
-16069
-16070
-16071
-16072
-16073

+16097
+16098
+16099
+16100
+16101
+16102
+16103
+16104
+16105

     

     
-      
# File 'lib/kettle/jem.rb', line 16065
+      
# File 'lib/kettle/jem.rb', line 16097
 
 def version_spec_require_insertion_index(content)
   ensure_runtime_dependencies!
@@ -95729,14 +95743,14 @@ 

       
 
 
-15986
-15987
-15988
-15989
-15990

+16018
+16019
+16020
+16021
+16022

     

     
-      
# File 'lib/kettle/jem.rb', line 15986
+      
# File 'lib/kettle/jem.rb', line 16018
 
 def version_spec_rspec_describe_call(content)
   top_level_ruby_call_records(content, :describe).find do |call|
@@ -95763,18 +95777,18 @@ 

       
 
 
-9056
-9057
-9058
-9059
-9060
-9061
-9062
-9063
-9064

+9087
+9088
+9089
+9090
+9091
+9092
+9093
+9094
+9095

     

     
-      
# File 'lib/kettle/jem.rb', line 9056
+      
# File 'lib/kettle/jem.rb', line 9087
 
 def versioned_gem_name_parts(name)
   match = name.to_s.match(/\A(.+?)(\d+(?:[_-]\d+)*)\z/)
@@ -95828,18 +95842,18 @@ 

       
 
 
-9046
-9047
-9048
-9049
-9050
-9051
-9052
-9053
-9054

+9077
+9078
+9079
+9080
+9081
+9082
+9083
+9084
+9085

     

     
-      
# File 'lib/kettle/jem.rb', line 9046
+      
# File 'lib/kettle/jem.rb', line 9077
 
 def versioned_gem_name_update_candidate?(destination_name, template_name)
   destination = versioned_gem_name_parts(destination_name)
@@ -95870,31 +95884,31 @@ 

       
 
 
-4746
-4747
-4748
-4749
-4750
-4751
-4752
-4753
-4754
-4755
-4756
-4757
-4758
-4759
-4760
-4761
-4762
-4763
-4764
-4765
-4766
-4767

+4775
+4776
+4777
+4778
+4779
+4780
+4781
+4782
+4783
+4784
+4785
+4786
+4787
+4788
+4789
+4790
+4791
+4792
+4793
+4794
+4795
+4796

     

     
-      
# File 'lib/kettle/jem.rb', line 4746
+      
# File 'lib/kettle/jem.rb', line 4775
 
 def with_event_phase(events, phase, payload = {})
   started_at = monotonic_time
@@ -95938,21 +95952,21 @@ 

       
 
 
-13758
-13759
-13760
-13761
-13762
-13763
-13764
-13765
-13766
-13767
-13768
-13769

+13789
+13790
+13791
+13792
+13793
+13794
+13795
+13796
+13797
+13798
+13799
+13800

     

     
-      
# File 'lib/kettle/jem.rb', line 13758
+      
# File 'lib/kettle/jem.rb', line 13789
 
 def with_git_operation_lock(env)
   lock_path = git_operation_lock_path(env || {})
@@ -95986,29 +96000,29 @@ 

       
 
 
-4817
-4818
-4819
-4820
-4821
-4822
-4823
-4824
-4825
-4826
-4827
-4828
-4829
-4830
-4831
-4832
-4833
-4834
-4835
-4836

+4846
+4847
+4848
+4849
+4850
+4851
+4852
+4853
+4854
+4855
+4856
+4857
+4858
+4859
+4860
+4861
+4862
+4863
+4864
+4865

     

     
-      
# File 'lib/kettle/jem.rb', line 4817
+      
# File 'lib/kettle/jem.rb', line 4846
 
 def with_readme_timing(name)
   timings = Thread.current[:kettle_jem_readme_timings]
@@ -96050,18 +96064,18 @@ 

       
 
 
-4807
-4808
-4809
-4810
-4811
-4812
-4813
-4814
-4815

+4836
+4837
+4838
+4839
+4840
+4841
+4842
+4843
+4844

     

     
-      
# File 'lib/kettle/jem.rb', line 4807
+      
# File 'lib/kettle/jem.rb', line 4836
 
 def with_readme_timing_context(relative_path, timings)
   return yield unless relative_path.to_s == "README.md"
@@ -96092,12 +96106,12 @@ 

       
 
 
-9078
-9079
-9080

+9109
+9110
+9111

     

     
-      
# File 'lib/kettle/jem.rb', line 9078
+      
# File 'lib/kettle/jem.rb', line 9109
 
 def word_array_assignment(content, name)
   word_array_assignment_record(content, name)&.fetch(:names) || []
@@ -96122,25 +96136,25 @@ 

       
 
 
-9093
-9094
-9095
-9096
-9097
-9098
-9099
-9100
-9101
-9102
-9103
-9104
-9105
-9106
-9107
-9108

+9124
+9125
+9126
+9127
+9128
+9129
+9130
+9131
+9132
+9133
+9134
+9135
+9136
+9137
+9138
+9139

     

     
-      
# File 'lib/kettle/jem.rb', line 9093
+      
# File 'lib/kettle/jem.rb', line 9124
 
 def word_array_assignment_record(content, name)
   result = prism_parse_success(content)
@@ -96201,15 +96215,15 @@ 

       
 
 
-4641
-4642
-4643
-4644
-4645
-4646

+4670
+4671
+4672
+4673
+4674
+4675

     

     
-      
# File 'lib/kettle/jem.rb', line 4641
+      
# File 'lib/kettle/jem.rb', line 4670
 
 def worker_safe_recipe?(recipe)
   name = recipe.fetch(:name).to_s
@@ -96237,22 +96251,22 @@ 

       
 
 
-4613
-4614
-4615
-4616
-4617
-4618
-4619
-4620
-4621
-4622
-4623
-4624
-4625

+4642
+4643
+4644
+4645
+4646
+4647
+4648
+4649
+4650
+4651
+4652
+4653
+4654

     

     
-      
# File 'lib/kettle/jem.rb', line 4613
+      
# File 'lib/kettle/jem.rb', line 4642
 
 def worker_safe_recipe_payload(recipe, project_root:, template_contents:)
   return recipe unless recipe.fetch(:primitive).to_s == "supplied_template_source_application"
@@ -96287,24 +96301,24 @@ 

       
 
 
-9233
-9234
-9235
-9236
-9237
-9238
-9239
-9240
-9241
-9242
-9243
-9244
-9245
-9246
-9247

+9264
+9265
+9266
+9267
+9268
+9269
+9270
+9271
+9272
+9273
+9274
+9275
+9276
+9277
+9278

     

     
-      
# File 'lib/kettle/jem.rb', line 9233
+      
# File 'lib/kettle/jem.rb', line 9264
 
 def workflow_job_env_existing_keys(lines, bundle_index, indent_length)
   existing = Set.new
@@ -96341,17 +96355,17 @@ 

       
 
 
-9203
-9204
-9205
-9206
-9207
-9208
-9209
-9210

+9234
+9235
+9236
+9237
+9238
+9239
+9240
+9241

     

     
-      
# File 'lib/kettle/jem.rb', line 9203
+      
# File 'lib/kettle/jem.rb', line 9234
 
 def workflow_matrix_env_indent(lines, mapping)
   ((mapping.start_line - 1)...mapping.end_line).each do |index|
@@ -96381,15 +96395,15 @@ 

       
 
 
-9196
-9197
-9198
-9199
-9200
-9201

+9227
+9228
+9229
+9230
+9231
+9232

     

     
-      
# File 'lib/kettle/jem.rb', line 9196
+      
# File 'lib/kettle/jem.rb', line 9227
 
 def workflow_matrix_env_insert_index(lines, mapping)
   ((mapping.start_line - 1)...mapping.end_line).each do |index|
@@ -96417,12 +96431,12 @@ 

       
 
 
-13795
-13796
-13797

+13826
+13827
+13828

     

     
-      
# File 'lib/kettle/jem.rb', line 13795
+      
# File 'lib/kettle/jem.rb', line 13826
 
 def workflow_recipe_slug(workflow_path)
   workflow_path.gsub(/[^a-zA-Z0-9]+/, "_").gsub(/\A_+|_+\z/, "")
@@ -96447,26 +96461,26 @@ 

       
 
 
-16363
-16364
-16365
-16366
-16367
-16368
-16369
-16370
-16371
-16372
-16373
-16374
-16375
-16376
-16377
-16378
-16379

+16395
+16396
+16397
+16398
+16399
+16400
+16401
+16402
+16403
+16404
+16405
+16406
+16407
+16408
+16409
+16410
+16411

     

     
-      
# File 'lib/kettle/jem.rb', line 16363
+      
# File 'lib/kettle/jem.rb', line 16395
 
 def wrap_ruby_namespace(namespace, body_lines, outer_namespace_kind: :module, namespace_kinds: {}, namespace_superclasses: {})
   segments = namespace.to_s.split("::").reject(&:empty?)
@@ -96505,29 +96519,29 @@ 

       
 
 
-16011
-16012
-16013
-16014
-16015
-16016
-16017
-16018
-16019
-16020
-16021
-16022
-16023
-16024
-16025
-16026
-16027
-16028
-16029
-16030

+16043
+16044
+16045
+16046
+16047
+16048
+16049
+16050
+16051
+16052
+16053
+16054
+16055
+16056
+16057
+16058
+16059
+16060
+16061
+16062

     

     
-      
# File 'lib/kettle/jem.rb', line 16011
+      
# File 'lib/kettle/jem.rb', line 16043
 
 def write_consolidated_version_signature(project_root, signature_path, legacy_signature_paths, namespace:,
   outer_namespace_kind: :module, namespace_kinds: {})
@@ -96569,18 +96583,18 @@ 

       
 
 
-16702
-16703
-16704
-16705
-16706
-16707
-16708
-16709
-16710

+16734
+16735
+16736
+16737
+16738
+16739
+16740
+16741
+16742

     

     
-      
# File 'lib/kettle/jem.rb', line 16702
+      
# File 'lib/kettle/jem.rb', line 16734
 
 def write_if_changed(project_root, relative_path, content)
   path = File.join(project_root, relative_path)
@@ -96611,24 +96625,24 @@ 

       
 
 
-14066
-14067
-14068
-14069
-14070
-14071
-14072
-14073
-14074
-14075
-14076
-14077
-14078
-14079
-14080

+14097
+14098
+14099
+14100
+14101
+14102
+14103
+14104
+14105
+14106
+14107
+14108
+14109
+14110
+14111

     

     
-      
# File 'lib/kettle/jem.rb', line 14066
+      
# File 'lib/kettle/jem.rb', line 14097
 
 def write_intent_from_recipe_report(project_root, recipe_report)
   return unless recipe_report[:changed]
@@ -96665,12 +96679,12 @@ 

       
 
 
-14035
-14036
-14037

+14066
+14067
+14068

     

     
-      
# File 'lib/kettle/jem.rb', line 14035
+      
# File 'lib/kettle/jem.rb', line 14066
 
 def write_intents_for_phase(project_root, recipe_reports)
   recipe_reports.filter_map { |recipe_report| write_intent_from_recipe_report(project_root, recipe_report) }
@@ -96695,16 +96709,16 @@ 

       
 
 
-12900
-12901
-12902
-12903
-12904
-12905
-12906

+12931
+12932
+12933
+12934
+12935
+12936
+12937

     

     
-      
# File 'lib/kettle/jem.rb', line 12900
+      
# File 'lib/kettle/jem.rb', line 12931
 
 def yaml_config_scalar_literal(value, path:)
   clean = value.to_s.strip
@@ -96756,22 +96770,22 @@ 

       
 
 
-19880
-19881
-19882
-19883
-19884
-19885
-19886
-19887
-19888
-19889
-19890
-19891
-19892

+19916
+19917
+19918
+19919
+19920
+19921
+19922
+19923
+19924
+19925
+19926
+19927
+19928

     

     
-      
# File 'lib/kettle/jem.rb', line 19880
+      
# File 'lib/kettle/jem.rb', line 19916
 
 def yaml_contains_key_value?(node, key, value)
   case node
@@ -96806,12 +96820,12 @@ 

       
 
 
-9212
-9213
-9214

+9243
+9244
+9245

     

     
-      
# File 'lib/kettle/jem.rb', line 9212
+      
# File 'lib/kettle/jem.rb', line 9243
 
 def yaml_double_quoted_scalar(value)
   %("#{value.to_s.gsub("\\", "\\\\\\").gsub('"', '\"')}")
@@ -96836,47 +96850,47 @@ 

       
 
 
-12861
-12862
-12863
-12864
-12865
-12866
-12867
-12868
-12869
-12870
-12871
-12872
-12873
-12874
-12875
-12876
-12877
-12878
-12879
-12880
-12881
-12882
-12883
-12884
-12885
-12886
-12887
-12888
-12889
-12890
-12891
 12892
 12893
 12894
 12895
 12896
 12897
-12898

+12898
+12899
+12900
+12901
+12902
+12903
+12904
+12905
+12906
+12907
+12908
+12909
+12910
+12911
+12912
+12913
+12914
+12915
+12916
+12917
+12918
+12919
+12920
+12921
+12922
+12923
+12924
+12925
+12926
+12927
+12928
+12929

     

     
-      
# File 'lib/kettle/jem.rb', line 12861
+      
# File 'lib/kettle/jem.rb', line 12892
 
 def yaml_line_comment_suffix(line, key_index)
   value_start = line.to_s.index(":", key_index).to_i + 1
@@ -96936,20 +96950,20 @@ 

       
 
 
-9249
-9250
-9251
-9252
-9253
-9254
-9255
-9256
-9257
-9258
-9259

+9280
+9281
+9282
+9283
+9284
+9285
+9286
+9287
+9288
+9289
+9290

     

     
-      
# File 'lib/kettle/jem.rb', line 9249
+      
# File 'lib/kettle/jem.rb', line 9280
 
 def yaml_mapping_nodes(content)
   root = Psych.parse_stream(content.to_s)
@@ -96982,17 +96996,17 @@ 

       
 
 
-20162
-20163
-20164
-20165
-20166
-20167
-20168
-20169

+20198
+20199
+20200
+20201
+20202
+20203
+20204
+20205

     

     
-      
# File 'lib/kettle/jem.rb', line 20162
+      
# File 'lib/kettle/jem.rb', line 20198
 
 def yaml_mapping_path_entries(content)
   document = Psych.parse_stream(content.to_s)
@@ -97022,18 +97036,18 @@ 

       
 
 
-9275
-9276
-9277
-9278
-9279
-9280
-9281
-9282
-9283

+9306
+9307
+9308
+9309
+9310
+9311
+9312
+9313
+9314

     

     
-      
# File 'lib/kettle/jem.rb', line 9275
+      
# File 'lib/kettle/jem.rb', line 9306
 
 def yaml_mapping_scalar_node(mapping, key)
   mapping.children.each_slice(2) do |key_node, value_node|
@@ -97064,12 +97078,12 @@ 

       
 
 
-9271
-9272
-9273

+9302
+9303
+9304

     

     
-      
# File 'lib/kettle/jem.rb', line 9271
+      
# File 'lib/kettle/jem.rb', line 9302
 
 def yaml_mapping_scalar_value(mapping, key)
   yaml_mapping_scalar_node(mapping, key)&.value.to_s
@@ -97094,16 +97108,16 @@ 

       
 
 
-7390
-7391
-7392
-7393
-7394
-7395
-7396

+7421
+7422
+7423
+7424
+7425
+7426
+7427

     

     
-      
# File 'lib/kettle/jem.rb', line 7390
+      
# File 'lib/kettle/jem.rb', line 7421
 
 def yaml_mapping_value(mapping, key)
   mapping.children.each_slice(2) do |key_node, value_node|
@@ -97132,19 +97146,19 @@ 

       
 
 
-20216
-20217
-20218
-20219
-20220
-20221
-20222
-20223
-20224
-20225

+20252
+20253
+20254
+20255
+20256
+20257
+20258
+20259
+20260
+20261

     

     
-      
# File 'lib/kettle/jem.rb', line 20216
+      
# File 'lib/kettle/jem.rb', line 20252
 
 def yaml_mapping_value_node(content, key, node_class)
   yaml_mapping_nodes(content).each do |mapping|
@@ -97176,25 +97190,25 @@ 

       
 
 
-10436
-10437
-10438
-10439
-10440
-10441
-10442
-10443
-10444
-10445
-10446
-10447
-10448
-10449
-10450
-10451

+10467
+10468
+10469
+10470
+10471
+10472
+10473
+10474
+10475
+10476
+10477
+10478
+10479
+10480
+10481
+10482

     

     
-      
# File 'lib/kettle/jem.rb', line 10436
+      
# File 'lib/kettle/jem.rb', line 10467
 
 def yaml_merge_options(recipe)
   options = {
@@ -97255,12 +97269,12 @@ 

       
 
 
-9305
-9306
-9307

+9336
+9337
+9338

     

     
-      
# File 'lib/kettle/jem.rb', line 9305
+      
# File 'lib/kettle/jem.rb', line 9336
 
 def yaml_process_result_adapter_failure?(merge_result)
   process_result_adapter_failure?(merge_result)
@@ -97285,20 +97299,20 @@ 

       
 
 
-12516
-12517
-12518
-12519
-12520
-12521
-12522
-12523
-12524
-12525
-12526

+12547
+12548
+12549
+12550
+12551
+12552
+12553
+12554
+12555
+12556
+12557

     

     
-      
# File 'lib/kettle/jem.rb', line 12516
+      
# File 'lib/kettle/jem.rb', line 12547
 
 def yaml_scalar_line_value(content, key)
   lines = content.to_s.lines
@@ -97331,16 +97345,16 @@ 

       
 
 
-20145
-20146
-20147
-20148
-20149
-20150
-20151

+20181
+20182
+20183
+20184
+20185
+20186
+20187

     

     
-      
# File 'lib/kettle/jem.rb', line 20145
+      
# File 'lib/kettle/jem.rb', line 20181
 
 def yaml_scalar_pairs(content)
   yaml_mapping_nodes(content).flat_map do |mapping|
@@ -97369,17 +97383,17 @@ 

       
 
 
-20153
-20154
-20155
-20156
-20157
-20158
-20159
-20160

+20189
+20190
+20191
+20192
+20193
+20194
+20195
+20196

     

     
-      
# File 'lib/kettle/jem.rb', line 20153
+      
# File 'lib/kettle/jem.rb', line 20189
 
 def yaml_scalar_path_entries(content)
   document = Psych.parse_stream(content.to_s)
@@ -97409,27 +97423,27 @@ 

       
 
 
-19855
-19856
-19857
-19858
-19859
-19860
-19861
-19862
-19863
-19864
-19865
-19866
-19867
-19868
-19869
-19870
-19871
-19872

+19891
+19892
+19893
+19894
+19895
+19896
+19897
+19898
+19899
+19900
+19901
+19902
+19903
+19904
+19905
+19906
+19907
+19908

     

     
-      
# File 'lib/kettle/jem.rb', line 19855
+      
# File 'lib/kettle/jem.rb', line 19891
 
 def yaml_scalar_sequence_at_path(content, path)
   document = Psych.parse_stream(content.to_s).children.first
@@ -97469,14 +97483,14 @@ 

       
 
 
-17882
-17883
-17884
-17885
-17886

+17914
+17915
+17916
+17917
+17918

     

     
-      
# File 'lib/kettle/jem.rb', line 17882
+      
# File 'lib/kettle/jem.rb', line 17914
 
 def yaml_scalar_value_template_tokens(content)
   yaml_scalar_pairs(content).flat_map do |_key_node, value_node|
@@ -97503,22 +97517,22 @@ 

       
 
 
-20005
-20006
-20007
-20008
-20009
-20010
-20011
-20012
-20013
-20014
-20015
-20016
-20017

+20041
+20042
+20043
+20044
+20045
+20046
+20047
+20048
+20049
+20050
+20051
+20052
+20053

     

     
-      
# File 'lib/kettle/jem.rb', line 20005
+      
# File 'lib/kettle/jem.rb', line 20041
 
 def yaml_top_level_key_lines(content)
   document = Psych.parse_stream(content.to_s).children.first
@@ -97543,7 +97557,7 @@ 

 
 
       
diff --git a/gems/kettle-jem/docs/Kettle/Jem/CLI.html b/gems/kettle-jem/docs/Kettle/Jem/CLI.html
index 551b6660b..cd6266af6 100644
--- a/gems/kettle-jem/docs/Kettle/Jem/CLI.html
+++ b/gems/kettle-jem/docs/Kettle/Jem/CLI.html
@@ -1665,7 +1665,7 @@ 

 
 
       
diff --git a/gems/kettle-jem/docs/Kettle/Jem/ChecksumMode.html b/gems/kettle-jem/docs/Kettle/Jem/ChecksumMode.html
index b383ac89c..39ce1238a 100644
--- a/gems/kettle-jem/docs/Kettle/Jem/ChecksumMode.html
+++ b/gems/kettle-jem/docs/Kettle/Jem/ChecksumMode.html
@@ -715,7 +715,7 @@ 

 
 
       
diff --git a/gems/kettle-jem/docs/Kettle/Jem/DecisionEvaluation.html b/gems/kettle-jem/docs/Kettle/Jem/DecisionEvaluation.html
index 3796c3522..d174607fe 100644
--- a/gems/kettle-jem/docs/Kettle/Jem/DecisionEvaluation.html
+++ b/gems/kettle-jem/docs/Kettle/Jem/DecisionEvaluation.html
@@ -1157,7 +1157,7 @@ 

 
 
       
diff --git a/gems/kettle-jem/docs/Kettle/Jem/DecisionPolicy.html b/gems/kettle-jem/docs/Kettle/Jem/DecisionPolicy.html
index 961b83281..540602e2f 100644
--- a/gems/kettle-jem/docs/Kettle/Jem/DecisionPolicy.html
+++ b/gems/kettle-jem/docs/Kettle/Jem/DecisionPolicy.html
@@ -1481,7 +1481,7 @@ 

 
 
       
diff --git a/gems/kettle-jem/docs/Kettle/Jem/Error.html b/gems/kettle-jem/docs/Kettle/Jem/Error.html
index 0e2f009f9..e060a321f 100644
--- a/gems/kettle-jem/docs/Kettle/Jem/Error.html
+++ b/gems/kettle-jem/docs/Kettle/Jem/Error.html
@@ -117,7 +117,7 @@
 
 
       
diff --git a/gems/kettle-jem/docs/Kettle/Jem/FileWorkUnit.html b/gems/kettle-jem/docs/Kettle/Jem/FileWorkUnit.html
index b3a3f41c4..df01adc1f 100644
--- a/gems/kettle-jem/docs/Kettle/Jem/FileWorkUnit.html
+++ b/gems/kettle-jem/docs/Kettle/Jem/FileWorkUnit.html
@@ -433,7 +433,7 @@ 

 
 
       
diff --git a/gems/kettle-jem/docs/Kettle/Jem/GemSpecReader.html b/gems/kettle-jem/docs/Kettle/Jem/GemSpecReader.html
index 82dbb3e43..6a9d38124 100644
--- a/gems/kettle-jem/docs/Kettle/Jem/GemSpecReader.html
+++ b/gems/kettle-jem/docs/Kettle/Jem/GemSpecReader.html
@@ -278,7 +278,7 @@ 

 
 
       
diff --git a/gems/kettle-jem/docs/Kettle/Jem/LicenseTxtMigrator.html b/gems/kettle-jem/docs/Kettle/Jem/LicenseTxtMigrator.html
index 9a79d1418..069a8d97d 100644
--- a/gems/kettle-jem/docs/Kettle/Jem/LicenseTxtMigrator.html
+++ b/gems/kettle-jem/docs/Kettle/Jem/LicenseTxtMigrator.html
@@ -375,7 +375,7 @@ 

 
 
       
diff --git a/gems/kettle-jem/docs/Kettle/Jem/MaintenanceChangelog.html b/gems/kettle-jem/docs/Kettle/Jem/MaintenanceChangelog.html
index 7aba11265..7095fbf7e 100644
--- a/gems/kettle-jem/docs/Kettle/Jem/MaintenanceChangelog.html
+++ b/gems/kettle-jem/docs/Kettle/Jem/MaintenanceChangelog.html
@@ -303,30 +303,7 @@ 

         
  • 
   
     
-      .template_entry_counts(matches)  ⇒ Object 
-    
-
-    
-  
-  
-  
-  
-  
-  
-  
-  
-
-  
-    
    
-
    
-  
-
    • 
-
-      
-        
  • 
-  
-    
-      .template_run_entry(changed_files, matches)  ⇒ Object 
+      .template_run_entry(changed_files)  ⇒ Object 
     
 
     
@@ -528,12 +505,12 @@ 
    
       
     
 
-161
-162
-163
    
+159
+160
+161
    • 
     
    		
     
-      
    # File 'lib/kettle/jem/maintenance_changelog.rb', line 161
+      
    # File 'lib/kettle/jem/maintenance_changelog.rb', line 159
 
 def bootstrap_only_report?(report)
   report.fetch(:setup_status, "").to_s.start_with?("bootstrap_")
@@ -584,7 +561,18 @@ 
    
 113
 114
 115
-116
    
+116
+117
+118
+119
+120
+121
+122
+123
+124
+125
+126
+127
    
         		
     
       
    # File 'lib/kettle/jem/maintenance_changelog.rb', line 90
@@ -606,14 +594,25 @@ 
    
   end
 
   key = TEMPLATE_CHANGELOG_KEYS.fetch(label, "kettle-jem/template")
-  entry = ->(matches) { template_run_entry(changed_files, matches) }
+  tracked_paths = nil
+  entry = lambda do |matches|
+    existing_paths = matches.empty? ? [] : TemplateLock.maintenance_changelog_paths(project_root: project_root, key: key).to_a
+    tracked_paths = (existing_paths + changed_files).uniq.sort
+    template_run_entry(tracked_paths)
+  end
   result = upsert_unreleased_entry(project_root: project_root, section: "Changed", key: key, entry: entry)
-  changelog = result.merge(changed_files: changed_files, entry: result.fetch(:entry))
+  state_changed = TemplateLock.update_maintenance_changelog_paths(
+    project_root: project_root,
+    key: key,
+    paths: tracked_paths || changed_files
+  )
+  changelog = result.merge(changed_files: changed_files, tracked_paths: tracked_paths, entry: result.fetch(:entry))
   changed_files_with_changelog = if result.fetch(:status) == "updated"
     (Array(report.fetch(:changed_files, [])) + ["CHANGELOG.md"]).uniq.sort
   else
     Array(report.fetch(:changed_files, [])).uniq.sort
   end
+  changed_files_with_changelog << KETTLE_LOCK_PATH if state_changed
   report.merge(changelog: changelog, changed_files: changed_files_with_changelog)
 end
    
         		
-      
    # File 'lib/kettle/jem/maintenance_changelog.rb', line 149
+      
    # File 'lib/kettle/jem/maintenance_changelog.rb', line 147
 
 def template_change_category(path)
   TEMPLATE_CHANGE_CATEGORIES.each do |category, matcher|
@@ -672,14 +671,14 @@ 
    
       
     
 
-118
-119
-120
-121
-122
    
+129
+130
+131
+132
+133
    
     
    		
     
-      
    # File 'lib/kettle/jem/maintenance_changelog.rb', line 118
+      
    # File 'lib/kettle/jem/maintenance_changelog.rb', line 129
 
 def template_changed_files(changed_files)
   Array(changed_files).map(&:to_s).uniq.sort.reject do |path|
@@ -729,13 +728,13 @@ 
    
       
     
 
+154
+155
 156
-157
-158
-159
    
+157
    
     
    		
     
-      
    # File 'lib/kettle/jem/maintenance_changelog.rb', line 156
+      
    # File 'lib/kettle/jem/maintenance_changelog.rb', line 154
 
 def template_changelog_disabled?(run_options)
   options = run_options.to_h
@@ -747,9 +746,9 @@ 
    
 
     
       
    
-  
    
+  
    
   
-    .template_entry_counts(matches)  ⇒ Object 
+    .template_run_entry(changed_files)  ⇒ Object 
   
 
   
@@ -761,6 +760,7 @@ 
    
       
     
 
+135
 136
 137
 138
@@ -770,62 +770,13 @@ 
    
 142
 143
 144
-145
-146
-147
    
-    
    		
-      
    # File 'lib/kettle/jem/maintenance_changelog.rb', line 136
-
-def template_entry_counts(matches)
-  source = Array(matches).first.to_h.fetch(:source, "")
-  source.lines.filter_map do |line|
-    match = line.match(/\A\s{2,}- (.+?) \((\d+)\)\s*\z/)
-    next unless match
-
-    category = match[1].tr(" ", "_").to_sym
-    next unless TEMPLATE_CHANGE_CATEGORIES.key?(category) || category == :other
-
-    [category, match[2].to_i]
-  end.to_h
-end
    
-    
    
-
    
-    
-      
    
-  
    
-  
-    .template_run_entry(changed_files, matches)  ⇒ Object 
-  
-
-  
-
-  
-
    
-  
-    
    
-      
    -
-
-124
-125
-126
-127
-128
-129
-130
-131
-132
-133
-134
    
+145
         		
     
-      
    # File 'lib/kettle/jem/maintenance_changelog.rb', line 124
+      
    # File 'lib/kettle/jem/maintenance_changelog.rb', line 135
 
-def template_run_entry(changed_files, matches)
-  counts = template_entry_counts(matches)
+def template_run_entry(changed_files)
+  counts = {}
   changed_files.group_by { |path| template_change_category(path) }.each do |category, paths|
     counts[category] = counts.fetch(category, 0) + paths.length
   end
@@ -903,6 +854,8 @@ 
    
       
     
 
+163
+164
 165
 166
 167
@@ -917,12 +870,10 @@ 
    
 176
 177
 178
-179
-180
-181
    
+179
    
     
    		
     
-      
    # File 'lib/kettle/jem/maintenance_changelog.rb', line 165
+      
    # File 'lib/kettle/jem/maintenance_changelog.rb', line 163
 
 def with_project_changelog_path(project_root)
   CHANGELOG_PATH_MUTEX.synchronize do
@@ -951,7 +902,7 @@ 
    
 
 
       
diff --git a/gems/kettle-jem/docs/Kettle/Jem/PluginContext.html b/gems/kettle-jem/docs/Kettle/Jem/PluginContext.html
index f8bcd911f..21481e476 100644
--- a/gems/kettle-jem/docs/Kettle/Jem/PluginContext.html
+++ b/gems/kettle-jem/docs/Kettle/Jem/PluginContext.html
@@ -923,7 +923,7 @@ 
    
 
 
       
diff --git a/gems/kettle-jem/docs/Kettle/Jem/PluginHelpers.html b/gems/kettle-jem/docs/Kettle/Jem/PluginHelpers.html
index f3103cfa8..327e556c1 100644
--- a/gems/kettle-jem/docs/Kettle/Jem/PluginHelpers.html
+++ b/gems/kettle-jem/docs/Kettle/Jem/PluginHelpers.html
@@ -272,7 +272,7 @@ 
    
 
 
       
diff --git a/gems/kettle-jem/docs/Kettle/Jem/PluginLoader.html b/gems/kettle-jem/docs/Kettle/Jem/PluginLoader.html
index 3b5d38cc4..c4de0d0f8 100644
--- a/gems/kettle-jem/docs/Kettle/Jem/PluginLoader.html
+++ b/gems/kettle-jem/docs/Kettle/Jem/PluginLoader.html
@@ -486,7 +486,7 @@ 
    
 
 
       
diff --git a/gems/kettle-jem/docs/Kettle/Jem/PluginOutput.html b/gems/kettle-jem/docs/Kettle/Jem/PluginOutput.html
index b58cb0e90..fbd7fb139 100644
--- a/gems/kettle-jem/docs/Kettle/Jem/PluginOutput.html
+++ b/gems/kettle-jem/docs/Kettle/Jem/PluginOutput.html
@@ -307,7 +307,7 @@ 
    
 
 
       
diff --git a/gems/kettle-jem/docs/Kettle/Jem/PluginRegistrar.html b/gems/kettle-jem/docs/Kettle/Jem/PluginRegistrar.html
index cdb423072..ccecd1c59 100644
--- a/gems/kettle-jem/docs/Kettle/Jem/PluginRegistrar.html
+++ b/gems/kettle-jem/docs/Kettle/Jem/PluginRegistrar.html
@@ -442,7 +442,7 @@ 
    
 
 
       
diff --git a/gems/kettle-jem/docs/Kettle/Jem/PluginRegistry.html b/gems/kettle-jem/docs/Kettle/Jem/PluginRegistry.html
index 2430ce277..01fb792df 100644
--- a/gems/kettle-jem/docs/Kettle/Jem/PluginRegistry.html
+++ b/gems/kettle-jem/docs/Kettle/Jem/PluginRegistry.html
@@ -762,7 +762,7 @@ 
    
 
 
       
diff --git a/gems/kettle-jem/docs/Kettle/Jem/PluginRegistry/Hook.html b/gems/kettle-jem/docs/Kettle/Jem/PluginRegistry/Hook.html
index 4b7451e31..98e350db9 100644
--- a/gems/kettle-jem/docs/Kettle/Jem/PluginRegistry/Hook.html
+++ b/gems/kettle-jem/docs/Kettle/Jem/PluginRegistry/Hook.html
@@ -467,7 +467,7 @@ 
    
 
 
       
diff --git a/gems/kettle-jem/docs/Kettle/Jem/ReadmePostProcessor.html b/gems/kettle-jem/docs/Kettle/Jem/ReadmePostProcessor.html
index 917c6ca4e..ee81c19b6 100644
--- a/gems/kettle-jem/docs/Kettle/Jem/ReadmePostProcessor.html
+++ b/gems/kettle-jem/docs/Kettle/Jem/ReadmePostProcessor.html
@@ -2050,7 +2050,7 @@ 
    
 
 
       
diff --git a/gems/kettle-jem/docs/Kettle/Jem/RubyGemsResolver.html b/gems/kettle-jem/docs/Kettle/Jem/RubyGemsResolver.html
index c2bb34eec..215c63fd1 100644
--- a/gems/kettle-jem/docs/Kettle/Jem/RubyGemsResolver.html
+++ b/gems/kettle-jem/docs/Kettle/Jem/RubyGemsResolver.html
@@ -836,7 +836,7 @@ 
    
 
 
       
diff --git a/gems/kettle-jem/docs/Kettle/Jem/SelfTest.html b/gems/kettle-jem/docs/Kettle/Jem/SelfTest.html
index 35f1ce5e0..db943e1b1 100644
--- a/gems/kettle-jem/docs/Kettle/Jem/SelfTest.html
+++ b/gems/kettle-jem/docs/Kettle/Jem/SelfTest.html
@@ -108,7 +108,7 @@ 
    Defined Under Namespace
    
 
 
       
diff --git a/gems/kettle-jem/docs/Kettle/Jem/SelfTest/Manifest.html b/gems/kettle-jem/docs/Kettle/Jem/SelfTest/Manifest.html
index bc93d20d7..3a979c783 100644
--- a/gems/kettle-jem/docs/Kettle/Jem/SelfTest/Manifest.html
+++ b/gems/kettle-jem/docs/Kettle/Jem/SelfTest/Manifest.html
@@ -172,27 +172,27 @@ 
    
       
     
 
-2443
-2444
-2445
-2446
-2447
-2448
-2449
-2450
-2451
-2452
-2453
-2454
-2455
-2456
-2457
-2458
-2459
-2460
    
+2472
+2473
+2474
+2475
+2476
+2477
+2478
+2479
+2480
+2481
+2482
+2483
+2484
+2485
+2486
+2487
+2488
+2489
    
     
    		
     
-      
    # File 'lib/kettle/jem.rb', line 2443
+      
    # File 'lib/kettle/jem.rb', line 2472
 
 def compare(before, after)
   all_keys = (before.keys | after.keys).sort
@@ -232,25 +232,25 @@ 
    
       
     
 
-2426
-2427
-2428
-2429
-2430
-2431
-2432
-2433
-2434
-2435
-2436
-2437
-2438
-2439
-2440
-2441
    
+2455
+2456
+2457
+2458
+2459
+2460
+2461
+2462
+2463
+2464
+2465
+2466
+2467
+2468
+2469
+2470
    
     
    		
     
-      
    # File 'lib/kettle/jem.rb', line 2426
+      
    # File 'lib/kettle/jem.rb', line 2455
 
 def generate(dir)
   result = {}
@@ -278,7 +278,7 @@ 
    
 
 
       
diff --git a/gems/kettle-jem/docs/Kettle/Jem/SelfTest/Reporter.html b/gems/kettle-jem/docs/Kettle/Jem/SelfTest/Reporter.html
index de92ca06a..fe3002ac6 100644
--- a/gems/kettle-jem/docs/Kettle/Jem/SelfTest/Reporter.html
+++ b/gems/kettle-jem/docs/Kettle/Jem/SelfTest/Reporter.html
@@ -218,25 +218,25 @@ 
    
       
     
 
-2527
-2528
-2529
-2530
-2531
-2532
-2533
-2534
-2535
-2536
-2537
-2538
-2539
-2540
-2541
-2542
    
+2556
+2557
+2558
+2559
+2560
+2561
+2562
+2563
+2564
+2565
+2566
+2567
+2568
+2569
+2570
+2571
    
     
    		
     
-      
    # File 'lib/kettle/jem.rb', line 2527
+      
    # File 'lib/kettle/jem.rb', line 2556
 
 def append_self_test_table(lines, title, paths, status = nil)
   return if paths.empty?
@@ -274,24 +274,24 @@ 
    
       
     
 
-2544
-2545
-2546
-2547
-2548
-2549
-2550
-2551
-2552
-2553
-2554
-2555
-2556
-2557
-2558
    
+2573
+2574
+2575
+2576
+2577
+2578
+2579
+2580
+2581
+2582
+2583
+2584
+2585
+2586
+2587
    
     
    		
     
-      
    # File 'lib/kettle/jem.rb', line 2544
+      
    # File 'lib/kettle/jem.rb', line 2573
 
 def append_skipped_files(lines, skipped)
   return if skipped.empty?
@@ -328,21 +328,21 @@ 
    
       
     
 
-2466
-2467
-2468
-2469
-2470
-2471
-2472
-2473
-2474
-2475
-2476
-2477
    
+2495
+2496
+2497
+2498
+2499
+2500
+2501
+2502
+2503
+2504
+2505
+2506
    
     
    		
     
-      
    # File 'lib/kettle/jem.rb', line 2466
+      
    # File 'lib/kettle/jem.rb', line 2495
 
 def diff(file_a, file_b)
   a = File.exist?(file_a.to_s) ? file_a.to_s : File::NULL
@@ -376,35 +376,6 @@ 
    
       
     
 
-2479
-2480
-2481
-2482
-2483
-2484
-2485
-2486
-2487
-2488
-2489
-2490
-2491
-2492
-2493
-2494
-2495
-2496
-2497
-2498
-2499
-2500
-2501
-2502
-2503
-2504
-2505
-2506
-2507
 2508
 2509
 2510
@@ -422,10 +393,39 @@ 
    
 2522
 2523
 2524
-2525
    
+2525
+2526
+2527
+2528
+2529
+2530
+2531
+2532
+2533
+2534
+2535
+2536
+2537
+2538
+2539
+2540
+2541
+2542
+2543
+2544
+2545
+2546
+2547
+2548
+2549
+2550
+2551
+2552
+2553
+2554
    
     
    		
     
-      
    # File 'lib/kettle/jem.rb', line 2479
+      
    # File 'lib/kettle/jem.rb', line 2508
 
 def summary(comparison, output_dir:, templating_environment: nil, diff_count: nil, now: Time.now)
   matched = comparison.fetch(:matched, [])
@@ -484,7 +484,7 @@ 
    
 
 
       
diff --git a/gems/kettle-jem/docs/Kettle/Jem/Tasks.html b/gems/kettle-jem/docs/Kettle/Jem/Tasks.html
index 71384c533..2940eec0a 100644
--- a/gems/kettle-jem/docs/Kettle/Jem/Tasks.html
+++ b/gems/kettle-jem/docs/Kettle/Jem/Tasks.html
@@ -110,7 +110,7 @@ 
    Defined Under Namespace
    
 
 
       
diff --git a/gems/kettle-jem/docs/Kettle/Jem/Tasks/InstallTask.html b/gems/kettle-jem/docs/Kettle/Jem/Tasks/InstallTask.html
index 2bc7a295d..d4194dacf 100644
--- a/gems/kettle-jem/docs/Kettle/Jem/Tasks/InstallTask.html
+++ b/gems/kettle-jem/docs/Kettle/Jem/Tasks/InstallTask.html
@@ -98,7 +98,7 @@ 
    
         
    CURATED_BINSTUB_GEMS =
           
         
    
-        
    %w[appraisal2 rake rbs rspec-core yard kettle-dev kettle-test kettle-soup-cover kettle-gha-pins stone_checksums].freeze
    
+        
    %w[appraisal2 rake rbs rspec-core yard rubocop-gradual kettle-dev kettle-test kettle-soup-cover kettle-gha-pins stone_checksums].freeze
    
       
         
    CURATED_BINSTUB_DISCRETE_EXECUTABLES =
           
@@ -11690,7 +11690,7 @@ 
    
 
 
       
diff --git a/gems/kettle-jem/docs/Kettle/Jem/Tasks/PrepareTask.html b/gems/kettle-jem/docs/Kettle/Jem/Tasks/PrepareTask.html
index dce2d708e..e6394ee5a 100644
--- a/gems/kettle-jem/docs/Kettle/Jem/Tasks/PrepareTask.html
+++ b/gems/kettle-jem/docs/Kettle/Jem/Tasks/PrepareTask.html
@@ -1593,7 +1593,7 @@ 
    
 
 
       
diff --git a/gems/kettle-jem/docs/Kettle/Jem/Tasks/SelfTestTask.html b/gems/kettle-jem/docs/Kettle/Jem/Tasks/SelfTestTask.html
index f046dd7e8..e43556198 100644
--- a/gems/kettle-jem/docs/Kettle/Jem/Tasks/SelfTestTask.html
+++ b/gems/kettle-jem/docs/Kettle/Jem/Tasks/SelfTestTask.html
@@ -1328,7 +1328,7 @@ 
    
 
 
       
diff --git a/gems/kettle-jem/docs/Kettle/Jem/Tasks/TemplateTask.html b/gems/kettle-jem/docs/Kettle/Jem/Tasks/TemplateTask.html
index 4cf265ae6..6d4ebd8e4 100644
--- a/gems/kettle-jem/docs/Kettle/Jem/Tasks/TemplateTask.html
+++ b/gems/kettle-jem/docs/Kettle/Jem/Tasks/TemplateTask.html
@@ -889,7 +889,7 @@ 
    
 
 
       
diff --git a/gems/kettle-jem/docs/Kettle/Jem/TemplateChecksums.html b/gems/kettle-jem/docs/Kettle/Jem/TemplateChecksums.html
index 6da4bbf1c..27839f72c 100644
--- a/gems/kettle-jem/docs/Kettle/Jem/TemplateChecksums.html
+++ b/gems/kettle-jem/docs/Kettle/Jem/TemplateChecksums.html
@@ -1129,7 +1129,7 @@ 
    
 
 
       
diff --git a/gems/kettle-jem/docs/Kettle/Jem/TemplateLock.html b/gems/kettle-jem/docs/Kettle/Jem/TemplateLock.html
index bfde7330d..ab6d5fb08 100644
--- a/gems/kettle-jem/docs/Kettle/Jem/TemplateLock.html
+++ b/gems/kettle-jem/docs/Kettle/Jem/TemplateLock.html
@@ -110,6 +110,11 @@ 
    
         
    
         
    "files"
    
       
+        
    MAINTENANCE_CHANGELOG_SUBKEY =
+          
+        
    
+        
    "maintenance_changelog"
    
+      
     
   
 
@@ -236,6 +241,52 @@ 
    
   
 
   
+    
    
+
    
+  
+
+
+      
+        
  • 
+  
+    
+      .maintenance_changelog(lock)  ⇒ Object 
+    
+
+    
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+    
    
+
    
+  
+
    • 
+
+      
+        
  • 
+  
+    
+      .maintenance_changelog_paths(project_root:, key:)  ⇒ Object 
+    
+
+    
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
     
    
 
    
   
@@ -305,6 +356,29 @@ 
    
   
 
   
+    
    
+
    
+  
+
    • 
+
+      
+        
  • 
+  
+    
+      .update_maintenance_changelog_paths(project_root:, key:, paths:)  ⇒ Object 
+    
+
+    
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
     
    
 
    
   
@@ -359,16 +433,16 @@ 
    
       
     
 
-2158
-2159
-2160
-2161
-2162
-2163
-2164
    
+2187
+2188
+2189
+2190
+2191
+2192
+2193
    • 
     
    		
     
-      
    # File 'lib/kettle/jem.rb', line 2158
+      
    # File 'lib/kettle/jem.rb', line 2187
 
 def build_lock(template_state:, file_records:)
   {
@@ -397,13 +471,13 @@ 
    
       
     
 
-2153
 2154
 2155
-2156
    
+2156
+2157
    
     
    		
     
-      
    # File 'lib/kettle/jem.rb', line 2153
+      
    # File 'lib/kettle/jem.rb', line 2154
 
 def file_record(lock, relative_path)
   record = files(lock)[relative_path.to_s]
@@ -429,13 +503,13 @@ 
    
       
     
 
-2148
 2149
 2150
-2151
    
+2151
+2152
    
     
    		
     
-      
    # File 'lib/kettle/jem.rb', line 2148
+      
    # File 'lib/kettle/jem.rb', line 2149
 
 def files(lock)
   value = lock.is_a?(Hash) ? lock[FILES_KEY] : nil
@@ -461,12 +535,12 @@ 
    
       
     
 
-2097
 2098
-2099
    
+2099
+2100
    
     
    		
     
-      
    # File 'lib/kettle/jem.rb', line 2097
+      
    # File 'lib/kettle/jem.rb', line 2098
 
 def legacy_path(project_root)
   File.join(project_root.to_s, LEGACY_KETTLE_LOCK_PATH)
@@ -491,7 +565,6 @@ 
    
       
     
 
-2101
 2102
 2103
 2104
@@ -507,10 +580,11 @@ 
    
 2114
 2115
 2116
-2117
    
+2117
+2118
    
     
    		
     
-      
    # File 'lib/kettle/jem.rb', line 2101
+      
    # File 'lib/kettle/jem.rb', line 2102
 
 def load(project_root:, config_path: nil)
   lock_path = path(project_root)
@@ -532,6 +606,74 @@ 
    
     
    		
   
    
 
    
+
    
+    
+      
    
+  
    
+  
+    .maintenance_changelog(lock)  ⇒ Object 
+  
+
+  
+
+  
+
    
+  
+    
+    
+  
+
    
+      
    +
+
+2159
+2160
+2161
+2162
    
+        		
+      
    # File 'lib/kettle/jem.rb', line 2159
+
+def maintenance_changelog(lock)
+  value = lock.dig(TEMPLATE_STATE_KEY, MAINTENANCE_CHANGELOG_SUBKEY)
+  value.is_a?(Hash) ? value : {}
+end
    
+    
    
+
    
+    
+      
    
+  
    
+  
+    .maintenance_changelog_paths(project_root:, key:)  ⇒ Object 
+  
+
+  
+
+  
+
    
+  
+    
+    
+  
+
    
+      
    +
+
+2164
+2165
+2166
+2167
+2168
+2169
    
+        		
+      
    # File 'lib/kettle/jem.rb', line 2164
+
+def maintenance_changelog_paths(project_root:, key:)
+  state = maintenance_changelog(load(project_root: project_root))
+  return unless state.key?(key.to_s)
+
+  Array(state.fetch(key.to_s)).map(&:to_s).uniq.sort
+end
    
+    
    
 
    
     
       
    
@@ -549,7 +691,6 @@ 
    
       
     
 
-2119
 2120
 2121
 2122
@@ -562,10 +703,11 @@ 
    
 2129
 2130
 2131
-2132
    
+2132
+2133
    
     
     
-      
    # File 'lib/kettle/jem.rb', line 2119
+      
    # File 'lib/kettle/jem.rb', line 2120
 
 def merge_legacy(lock, legacy)
   return lock unless legacy.is_a?(Hash) && !legacy.empty?
@@ -601,12 +743,12 @@ 
    
       
     
 
-2093
 2094
-2095
    
+2095
+2096
    
     
     
-      
    # File 'lib/kettle/jem.rb', line 2093
+      
    # File 'lib/kettle/jem.rb', line 2094
 
 def path(project_root)
   File.join(project_root.to_s, KETTLE_LOCK_PATH)
@@ -631,16 +773,16 @@ 
    
       
     
 
-2140
 2141
 2142
 2143
 2144
 2145
-2146
    
+2146
+2147
    
     
     
-      
    # File 'lib/kettle/jem.rb', line 2140
+      
    # File 'lib/kettle/jem.rb', line 2141
 
 def remove_legacy(project_root)
   legacy_lock_path = legacy_path(project_root)
@@ -652,6 +794,60 @@ 
    
     
   
 
+
+    
+      
    
+  
    
+  
+    .update_maintenance_changelog_paths(project_root:, key:, paths:)  ⇒ Object 
+  
+
+  
+
+  
+
    
+  
+    
+    
+  
+
    
+      
    +
+
+2171
+2172
+2173
+2174
+2175
+2176
+2177
+2178
+2179
+2180
+2181
+2182
+2183
+2184
+2185
    
+        		
+      
    # File 'lib/kettle/jem.rb', line 2171
+
+def update_maintenance_changelog_paths(project_root:, key:, paths:)
+  lock = load(project_root: project_root)
+  template_state = lock.fetch(TEMPLATE_STATE_KEY, {}).dup
+  changelog = maintenance_changelog(lock).dup
+  normalized_paths = Array(paths).map(&:to_s).uniq.sort
+  return false if changelog[key.to_s] == normalized_paths
+
+  changelog[key.to_s] = normalized_paths
+  template_state[MAINTENANCE_CHANGELOG_SUBKEY] = changelog
+  lock[TEMPLATE_STATE_KEY] = template_state
+  lock["version"] ||= VERSION
+  lock[FILES_KEY] ||= {}
+  write(project_root: project_root, lock: lock)
+  true
+end
    
+    
    
 
    
     
       
    
@@ -669,14 +865,14 @@ 
    
       
     
 
-2134
 2135
 2136
 2137
-2138
    
+2138
+2139
    
     
     
-      
    # File 'lib/kettle/jem.rb', line 2134
+      
    # File 'lib/kettle/jem.rb', line 2135
 
 def write(project_root:, lock:)
   lock_path = path(project_root)
@@ -693,7 +889,7 @@ 
    
 
 
       
diff --git a/gems/kettle-jem/docs/Kettle/Jem/TemplatingReport.html b/gems/kettle-jem/docs/Kettle/Jem/TemplatingReport.html
index 81aa2f589..cc7e75164 100644
--- a/gems/kettle-jem/docs/Kettle/Jem/TemplatingReport.html
+++ b/gems/kettle-jem/docs/Kettle/Jem/TemplatingReport.html
@@ -531,19 +531,19 @@ 
    
       
     
 
-2193
-2194
-2195
-2196
-2197
-2198
-2199
-2200
-2201
-2202
    
+2222
+2223
+2224
+2225
+2226
+2227
+2228
+2229
+2230
+2231
    
     
     
-      
    # File 'lib/kettle/jem.rb', line 2193
+      
    # File 'lib/kettle/jem.rb', line 2222
 
 def build_entry(name, spec, workspace_root:)
   path = spec&.full_gem_path.to_s
@@ -575,14 +575,14 @@ 
    
       
     
 
-2226
-2227
-2228
-2229
-2230
    
+2255
+2256
+2257
+2258
+2259
    
     
     
-      
    # File 'lib/kettle/jem.rb', line 2226
+      
    # File 'lib/kettle/jem.rb', line 2255
 
 def canonical_path(path)
   File.realpath(path)
@@ -609,29 +609,29 @@ 
    
       
     
 
-2232
-2233
-2234
-2235
-2236
-2237
-2238
-2239
-2240
-2241
-2242
-2243
-2244
-2245
-2246
-2247
-2248
-2249
-2250
-2251
    
+2261
+2262
+2263
+2264
+2265
+2266
+2267
+2268
+2269
+2270
+2271
+2272
+2273
+2274
+2275
+2276
+2277
+2278
+2279
+2280
    
     
     
-      
    # File 'lib/kettle/jem.rb', line 2232
+      
    # File 'lib/kettle/jem.rb', line 2261
 
 def console_lines(snapshot: nil, project_root: nil)
   snapshot ||= self.snapshot
@@ -673,22 +673,22 @@ 
    
       
     
 
-2204
-2205
-2206
-2207
-2208
-2209
-2210
-2211
-2212
-2213
-2214
-2215
-2216
    
+2233
+2234
+2235
+2236
+2237
+2238
+2239
+2240
+2241
+2242
+2243
+2244
+2245
    
     
     
-      
    # File 'lib/kettle/jem.rb', line 2204
+      
    # File 'lib/kettle/jem.rb', line 2233
 
 def default_workspace_root
   env_root = ENV["KETTLE_DEV_DEV"].to_s.strip
@@ -746,16 +746,16 @@ 
    
       
     
 
-2218
-2219
-2220
-2221
-2222
-2223
-2224
    
+2247
+2248
+2249
+2250
+2251
+2252
+2253
    
     
     
-      
    # File 'lib/kettle/jem.rb', line 2218
+      
    # File 'lib/kettle/jem.rb', line 2247
 
 def local_path?(path, workspace_root: default_workspace_root)
   return false if workspace_root.to_s.strip.empty?
@@ -784,18 +784,18 @@ 
    
       
     
 
-2362
-2363
-2364
-2365
-2366
-2367
-2368
-2369
-2370
    
+2391
+2392
+2393
+2394
+2395
+2396
+2397
+2398
+2399
    
     
     
-      
    # File 'lib/kettle/jem.rb', line 2362
+      
    # File 'lib/kettle/jem.rb', line 2391
 
 def local_warning_section(warning)
   <<~MARKDOWN.chomp
@@ -826,30 +826,30 @@ 
    
       
     
 
-2372
-2373
-2374
-2375
-2376
-2377
-2378
-2379
-2380
-2381
-2382
-2383
-2384
-2385
-2386
-2387
-2388
-2389
-2390
-2391
-2392
    
+2401
+2402
+2403
+2404
+2405
+2406
+2407
+2408
+2409
+2410
+2411
+2412
+2413
+2414
+2415
+2416
+2417
+2418
+2419
+2420
+2421
    
     
     
-      
    # File 'lib/kettle/jem.rb', line 2372
+      
    # File 'lib/kettle/jem.rb', line 2401
 
 def local_workspace_warning(snapshot:, project_root:)
   return if project_root.to_s.strip.empty?
@@ -892,18 +892,18 @@ 
    
       
     
 
-2352
-2353
-2354
-2355
-2356
-2357
-2358
-2359
-2360
    
+2381
+2382
+2383
+2384
+2385
+2386
+2387
+2388
+2389
    
     
     
-      
    # File 'lib/kettle/jem.rb', line 2352
+      
    # File 'lib/kettle/jem.rb', line 2381
 
 def local_workspace_warning_lines(snapshot:, project_root:)
   warning = local_workspace_warning(snapshot: snapshot, project_root: project_root)
@@ -934,30 +934,30 @@ 
    
       
     
 
-2253
-2254
-2255
-2256
-2257
-2258
-2259
-2260
-2261
-2262
-2263
-2264
-2265
-2266
-2267
-2268
-2269
-2270
-2271
-2272
-2273
    
+2282
+2283
+2284
+2285
+2286
+2287
+2288
+2289
+2290
+2291
+2292
+2293
+2294
+2295
+2296
+2297
+2298
+2299
+2300
+2301
+2302
    
     
     
-      
    # File 'lib/kettle/jem.rb', line 2253
+      
    # File 'lib/kettle/jem.rb', line 2282
 
 def markdown_section(snapshot: nil)
   snapshot ||= self.snapshot
@@ -1000,35 +1000,6 @@ 
    
       
     
 
-2275
-2276
-2277
-2278
-2279
-2280
-2281
-2282
-2283
-2284
-2285
-2286
-2287
-2288
-2289
-2290
-2291
-2292
-2293
-2294
-2295
-2296
-2297
-2298
-2299
-2300
-2301
-2302
-2303
 2304
 2305
 2306
@@ -1039,10 +1010,39 @@ 
    
 2311
 2312
 2313
-2314
    
+2314
+2315
+2316
+2317
+2318
+2319
+2320
+2321
+2322
+2323
+2324
+2325
+2326
+2327
+2328
+2329
+2330
+2331
+2332
+2333
+2334
+2335
+2336
+2337
+2338
+2339
+2340
+2341
+2342
+2343
    
     
     
-      
    # File 'lib/kettle/jem.rb', line 2275
+      
    # File 'lib/kettle/jem.rb', line 2304
 
 def render_markdown(project_root:, output_dir: nil, snapshot: nil, run_started_at: Time.now, finished_at: nil,
   status: nil, warnings: [], error: nil, template_diff: nil, template_commit_sha: nil)
@@ -1104,14 +1104,14 @@ 
    
       
     
 
-2316
-2317
-2318
-2319
-2320
    
+2345
+2346
+2347
+2348
+2349
    
     
     
-      
    # File 'lib/kettle/jem.rb', line 2316
+      
    # File 'lib/kettle/jem.rb', line 2345
 
 def report_path(project_root:, output_dir: nil, run_started_at: Time.now, pid: Process.pid)
   target_root = output_dir || project_root
@@ -1138,15 +1138,15 @@ 
    
       
     
 
-2394
-2395
-2396
-2397
-2398
-2399
    
+2423
+2424
+2425
+2426
+2427
+2428
    
     
     
-      
    # File 'lib/kettle/jem.rb', line 2394
+      
    # File 'lib/kettle/jem.rb', line 2423
 
 def sibling_workspace_root(project_root)
   candidate = canonical_path(File.expand_path("..", project_root))
@@ -1174,16 +1174,16 @@ 
    
       
     
 
-2185
-2186
-2187
-2188
-2189
-2190
-2191
    
+2214
+2215
+2216
+2217
+2218
+2219
+2220
    
     
     
-      
    # File 'lib/kettle/jem.rb', line 2185
+      
    # File 'lib/kettle/jem.rb', line 2214
 
 def snapshot(loaded_specs: Gem.loaded_specs, workspace_root: default_workspace_root)
   {
@@ -1212,15 +1212,15 @@ 
    
       
     
 
-2345
-2346
-2347
-2348
-2349
-2350
    
+2374
+2375
+2376
+2377
+2378
+2379
    
     
     
-      
    # File 'lib/kettle/jem.rb', line 2345
+      
    # File 'lib/kettle/jem.rb', line 2374
 
 def source_label(entry)
   return "not loaded" unless entry[:loaded]
@@ -1248,28 +1248,28 @@ 
    
       
     
 
-2401
-2402
-2403
-2404
-2405
-2406
-2407
-2408
-2409
-2410
-2411
-2412
-2413
-2414
-2415
-2416
-2417
-2418
-2419
    
+2430
+2431
+2432
+2433
+2434
+2435
+2436
+2437
+2438
+2439
+2440
+2441
+2442
+2443
+2444
+2445
+2446
+2447
+2448
    
     
     
-      
    # File 'lib/kettle/jem.rb', line 2401
+      
    # File 'lib/kettle/jem.rb', line 2430
 
 def template_diff_section(diff)
   lines = ["## Template File Changes", ""]
@@ -1310,31 +1310,31 @@ 
    
       
     
 
-2322
-2323
-2324
-2325
-2326
-2327
-2328
-2329
-2330
-2331
-2332
-2333
-2334
-2335
-2336
-2337
-2338
-2339
-2340
-2341
-2342
-2343
    
+2351
+2352
+2353
+2354
+2355
+2356
+2357
+2358
+2359
+2360
+2361
+2362
+2363
+2364
+2365
+2366
+2367
+2368
+2369
+2370
+2371
+2372
    
     
     
-      
    # File 'lib/kettle/jem.rb', line 2322
+      
    # File 'lib/kettle/jem.rb', line 2351
 
 def write(project_root:, output_dir: nil, snapshot: nil, report_path: nil, run_started_at: Time.now,
   finished_at: nil, status: nil, warnings: [], error: nil, template_diff: nil, template_commit_sha: nil)
@@ -1368,7 +1368,7 @@ 
    
 
 
       
diff --git a/gems/kettle-jem/docs/Kettle/Jem/TransferChangelogFilterParser.html b/gems/kettle-jem/docs/Kettle/Jem/TransferChangelogFilterParser.html
index 7cdf20f22..0b85860c2 100644
--- a/gems/kettle-jem/docs/Kettle/Jem/TransferChangelogFilterParser.html
+++ b/gems/kettle-jem/docs/Kettle/Jem/TransferChangelogFilterParser.html
@@ -129,7 +129,7 @@ 
    Overview
    
 
    
 
       
diff --git a/gems/kettle-jem/docs/Kettle/Jem/TransferChangelogLineParser.html b/gems/kettle-jem/docs/Kettle/Jem/TransferChangelogLineParser.html
index 77f646f41..3ed195d6c 100644
--- a/gems/kettle-jem/docs/Kettle/Jem/TransferChangelogLineParser.html
+++ b/gems/kettle-jem/docs/Kettle/Jem/TransferChangelogLineParser.html
@@ -117,7 +117,7 @@
 
 
       
diff --git a/gems/kettle-jem/docs/Kettle/Jem/Version.html b/gems/kettle-jem/docs/Kettle/Jem/Version.html
index ea1968187..114560407 100644
--- a/gems/kettle-jem/docs/Kettle/Jem/Version.html
+++ b/gems/kettle-jem/docs/Kettle/Jem/Version.html
@@ -118,7 +118,7 @@ 
    
 
 
         
-        
    "7.1.25"
    
+        
    "7.1.26"
    
       
     
   
@@ -134,7 +134,7 @@ 
    
 
 
       
diff --git a/gems/kettle-jem/docs/Kettle/Jem/WriteIntent.html b/gems/kettle-jem/docs/Kettle/Jem/WriteIntent.html
index d8946ff94..1c6761bae 100644
--- a/gems/kettle-jem/docs/Kettle/Jem/WriteIntent.html
+++ b/gems/kettle-jem/docs/Kettle/Jem/WriteIntent.html
@@ -793,7 +793,7 @@ 
    
 
 
       
diff --git a/gems/kettle-jem/docs/_index.html b/gems/kettle-jem/docs/_index.html
index 089059222..b5ed50e13 100644
--- a/gems/kettle-jem/docs/_index.html
+++ b/gems/kettle-jem/docs/_index.html
@@ -507,7 +507,7 @@ 
    Namespace Listing A-Z
    
 
 
       
diff --git a/gems/kettle-jem/docs/file.AGENTS.html b/gems/kettle-jem/docs/file.AGENTS.html
index f426e314c..3460778ff 100644
--- a/gems/kettle-jem/docs/file.AGENTS.html
+++ b/gems/kettle-jem/docs/file.AGENTS.html
@@ -410,7 +410,7 @@ 
    🚫 Common Pitfalls
    
 
 
       
diff --git a/gems/kettle-jem/docs/file.AGPL-3.0-only.html b/gems/kettle-jem/docs/file.AGPL-3.0-only.html
index 8954ebfab..9b5773477 100644
--- a/gems/kettle-jem/docs/file.AGPL-3.0-only.html
+++ b/gems/kettle-jem/docs/file.AGPL-3.0-only.html
@@ -342,7 +342,7 @@
 
 
       
diff --git a/gems/kettle-jem/docs/file.CHANGELOG.html b/gems/kettle-jem/docs/file.CHANGELOG.html
index 59099ae24..f101783c1 100644
--- a/gems/kettle-jem/docs/file.CHANGELOG.html
+++ b/gems/kettle-jem/docs/file.CHANGELOG.html
@@ -70,7 +70,7 @@
 and yes, platform and engine support are part of the public API.
    
 Please file a bug if you notice a violation of semantic versioning.
    
 
-
    Unreleased
    
+
    Unreleased
    
 
 
    Added
    
 
@@ -84,6 +84,66 @@ 
    Fixed
    
 
 
    Security
    
 
+
    
+7.1.26 - 2026-09-10
    
+
+
      
+  
    • TAG: v7.1.26
+
      • 
+  
    • COVERAGE: 93.67% – 11268/12030 lines in 16 files
      • 
+  
    • BRANCH COVERAGE: 77.10% – 4794/6218 branches in 16 files
      • 
+  
    • 18.11% documented
      • 
+
    
+
+
    Added
    
+
+
      
+  
    • Curated Bundler binstub generation now includes rubocop-gradual.
      • 
+
    
+
+
    Changed
    
+
+
      
+  
    • [kc] kettle-jem-deps-floor: Update kettle-jem template dependency floors:
+    
        
+      
      • kettle-dev (>= 3.0.33 -> >= 3.0.34)
        • 
+      
      • kettle-family (>= 1.2.97 -> >= 1.2.100)
        • 
+    
      
+  
      • 
+  
    • [kc] kettle-jem/prepare: updated 10 project files:
+    
        
+      
      • dependencies (10)
        • 
+    
      
+  
      • 
+  
    • [kc] kettle-jem/template: updated 5 project files:
+    
        
+      
      • code and tests (1)
        • 
+      
      • dependencies (3)
        • 
+      
      • other (1)
        • 
+    
      
+  
      • 
+
    
+
+
    Fixed
    
+
+
      
+  
    • 
+    
      [kc] kettle-jem/template-file-tracking: Track distinct changed template files across repeated Unreleased template runs.
      
+  
      • 
+  
    • 
+    
      Keep branch-stack release CI active by managing the r_--v GitHub Actions push trigger.
      
+  
      • 
+  
    • 
+    
      Allow KETTLE_DEV_DEV to override a directly declared kettle-dev development dependency in local coverage Gemfiles.
      
+  
      • 
+  
    • 
+    
      Predeclare the intentional version_gem runtime-heads dependency overlap in generated Kettle Jem configuration.
      
+  
      • 
+  
    • 
+    
      Preserve declared kettle-dev requirements when local coverage and templating Gemfiles replace it with a workspace path.
      
+  
      • 
+
    
+
 
    
 7.1.25 - 2026-09-08
    
 
@@ -95,7 +155,7 @@ 
    
   
  • 18.14% documented
    • 
 
 
-
    Changed
    
+
    Changed
    
 
 
      
   
    • [kc] kettle-jem-deps-floor: Update kettle-jem template dependency floors:
@@ -116,7 +176,7 @@ 
      
   
    • 18.14% documented
      • 
 
    
 
-
    Changed
    
+
    Changed
    
 
 
      
   
    • [kc] kettle-jem-deps-floor: Update kettle-jem template dependency floors:
@@ -126,7 +186,7 @@ 
      Changed
      
   
      • 
 
    
 
-
    Fixed
    
+
    Fixed
    
 
 
      
   
    • 
@@ -151,7 +211,7 @@ 
      
   
    • 18.13% documented
      • 
 
    
 
-
    Changed
    
+
    Changed
    
 
 
      
   
    • [kc] kettle-jem-deps-floor: Update kettle-jem template dependency floors:
@@ -161,7 +221,7 @@ 
      Changed
      
   
      • 
 
    
 
-
    Fixed
    
+
    Fixed
    
 
 
      
   
    • 
@@ -189,7 +249,7 @@ 
      
   
    • 18.04% documented
      • 
 
    
 
-
    Fixed
    
+
    Fixed
    
 
 
      
   
    • 
@@ -211,7 +271,7 @@ 
      
   
    • 18.01% documented
      • 
 
    
 
-
    Changed
    
+
    Changed
    
 
 
      
   
    • [kc] kettle-jem-deps-floor: Update kettle-jem template dependency floors:
@@ -233,7 +293,7 @@ 
      
   
    • 18.01% documented
      • 
 
    
 
-
    Changed
    
+
    Changed
    
 
 
      
   
    • [kc] kettle-jem-deps-floor: Update kettle-jem template dependency floors:
@@ -255,7 +315,7 @@ 
      
   
    • 18.01% documented
      • 
 
    
 
-
    Changed
    
+
    Changed
    
 
 
      
   
    • [kc] kettle-jem-deps-floor: Update kettle-jem template dependency floors:
@@ -277,7 +337,7 @@ 
      
   
    • 18.01% documented
      • 
 
    
 
-
    Changed
    
+
    Changed
    
 
 
      
   
    • [kc] kettle-jem-deps-floor: Update kettle-jem template dependency floors:
@@ -298,7 +358,7 @@ 
      Changed
      
   
      • 
 
    
 
-
    Fixed
    
+
    Fixed
    
 
 
      
   
    • 
@@ -320,7 +380,7 @@ 
      
   
    • 17.92% documented
      • 
 
    
 
-
    Changed
    
+
    Changed
    
 
 
      
   
    • [kc] kettle-jem-deps-floor: Update kettle-jem template dependency floors:
@@ -337,7 +397,7 @@ 
      Changed
      
   
      • 
 
    
 
-
    Fixed
    
+
    Fixed
    
 
 
      
   
    • Apply StructuredMerge local template dependencies on the active development platform.
      • 
@@ -354,7 +414,7 @@ 
      
   
    • 17.92% documented
      • 
 
    
 
-
    Changed
    
+
    Changed
    
 
 
      
   
    • [kc] kettle-jem-deps-floor: Update kettle-jem template dependency floors:
@@ -375,7 +435,7 @@ 
      Changed
      
   
      • 
 
    
 
-
    Fixed
    
+
    Fixed
    
 
 
      
   
    • 
@@ -406,7 +466,7 @@ 
      
   
    • 17.95% documented
      • 
 
    
 
-
    Changed
    
+
    Changed
    
 
 
      
   
    • [kc] kettle-jem-deps-floor: Update kettle-jem template dependency floors:
@@ -440,7 +500,7 @@ 
      
   
    • 17.95% documented
      • 
 
    
 
-
    Changed
    
+
    Changed
    
 
 
      
   
    • [kc] kettle-jem-deps-floor: Update kettle-jem template dependency floors:
@@ -466,7 +526,7 @@ 
      Changed
      
   
      • 
 
    
 
-
    Fixed
    
+
    Fixed
    
 
 
      
   
    • 
@@ -488,7 +548,7 @@ 
      
   
    • 17.96% documented
      • 
 
    
 
-
    Changed
    
+
    Changed
    
 
 
      
   
    • [kc] kettle-jem/template: updated 796 project files:
@@ -508,7 +568,7 @@ 
      Changed
      
   
      • 
 
    
 
-
    Fixed
    
+
    Fixed
    
 
 
      
   
    • 
@@ -536,7 +596,7 @@ 
      
   
    • 17.95% documented
      • 
 
    
 
-
    Changed
    
+
    Changed
    
 
 
      
   
    • [kc] kettle-jem-deps-floor: Update kettle-jem template dependency floors:
@@ -557,7 +617,7 @@ 
      
   
    • 17.95% documented
      • 
 
    
 
-
    Changed
    
+
    Changed
    
 
 
      
   
    • [kc] kettle-jem/template: updated 398 project files:
@@ -580,7 +640,7 @@ 
      Changed
      
   
    • Raise first-party dependency minimums to their latest released versions.
      • 
 
    
 
-
    Fixed
    
+
    Fixed
    
 
 
      
   
    • 
@@ -602,7 +662,7 @@ 
      
   
    • 17.92% documented
      • 
 
    
 
-
    Changed
    
+
    Changed
    
 
 
      
   
    • 
@@ -658,7 +718,7 @@ 
      Changed
      
   
      • 
 
    
 
-
    Fixed
    
+
    Fixed
    
 
 
      
   
    • 
@@ -680,13 +740,13 @@ 
      
   
    • 17.93% documented
      • 
 
    
 
-
    Added
    
+
    Added
    
 
 
      
   
    • Gemspec author metadata now expands existing authors with Git-derived copyright holders and consolidates configured author aliases, while applying the documented default machine-account filter.
      • 
 
    
 
-
    Changed
    
+
    Changed
    
 
 
      
   
    • 
@@ -712,7 +772,7 @@ 
      
   
    • 17.97% documented
      • 
 
    
 
-
    Changed
    
+
    Changed
    
 
 
      
   
    • [kc] kettle-jem-deps-floor: Update kettle-jem template dependency floors:
@@ -734,7 +794,7 @@ 
      
   
    • 17.97% documented
      • 
 
    
 
-
    Changed
    
+
    Changed
    
 
 
      
   
    • [kc] kettle-jem-deps-floor: Update kettle-jem template dependency floors:
@@ -769,7 +829,7 @@ 
      
   
    • 17.97% documented
      • 
 
    
 
-
    Changed
    
+
    Changed
    
 
 
      
   
    • 
@@ -810,7 +870,7 @@ 
      Changed
      
   
    • Make the repository-local kettle-jem-deps-floor executable bootstrap the consistent StructuredMerge development bundle before loading parser dependencies.
      • 
 
    
 
-
    Fixed
    
+
    Fixed
    
 
 
      
   
    • 
@@ -835,7 +895,7 @@ 
      
   
    • 18.00% documented
      • 
 
    
 
-
    Changed
    
+
    Changed
    
 
 
      
   
    • 
@@ -862,7 +922,7 @@ 
      Changed
      
   
    • Main templating commands now record an aggregate Changed entry through kettle-changelog only when template files change, while transfer replay uses kettle-changelog’s structural merger.
      • 
 
    
 
-
    Fixed
    
+
    Fixed
    
 
 
      
   
    • Restore source-checkout loading for the repository-local dependency-floor and workflow-pin maintenance tools.
      • 
@@ -879,7 +939,7 @@ 
      
   
    • 18.01% documented
      • 
 
    
 
-
    Changed
    
+
    Changed
    
 
 
      
   
    • 
@@ -890,7 +950,7 @@ 
      Changed
      
   
      • 
 
    
 
-
    Fixed
    
+
    Fixed
    
 
 
      
   
    • 
@@ -936,7 +996,7 @@ 
      
   
    • 18.04% documented
      • 
 
    
 
-
    Added
    
+
    Added
    
 
 
      
   
    • 
@@ -947,7 +1007,7 @@ 
      Added
      
   
      • 
 
    
 
-
    Changed
    
+
    Changed
    
 
 
      
   
    • 
@@ -967,7 +1027,7 @@ 
      Changed
      
   
      • 
 
    
 
-
    Fixed
    
+
    Fixed
    
 
 
      
   
    • 
@@ -1004,7 +1064,7 @@ 
      
   
    • 18.04% documented
      • 
 
    
 
-
    Added
    
+
    Added
    
 
 
      
   
    • Template NDJSON summaries now distinguish checksum write bypasses, planned
      
@@ -1063,7 +1123,7 @@ 
      Added
      
   
    • Transfer changelog replay now supports destination applicability filters and filter-aware status reporting.
      • 
 
    
 
-
    Changed
    
+
    Changed
    
 
 
      
   
    • Runtime dependency metadata now requires kettle-ndjson 0.1.3 or newer and
      
@@ -1279,7 +1339,7 @@ 
      Changed
      
   
    • Record explicit modular dependency removals and compatible keep_both decisions so repeated templating remains deterministic.
      • 
 
    
 
-
    Fixed
    
+
    Fixed
    
 
 
      
   
    • Templating now removes the obsolete tree_sitter_language_pack entry from
      
@@ -2538,7 +2598,7 @@ 
      
 
      • 
 
    
 
-
    Added
    
+
    Added
    
 
 
      
   
    • Released kettle-jem as part of the initial StructuredMerge Ruby 7.0.0 gem set.
      • 
@@ -2548,7 +2608,7 @@ 
      Added
      
 
 
       
diff --git a/gems/kettle-jem/docs/file.CODE_OF_CONDUCT.html b/gems/kettle-jem/docs/file.CODE_OF_CONDUCT.html
index ba7785658..d2c18d21d 100644
--- a/gems/kettle-jem/docs/file.CODE_OF_CONDUCT.html
+++ b/gems/kettle-jem/docs/file.CODE_OF_CONDUCT.html
@@ -193,7 +193,7 @@ 
      Attribution
      
 
 
       
diff --git a/gems/kettle-jem/docs/file.CONTRIBUTING.html b/gems/kettle-jem/docs/file.CONTRIBUTING.html
index ed2fb6bfb..0374bc6f0 100644
--- a/gems/kettle-jem/docs/file.CONTRIBUTING.html
+++ b/gems/kettle-jem/docs/file.CONTRIBUTING.html
@@ -397,7 +397,7 @@ 
      Manual process
      
 
 
       
diff --git a/gems/kettle-jem/docs/file.FUNDING.html b/gems/kettle-jem/docs/file.FUNDING.html
index 0d0aed438..89fa7cd79 100644
--- a/gems/kettle-jem/docs/file.FUNDING.html
+++ b/gems/kettle-jem/docs/file.FUNDING.html
@@ -102,7 +102,7 @@ 
      Another Way to Support Open
 
 
       
diff --git a/gems/kettle-jem/docs/file.IRP.html b/gems/kettle-jem/docs/file.IRP.html
index 7702db1d9..bee674054 100644
--- a/gems/kettle-jem/docs/file.IRP.html
+++ b/gems/kettle-jem/docs/file.IRP.html
@@ -98,7 +98,7 @@ 
      Follow-up
      
 
 
       
diff --git a/gems/kettle-jem/docs/file.LICENSE.html b/gems/kettle-jem/docs/file.LICENSE.html
index d5522e54a..8b26b875a 100644
--- a/gems/kettle-jem/docs/file.LICENSE.html
+++ b/gems/kettle-jem/docs/file.LICENSE.html
@@ -79,7 +79,7 @@ 
 
 
       
diff --git a/gems/kettle-jem/docs/file.PolyForm-Small-Business-1.0.0.html b/gems/kettle-jem/docs/file.PolyForm-Small-Business-1.0.0.html
index 374d1aea2..2b41077c1 100644
--- a/gems/kettle-jem/docs/file.PolyForm-Small-Business-1.0.0.html
+++ b/gems/kettle-jem/docs/file.PolyForm-Small-Business-1.0.0.html
@@ -185,7 +185,7 @@ 
      Definitions
      
 
 
       
diff --git a/gems/kettle-jem/docs/file.README.html b/gems/kettle-jem/docs/file.README.html
index 2fce30f83..b7d593284 100644
--- a/gems/kettle-jem/docs/file.README.html
+++ b/gems/kettle-jem/docs/file.README.html
@@ -141,7 +141,7 @@ 
      💡 Info you can shake a stick at
      
     
       Source
       
-Source on GitLab.com Source on CodeBerg.org Source on GitHub.com The best SHA: dQw4w9WgXcQ!
+Source on GitLab.com Source on CodeBerg.org Source on GitHub.com The best SHA: dQw4w9WgXcQ!
 
     
     
@@ -490,6 +490,14 @@ 
      Per-Engine Workflow Commands
      
     truffleruby-22.3: kettle-test --tag ~type:acceptance --example-status-log .rspec_status
 
    
 
+
    Branch-Stack CI
    
+
+
    Generated GitHub Actions workflows run on the default branch, *-stable, and
    
+branch-stack release names matching r*_*-*-v* (for example,
    
+r3_2-even-v24). This keeps release CI active for every target that
    
+kettle-family publishes from a branch stack. Existing project-specific push
    
+branch patterns remain preserved during templating.
    
+
 
    Default Local Test Bundle
    
 
 
    The root Gemfile is the default bundle for local commands such as
    
@@ -1373,7 +1381,7 @@ 
    Please give the project a star ⭐ ♥
 
 
       
diff --git a/gems/kettle-jem/docs/file.RRRRrb-Matrix.html b/gems/kettle-jem/docs/file.RRRRrb-Matrix.html
index ea75a4069..e6209e5a3 100644
--- a/gems/kettle-jem/docs/file.RRRRrb-Matrix.html
+++ b/gems/kettle-jem/docs/file.RRRRrb-Matrix.html
@@ -411,7 +411,7 @@ 
    Support & Funding Info
    
 
 
       
diff --git a/gems/kettle-jem/docs/file.RUBOCOP.html b/gems/kettle-jem/docs/file.RUBOCOP.html
index c32f3fdbc..d6a691ce5 100644
--- a/gems/kettle-jem/docs/file.RUBOCOP.html
+++ b/gems/kettle-jem/docs/file.RUBOCOP.html
@@ -166,7 +166,7 @@ 
    Benefits of rubocop_gradual
    
 
 
       
diff --git a/gems/kettle-jem/docs/file.SECURITY.html b/gems/kettle-jem/docs/file.SECURITY.html
index fd7941139..a5d7d1d22 100644
--- a/gems/kettle-jem/docs/file.SECURITY.html
+++ b/gems/kettle-jem/docs/file.SECURITY.html
@@ -93,7 +93,7 @@ 
    Additional Support
    
 
 
       
diff --git a/gems/kettle-jem/docs/index.html b/gems/kettle-jem/docs/index.html
index 95ae74239..ad67885ab 100644
--- a/gems/kettle-jem/docs/index.html
+++ b/gems/kettle-jem/docs/index.html
@@ -141,7 +141,7 @@ 
    💡 Info you can shake a stick at
    
     
       Source
       
-Source on GitLab.com Source on CodeBerg.org Source on GitHub.com The best SHA: dQw4w9WgXcQ!
+Source on GitLab.com Source on CodeBerg.org Source on GitHub.com The best SHA: dQw4w9WgXcQ!
 
     
     
@@ -490,6 +490,14 @@ 
    Per-Engine Workflow Commands
    
     truffleruby-22.3: kettle-test --tag ~type:acceptance --example-status-log .rspec_status
 
    
 
+
    Branch-Stack CI
    
+
+
    Generated GitHub Actions workflows run on the default branch, *-stable, and
    
+branch-stack release names matching r*_*-*-v* (for example,
    
+r3_2-even-v24). This keeps release CI active for every target that
    
+kettle-family publishes from a branch stack. Existing project-specific push
    
+branch patterns remain preserved during templating.
    
+
 
    Default Local Test Bundle
    
 
 
    The root Gemfile is the default bundle for local commands such as
    
@@ -1373,7 +1381,7 @@ 
    Please give the project a star ⭐ ♥
 
 
       
diff --git a/gems/kettle-jem/docs/method_list.html b/gems/kettle-jem/docs/method_list.html
index 6d080c1b4..646abdb26 100644
--- a/gems/kettle-jem/docs/method_list.html
+++ b/gems/kettle-jem/docs/method_list.html
@@ -6103,6 +6103,22 @@ 
    Method List
    
   
   
 
+  
  • 
+    
    
+      maintenance_changelog
+      Kettle::Jem::TemplateLock
+    
    
+  
    • 
+  
+
+  
  • 
+    
    
+      maintenance_changelog_paths
+      Kettle::Jem::TemplateLock
+    
    
+  
    • 
+  
+
   
  • 
     
    
       managed_bootstrap_gems
@@ -11600,14 +11616,6 @@ 
    Method List
    
   
 
   
  • 
-    
    
-      template_entry_counts
-      Kettle::Jem::MaintenanceChangelog
-    
    
-  
    • 
-  
-
-  
  • 
     
    
       template_entry_paths
       Kettle::Jem
@@ -11615,7 +11623,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       template_file_outcomes
       Kettle::Jem
@@ -11623,7 +11631,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       template_file_strategy_config
       Kettle::Jem
@@ -11631,7 +11639,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       template_file_type
       Kettle::Jem
@@ -11639,7 +11647,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       template_file_type_for_relative_path
       Kettle::Jem
@@ -11647,7 +11655,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       template_input_fingerprint
       Kettle::Jem
@@ -11655,7 +11663,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       template_input_fingerprint_payload
       Kettle::Jem
@@ -11663,7 +11671,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       template_inventory_entries
       Kettle::Jem
@@ -11671,7 +11679,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       template_inventory_target_path
       Kettle::Jem
@@ -11679,7 +11687,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       template_keep_destination_path?
       Kettle::Jem
@@ -11687,7 +11695,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       template_legacy_destination_cleanups
       Kettle::Jem
@@ -11695,7 +11703,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       template_lock_state
       Kettle::Jem
@@ -11703,7 +11711,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       template_managed_dependency
       Kettle::Jem
@@ -11711,7 +11719,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       template_managed_dependency_active?
       Kettle::Jem
@@ -11719,7 +11727,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       template_managed_dependency_call?
       Kettle::Jem
@@ -11727,7 +11735,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       template_managed_dependency_names
       Kettle::Jem
@@ -11735,7 +11743,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       template_managed_dependency_requirements
       Kettle::Jem
@@ -11743,7 +11751,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       template_manifest
       Kettle::Jem
@@ -11751,7 +11759,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       template_obsolete_license_cleanups
       Kettle::Jem
@@ -11759,7 +11767,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       template_pattern_strategy_config
       Kettle::Jem
@@ -11767,7 +11775,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       template_root
       Kettle::Jem
@@ -11775,7 +11783,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       template_root_path
       Kettle::Jem
@@ -11783,7 +11791,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       template_run_entry
       Kettle::Jem::MaintenanceChangelog
@@ -11791,7 +11799,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       template_runtime_config
       Kettle::Jem
@@ -11799,7 +11807,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       template_selection_for
       Kettle::Jem
@@ -11807,7 +11815,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       template_source_absolute_path
       Kettle::Jem
@@ -11815,7 +11823,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       template_source_application_worker_safe?
       Kettle::Jem
@@ -11823,7 +11831,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       template_source_display_path
       Kettle::Jem
@@ -11831,7 +11839,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       template_source_lock_path
       Kettle::Jem
@@ -11839,7 +11847,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       template_source_preference
       Kettle::Jem
@@ -11847,7 +11855,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       template_source_preferences
       Kettle::Jem
@@ -11855,7 +11863,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       template_source_selection_reason
       Kettle::Jem
@@ -11863,7 +11871,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       template_strategy_config
       Kettle::Jem
@@ -11871,7 +11879,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       template_strategy_entry
       Kettle::Jem
@@ -11879,7 +11887,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       template_tokens
       Kettle::Jem
@@ -11887,7 +11895,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       template_version_gem_bootstrap_step
       Kettle::Jem
@@ -11895,7 +11903,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       templating_bootstrap_command
       Kettle::Jem::Tasks::PrepareTask
@@ -11903,7 +11911,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       templating_bootstrap_lockfile_ready?
       Kettle::Jem::Tasks::PrepareTask
@@ -11911,7 +11919,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       templating_bootstrap_step_name
       Kettle::Jem::Tasks::PrepareTask
@@ -11919,7 +11927,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       templating_guard_records
       Kettle::Jem
@@ -11927,7 +11935,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       templating_run_options
       Kettle::Jem::Tasks::TemplateTask
@@ -11935,7 +11943,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       timed_recipe_report
       Kettle::Jem
@@ -11943,7 +11951,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #timing
       Kettle::Jem::PluginRegistry::Hook
@@ -11951,7 +11959,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #to_h
       Kettle::Jem::DecisionEvaluation
@@ -11959,7 +11967,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #to_h
       Kettle::Jem::DecisionPolicy
@@ -11967,7 +11975,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #to_s
       Kettle::Jem::ChecksumMode
@@ -11975,7 +11983,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       token_config_values
       Kettle::Jem
@@ -11983,7 +11991,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       token_placeholder?
       Kettle::Jem
@@ -11991,7 +11999,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #tokens
       Kettle::Jem::ChecksumMode
@@ -11999,7 +12007,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       toml_string_scalar_line_value
       Kettle::Jem
@@ -12007,7 +12015,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       top_level_ruby_call_records
       Kettle::Jem
@@ -12015,7 +12023,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       top_level_yaml_key_line?
       Kettle::Jem
@@ -12023,7 +12031,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       tracked_binstub?
       Kettle::Jem::Tasks::InstallTask
@@ -12031,7 +12039,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       transfer_changelog_context
       Kettle::Jem
@@ -12039,7 +12047,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       transfer_changelog_entries
       Kettle::Jem
@@ -12047,7 +12055,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       transfer_changelog_entry_applies?
       Kettle::Jem
@@ -12055,7 +12063,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       transfer_changelog_entrypoint_require
       Kettle::Jem
@@ -12063,7 +12071,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       transfer_changelog_filter_applies?
       Kettle::Jem
@@ -12071,7 +12079,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       transfer_changelog_filter_field_types
       Kettle::Jem
@@ -12079,7 +12087,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       transfer_changelog_filter_predicate_applies?
       Kettle::Jem
@@ -12087,7 +12095,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       transfer_changelog_gemspec_assignment
       Kettle::Jem
@@ -12095,7 +12103,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       transfer_changelog_lag
       Kettle::Jem
@@ -12103,7 +12111,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       transfer_changelog_min_ruby
       Kettle::Jem
@@ -12111,7 +12119,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       transfer_changelog_package_name
       Kettle::Jem
@@ -12119,7 +12127,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       transfer_changelog_status
       Kettle::Jem
@@ -12127,7 +12135,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       trim_readme_compatibility_badges
       Kettle::Jem::Tasks::InstallTask
@@ -12135,7 +12143,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       trim_trailing_blank_lines
       Kettle::Jem
@@ -12143,7 +12151,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       truthy?
       Kettle::Jem::DecisionPolicy
@@ -12151,7 +12159,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       truthy?
       Kettle::Jem::Tasks::TemplateTask
@@ -12159,7 +12167,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       truthy_config?
       Kettle::Jem
@@ -12167,7 +12175,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       uncomment_ruby_comment_line
       Kettle::Jem
@@ -12175,7 +12183,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       unresolved_template_scan?
       Kettle::Jem
@@ -12183,7 +12191,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       unsafe_git_driver_command_value?
       Kettle::Jem::Tasks::InstallTask
@@ -12191,7 +12199,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       unsupported_templating_platform
       Kettle::Jem::Tasks::InstallTask
@@ -12199,7 +12207,7 @@ 
    Method List
    
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       update_github_actions_pins
       Kettle::Jem
@@ -12207,6 +12215,14 @@ 
    Method List
    
   
    • 
   
 
+  
  • 
+    
    
+      update_maintenance_changelog_paths
+      Kettle::Jem::TemplateLock
+    
    
+  
    • 
+  
+
   
  • 
     
    
       upsert_template_root_override
diff --git a/gems/kettle-jem/docs/top-level-namespace.html b/gems/kettle-jem/docs/top-level-namespace.html
index 68db5d6d4..34c263b53 100644
--- a/gems/kettle-jem/docs/top-level-namespace.html
+++ b/gems/kettle-jem/docs/top-level-namespace.html
@@ -102,7 +102,7 @@ 
    Defined Under Namespace
    
 
    
 
       
diff --git a/gems/kramdown-merge/Gemfile.lock b/gems/kramdown-merge/Gemfile.lock
index 830acb80d..98da63790 100644
--- a/gems/kramdown-merge/Gemfile.lock
+++ b/gems/kramdown-merge/Gemfile.lock
@@ -144,8 +144,8 @@ PATH
       commonmarker-merge (~> 7.1, >= 7.1.8)
       dotenv-merge (~> 7.1, >= 7.1.8)
       json-merge (~> 7.1, >= 7.1.8)
-      kettle-changelog (~> 1.0, >= 1.0.6)
-      kettle-dev (>= 3.0.17, < 4.0.0)
+      kettle-changelog (~> 1.0, >= 1.0.7)
+      kettle-dev (~> 3.0, >= 3.0.34)
       kettle-gha-pins (~> 0.3, >= 0.3.14)
       kettle-ndjson (~> 0.1, >= 0.1.13)
       kettle-rb (~> 0.1, >= 0.1.11)
@@ -253,7 +253,7 @@ PATH
       go-merge (= 7.1.9)
       html-merge (= 7.1.9)
       json-merge (= 7.1.9)
-      kettle-jem (~> 7.1, >= 7.1.18)
+      kettle-jem (~> 7.1, >= 7.1.26)
       markdown-merge (= 7.1.9)
       plain-merge (= 7.1.9)
       prism-merge (= 7.1.9)
@@ -336,8 +336,6 @@ GEM
     command_kit-completion (0.3.0)
       command_kit (~> 0.1)
       completely (~> 0.6)
-    commonmarker (2.10.0)
-      rb_sys (~> 0.9)
     commonmarker (2.10.0-aarch64-linux)
     commonmarker (2.10.0-aarch64-linux-musl)
     commonmarker (2.10.0-arm64-darwin)
@@ -509,9 +507,6 @@ GEM
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.4.2)
-    rake-compiler-dock (1.12.0)
-    rb_sys (0.9.130)
-      rake-compiler-dock (= 1.12.0)
     rbs (4.2.0)
       logger
       prism (>= 1.6.0)
@@ -705,9 +700,6 @@ GEM
     toml-rb (4.2.1)
       citrus (~> 3.0, > 3.0)
       racc (~> 1.7)
-    tree_sitter_language_pack (1.17.0)
-      rb_sys (>= 0.9.130, < 0.10)
-      sorbet-runtime (~> 0.5)
     tree_sitter_language_pack (1.17.0-aarch64-linux)
       sorbet-runtime (~> 0.5)
     tree_sitter_language_pack (1.17.0-arm64-darwin)
@@ -865,7 +857,7 @@ CHECKSUMS
   benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c
   bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd
   binary-merge (7.1.9)
-  bundler (4.1.0.beta1)
+  bundler (4.1.0.beta1) sha256=8a2dac8ca276ff4eff5efc2c6457b0044080fc1e431534ad7c5cc6187232b800
   bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9
   cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb
   citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650
@@ -874,7 +866,6 @@ CHECKSUMS
   colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02
   command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90
   command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737
-  commonmarker (2.10.0)
   commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478
   commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25
   commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e
@@ -959,8 +950,6 @@ CHECKSUMS
   racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
   rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
   rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
-  rake-compiler-dock (1.12.0)
-  rb_sys (0.9.130)
   rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674
   rbs-merge (7.1.9)
   rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192
@@ -1030,7 +1019,6 @@ CHECKSUMS
   toml-merge (7.1.9)
   toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb
   tree_haver (7.1.9)
-  tree_sitter_language_pack (1.17.0)
   tree_sitter_language_pack (1.17.0-aarch64-linux)
   tree_sitter_language_pack (1.17.0-arm64-darwin)
   tree_sitter_language_pack (1.17.0-x86_64-darwin)
diff --git a/gems/markdown-merge/Gemfile.lock b/gems/markdown-merge/Gemfile.lock
index 84ebbbacc..7202b8ba2 100644
--- a/gems/markdown-merge/Gemfile.lock
+++ b/gems/markdown-merge/Gemfile.lock
@@ -144,8 +144,8 @@ PATH
       commonmarker-merge (~> 7.1, >= 7.1.8)
       dotenv-merge (~> 7.1, >= 7.1.8)
       json-merge (~> 7.1, >= 7.1.8)
-      kettle-changelog (~> 1.0, >= 1.0.6)
-      kettle-dev (>= 3.0.17, < 4.0.0)
+      kettle-changelog (~> 1.0, >= 1.0.7)
+      kettle-dev (~> 3.0, >= 3.0.34)
       kettle-gha-pins (~> 0.3, >= 0.3.14)
       kettle-ndjson (~> 0.1, >= 0.1.13)
       kettle-rb (~> 0.1, >= 0.1.11)
@@ -253,7 +253,7 @@ PATH
       go-merge (= 7.1.9)
       html-merge (= 7.1.9)
       json-merge (= 7.1.9)
-      kettle-jem (~> 7.1, >= 7.1.18)
+      kettle-jem (~> 7.1, >= 7.1.26)
       markdown-merge (= 7.1.9)
       plain-merge (= 7.1.9)
       prism-merge (= 7.1.9)
@@ -336,8 +336,6 @@ GEM
     command_kit-completion (0.3.0)
       command_kit (~> 0.1)
       completely (~> 0.6)
-    commonmarker (2.10.0)
-      rb_sys (~> 0.9)
     commonmarker (2.10.0-aarch64-linux)
     commonmarker (2.10.0-aarch64-linux-musl)
     commonmarker (2.10.0-arm64-darwin)
@@ -509,9 +507,6 @@ GEM
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.4.2)
-    rake-compiler-dock (1.12.0)
-    rb_sys (0.9.130)
-      rake-compiler-dock (= 1.12.0)
     rbs (4.2.0)
       logger
       prism (>= 1.6.0)
@@ -705,9 +700,6 @@ GEM
     toml-rb (4.2.1)
       citrus (~> 3.0, > 3.0)
       racc (~> 1.7)
-    tree_sitter_language_pack (1.16.2)
-      rb_sys (>= 0.9.130, < 0.10)
-      sorbet-runtime (~> 0.5)
     tree_sitter_language_pack (1.16.2-aarch64-linux)
       sorbet-runtime (~> 0.5)
     tree_sitter_language_pack (1.16.2-arm64-darwin)
@@ -866,7 +858,7 @@ CHECKSUMS
   benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c
   bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd
   binary-merge (7.1.9)
-  bundler (4.1.0.beta1)
+  bundler (4.1.0.beta1) sha256=8a2dac8ca276ff4eff5efc2c6457b0044080fc1e431534ad7c5cc6187232b800
   bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9
   cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb
   citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650
@@ -875,7 +867,6 @@ CHECKSUMS
   colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02
   command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90
   command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737
-  commonmarker (2.10.0)
   commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478
   commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25
   commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e
@@ -960,8 +951,6 @@ CHECKSUMS
   racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
   rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
   rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
-  rake-compiler-dock (1.12.0)
-  rb_sys (0.9.130)
   rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674
   rbs-merge (7.1.9)
   rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192
@@ -1031,7 +1020,6 @@ CHECKSUMS
   toml-merge (7.1.9)
   toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb
   tree_haver (7.1.9)
-  tree_sitter_language_pack (1.16.2)
   tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652
   tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6
   tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6
diff --git a/gems/markly-merge/Gemfile.lock b/gems/markly-merge/Gemfile.lock
index 73e1e7208..dfa468eae 100644
--- a/gems/markly-merge/Gemfile.lock
+++ b/gems/markly-merge/Gemfile.lock
@@ -144,8 +144,8 @@ PATH
       commonmarker-merge (~> 7.1, >= 7.1.8)
       dotenv-merge (~> 7.1, >= 7.1.8)
       json-merge (~> 7.1, >= 7.1.8)
-      kettle-changelog (~> 1.0, >= 1.0.6)
-      kettle-dev (>= 3.0.17, < 4.0.0)
+      kettle-changelog (~> 1.0, >= 1.0.7)
+      kettle-dev (~> 3.0, >= 3.0.34)
       kettle-gha-pins (~> 0.3, >= 0.3.14)
       kettle-ndjson (~> 0.1, >= 0.1.13)
       kettle-rb (~> 0.1, >= 0.1.11)
@@ -253,7 +253,7 @@ PATH
       go-merge (= 7.1.9)
       html-merge (= 7.1.9)
       json-merge (= 7.1.9)
-      kettle-jem (~> 7.1, >= 7.1.18)
+      kettle-jem (~> 7.1, >= 7.1.26)
       markdown-merge (= 7.1.9)
       plain-merge (= 7.1.9)
       prism-merge (= 7.1.9)
@@ -336,8 +336,6 @@ GEM
     command_kit-completion (0.3.0)
       command_kit (~> 0.1)
       completely (~> 0.6)
-    commonmarker (2.10.0)
-      rb_sys (~> 0.9)
     commonmarker (2.10.0-aarch64-linux)
     commonmarker (2.10.0-aarch64-linux-musl)
     commonmarker (2.10.0-arm64-darwin)
@@ -509,9 +507,6 @@ GEM
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.4.2)
-    rake-compiler-dock (1.12.0)
-    rb_sys (0.9.130)
-      rake-compiler-dock (= 1.12.0)
     rbs (4.2.0)
       logger
       prism (>= 1.6.0)
@@ -705,9 +700,6 @@ GEM
     toml-rb (4.2.1)
       citrus (~> 3.0, > 3.0)
       racc (~> 1.7)
-    tree_sitter_language_pack (1.17.0)
-      rb_sys (>= 0.9.130, < 0.10)
-      sorbet-runtime (~> 0.5)
     tree_sitter_language_pack (1.17.0-aarch64-linux)
       sorbet-runtime (~> 0.5)
     tree_sitter_language_pack (1.17.0-arm64-darwin)
@@ -866,7 +858,7 @@ CHECKSUMS
   benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c
   bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd
   binary-merge (7.1.9)
-  bundler (4.1.0.beta1)
+  bundler (4.1.0.beta1) sha256=8a2dac8ca276ff4eff5efc2c6457b0044080fc1e431534ad7c5cc6187232b800
   bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9
   cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb
   citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650
@@ -875,7 +867,6 @@ CHECKSUMS
   colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02
   command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90
   command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737
-  commonmarker (2.10.0)
   commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478
   commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25
   commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e
@@ -960,8 +951,6 @@ CHECKSUMS
   racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
   rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
   rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
-  rake-compiler-dock (1.12.0)
-  rb_sys (0.9.130)
   rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674
   rbs-merge (7.1.9)
   rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192
@@ -1031,7 +1020,6 @@ CHECKSUMS
   toml-merge (7.1.9)
   toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb
   tree_haver (7.1.9)
-  tree_sitter_language_pack (1.17.0)
   tree_sitter_language_pack (1.17.0-aarch64-linux)
   tree_sitter_language_pack (1.17.0-arm64-darwin)
   tree_sitter_language_pack (1.17.0-x86_64-darwin)
diff --git a/gems/parslet-toml-merge/Gemfile.lock b/gems/parslet-toml-merge/Gemfile.lock
index 270e83f0d..a8f71084f 100644
--- a/gems/parslet-toml-merge/Gemfile.lock
+++ b/gems/parslet-toml-merge/Gemfile.lock
@@ -144,8 +144,8 @@ PATH
       commonmarker-merge (~> 7.1, >= 7.1.8)
       dotenv-merge (~> 7.1, >= 7.1.8)
       json-merge (~> 7.1, >= 7.1.8)
-      kettle-changelog (~> 1.0, >= 1.0.6)
-      kettle-dev (>= 3.0.17, < 4.0.0)
+      kettle-changelog (~> 1.0, >= 1.0.7)
+      kettle-dev (~> 3.0, >= 3.0.34)
       kettle-gha-pins (~> 0.3, >= 0.3.14)
       kettle-ndjson (~> 0.1, >= 0.1.13)
       kettle-rb (~> 0.1, >= 0.1.11)
@@ -253,7 +253,7 @@ PATH
       go-merge (= 7.1.9)
       html-merge (= 7.1.9)
       json-merge (= 7.1.9)
-      kettle-jem (~> 7.1, >= 7.1.18)
+      kettle-jem (~> 7.1, >= 7.1.26)
       markdown-merge (= 7.1.9)
       plain-merge (= 7.1.9)
       prism-merge (= 7.1.9)
@@ -336,8 +336,6 @@ GEM
     command_kit-completion (0.3.0)
       command_kit (~> 0.1)
       completely (~> 0.6)
-    commonmarker (2.10.0)
-      rb_sys (~> 0.9)
     commonmarker (2.10.0-aarch64-linux)
     commonmarker (2.10.0-aarch64-linux-musl)
     commonmarker (2.10.0-arm64-darwin)
@@ -509,9 +507,6 @@ GEM
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.4.2)
-    rake-compiler-dock (1.12.0)
-    rb_sys (0.9.130)
-      rake-compiler-dock (= 1.12.0)
     rbs (4.2.0)
       logger
       prism (>= 1.6.0)
@@ -705,9 +700,6 @@ GEM
     toml-rb (4.2.1)
       citrus (~> 3.0, > 3.0)
       racc (~> 1.7)
-    tree_sitter_language_pack (1.17.0)
-      rb_sys (>= 0.9.130, < 0.10)
-      sorbet-runtime (~> 0.5)
     tree_sitter_language_pack (1.17.0-aarch64-linux)
       sorbet-runtime (~> 0.5)
     tree_sitter_language_pack (1.17.0-arm64-darwin)
@@ -866,7 +858,7 @@ CHECKSUMS
   benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c
   bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd
   binary-merge (7.1.9)
-  bundler (4.1.0.beta1)
+  bundler (4.1.0.beta1) sha256=8a2dac8ca276ff4eff5efc2c6457b0044080fc1e431534ad7c5cc6187232b800
   bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9
   cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb
   citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650
@@ -875,7 +867,6 @@ CHECKSUMS
   colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02
   command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90
   command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737
-  commonmarker (2.10.0)
   commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478
   commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25
   commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e
@@ -960,8 +951,6 @@ CHECKSUMS
   racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
   rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
   rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
-  rake-compiler-dock (1.12.0)
-  rb_sys (0.9.130)
   rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674
   rbs-merge (7.1.9)
   rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192
@@ -1031,7 +1020,6 @@ CHECKSUMS
   toml-merge (7.1.9)
   toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb
   tree_haver (7.1.9)
-  tree_sitter_language_pack (1.17.0)
   tree_sitter_language_pack (1.17.0-aarch64-linux)
   tree_sitter_language_pack (1.17.0-arm64-darwin)
   tree_sitter_language_pack (1.17.0-x86_64-darwin)
diff --git a/gems/plain-merge/Gemfile.lock b/gems/plain-merge/Gemfile.lock
index a73b6cb19..309fb8f4b 100644
--- a/gems/plain-merge/Gemfile.lock
+++ b/gems/plain-merge/Gemfile.lock
@@ -144,8 +144,8 @@ PATH
       commonmarker-merge (~> 7.1, >= 7.1.8)
       dotenv-merge (~> 7.1, >= 7.1.8)
       json-merge (~> 7.1, >= 7.1.8)
-      kettle-changelog (~> 1.0, >= 1.0.6)
-      kettle-dev (>= 3.0.17, < 4.0.0)
+      kettle-changelog (~> 1.0, >= 1.0.7)
+      kettle-dev (~> 3.0, >= 3.0.34)
       kettle-gha-pins (~> 0.3, >= 0.3.14)
       kettle-ndjson (~> 0.1, >= 0.1.13)
       kettle-rb (~> 0.1, >= 0.1.11)
@@ -253,7 +253,7 @@ PATH
       go-merge (= 7.1.9)
       html-merge (= 7.1.9)
       json-merge (= 7.1.9)
-      kettle-jem (~> 7.1, >= 7.1.18)
+      kettle-jem (~> 7.1, >= 7.1.26)
       markdown-merge (= 7.1.9)
       plain-merge (= 7.1.9)
       prism-merge (= 7.1.9)
@@ -336,8 +336,6 @@ GEM
     command_kit-completion (0.3.0)
       command_kit (~> 0.1)
       completely (~> 0.6)
-    commonmarker (2.10.0)
-      rb_sys (~> 0.9)
     commonmarker (2.10.0-aarch64-linux)
     commonmarker (2.10.0-aarch64-linux-musl)
     commonmarker (2.10.0-arm64-darwin)
@@ -509,9 +507,6 @@ GEM
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.4.2)
-    rake-compiler-dock (1.12.0)
-    rb_sys (0.9.130)
-      rake-compiler-dock (= 1.12.0)
     rbs (4.2.0)
       logger
       prism (>= 1.6.0)
@@ -705,9 +700,6 @@ GEM
     toml-rb (4.2.1)
       citrus (~> 3.0, > 3.0)
       racc (~> 1.7)
-    tree_sitter_language_pack (1.16.2)
-      rb_sys (>= 0.9.130, < 0.10)
-      sorbet-runtime (~> 0.5)
     tree_sitter_language_pack (1.16.2-aarch64-linux)
       sorbet-runtime (~> 0.5)
     tree_sitter_language_pack (1.16.2-arm64-darwin)
@@ -866,7 +858,7 @@ CHECKSUMS
   benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c
   bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd
   binary-merge (7.1.9)
-  bundler (4.1.0.beta1)
+  bundler (4.1.0.beta1) sha256=8a2dac8ca276ff4eff5efc2c6457b0044080fc1e431534ad7c5cc6187232b800
   bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9
   cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb
   citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650
@@ -875,7 +867,6 @@ CHECKSUMS
   colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02
   command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90
   command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737
-  commonmarker (2.10.0)
   commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478
   commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25
   commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e
@@ -960,8 +951,6 @@ CHECKSUMS
   racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
   rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
   rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
-  rake-compiler-dock (1.12.0)
-  rb_sys (0.9.130)
   rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674
   rbs-merge (7.1.9)
   rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192
@@ -1031,7 +1020,6 @@ CHECKSUMS
   toml-merge (7.1.9)
   toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb
   tree_haver (7.1.9)
-  tree_sitter_language_pack (1.16.2)
   tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652
   tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6
   tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6
diff --git a/gems/prism-merge/Gemfile.lock b/gems/prism-merge/Gemfile.lock
index 2e7654fed..dffff0363 100644
--- a/gems/prism-merge/Gemfile.lock
+++ b/gems/prism-merge/Gemfile.lock
@@ -146,8 +146,8 @@ PATH
       commonmarker-merge (~> 7.1, >= 7.1.8)
       dotenv-merge (~> 7.1, >= 7.1.8)
       json-merge (~> 7.1, >= 7.1.8)
-      kettle-changelog (~> 1.0, >= 1.0.6)
-      kettle-dev (>= 3.0.17, < 4.0.0)
+      kettle-changelog (~> 1.0, >= 1.0.7)
+      kettle-dev (~> 3.0, >= 3.0.34)
       kettle-gha-pins (~> 0.3, >= 0.3.14)
       kettle-ndjson (~> 0.1, >= 0.1.13)
       kettle-rb (~> 0.1, >= 0.1.11)
@@ -253,7 +253,7 @@ PATH
       go-merge (= 7.1.9)
       html-merge (= 7.1.9)
       json-merge (= 7.1.9)
-      kettle-jem (~> 7.1, >= 7.1.18)
+      kettle-jem (~> 7.1, >= 7.1.26)
       markdown-merge (= 7.1.9)
       plain-merge (= 7.1.9)
       prism-merge (= 7.1.9)
@@ -336,8 +336,6 @@ GEM
     command_kit-completion (0.3.0)
       command_kit (~> 0.1)
       completely (~> 0.6)
-    commonmarker (2.10.0)
-      rb_sys (~> 0.9)
     commonmarker (2.10.0-aarch64-linux)
     commonmarker (2.10.0-aarch64-linux-musl)
     commonmarker (2.10.0-arm64-darwin)
@@ -509,9 +507,6 @@ GEM
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.4.2)
-    rake-compiler-dock (1.12.0)
-    rb_sys (0.9.130)
-      rake-compiler-dock (= 1.12.0)
     rbs (4.2.0)
       logger
       prism (>= 1.6.0)
@@ -705,9 +700,6 @@ GEM
     toml-rb (4.2.1)
       citrus (~> 3.0, > 3.0)
       racc (~> 1.7)
-    tree_sitter_language_pack (1.17.0)
-      rb_sys (>= 0.9.130, < 0.10)
-      sorbet-runtime (~> 0.5)
     tree_sitter_language_pack (1.17.0-aarch64-linux)
       sorbet-runtime (~> 0.5)
     tree_sitter_language_pack (1.17.0-arm64-darwin)
@@ -866,7 +858,7 @@ CHECKSUMS
   benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c
   bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd
   binary-merge (7.1.9)
-  bundler (4.1.0.beta1)
+  bundler (4.1.0.beta1) sha256=8a2dac8ca276ff4eff5efc2c6457b0044080fc1e431534ad7c5cc6187232b800
   bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9
   cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb
   citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650
@@ -875,7 +867,6 @@ CHECKSUMS
   colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02
   command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90
   command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737
-  commonmarker (2.10.0)
   commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478
   commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25
   commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e
@@ -960,8 +951,6 @@ CHECKSUMS
   racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
   rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
   rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
-  rake-compiler-dock (1.12.0)
-  rb_sys (0.9.130)
   rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674
   rbs-merge (7.1.9)
   rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192
@@ -1031,7 +1020,6 @@ CHECKSUMS
   toml-merge (7.1.9)
   toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb
   tree_haver (7.1.9)
-  tree_sitter_language_pack (1.17.0)
   tree_sitter_language_pack (1.17.0-aarch64-linux)
   tree_sitter_language_pack (1.17.0-arm64-darwin)
   tree_sitter_language_pack (1.17.0-x86_64-darwin)
diff --git a/gems/psych-merge/Gemfile.lock b/gems/psych-merge/Gemfile.lock
index 1b7caaab4..e4e35439e 100644
--- a/gems/psych-merge/Gemfile.lock
+++ b/gems/psych-merge/Gemfile.lock
@@ -145,8 +145,8 @@ PATH
       commonmarker-merge (~> 7.1, >= 7.1.8)
       dotenv-merge (~> 7.1, >= 7.1.8)
       json-merge (~> 7.1, >= 7.1.8)
-      kettle-changelog (~> 1.0, >= 1.0.6)
-      kettle-dev (>= 3.0.17, < 4.0.0)
+      kettle-changelog (~> 1.0, >= 1.0.7)
+      kettle-dev (~> 3.0, >= 3.0.34)
       kettle-gha-pins (~> 0.3, >= 0.3.14)
       kettle-ndjson (~> 0.1, >= 0.1.13)
       kettle-rb (~> 0.1, >= 0.1.11)
@@ -253,7 +253,7 @@ PATH
       go-merge (= 7.1.9)
       html-merge (= 7.1.9)
       json-merge (= 7.1.9)
-      kettle-jem (~> 7.1, >= 7.1.18)
+      kettle-jem (~> 7.1, >= 7.1.26)
       markdown-merge (= 7.1.9)
       plain-merge (= 7.1.9)
       prism-merge (= 7.1.9)
@@ -336,8 +336,6 @@ GEM
     command_kit-completion (0.3.0)
       command_kit (~> 0.1)
       completely (~> 0.6)
-    commonmarker (2.10.0)
-      rb_sys (~> 0.9)
     commonmarker (2.10.0-aarch64-linux)
     commonmarker (2.10.0-aarch64-linux-musl)
     commonmarker (2.10.0-arm64-darwin)
@@ -509,9 +507,6 @@ GEM
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.4.2)
-    rake-compiler-dock (1.12.0)
-    rb_sys (0.9.130)
-      rake-compiler-dock (= 1.12.0)
     rbs (4.2.0)
       logger
       prism (>= 1.6.0)
@@ -705,9 +700,6 @@ GEM
     toml-rb (4.2.1)
       citrus (~> 3.0, > 3.0)
       racc (~> 1.7)
-    tree_sitter_language_pack (1.17.0)
-      rb_sys (>= 0.9.130, < 0.10)
-      sorbet-runtime (~> 0.5)
     tree_sitter_language_pack (1.17.0-aarch64-linux)
       sorbet-runtime (~> 0.5)
     tree_sitter_language_pack (1.17.0-arm64-darwin)
@@ -866,7 +858,7 @@ CHECKSUMS
   benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c
   bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd
   binary-merge (7.1.9)
-  bundler (4.1.0.beta1)
+  bundler (4.1.0.beta1) sha256=8a2dac8ca276ff4eff5efc2c6457b0044080fc1e431534ad7c5cc6187232b800
   bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9
   cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb
   citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650
@@ -875,7 +867,6 @@ CHECKSUMS
   colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02
   command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90
   command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737
-  commonmarker (2.10.0)
   commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478
   commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25
   commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e
@@ -960,8 +951,6 @@ CHECKSUMS
   racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
   rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
   rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
-  rake-compiler-dock (1.12.0)
-  rb_sys (0.9.130)
   rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674
   rbs-merge (7.1.9)
   rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192
@@ -1031,7 +1020,6 @@ CHECKSUMS
   toml-merge (7.1.9)
   toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb
   tree_haver (7.1.9)
-  tree_sitter_language_pack (1.17.0)
   tree_sitter_language_pack (1.17.0-aarch64-linux)
   tree_sitter_language_pack (1.17.0-arm64-darwin)
   tree_sitter_language_pack (1.17.0-x86_64-darwin)
diff --git a/gems/rbs-merge/Gemfile.lock b/gems/rbs-merge/Gemfile.lock
index a6511ca1f..ecc8dd329 100644
--- a/gems/rbs-merge/Gemfile.lock
+++ b/gems/rbs-merge/Gemfile.lock
@@ -145,8 +145,8 @@ PATH
       commonmarker-merge (~> 7.1, >= 7.1.8)
       dotenv-merge (~> 7.1, >= 7.1.8)
       json-merge (~> 7.1, >= 7.1.8)
-      kettle-changelog (~> 1.0, >= 1.0.6)
-      kettle-dev (>= 3.0.17, < 4.0.0)
+      kettle-changelog (~> 1.0, >= 1.0.7)
+      kettle-dev (~> 3.0, >= 3.0.34)
       kettle-gha-pins (~> 0.3, >= 0.3.14)
       kettle-ndjson (~> 0.1, >= 0.1.13)
       kettle-rb (~> 0.1, >= 0.1.11)
@@ -253,7 +253,7 @@ PATH
       go-merge (= 7.1.9)
       html-merge (= 7.1.9)
       json-merge (= 7.1.9)
-      kettle-jem (~> 7.1, >= 7.1.18)
+      kettle-jem (~> 7.1, >= 7.1.26)
       markdown-merge (= 7.1.9)
       plain-merge (= 7.1.9)
       prism-merge (= 7.1.9)
@@ -336,8 +336,6 @@ GEM
     command_kit-completion (0.3.0)
       command_kit (~> 0.1)
       completely (~> 0.6)
-    commonmarker (2.10.0)
-      rb_sys (~> 0.9)
     commonmarker (2.10.0-aarch64-linux)
     commonmarker (2.10.0-aarch64-linux-musl)
     commonmarker (2.10.0-arm64-darwin)
@@ -509,9 +507,6 @@ GEM
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.4.2)
-    rake-compiler-dock (1.12.0)
-    rb_sys (0.9.130)
-      rake-compiler-dock (= 1.12.0)
     rbs (4.2.0)
       logger
       prism (>= 1.6.0)
@@ -705,9 +700,6 @@ GEM
     toml-rb (4.2.1)
       citrus (~> 3.0, > 3.0)
       racc (~> 1.7)
-    tree_sitter_language_pack (1.16.2)
-      rb_sys (>= 0.9.130, < 0.10)
-      sorbet-runtime (~> 0.5)
     tree_sitter_language_pack (1.16.2-aarch64-linux)
       sorbet-runtime (~> 0.5)
     tree_sitter_language_pack (1.16.2-arm64-darwin)
@@ -865,7 +857,7 @@ CHECKSUMS
   benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c
   bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd
   binary-merge (7.1.9)
-  bundler (4.1.0.beta1)
+  bundler (4.1.0.beta1) sha256=8a2dac8ca276ff4eff5efc2c6457b0044080fc1e431534ad7c5cc6187232b800
   bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9
   cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb
   citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650
@@ -874,7 +866,6 @@ CHECKSUMS
   colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02
   command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90
   command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737
-  commonmarker (2.10.0)
   commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478
   commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25
   commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e
@@ -959,8 +950,6 @@ CHECKSUMS
   racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
   rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
   rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
-  rake-compiler-dock (1.12.0)
-  rb_sys (0.9.130)
   rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674
   rbs-merge (7.1.9)
   rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192
@@ -1030,7 +1019,6 @@ CHECKSUMS
   toml-merge (7.1.9)
   toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb
   tree_haver (7.1.9)
-  tree_sitter_language_pack (1.16.2)
   tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652
   tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6
   tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6
diff --git a/gems/ruby-merge/Gemfile.lock b/gems/ruby-merge/Gemfile.lock
index d5c28718b..e2138aac9 100644
--- a/gems/ruby-merge/Gemfile.lock
+++ b/gems/ruby-merge/Gemfile.lock
@@ -15,314 +15,46 @@ PATH
       tree_haver (= 7.1.9)
       version_gem (~> 1.1, >= 1.1.15)
 
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly
+GEM
+  remote: https://gem.coop/
   specs:
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
+    anonymous_loader (0.1.3)
+      version_gem (~> 1.1, >= 1.1.14)
+    ansi (1.6.0)
+    appraisal2 (3.2.3)
+      bundler (>= 1.17.3)
+      rake (>= 10)
+      thor (>= 0.14)
+    appraisal2-rubocop (1.0.2)
+      appraisal2 (>= 3.2.3)
+      rubocop (>= 1.0)
+      version_gem (~> 1.1, >= 1.1.15)
+    ast (2.4.3)
+    ast-crispr (7.1.9)
+      ast-merge (= 7.1.9)
+      service_actor (~> 3.9)
+      version_gem (~> 1.1, >= 1.1.15)
     ast-crispr-markdown-markly (7.1.9)
       ast-crispr (= 7.1.9)
       markdown-merge (= 7.1.9)
       markly-merge (= 7.1.9)
       version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism
-  specs:
     ast-crispr-ruby-prism (7.1.9)
       ast-crispr (= 7.1.9)
       prism-merge (= 7.1.9)
       version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr
-  specs:
-    ast-crispr (7.1.9)
-      ast-merge (= 7.1.9)
-      service_actor (~> 3.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git
-  specs:
-    ast-merge-git (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge
-  specs:
     ast-merge (7.1.9)
       benchmark
       token-resolver (~> 2.0, >= 2.0.4)
       tree_haver (= 7.1.9)
       version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template
-  specs:
-    ast-template (7.1.9)
-      ast-merge (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge
-  specs:
+    backports (3.25.3)
     bash-merge (7.1.9)
       ast-merge (= 7.1.9)
       tree_haver (= 7.1.9)
       version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge
-  specs:
-    binary-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge
-  specs:
-    citrus-toml-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      toml-merge (= 7.1.9)
-      toml-rb (~> 4.1)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge
-  specs:
-    commonmarker-merge (7.1.9)
-      commonmarker (~> 2.2)
-      markdown-merge (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge
-  specs:
-    dotenv-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      plain-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge
-  specs:
-    go-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge
-  specs:
-    html-merge (7.1.9)
-      ast-crispr (= 7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge
-  specs:
-    json-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem
-  specs:
-    kettle-jem (7.1.26)
-      addressable (>= 2.8, < 3)
-      ast-crispr-markdown-markly (~> 7.1, >= 7.1.8)
-      ast-crispr-ruby-prism (~> 7.1, >= 7.1.8)
-      ast-merge (~> 7.1, >= 7.1.8)
-      bash-merge (~> 7.1, >= 7.1.8)
-      citrus-toml-merge (~> 7.1, >= 7.1.8)
-      commonmarker-merge (~> 7.1, >= 7.1.8)
-      dotenv-merge (~> 7.1, >= 7.1.8)
-      json-merge (~> 7.1, >= 7.1.8)
-      kettle-changelog (~> 1.0, >= 1.0.6)
-      kettle-dev (>= 3.0.17, < 4.0.0)
-      kettle-gha-pins (~> 0.3, >= 0.3.14)
-      kettle-ndjson (~> 0.1, >= 0.1.13)
-      kettle-rb (~> 0.1, >= 0.1.11)
-      kramdown-merge (~> 7.1, >= 7.1.8)
-      markdown-merge (~> 7.1, >= 7.1.8)
-      markly-merge (~> 7.1, >= 7.1.8)
-      parslet (~> 2.0)
-      prism-merge (~> 7.1, >= 7.1.8)
-      psych-merge (~> 7.1, >= 7.1.8)
-      rbs (>= 3.10)
-      rbs-merge (~> 7.1, >= 7.1.8)
-      ruby-merge (~> 7.1, >= 7.1.8)
-      token-resolver (~> 2.0, >= 2.0.10)
-      toml-merge (~> 7.1, >= 7.1.8)
-      toml-rb (~> 4.2)
-      tree_haver (~> 7.1, >= 7.1.8)
-      version_gem (~> 1.1, >= 1.1.15)
-      yaml-merge (~> 7.1, >= 7.1.8)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge
-  specs:
-    kramdown-merge (7.1.9)
-      kramdown (~> 2.5)
-      markdown-merge (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge
-  specs:
-    markdown-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge
-  specs:
-    markly-merge (7.1.9)
-      markdown-merge (= 7.1.9)
-      markly (~> 0.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge
-  specs:
-    parslet-toml-merge (7.1.9)
-      toml (~> 0.3)
-      toml-merge (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge
-  specs:
-    plain-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge
-  specs:
-    prism-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      prism (~> 1.6)
-      ruby-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge
-  specs:
-    psych-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-      yaml-merge (= 7.1.9)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge
-  specs:
-    rbs-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      rbs (>= 3.10)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge
-  specs:
-    rust-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb
-  specs:
-    smorg-rb (7.1.9)
-      ast-merge (= 7.1.9)
-      ast-merge-git (= 7.1.9)
-      bash-merge (= 7.1.9)
-      diff-lcs (~> 1.5)
-      dotenv-merge (= 7.1.9)
-      go-merge (= 7.1.9)
-      html-merge (= 7.1.9)
-      json-merge (= 7.1.9)
-      kettle-jem (~> 7.1, >= 7.1.18)
-      markdown-merge (= 7.1.9)
-      plain-merge (= 7.1.9)
-      prism-merge (= 7.1.9)
-      psych-merge (= 7.1.9)
-      rbs-merge (= 7.1.9)
-      rust-merge (= 7.1.9)
-      toml-merge (= 7.1.9)
-      typescript-merge (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge
-  specs:
-    toml-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver
-  specs:
-    tree_haver (7.1.9)
-      citrus (~> 3.0)
-      parslet (~> 2.0)
-      tree_sitter_language_pack (>= 1.16.2, < 2.0)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge
-  specs:
-    typescript-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge
-  specs:
-    yaml-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge
-  specs:
-    zip-merge (7.1.9)
-      binary-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-GEM
-  remote: https://gem.coop/
-  specs:
-    addressable (2.9.0)
-      public_suffix (>= 2.0.2, < 8.0)
-    anonymous_loader (0.1.3)
-      version_gem (~> 1.1, >= 1.1.14)
-    ansi (1.6.0)
-    appraisal2 (3.2.3)
-      bundler (>= 1.17.3)
-      rake (>= 10)
-      thor (>= 0.14)
-    appraisal2-rubocop (1.0.2)
-      appraisal2 (>= 3.2.3)
-      rubocop (>= 1.0)
-      version_gem (~> 1.1, >= 1.1.15)
-    ast (2.4.3)
-    backports (3.25.3)
     benchmark (0.5.0)
     bigdecimal (4.1.2)
     bundler-audit (0.9.3)
@@ -330,20 +62,27 @@ GEM
       thor (~> 1.0)
     cgi (0.5.2)
     citrus (3.0.2)
+    citrus-toml-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      toml-merge (= 7.1.9)
+      toml-rb (~> 4.1)
+      version_gem (~> 1.1, >= 1.1.15)
     cmdparse (3.0.7)
     colsole (1.0.1)
     command_kit (0.6.0)
     command_kit-completion (0.3.0)
       command_kit (~> 0.1)
       completely (~> 0.6)
-    commonmarker (2.10.0)
-      rb_sys (~> 0.9)
     commonmarker (2.10.0-aarch64-linux)
     commonmarker (2.10.0-aarch64-linux-musl)
     commonmarker (2.10.0-arm64-darwin)
     commonmarker (2.10.0-x86_64-darwin)
     commonmarker (2.10.0-x86_64-linux)
     commonmarker (2.10.0-x86_64-linux-musl)
+    commonmarker-merge (7.1.9)
+      commonmarker (~> 2.2)
+      markdown-merge (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     completely (0.8.0)
       colsole (~> 1.0.0)
       erb
@@ -357,6 +96,11 @@ GEM
     diff-lcs (1.6.2)
     diffy (3.4.4)
     docopt_ng (0.7.1)
+    dotenv-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      plain-merge (= 7.1.9)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     dry-configurable (1.4.0)
       dry-core (~> 1.0)
       zeitwerk (~> 2.6)
@@ -406,6 +150,10 @@ GEM
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     json (2.21.2)
+    json-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     kettle-changelog (1.0.7)
       ast-crispr-markdown-markly (~> 7.1, >= 7.1.1)
       kettle-dev (>= 3.0.19, < 4.0.0)
@@ -418,8 +166,6 @@ GEM
       kettle-test (~> 2.0, >= 2.0.21)
       ruby-progressbar (~> 1.13)
       tty-progressbar (~> 0.18)
-    kettle-drift (1.0.13)
-      version_gem (~> 1.1, >= 1.1.15)
     kettle-family (1.2.100)
       command_kit (~> 0.6)
       command_kit-completion (~> 0.1)
@@ -436,6 +182,36 @@ GEM
       ruby-progressbar (~> 1.13)
       tty-progressbar (~> 0.18)
       version_gem (~> 1.1, >= 1.1.15)
+    kettle-jem (7.1.25)
+      addressable (>= 2.8, < 3)
+      ast-crispr-markdown-markly (~> 7.1, >= 7.1.8)
+      ast-crispr-ruby-prism (~> 7.1, >= 7.1.8)
+      ast-merge (~> 7.1, >= 7.1.8)
+      bash-merge (~> 7.1, >= 7.1.8)
+      citrus-toml-merge (~> 7.1, >= 7.1.8)
+      commonmarker-merge (~> 7.1, >= 7.1.8)
+      dotenv-merge (~> 7.1, >= 7.1.8)
+      json-merge (~> 7.1, >= 7.1.8)
+      kettle-changelog (~> 1.0, >= 1.0.6)
+      kettle-dev (>= 3.0.17, < 4.0.0)
+      kettle-gha-pins (~> 0.3, >= 0.3.14)
+      kettle-ndjson (~> 0.1, >= 0.1.13)
+      kettle-rb (~> 0.1, >= 0.1.11)
+      kramdown-merge (~> 7.1, >= 7.1.8)
+      markdown-merge (~> 7.1, >= 7.1.8)
+      markly-merge (~> 7.1, >= 7.1.8)
+      parslet (~> 2.0)
+      prism-merge (~> 7.1, >= 7.1.8)
+      psych-merge (~> 7.1, >= 7.1.8)
+      rbs (>= 3.10)
+      rbs-merge (~> 7.1, >= 7.1.8)
+      ruby-merge (~> 7.1, >= 7.1.8)
+      token-resolver (~> 2.0, >= 2.0.10)
+      toml-merge (~> 7.1, >= 7.1.8)
+      toml-rb (~> 4.2)
+      tree_haver (~> 7.1, >= 7.1.8)
+      version_gem (~> 1.1, >= 1.1.15)
+      yaml-merge (~> 7.1, >= 7.1.8)
     kettle-ndjson (0.1.15)
       version_gem (~> 1.1, >= 1.1.15)
     kettle-rb (0.1.12)
@@ -461,12 +237,24 @@ GEM
       version_gem (~> 1.1, >= 1.1.15)
     kramdown (2.5.2)
       rexml (>= 3.4.4)
+    kramdown-merge (7.1.9)
+      kramdown (~> 2.5)
+      markdown-merge (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     language_server-protocol (3.17.0.6)
     lint_roller (1.1.0)
     logger (1.7.0)
+    markdown-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     markly (0.19.0)
+    markly-merge (7.1.9)
+      markdown-merge (= 7.1.9)
+      markly (~> 0.9)
+      version_gem (~> 1.1, >= 1.1.15)
     mini_portile2 (2.8.9)
     mister_bin (0.9.0)
       colsole (~> 1.0.0)
@@ -498,24 +286,41 @@ GEM
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
+    plain-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     pp (0.6.4)
       prettyprint
     prettyprint (0.2.0)
     prism (1.9.0)
+    prism-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      prism (~> 1.6)
+      ruby-merge (= 7.1.9)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     psych (5.5.0)
       date
       stringio
+    psych-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
+      yaml-merge (= 7.1.9)
     public_suffix (7.0.5)
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.4.2)
-    rake-compiler-dock (1.12.0)
-    rb_sys (0.9.130)
-      rake-compiler-dock (= 1.12.0)
     rbs (4.2.0)
       logger
       prism (>= 1.6.0)
       tsort
+    rbs-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      rbs (>= 3.10)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     rdoc (7.2.0)
       erb
       psych (>= 4.0.0)
@@ -700,14 +505,18 @@ GEM
     token-resolver (2.0.10)
       parslet (~> 2.0)
       version_gem (~> 1.1, >= 1.1.15)
-    toml (0.3.0)
-      parslet (>= 1.8.0, < 3.0.0)
+    toml-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     toml-rb (4.2.1)
       citrus (~> 3.0, > 3.0)
       racc (~> 1.7)
-    tree_sitter_language_pack (1.16.2)
-      rb_sys (>= 0.9.130, < 0.10)
-      sorbet-runtime (~> 0.5)
+    tree_haver (7.1.9)
+      citrus (~> 3.0)
+      parslet (~> 2.0)
+      tree_sitter_language_pack (>= 1.16.2, < 2.0)
+      version_gem (~> 1.1, >= 1.1.15)
     tree_sitter_language_pack (1.16.2-aarch64-linux)
       sorbet-runtime (~> 0.5)
     tree_sitter_language_pack (1.16.2-arm64-darwin)
@@ -736,6 +545,10 @@ GEM
       kramdown (>= 2.4, < 3)
       kramdown-parser-gfm (~> 1.1)
       version_gem (~> 1.1, >= 1.1.15)
+    yaml-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     yard (0.9.45)
     yard-fence (0.9.8)
       rdoc (>= 6.11, < 8)
@@ -773,49 +586,25 @@ DEPENDENCIES
   anonymous_loader (~> 0.1, >= 0.1.3)
   appraisal2 (~> 3.2, >= 3.2.3)
   appraisal2-rubocop (~> 1.0, >= 1.0.2)
-  ast-crispr!
-  ast-crispr-markdown-markly!
-  ast-crispr-ruby-prism!
-  ast-merge!
-  ast-merge-git!
-  ast-template!
-  bash-merge!
   benchmark (~> 0.5, >= 0.5.0)
-  binary-merge!
   bundler-audit (~> 0.9.3)
   cgi (~> 0.5)
-  citrus-toml-merge!
-  commonmarker-merge!
   debug (>= 1.1)
-  dotenv-merge!
   erb (~> 6.0, >= 6.0.7)
   gem_bench (~> 2.0, >= 2.0.5)
   gitmoji-regex (~> 2.0, >= 2.0.12)
-  go-merge!
-  html-merge!
   irb (~> 1.17)
-  json-merge!
   kettle-changelog (~> 1.0, >= 1.0.7)
   kettle-dev (~> 3.0, >= 3.0.34)
-  kettle-drift (~> 1.0, >= 1.0.13)
   kettle-family (~> 1.2, >= 1.2.100)
-  kettle-jem!
   kettle-soup-cover (~> 3.0, >= 3.0.10)
   kettle-test (~> 2.0, >= 2.0.21)
   kramdown (~> 2.5, >= 2.5.2)
-  kramdown-merge!
   kramdown-parser-gfm (~> 1.1)
-  markdown-merge!
-  markly-merge!
   mutex_m (~> 0.2)
   nomono (~> 1.1, >= 1.1.5)
-  parslet-toml-merge!
-  plain-merge!
-  prism-merge!
-  psych-merge!
   rake (~> 13.0)
   rbs (>= 3.0)
-  rbs-merge!
   reek (~> 6.5, >= 6.5.0)
   require_bench (~> 1.0, >= 1.0.4)
   rubocop-gradual (~> 0.4, >= 0.4.0)
@@ -827,18 +616,12 @@ DEPENDENCIES
   rubocop-ruby3_2 (~> 3.0, >= 3.0.8)
   ruby-merge!
   ruby-progressbar (~> 1.13)
-  rust-merge!
-  smorg-rb!
   standard (~> 1.56, >= 1.56.0)
   stone_checksums (~> 1.0, >= 1.0.8)
   stringio (>= 3.0)
-  toml-merge!
-  tree_haver!
   turbo_tests2 (~> 3.2, >= 3.2.7)
-  typescript-merge!
   webrick (~> 1.9)
   yaml-converter (~> 0.2, >= 0.2.5)
-  yaml-merge!
   yard (~> 0.9, >= 0.9.45)
   yard-fence (~> 0.9, >= 0.9.8)
   yard-junk (~> 0.1, >= 0.1.0)
@@ -846,7 +629,6 @@ DEPENDENCIES
   yard-relative_markdown_links (~> 0.6)
   yard-timekeeper (~> 0.2, >= 0.2.6)
   yard-yaml (~> 0.2, >= 0.2.5)
-  zip-merge!
 
 CHECKSUMS
   addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af
@@ -859,14 +641,11 @@ CHECKSUMS
   ast-crispr-markdown-markly (7.1.9)
   ast-crispr-ruby-prism (7.1.9)
   ast-merge (7.1.9)
-  ast-merge-git (7.1.9)
-  ast-template (7.1.9)
   backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235
   bash-merge (7.1.9)
   benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c
   bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd
-  binary-merge (7.1.9)
-  bundler (4.1.0.beta1)
+  bundler (4.1.0.beta1) sha256=8a2dac8ca276ff4eff5efc2c6457b0044080fc1e431534ad7c5cc6187232b800
   bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9
   cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb
   citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650
@@ -875,7 +654,6 @@ CHECKSUMS
   colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02
   command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90
   command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737
-  commonmarker (2.10.0)
   commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478
   commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25
   commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e
@@ -904,19 +682,16 @@ CHECKSUMS
   gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead
   geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9
   gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d
-  go-merge (7.1.9)
   hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2
-  html-merge (7.1.9)
   io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08
   irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3
   json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a
   json-merge (7.1.9)
   kettle-changelog (1.0.7)
   kettle-dev (3.0.34)
-  kettle-drift (1.0.13)
   kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80
   kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21
-  kettle-jem (7.1.26)
+  kettle-jem (7.1.25)
   kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f
   kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4
   kettle-soup-cover (3.0.10)
@@ -948,7 +723,6 @@ CHECKSUMS
   parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c
   parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828
   parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606
-  parslet-toml-merge (7.1.9)
   plain-merge (7.1.9)
   pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570
   prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193
@@ -960,8 +734,6 @@ CHECKSUMS
   racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
   rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
   rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
-  rake-compiler-dock (1.12.0)
-  rb_sys (0.9.130)
   rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674
   rbs-merge (7.1.9)
   rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192
@@ -1003,7 +775,6 @@ CHECKSUMS
   ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33
   ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa
   ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5
-  rust-merge (7.1.9)
   service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce
   silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782
   simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e
@@ -1011,7 +782,6 @@ CHECKSUMS
   simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6
   simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc
   simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed
-  smorg-rb (7.1.9)
   sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f
   standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787
   standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b
@@ -1027,11 +797,9 @@ CHECKSUMS
   timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542
   timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9
   token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87
-  toml (0.3.0)
   toml-merge (7.1.9)
   toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb
   tree_haver (7.1.9)
-  tree_sitter_language_pack (1.16.2)
   tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652
   tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6
   tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6
@@ -1041,7 +809,6 @@ CHECKSUMS
   tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6
   tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50
   turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7
-  typescript-merge (7.1.9)
   unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a
   version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0
   webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131
@@ -1055,7 +822,6 @@ CHECKSUMS
   yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a
   yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca
   zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5
-  zip-merge (7.1.9)
   zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20
 
 BUNDLED WITH
diff --git a/gems/rust-merge/Gemfile.lock b/gems/rust-merge/Gemfile.lock
index 6e3e98200..b4e9d47bc 100644
--- a/gems/rust-merge/Gemfile.lock
+++ b/gems/rust-merge/Gemfile.lock
@@ -15,314 +15,46 @@ PATH
       tree_haver (= 7.1.9)
       version_gem (~> 1.1, >= 1.1.15)
 
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly
+GEM
+  remote: https://gem.coop/
   specs:
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
+    anonymous_loader (0.1.3)
+      version_gem (~> 1.1, >= 1.1.14)
+    ansi (1.6.0)
+    appraisal2 (3.2.3)
+      bundler (>= 1.17.3)
+      rake (>= 10)
+      thor (>= 0.14)
+    appraisal2-rubocop (1.0.2)
+      appraisal2 (>= 3.2.3)
+      rubocop (>= 1.0)
+      version_gem (~> 1.1, >= 1.1.15)
+    ast (2.4.3)
+    ast-crispr (7.1.9)
+      ast-merge (= 7.1.9)
+      service_actor (~> 3.9)
+      version_gem (~> 1.1, >= 1.1.15)
     ast-crispr-markdown-markly (7.1.9)
       ast-crispr (= 7.1.9)
       markdown-merge (= 7.1.9)
       markly-merge (= 7.1.9)
       version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism
-  specs:
     ast-crispr-ruby-prism (7.1.9)
       ast-crispr (= 7.1.9)
       prism-merge (= 7.1.9)
       version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr
-  specs:
-    ast-crispr (7.1.9)
-      ast-merge (= 7.1.9)
-      service_actor (~> 3.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git
-  specs:
-    ast-merge-git (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge
-  specs:
     ast-merge (7.1.9)
       benchmark
       token-resolver (~> 2.0, >= 2.0.4)
       tree_haver (= 7.1.9)
       version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template
-  specs:
-    ast-template (7.1.9)
-      ast-merge (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge
-  specs:
+    backports (3.25.3)
     bash-merge (7.1.9)
       ast-merge (= 7.1.9)
       tree_haver (= 7.1.9)
       version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge
-  specs:
-    binary-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge
-  specs:
-    citrus-toml-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      toml-merge (= 7.1.9)
-      toml-rb (~> 4.1)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge
-  specs:
-    commonmarker-merge (7.1.9)
-      commonmarker (~> 2.2)
-      markdown-merge (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge
-  specs:
-    dotenv-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      plain-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge
-  specs:
-    go-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge
-  specs:
-    html-merge (7.1.9)
-      ast-crispr (= 7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge
-  specs:
-    json-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem
-  specs:
-    kettle-jem (7.1.26)
-      addressable (>= 2.8, < 3)
-      ast-crispr-markdown-markly (~> 7.1, >= 7.1.8)
-      ast-crispr-ruby-prism (~> 7.1, >= 7.1.8)
-      ast-merge (~> 7.1, >= 7.1.8)
-      bash-merge (~> 7.1, >= 7.1.8)
-      citrus-toml-merge (~> 7.1, >= 7.1.8)
-      commonmarker-merge (~> 7.1, >= 7.1.8)
-      dotenv-merge (~> 7.1, >= 7.1.8)
-      json-merge (~> 7.1, >= 7.1.8)
-      kettle-changelog (~> 1.0, >= 1.0.6)
-      kettle-dev (>= 3.0.17, < 4.0.0)
-      kettle-gha-pins (~> 0.3, >= 0.3.14)
-      kettle-ndjson (~> 0.1, >= 0.1.13)
-      kettle-rb (~> 0.1, >= 0.1.11)
-      kramdown-merge (~> 7.1, >= 7.1.8)
-      markdown-merge (~> 7.1, >= 7.1.8)
-      markly-merge (~> 7.1, >= 7.1.8)
-      parslet (~> 2.0)
-      prism-merge (~> 7.1, >= 7.1.8)
-      psych-merge (~> 7.1, >= 7.1.8)
-      rbs (>= 3.10)
-      rbs-merge (~> 7.1, >= 7.1.8)
-      ruby-merge (~> 7.1, >= 7.1.8)
-      token-resolver (~> 2.0, >= 2.0.10)
-      toml-merge (~> 7.1, >= 7.1.8)
-      toml-rb (~> 4.2)
-      tree_haver (~> 7.1, >= 7.1.8)
-      version_gem (~> 1.1, >= 1.1.15)
-      yaml-merge (~> 7.1, >= 7.1.8)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge
-  specs:
-    kramdown-merge (7.1.9)
-      kramdown (~> 2.5)
-      markdown-merge (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge
-  specs:
-    markdown-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge
-  specs:
-    markly-merge (7.1.9)
-      markdown-merge (= 7.1.9)
-      markly (~> 0.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge
-  specs:
-    parslet-toml-merge (7.1.9)
-      toml (~> 0.3)
-      toml-merge (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge
-  specs:
-    plain-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge
-  specs:
-    prism-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      prism (~> 1.6)
-      ruby-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge
-  specs:
-    psych-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-      yaml-merge (= 7.1.9)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge
-  specs:
-    rbs-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      rbs (>= 3.10)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge
-  specs:
-    ruby-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb
-  specs:
-    smorg-rb (7.1.9)
-      ast-merge (= 7.1.9)
-      ast-merge-git (= 7.1.9)
-      bash-merge (= 7.1.9)
-      diff-lcs (~> 1.5)
-      dotenv-merge (= 7.1.9)
-      go-merge (= 7.1.9)
-      html-merge (= 7.1.9)
-      json-merge (= 7.1.9)
-      kettle-jem (~> 7.1, >= 7.1.18)
-      markdown-merge (= 7.1.9)
-      plain-merge (= 7.1.9)
-      prism-merge (= 7.1.9)
-      psych-merge (= 7.1.9)
-      rbs-merge (= 7.1.9)
-      rust-merge (= 7.1.9)
-      toml-merge (= 7.1.9)
-      typescript-merge (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge
-  specs:
-    toml-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver
-  specs:
-    tree_haver (7.1.9)
-      citrus (~> 3.0)
-      parslet (~> 2.0)
-      tree_sitter_language_pack (>= 1.16.2, < 2.0)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge
-  specs:
-    typescript-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge
-  specs:
-    yaml-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge
-  specs:
-    zip-merge (7.1.9)
-      binary-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-GEM
-  remote: https://gem.coop/
-  specs:
-    addressable (2.9.0)
-      public_suffix (>= 2.0.2, < 8.0)
-    anonymous_loader (0.1.3)
-      version_gem (~> 1.1, >= 1.1.14)
-    ansi (1.6.0)
-    appraisal2 (3.2.3)
-      bundler (>= 1.17.3)
-      rake (>= 10)
-      thor (>= 0.14)
-    appraisal2-rubocop (1.0.2)
-      appraisal2 (>= 3.2.3)
-      rubocop (>= 1.0)
-      version_gem (~> 1.1, >= 1.1.15)
-    ast (2.4.3)
-    backports (3.25.3)
     benchmark (0.5.0)
     bigdecimal (4.1.2)
     bundler-audit (0.9.3)
@@ -330,20 +62,27 @@ GEM
       thor (~> 1.0)
     cgi (0.5.2)
     citrus (3.0.2)
+    citrus-toml-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      toml-merge (= 7.1.9)
+      toml-rb (~> 4.1)
+      version_gem (~> 1.1, >= 1.1.15)
     cmdparse (3.0.7)
     colsole (1.0.1)
     command_kit (0.6.0)
     command_kit-completion (0.3.0)
       command_kit (~> 0.1)
       completely (~> 0.6)
-    commonmarker (2.10.0)
-      rb_sys (~> 0.9)
     commonmarker (2.10.0-aarch64-linux)
     commonmarker (2.10.0-aarch64-linux-musl)
     commonmarker (2.10.0-arm64-darwin)
     commonmarker (2.10.0-x86_64-darwin)
     commonmarker (2.10.0-x86_64-linux)
     commonmarker (2.10.0-x86_64-linux-musl)
+    commonmarker-merge (7.1.9)
+      commonmarker (~> 2.2)
+      markdown-merge (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     completely (0.8.0)
       colsole (~> 1.0.0)
       erb
@@ -357,6 +96,11 @@ GEM
     diff-lcs (1.6.2)
     diffy (3.4.4)
     docopt_ng (0.7.1)
+    dotenv-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      plain-merge (= 7.1.9)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     dry-configurable (1.4.0)
       dry-core (~> 1.0)
       zeitwerk (~> 2.6)
@@ -406,6 +150,10 @@ GEM
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     json (2.21.2)
+    json-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     kettle-changelog (1.0.7)
       ast-crispr-markdown-markly (~> 7.1, >= 7.1.1)
       kettle-dev (>= 3.0.19, < 4.0.0)
@@ -418,8 +166,6 @@ GEM
       kettle-test (~> 2.0, >= 2.0.21)
       ruby-progressbar (~> 1.13)
       tty-progressbar (~> 0.18)
-    kettle-drift (1.0.13)
-      version_gem (~> 1.1, >= 1.1.15)
     kettle-family (1.2.100)
       command_kit (~> 0.6)
       command_kit-completion (~> 0.1)
@@ -436,6 +182,36 @@ GEM
       ruby-progressbar (~> 1.13)
       tty-progressbar (~> 0.18)
       version_gem (~> 1.1, >= 1.1.15)
+    kettle-jem (7.1.25)
+      addressable (>= 2.8, < 3)
+      ast-crispr-markdown-markly (~> 7.1, >= 7.1.8)
+      ast-crispr-ruby-prism (~> 7.1, >= 7.1.8)
+      ast-merge (~> 7.1, >= 7.1.8)
+      bash-merge (~> 7.1, >= 7.1.8)
+      citrus-toml-merge (~> 7.1, >= 7.1.8)
+      commonmarker-merge (~> 7.1, >= 7.1.8)
+      dotenv-merge (~> 7.1, >= 7.1.8)
+      json-merge (~> 7.1, >= 7.1.8)
+      kettle-changelog (~> 1.0, >= 1.0.6)
+      kettle-dev (>= 3.0.17, < 4.0.0)
+      kettle-gha-pins (~> 0.3, >= 0.3.14)
+      kettle-ndjson (~> 0.1, >= 0.1.13)
+      kettle-rb (~> 0.1, >= 0.1.11)
+      kramdown-merge (~> 7.1, >= 7.1.8)
+      markdown-merge (~> 7.1, >= 7.1.8)
+      markly-merge (~> 7.1, >= 7.1.8)
+      parslet (~> 2.0)
+      prism-merge (~> 7.1, >= 7.1.8)
+      psych-merge (~> 7.1, >= 7.1.8)
+      rbs (>= 3.10)
+      rbs-merge (~> 7.1, >= 7.1.8)
+      ruby-merge (~> 7.1, >= 7.1.8)
+      token-resolver (~> 2.0, >= 2.0.10)
+      toml-merge (~> 7.1, >= 7.1.8)
+      toml-rb (~> 4.2)
+      tree_haver (~> 7.1, >= 7.1.8)
+      version_gem (~> 1.1, >= 1.1.15)
+      yaml-merge (~> 7.1, >= 7.1.8)
     kettle-ndjson (0.1.15)
       version_gem (~> 1.1, >= 1.1.15)
     kettle-rb (0.1.12)
@@ -461,12 +237,24 @@ GEM
       version_gem (~> 1.1, >= 1.1.15)
     kramdown (2.5.2)
       rexml (>= 3.4.4)
+    kramdown-merge (7.1.9)
+      kramdown (~> 2.5)
+      markdown-merge (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     language_server-protocol (3.17.0.6)
     lint_roller (1.1.0)
     logger (1.7.0)
+    markdown-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     markly (0.19.0)
+    markly-merge (7.1.9)
+      markdown-merge (= 7.1.9)
+      markly (~> 0.9)
+      version_gem (~> 1.1, >= 1.1.15)
     mini_portile2 (2.8.9)
     mister_bin (0.9.0)
       colsole (~> 1.0.0)
@@ -498,24 +286,41 @@ GEM
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
+    plain-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     pp (0.6.4)
       prettyprint
     prettyprint (0.2.0)
     prism (1.9.0)
+    prism-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      prism (~> 1.6)
+      ruby-merge (= 7.1.9)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     psych (5.5.0)
       date
       stringio
+    psych-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
+      yaml-merge (= 7.1.9)
     public_suffix (7.0.5)
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.4.2)
-    rake-compiler-dock (1.12.0)
-    rb_sys (0.9.130)
-      rake-compiler-dock (= 1.12.0)
     rbs (4.2.0)
       logger
       prism (>= 1.6.0)
       tsort
+    rbs-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      rbs (>= 3.10)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     rdoc (7.2.0)
       erb
       psych (>= 4.0.0)
@@ -640,6 +445,10 @@ GEM
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
       rubocop-ast (>= 1.44.0, < 2.0)
+    ruby-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     ruby-progressbar (1.13.0)
     ruby_engine (2.0.3)
     ruby_version (1.0.3)
@@ -700,14 +509,18 @@ GEM
     token-resolver (2.0.10)
       parslet (~> 2.0)
       version_gem (~> 1.1, >= 1.1.15)
-    toml (0.3.0)
-      parslet (>= 1.8.0, < 3.0.0)
+    toml-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     toml-rb (4.2.1)
       citrus (~> 3.0, > 3.0)
       racc (~> 1.7)
-    tree_sitter_language_pack (1.17.0)
-      rb_sys (>= 0.9.130, < 0.10)
-      sorbet-runtime (~> 0.5)
+    tree_haver (7.1.9)
+      citrus (~> 3.0)
+      parslet (~> 2.0)
+      tree_sitter_language_pack (>= 1.16.2, < 2.0)
+      version_gem (~> 1.1, >= 1.1.15)
     tree_sitter_language_pack (1.17.0-aarch64-linux)
       sorbet-runtime (~> 0.5)
     tree_sitter_language_pack (1.17.0-arm64-darwin)
@@ -736,6 +549,10 @@ GEM
       kramdown (>= 2.4, < 3)
       kramdown-parser-gfm (~> 1.1)
       version_gem (~> 1.1, >= 1.1.15)
+    yaml-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     yard (0.9.45)
     yard-fence (0.9.8)
       rdoc (>= 6.11, < 8)
@@ -773,49 +590,25 @@ DEPENDENCIES
   anonymous_loader (~> 0.1, >= 0.1.3)
   appraisal2 (~> 3.2, >= 3.2.3)
   appraisal2-rubocop (~> 1.0, >= 1.0.2)
-  ast-crispr!
-  ast-crispr-markdown-markly!
-  ast-crispr-ruby-prism!
-  ast-merge!
-  ast-merge-git!
-  ast-template!
-  bash-merge!
   benchmark (~> 0.5, >= 0.5.0)
-  binary-merge!
   bundler-audit (~> 0.9.3)
   cgi (~> 0.5)
-  citrus-toml-merge!
-  commonmarker-merge!
   debug (>= 1.1)
-  dotenv-merge!
   erb (~> 6.0, >= 6.0.7)
   gem_bench (~> 2.0, >= 2.0.5)
   gitmoji-regex (~> 2.0, >= 2.0.12)
-  go-merge!
-  html-merge!
   irb (~> 1.17)
-  json-merge!
   kettle-changelog (~> 1.0, >= 1.0.7)
   kettle-dev (~> 3.0, >= 3.0.34)
-  kettle-drift (~> 1.0, >= 1.0.13)
   kettle-family (~> 1.2, >= 1.2.100)
-  kettle-jem!
   kettle-soup-cover (~> 3.0, >= 3.0.10)
   kettle-test (~> 2.0, >= 2.0.21)
   kramdown (~> 2.5, >= 2.5.2)
-  kramdown-merge!
   kramdown-parser-gfm (~> 1.1)
-  markdown-merge!
-  markly-merge!
   mutex_m (~> 0.2)
   nomono (~> 1.1, >= 1.1.5)
-  parslet-toml-merge!
-  plain-merge!
-  prism-merge!
-  psych-merge!
   rake (~> 13.0)
   rbs (>= 3.0)
-  rbs-merge!
   reek (~> 6.5, >= 6.5.0)
   require_bench (~> 1.0, >= 1.0.4)
   rubocop-gradual (~> 0.4, >= 0.4.0)
@@ -825,20 +618,14 @@ DEPENDENCIES
   rubocop-on-rbs (~> 2.0, >= 2.0.0)
   rubocop-packaging!
   rubocop-ruby3_2 (~> 3.0, >= 3.0.8)
-  ruby-merge!
   ruby-progressbar (~> 1.13)
   rust-merge!
-  smorg-rb!
   standard (~> 1.56, >= 1.56.0)
   stone_checksums (~> 1.0, >= 1.0.8)
   stringio (>= 3.0)
-  toml-merge!
-  tree_haver!
   turbo_tests2 (~> 3.2, >= 3.2.7)
-  typescript-merge!
   webrick (~> 1.9)
   yaml-converter (~> 0.2, >= 0.2.5)
-  yaml-merge!
   yard (~> 0.9, >= 0.9.45)
   yard-fence (~> 0.9, >= 0.9.8)
   yard-junk (~> 0.1, >= 0.1.0)
@@ -846,7 +633,6 @@ DEPENDENCIES
   yard-relative_markdown_links (~> 0.6)
   yard-timekeeper (~> 0.2, >= 0.2.6)
   yard-yaml (~> 0.2, >= 0.2.5)
-  zip-merge!
 
 CHECKSUMS
   addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af
@@ -859,14 +645,11 @@ CHECKSUMS
   ast-crispr-markdown-markly (7.1.9)
   ast-crispr-ruby-prism (7.1.9)
   ast-merge (7.1.9)
-  ast-merge-git (7.1.9)
-  ast-template (7.1.9)
   backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235
   bash-merge (7.1.9)
   benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c
   bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd
-  binary-merge (7.1.9)
-  bundler (4.1.0.beta1)
+  bundler (4.1.0.beta1) sha256=8a2dac8ca276ff4eff5efc2c6457b0044080fc1e431534ad7c5cc6187232b800
   bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9
   cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb
   citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650
@@ -875,7 +658,6 @@ CHECKSUMS
   colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02
   command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90
   command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737
-  commonmarker (2.10.0)
   commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478
   commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25
   commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e
@@ -904,19 +686,16 @@ CHECKSUMS
   gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead
   geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9
   gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d
-  go-merge (7.1.9)
   hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2
-  html-merge (7.1.9)
   io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08
   irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3
   json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a
   json-merge (7.1.9)
   kettle-changelog (1.0.7)
   kettle-dev (3.0.34)
-  kettle-drift (1.0.13)
   kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80
   kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21
-  kettle-jem (7.1.26)
+  kettle-jem (7.1.25)
   kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f
   kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4
   kettle-soup-cover (3.0.10)
@@ -948,7 +727,6 @@ CHECKSUMS
   parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c
   parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828
   parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606
-  parslet-toml-merge (7.1.9)
   plain-merge (7.1.9)
   pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570
   prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193
@@ -960,8 +738,6 @@ CHECKSUMS
   racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
   rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
   rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
-  rake-compiler-dock (1.12.0)
-  rb_sys (0.9.130)
   rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674
   rbs-merge (7.1.9)
   rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192
@@ -1011,7 +787,6 @@ CHECKSUMS
   simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6
   simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc
   simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed
-  smorg-rb (7.1.9)
   sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f
   standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787
   standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b
@@ -1027,11 +802,9 @@ CHECKSUMS
   timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542
   timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9
   token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87
-  toml (0.3.0)
   toml-merge (7.1.9)
   toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb
   tree_haver (7.1.9)
-  tree_sitter_language_pack (1.17.0)
   tree_sitter_language_pack (1.17.0-aarch64-linux)
   tree_sitter_language_pack (1.17.0-arm64-darwin)
   tree_sitter_language_pack (1.17.0-x86_64-darwin)
@@ -1041,7 +814,6 @@ CHECKSUMS
   tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6
   tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50
   turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7
-  typescript-merge (7.1.9)
   unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a
   version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0
   webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131
@@ -1055,7 +827,6 @@ CHECKSUMS
   yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a
   yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca
   zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5
-  zip-merge (7.1.9)
   zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20
 
 BUNDLED WITH
diff --git a/gems/toml-merge/Gemfile.lock b/gems/toml-merge/Gemfile.lock
index c625139d7..dcdb49ae8 100644
--- a/gems/toml-merge/Gemfile.lock
+++ b/gems/toml-merge/Gemfile.lock
@@ -15,314 +15,46 @@ PATH
       tree_haver (= 7.1.9)
       version_gem (~> 1.1, >= 1.1.15)
 
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly
+GEM
+  remote: https://gem.coop/
   specs:
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
+    anonymous_loader (0.1.3)
+      version_gem (~> 1.1, >= 1.1.14)
+    ansi (1.6.0)
+    appraisal2 (3.2.3)
+      bundler (>= 1.17.3)
+      rake (>= 10)
+      thor (>= 0.14)
+    appraisal2-rubocop (1.0.2)
+      appraisal2 (>= 3.2.3)
+      rubocop (>= 1.0)
+      version_gem (~> 1.1, >= 1.1.15)
+    ast (2.4.3)
+    ast-crispr (7.1.9)
+      ast-merge (= 7.1.9)
+      service_actor (~> 3.9)
+      version_gem (~> 1.1, >= 1.1.15)
     ast-crispr-markdown-markly (7.1.9)
       ast-crispr (= 7.1.9)
       markdown-merge (= 7.1.9)
       markly-merge (= 7.1.9)
       version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism
-  specs:
     ast-crispr-ruby-prism (7.1.9)
       ast-crispr (= 7.1.9)
       prism-merge (= 7.1.9)
       version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr
-  specs:
-    ast-crispr (7.1.9)
-      ast-merge (= 7.1.9)
-      service_actor (~> 3.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git
-  specs:
-    ast-merge-git (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge
-  specs:
     ast-merge (7.1.9)
       benchmark
       token-resolver (~> 2.0, >= 2.0.4)
       tree_haver (= 7.1.9)
       version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template
-  specs:
-    ast-template (7.1.9)
-      ast-merge (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge
-  specs:
+    backports (3.25.3)
     bash-merge (7.1.9)
       ast-merge (= 7.1.9)
       tree_haver (= 7.1.9)
       version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge
-  specs:
-    binary-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge
-  specs:
-    citrus-toml-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      toml-merge (= 7.1.9)
-      toml-rb (~> 4.1)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge
-  specs:
-    commonmarker-merge (7.1.9)
-      commonmarker (~> 2.2)
-      markdown-merge (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge
-  specs:
-    dotenv-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      plain-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge
-  specs:
-    go-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge
-  specs:
-    html-merge (7.1.9)
-      ast-crispr (= 7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge
-  specs:
-    json-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem
-  specs:
-    kettle-jem (7.1.26)
-      addressable (>= 2.8, < 3)
-      ast-crispr-markdown-markly (~> 7.1, >= 7.1.8)
-      ast-crispr-ruby-prism (~> 7.1, >= 7.1.8)
-      ast-merge (~> 7.1, >= 7.1.8)
-      bash-merge (~> 7.1, >= 7.1.8)
-      citrus-toml-merge (~> 7.1, >= 7.1.8)
-      commonmarker-merge (~> 7.1, >= 7.1.8)
-      dotenv-merge (~> 7.1, >= 7.1.8)
-      json-merge (~> 7.1, >= 7.1.8)
-      kettle-changelog (~> 1.0, >= 1.0.6)
-      kettle-dev (>= 3.0.17, < 4.0.0)
-      kettle-gha-pins (~> 0.3, >= 0.3.14)
-      kettle-ndjson (~> 0.1, >= 0.1.13)
-      kettle-rb (~> 0.1, >= 0.1.11)
-      kramdown-merge (~> 7.1, >= 7.1.8)
-      markdown-merge (~> 7.1, >= 7.1.8)
-      markly-merge (~> 7.1, >= 7.1.8)
-      parslet (~> 2.0)
-      prism-merge (~> 7.1, >= 7.1.8)
-      psych-merge (~> 7.1, >= 7.1.8)
-      rbs (>= 3.10)
-      rbs-merge (~> 7.1, >= 7.1.8)
-      ruby-merge (~> 7.1, >= 7.1.8)
-      token-resolver (~> 2.0, >= 2.0.10)
-      toml-merge (~> 7.1, >= 7.1.8)
-      toml-rb (~> 4.2)
-      tree_haver (~> 7.1, >= 7.1.8)
-      version_gem (~> 1.1, >= 1.1.15)
-      yaml-merge (~> 7.1, >= 7.1.8)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge
-  specs:
-    kramdown-merge (7.1.9)
-      kramdown (~> 2.5)
-      markdown-merge (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge
-  specs:
-    markdown-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge
-  specs:
-    markly-merge (7.1.9)
-      markdown-merge (= 7.1.9)
-      markly (~> 0.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge
-  specs:
-    parslet-toml-merge (7.1.9)
-      toml (~> 0.3)
-      toml-merge (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge
-  specs:
-    plain-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge
-  specs:
-    prism-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      prism (~> 1.6)
-      ruby-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge
-  specs:
-    psych-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-      yaml-merge (= 7.1.9)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge
-  specs:
-    rbs-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      rbs (>= 3.10)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge
-  specs:
-    ruby-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge
-  specs:
-    rust-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb
-  specs:
-    smorg-rb (7.1.9)
-      ast-merge (= 7.1.9)
-      ast-merge-git (= 7.1.9)
-      bash-merge (= 7.1.9)
-      diff-lcs (~> 1.5)
-      dotenv-merge (= 7.1.9)
-      go-merge (= 7.1.9)
-      html-merge (= 7.1.9)
-      json-merge (= 7.1.9)
-      kettle-jem (~> 7.1, >= 7.1.18)
-      markdown-merge (= 7.1.9)
-      plain-merge (= 7.1.9)
-      prism-merge (= 7.1.9)
-      psych-merge (= 7.1.9)
-      rbs-merge (= 7.1.9)
-      rust-merge (= 7.1.9)
-      toml-merge (= 7.1.9)
-      typescript-merge (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver
-  specs:
-    tree_haver (7.1.9)
-      citrus (~> 3.0)
-      parslet (~> 2.0)
-      tree_sitter_language_pack (>= 1.16.2, < 2.0)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge
-  specs:
-    typescript-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge
-  specs:
-    yaml-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge
-  specs:
-    zip-merge (7.1.9)
-      binary-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-GEM
-  remote: https://gem.coop/
-  specs:
-    addressable (2.9.0)
-      public_suffix (>= 2.0.2, < 8.0)
-    anonymous_loader (0.1.3)
-      version_gem (~> 1.1, >= 1.1.14)
-    ansi (1.6.0)
-    appraisal2 (3.2.3)
-      bundler (>= 1.17.3)
-      rake (>= 10)
-      thor (>= 0.14)
-    appraisal2-rubocop (1.0.2)
-      appraisal2 (>= 3.2.3)
-      rubocop (>= 1.0)
-      version_gem (~> 1.1, >= 1.1.15)
-    ast (2.4.3)
-    backports (3.25.3)
     benchmark (0.5.0)
     bigdecimal (4.1.2)
     bundler-audit (0.9.3)
@@ -330,20 +62,27 @@ GEM
       thor (~> 1.0)
     cgi (0.5.2)
     citrus (3.0.2)
+    citrus-toml-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      toml-merge (= 7.1.9)
+      toml-rb (~> 4.1)
+      version_gem (~> 1.1, >= 1.1.15)
     cmdparse (3.0.7)
     colsole (1.0.1)
     command_kit (0.6.0)
     command_kit-completion (0.3.0)
       command_kit (~> 0.1)
       completely (~> 0.6)
-    commonmarker (2.10.0)
-      rb_sys (~> 0.9)
     commonmarker (2.10.0-aarch64-linux)
     commonmarker (2.10.0-aarch64-linux-musl)
     commonmarker (2.10.0-arm64-darwin)
     commonmarker (2.10.0-x86_64-darwin)
     commonmarker (2.10.0-x86_64-linux)
     commonmarker (2.10.0-x86_64-linux-musl)
+    commonmarker-merge (7.1.9)
+      commonmarker (~> 2.2)
+      markdown-merge (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     completely (0.8.0)
       colsole (~> 1.0.0)
       erb
@@ -357,6 +96,11 @@ GEM
     diff-lcs (1.6.2)
     diffy (3.4.4)
     docopt_ng (0.7.1)
+    dotenv-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      plain-merge (= 7.1.9)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     dry-configurable (1.4.0)
       dry-core (~> 1.0)
       zeitwerk (~> 2.6)
@@ -406,6 +150,10 @@ GEM
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     json (2.21.2)
+    json-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     kettle-changelog (1.0.7)
       ast-crispr-markdown-markly (~> 7.1, >= 7.1.1)
       kettle-dev (>= 3.0.19, < 4.0.0)
@@ -418,8 +166,6 @@ GEM
       kettle-test (~> 2.0, >= 2.0.21)
       ruby-progressbar (~> 1.13)
       tty-progressbar (~> 0.18)
-    kettle-drift (1.0.13)
-      version_gem (~> 1.1, >= 1.1.15)
     kettle-family (1.2.100)
       command_kit (~> 0.6)
       command_kit-completion (~> 0.1)
@@ -436,6 +182,36 @@ GEM
       ruby-progressbar (~> 1.13)
       tty-progressbar (~> 0.18)
       version_gem (~> 1.1, >= 1.1.15)
+    kettle-jem (7.1.25)
+      addressable (>= 2.8, < 3)
+      ast-crispr-markdown-markly (~> 7.1, >= 7.1.8)
+      ast-crispr-ruby-prism (~> 7.1, >= 7.1.8)
+      ast-merge (~> 7.1, >= 7.1.8)
+      bash-merge (~> 7.1, >= 7.1.8)
+      citrus-toml-merge (~> 7.1, >= 7.1.8)
+      commonmarker-merge (~> 7.1, >= 7.1.8)
+      dotenv-merge (~> 7.1, >= 7.1.8)
+      json-merge (~> 7.1, >= 7.1.8)
+      kettle-changelog (~> 1.0, >= 1.0.6)
+      kettle-dev (>= 3.0.17, < 4.0.0)
+      kettle-gha-pins (~> 0.3, >= 0.3.14)
+      kettle-ndjson (~> 0.1, >= 0.1.13)
+      kettle-rb (~> 0.1, >= 0.1.11)
+      kramdown-merge (~> 7.1, >= 7.1.8)
+      markdown-merge (~> 7.1, >= 7.1.8)
+      markly-merge (~> 7.1, >= 7.1.8)
+      parslet (~> 2.0)
+      prism-merge (~> 7.1, >= 7.1.8)
+      psych-merge (~> 7.1, >= 7.1.8)
+      rbs (>= 3.10)
+      rbs-merge (~> 7.1, >= 7.1.8)
+      ruby-merge (~> 7.1, >= 7.1.8)
+      token-resolver (~> 2.0, >= 2.0.10)
+      toml-merge (~> 7.1, >= 7.1.8)
+      toml-rb (~> 4.2)
+      tree_haver (~> 7.1, >= 7.1.8)
+      version_gem (~> 1.1, >= 1.1.15)
+      yaml-merge (~> 7.1, >= 7.1.8)
     kettle-ndjson (0.1.15)
       version_gem (~> 1.1, >= 1.1.15)
     kettle-rb (0.1.12)
@@ -461,12 +237,24 @@ GEM
       version_gem (~> 1.1, >= 1.1.15)
     kramdown (2.5.2)
       rexml (>= 3.4.4)
+    kramdown-merge (7.1.9)
+      kramdown (~> 2.5)
+      markdown-merge (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     language_server-protocol (3.17.0.6)
     lint_roller (1.1.0)
     logger (1.7.0)
+    markdown-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     markly (0.19.0)
+    markly-merge (7.1.9)
+      markdown-merge (= 7.1.9)
+      markly (~> 0.9)
+      version_gem (~> 1.1, >= 1.1.15)
     mini_portile2 (2.8.9)
     mister_bin (0.9.0)
       colsole (~> 1.0.0)
@@ -498,24 +286,41 @@ GEM
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
+    plain-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     pp (0.6.4)
       prettyprint
     prettyprint (0.2.0)
     prism (1.9.0)
+    prism-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      prism (~> 1.6)
+      ruby-merge (= 7.1.9)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     psych (5.5.0)
       date
       stringio
+    psych-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
+      yaml-merge (= 7.1.9)
     public_suffix (7.0.5)
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.4.2)
-    rake-compiler-dock (1.12.0)
-    rb_sys (0.9.130)
-      rake-compiler-dock (= 1.12.0)
     rbs (4.2.0)
       logger
       prism (>= 1.6.0)
       tsort
+    rbs-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      rbs (>= 3.10)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     rdoc (7.2.0)
       erb
       psych (>= 4.0.0)
@@ -640,6 +445,10 @@ GEM
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
       rubocop-ast (>= 1.44.0, < 2.0)
+    ruby-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     ruby-progressbar (1.13.0)
     ruby_engine (2.0.3)
     ruby_version (1.0.3)
@@ -700,14 +509,14 @@ GEM
     token-resolver (2.0.10)
       parslet (~> 2.0)
       version_gem (~> 1.1, >= 1.1.15)
-    toml (0.3.0)
-      parslet (>= 1.8.0, < 3.0.0)
     toml-rb (4.2.1)
       citrus (~> 3.0, > 3.0)
       racc (~> 1.7)
-    tree_sitter_language_pack (1.16.2)
-      rb_sys (>= 0.9.130, < 0.10)
-      sorbet-runtime (~> 0.5)
+    tree_haver (7.1.9)
+      citrus (~> 3.0)
+      parslet (~> 2.0)
+      tree_sitter_language_pack (>= 1.16.2, < 2.0)
+      version_gem (~> 1.1, >= 1.1.15)
     tree_sitter_language_pack (1.16.2-aarch64-linux)
       sorbet-runtime (~> 0.5)
     tree_sitter_language_pack (1.16.2-arm64-darwin)
@@ -736,6 +545,10 @@ GEM
       kramdown (>= 2.4, < 3)
       kramdown-parser-gfm (~> 1.1)
       version_gem (~> 1.1, >= 1.1.15)
+    yaml-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     yard (0.9.45)
     yard-fence (0.9.8)
       rdoc (>= 6.11, < 8)
@@ -773,49 +586,25 @@ DEPENDENCIES
   anonymous_loader (~> 0.1, >= 0.1.3)
   appraisal2 (~> 3.2, >= 3.2.3)
   appraisal2-rubocop (~> 1.0, >= 1.0.2)
-  ast-crispr!
-  ast-crispr-markdown-markly!
-  ast-crispr-ruby-prism!
-  ast-merge!
-  ast-merge-git!
-  ast-template!
-  bash-merge!
   benchmark (~> 0.5, >= 0.5.0)
-  binary-merge!
   bundler-audit (~> 0.9.3)
   cgi (~> 0.5)
-  citrus-toml-merge!
-  commonmarker-merge!
   debug (>= 1.1)
-  dotenv-merge!
   erb (~> 6.0, >= 6.0.7)
   gem_bench (~> 2.0, >= 2.0.5)
   gitmoji-regex (~> 2.0, >= 2.0.12)
-  go-merge!
-  html-merge!
   irb (~> 1.17)
-  json-merge!
   kettle-changelog (~> 1.0, >= 1.0.7)
   kettle-dev (~> 3.0, >= 3.0.34)
-  kettle-drift (~> 1.0, >= 1.0.13)
   kettle-family (~> 1.2, >= 1.2.100)
-  kettle-jem!
   kettle-soup-cover (~> 3.0, >= 3.0.10)
   kettle-test (~> 2.0, >= 2.0.21)
   kramdown (~> 2.5, >= 2.5.2)
-  kramdown-merge!
   kramdown-parser-gfm (~> 1.1)
-  markdown-merge!
-  markly-merge!
   mutex_m (~> 0.2)
   nomono (~> 1.1, >= 1.1.5)
-  parslet-toml-merge!
-  plain-merge!
-  prism-merge!
-  psych-merge!
   rake (~> 13.0)
   rbs (>= 3.0)
-  rbs-merge!
   reek (~> 6.5, >= 6.5.0)
   require_bench (~> 1.0, >= 1.0.4)
   rubocop-gradual (~> 0.4, >= 0.4.0)
@@ -825,20 +614,14 @@ DEPENDENCIES
   rubocop-on-rbs (~> 2.0, >= 2.0.0)
   rubocop-packaging!
   rubocop-ruby3_2 (~> 3.0, >= 3.0.8)
-  ruby-merge!
   ruby-progressbar (~> 1.13)
-  rust-merge!
-  smorg-rb!
   standard (~> 1.56, >= 1.56.0)
   stone_checksums (~> 1.0, >= 1.0.8)
   stringio (>= 3.0)
   toml-merge!
-  tree_haver!
   turbo_tests2 (~> 3.2, >= 3.2.7)
-  typescript-merge!
   webrick (~> 1.9)
   yaml-converter (~> 0.2, >= 0.2.5)
-  yaml-merge!
   yard (~> 0.9, >= 0.9.45)
   yard-fence (~> 0.9, >= 0.9.8)
   yard-junk (~> 0.1, >= 0.1.0)
@@ -846,7 +629,6 @@ DEPENDENCIES
   yard-relative_markdown_links (~> 0.6)
   yard-timekeeper (~> 0.2, >= 0.2.6)
   yard-yaml (~> 0.2, >= 0.2.5)
-  zip-merge!
 
 CHECKSUMS
   addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af
@@ -859,14 +641,11 @@ CHECKSUMS
   ast-crispr-markdown-markly (7.1.9)
   ast-crispr-ruby-prism (7.1.9)
   ast-merge (7.1.9)
-  ast-merge-git (7.1.9)
-  ast-template (7.1.9)
   backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235
   bash-merge (7.1.9)
   benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c
   bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd
-  binary-merge (7.1.9)
-  bundler (4.1.0.beta1)
+  bundler (4.1.0.beta1) sha256=8a2dac8ca276ff4eff5efc2c6457b0044080fc1e431534ad7c5cc6187232b800
   bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9
   cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb
   citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650
@@ -875,7 +654,6 @@ CHECKSUMS
   colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02
   command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90
   command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737
-  commonmarker (2.10.0)
   commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478
   commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25
   commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e
@@ -904,19 +682,16 @@ CHECKSUMS
   gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead
   geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9
   gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d
-  go-merge (7.1.9)
   hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2
-  html-merge (7.1.9)
   io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08
   irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3
   json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a
   json-merge (7.1.9)
   kettle-changelog (1.0.7)
   kettle-dev (3.0.34)
-  kettle-drift (1.0.13)
   kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80
   kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21
-  kettle-jem (7.1.26)
+  kettle-jem (7.1.25)
   kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f
   kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4
   kettle-soup-cover (3.0.10)
@@ -948,7 +723,6 @@ CHECKSUMS
   parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c
   parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828
   parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606
-  parslet-toml-merge (7.1.9)
   plain-merge (7.1.9)
   pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570
   prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193
@@ -960,8 +734,6 @@ CHECKSUMS
   racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
   rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
   rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
-  rake-compiler-dock (1.12.0)
-  rb_sys (0.9.130)
   rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674
   rbs-merge (7.1.9)
   rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192
@@ -1003,7 +775,6 @@ CHECKSUMS
   ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33
   ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa
   ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5
-  rust-merge (7.1.9)
   service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce
   silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782
   simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e
@@ -1011,7 +782,6 @@ CHECKSUMS
   simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6
   simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc
   simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed
-  smorg-rb (7.1.9)
   sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f
   standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787
   standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b
@@ -1027,11 +797,9 @@ CHECKSUMS
   timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542
   timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9
   token-resolver (2.0.10) sha256=188df2d18d90816c690ba9a66d7299ba9de9a73779d816170ea70da624aa3d87
-  toml (0.3.0)
   toml-merge (7.1.9)
   toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb
   tree_haver (7.1.9)
-  tree_sitter_language_pack (1.16.2)
   tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652
   tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6
   tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6
@@ -1041,7 +809,6 @@ CHECKSUMS
   tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6
   tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50
   turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7
-  typescript-merge (7.1.9)
   unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a
   version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0
   webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131
@@ -1055,7 +822,6 @@ CHECKSUMS
   yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a
   yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca
   zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5
-  zip-merge (7.1.9)
   zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20
 
 BUNDLED WITH
diff --git a/gems/tree_haver/Gemfile.lock b/gems/tree_haver/Gemfile.lock
index c69e631f0..123d2b9cd 100644
--- a/gems/tree_haver/Gemfile.lock
+++ b/gems/tree_haver/Gemfile.lock
@@ -16,313 +16,46 @@ PATH
       tree_sitter_language_pack (>= 1.16.2, < 2.0)
       version_gem (~> 1.1, >= 1.1.15)
 
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly
+GEM
+  remote: https://gem.coop/
   specs:
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
+    anonymous_loader (0.1.3)
+      version_gem (~> 1.1, >= 1.1.14)
+    ansi (1.6.0)
+    appraisal2 (3.2.3)
+      bundler (>= 1.17.3)
+      rake (>= 10)
+      thor (>= 0.14)
+    appraisal2-rubocop (1.0.2)
+      appraisal2 (>= 3.2.3)
+      rubocop (>= 1.0)
+      version_gem (~> 1.1, >= 1.1.15)
+    ast (2.4.3)
+    ast-crispr (7.1.9)
+      ast-merge (= 7.1.9)
+      service_actor (~> 3.9)
+      version_gem (~> 1.1, >= 1.1.15)
     ast-crispr-markdown-markly (7.1.9)
       ast-crispr (= 7.1.9)
       markdown-merge (= 7.1.9)
       markly-merge (= 7.1.9)
       version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism
-  specs:
     ast-crispr-ruby-prism (7.1.9)
       ast-crispr (= 7.1.9)
       prism-merge (= 7.1.9)
       version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr
-  specs:
-    ast-crispr (7.1.9)
-      ast-merge (= 7.1.9)
-      service_actor (~> 3.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git
-  specs:
-    ast-merge-git (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge
-  specs:
     ast-merge (7.1.9)
       benchmark
       token-resolver (~> 2.0, >= 2.0.4)
       tree_haver (= 7.1.9)
       version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-template
-  specs:
-    ast-template (7.1.9)
-      ast-merge (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge
-  specs:
+    backports (3.25.3)
     bash-merge (7.1.9)
       ast-merge (= 7.1.9)
       tree_haver (= 7.1.9)
       version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/binary-merge
-  specs:
-    binary-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge
-  specs:
-    citrus-toml-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      toml-merge (= 7.1.9)
-      toml-rb (~> 4.1)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge
-  specs:
-    commonmarker-merge (7.1.9)
-      commonmarker (~> 2.2)
-      markdown-merge (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge
-  specs:
-    dotenv-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      plain-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge
-  specs:
-    go-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/html-merge
-  specs:
-    html-merge (7.1.9)
-      ast-crispr (= 7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge
-  specs:
-    json-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem
-  specs:
-    kettle-jem (7.1.26)
-      addressable (>= 2.8, < 3)
-      ast-crispr-markdown-markly (~> 7.1, >= 7.1.8)
-      ast-crispr-ruby-prism (~> 7.1, >= 7.1.8)
-      ast-merge (~> 7.1, >= 7.1.8)
-      bash-merge (~> 7.1, >= 7.1.8)
-      citrus-toml-merge (~> 7.1, >= 7.1.8)
-      commonmarker-merge (~> 7.1, >= 7.1.8)
-      dotenv-merge (~> 7.1, >= 7.1.8)
-      json-merge (~> 7.1, >= 7.1.8)
-      kettle-changelog (~> 1.0, >= 1.0.6)
-      kettle-dev (>= 3.0.17, < 4.0.0)
-      kettle-gha-pins (~> 0.3, >= 0.3.14)
-      kettle-ndjson (~> 0.1, >= 0.1.13)
-      kettle-rb (~> 0.1, >= 0.1.11)
-      kramdown-merge (~> 7.1, >= 7.1.8)
-      markdown-merge (~> 7.1, >= 7.1.8)
-      markly-merge (~> 7.1, >= 7.1.8)
-      parslet (~> 2.0)
-      prism-merge (~> 7.1, >= 7.1.8)
-      psych-merge (~> 7.1, >= 7.1.8)
-      rbs (>= 3.10)
-      rbs-merge (~> 7.1, >= 7.1.8)
-      ruby-merge (~> 7.1, >= 7.1.8)
-      token-resolver (~> 2.0, >= 2.0.10)
-      toml-merge (~> 7.1, >= 7.1.8)
-      toml-rb (~> 4.2)
-      tree_haver (~> 7.1, >= 7.1.8)
-      version_gem (~> 1.1, >= 1.1.15)
-      yaml-merge (~> 7.1, >= 7.1.8)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge
-  specs:
-    kramdown-merge (7.1.9)
-      kramdown (~> 2.5)
-      markdown-merge (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge
-  specs:
-    markdown-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge
-  specs:
-    markly-merge (7.1.9)
-      markdown-merge (= 7.1.9)
-      markly (~> 0.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge
-  specs:
-    parslet-toml-merge (7.1.9)
-      toml (~> 0.3)
-      toml-merge (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge
-  specs:
-    plain-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge
-  specs:
-    prism-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      prism (~> 1.6)
-      ruby-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/psych-merge
-  specs:
-    psych-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-      yaml-merge (= 7.1.9)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge
-  specs:
-    rbs-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      rbs (>= 3.10)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge
-  specs:
-    ruby-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/rust-merge
-  specs:
-    rust-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb
-  specs:
-    smorg-rb (7.1.9)
-      ast-merge (= 7.1.9)
-      ast-merge-git (= 7.1.9)
-      bash-merge (= 7.1.9)
-      diff-lcs (~> 1.5)
-      dotenv-merge (= 7.1.9)
-      go-merge (= 7.1.9)
-      html-merge (= 7.1.9)
-      json-merge (= 7.1.9)
-      kettle-jem (~> 7.1, >= 7.1.18)
-      markdown-merge (= 7.1.9)
-      plain-merge (= 7.1.9)
-      prism-merge (= 7.1.9)
-      psych-merge (= 7.1.9)
-      rbs-merge (= 7.1.9)
-      rust-merge (= 7.1.9)
-      toml-merge (= 7.1.9)
-      typescript-merge (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge
-  specs:
-    toml-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge
-  specs:
-    typescript-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge
-  specs:
-    yaml-merge (7.1.9)
-      ast-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-PATH
-  remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/zip-merge
-  specs:
-    zip-merge (7.1.9)
-      binary-merge (= 7.1.9)
-      tree_haver (= 7.1.9)
-      version_gem (~> 1.1, >= 1.1.15)
-
-GEM
-  remote: https://gem.coop/
-  specs:
-    addressable (2.9.0)
-      public_suffix (>= 2.0.2, < 8.0)
-    anonymous_loader (0.1.3)
-      version_gem (~> 1.1, >= 1.1.14)
-    ansi (1.6.0)
-    appraisal2 (3.2.3)
-      bundler (>= 1.17.3)
-      rake (>= 10)
-      thor (>= 0.14)
-    appraisal2-rubocop (1.0.2)
-      appraisal2 (>= 3.2.3)
-      rubocop (>= 1.0)
-      version_gem (~> 1.1, >= 1.1.15)
-    ast (2.4.3)
-    backports (3.25.3)
     benchmark (0.5.0)
     bigdecimal (4.1.2)
     bundler-audit (0.9.3)
@@ -330,15 +63,22 @@ GEM
       thor (~> 1.0)
     cgi (0.5.2)
     citrus (3.0.2)
+    citrus-toml-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      toml-merge (= 7.1.9)
+      toml-rb (~> 4.1)
+      version_gem (~> 1.1, >= 1.1.15)
     cmdparse (3.0.7)
     colsole (1.0.1)
     command_kit (0.6.0)
     command_kit-completion (0.3.0)
       command_kit (~> 0.1)
       completely (~> 0.6)
-    commonmarker (2.10.0)
-      rb_sys (~> 0.9)
     commonmarker (2.10.0-x86_64-linux)
+    commonmarker-merge (7.1.9)
+      commonmarker (~> 2.2)
+      markdown-merge (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     completely (0.8.0)
       colsole (~> 1.0.0)
       erb
@@ -352,6 +92,11 @@ GEM
     diff-lcs (1.6.2)
     diffy (3.4.4)
     docopt_ng (0.7.1)
+    dotenv-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      plain-merge (= 7.1.9)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     dry-configurable (1.4.0)
       dry-core (~> 1.0)
       zeitwerk (~> 2.6)
@@ -401,6 +146,10 @@ GEM
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     json (2.21.2)
+    json-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     kettle-changelog (1.0.7)
       ast-crispr-markdown-markly (~> 7.1, >= 7.1.1)
       kettle-dev (>= 3.0.19, < 4.0.0)
@@ -413,8 +162,6 @@ GEM
       kettle-test (~> 2.0, >= 2.0.21)
       ruby-progressbar (~> 1.13)
       tty-progressbar (~> 0.18)
-    kettle-drift (1.0.13)
-      version_gem (~> 1.1, >= 1.1.15)
     kettle-family (1.2.100)
       command_kit (~> 0.6)
       command_kit-completion (~> 0.1)
@@ -431,6 +178,36 @@ GEM
       ruby-progressbar (~> 1.13)
       tty-progressbar (~> 0.18)
       version_gem (~> 1.1, >= 1.1.15)
+    kettle-jem (7.1.25)
+      addressable (>= 2.8, < 3)
+      ast-crispr-markdown-markly (~> 7.1, >= 7.1.8)
+      ast-crispr-ruby-prism (~> 7.1, >= 7.1.8)
+      ast-merge (~> 7.1, >= 7.1.8)
+      bash-merge (~> 7.1, >= 7.1.8)
+      citrus-toml-merge (~> 7.1, >= 7.1.8)
+      commonmarker-merge (~> 7.1, >= 7.1.8)
+      dotenv-merge (~> 7.1, >= 7.1.8)
+      json-merge (~> 7.1, >= 7.1.8)
+      kettle-changelog (~> 1.0, >= 1.0.6)
+      kettle-dev (>= 3.0.17, < 4.0.0)
+      kettle-gha-pins (~> 0.3, >= 0.3.14)
+      kettle-ndjson (~> 0.1, >= 0.1.13)
+      kettle-rb (~> 0.1, >= 0.1.11)
+      kramdown-merge (~> 7.1, >= 7.1.8)
+      markdown-merge (~> 7.1, >= 7.1.8)
+      markly-merge (~> 7.1, >= 7.1.8)
+      parslet (~> 2.0)
+      prism-merge (~> 7.1, >= 7.1.8)
+      psych-merge (~> 7.1, >= 7.1.8)
+      rbs (>= 3.10)
+      rbs-merge (~> 7.1, >= 7.1.8)
+      ruby-merge (~> 7.1, >= 7.1.8)
+      token-resolver (~> 2.0, >= 2.0.10)
+      toml-merge (~> 7.1, >= 7.1.8)
+      toml-rb (~> 4.2)
+      tree_haver (~> 7.1, >= 7.1.8)
+      version_gem (~> 1.1, >= 1.1.15)
+      yaml-merge (~> 7.1, >= 7.1.8)
     kettle-ndjson (0.1.15)
       version_gem (~> 1.1, >= 1.1.15)
     kettle-rb (0.1.12)
@@ -456,12 +233,24 @@ GEM
       version_gem (~> 1.1, >= 1.1.15)
     kramdown (2.5.2)
       rexml (>= 3.4.4)
+    kramdown-merge (7.1.9)
+      kramdown (~> 2.5)
+      markdown-merge (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     language_server-protocol (3.17.0.6)
     lint_roller (1.1.0)
     logger (1.7.0)
+    markdown-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     markly (0.19.0)
+    markly-merge (7.1.9)
+      markdown-merge (= 7.1.9)
+      markly (~> 0.9)
+      version_gem (~> 1.1, >= 1.1.15)
     mini_portile2 (2.8.9)
     mister_bin (0.9.0)
       colsole (~> 1.0.0)
@@ -483,24 +272,41 @@ GEM
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
+    plain-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     pp (0.6.4)
       prettyprint
     prettyprint (0.2.0)
     prism (1.9.0)
+    prism-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      prism (~> 1.6)
+      ruby-merge (= 7.1.9)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     psych (5.5.0)
       date
       stringio
+    psych-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
+      yaml-merge (= 7.1.9)
     public_suffix (7.0.5)
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.4.2)
-    rake-compiler-dock (1.12.0)
-    rb_sys (0.9.130)
-      rake-compiler-dock (= 1.12.0)
     rbs (4.2.0)
       logger
       prism (>= 1.6.0)
       tsort
+    rbs-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      rbs (>= 3.10)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     rdoc (7.2.0)
       erb
       psych (>= 4.0.0)
@@ -625,6 +431,10 @@ GEM
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
       rubocop-ast (>= 1.44.0, < 2.0)
+    ruby-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     ruby-progressbar (1.13.0)
     ruby_engine (2.0.3)
     ruby_version (1.0.3)
@@ -687,12 +497,13 @@ GEM
       version_gem (~> 1.1, >= 1.1.15)
     toml (0.3.0)
       parslet (>= 1.8.0, < 3.0.0)
+    toml-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     toml-rb (4.2.1)
       citrus (~> 3.0, > 3.0)
       racc (~> 1.7)
-    tree_sitter_language_pack (1.16.2)
-      rb_sys (>= 0.9.130, < 0.10)
-      sorbet-runtime (~> 0.5)
     tree_sitter_language_pack (1.16.2-x86_64-linux)
       sorbet-runtime (~> 0.5)
     tsort (0.2.0)
@@ -715,6 +526,10 @@ GEM
       kramdown (>= 2.4, < 3)
       kramdown-parser-gfm (~> 1.1)
       version_gem (~> 1.1, >= 1.1.15)
+    yaml-merge (7.1.9)
+      ast-merge (= 7.1.9)
+      tree_haver (= 7.1.9)
+      version_gem (~> 1.1, >= 1.1.15)
     yard (0.9.45)
     yard-fence (0.9.8)
       rdoc (>= 6.11, < 8)
@@ -746,49 +561,25 @@ DEPENDENCIES
   anonymous_loader (~> 0.1, >= 0.1.3)
   appraisal2 (~> 3.2, >= 3.2.3)
   appraisal2-rubocop (~> 1.0, >= 1.0.2)
-  ast-crispr!
-  ast-crispr-markdown-markly!
-  ast-crispr-ruby-prism!
-  ast-merge!
-  ast-merge-git!
-  ast-template!
-  bash-merge!
   benchmark (~> 0.5, >= 0.5.0)
-  binary-merge!
   bundler-audit (~> 0.9.3)
   cgi (~> 0.5)
-  citrus-toml-merge!
-  commonmarker-merge!
   debug (>= 1.1)
-  dotenv-merge!
   erb (~> 6.0, >= 6.0.7)
   gem_bench (~> 2.0, >= 2.0.5)
   gitmoji-regex (~> 2.0, >= 2.0.12)
-  go-merge!
-  html-merge!
   irb (~> 1.17)
-  json-merge!
   kettle-changelog (~> 1.0, >= 1.0.7)
   kettle-dev (~> 3.0, >= 3.0.34)
-  kettle-drift (~> 1.0, >= 1.0.13)
   kettle-family (~> 1.2, >= 1.2.97)
-  kettle-jem!
   kettle-soup-cover (~> 3.0, >= 3.0.10)
   kettle-test (~> 2.0, >= 2.0.21)
   kramdown (~> 2.5, >= 2.5.2)
-  kramdown-merge!
   kramdown-parser-gfm (~> 1.1)
-  markdown-merge!
-  markly-merge!
   mutex_m (~> 0.2)
   nomono (~> 1.1, >= 1.1.5)
-  parslet-toml-merge!
-  plain-merge!
-  prism-merge!
-  psych-merge!
   rake (~> 13.0)
   rbs (>= 3.0)
-  rbs-merge!
   reek (~> 6.5, >= 6.5.0)
   require_bench (~> 1.0, >= 1.0.4)
   rubocop-gradual (~> 0.4, >= 0.4.0)
@@ -798,22 +589,16 @@ DEPENDENCIES
   rubocop-on-rbs (~> 2.0, >= 2.0.0)
   rubocop-packaging!
   rubocop-ruby3_2 (~> 3.0, >= 3.0.6)
-  ruby-merge!
   ruby-progressbar (~> 1.13)
-  rust-merge!
-  smorg-rb!
   standard (~> 1.56, >= 1.56.0)
   stone_checksums (~> 1.0, >= 1.0.8)
   stringio (>= 3.0)
   toml (~> 0.3)
-  toml-merge!
   toml-rb (~> 4.1)
   tree_haver!
   turbo_tests2 (~> 3.2, >= 3.2.7)
-  typescript-merge!
   webrick (~> 1.9)
   yaml-converter (~> 0.2, >= 0.2.5)
-  yaml-merge!
   yard (~> 0.9, >= 0.9.45)
   yard-fence (~> 0.9, >= 0.9.8)
   yard-junk (~> 0.1, >= 0.1.0)
@@ -821,7 +606,6 @@ DEPENDENCIES
   yard-relative_markdown_links (~> 0.6)
   yard-timekeeper (~> 0.2, >= 0.2.6)
   yard-yaml (~> 0.2, >= 0.2.5)
-  zip-merge!
 
 CHECKSUMS
   addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af
@@ -834,13 +618,10 @@ CHECKSUMS
   ast-crispr-markdown-markly (7.1.9)
   ast-crispr-ruby-prism (7.1.9)
   ast-merge (7.1.9)
-  ast-merge-git (7.1.9)
-  ast-template (7.1.9)
   backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235
   bash-merge (7.1.9)
   benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c
   bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd
-  binary-merge (7.1.9)
   bundler (4.1.0.beta1) sha256=8a2dac8ca276ff4eff5efc2c6457b0044080fc1e431534ad7c5cc6187232b800
   bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9
   cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb
@@ -850,7 +631,6 @@ CHECKSUMS
   colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02
   command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90
   command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737
-  commonmarker (2.10.0)
   commonmarker (2.10.0-x86_64-linux) sha256=945c510c0bfca9022245928e2248468fe3ddad58c939be0c37b20082cc392880
   commonmarker-merge (7.1.9)
   completely (0.8.0) sha256=e493cd5d84805f47917a41f277ecbfe5f35363bed670be5a957d3acaed8c6c5e
@@ -874,19 +654,16 @@ CHECKSUMS
   gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead
   geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9
   gitmoji-regex (2.0.12) sha256=bebbf29e9539a27f76d0695899c0fabde1b59dba556277508abf45e72a1dc24d
-  go-merge (7.1.9)
   hexapdf (1.10.0) sha256=9c2e8d094876878c6203d441655fafc1890870041456e03205eec7d83edf9db2
-  html-merge (7.1.9)
   io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08
   irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3
   json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a
   json-merge (7.1.9)
   kettle-changelog (1.0.7)
   kettle-dev (3.0.34)
-  kettle-drift (1.0.13)
   kettle-family (1.2.100) sha256=b5d1ebd647eb45afbef7b84c20270dd2ea1c17e221152996266b963634db2d80
   kettle-gha-pins (0.3.14) sha256=443a218149d3a2ab300875eb10ef55d5c4bc340bce7ba7caba026e1680dd8c21
-  kettle-jem (7.1.26)
+  kettle-jem (7.1.25)
   kettle-ndjson (0.1.15) sha256=8606ab5b59092d46ba50394b2ad65738f6a5cc11258c6cc943f8e451da864a1f
   kettle-rb (0.1.12) sha256=918ea072d3069f998e7dbd76836a14378cc9a16e317e2bf79da714f5ec0be5a4
   kettle-soup-cover (3.0.10)
@@ -913,7 +690,6 @@ CHECKSUMS
   parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c
   parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828
   parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606
-  parslet-toml-merge (7.1.9)
   plain-merge (7.1.9)
   pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570
   prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193
@@ -925,8 +701,6 @@ CHECKSUMS
   racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
   rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
   rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
-  rake-compiler-dock (1.12.0)
-  rb_sys (0.9.130)
   rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674
   rbs-merge (7.1.9)
   rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192
@@ -968,7 +742,6 @@ CHECKSUMS
   ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33
   ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa
   ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5
-  rust-merge (7.1.9)
   service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce
   silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782
   simplecov (1.2.0) sha256=ea6acd05eece5a41990e2a5171c57d15700d329326c7666c85ee8c6a0dd0977e
@@ -976,7 +749,6 @@ CHECKSUMS
   simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6
   simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc
   simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed
-  smorg-rb (7.1.9)
   sorbet-runtime (0.6.13490) sha256=b7818903f86867eec8912bd4ca258558e41d7b3514bdc1a91f9df1d09b4a775f
   standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787
   standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b
@@ -996,14 +768,12 @@ CHECKSUMS
   toml-merge (7.1.9)
   toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb
   tree_haver (7.1.9)
-  tree_sitter_language_pack (1.16.2)
   tree_sitter_language_pack (1.16.2-x86_64-linux) sha256=d8151e6e44e35ace9de3611c76b730896beab17f427db06d8f76666332a5dc60
   tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f
   tty-cursor (0.7.1) sha256=79534185e6a777888d88628b14b6a1fdf5154a603f285f80b1753e1908e0bf48
   tty-progressbar (0.18.3) sha256=6cbb4260e55e74a9180d502143eb6a467d2c8e51bf5f3c9509fb5cacc3d4a5f6
   tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50
   turbo_tests2 (3.2.7) sha256=b0fbc681d15aa1aa8158d7826575155d2fc084124a1903b45db02a0ea9a9c0e7
-  typescript-merge (7.1.9)
   unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a
   version_gem (1.1.15) sha256=a73241587b29252e3567e0c818ded80730eb754d43b508f6ce4db22ca9ba27d0
   webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131
@@ -1017,7 +787,6 @@ CHECKSUMS
   yard-timekeeper (0.2.6) sha256=8dc5f67f98f95339fa2a8e7c842fee3ec01e429e90d7dedc6d815c30a544fb3a
   yard-yaml (0.2.5) sha256=85ef36242587c3c192fd86e185877aa5fb895fd4a1751136bc853e56205ad5ca
   zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5
-  zip-merge (7.1.9)
   zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20
 
 BUNDLED WITH
diff --git a/gems/tree_haver/docs/TreeHaver.html b/gems/tree_haver/docs/TreeHaver.html
index 4bb27f052..c9391078a 100644
--- a/gems/tree_haver/docs/TreeHaver.html
+++ b/gems/tree_haver/docs/TreeHaver.html
@@ -4153,7 +4153,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/AdapterInfo.html b/gems/tree_haver/docs/TreeHaver/AdapterInfo.html
index 5e6aa9802..27fcdebc3 100644
--- a/gems/tree_haver/docs/TreeHaver/AdapterInfo.html
+++ b/gems/tree_haver/docs/TreeHaver/AdapterInfo.html
@@ -548,7 +548,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/AppliedEditProjectionOperation.html b/gems/tree_haver/docs/TreeHaver/AppliedEditProjectionOperation.html
index aa2ab15f6..9f610caf9 100644
--- a/gems/tree_haver/docs/TreeHaver/AppliedEditProjectionOperation.html
+++ b/gems/tree_haver/docs/TreeHaver/AppliedEditProjectionOperation.html
@@ -548,7 +548,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/BackendAPI.html b/gems/tree_haver/docs/TreeHaver/BackendAPI.html
index 31aedbec1..6c282da6a 100644
--- a/gems/tree_haver/docs/TreeHaver/BackendAPI.html
+++ b/gems/tree_haver/docs/TreeHaver/BackendAPI.html
@@ -906,7 +906,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/BackendAvailabilityCheck.html b/gems/tree_haver/docs/TreeHaver/BackendAvailabilityCheck.html
index 0b10ae862..e82e3f23f 100644
--- a/gems/tree_haver/docs/TreeHaver/BackendAvailabilityCheck.html
+++ b/gems/tree_haver/docs/TreeHaver/BackendAvailabilityCheck.html
@@ -548,7 +548,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/BackendAvailabilityReport.html b/gems/tree_haver/docs/TreeHaver/BackendAvailabilityReport.html
index 490ae0309..c151b5c46 100644
--- a/gems/tree_haver/docs/TreeHaver/BackendAvailabilityReport.html
+++ b/gems/tree_haver/docs/TreeHaver/BackendAvailabilityReport.html
@@ -548,7 +548,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/BackendCapability.html b/gems/tree_haver/docs/TreeHaver/BackendCapability.html
index 980380371..0946f51da 100644
--- a/gems/tree_haver/docs/TreeHaver/BackendCapability.html
+++ b/gems/tree_haver/docs/TreeHaver/BackendCapability.html
@@ -1505,7 +1505,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/BackendConflict.html b/gems/tree_haver/docs/TreeHaver/BackendConflict.html
index 474ff1037..29f4e343c 100644
--- a/gems/tree_haver/docs/TreeHaver/BackendConflict.html
+++ b/gems/tree_haver/docs/TreeHaver/BackendConflict.html
@@ -126,7 +126,7 @@
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/BackendReference.html b/gems/tree_haver/docs/TreeHaver/BackendReference.html
index 35ead09f3..b9c3f56a5 100644
--- a/gems/tree_haver/docs/TreeHaver/BackendReference.html
+++ b/gems/tree_haver/docs/TreeHaver/BackendReference.html
@@ -368,7 +368,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/BackendRegistry.html b/gems/tree_haver/docs/TreeHaver/BackendRegistry.html
index c74a66819..db278e6c8 100644
--- a/gems/tree_haver/docs/TreeHaver/BackendRegistry.html
+++ b/gems/tree_haver/docs/TreeHaver/BackendRegistry.html
@@ -1254,7 +1254,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends.html b/gems/tree_haver/docs/TreeHaver/Backends.html
index 5c62b532f..3690ab8b8 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends.html
@@ -110,7 +110,7 @@ 
    Defined Under Namespace
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/Citrus.html b/gems/tree_haver/docs/TreeHaver/Backends/Citrus.html
index 25ec0be1c..1303446be 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/Citrus.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/Citrus.html
@@ -454,7 +454,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/Citrus/Language.html b/gems/tree_haver/docs/TreeHaver/Backends/Citrus/Language.html
index 2db3ce828..3a1543399 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/Citrus/Language.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/Citrus/Language.html
@@ -839,7 +839,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/Citrus/Node.html b/gems/tree_haver/docs/TreeHaver/Backends/Citrus/Node.html
index 43a2b04e5..b27f5033c 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/Citrus/Node.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/Citrus/Node.html
@@ -1119,7 +1119,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/Citrus/Parser.html b/gems/tree_haver/docs/TreeHaver/Backends/Citrus/Parser.html
index c338d8d6a..57e8d0fdd 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/Citrus/Parser.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/Citrus/Parser.html
@@ -695,7 +695,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/Citrus/Tree.html b/gems/tree_haver/docs/TreeHaver/Backends/Citrus/Tree.html
index fe676aba7..077286ae8 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/Citrus/Tree.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/Citrus/Tree.html
@@ -414,7 +414,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/FFI.html b/gems/tree_haver/docs/TreeHaver/Backends/FFI.html
index 989acd372..131759ae0 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/FFI.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/FFI.html
@@ -623,7 +623,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/FFI/Language.html b/gems/tree_haver/docs/TreeHaver/Backends/FFI/Language.html
index c43d799b0..7a27d5739 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/FFI/Language.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/FFI/Language.html
@@ -1280,7 +1280,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/FFI/Native.html b/gems/tree_haver/docs/TreeHaver/Backends/FFI/Native.html
index a902228a5..2ff6cc54f 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/FFI/Native.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/FFI/Native.html
@@ -946,7 +946,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/FFI/Node.html b/gems/tree_haver/docs/TreeHaver/Backends/FFI/Node.html
index a800159a8..6c5e63e30 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/FFI/Node.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/FFI/Node.html
@@ -2712,7 +2712,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/FFI/Parser.html b/gems/tree_haver/docs/TreeHaver/Backends/FFI/Parser.html
index 7ded2c002..bfdbdf3b7 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/FFI/Parser.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/FFI/Parser.html
@@ -626,7 +626,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/FFI/Tree.html b/gems/tree_haver/docs/TreeHaver/Backends/FFI/Tree.html
index f8c4e5328..0cb1bef11 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/FFI/Tree.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/FFI/Tree.html
@@ -446,7 +446,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/Java.html b/gems/tree_haver/docs/TreeHaver/Backends/Java.html
index cb7e4aaf4..24ac402f1 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/Java.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/Java.html
@@ -1072,7 +1072,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/Java/Language.html b/gems/tree_haver/docs/TreeHaver/Backends/Java/Language.html
index 70c473cff..dad39cbe3 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/Java/Language.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/Java/Language.html
@@ -1258,7 +1258,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/Java/Node.html b/gems/tree_haver/docs/TreeHaver/Backends/Java/Node.html
index b4a1290d9..786c25a1f 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/Java/Node.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/Java/Node.html
@@ -1876,7 +1876,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/Java/Parser.html b/gems/tree_haver/docs/TreeHaver/Backends/Java/Parser.html
index 872113a6a..d0edcf78f 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/Java/Parser.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/Java/Parser.html
@@ -665,7 +665,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/Java/Tree.html b/gems/tree_haver/docs/TreeHaver/Backends/Java/Tree.html
index acd122419..0abd007aa 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/Java/Tree.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/Java/Tree.html
@@ -656,7 +656,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/MRI.html b/gems/tree_haver/docs/TreeHaver/Backends/MRI.html
index 0b4d712a7..9fcac5135 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/MRI.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/MRI.html
@@ -473,7 +473,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/MRI/Language.html b/gems/tree_haver/docs/TreeHaver/Backends/MRI/Language.html
index 46c2a7bfc..884009029 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/MRI/Language.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/MRI/Language.html
@@ -1084,7 +1084,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/MRI/Parser.html b/gems/tree_haver/docs/TreeHaver/Backends/MRI/Parser.html
index 91b7307a2..3717059c3 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/MRI/Parser.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/MRI/Parser.html
@@ -710,7 +710,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/Parslet.html b/gems/tree_haver/docs/TreeHaver/Backends/Parslet.html
index 016fb694e..bf888e475 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/Parslet.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/Parslet.html
@@ -451,7 +451,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/Parslet/Language.html b/gems/tree_haver/docs/TreeHaver/Backends/Parslet/Language.html
index f0ce166a4..7f6a28dda 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/Parslet/Language.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/Parslet/Language.html
@@ -839,7 +839,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/Parslet/Node.html b/gems/tree_haver/docs/TreeHaver/Backends/Parslet/Node.html
index 79178a989..006bbe83b 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/Parslet/Node.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/Parslet/Node.html
@@ -1495,7 +1495,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/Parslet/Parser.html b/gems/tree_haver/docs/TreeHaver/Backends/Parslet/Parser.html
index bf9f3c49b..e99ea774f 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/Parslet/Parser.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/Parslet/Parser.html
@@ -697,7 +697,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/Parslet/Tree.html b/gems/tree_haver/docs/TreeHaver/Backends/Parslet/Tree.html
index 449f95825..2f4925584 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/Parslet/Tree.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/Parslet/Tree.html
@@ -414,7 +414,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/Prism.html b/gems/tree_haver/docs/TreeHaver/Backends/Prism.html
index 07586fc59..723c28986 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/Prism.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/Prism.html
@@ -457,7 +457,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/Prism/Comment.html b/gems/tree_haver/docs/TreeHaver/Backends/Prism/Comment.html
index a6c85b0af..f74a0538a 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/Prism/Comment.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/Prism/Comment.html
@@ -739,7 +739,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/Prism/Language.html b/gems/tree_haver/docs/TreeHaver/Backends/Prism/Language.html
index 6b3f0536b..b99f112fe 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/Prism/Language.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/Prism/Language.html
@@ -755,7 +755,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/Prism/Node.html b/gems/tree_haver/docs/TreeHaver/Backends/Prism/Node.html
index 3c55a68d2..9291f460a 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/Prism/Node.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/Prism/Node.html
@@ -1641,7 +1641,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/Prism/Parser.html b/gems/tree_haver/docs/TreeHaver/Backends/Prism/Parser.html
index 0cc1e6def..5078ead33 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/Prism/Parser.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/Prism/Parser.html
@@ -610,7 +610,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/Prism/Tree.html b/gems/tree_haver/docs/TreeHaver/Backends/Prism/Tree.html
index 3f7bbfe06..6c4552659 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/Prism/Tree.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/Prism/Tree.html
@@ -917,7 +917,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/Psych.html b/gems/tree_haver/docs/TreeHaver/Backends/Psych.html
index 5707326c1..298cff42e 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/Psych.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/Psych.html
@@ -468,7 +468,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/Psych/Language.html b/gems/tree_haver/docs/TreeHaver/Backends/Psych/Language.html
index 18a3b53bf..fd3f1fbbb 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/Psych/Language.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/Psych/Language.html
@@ -525,7 +525,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/Psych/Node.html b/gems/tree_haver/docs/TreeHaver/Backends/Psych/Node.html
index f2e069894..b3d003bff 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/Psych/Node.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/Psych/Node.html
@@ -1503,7 +1503,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/Psych/Parser.html b/gems/tree_haver/docs/TreeHaver/Backends/Psych/Parser.html
index 9b8f19964..3ec493850 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/Psych/Parser.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/Psych/Parser.html
@@ -419,7 +419,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/Psych/Tree.html b/gems/tree_haver/docs/TreeHaver/Backends/Psych/Tree.html
index f700c2fb1..cc342eae6 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/Psych/Tree.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/Psych/Tree.html
@@ -506,7 +506,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/Rust.html b/gems/tree_haver/docs/TreeHaver/Backends/Rust.html
index e994edfde..5d2f19c53 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/Rust.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/Rust.html
@@ -464,7 +464,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/Rust/Language.html b/gems/tree_haver/docs/TreeHaver/Backends/Rust/Language.html
index 4dc18b968..1d1cec278 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/Rust/Language.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/Rust/Language.html
@@ -817,7 +817,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/Rust/Parser.html b/gems/tree_haver/docs/TreeHaver/Backends/Rust/Parser.html
index 90bea6fe4..851b40b1f 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/Rust/Parser.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/Rust/Parser.html
@@ -567,7 +567,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/Tslp.html b/gems/tree_haver/docs/TreeHaver/Backends/Tslp.html
index bcce6b7c2..fd58bd44a 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/Tslp.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/Tslp.html
@@ -591,7 +591,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/Tslp/Language.html b/gems/tree_haver/docs/TreeHaver/Backends/Tslp/Language.html
index 829ab06a2..7cd1b22d7 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/Tslp/Language.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/Tslp/Language.html
@@ -294,7 +294,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/Tslp/Node.html b/gems/tree_haver/docs/TreeHaver/Backends/Tslp/Node.html
index 85fa62db5..055eeb166 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/Tslp/Node.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/Tslp/Node.html
@@ -1196,7 +1196,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/Tslp/Parser.html b/gems/tree_haver/docs/TreeHaver/Backends/Tslp/Parser.html
index b98255273..118e8a609 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/Tslp/Parser.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/Tslp/Parser.html
@@ -253,7 +253,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Backends/Tslp/Tree.html b/gems/tree_haver/docs/TreeHaver/Backends/Tslp/Tree.html
index b8c0cbb70..59a95ce77 100644
--- a/gems/tree_haver/docs/TreeHaver/Backends/Tslp/Tree.html
+++ b/gems/tree_haver/docs/TreeHaver/Backends/Tslp/Tree.html
@@ -355,7 +355,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Base.html b/gems/tree_haver/docs/TreeHaver/Base.html
index 97e7d3c60..7b37e216b 100644
--- a/gems/tree_haver/docs/TreeHaver/Base.html
+++ b/gems/tree_haver/docs/TreeHaver/Base.html
@@ -110,7 +110,7 @@ 
    Defined Under Namespace
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Base/Comment.html b/gems/tree_haver/docs/TreeHaver/Base/Comment.html
index a644ca3cc..8f2143f8f 100644
--- a/gems/tree_haver/docs/TreeHaver/Base/Comment.html
+++ b/gems/tree_haver/docs/TreeHaver/Base/Comment.html
@@ -2826,7 +2826,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Base/Language.html b/gems/tree_haver/docs/TreeHaver/Base/Language.html
index 2d4de434c..52fb31480 100644
--- a/gems/tree_haver/docs/TreeHaver/Base/Language.html
+++ b/gems/tree_haver/docs/TreeHaver/Base/Language.html
@@ -1084,7 +1084,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Base/Node.html b/gems/tree_haver/docs/TreeHaver/Base/Node.html
index a2ce9d3ac..7bff44ddf 100644
--- a/gems/tree_haver/docs/TreeHaver/Base/Node.html
+++ b/gems/tree_haver/docs/TreeHaver/Base/Node.html
@@ -2962,7 +2962,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Base/Parser.html b/gems/tree_haver/docs/TreeHaver/Base/Parser.html
index 3a9de0c8f..755785609 100644
--- a/gems/tree_haver/docs/TreeHaver/Base/Parser.html
+++ b/gems/tree_haver/docs/TreeHaver/Base/Parser.html
@@ -477,7 +477,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Base/Point.html b/gems/tree_haver/docs/TreeHaver/Base/Point.html
index f297cf00d..cf30461df 100644
--- a/gems/tree_haver/docs/TreeHaver/Base/Point.html
+++ b/gems/tree_haver/docs/TreeHaver/Base/Point.html
@@ -673,7 +673,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Base/Tree.html b/gems/tree_haver/docs/TreeHaver/Base/Tree.html
index f8cf84b9e..c3f23f0fc 100644
--- a/gems/tree_haver/docs/TreeHaver/Base/Tree.html
+++ b/gems/tree_haver/docs/TreeHaver/Base/Tree.html
@@ -1180,7 +1180,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/BinaryDiagnostic.html b/gems/tree_haver/docs/TreeHaver/BinaryDiagnostic.html
index b7a4a0842..15215bdbd 100644
--- a/gems/tree_haver/docs/TreeHaver/BinaryDiagnostic.html
+++ b/gems/tree_haver/docs/TreeHaver/BinaryDiagnostic.html
@@ -635,7 +635,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/BinaryMergeReport.html b/gems/tree_haver/docs/TreeHaver/BinaryMergeReport.html
index 72a3f182d..38ddda376 100644
--- a/gems/tree_haver/docs/TreeHaver/BinaryMergeReport.html
+++ b/gems/tree_haver/docs/TreeHaver/BinaryMergeReport.html
@@ -896,7 +896,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/BinaryNestedDispatch.html b/gems/tree_haver/docs/TreeHaver/BinaryNestedDispatch.html
index 245d1328d..684c030e7 100644
--- a/gems/tree_haver/docs/TreeHaver/BinaryNestedDispatch.html
+++ b/gems/tree_haver/docs/TreeHaver/BinaryNestedDispatch.html
@@ -461,7 +461,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/BinaryPayloadRegion.html b/gems/tree_haver/docs/TreeHaver/BinaryPayloadRegion.html
index 6ba67f45a..0044fd852 100644
--- a/gems/tree_haver/docs/TreeHaver/BinaryPayloadRegion.html
+++ b/gems/tree_haver/docs/TreeHaver/BinaryPayloadRegion.html
@@ -548,7 +548,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/BinaryRawPayload.html b/gems/tree_haver/docs/TreeHaver/BinaryRawPayload.html
index e9176675f..efd2c19fc 100644
--- a/gems/tree_haver/docs/TreeHaver/BinaryRawPayload.html
+++ b/gems/tree_haver/docs/TreeHaver/BinaryRawPayload.html
@@ -548,7 +548,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/BinaryRenderPolicy.html b/gems/tree_haver/docs/TreeHaver/BinaryRenderPolicy.html
index 06c060110..471369d11 100644
--- a/gems/tree_haver/docs/TreeHaver/BinaryRenderPolicy.html
+++ b/gems/tree_haver/docs/TreeHaver/BinaryRenderPolicy.html
@@ -635,7 +635,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/BinaryScalarValue.html b/gems/tree_haver/docs/TreeHaver/BinaryScalarValue.html
index 2d11d1aa1..ec540ad5b 100644
--- a/gems/tree_haver/docs/TreeHaver/BinaryScalarValue.html
+++ b/gems/tree_haver/docs/TreeHaver/BinaryScalarValue.html
@@ -809,7 +809,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/ByteEditSpan.html b/gems/tree_haver/docs/TreeHaver/ByteEditSpan.html
index b864f5ccf..d71d8e5ad 100644
--- a/gems/tree_haver/docs/TreeHaver/ByteEditSpan.html
+++ b/gems/tree_haver/docs/TreeHaver/ByteEditSpan.html
@@ -881,7 +881,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/ByteRange.html b/gems/tree_haver/docs/TreeHaver/ByteRange.html
index 67d199e5c..7ca2dc1aa 100644
--- a/gems/tree_haver/docs/TreeHaver/ByteRange.html
+++ b/gems/tree_haver/docs/TreeHaver/ByteRange.html
@@ -731,7 +731,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/CitrusGrammarFinder.html b/gems/tree_haver/docs/TreeHaver/CitrusGrammarFinder.html
index 7900aa048..e138de508 100644
--- a/gems/tree_haver/docs/TreeHaver/CitrusGrammarFinder.html
+++ b/gems/tree_haver/docs/TreeHaver/CitrusGrammarFinder.html
@@ -1327,7 +1327,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/EditProjectionExecutionRequest.html b/gems/tree_haver/docs/TreeHaver/EditProjectionExecutionRequest.html
index e9e75cb70..5fa1e9eaf 100644
--- a/gems/tree_haver/docs/TreeHaver/EditProjectionExecutionRequest.html
+++ b/gems/tree_haver/docs/TreeHaver/EditProjectionExecutionRequest.html
@@ -635,7 +635,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/EditProjectionExecutionResult.html b/gems/tree_haver/docs/TreeHaver/EditProjectionExecutionResult.html
index e73f0f350..16f7232dd 100644
--- a/gems/tree_haver/docs/TreeHaver/EditProjectionExecutionResult.html
+++ b/gems/tree_haver/docs/TreeHaver/EditProjectionExecutionResult.html
@@ -635,7 +635,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/EditProjectionOperationRequest.html b/gems/tree_haver/docs/TreeHaver/EditProjectionOperationRequest.html
index 9bd2b00f0..3e74ea91d 100644
--- a/gems/tree_haver/docs/TreeHaver/EditProjectionOperationRequest.html
+++ b/gems/tree_haver/docs/TreeHaver/EditProjectionOperationRequest.html
@@ -548,7 +548,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/EditProjectionProviderMatrix.html b/gems/tree_haver/docs/TreeHaver/EditProjectionProviderMatrix.html
index 632d13f1f..6467ea626 100644
--- a/gems/tree_haver/docs/TreeHaver/EditProjectionProviderMatrix.html
+++ b/gems/tree_haver/docs/TreeHaver/EditProjectionProviderMatrix.html
@@ -461,7 +461,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/EditProjectionProviderMatrixEntry.html b/gems/tree_haver/docs/TreeHaver/EditProjectionProviderMatrixEntry.html
index 18ca6deeb..26480eb36 100644
--- a/gems/tree_haver/docs/TreeHaver/EditProjectionProviderMatrixEntry.html
+++ b/gems/tree_haver/docs/TreeHaver/EditProjectionProviderMatrixEntry.html
@@ -722,7 +722,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/EditProjectionProviderOperation.html b/gems/tree_haver/docs/TreeHaver/EditProjectionProviderOperation.html
index c3521ad68..8fb9eaae9 100644
--- a/gems/tree_haver/docs/TreeHaver/EditProjectionProviderOperation.html
+++ b/gems/tree_haver/docs/TreeHaver/EditProjectionProviderOperation.html
@@ -809,7 +809,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/EditProjectionSupport.html b/gems/tree_haver/docs/TreeHaver/EditProjectionSupport.html
index 7e88c0db0..23964fabf 100644
--- a/gems/tree_haver/docs/TreeHaver/EditProjectionSupport.html
+++ b/gems/tree_haver/docs/TreeHaver/EditProjectionSupport.html
@@ -1157,7 +1157,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Error.html b/gems/tree_haver/docs/TreeHaver/Error.html
index 0148b054d..f8988433d 100644
--- a/gems/tree_haver/docs/TreeHaver/Error.html
+++ b/gems/tree_haver/docs/TreeHaver/Error.html
@@ -121,7 +121,7 @@ 
    Direct Known Subclasses
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/FeatureProfile.html b/gems/tree_haver/docs/TreeHaver/FeatureProfile.html
index 6b9e1e985..5a064aec5 100644
--- a/gems/tree_haver/docs/TreeHaver/FeatureProfile.html
+++ b/gems/tree_haver/docs/TreeHaver/FeatureProfile.html
@@ -548,7 +548,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/GrammarFinder.html b/gems/tree_haver/docs/TreeHaver/GrammarFinder.html
index 13cb7ac82..7daaa28d9 100644
--- a/gems/tree_haver/docs/TreeHaver/GrammarFinder.html
+++ b/gems/tree_haver/docs/TreeHaver/GrammarFinder.html
@@ -2195,7 +2195,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/KaitaiByteSpan.html b/gems/tree_haver/docs/TreeHaver/KaitaiByteSpan.html
index 355c2af21..4c8c6737e 100644
--- a/gems/tree_haver/docs/TreeHaver/KaitaiByteSpan.html
+++ b/gems/tree_haver/docs/TreeHaver/KaitaiByteSpan.html
@@ -374,7 +374,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/KaitaiTreeAnalysis.html b/gems/tree_haver/docs/TreeHaver/KaitaiTreeAnalysis.html
index 38627bf12..e82cdfe80 100644
--- a/gems/tree_haver/docs/TreeHaver/KaitaiTreeAnalysis.html
+++ b/gems/tree_haver/docs/TreeHaver/KaitaiTreeAnalysis.html
@@ -690,7 +690,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/KaitaiTreeNode.html b/gems/tree_haver/docs/TreeHaver/KaitaiTreeNode.html
index 69d871132..862738fab 100644
--- a/gems/tree_haver/docs/TreeHaver/KaitaiTreeNode.html
+++ b/gems/tree_haver/docs/TreeHaver/KaitaiTreeNode.html
@@ -635,7 +635,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Language.html b/gems/tree_haver/docs/TreeHaver/Language.html
index b672dfa6d..bbd3d6b6c 100644
--- a/gems/tree_haver/docs/TreeHaver/Language.html
+++ b/gems/tree_haver/docs/TreeHaver/Language.html
@@ -1083,7 +1083,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/LanguageRegistry.html b/gems/tree_haver/docs/TreeHaver/LanguageRegistry.html
index 3f0480996..abe7fe410 100644
--- a/gems/tree_haver/docs/TreeHaver/LanguageRegistry.html
+++ b/gems/tree_haver/docs/TreeHaver/LanguageRegistry.html
@@ -1036,7 +1036,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/LanguageVersion.html b/gems/tree_haver/docs/TreeHaver/LanguageVersion.html
index b8fed03fc..7b5fa5aa7 100644
--- a/gems/tree_haver/docs/TreeHaver/LanguageVersion.html
+++ b/gems/tree_haver/docs/TreeHaver/LanguageVersion.html
@@ -374,7 +374,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/LibraryPathUtils.html b/gems/tree_haver/docs/TreeHaver/LibraryPathUtils.html
index 210505d06..c8afc35f8 100644
--- a/gems/tree_haver/docs/TreeHaver/LibraryPathUtils.html
+++ b/gems/tree_haver/docs/TreeHaver/LibraryPathUtils.html
@@ -503,7 +503,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/LibraryPathValidation.html b/gems/tree_haver/docs/TreeHaver/LibraryPathValidation.html
index b1aefe02a..199efb819 100644
--- a/gems/tree_haver/docs/TreeHaver/LibraryPathValidation.html
+++ b/gems/tree_haver/docs/TreeHaver/LibraryPathValidation.html
@@ -461,7 +461,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/NativeParserProvider.html b/gems/tree_haver/docs/TreeHaver/NativeParserProvider.html
index 1df6081c6..89a5a6d93 100644
--- a/gems/tree_haver/docs/TreeHaver/NativeParserProvider.html
+++ b/gems/tree_haver/docs/TreeHaver/NativeParserProvider.html
@@ -809,7 +809,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/NativeProviderMetadata.html b/gems/tree_haver/docs/TreeHaver/NativeProviderMetadata.html
index 290e9b00e..d962e1ea2 100644
--- a/gems/tree_haver/docs/TreeHaver/NativeProviderMetadata.html
+++ b/gems/tree_haver/docs/TreeHaver/NativeProviderMetadata.html
@@ -1592,7 +1592,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Node.html b/gems/tree_haver/docs/TreeHaver/Node.html
index 9e5d93a0a..1da17d650 100644
--- a/gems/tree_haver/docs/TreeHaver/Node.html
+++ b/gems/tree_haver/docs/TreeHaver/Node.html
@@ -3575,7 +3575,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/NormalizedParseResult.html b/gems/tree_haver/docs/TreeHaver/NormalizedParseResult.html
index ff3e70b00..534eb4e37 100644
--- a/gems/tree_haver/docs/TreeHaver/NormalizedParseResult.html
+++ b/gems/tree_haver/docs/TreeHaver/NormalizedParseResult.html
@@ -896,7 +896,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/NormalizedTreeNode.html b/gems/tree_haver/docs/TreeHaver/NormalizedTreeNode.html
index dce48f63d..8964abc51 100644
--- a/gems/tree_haver/docs/TreeHaver/NormalizedTreeNode.html
+++ b/gems/tree_haver/docs/TreeHaver/NormalizedTreeNode.html
@@ -1592,7 +1592,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/NotAvailable.html b/gems/tree_haver/docs/TreeHaver/NotAvailable.html
index b9886a155..a592c56bf 100644
--- a/gems/tree_haver/docs/TreeHaver/NotAvailable.html
+++ b/gems/tree_haver/docs/TreeHaver/NotAvailable.html
@@ -126,7 +126,7 @@
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/OrderedSiblingEdge.html b/gems/tree_haver/docs/TreeHaver/OrderedSiblingEdge.html
index 8626294dc..95d5acdf9 100644
--- a/gems/tree_haver/docs/TreeHaver/OrderedSiblingEdge.html
+++ b/gems/tree_haver/docs/TreeHaver/OrderedSiblingEdge.html
@@ -548,7 +548,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/OrderedTreePrimitives.html b/gems/tree_haver/docs/TreeHaver/OrderedTreePrimitives.html
index a252bca86..7fb24f5d8 100644
--- a/gems/tree_haver/docs/TreeHaver/OrderedTreePrimitives.html
+++ b/gems/tree_haver/docs/TreeHaver/OrderedTreePrimitives.html
@@ -548,7 +548,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/ParseErrorNode.html b/gems/tree_haver/docs/TreeHaver/ParseErrorNode.html
index 86ac38300..5e129c359 100644
--- a/gems/tree_haver/docs/TreeHaver/ParseErrorNode.html
+++ b/gems/tree_haver/docs/TreeHaver/ParseErrorNode.html
@@ -461,7 +461,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/ParseErrorTolerance.html b/gems/tree_haver/docs/TreeHaver/ParseErrorTolerance.html
index d3c39b21a..ea0af5ccb 100644
--- a/gems/tree_haver/docs/TreeHaver/ParseErrorTolerance.html
+++ b/gems/tree_haver/docs/TreeHaver/ParseErrorTolerance.html
@@ -722,7 +722,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Parser.html b/gems/tree_haver/docs/TreeHaver/Parser.html
index 00985dd76..cc2b35e90 100644
--- a/gems/tree_haver/docs/TreeHaver/Parser.html
+++ b/gems/tree_haver/docs/TreeHaver/Parser.html
@@ -1148,7 +1148,7 @@ 
    Incremental parse
    
 
    
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/ParserDiagnostics.html b/gems/tree_haver/docs/TreeHaver/ParserDiagnostics.html
index ccf84cc89..e76da97c1 100644
--- a/gems/tree_haver/docs/TreeHaver/ParserDiagnostics.html
+++ b/gems/tree_haver/docs/TreeHaver/ParserDiagnostics.html
@@ -461,7 +461,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/ParserIdentity.html b/gems/tree_haver/docs/TreeHaver/ParserIdentity.html
index 6f5de24c7..1843368b9 100644
--- a/gems/tree_haver/docs/TreeHaver/ParserIdentity.html
+++ b/gems/tree_haver/docs/TreeHaver/ParserIdentity.html
@@ -461,7 +461,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/ParserRequest.html b/gems/tree_haver/docs/TreeHaver/ParserRequest.html
index 8d7450550..ab0b64928 100644
--- a/gems/tree_haver/docs/TreeHaver/ParserRequest.html
+++ b/gems/tree_haver/docs/TreeHaver/ParserRequest.html
@@ -461,7 +461,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/ParsletGrammarFinder.html b/gems/tree_haver/docs/TreeHaver/ParsletGrammarFinder.html
index ff5b5e9e9..ab84b8930 100644
--- a/gems/tree_haver/docs/TreeHaver/ParsletGrammarFinder.html
+++ b/gems/tree_haver/docs/TreeHaver/ParsletGrammarFinder.html
@@ -1297,7 +1297,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/PathValidator.html b/gems/tree_haver/docs/TreeHaver/PathValidator.html
index f43047744..7bb620077 100644
--- a/gems/tree_haver/docs/TreeHaver/PathValidator.html
+++ b/gems/tree_haver/docs/TreeHaver/PathValidator.html
@@ -2003,7 +2003,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/ProviderDiagnostic.html b/gems/tree_haver/docs/TreeHaver/ProviderDiagnostic.html
index b3580d277..ccda57fe8 100644
--- a/gems/tree_haver/docs/TreeHaver/ProviderDiagnostic.html
+++ b/gems/tree_haver/docs/TreeHaver/ProviderDiagnostic.html
@@ -722,7 +722,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/ProviderDiagnosticsReport.html b/gems/tree_haver/docs/TreeHaver/ProviderDiagnosticsReport.html
index 7adb339a3..da988c4b2 100644
--- a/gems/tree_haver/docs/TreeHaver/ProviderDiagnosticsReport.html
+++ b/gems/tree_haver/docs/TreeHaver/ProviderDiagnosticsReport.html
@@ -635,7 +635,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/RSpec.html b/gems/tree_haver/docs/TreeHaver/RSpec.html
index 01c294009..76247c081 100644
--- a/gems/tree_haver/docs/TreeHaver/RSpec.html
+++ b/gems/tree_haver/docs/TreeHaver/RSpec.html
@@ -108,7 +108,7 @@ 
    Defined Under Namespace
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/RSpec/DependencyTags.html b/gems/tree_haver/docs/TreeHaver/RSpec/DependencyTags.html
index 942ce1d2a..0379b048c 100644
--- a/gems/tree_haver/docs/TreeHaver/RSpec/DependencyTags.html
+++ b/gems/tree_haver/docs/TreeHaver/RSpec/DependencyTags.html
@@ -375,7 +375,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/SourceFragment.html b/gems/tree_haver/docs/TreeHaver/SourceFragment.html
index 362ca81cf..4961ffb49 100644
--- a/gems/tree_haver/docs/TreeHaver/SourceFragment.html
+++ b/gems/tree_haver/docs/TreeHaver/SourceFragment.html
@@ -722,7 +722,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/SourcePoint.html b/gems/tree_haver/docs/TreeHaver/SourcePoint.html
index a722cf97d..b9e72f9b4 100644
--- a/gems/tree_haver/docs/TreeHaver/SourcePoint.html
+++ b/gems/tree_haver/docs/TreeHaver/SourcePoint.html
@@ -374,7 +374,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/SourceSpan.html b/gems/tree_haver/docs/TreeHaver/SourceSpan.html
index 0cd25e8d4..621bf222f 100644
--- a/gems/tree_haver/docs/TreeHaver/SourceSpan.html
+++ b/gems/tree_haver/docs/TreeHaver/SourceSpan.html
@@ -461,7 +461,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Tree.html b/gems/tree_haver/docs/TreeHaver/Tree.html
index 6e4dfbc59..1dbb96c8c 100644
--- a/gems/tree_haver/docs/TreeHaver/Tree.html
+++ b/gems/tree_haver/docs/TreeHaver/Tree.html
@@ -1175,7 +1175,7 @@ 
    Examples:
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/TreeHaverProfile.html b/gems/tree_haver/docs/TreeHaver/TreeHaverProfile.html
index 6cc06bdd7..588b27a28 100644
--- a/gems/tree_haver/docs/TreeHaver/TreeHaverProfile.html
+++ b/gems/tree_haver/docs/TreeHaver/TreeHaverProfile.html
@@ -1157,7 +1157,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/Version.html b/gems/tree_haver/docs/TreeHaver/Version.html
index 0683e3839..4961990bd 100644
--- a/gems/tree_haver/docs/TreeHaver/Version.html
+++ b/gems/tree_haver/docs/TreeHaver/Version.html
@@ -118,7 +118,7 @@ 
    
 
 
         
-        
    '7.1.8'
    
+        
    '7.1.9'
    
       
     
   
@@ -134,7 +134,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/ZipArchiveEntry.html b/gems/tree_haver/docs/TreeHaver/ZipArchiveEntry.html
index 64bf26dec..b8180d410 100644
--- a/gems/tree_haver/docs/TreeHaver/ZipArchiveEntry.html
+++ b/gems/tree_haver/docs/TreeHaver/ZipArchiveEntry.html
@@ -1070,7 +1070,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/ZipArchiveInfo.html b/gems/tree_haver/docs/TreeHaver/ZipArchiveInfo.html
index c786abe88..0430d9915 100644
--- a/gems/tree_haver/docs/TreeHaver/ZipArchiveInfo.html
+++ b/gems/tree_haver/docs/TreeHaver/ZipArchiveInfo.html
@@ -548,7 +548,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/ZipFamilyReport.html b/gems/tree_haver/docs/TreeHaver/ZipFamilyReport.html
index df27a098b..4035b5a31 100644
--- a/gems/tree_haver/docs/TreeHaver/ZipFamilyReport.html
+++ b/gems/tree_haver/docs/TreeHaver/ZipFamilyReport.html
@@ -635,7 +635,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/ZipMemberDecision.html b/gems/tree_haver/docs/TreeHaver/ZipMemberDecision.html
index 01aaaa1c2..d112a1253 100644
--- a/gems/tree_haver/docs/TreeHaver/ZipMemberDecision.html
+++ b/gems/tree_haver/docs/TreeHaver/ZipMemberDecision.html
@@ -635,7 +635,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/TreeHaver/ZipUnsafeEntry.html b/gems/tree_haver/docs/TreeHaver/ZipUnsafeEntry.html
index a54f1a96d..9cbace697 100644
--- a/gems/tree_haver/docs/TreeHaver/ZipUnsafeEntry.html
+++ b/gems/tree_haver/docs/TreeHaver/ZipUnsafeEntry.html
@@ -548,7 +548,7 @@ 
    
 
 
       
diff --git a/gems/tree_haver/docs/_index.html b/gems/tree_haver/docs/_index.html
index 5d73c52e3..8d78895b5 100644
--- a/gems/tree_haver/docs/_index.html
+++ b/gems/tree_haver/docs/_index.html
@@ -1091,7 +1091,7 @@ 
    Namespace Listing A-Z
    
 
 
       
diff --git a/gems/tree_haver/docs/file.AGPL-3.0-only.html b/gems/tree_haver/docs/file.AGPL-3.0-only.html
index aa50bf72c..3149f5d47 100644
--- a/gems/tree_haver/docs/file.AGPL-3.0-only.html
+++ b/gems/tree_haver/docs/file.AGPL-3.0-only.html
@@ -342,7 +342,7 @@
 
 
       
diff --git a/gems/tree_haver/docs/file.LICENSE.html b/gems/tree_haver/docs/file.LICENSE.html
index 6bff0db15..bff3920bd 100644
--- a/gems/tree_haver/docs/file.LICENSE.html
+++ b/gems/tree_haver/docs/file.LICENSE.html
@@ -79,7 +79,7 @@ 
 
 
       
diff --git a/gems/tree_haver/docs/file.PolyForm-Small-Business-1.0.0.html b/gems/tree_haver/docs/file.PolyForm-Small-Business-1.0.0.html
index 8b631c20c..2c215f80d 100644
--- a/gems/tree_haver/docs/file.PolyForm-Small-Business-1.0.0.html
+++ b/gems/tree_haver/docs/file.PolyForm-Small-Business-1.0.0.html
@@ -185,7 +185,7 @@ 
    Definitions
    
 
 
       
diff --git a/gems/tree_haver/docs/file.README.html b/gems/tree_haver/docs/file.README.html
index f368d875a..4f5f54e68 100644
--- a/gems/tree_haver/docs/file.README.html
+++ b/gems/tree_haver/docs/file.README.html
@@ -2490,7 +2490,7 @@ 
    📄 License
    
 
 
       
diff --git a/gems/tree_haver/docs/index.html b/gems/tree_haver/docs/index.html
index 4b2f30035..f5671d3a8 100644
--- a/gems/tree_haver/docs/index.html
+++ b/gems/tree_haver/docs/index.html
@@ -2490,7 +2490,7 @@ 
    📄 License
    
 
 
       
diff --git a/gems/tree_haver/docs/top-level-namespace.html b/gems/tree_haver/docs/top-level-namespace.html
index d5f0c4e3e..8d595b855 100644
--- a/gems/tree_haver/docs/top-level-namespace.html
+++ b/gems/tree_haver/docs/top-level-namespace.html
@@ -102,7 +102,7 @@ 
    Defined Under Namespace
    
 
 
       
diff --git a/gems/typescript-merge/Gemfile.lock b/gems/typescript-merge/Gemfile.lock
index b2a029bde..b798cdfa3 100644
--- a/gems/typescript-merge/Gemfile.lock
+++ b/gems/typescript-merge/Gemfile.lock
@@ -144,8 +144,8 @@ PATH
       commonmarker-merge (~> 7.1, >= 7.1.8)
       dotenv-merge (~> 7.1, >= 7.1.8)
       json-merge (~> 7.1, >= 7.1.8)
-      kettle-changelog (~> 1.0, >= 1.0.6)
-      kettle-dev (>= 3.0.17, < 4.0.0)
+      kettle-changelog (~> 1.0, >= 1.0.7)
+      kettle-dev (~> 3.0, >= 3.0.34)
       kettle-gha-pins (~> 0.3, >= 0.3.14)
       kettle-ndjson (~> 0.1, >= 0.1.13)
       kettle-rb (~> 0.1, >= 0.1.11)
@@ -261,7 +261,7 @@ PATH
       go-merge (= 7.1.9)
       html-merge (= 7.1.9)
       json-merge (= 7.1.9)
-      kettle-jem (~> 7.1, >= 7.1.18)
+      kettle-jem (~> 7.1, >= 7.1.26)
       markdown-merge (= 7.1.9)
       plain-merge (= 7.1.9)
       prism-merge (= 7.1.9)
@@ -336,8 +336,6 @@ GEM
     command_kit-completion (0.3.0)
       command_kit (~> 0.1)
       completely (~> 0.6)
-    commonmarker (2.10.0)
-      rb_sys (~> 0.9)
     commonmarker (2.10.0-aarch64-linux)
     commonmarker (2.10.0-aarch64-linux-musl)
     commonmarker (2.10.0-arm64-darwin)
@@ -509,9 +507,6 @@ GEM
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.4.2)
-    rake-compiler-dock (1.12.0)
-    rb_sys (0.9.130)
-      rake-compiler-dock (= 1.12.0)
     rbs (4.2.0)
       logger
       prism (>= 1.6.0)
@@ -705,9 +700,6 @@ GEM
     toml-rb (4.2.1)
       citrus (~> 3.0, > 3.0)
       racc (~> 1.7)
-    tree_sitter_language_pack (1.17.0)
-      rb_sys (>= 0.9.130, < 0.10)
-      sorbet-runtime (~> 0.5)
     tree_sitter_language_pack (1.17.0-aarch64-linux)
       sorbet-runtime (~> 0.5)
     tree_sitter_language_pack (1.17.0-arm64-darwin)
@@ -866,7 +858,7 @@ CHECKSUMS
   benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c
   bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd
   binary-merge (7.1.9)
-  bundler (4.1.0.beta1)
+  bundler (4.1.0.beta1) sha256=8a2dac8ca276ff4eff5efc2c6457b0044080fc1e431534ad7c5cc6187232b800
   bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9
   cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb
   citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650
@@ -875,7 +867,6 @@ CHECKSUMS
   colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02
   command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90
   command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737
-  commonmarker (2.10.0)
   commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478
   commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25
   commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e
@@ -960,8 +951,6 @@ CHECKSUMS
   racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
   rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
   rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
-  rake-compiler-dock (1.12.0)
-  rb_sys (0.9.130)
   rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674
   rbs-merge (7.1.9)
   rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192
@@ -1031,7 +1020,6 @@ CHECKSUMS
   toml-merge (7.1.9)
   toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb
   tree_haver (7.1.9)
-  tree_sitter_language_pack (1.17.0)
   tree_sitter_language_pack (1.17.0-aarch64-linux)
   tree_sitter_language_pack (1.17.0-arm64-darwin)
   tree_sitter_language_pack (1.17.0-x86_64-darwin)
diff --git a/gems/yaml-merge/Gemfile.lock b/gems/yaml-merge/Gemfile.lock
index a951db287..70a7670b2 100644
--- a/gems/yaml-merge/Gemfile.lock
+++ b/gems/yaml-merge/Gemfile.lock
@@ -144,8 +144,8 @@ PATH
       commonmarker-merge (~> 7.1, >= 7.1.8)
       dotenv-merge (~> 7.1, >= 7.1.8)
       json-merge (~> 7.1, >= 7.1.8)
-      kettle-changelog (~> 1.0, >= 1.0.6)
-      kettle-dev (>= 3.0.17, < 4.0.0)
+      kettle-changelog (~> 1.0, >= 1.0.7)
+      kettle-dev (~> 3.0, >= 3.0.34)
       kettle-gha-pins (~> 0.3, >= 0.3.14)
       kettle-ndjson (~> 0.1, >= 0.1.13)
       kettle-rb (~> 0.1, >= 0.1.11)
@@ -261,7 +261,7 @@ PATH
       go-merge (= 7.1.9)
       html-merge (= 7.1.9)
       json-merge (= 7.1.9)
-      kettle-jem (~> 7.1, >= 7.1.18)
+      kettle-jem (~> 7.1, >= 7.1.26)
       markdown-merge (= 7.1.9)
       plain-merge (= 7.1.9)
       prism-merge (= 7.1.9)
@@ -336,8 +336,6 @@ GEM
     command_kit-completion (0.3.0)
       command_kit (~> 0.1)
       completely (~> 0.6)
-    commonmarker (2.10.0)
-      rb_sys (~> 0.9)
     commonmarker (2.10.0-aarch64-linux)
     commonmarker (2.10.0-aarch64-linux-musl)
     commonmarker (2.10.0-arm64-darwin)
@@ -509,9 +507,6 @@ GEM
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.4.2)
-    rake-compiler-dock (1.12.0)
-    rb_sys (0.9.130)
-      rake-compiler-dock (= 1.12.0)
     rbs (4.2.0)
       logger
       prism (>= 1.6.0)
@@ -705,9 +700,6 @@ GEM
     toml-rb (4.2.1)
       citrus (~> 3.0, > 3.0)
       racc (~> 1.7)
-    tree_sitter_language_pack (1.16.2)
-      rb_sys (>= 0.9.130, < 0.10)
-      sorbet-runtime (~> 0.5)
     tree_sitter_language_pack (1.16.2-aarch64-linux)
       sorbet-runtime (~> 0.5)
     tree_sitter_language_pack (1.16.2-arm64-darwin)
@@ -866,7 +858,7 @@ CHECKSUMS
   benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c
   bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd
   binary-merge (7.1.9)
-  bundler (4.1.0.beta1)
+  bundler (4.1.0.beta1) sha256=8a2dac8ca276ff4eff5efc2c6457b0044080fc1e431534ad7c5cc6187232b800
   bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9
   cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb
   citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650
@@ -875,7 +867,6 @@ CHECKSUMS
   colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02
   command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90
   command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737
-  commonmarker (2.10.0)
   commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478
   commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25
   commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e
@@ -960,8 +951,6 @@ CHECKSUMS
   racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
   rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
   rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
-  rake-compiler-dock (1.12.0)
-  rb_sys (0.9.130)
   rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674
   rbs-merge (7.1.9)
   rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192
@@ -1031,7 +1020,6 @@ CHECKSUMS
   toml-merge (7.1.9)
   toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb
   tree_haver (7.1.9)
-  tree_sitter_language_pack (1.16.2)
   tree_sitter_language_pack (1.16.2-aarch64-linux) sha256=f44b6de8a7ac74b5115b0c155cd384e7df29a7b0d3c65bae2a5e78fd2e232652
   tree_sitter_language_pack (1.16.2-arm64-darwin) sha256=c673c3cef003761d2e6ed818f338e21664860e0b80a4d1f20c4993cd7e88b8d6
   tree_sitter_language_pack (1.16.2-x86_64-darwin) sha256=f7457f90ec51d70ed2b1c1de452e665c7ee6e6f17d2dd7cd30e2c082877f75e6
diff --git a/gems/zip-merge/Gemfile.lock b/gems/zip-merge/Gemfile.lock
index a3ec3a0c3..fa5b312f2 100644
--- a/gems/zip-merge/Gemfile.lock
+++ b/gems/zip-merge/Gemfile.lock
@@ -144,8 +144,8 @@ PATH
       commonmarker-merge (~> 7.1, >= 7.1.8)
       dotenv-merge (~> 7.1, >= 7.1.8)
       json-merge (~> 7.1, >= 7.1.8)
-      kettle-changelog (~> 1.0, >= 1.0.6)
-      kettle-dev (>= 3.0.17, < 4.0.0)
+      kettle-changelog (~> 1.0, >= 1.0.7)
+      kettle-dev (~> 3.0, >= 3.0.34)
       kettle-gha-pins (~> 0.3, >= 0.3.14)
       kettle-ndjson (~> 0.1, >= 0.1.13)
       kettle-rb (~> 0.1, >= 0.1.11)
@@ -261,7 +261,7 @@ PATH
       go-merge (= 7.1.9)
       html-merge (= 7.1.9)
       json-merge (= 7.1.9)
-      kettle-jem (~> 7.1, >= 7.1.18)
+      kettle-jem (~> 7.1, >= 7.1.26)
       markdown-merge (= 7.1.9)
       plain-merge (= 7.1.9)
       prism-merge (= 7.1.9)
@@ -336,8 +336,6 @@ GEM
     command_kit-completion (0.3.0)
       command_kit (~> 0.1)
       completely (~> 0.6)
-    commonmarker (2.10.0)
-      rb_sys (~> 0.9)
     commonmarker (2.10.0-aarch64-linux)
     commonmarker (2.10.0-aarch64-linux-musl)
     commonmarker (2.10.0-arm64-darwin)
@@ -509,9 +507,6 @@ GEM
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.4.2)
-    rake-compiler-dock (1.12.0)
-    rb_sys (0.9.130)
-      rake-compiler-dock (= 1.12.0)
     rbs (4.2.0)
       logger
       prism (>= 1.6.0)
@@ -705,9 +700,6 @@ GEM
     toml-rb (4.2.1)
       citrus (~> 3.0, > 3.0)
       racc (~> 1.7)
-    tree_sitter_language_pack (1.17.0)
-      rb_sys (>= 0.9.130, < 0.10)
-      sorbet-runtime (~> 0.5)
     tree_sitter_language_pack (1.17.0-aarch64-linux)
       sorbet-runtime (~> 0.5)
     tree_sitter_language_pack (1.17.0-arm64-darwin)
@@ -866,7 +858,7 @@ CHECKSUMS
   benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c
   bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd
   binary-merge (7.1.9)
-  bundler (4.1.0.beta1)
+  bundler (4.1.0.beta1) sha256=8a2dac8ca276ff4eff5efc2c6457b0044080fc1e431534ad7c5cc6187232b800
   bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9
   cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb
   citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650
@@ -875,7 +867,6 @@ CHECKSUMS
   colsole (1.0.1) sha256=7632a300ace2db877c024ffe413c684954cf37e41264b75ace9f456c9d657b02
   command_kit (0.6.0) sha256=e57f29cf5aee4f571c210041d910ff87f85749e42dfe75139c57cc93d84afa90
   command_kit-completion (0.3.0) sha256=d9c498555125bcdd0c9d869f2a64a25a2f0205102a7f28c81c7937ae633ea737
-  commonmarker (2.10.0)
   commonmarker (2.10.0-aarch64-linux) sha256=eeb167dea203dee066eb0dd99b3fd2deb526c8b5e7297ad385f7a5d60f869478
   commonmarker (2.10.0-aarch64-linux-musl) sha256=e95d9e87ea6306e21ffa11855a7bb55518538143b23a227fe3bb00b41873ce25
   commonmarker (2.10.0-arm64-darwin) sha256=39ecc891d1e4308b5233cc28b40383de854a2bfbefe17d68e49174347a8aa79e
@@ -960,8 +951,6 @@ CHECKSUMS
   racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
   rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
   rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
-  rake-compiler-dock (1.12.0)
-  rb_sys (0.9.130)
   rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674
   rbs-merge (7.1.9)
   rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192
@@ -1031,7 +1020,6 @@ CHECKSUMS
   toml-merge (7.1.9)
   toml-rb (4.2.1) sha256=e6c40e27905e86a7d38cc252eb4bc12d72c61576c826a358390c30f5de0b9dbb
   tree_haver (7.1.9)
-  tree_sitter_language_pack (1.17.0)
   tree_sitter_language_pack (1.17.0-aarch64-linux)
   tree_sitter_language_pack (1.17.0-arm64-darwin)
   tree_sitter_language_pack (1.17.0-x86_64-darwin)